diff --git a/gui/extension/.vscode/tasks.json b/gui/extension/.vscode/tasks.json index df5a5c8b..d432d790 100644 --- a/gui/extension/.vscode/tasks.json +++ b/gui/extension/.vscode/tasks.json @@ -4,7 +4,7 @@ { "label": "tsc: extension", "type": "shell", - "command": "tsc", + "command": "./node_modules/.bin/tsc", "args": [ "-w", "-p", @@ -72,7 +72,7 @@ { "label": "tsc: e2e", "type": "shell", - "command": "tsc", + "command": "./node_modules/.bin/tsc", "args": [ "-w", "-p", diff --git a/gui/extension/CHANGELOG.md b/gui/extension/CHANGELOG.md index 4c145def..45e05d52 100644 --- a/gui/extension/CHANGELOG.md +++ b/gui/extension/CHANGELOG.md @@ -7,6 +7,7 @@ - BUG#36027690 Connection error when opening REST Object Request Path in Web Browser - BUG#36032142 Unexpected error when deleting records with filter containing nullables - BUG#36173373 Parent class field not accessible in the child class in the TypeScript SDK +- BUG#36211402 Unexpected compilation error when building the VSCode Extension ## Changes in 1.14.2+8.1.1 diff --git a/gui/extension/package.json b/gui/extension/package.json index 3b67472c..f7a3f76e 100644 --- a/gui/extension/package.json +++ b/gui/extension/package.json @@ -1636,7 +1636,7 @@ "eslint-plugin-jsdoc": "46.8.2", "eslint-plugin-prefer-arrow": "1.2.3", "oci-mysql": "2.73.0", - "typescript": "5.2.2" + "typescript": "5.3.3" }, "scripts": { "build-dev-package": "vsce package", diff --git a/gui/frontend/package-lock.json b/gui/frontend/package-lock.json index c1638081..721ee9ee 100644 --- a/gui/frontend/package-lock.json +++ b/gui/frontend/package-lock.json @@ -75,7 +75,7 @@ "selenium-webdriver": "4.16.0", "terser": "5.24.0", "ts-node": "10.9.1", - "typescript": "5.2.2", + "typescript": "5.3.3", "vite": "4.5.0", "vite-plugin-monaco-editor": "1.1.0" } @@ -14522,9 +14522,9 @@ } }, "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "5.3.3", + "resolved": "https://artifacthub-phx.oci.oraclecorp.com/api/npm/npmjs-remote/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/gui/frontend/package.json b/gui/frontend/package.json index 9e3cfad1..b7e02c77 100644 --- a/gui/frontend/package.json +++ b/gui/frontend/package.json @@ -85,7 +85,7 @@ "selenium-webdriver": "4.16.0", "terser": "5.24.0", "ts-node": "10.9.1", - "typescript": "5.2.2", + "typescript": "5.3.3", "vite": "4.5.0", "vite-plugin-monaco-editor": "1.1.0" }, @@ -95,4 +95,4 @@ "not ie <= 11", "not op_mini all" ] -} \ No newline at end of file +} diff --git a/gui/frontend/src/parsing/python/PythonLexerBase.ts b/gui/frontend/src/parsing/python/PythonLexerBase.ts index 2aa5dd88..575128ea 100644 --- a/gui/frontend/src/parsing/python/PythonLexerBase.ts +++ b/gui/frontend/src/parsing/python/PythonLexerBase.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2023, Oracle and/or its affiliates. + * Copyright (c) 2021, 2024, Oracle and/or its affiliates. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License, version 2.0, @@ -48,7 +48,11 @@ export abstract class PythonLexerBase extends Lexer { return super.emit(); } - super._token = token; + // The _token field is handled by the parent Lexer class, however, the TypeScript compiler now prevents field + // assignment using "super", because fields are kept in a flat structure in the prototype chain and there are no + // assurances they are not rewritten by the child classes. + // Until the Lexer class introduces a setter for this specific field, use we can replace "super" by "this". + this._token = token; this.buffer.push(token); this.lastToken = token; diff --git a/mrs_plugin/sdk/package.json b/mrs_plugin/sdk/package.json index 38c81447..2a2eb5a9 100644 --- a/mrs_plugin/sdk/package.json +++ b/mrs_plugin/sdk/package.json @@ -25,7 +25,7 @@ "eslint-plugin-jsx-a11y": "6.7.1", "eslint-plugin-prefer-arrow": "1.2.3", "preact": "10.19.2", - "typescript": "4.9.5", + "typescript": "5.3.3", "vitest": "0.33.0" } }