corrected read values from intersystems.servers

Author: daimor

package.json

@@ -448,7 +448,7 @@
           "scope": "resource",
           "additionalProperties": false,
           "default": {
-            "active": true,
+            "active": false,
             "host": "localhost",
             "port": 52773,
             "ns": "USER"
@@ -459,7 +459,8 @@
           "properties": {
             "active": {
               "type": "boolean",
-              "description": "This connection is active"
+              "description": "This connection is active",
+              "default": false
             },
             "server": {
               "type": "string",

src/api/atelier.d.ts

@@ -7,21 +7,33 @@ interface ResponseStatus {
   summary: string;
 }
 
-interface ResponseResult<T> {
+interface Content<T> {
   content: T;
 }
 
 export interface Response<T = any> {
   status: ResponseStatus;
   console: string[];
-  result: ResponseResult<T>;
+  result: T;
 }
 
 interface ServerInfoFeature {
   name: string;
   enabled: string;
 }
 
+export interface Document {
+  name: string;
+  db: string;
+  ts: string;
+  upd: boolean;
+  cat: "RTN" | "CLS" | "CSP" | "OTH";
+  status: string;
+  enc: boolean;
+  flags: number;
+  content: string[];
+}
+
 export interface ServerInfo {
   version: string;
   id: string;
@@ -30,17 +42,17 @@ export interface ServerInfo {
   namespaces: string[];
 }
 
-export interface AtelierSearchMatch {
+export interface SearchMatch {
   text: string;
   line?: number;
   member?: string;
   attr?: string;
   attrline?: number;
 }
 
-export interface AtelierSearchResult {
+export interface SearchResult {
   doc: string;
-  matches: AtelierSearchMatch[];
+  matches: SearchMatch[];
 }
 
 export interface AtelierJob {
@@ -50,3 +62,9 @@ export interface AtelierJob {
   state: string;
   device: string;
 }
+
+export interface DeleteStatus {
+  name: string;
+  db: string;
+  status: string;
+}

src/api/index.ts

@@ -119,7 +119,7 @@ export class AtelierAPI {
 
   private setConnection(workspaceFolderName: string, namespace?: string): void {
     let serverName;
-    if (config(`intersystems.servers.${workspaceFolderName}.webServer`)) {
+    if (config(`intersystems.servers.${workspaceFolderName}`)) {
       serverName = workspaceFolderName;
       workspaceFolderName = currentWorkspaceFolder();
     }
@@ -129,10 +129,11 @@ export class AtelierAPI {
     }
 
     if (serverName && serverName.length) {
-      const { scheme, host, port, username, password, pathPrefix } = config(
-        `intersystems.servers.${serverName}.webServer`,
-        workspaceFolderName
-      );
+      const {
+        webServer: { scheme, host, port, pathPrefix },
+        username,
+        password,
+      } = config(`intersystems.servers.${serverName}`, workspaceFolderName);
       this._config = {
         active: conn.active,
         apiVersion: 1,
@@ -301,7 +302,7 @@ export class AtelierAPI {
     });
   }
 
-  public serverInfo(): Promise<Atelier.Response<Atelier.ServerInfo>> {
+  public serverInfo(): Promise<Atelier.Response<Atelier.Content<Atelier.ServerInfo>>> {
     return this.request(0, "GET").then((info) => {
       if (info && info.result && info.result.content && info.result.content.api > 0) {
         const data = info.result.content;
@@ -332,15 +333,15 @@ export class AtelierAPI {
     category?: string;
     type?: string;
     filter?: string;
-  }): Promise<any> {
+  }): Promise<Atelier.Response> {
     return this.request(1, "GET", `${this.ns}/docnames/${category}/${type}`, null, {
       filter,
       generated,
     });
   }
 
   // api v1+
-  public getDoc(name: string, format?: string): Promise<any> {
+  public getDoc(name: string, format?: string): Promise<Atelier.Response> {
     let params = {};
     if (format) {
       params = {
@@ -351,12 +352,16 @@ export class AtelierAPI {
   }
 
   // api v1+
-  public deleteDoc(name: string): Promise<any> {
+  public deleteDoc(name: string): Promise<Atelier.Response<Atelier.Document>> {
     return this.request(1, "DELETE", `${this.ns}/doc/${name}`);
   }
 
   // v1+
-  public putDoc(name: string, data: { enc: boolean; content: string[] }, ignoreConflict?: boolean): Promise<any> {
+  public putDoc(
+    name: string,
+    data: { enc: boolean; content: string[] },
+    ignoreConflict?: boolean
+  ): Promise<Atelier.Response> {
     const params = { ignoreConflict };
     return this.request(1, "PUT", `${this.ns}/doc/${name}`, data, params);
   }
@@ -377,7 +382,7 @@ export class AtelierAPI {
     case?: boolean;
     wild?: boolean;
     word?: boolean;
-  }): Promise<any> {
+  }): Promise<Atelier.Response<Atelier.SearchResult[]>> {
     params = {
       files: "*.cls,*.mac,*.int,*.inc",
       gen: false,
@@ -409,12 +414,12 @@ export class AtelierAPI {
     });
   }
 
-  public cvtXmlUdl(source: string): Promise<any> {
+  public cvtXmlUdl(source: string): Promise<Atelier.Response> {
     return this.request(1, "POST", `${this.ns}/`, source, {}, { "Content-Type": "application/xml" });
   }
 
   // v2+
-  public getmacrodefinition(docname: string, macroname: string, includes: string[]): Promise<any> {
+  public getmacrodefinition(docname: string, macroname: string, includes: string[]): Promise<Atelier.Response> {
     return this.request(2, "POST", `${this.ns}/action/getmacrodefinition`, {
       docname,
       includes,

src/providers/FileSystemPovider/TextSearchProvider.ts

@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import { AtelierSearchResult, AtelierSearchMatch } from "../../api/atelier";
+import { SearchResult, SearchMatch } from "../../api/atelier";
 import { AtelierAPI } from "../../api";
 import { DocumentContentProvider } from "../DocumentContentProvider";
 
@@ -30,7 +30,7 @@ export class TextSearchProvider implements vscode.TextSearchProvider {
         case: query.isCaseSensitive,
       })
       .then((data) => data.result)
-      .then((files: AtelierSearchResult[]) =>
+      .then((files: SearchResult[]) =>
         files.map(async (file) => {
           const fileName = file.doc;
           const uri = DocumentContentProvider.getUri(fileName);
@@ -46,7 +46,7 @@ export class TextSearchProvider implements vscode.TextSearchProvider {
       .then((files) => {
         files.forEach((file) => {
           const { uri, document, matches } = file;
-          matches.forEach((match: AtelierSearchMatch) => {
+          matches.forEach((match: SearchMatch) => {
             const { text, member } = match;
             let { line } = match;
             if (member) {