Update mapepire client

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

package-lock.json

@@ -1394,7 +1394,7 @@
     "webpack-cli": "^4.5.0"
   },
   "dependencies": {
-    "@ibm/mapepire-js": "^0.3.0",
+    "@ibm/mapepire-js": "^0.5.0",
     "@octokit/rest": "^21.1.1",
     "chart.js": "^4.4.2",
     "csv": "^6.1.3",

package.json

@@ -2,8 +2,8 @@ import { getInstance } from "../base";
 import { ServerComponent } from "./serverComponent";
 import { SelfValue } from "../views/jobManager/selfCodes/nodes";
 import { SQLJob } from "@ibm/mapepire-js";
-import { ConnectionResult, JobStatus, QueryResult, ServerRequest, ServerResponse } from "@ibm/mapepire-js/dist/src/types";
-import { JobLogEntry } from "./types";
+import { ConnectionResult, QueryResult, ServerRequest, ServerResponse } from "@ibm/mapepire-js/dist/src/types";
+import { JobLogEntry, JobStatus } from "./types";
 import Statement from "../database/statement";
 
 const DB2I_VERSION = (process.env[`DB2I_VERSION`] || `<version unknown>`) + ((process.env.DEV) ? ``:`-dev`);
@@ -106,7 +106,7 @@ export class OldSQLJob extends SQLJob {
   getStatus(): JobStatus {
     const currentListenerCount = this.responseEmitter.eventNames().length;
 
-    return this.channel && currentListenerCount > 0 ? "busy" : this.status;
+    return this.channel && currentListenerCount > 0 ? JobStatus.BUSY : this.status;
   }
 
   async connect(): Promise<ConnectionResult> {
@@ -116,12 +116,12 @@ export class OldSQLJob extends SQLJob {
 
     this.channel.on(`error`, (err) => {
       ServerComponent.writeOutput(err);
-      this.dispose();
+      this.end();
     })
 
     this.channel.on(`close`, (code: number) => {
       ServerComponent.writeOutput(`Exited with code ${code}.`)
-      this.dispose();
+      this.end();
     })
 
     const props = Object
@@ -147,10 +147,10 @@ export class OldSQLJob extends SQLJob {
     const connectResult = await this.send<ConnectionResult>(connectionObject);
 
     if (connectResult.success === true) {
-      this.status = "ready";
+      this.status = JobStatus.READY;
     } else {
-      this.dispose();
-      this.status = "notStarted";
+      this.end();
+      this.status = JobStatus.NOT_STARTED;
       throw new Error(connectResult.error || `Failed to connect to server.`);
     }
 
@@ -217,13 +217,13 @@ export class OldSQLJob extends SQLJob {
       }));
     });
 
-    this.dispose();
+    this.end();
   }
 
-  dispose() {
+ private end() {
     this.channel.close();
     this.channel = undefined;
-    this.status = "ended";
+    this.status = JobStatus.ENDED;
     this.responseEmitter.removeAllListeners();
   }
 }

src/connection/sqlJob.ts

@@ -1,4 +1,23 @@
-import { QueryMetaData, QueryResult } from "@ibm/mapepire-js/dist/src/types";
+
+// Redefined from mapepire-js
+export enum JobStatus {
+  NOT_STARTED = "notStarted",
+  CONNECTING = "connecting",
+  READY = "ready",
+  BUSY = "busy",
+  ENDED = "ended"
+}
+
+export enum TransactionEndType {
+  COMMIT = "COMMIT",
+  ROLLBACK = "ROLLBACK"
+}
+
+export enum ExplainType {
+  RUN = "run",
+  DO_NOT_RUN = "doNotRun"
+}
+// End
 
 export interface JobLogEntry {
   MESSAGE_ID: string;

src/connection/types.ts

@@ -14,6 +14,7 @@ import { setCancelButtonVisibility } from "../results";
 import { JDBCOptions } from "@ibm/mapepire-js/dist/src/types";
 import { registerDb2iTablesProvider } from "../../aiProviders/continue/listTablesContextProvider";
 import { sqlLanguageStatus } from "../../language/providers";
+import { TransactionEndType } from "../../connection/types";
 
 const selectJobCommand = `vscode-db2i.jobManager.selectJob`;
 const activeColor = new vscode.ThemeColor(`minimapGutter.addedBackground`);
@@ -71,10 +72,10 @@ export class JobManagerView implements TreeDataProvider<any> {
 
                 switch (decision) {
                   case `Commit and end`:
-                    await selected.job.endTransaction("commit");
+                    await selected.job.endTransaction(TransactionEndType.COMMIT);
                     break;
                   case `Rollback and end`:
-                    await selected.job.endTransaction("rollback");
+                    await selected.job.endTransaction(TransactionEndType.ROLLBACK);
                     break;
                   default:
                     // Actually... don't end the job
@@ -245,7 +246,7 @@ export class JobManagerView implements TreeDataProvider<any> {
         let selected = id ? JobManager.getJob(id) : JobManager.getSelection();
         if (selected) {
           if (selected.job.underCommitControl()) {
-            const result = await selected.job.endTransaction("commit");
+            const result = await selected.job.endTransaction(TransactionEndType.ROLLBACK);
             if (!result.success) {
               vscode.window.showErrorMessage(`Failed to commit.` + result.error);
             }
@@ -261,7 +262,7 @@ export class JobManagerView implements TreeDataProvider<any> {
         if (selected) {
           if (selected.job.underCommitControl()) {
             try {
-              const result = await selected.job.endTransaction("rollback");
+              const result = await selected.job.endTransaction(TransactionEndType.ROLLBACK);
               if (!result.success) {
                 vscode.window.showErrorMessage(`Failed to rollback. ` + result.error);
               }

src/views/jobManager/jobManagerView.ts

@@ -15,8 +15,8 @@ import { DoveTreeDecorationProvider } from "./explain/doveTreeDecorationProvider
 import { ResultSetPanelProvider } from "./resultSetPanelProvider";
 import { generateSqlForAdvisedIndexes } from "./explain/advice";
 import { updateStatusBar } from "../jobManager/statusBar";
-import { ExplainType } from "@ibm/mapepire-js/dist/src/types";
 import { DbCache } from "../../language/providers/logic/cache";
+import { ExplainType } from "../../connection/types";
 
 export type StatementQualifier = "statement" | "update" | "explain" | "onlyexplain" | "json" | "csv" | "cl" | "sql";
 
@@ -355,7 +355,7 @@ async function runHandler(options?: StatementInfo) {
             const onlyExplain = statementDetail.qualifier === `onlyexplain`;
 
             chosenView.setLoadingText(onlyExplain ? `Explaining without running...` : `Explaining...`);
-            const explainType: ExplainType = onlyExplain ? "doNotRun" : "run";
+            const explainType: ExplainType = onlyExplain ? ExplainType.DO_NOT_RUN : ExplainType.RUN;
 
               setCancelButtonVisibility(true);
               const explained = await selectedJob.job.explain(statementDetail.content, explainType); // Can throw