@theia/vsx-registry 1.60.2 → 1.61.0

package/lib/browser/vsx-extensions-model.d.ts

@@ -14,6 +14,8 @@ import { RequestService } from '@theia/core/shared/@theia/request';
 import { OVSXApiFilterProvider } from '@theia/ovsx-client';
 import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { HostedPluginServer } from '@theia/plugin-ext';
+import { HostedPluginWatcher } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin-watcher';
 export declare class VSXExtensionsModel {
     protected initialized: Promise<void>;
     /**
@@ -21,14 +23,20 @@ export declare class VSXExtensionsModel {
      */
     protected readonly extensions: Map<string, VSXExtension>;
     protected readonly onDidChangeEmitter: Emitter<void>;
-    protected _installed: Set<string>;
+    protected disabled: Set<`${string}.${string}`>;
+    protected uninstalled: Set<`${string}.${string}`>;
+    protected deployed: Set<`${string}.${string}`>;
+    protected _installed: Set<`${string}.${string}`>;
     protected _recommended: Set<string>;
     protected _searchResult: Set<string>;
+    protected builtins: Set<`${string}.${string}`>;
     protected _searchError?: string;
     protected searchCancellationTokenSource: CancellationTokenSource;
     protected updateSearchResult: () => Promise<void>;
     protected clientProvider: OVSXClientProvider;
     protected readonly pluginSupport: HostedPluginSupport;
+    protected pluginWatcher: HostedPluginWatcher;
+    protected readonly pluginServer: HostedPluginServer;
     protected readonly extensionFactory: VSXExtensionFactory;
     protected readonly progressService: ProgressService;
     protected readonly preferences: PreferenceService;
@@ -46,7 +54,11 @@ export declare class VSXExtensionsModel {
     get searchResult(): IterableIterator<string>;
     get recommended(): IterableIterator<string>;
     setOnlyShowVerifiedExtensions(bool: boolean): void;
+    isBuiltIn(id: string): boolean;
     isInstalled(id: string): boolean;
+    isUninstalled(id: string): boolean;
+    isDeployed(id: string): boolean;
+    isDisabled(id: string): boolean;
     getExtension(id: string): VSXExtension | undefined;
     resolve(id: string): Promise<VSXExtension>;
     protected findReadmeFile(extension: VSXExtension): Promise<URI | undefined>;
@@ -54,7 +66,7 @@ export declare class VSXExtensionsModel {
     protected initSearchResult(): Promise<void>;
     protected initRecommended(): Promise<void>;
     protected resetSearchCancellationTokenSource(): CancellationTokenSource;
-    protected setExtension(id: string): VSXExtension;
+    protected setExtension(id: string, version?: string): VSXExtension;
     protected doChange<T>(task: () => Promise<T>): Promise<T>;
     protected doChange<T>(task: () => Promise<T>, token: CancellationToken): Promise<T | undefined>;
     protected doUpdateSearchResult(param: VSXSearchOptions, token: CancellationToken): Promise<void>;

package/lib/browser/vsx-extensions-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-extensions-model.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vsx-extensions-model.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}

package/lib/browser/vsx-extensions-model.js

@@ -36,6 +36,8 @@ const request_1 = require("@theia/core/shared/@theia/request");
 const ovsx_client_1 = require("@theia/ovsx-client");
 const application_protocol_1 = require("@theia/core/lib/common/application-protocol");
 const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
+const plugin_ext_1 = require("@theia/plugin-ext");
+const hosted_plugin_watcher_1 = require("@theia/plugin-ext/lib/hosted/browser/hosted-plugin-watcher");
 let VSXExtensionsModel = class VSXExtensionsModel {
     constructor() {
         /**
@@ -43,9 +45,13 @@ let VSXExtensionsModel = class VSXExtensionsModel {
          */
         this.extensions = new Map();
         this.onDidChangeEmitter = new event_1.Emitter();
+        this.disabled = new Set();
+        this.uninstalled = new Set();
+        this.deployed = new Set();
         this._installed = new Set();
         this._recommended = new Set();
         this._searchResult = new Set();
+        this.builtins = new Set();
         this.searchCancellationTokenSource = new cancellation_1.CancellationTokenSource();
         this.updateSearchResult = (0, p_debounce_1.default)(async () => {
             const { token } = this.resetSearchCancellationTokenSource();
@@ -83,9 +89,21 @@ let VSXExtensionsModel = class VSXExtensionsModel {
         }
         this.updateSearchResult();
     }
+    isBuiltIn(id) {
+        return this.builtins.has(id);
+    }
     isInstalled(id) {
         return this._installed.has(id);
     }
+    isUninstalled(id) {
+        return this.uninstalled.has(id);
+    }
+    isDeployed(id) {
+        return this.deployed.has(id);
+    }
+    isDisabled(id) {
+        return this.disabled.has(id);
+    }
     getExtension(id) {
         return this.extensions.get(id);
     }
@@ -138,13 +156,15 @@ let VSXExtensionsModel = class VSXExtensionsModel {
     }
     async initInstalled() {
         await this.pluginSupport.willStart;
-        this.pluginSupport.onDidChangePlugins(() => this.updateInstalled());
         try {
             await this.updateInstalled();
         }
         catch (e) {
             console.error(e);
         }
+        this.pluginWatcher.onDidDeploy(() => {
+            this.updateInstalled();
+        });
     }
     async initSearchResult() {
         this.search.onDidChangeQuery(() => this.updateSearchResult());
@@ -173,10 +193,10 @@ let VSXExtensionsModel = class VSXExtensionsModel {
         this.searchCancellationTokenSource.cancel();
         return this.searchCancellationTokenSource = new cancellation_1.CancellationTokenSource();
     }
-    setExtension(id) {
+    setExtension(id, version) {
         let extension = this.extensions.get(id);
         if (!extension) {
-            extension = this.extensionFactory({ id });
+            extension = this.extensionFactory({ id, version, model: this });
             this.extensions.set(id, extension);
         }
         return extension;
@@ -273,19 +293,38 @@ let VSXExtensionsModel = class VSXExtensionsModel {
         }
     }
     async updateInstalled() {
+        const [deployed, uninstalled, disabled] = await Promise.all([this.pluginServer.getDeployedPluginIds(), this.pluginServer.getUninstalledPluginIds(), this.pluginServer.getDisabledPluginIds()]);
+        this.uninstalled = new Set();
+        uninstalled.forEach(id => this.uninstalled.add(plugin_ext_1.PluginIdentifiers.unversionedFromVersioned(id)));
+        this.disabled = new Set();
+        disabled.forEach(id => this.disabled.add(plugin_ext_1.PluginIdentifiers.unversionedFromVersioned(id)));
+        this.deployed = new Set();
+        deployed.forEach(id => this.deployed.add(plugin_ext_1.PluginIdentifiers.unversionedFromVersioned(id)));
         const prevInstalled = this._installed;
+        const installedVersioned = new Set();
         return this.doChange(async () => {
-            const plugins = this.pluginSupport.plugins;
             const currInstalled = new Set();
             const refreshing = [];
-            for (const plugin of plugins) {
-                if (plugin.model.engine.type === 'vscode') {
-                    const version = plugin.model.version;
-                    const id = plugin.model.id;
-                    this._installed.delete(id);
-                    const extension = this.setExtension(id);
-                    currInstalled.add(extension.id);
-                    refreshing.push(this.refresh(id, version));
+            for (const versionedId of deployed) {
+                installedVersioned.add(versionedId);
+                const idAndVersion = plugin_ext_1.PluginIdentifiers.idAndVersionFromVersionedId(versionedId);
+                if (idAndVersion) {
+                    this._installed.delete(idAndVersion.id);
+                    this.setExtension(idAndVersion.id, idAndVersion.version);
+                    currInstalled.add(idAndVersion.id);
+                    refreshing.push(this.refresh(idAndVersion.id, idAndVersion.version));
+                }
+            }
+            for (const versionedId of disabled) {
+                const idAndVersion = plugin_ext_1.PluginIdentifiers.idAndVersionFromVersionedId(versionedId);
+                installedVersioned.add(versionedId);
+                if (idAndVersion && !this.isUninstalled(idAndVersion.id)) {
+                    if (!currInstalled.has(idAndVersion.id)) {
+                        this._installed.delete(idAndVersion.id);
+                        this.setExtension(idAndVersion.id, idAndVersion.version);
+                        currInstalled.add(idAndVersion.id);
+                        refreshing.push(this.refresh(idAndVersion.id, idAndVersion.version));
+                    }
                 }
             }
             for (const id of this._installed) {
@@ -295,10 +334,35 @@ let VSXExtensionsModel = class VSXExtensionsModel {
                 }
                 refreshing.push(this.refresh(id, extension.version));
             }
+            await Promise.all(refreshing);
             const installed = new Set([...prevInstalled, ...currInstalled]);
             const installedSorted = Array.from(installed).sort((a, b) => this.compareExtensions(a, b));
             this._installed = new Set(installedSorted.values());
-            await Promise.all(refreshing);
+            const missingIds = new Set();
+            for (const id of installedVersioned) {
+                const unversionedId = plugin_ext_1.PluginIdentifiers.unversionedFromVersioned(id);
+                const plugin = this.pluginSupport.getPlugin(unversionedId);
+                if (plugin) {
+                    if (plugin.type === plugin_ext_1.PluginType.System) {
+                        this.builtins.add(unversionedId);
+                    }
+                    else {
+                        this.builtins.delete(unversionedId);
+                    }
+                }
+                else {
+                    missingIds.add(id);
+                }
+            }
+            const missing = await this.pluginServer.getDeployedPlugins([...missingIds.values()]);
+            for (const plugin of missing) {
+                if (plugin.type === plugin_ext_1.PluginType.System) {
+                    this.builtins.add(plugin_ext_1.PluginIdentifiers.componentsToUnversionedId(plugin.metadata.model));
+                }
+                else {
+                    this.builtins.delete(plugin_ext_1.PluginIdentifiers.componentsToUnversionedId(plugin.metadata.model));
+                }
+            }
         });
     }
     updateRecommended() {
@@ -307,7 +371,7 @@ let VSXExtensionsModel = class VSXExtensionsModel {
             const allUnwantedRecommendations = new Set();
             const updateRecommendationsForScope = (scope, root) => {
                 const { recommendations, unwantedRecommendations } = this.getRecommendationsForScope(scope, root);
-                recommendations.forEach(recommendation => allRecommendations.add(recommendation));
+                recommendations.forEach(recommendation => allRecommendations.add(recommendation.toLowerCase()));
                 unwantedRecommendations.forEach(unwantedRecommendation => allUnwantedRecommendations.add(unwantedRecommendation));
             };
             updateRecommendationsForScope('defaultValue'); // In case there are application-default recommendations.
@@ -392,14 +456,11 @@ let VSXExtensionsModel = class VSXExtensionsModel {
      * @param extension the extension to refresh.
      */
     shouldRefresh(extension) {
-        if (extension === undefined) {
-            return true;
-        }
-        return !extension.builtin;
+        return extension === undefined || extension.plugin === undefined;
     }
     onDidFailRefresh(id, error) {
         const cached = this.getExtension(id);
-        if (cached && cached.installed) {
+        if (cached && cached.deployed) {
             return cached;
         }
         console.error(`[${id}]: failed to refresh, reason:`, error);
@@ -434,6 +495,14 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(hosted_plugin_1.HostedPluginSupport),
     tslib_1.__metadata("design:type", hosted_plugin_1.HostedPluginSupport)
 ], VSXExtensionsModel.prototype, "pluginSupport", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(hosted_plugin_watcher_1.HostedPluginWatcher),
+    tslib_1.__metadata("design:type", hosted_plugin_watcher_1.HostedPluginWatcher)
+], VSXExtensionsModel.prototype, "pluginWatcher", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(plugin_ext_1.HostedPluginServer),
+    tslib_1.__metadata("design:type", Object)
+], VSXExtensionsModel.prototype, "pluginServer", void 0);
 tslib_1.__decorate([
     (0, inversify_1.inject)(vsx_extension_1.VSXExtensionFactory),
     tslib_1.__metadata("design:type", Function)

package/lib/browser/vsx-extensions-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-extensions-model.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vsx-extensions-model.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}

package/lib/browser/vsx-language-quick-pick-service.js

@@ -52,7 +52,7 @@ let VSXLanguageQuickPickService = class VSXLanguageQuickPickService extends lang
                                 });
                                 try {
                                     const extensionUri = plugin_vscode_uri_1.VSCodeExtensionUri.fromId(`${extension.extension.namespace}.${extension.extension.name}`).toString();
-                                    await this.pluginServer.deploy(extensionUri);
+                                    await this.pluginServer.install(extensionUri);
                                 }
                                 finally {
                                     progress.cancel();

package/lib/browser/vsx-language-quick-pick-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-language-quick-pick-service.js","sourceRoot":"","sources":["../../src/browser/vsx-language-quick-pick-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vsx-language-quick-pick-service.js","sourceRoot":"","sources":["../../src/browser/vsx-language-quick-pick-service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@theia/vsx-registry",
-  "version": "1.60.2",
+  "version": "1.61.0",
   "description": "Theia - VSX Registry",
   "dependencies": {
-    "@theia/core": "1.60.2",
-    "@theia/filesystem": "1.60.2",
-    "@theia/navigator": "1.60.2",
-    "@theia/ovsx-client": "1.60.2",
-    "@theia/plugin-ext": "1.60.2",
-    "@theia/plugin-ext-vscode": "1.60.2",
-    "@theia/preferences": "1.60.2",
-    "@theia/workspace": "1.60.2",
+    "@theia/core": "1.61.0",
+    "@theia/filesystem": "1.61.0",
+    "@theia/navigator": "1.61.0",
+    "@theia/ovsx-client": "1.61.0",
+    "@theia/plugin-ext": "1.61.0",
+    "@theia/plugin-ext-vscode": "1.61.0",
+    "@theia/preferences": "1.61.0",
+    "@theia/workspace": "1.61.0",
     "limiter": "^2.1.0",
     "luxon": "^2.4.0",
     "p-debounce": "^2.1.0",
@@ -55,11 +55,11 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.60.2",
+    "@theia/ext-scripts": "1.61.0",
     "@types/luxon": "^2.3.2"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "20a341b4c41053bfa2c6efc9ff07ac967da077f2"
+  "gitHead": "c99af52568c2e1f453c80c1b0d1fb73c3a23dcc0"
 }

package/src/browser/style/index.css

@@ -16,9 +16,7 @@
 
 :root {
   --theia-vsx-extension-icon-size: calc(var(--theia-ui-icon-font-size) * 3);
-  --theia-vsx-extension-editor-icon-size: calc(
-    var(--theia-vsx-extension-icon-size) * 3
-  );
+  --theia-vsx-extension-editor-icon-size: calc(var(--theia-vsx-extension-icon-size) * 3);
 }
 
 .vsx-search-container {
@@ -76,14 +74,14 @@
 }
 
 .theia-vsx-extension,
-.theia-vsx-extensions-view-container .part > .body {
+.theia-vsx-extensions-view-container .part>.body {
   min-height: calc(var(--theia-content-line-height) * 3);
 }
 
 .theia-vsx-extensions-search-bar {
-  padding: var(--theia-ui-padding) var(--theia-scrollbar-width)
-    var(--theia-ui-padding) 18px
-    /* expansion toggle padding of tree elements in result list */;
+  padding: var(--theia-ui-padding) var(--theia-scrollbar-width) var(--theia-ui-padding) 18px
+    /* expansion toggle padding of tree elements in result list */
+  ;
   display: flex;
   align-content: center;
 }
@@ -100,6 +98,7 @@
   border: none;
   outline: none;
 }
+
 .theia-vsx-extension {
   display: flex;
   flex-direction: row;
@@ -125,9 +124,7 @@
 .theia-vsx-extension-content {
   display: flex;
   flex-direction: column;
-  width: calc(
-    100% - var(--theia-vsx-extension-icon-size) - var(--theia-ui-padding) * 2.5
-  );
+  width: calc(100% - var(--theia-vsx-extension-icon-size) - var(--theia-ui-padding) * 2.5);
 }
 
 .theia-vsx-extension-content .title {
@@ -142,6 +139,10 @@
   font-weight: bold;
 }
 
+.theia-vsx-extension-content .disabled {
+  font-weight: bold;
+}
+
 .theia-vsx-extension-content .title .version,
 .theia-vsx-extension-content .title .stat {
   opacity: 0.85;
@@ -158,13 +159,13 @@
   align-items: center;
 }
 
-.theia-vsx-extension-content .title .stat .average-rating > i {
+.theia-vsx-extension-content .title .stat .average-rating>i {
   color: #ff8e00;
 }
 
-.theia-vsx-extension-editor .download-count > i,
-.theia-vsx-extension-content .title .stat .average-rating > i,
-.theia-vsx-extension-content .title .stat .download-count > i {
+.theia-vsx-extension-editor .download-count>i,
+.theia-vsx-extension-content .title .stat .average-rating>i,
+.theia-vsx-extension-content .title .stat .download-count>i {
   padding-right: calc(var(--theia-ui-padding) / 2);
 }
 
@@ -220,8 +221,7 @@
 
 .theia-vsx-extension-editor .header {
   display: flex;
-  padding: calc(var(--theia-ui-padding) * 3) calc(var(--theia-ui-padding) * 3)
-    calc(var(--theia-ui-padding) * 3);
+  padding: calc(var(--theia-ui-padding) * 3) calc(var(--theia-ui-padding) * 3) calc(var(--theia-ui-padding) * 3);
   flex-shrink: 0;
   border-bottom: 1px solid hsla(0, 0%, 50%, 0.5);
   width: 100%;
@@ -262,19 +262,19 @@
   border-collapse: collapse;
 }
 
-.theia-vsx-extension-editor .body table > thead > tr > th {
+.theia-vsx-extension-editor .body table>thead>tr>th {
   text-align: left;
   border-bottom: 1px solid var(--theia-extensionEditor-tableHeadBorder);
 }
 
-.theia-vsx-extension-editor .body table > thead > tr > th,
-.theia-vsx-extension-editor .body table > thead > tr > td,
-.theia-vsx-extension-editor .body table > tbody > tr > th,
-.theia-vsx-extension-editor .body table > tbody > tr > td {
+.theia-vsx-extension-editor .body table>thead>tr>th,
+.theia-vsx-extension-editor .body table>thead>tr>td,
+.theia-vsx-extension-editor .body table>tbody>tr>th,
+.theia-vsx-extension-editor .body table>tbody>tr>td {
   padding: 5px 10px;
 }
 
-.theia-vsx-extension-editor .body table > tbody > tr + tr > td {
+.theia-vsx-extension-editor .body table>tbody>tr+tr>td {
   border-top: 1px solid var(--theia-extensionEditor-tableCellBorder);
 }
 
@@ -364,7 +364,7 @@
   white-space: nowrap;
 }
 
-.theia-vsx-extension-editor .header .details .subtitle > span {
+.theia-vsx-extension-editor .header .details .subtitle>span {
   display: flex;
   align-items: center;
   cursor: pointer;
@@ -372,11 +372,7 @@
   height: var(--theia-content-line-height);
 }
 
-.theia-vsx-extension-editor
-  .header
-  .details
-  .subtitle
-  > span:not(:first-child):not(:empty) {
+.theia-vsx-extension-editor .header .details .subtitle>span:not(:first-child):not(:empty) {
   border-left: 1px solid hsla(0, 0%, 50%, 0.7);
   padding-left: calc(var(--theia-ui-padding) * 2);
   margin-left: calc(var(--theia-ui-padding) * 2);
@@ -387,26 +383,16 @@
   font-size: var(--theia-ui-font-size3);
 }
 
-.theia-vsx-extension-editor
-  .header
-  .details
-  .subtitle
-  .publisher
-  .namespace-access,
+.theia-vsx-extension-editor .header .details .subtitle .publisher .namespace-access,
 .theia-vsx-extension-editor .header .details .subtitle .download-count::before {
   padding-right: var(--theia-ui-padding);
 }
 
-.theia-vsx-extension-editor .header .details .subtitle .average-rating > i {
+.theia-vsx-extension-editor .header .details .subtitle .average-rating>i {
   color: #ff8e00;
 }
 
-.theia-vsx-extension-editor
-  .header
-  .details
-  .subtitle
-  .average-rating
-  > i:not(:first-child) {
+.theia-vsx-extension-editor .header .details .subtitle .average-rating>i:not(:first-child) {
   padding-left: calc(var(--theia-ui-padding) / 2);
 }
 

package/src/browser/vsx-extension-commands.ts

@@ -44,6 +44,14 @@ export namespace VSXExtensionsCommands {
     export const INSTALL_ANOTHER_VERSION: Command = {
         id: 'vsxExtensions.installAnotherVersion'
     };
+
+    export const DISABLE: Command = {
+        id: 'vsxExtensions.disable'
+    };
+
+    export const ENABLE: Command = {
+        id: 'vsxExtensions.enable'
+    };
     export const COPY: Command = {
         id: 'vsxExtensions.copy'
     };

package/src/browser/vsx-extension-editor-manager.ts

@@ -17,7 +17,6 @@
 import { injectable } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { WidgetOpenHandler } from '@theia/core/lib/browser';
-import { VSXExtensionOptions } from './vsx-extension';
 import { VSCodeExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
 import { VSXExtensionEditor } from './vsx-extension-editor';
 
@@ -31,7 +30,7 @@ export class VSXExtensionEditorManager extends WidgetOpenHandler<VSXExtensionEdi
         return !!id ? 500 : 0;
     }
 
-    protected createWidgetOptions(uri: URI): VSXExtensionOptions {
+    protected createWidgetOptions(uri: URI): { id: string } {
         const id = VSCodeExtensionUri.toId(uri);
         if (!id) {
             throw new Error('Invalid URI: ' + uri.toString());