Merge pull request intersystems-community#740 from intersystems-community/dependabot-fixes

package updates to resolve security issues

Author: isc-rsingh

package-lock.json

@@ -1109,12 +1109,12 @@
     "@types/request": "^2.48.5",
     "@types/ws": "^7.2.5",
     "@types/xmldom": "^0.1.29",
-    "@typescript-eslint/eslint-plugin": "^3.4.0",
-    "@typescript-eslint/parser": "^3.4.0",
-    "eslint": "^7.3.1",
-    "eslint-config-airbnb": "^18.2.0",
+    "@typescript-eslint/eslint-plugin": "^4.32.0",
+    "@typescript-eslint/parser": "^4.32.0",
+    "eslint": "^7.32.0",
+    "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.21.2",
+    "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
@@ -1127,7 +1127,7 @@
     "prettier": "^2.0.5",
     "tape": "^5.0.1",
     "ts-loader": "^7.0.5",
-    "typescript": "^3.9.5",
+    "typescript": "^4.4.3",
     "vsce": "^1.93.0",
     "vscode-debugadapter-testsupport": "^1.41.0",
     "vscode-dts": "^0.3.1",
@@ -1136,19 +1136,19 @@
     "webpack-cli": "^4.5.0"
   },
   "dependencies": {
+    "@xmldom/xmldom": "^0.7.5",
     "await-notify": "^1.0.1",
     "core-js": "^3.6.5",
     "domexception": "^2.0.1",
     "glob": "^7.1.6",
     "iconv-lite": "^0.6.0",
     "mkdirp": "^1.0.4",
-    "node-fetch": "^3.0.0-beta.9",
+    "node-fetch": "^3.0.0",
     "request": "^2.88.2",
     "vscode-cache": "^0.3.0",
     "vscode-debugadapter": "^1.41.0",
     "vscode-debugprotocol": "^1.41.0",
     "vscode-extension-telemetry": "^0.1.6",
-    "ws": "^7.4.6",
-    "xmldom": "^0.5.0"
+    "ws": "^7.4.6"
   }
 }

package.json

@@ -1,4 +1,8 @@
-import fetch from "node-fetch";
+// import fetch from "node-fetch";
+// mod.cjs
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+const fetch = (...args) => import("node-fetch").then(({ default: fetch }) => fetch(...args));
 import * as httpModule from "http";
 import * as httpsModule from "https";
 import * as url from "url";

src/api/index.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from "events";
 import * as WebSocket from "ws";
 import * as iconv from "iconv-lite";
-import { DOMParser } from "xmldom";
+import { DOMParser } from "@xmldom/xmldom";
 
 /** The encoding all XDebug messages are encoded with */
 export const ENCODING = "iso-8859-1";

src/debug/dbgp.ts

@@ -3,7 +3,8 @@ import vscode = require("vscode");
 import { ObjectScriptDebugSession } from "./debugSession";
 
 export class ObjectScriptDebugAdapterDescriptorFactory
