From d0b893577c9b991ab3c162854c95a589511070a3 Mon Sep 17 00:00:00 2001 From: "ricardo.junior" Date: Wed, 17 Jun 2026 17:46:35 -0300 Subject: [PATCH 1/3] fix: publish --- client/package-lock.json | 32 ++++++++++++++++++++------------ client/package.json | 4 ++-- client/src/extension.ts | 14 +++++++------- package-lock.json | 4 ++-- package.json | 4 ++-- server/package.json | 2 +- 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 158d7b1..867a3de 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,18 +1,18 @@ { "name": "language-server-client", - "version": "2.8.4-SNAPSHOT", + "version": "2.8.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "language-server-client", - "version": "2.8.4-SNAPSHOT", + "version": "2.8.3", "dependencies": { "axios": "^1.15.0", "vscode-languageclient": "^9.0.1" }, "devDependencies": { - "@intersystems-community/intersystems-servermanager": "^3.10.2", + "@consistem-sistemas/consistem-servermanager": "file:../../intersystems-servermanager/types", "@types/semver": "^7.7.0", "@types/vscode": "1.93.0" }, @@ -20,12 +20,19 @@ "vscode": "^1.93.0" } }, - "node_modules/@intersystems-community/intersystems-servermanager": { + "../../intersystems-servermanager/types": { + "name": "@consistem-sistemas/consistem-servermanager", "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@intersystems-community/intersystems-servermanager/-/intersystems-servermanager-3.10.2.tgz", - "integrity": "sha512-gwXxtvh+22MbCg3ZS8+evMCOuMvoDmApeYIghhFe3+NePIHhEC0na/UxeoA65xe4Rc97CJ+B2bCca/UF6iDI1A==", "dev": true, - "license": "MIT" + "license": "MIT", + "devDependencies": { + "@types/vscode": "^1.93.0", + "rimraf": "^3.0.0" + } + }, + "node_modules/@consistem-sistemas/consistem-servermanager": { + "resolved": "../../intersystems-servermanager/types", + "link": true }, "node_modules/@types/semver": { "version": "7.7.0", @@ -413,11 +420,12 @@ } }, "dependencies": { - "@intersystems-community/intersystems-servermanager": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@intersystems-community/intersystems-servermanager/-/intersystems-servermanager-3.10.2.tgz", - "integrity": "sha512-gwXxtvh+22MbCg3ZS8+evMCOuMvoDmApeYIghhFe3+NePIHhEC0na/UxeoA65xe4Rc97CJ+B2bCca/UF6iDI1A==", - "dev": true + "@consistem-sistemas/consistem-servermanager": { + "version": "file:../../intersystems-servermanager/types", + "requires": { + "@types/vscode": "^1.93.0", + "rimraf": "^3.0.0" + } }, "@types/semver": { "version": "7.7.0", diff --git a/client/package.json b/client/package.json index 7d04fce..1d05079 100644 --- a/client/package.json +++ b/client/package.json @@ -1,7 +1,7 @@ { "name": "language-server-client", "author": "InterSystems Corporation", - "version": "2.8.4-SNAPSHOT", + "version": "2.8.3", "private": true, "engines": { "vscode": "^1.93.0" @@ -11,7 +11,7 @@ "vscode-languageclient": "^9.0.1" }, "devDependencies": { - "@intersystems-community/intersystems-servermanager": "^3.10.2", + "@consistem-sistemas/consistem-servermanager": "file:../../intersystems-servermanager/types", "@types/semver": "^7.7.0", "@types/vscode": "1.93.0" } diff --git a/client/src/extension.ts b/client/src/extension.ts index 3e0be4d..4798042 100644 --- a/client/src/extension.ts +++ b/client/src/extension.ts @@ -25,7 +25,7 @@ import { } from "vscode-languageclient/node"; import { gt, lte, lt } from "semver"; -import * as serverManager from "@intersystems-community/intersystems-servermanager"; +import * as serverManager from "@consistem-sistemas/consistem-servermanager"; import { ObjectScriptEvaluatableExpressionProvider } from "./evaluatableExpressionProvider"; import { @@ -91,7 +91,7 @@ type MakeRESTRequestParams = { export async function activate(context: ExtensionContext) { // Get the main extension exported API - const objectScriptExt = extensions.getExtension("consistem-sistemas.vscode-objectscript")!; + const objectScriptExt = extensions.getExtension("consistem-sistemas.consistem-vscode-objectscript")!; objectScriptApi = objectScriptExt.isActive ? objectScriptExt.exports : await objectScriptExt.activate(); // The server is implemented in node @@ -164,7 +164,7 @@ export async function activate(context: ExtensionContext) { wsFolderServerSpecs.clear(); client.sendNotification("intersystems/server/connectionChange"); }); - const serverManagerExt = extensions.getExtension("consistem-sistemas.servermanager"); + const serverManagerExt = extensions.getExtension("consistem-sistemas.consistem-servermanager"); if (serverManagerExt !== undefined) { // The server manager extension is installed serverManagerApi = serverManagerExt.isActive ? serverManagerExt.exports : await serverManagerExt.activate(); @@ -402,7 +402,7 @@ export async function activate(context: ExtensionContext) { if (workspace.name === undefined) { window .showInformationMessage( - `For the best user experience, InterSystems recommends that you activate the default light theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.language-server). Activate now?`, + `For the best user experience, InterSystems recommends that you activate the default light theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-language-server). Activate now?`, "Yes", "Don't Ask Again", ) @@ -417,7 +417,7 @@ export async function activate(context: ExtensionContext) { // Only give the "Only This Workspace" option if a workspace is open window .showInformationMessage( - `For the best user experience, InterSystems recommends that you activate the default light theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.language-server). Activate now?`, + `For the best user experience, InterSystems recommends that you activate the default light theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-language-server). Activate now?`, "Globally", "Only This Workspace", "Don't Ask Again", @@ -436,7 +436,7 @@ export async function activate(context: ExtensionContext) { if (workspace.name === undefined) { window .showInformationMessage( - `For the best user experience, InterSystems recommends that you activate the default dark theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.language-server). Activate now?`, + `For the best user experience, InterSystems recommends that you activate the default dark theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-language-server). Activate now?`, "Yes", "Don't Ask Again", ) @@ -451,7 +451,7 @@ export async function activate(context: ExtensionContext) { // Only give the "Only This Workspace" option if a workspace is open window .showInformationMessage( - `For the best user experience, InterSystems recommends that you activate the default dark theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.language-server). Activate now?`, + `For the best user experience, InterSystems recommends that you activate the default dark theme included with the [InterSystems Language Server extension](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-language-server). Activate now?`, "Globally", "Only This Workspace", "Don't Ask Again", diff --git a/package-lock.json b/package-lock.json index c24e6b2..5daa327 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "language-server", + "name": "consistem-language-server", "version": "2.8.4-SNAPSHOT", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "language-server", + "name": "consistem-language-server", "version": "2.8.4-SNAPSHOT", "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE.txt", diff --git a/package.json b/package.json index 4d50ce9..b0653c0 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "language-server", + "name": "consistem-language-server", "displayName": "Consistem Language Server", "description": "A language server for InterSystems ObjectScript, based on the official project and maintained by Consistem.", "author": "InterSystems Corporation", @@ -1818,7 +1818,7 @@ "webpack-cli": "^7.0.2" }, "extensionDependencies": [ - "consistem-sistemas.vscode-objectscript" + "consistem-sistemas.consistem-vscode-objectscript" ], "prettier": { "useTabs": true, diff --git a/server/package.json b/server/package.json index f8e221c..b0cbdb4 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "language-server-server", - "version": "2.8.4-SNAPSHOT", + "version": "2.8.3", "author": "InterSystems Corporation", "private": true, "engines": { From e2812caf5960e3724e9d3838c8ca6a477d46e76c Mon Sep 17 00:00:00 2001 From: "ricardo.junior" Date: Thu, 18 Jun 2026 11:27:24 -0300 Subject: [PATCH 2/3] fix: ajustes para publicar --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 151caf7..fd2363a 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ This extension can be installed on the following platforms: ## Dependencies -This extension depends on the [vscode-objectscript](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.vscode-objectscript) extension be downloaded and enabled. +This extension depends on the [vscode-objectscript](https://marketplace.visualstudio.com/items?itemName=consistem-sistemas.consistem-vscode-objectscript) extension be downloaded and enabled. ## InterSystems Product Compatibility From ef9fdfabcb525c4d2d6d97e8272ce6ed37bf01c9 Mon Sep 17 00:00:00 2001 From: "ricardo.junior" Date: Thu, 18 Jun 2026 11:51:07 -0300 Subject: [PATCH 3/3] fix: ajustes para publicar --- .vscodeignore | 1 + client/package-lock.json | 26 +++----- client/package.json | 2 +- .../vendor/consistem-servermanager/index.d.ts | 66 +++++++++++++++++++ .../vendor/consistem-servermanager/index.js | 4 ++ .../consistem-servermanager/package.json | 9 +++ 6 files changed, 90 insertions(+), 18 deletions(-) create mode 100644 client/vendor/consistem-servermanager/index.d.ts create mode 100644 client/vendor/consistem-servermanager/index.js create mode 100644 client/vendor/consistem-servermanager/package.json diff --git a/.vscodeignore b/.vscodeignore index ae09c7a..3024cf2 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -8,6 +8,7 @@ shared.webpack.config.js **/tslint.json client/node_modules/** client/src/** +client/vendor/** client/webpack.config.js server/node_modules/** server/src/** diff --git a/client/package-lock.json b/client/package-lock.json index 867a3de..b336d23 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -12,7 +12,7 @@ "vscode-languageclient": "^9.0.1" }, "devDependencies": { - "@consistem-sistemas/consistem-servermanager": "file:../../intersystems-servermanager/types", + "@consistem-sistemas/consistem-servermanager": "file:./vendor/consistem-servermanager", "@types/semver": "^7.7.0", "@types/vscode": "1.93.0" }, @@ -20,18 +20,8 @@ "vscode": "^1.93.0" } }, - "../../intersystems-servermanager/types": { - "name": "@consistem-sistemas/consistem-servermanager", - "version": "3.10.2", - "dev": true, - "license": "MIT", - "devDependencies": { - "@types/vscode": "^1.93.0", - "rimraf": "^3.0.0" - } - }, "node_modules/@consistem-sistemas/consistem-servermanager": { - "resolved": "../../intersystems-servermanager/types", + "resolved": "vendor/consistem-servermanager", "link": true }, "node_modules/@types/semver": { @@ -417,15 +407,17 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "vendor/consistem-servermanager": { + "name": "@consistem-sistemas/consistem-servermanager", + "version": "3.10.2", + "dev": true, + "license": "MIT" } }, "dependencies": { "@consistem-sistemas/consistem-servermanager": { - "version": "file:../../intersystems-servermanager/types", - "requires": { - "@types/vscode": "^1.93.0", - "rimraf": "^3.0.0" - } + "version": "file:vendor/consistem-servermanager" }, "@types/semver": { "version": "7.7.0", diff --git a/client/package.json b/client/package.json index 1d05079..f6077a0 100644 --- a/client/package.json +++ b/client/package.json @@ -11,7 +11,7 @@ "vscode-languageclient": "^9.0.1" }, "devDependencies": { - "@consistem-sistemas/consistem-servermanager": "file:../../intersystems-servermanager/types", + "@consistem-sistemas/consistem-servermanager": "file:./vendor/consistem-servermanager", "@types/semver": "^7.7.0", "@types/vscode": "1.93.0" } diff --git a/client/vendor/consistem-servermanager/index.d.ts b/client/vendor/consistem-servermanager/index.d.ts new file mode 100644 index 0000000..cd5617a --- /dev/null +++ b/client/vendor/consistem-servermanager/index.d.ts @@ -0,0 +1,66 @@ +import * as vscode from 'vscode'; + +export const EXTENSION_ID: string; +export const AUTHENTICATION_PROVIDER: string; + +export interface IServerName { + name: string; + description: string; + detail: string; + scope?: vscode.ConfigurationScope; +} + +export interface IWebServerSpec { + scheme?: string; + host: string; + port: number; + pathPrefix?: string; +} + +export interface ISuperServerSpec { + host?: string; + port: number; +} + +export interface IJSONServerSpec { + webServer: IWebServerSpec; + superServer?: ISuperServerSpec; + username?: string; + password?: string; + description?: string; +} + +export interface IServerSpec extends IJSONServerSpec { + name: string; +} + +export interface ServerManagerAPI { + pickServer( + scope?: vscode.ConfigurationScope, + options?: vscode.QuickPickOptions, + ): Promise; + + getServerNames( + scope?: vscode.ConfigurationScope, + sorted?: boolean, + ): IServerName[]; + + getServerSummary( + name: string, + scope?: vscode.ConfigurationScope, + ): IServerName | undefined; + + getServerSpec( + name: string, + scope?: vscode.ConfigurationScope, + flushCredentialCache?: boolean, + options?: { hideFromRecents?: boolean, /* Obsolete */ noCredentials?: boolean }, + ): Promise; + + getAccount( + serverSpec: IServerSpec + ): vscode.AuthenticationSessionAccountInformation | undefined; + + onDidChangePassword( + ): vscode.Event; +} diff --git a/client/vendor/consistem-servermanager/index.js b/client/vendor/consistem-servermanager/index.js new file mode 100644 index 0000000..1dc6900 --- /dev/null +++ b/client/vendor/consistem-servermanager/index.js @@ -0,0 +1,4 @@ +module.exports = { + EXTENSION_ID: 'consistem-sistemas.consistem-servermanager', + AUTHENTICATION_PROVIDER: 'intersystems-server-credentials' +}; diff --git a/client/vendor/consistem-servermanager/package.json b/client/vendor/consistem-servermanager/package.json new file mode 100644 index 0000000..f1aaa3f --- /dev/null +++ b/client/vendor/consistem-servermanager/package.json @@ -0,0 +1,9 @@ +{ + "name": "@consistem-sistemas/consistem-servermanager", + "version": "3.10.2", + "description": "InterSystems Server Manager VS Code extension API interfaces and constants (vendored for offline/CI builds)", + "types": "index.d.ts", + "main": "index.js", + "license": "MIT", + "private": true +}