Use own NPM types package when using own API

Author: gjsjohnmurray

package-lock.json

@@ -50,6 +50,7 @@
     "tough-cookie": "^4.0.0"
   },
   "devDependencies": {
+    "@intersystems-community/intersystems-servermanager": "^3.0.0",
     "@types/vscode": "^1.63.0",
     "@types/glob": "^7.1.1",
     "@types/keytar": "^4.4.2",

package.json

@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import { IJSONServerSpec } from "../extension";
+import { IJSONServerSpec } from "@intersystems-community/intersystems-servermanager";
 import { getServerNames } from "./getServerNames";
 
 export async function addServer(

src/api/addServer.ts

@@ -1,6 +1,7 @@
 import * as vscode from "vscode";
 import { Uri } from "vscode";
-import { extensionId, IServerSpec } from "../extension";
+import { IServerSpec } from "@intersystems-community/intersystems-servermanager";
+import { extensionId } from "../extension";
 import { makeRESTRequest } from "../makeRESTRequest";
 
 export enum BrowserTarget {

src/api/getPortalUriWithToken.ts

@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import { IServerName } from "../extension";
+import { IServerName } from "@intersystems-community/intersystems-servermanager";
 import { serverDetail } from "./getServerSummary";
 
 export function getServerNames(scope?: vscode.ConfigurationScope, sorted?: boolean): IServerName[] {

src/api/getServerNames.ts

@@ -1,7 +1,7 @@
 import * as vscode from "vscode";
 import { AUTHENTICATION_PROVIDER } from "../authenticationProvider";
 import { filePassword } from "../commands/managePasswords";
-import { IServerSpec } from "../extension";
+import { IServerSpec } from "@intersystems-community/intersystems-servermanager";
 import { Keychain } from "../keychain";
 
 interface ICredentialSet {

src/api/getServerSpec.ts

@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import { IServerName, IServerSpec } from "../extension";
+import { IServerName, IServerSpec } from "@intersystems-community/intersystems-servermanager";
 
 export function getServerSummary(name: string, scope?: vscode.ConfigurationScope): IServerName | undefined {
 	const server: IServerSpec | undefined = vscode.workspace.getConfiguration("intersystems.servers", scope).get(name);

src/api/getServerSummary.ts

@@ -1,6 +1,7 @@
 "use strict";
 
 import * as vscode from "vscode";
+import { IServerName, IServerSpec } from "@intersystems-community/intersystems-servermanager";
 import { addServer } from "./api/addServer";
 import { BrowserTarget, getPortalUriWithToken } from "./api/getPortalUriWithToken";
 import { getServerNames } from "./api/getServerNames";
@@ -16,34 +17,6 @@ import { NamespaceTreeItem, ProjectTreeItem, ServerManagerView, ServerTreeItem,
 export const extensionId = "intersystems-community.servermanager";
 export let globalState: vscode.Memento;
 
-export interface IServerName {
-	name: string;
-	description: string;
-	detail: string;
-}
-
-export interface IWebServerSpec {
-	scheme?: string;
-	host: string;
-	port: number;
-	pathPrefix?: string;
-}
-
-export interface IServerSpec {
-	name: string;
-	webServer: IWebServerSpec;
-	username?: string;
-	password?: string;
-	description?: string;
-}
-
-export interface IJSONServerSpec {
-	webServer: IWebServerSpec;
-	username?: string;
-	password?: string;
-	description?: string;
-}
-
 export function activate(context: vscode.ExtensionContext) {
 
 	const _onDidChangePassword = new vscode.EventEmitter<string>();

src/extension.ts

@@ -7,7 +7,7 @@ import * as https from "https";
 import tough = require("tough-cookie");
 import * as vscode from "vscode";
 import { AUTHENTICATION_PROVIDER } from "./authenticationProvider";
-import { IServerSpec } from "./extension";
+import { IServerSpec } from "@intersystems-community/intersystems-servermanager";
 import { getServerSpec } from "./api/getServerSpec";
 
 axiosCookieJarSupport(axios);

src/makeRESTRequest.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import { getServerNames } from "../api/getServerNames";
 import { credentialCache, getServerSpec } from "../api/getServerSpec";
 import { getServerSummary } from "../api/getServerSummary";
-import { IServerName } from "../extension";
+import { IServerName } from "@intersystems-community/intersystems-servermanager";
 import { makeRESTRequest } from "../makeRESTRequest";
 
 const SETTINGS_VERSION = "v1";