@theia/vsx-registry 1.46.0-next.196 → 1.46.0-next.200

package/lib/node/vsx-cli-deployer-participant.js

@@ -25,7 +25,7 @@ const node_1 = require("@theia/core/lib/node");
 const path = require("path");
 let VsxCliDeployerParticipant = class VsxCliDeployerParticipant {
     async onWillStart(context) {
-        const pluginUris = this.vsxCli.pluginsToInstall.map(async (id) => {
+        const pluginUris = await Promise.all(this.vsxCli.pluginsToInstall.map(async (id) => {
             try {
                 const resolvedPath = path.resolve(id);
                 const stat = await fs.promises.stat(resolvedPath);
@@ -37,8 +37,8 @@ let VsxCliDeployerParticipant = class VsxCliDeployerParticipant {
                 // expected if file does not exist
             }
             return common_1.VSXExtensionUri.fromVersionedId(id).toString();
-        });
-        context.userEntries.push(...await Promise.all(pluginUris));
+        }));
+        context.userEntries.push(...pluginUris);
     }
 };
 (0, tslib_1.__decorate)([

package/lib/node/vsx-cli-deployer-participant.js.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-cli-deployer-participant.js","sourceRoot":"","sources":["../../src/node/vsx-cli-deployer-participant.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAkE;AAElE,uCAAmC;AACnC,sCAA4C;AAC5C,yBAAyB;AACzB,+CAA+C;AAC/C,6BAA6B;AAG7B,IAAa,yBAAyB,GAAtC,MAAa,yBAAyB;IAKlC,KAAK,CAAC,WAAW,CAAC,OAAmC;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3D,IAAI;gBACA,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBACtC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAClD,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;oBACf,OAAO,cAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;iBAC3E;aACJ;YAAC,OAAO,CAAC,EAAE;gBACR,kCAAkC;aACrC;YACD,OAAO,wBAAe,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/D,CAAC;CACJ,CAAA;AAjBG;IADC,IAAA,kBAAM,EAAC,gBAAM,CAAC;2CACY,gBAAM;yDAAC;AAHzB,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAoBrC;AApBY,8DAAyB"}
+{"version":3,"file":"vsx-cli-deployer-participant.js","sourceRoot":"","sources":["../../src/node/vsx-cli-deployer-participant.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAkE;AAElE,uCAAmC;AACnC,sCAA4C;AAC5C,yBAAyB;AACzB,+CAA+C;AAC/C,6BAA6B;AAG7B,IAAa,yBAAyB,GAAtC,MAAa,yBAAyB;IAKlC,KAAK,CAAC,WAAW,CAAC,OAAmC;QACjD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC7E,IAAI;gBACA,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBACtC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAClD,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;oBACf,OAAO,cAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;iBAC3E;aACJ;YAAC,OAAO,CAAC,EAAE;gBACR,kCAAkC;aACrC;YACD,OAAO,wBAAe,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC,CAAC;QACJ,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;IAC5C,CAAC;CACJ,CAAA;AAjBG;IADC,IAAA,kBAAM,EAAC,gBAAM,CAAC;2CACY,gBAAM;yDAAC;AAHzB,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAoBrC;AApBY,8DAAyB"}

package/lib/node/vsx-remote-cli.d.ts

@@ -0,0 +1,7 @@
+import { RemoteCliContext, RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
+import { PluginDeployerHandler } from '@theia/plugin-ext';
+export declare class VsxRemoteCli implements RemoteCliContribution {
+    protected readonly pluginDeployerHandler: PluginDeployerHandler;
+    enhanceArgs(context: RemoteCliContext): Promise<string[]>;
+}
+//# sourceMappingURL=vsx-remote-cli.d.ts.map

package/lib/node/vsx-remote-cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vsx-remote-cli.d.ts","sourceRoot":"","sources":["../../src/node/vsx-remote-cli.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAE9G,OAAO,EAAE,qBAAqB,EAAc,MAAM,mBAAmB,CAAC;AAEtE,qBACa,YAAa,YAAW,qBAAqB;IAGtD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAE1D,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAYlE"}

package/lib/node/vsx-remote-cli.js

@@ -0,0 +1,40 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2024 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VsxRemoteCli = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const plugin_ext_1 = require("@theia/plugin-ext");
+let VsxRemoteCli = class VsxRemoteCli {
+    async enhanceArgs(context) {
+        const deployedPlugins = await this.pluginDeployerHandler.getDeployedPlugins();
+        // Plugin IDs can be duplicated between frontend and backend plugins, so we create a set first
+        const installPluginArgs = Array.from(new Set(deployedPlugins
+            .filter(plugin => plugin.type === plugin_ext_1.PluginType.User)
+            .map(p => `--install-plugin=${p.metadata.model.id}`)));
+        return installPluginArgs;
+    }
+};
+(0, tslib_1.__decorate)([
+    (0, inversify_1.inject)(plugin_ext_1.PluginDeployerHandler),
+    (0, tslib_1.__metadata)("design:type", Object)
+], VsxRemoteCli.prototype, "pluginDeployerHandler", void 0);
+VsxRemoteCli = (0, tslib_1.__decorate)([
+    (0, inversify_1.injectable)()
+], VsxRemoteCli);
+exports.VsxRemoteCli = VsxRemoteCli;
+//# sourceMappingURL=vsx-remote-cli.js.map

package/lib/node/vsx-remote-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vsx-remote-cli.js","sourceRoot":"","sources":["../../src/node/vsx-remote-cli.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAGhF,4DAAkE;AAClE,kDAAsE;AAGtE,IAAa,YAAY,GAAzB,MAAa,YAAY;IAKrB,KAAK,CAAC,WAAW,CAAC,OAAyB;QACvC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,EAAE,CAAC;QAC9E,8FAA8F;QAC9F,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAChC,IAAI,GAAG,CACH,eAAe;aACV,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,uBAAU,CAAC,IAAI,CAAC;aACjD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAC3D,CACJ,CAAC;QACF,OAAO,iBAAiB,CAAC;IAC7B,CAAC;CACJ,CAAA;AAdG;IADC,IAAA,kBAAM,EAAC,kCAAqB,CAAC;;2DACkC;AAHvD,YAAY;IADxB,IAAA,sBAAU,GAAE;GACA,YAAY,CAiBxB;AAjBY,oCAAY"}

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@theia/vsx-registry",
-  "version": "1.46.0-next.196+cb2bd96b3",
+  "version": "1.46.0-next.200+44b4f27c6",
   "description": "Theia - VSX Registry",
   "dependencies": {
-    "@theia/core": "1.46.0-next.196+cb2bd96b3",
-    "@theia/filesystem": "1.46.0-next.196+cb2bd96b3",
-    "@theia/navigator": "1.46.0-next.196+cb2bd96b3",
-    "@theia/ovsx-client": "1.46.0-next.196+cb2bd96b3",
-    "@theia/plugin-ext": "1.46.0-next.196+cb2bd96b3",
-    "@theia/plugin-ext-vscode": "1.46.0-next.196+cb2bd96b3",
-    "@theia/preferences": "1.46.0-next.196+cb2bd96b3",
-    "@theia/workspace": "1.46.0-next.196+cb2bd96b3",
+    "@theia/core": "1.46.0-next.200+44b4f27c6",
+    "@theia/filesystem": "1.46.0-next.200+44b4f27c6",
+    "@theia/navigator": "1.46.0-next.200+44b4f27c6",
+    "@theia/ovsx-client": "1.46.0-next.200+44b4f27c6",
+    "@theia/plugin-ext": "1.46.0-next.200+44b4f27c6",
+    "@theia/plugin-ext-vscode": "1.46.0-next.200+44b4f27c6",
+    "@theia/preferences": "1.46.0-next.200+44b4f27c6",
+    "@theia/workspace": "1.46.0-next.200+44b4f27c6",
     "luxon": "^2.4.0",
     "p-debounce": "^2.1.0",
     "semver": "^7.5.4",
@@ -60,5 +60,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "cb2bd96b362408c90179005a5b415ddbd452ce41"
+  "gitHead": "44b4f27c63028c1bdc7dcd9b565d666428af6f97"
 }

package/src/node/vsx-cli-deployer-participant.ts

@@ -29,7 +29,7 @@ export class VsxCliDeployerParticipant implements PluginDeployerParticipant {
     protected readonly vsxCli: VsxCli;
 
     async onWillStart(context: PluginDeployerStartContext): Promise<void> {
-        const pluginUris = this.vsxCli.pluginsToInstall.map(async id => {
+        const pluginUris = await Promise.all(this.vsxCli.pluginsToInstall.map(async id => {
             try {
                 const resolvedPath = path.resolve(id);
                 const stat = await fs.promises.stat(resolvedPath);
@@ -40,7 +40,7 @@ export class VsxCliDeployerParticipant implements PluginDeployerParticipant {
                 // expected if file does not exist
             }
             return VSXExtensionUri.fromVersionedId(id).toString();
-        });
-        context.userEntries.push(...await Promise.all(pluginUris));
+        }));
+        context.userEntries.push(...pluginUris);
     }
 }

package/src/node/vsx-remote-cli.ts

@@ -0,0 +1,39 @@
+// *****************************************************************************
+// Copyright (C) 2024 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { RemoteCliContext, RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { PluginDeployerHandler, PluginType } from '@theia/plugin-ext';
+
+@injectable()
+export class VsxRemoteCli implements RemoteCliContribution {
+
+    @inject(PluginDeployerHandler)
+    protected readonly pluginDeployerHandler: PluginDeployerHandler;
+
+    async enhanceArgs(context: RemoteCliContext): Promise<string[]> {
+        const deployedPlugins = await this.pluginDeployerHandler.getDeployedPlugins();
+        // Plugin IDs can be duplicated between frontend and backend plugins, so we create a set first
+        const installPluginArgs = Array.from(
+            new Set(
+                deployedPlugins
+                    .filter(plugin => plugin.type === PluginType.User)
+                    .map(p => `--install-plugin=${p.metadata.model.id}`)
+            )
+        );
+        return installPluginArgs;
+    }
+}