remove vulnerable package and fix KXI-45460

Author: Philip-Carneiro-KX

esbuild.js

@@ -1,5 +1,14 @@
 const { build } = require("esbuild");
-const { copy } = require("esbuild-plugin-copy");
+const fs = require("fs");
+const path = require("path");
+const glob = require("glob");
+
+function copyFiles(srcPattern, destDir) {
+  glob.sync(srcPattern).forEach((file) => {
+    const destFile = path.join(destDir, path.basename(file));
+    fs.copyFileSync(file, destFile);
+  });
+}
 
 const baseConfig = {
   bundle: true,
@@ -32,33 +41,6 @@ const webviewConfig = {
   entryPoints: ["./src/webview/main.ts"],
   external: ["vscode"],
   outfile: "./out/webview.js",
-  plugins: [
-    copy({
-      resolveFrom: "cwd",
-      assets: [
-        {
-          from: ["src/webview/styles/*.css"],
-          to: ["./out"],
-        },
-        {
-          from: ["node_modules/ag-grid-community/styles/ag-grid.min.css"],
-          to: ["./out"],
-        },
-        {
-          from: [
-            "node_modules/ag-grid-community/styles/ag-theme-alpine.min.css",
-          ],
-          to: ["./out"],
-        },
-        {
-          from: [
-            "node_modules/ag-grid-community/dist/ag-grid-community.min.js",
-          ],
-          to: ["./out"],
-        },
-      ],
-    }),
-  ],
 };
 
 (async () => {
@@ -68,6 +50,16 @@ const webviewConfig = {
     await build(serverConfig);
     console.log("server build complete");
     await build(webviewConfig);
+    copyFiles("src/webview/styles/*.css", "./out");
+    copyFiles("node_modules/ag-grid-community/styles/ag-grid.min.css", "./out");
+    copyFiles(
+      "node_modules/ag-grid-community/styles/ag-theme-alpine.min.css",
+      "./out",
+    );
+    copyFiles(
+      "node_modules/ag-grid-community/dist/ag-grid-community.min.js",
+      "./out",
+    );
     console.log("build complete");
   } catch (err) {
     process.stderr.write(err.stderr);

package-lock.json

@@ -333,6 +333,12 @@
         "command": "kdb.datasource.import.ds",
         "title": "Import Datasource from old format"
       },
+      {
+        "category": "KX",
+        "command": "kdb.terminal.run",
+        "title": "Run q file in a new q instance",
+        "icon": "$(debug-alt)"
+      },
       {
         "category": "KX",
         "command": "kdb.terminal.start",
@@ -341,25 +347,25 @@
       {
         "category": "KX",
         "command": "kdb.execute.selectedQuery",
-        "title": "Execute Current Selection",
+        "title": "KX: Execute Current Selection",
         "icon": "$(run-below)"
       },
       {
         "category": "KX",
         "command": "kdb.execute.fileQuery",
-        "title": "Execute Entire File",
+        "title": "KX: Execute Entire File",
         "icon": "$(run)"
       },
       {
         "category": "KX",
         "command": "kdb.execute.pythonScratchpadQuery",
-        "title": "Execute Current Selection in Insights Scratchpad",
+        "title": "KX: Execute Current Python Selection",
         "icon": "$(run-below)"
       },
       {
         "category": "KX",
         "command": "kdb.execute.pythonFileScratchpadQuery",
-        "title": "Execute Entire File in Insights Scratchpad",
+        "title": "KX: Execute Entire Python File",
         "icon": "$(run)"
       },
       {
@@ -394,19 +400,19 @@
         "command": "kdb.execute.pythonScratchpadQuery",
         "key": "ctrl+d",
         "mac": "cmd+d",
-        "when": "editorLangId == python"
+        "when": "editorLangId == python && (resourceFilename =~ /.kdb.py/ || kdb.insightsConnected)"
       },
       {
         "command": "kdb.execute.pythonFileScratchpadQuery",
         "key": "ctrl+shift+d",
         "mac": "cmd+shift+d",
-        "when": "editorLangId == python"
+        "when": "editorLangId == python && (resourceFilename =~ /.kdb.py/ || kdb.insightsConnected)"
       },
       {
         "command": "kdb.terminal.run",
         "key": "ctrl+shift+r",
         "mac": "cmd+shift+r",
-        "when": "editorLangId == q"
+        "when": "editorLangId == q && !(resourceFilename =~ /.kdb.q/)"
       }
     ],
     "snippets": [
@@ -701,17 +707,17 @@
         {
           "command": "kdb.terminal.run",
           "group": "q@2",
-          "when": "editorLangId == q"
+          "when": "editorLangId == q && !(resourceFilename =~ /.kdb.q/)"
         },
         {
           "command": "kdb.execute.pythonFileScratchpadQuery",
           "group": "q@0",
-          "when": "editorLangId == python"
+          "when": "editorLangId == python && (resourceFilename =~ /.kdb.py/ || kdb.insightsConnected)"
         },
         {
           "command": "kdb.execute.pythonScratchpadQuery",
           "group": "q@1",
-          "when": "editorLangId == python"
+          "when": "editorLangId == python && (resourceFilename =~ /.kdb.py/ || kdb.insightsConnected)"
         }
       ],
       "editor/context": [
@@ -728,17 +734,17 @@
         {
           "command": "kdb.terminal.run",
           "group": "q@2",
-          "when": "editorLangId == q"
+          "when": "editorLangId == q && !(resourceFilename =~ /.kdb.q/)"
         },
         {
           "command": "kdb.execute.pythonFileScratchpadQuery",
           "group": "q@0",
-          "when": "editorLangId == python"
+          "when": "editorLangId == python && (resourceFilename =~ /.kdb.py/ || kdb.insightsConnected)"
         },
         {
           "command": "kdb.execute.pythonScratchpadQuery",
           "group": "q@1",
-          "when": "editorLangId == python"
+          "when": "editorLangId == python && (resourceFilename =~ /.kdb.py/ || kdb.insightsConnected)"
         }
       ]
     },
@@ -829,7 +835,6 @@
     "axios": "^1.6.8",
     "chevrotain": "^10.5.0",
     "csv-parser": "^3.0.0",
-    "esbuild-plugin-copy": "^2.1.1",
     "extract-zip": "^2.0.1",
     "fs-extra": "^11.2.0",
     "fuse.js": "^7.0.0",