Merge pull request #269 from codefori/update/code_for_i_events

Update vscode-ibmi event listener and test runner

Author: worksofliam

package-lock.json

@@ -43,7 +43,7 @@
     "typings": "npx -p typescript tsc ./src/extension.ts --declaration --allowJs --emitDeclarationOnly --outDir types --esModuleInterop -t es2019 --moduleResolution node"
   },
   "devDependencies": {
-    "@halcyontech/vscode-ibmi-types": "^2.0.0",
+    "@halcyontech/vscode-ibmi-types": "^2.12.1",
     "@types/glob": "^7.1.3",
     "@types/node": "14.x",
     "@types/vscode": "^1.70.0",
@@ -1233,4 +1233,4 @@
       }
     ]
   }
-}
+}

package.json

@@ -69,7 +69,7 @@ export async function onConnectOrServerInstall(): Promise<boolean> {
 export function initConfig(context: ExtensionContext) {
   Config = new ConnectionStorage(context);
 
-  getInstance().onEvent(`disconnected`, async () => {
+  getInstance().subscribe(context, `disconnected`, `db2i-disconnect`, async () => {
     JobManagerView.setVisible(false);
     JobManager.endAll();
     updateStatusBar();

src/config.ts

@@ -11,7 +11,7 @@ import { JobManager, onConnectOrServerInstall, initConfig } from "./config";
 import { queryHistory } from "./views/queryHistoryView";
 import { ExampleBrowser } from "./views/examples/exampleBrowser";
 import { languageInit } from "./language";
-import { initialise } from "./testing";
+import { initialiseTestSuite } from "./testing";
 import { JobManagerView } from "./views/jobManager/jobManagerView";
 import { ServerComponent } from "./connection/serverComponent";
 import { SQLJobManager } from "./connection/manager";
@@ -75,20 +75,26 @@ export function activate(context: vscode.ExtensionContext): Db2i {
   initConfig(context);
 
   console.log(`Developer environment: ${process.env.DEV}`);
-  if (process.env.DEV) {
+  const devMode = process.env.DEV !== undefined;
+  let runTests: Function|undefined;
+  if (devMode) {
     // Run tests if not in production build
-    initialise(context);
+    runTests = initialiseTestSuite(context);
   }
 
   const instance = getInstance();
 
-  instance.onEvent(`connected`, () => {
+  instance.subscribe(context, `connected`, `db2i-connected`, () => {
     selfCodesView.setRefreshEnabled(false);
     selfCodesView.setJobOnly(false);
     // Refresh the examples when we have it, so we only display certain examples
     onConnectOrServerInstall().then(() => {
       exampleBrowser.refresh();
-      selfCodesView.setRefreshEnabled(Configuration.get(`jobSelfViewAutoRefresh`) || false)
+      selfCodesView.setRefreshEnabled(Configuration.get(`jobSelfViewAutoRefresh`) || false);
+
+      if (devMode && runTests) {
+        runTests();
+      }
     });
   });
 

src/extension.ts

@@ -28,14 +28,13 @@ export interface TestCase {
   test: () => Promise<void>
 }
 
-let testSuitesTreeProvider : TestSuitesTreeProvider;
-export function initialise(context: vscode.ExtensionContext) {
+let testSuitesTreeProvider: TestSuitesTreeProvider;
+export function initialiseTestSuite(context: vscode.ExtensionContext) {
   if (env.testing === `true`) {
     const instance = getInstance();
 
     vscode.commands.executeCommand(`setContext`, `vscode-db2i:testing`, true);
-    instance.onEvent(`connected`, runTests);
-    instance.onEvent(`disconnected`, resetTests);
+    instance.subscribe(context, `disconnected`, `db2i-resetTests`, resetTests);
 
     testSuitesTreeProvider = new TestSuitesTreeProvider(suites);
 
@@ -55,6 +54,8 @@ export function initialise(context: vscode.ExtensionContext) {
         }
       })
     );
+
+    return runTests;
   }
 }
 

src/testing/index.ts

@@ -374,7 +374,7 @@ export default class schemaBrowser {
       })
     )
 
-    getInstance().onEvent(`connected`, () => this.clearCacheAndRefresh());
+    getInstance().subscribe(context, `connected`, `db2i-clearCacheAndRefresh`, () => this.clearCacheAndRefresh());
   }
 
   clearCacheAndRefresh() {