precisely typed

Author: isc-klu

src/api/index.ts

@@ -30,16 +30,16 @@ const cookiesMap = new Map<string, string[]>();
 export interface ConnectionSettings {
   serverName: string;
   active: boolean;
-  apiVersion: number;
-  serverVersion: string;
+  apiVersion?: number;
+  serverVersion?: string;
   https: boolean;
   host: string;
   port: number;
   superserverPort?: number;
-  pathPrefix: string;
+  pathPrefix?: string;
   ns: string;
   auth: Authorization;
-  docker: boolean;
+  docker?: boolean;
   dockerService?: string;
 }
 
@@ -278,14 +278,18 @@ export class AtelierAPI {
           dockerService: conn["docker-compose"].service,
         };
       } else {
-        this._config = conn;
-        this._config.ns = ns;
-        this._config.serverName = "";
+        this._config = {
+          ...conn,
+          ns,
+          serverName: "",
+        };
       }
     } else {
-      this._config = conn;
-      this._config.ns = ns;
-      this._config.serverName = "";
+      this._config = {
+        ...conn,
+        ns,
+        serverName: "",
+      };
     }
   }
 

src/extension.ts

@@ -71,7 +71,7 @@ import { ObjectScriptRoutineSymbolProvider } from "./providers/ObjectScriptRouti
 import { ObjectScriptCodeLensProvider } from "./providers/ObjectScriptCodeLensProvider";
 import { XmlContentProvider } from "./providers/XmlContentProvider";
 
-import { AtelierAPI } from "./api";
+import { AtelierAPI, ConnectionSettings } from "./api";
 import { ObjectScriptDebugAdapterDescriptorFactory } from "./debug/debugAdapterFactory";
 import { ObjectScriptConfigurationProvider } from "./debug/debugConfProvider";
 import { ProjectsExplorerProvider } from "./explorer/projectsExplorer";
@@ -155,7 +155,15 @@ const lowCodeEditorViewType = packageJson.contributes.customEditors[0].viewType;
 
 const _onDidChangeConnection = new vscode.EventEmitter<void>();
 
-export const config = (setting?: string, workspaceFolderName?: string): vscode.WorkspaceConfiguration | any => {
+type ConnConfig = Pick<ConnectionSettings, "active" | "https" | "ns" | "host" | "port" | "auth"> & {
+  "docker-compose"?: any;
+  server?: any;
+  links?: any;
+};
+
+export function config(setting: "conn", workspaceFolderName?: string): ConnConfig;
+export function config(setting?: string, workspaceFolderName?: string): any;
+export function config(setting?: string, workspaceFolderName?: string): any {
   workspaceFolderName = workspaceFolderName || currentWorkspaceFolder();
   if (
     vscode.workspace.workspaceFolders?.length &&
@@ -181,16 +189,17 @@ export const config = (setting?: string, workspaceFolderName?: string): vscode.W
         const { port, hostname: host, auth, query } = url.parse("http://" + workspaceFolderName, true);
         const { ns = "USER", https = false } = query;
         const [username, password] = (auth || "_SYSTEM:SYS").split(":");
+        const authorization = serverManagerApi.defaultAuth();
+        authorization.resolve({ username, accessToken: password });
         if (setting == "conn") {
           return {
             active: true,
             https,
             ns,
             host,
-            port,
-            username,
-            password,
-          };
+            port: +port,
+            auth: authorization,
+          } as ConnConfig;
         } else if (setting == "export") {
           return {};
         }
@@ -199,7 +208,7 @@ export const config = (setting?: string, workspaceFolderName?: string): vscode.W
   }
   const result = vscode.workspace.getConfiguration(prefix, workspaceFolder?.uri);
   return setting && setting.length ? result.get(setting) : result;
-};
+}
 
 let reporter: TelemetryReporter;
 

src/providers/DocumentContentProvider.ts

@@ -9,8 +9,8 @@ import { getUrisForDocument } from "../utils/documentIndex";
 import { isfsConfig, IsfsUriParam } from "../utils/FileProviderUtil";
 
 export function compareConns(
-  conn1: { ns: any; server: any; host: any; port: any; "docker-compose": any },
-  conn2: { ns: any; server: any; host: any; port: any; "docker-compose": any }
+  conn1: { ns: any; server?: any; host: any; port: any; "docker-compose"?: any },
+  conn2: { ns: any; server?: any; host: any; port: any; "docker-compose"?: any }
 ): boolean {
   if (conn1.ns === conn2.ns) {
     // Same namespace name