-  implements vscode.DebugAdapterDescriptorFactory, vscode.Disposable {
+  implements vscode.DebugAdapterDescriptorFactory, vscode.Disposable
+{
   private server?: net.Server;
 
   public createDebugAdapterDescriptor(

src/debug/debugAdapterFactory.ts

@@ -406,44 +406,42 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
     const stack = await this._connection.sendStackGetCommand();
 
     const stackFrames = await Promise.all(
-      stack.stack.map(
-        async (stackFrame: xdebug.StackFrame, index): Promise<StackFrame> => {
-          const [, namespace, name] = decodeURI(stackFrame.fileUri).match(/^dbgp:\/\/\|([^|]+)\|(.*)$/);
-          const routine = name;
-          // const routine = name.includes(".") ? name : name + ".int";
-          const fileUri = DocumentContentProvider.getUri(routine, this._workspace, namespace).toString();
-          const source = new Source(routine, fileUri);
-          let line = stackFrame.line + 1;
-          const place = `${stackFrame.method}+${stackFrame.methodOffset}`;
-          const stackFrameId = this._stackFrameIdCounter++;
-          let noSource = false;
-          try {
-            const document = await vscode.workspace.openTextDocument(vscode.Uri.parse(source.path));
-            if (source.name.endsWith(".cls") && stackFrame.method !== "") {
-              const methodMatchPattern = new RegExp(`^(Class)?Method ${stackFrame.method}(?=[( ])`, "i");
-              for (let i = 0; i < document.lineCount; i++) {
-                const codeLine = document.lineAt(i);
-
-                const methodMatch = codeLine.text.match(methodMatchPattern);
-                if (methodMatch) {
-                  line = i + 2 + stackFrame.methodOffset;
-                  break;
-                }
+      stack.stack.map(async (stackFrame: xdebug.StackFrame, index): Promise<StackFrame> => {
+        const [, namespace, name] = decodeURI(stackFrame.fileUri).match(/^dbgp:\/\/\|([^|]+)\|(.*)$/);
+        const routine = name;
+        // const routine = name.includes(".") ? name : name + ".int";
+        const fileUri = DocumentContentProvider.getUri(routine, this._workspace, namespace).toString();
+        const source = new Source(routine, fileUri);
+        let line = stackFrame.line + 1;
+        const place = `${stackFrame.method}+${stackFrame.methodOffset}`;
+        const stackFrameId = this._stackFrameIdCounter++;
+        let noSource = false;
+        try {
+          const document = await vscode.workspace.openTextDocument(vscode.Uri.parse(source.path));
+          if (source.name.endsWith(".cls") && stackFrame.method !== "") {
+            const methodMatchPattern = new RegExp(`^(Class)?Method ${stackFrame.method}(?=[( ])`, "i");
+            for (let i = 0; i < document.lineCount; i++) {
+              const codeLine = document.lineAt(i);
+
+              const methodMatch = codeLine.text.match(methodMatchPattern);
+              if (methodMatch) {
+                line = i + 2 + stackFrame.methodOffset;
+                break;
               }
             }
-            this._stackFrames.set(stackFrameId, stackFrame);
-          } catch (ex) {
-            noSource = true;
           }
-          return {
-            id: stackFrameId,
-            name: place,
-            source: noSource ? null : source,
-            line,
-            column: 1,
-          };
+          this._stackFrames.set(stackFrameId, stackFrame);
+        } catch (ex) {
+          noSource = true;
         }
-      )
+        return {
+          id: stackFrameId,
+          name: place,
+          source: noSource ? null : source,
+          line,
+          column: 1,
+        };
+      })
     );
 
     response.body = {

src/debug/debugSession.ts

@@ -1,6 +1,7 @@
 import { IndentAction, LanguageConfiguration } from "vscode";
 
-export const WORD_PATTERN = /((?<=(class|extends|as|of) )(%?\b[a-z0-9]+(\.[a-z0-9]+)*\b))|(\^[a-z0-9]+(\.[a-z0-9]+)*)|((\${1,3}|[irm]?%|\^|#)?[a-z0-9]+)/i;
+export const WORD_PATTERN =
+  /((?<=(class|extends|as|of) )(%?\b[a-z0-9]+(\.[a-z0-9]+)*\b))|(\^[a-z0-9]+(\.[a-z0-9]+)*)|((\${1,3}|[irm]?%|\^|#)?[a-z0-9]+)/i;
 
 export function getLanguageConfiguration(lang: string): LanguageConfiguration {
   return {

src/languageConfiguration.ts

@@ -341,7 +341,8 @@ export class ObjectScriptCompletionItemProvider implements vscode.CompletionItem
       className = text.split(" ").pop();
     }
     // tslint:disable-next-line: max-line-length
-    pattern = /(?:(Extends |CompileAfter *=|DependsOn *=|PropertyClass *=) *\(? *)((%?[a-zA-Z0-9]*(?:\.[a-zA-Z0-9]*)*)(, *%?[a-zA-Z0-9]*(?:\.[a-zA-Z0-9]*)*|, *)*.?)?/i;
+    pattern =
+      /(?:(Extends |CompileAfter *=|DependsOn *=|PropertyClass *=) *\(? *)((%?[a-zA-Z0-9]*(?:\.[a-zA-Z0-9]*)*)(, *%?[a-zA-Z0-9]*(?:\.[a-zA-Z0-9]*)*|, *)*.?)?/i;
     if (
       !range &&
       // && (!document.getWordRangeAtPosition(position, /\bExtends\b\s*/i))

src/providers/ObjectScriptCompletionItemProvider.ts

@@ -2,7 +2,7 @@
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es6",
+    "target": "es2019",
     "outDir": "out",
     "moduleResolution": "node",
     "lib": ["esnext", "dom"],