@theia/vsx-registry 1.50.0 → 1.51.0

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

@@ -9,11 +9,12 @@ import { MenuModelRegistry, MessageService, SelectionService } from '@theia/core
 import { Command, CommandRegistry } from '@theia/core/lib/common/command';
 import URI from '@theia/core/lib/common/uri';
 import { FileDialogService } from '@theia/filesystem/lib/browser';
-import { OVSXApiFilter } from '@theia/ovsx-client';
+import { OVSXApiFilterProvider } from '@theia/ovsx-client';
 import { OVSXClientProvider } from '../common/ovsx-client-provider';
 import { VSXExtension } from './vsx-extension';
 import { VSXExtensionsModel } from './vsx-extensions-model';
 import { VSXExtensionsViewContainer } from './vsx-extensions-view-container';
+import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
 export declare namespace VSXCommands {
     const TOGGLE_EXTENSIONS: Command;
 }
@@ -26,7 +27,8 @@ export declare class VSXExtensionsContribution extends AbstractViewContribution<
     protected clipboardService: ClipboardService;
     protected preferenceService: PreferenceService;
     protected clientProvider: OVSXClientProvider;
-    protected vsxApiFilter: OVSXApiFilter;
+    protected vsxApiFilter: OVSXApiFilterProvider;
+    protected applicationServer: ApplicationServer;
     protected quickInput: QuickInputService;
     protected readonly selectionService: SelectionService;
     constructor();

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

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

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

@@ -37,6 +37,7 @@ const vsx_extension_commands_1 = require("./vsx-extension-commands");
 const vsx_extensions_model_1 = require("./vsx-extensions-model");
 const vsx_extensions_search_model_1 = require("./vsx-extensions-search-model");
 const vsx_extensions_view_container_1 = require("./vsx-extensions-view-container");
+const application_protocol_1 = require("@theia/core/lib/common/application-protocol");
 const debounce = require("@theia/core/shared/lodash.debounce");
 var VSXCommands;
 (function (VSXCommands) {
@@ -217,8 +218,14 @@ let VSXExtensionsContribution = class VSXExtensionsContribution extends view_con
         const extensionId = extension.id;
         const currentVersion = extension.version;
         const client = await this.clientProvider();
+        const filter = await this.vsxApiFilter();
+        const targetPlatform = await this.applicationServer.getApplicationPlatform();
         const { extensions } = await client.query({ extensionId, includeAllVersions: true });
-        const latestCompatible = this.vsxApiFilter.getLatestCompatibleExtension(extensions);
+        const latestCompatible = await filter.findLatestCompatibleExtension({
+            extensionId,
+            includeAllVersions: true,
+            targetPlatform
+        });
         let compatibleExtensions = [];
         let activeItem = undefined;
         if (latestCompatible) {
@@ -347,9 +354,13 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function)
 ], VSXExtensionsContribution.prototype, "clientProvider", void 0);
 tslib_1.__decorate([
-    (0, inversify_1.inject)(ovsx_client_1.OVSXApiFilter),
-    tslib_1.__metadata("design:type", Object)
+    (0, inversify_1.inject)(ovsx_client_1.OVSXApiFilterProvider),
+    tslib_1.__metadata("design:type", Function)
 ], VSXExtensionsContribution.prototype, "vsxApiFilter", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(application_protocol_1.ApplicationServer),
+    tslib_1.__metadata("design:type", Object)
+], VSXExtensionsContribution.prototype, "applicationServer", void 0);
 tslib_1.__decorate([
     (0, inversify_1.inject)(browser_1.QuickInputService),
     tslib_1.__metadata("design:type", Object)

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

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

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

@@ -11,7 +11,8 @@ import URI from '@theia/core/lib/common/uri';
 import { OVSXClient, VSXAllVersions, VSXSearchEntry, VSXSearchOptions } from '@theia/ovsx-client/lib/ovsx-types';
 import { OVSXClientProvider } from '../common/ovsx-client-provider';
 import { RequestService } from '@theia/core/shared/@theia/request';
-import { OVSXApiFilter } from '@theia/ovsx-client';
+import { OVSXApiFilterProvider } from '@theia/ovsx-client';
+import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
 export declare class VSXExtensionsModel {
     protected initialized: Promise<void>;
     /**
@@ -33,7 +34,8 @@ export declare class VSXExtensionsModel {
     protected readonly workspaceService: WorkspaceService;
     readonly search: VSXExtensionsSearchModel;
     protected request: RequestService;
-    protected vsxApiFilter: OVSXApiFilter;
+    protected vsxApiFilter: OVSXApiFilterProvider;
+    protected readonly applicationServer: ApplicationServer;
     protected init(): void;
     protected doInit(): Promise<void>;
     get onDidChange(): Event<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

@@ -33,6 +33,7 @@ const ovsx_types_1 = require("@theia/ovsx-client/lib/ovsx-types");
 const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
 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");
 let VSXExtensionsModel = class VSXExtensionsModel {
     constructor() {
         /**
@@ -173,6 +174,7 @@ let VSXExtensionsModel = class VSXExtensionsModel {
                 return;
             }
             const client = await this.clientProvider();
+            const filter = await this.vsxApiFilter();
             const result = await client.search(param);
             this._searchError = result.error;
             if (token.isCancellationRequested) {
@@ -180,7 +182,7 @@ let VSXExtensionsModel = class VSXExtensionsModel {
             }
             for (const data of result.extensions) {
                 const id = data.namespace.toLowerCase() + '.' + data.name.toLowerCase();
-                const allVersions = this.vsxApiFilter.getLatestCompatibleVersion(data);
+                const allVersions = filter.getLatestCompatibleVersion(data);
                 if (!allVersions) {
                     continue;
                 }
@@ -209,10 +211,11 @@ let VSXExtensionsModel = class VSXExtensionsModel {
         }, token);
     }
     async fetchVerifiedStatus(id, client, allVersions) {
-        var _a, _b;
+        var _a;
         const res = await client.query({ extensionId: id, extensionVersion: allVersions.version, includeAllVersions: true });
-        let verified = (_a = res.extensions) === null || _a === void 0 ? void 0 : _a[0].verified;
-        if (!verified && ((_b = res.extensions) === null || _b === void 0 ? void 0 : _b[0].publishedBy.loginName) === 'open-vsx') {
+        const extension = (_a = res.extensions) === null || _a === void 0 ? void 0 : _a[0];
+        let verified = extension === null || extension === void 0 ? void 0 : extension.verified;
+        if (!verified && (extension === null || extension === void 0 ? void 0 : extension.publishedBy.loginName) === 'open-vsx') {
             verified = true;
         }
         return verified;
@@ -302,19 +305,23 @@ let VSXExtensionsModel = class VSXExtensionsModel {
             if (!this.shouldRefresh(extension)) {
                 return extension;
             }
-            const client = await this.clientProvider();
+            const filter = await this.vsxApiFilter();
+            const targetPlatform = await this.applicationServer.getApplicationPlatform();
             let data;
             if (version === undefined) {
-                const { extensions } = await client.query({ extensionId: id, includeAllVersions: true });
-                if (extensions === null || extensions === void 0 ? void 0 : extensions.length) {
-                    data = this.vsxApiFilter.getLatestCompatibleExtension(extensions);
-                }
+                data = await filter.findLatestCompatibleExtension({
+                    extensionId: id,
+                    includeAllVersions: true,
+                    targetPlatform
+                });
             }
             else {
-                const { extensions } = await client.query({ extensionId: id, extensionVersion: version, includeAllVersions: true });
-                if (extensions === null || extensions === void 0 ? void 0 : extensions.length) {
-                    data = extensions === null || extensions === void 0 ? void 0 : extensions[0];
-                }
+                data = await filter.findLatestCompatibleExtension({
+                    extensionId: id,
+                    extensionVersion: version,
+                    includeAllVersions: true,
+                    targetPlatform
+                });
             }
             if (!data) {
                 return;
@@ -415,9 +422,13 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Object)
 ], VSXExtensionsModel.prototype, "request", void 0);
 tslib_1.__decorate([
-    (0, inversify_1.inject)(ovsx_client_1.OVSXApiFilter),
-    tslib_1.__metadata("design:type", Object)
+    (0, inversify_1.inject)(ovsx_client_1.OVSXApiFilterProvider),
+    tslib_1.__metadata("design:type", Function)
 ], VSXExtensionsModel.prototype, "vsxApiFilter", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(application_protocol_1.ApplicationServer),
+    tslib_1.__metadata("design:type", Object)
+], VSXExtensionsModel.prototype, "applicationServer", void 0);
 tslib_1.__decorate([
     (0, inversify_1.postConstruct)(),
     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":";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,4DAAiF;AACjF,2CAAkC;AAClC,6DAA6D;AAC7D,0DAA0D;AAC1D,wDAA8D;AAC9D,sEAAiG;AACjG,sFAAyF;AACzF,mDAAoE;AACpE,8EAA0E;AAC1E,+EAAyE;AACzE,qDAAuF;AACvF,0DAAgE;AAGhE,kEAAoJ;AACpJ,yEAAoE;AACpE,+DAAmF;AACnF,oDAAmD;AAG5C,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QAGH;;WAEG;QACgB,eAAU,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC7C,uBAAkB,GAAG,IAAI,eAAO,EAAQ,CAAC;QAClD,eAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QAC/B,iBAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACjC,kBAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QAGlC,kCAA6B,GAAG,IAAI,sCAAuB,EAAE,CAAC;QAC9D,uBAAkB,GAAG,IAAA,oBAAQ,EAAC,KAAK,IAAI,EAAE;YAC/C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,kCAAkC,EAAE,CAAC;YAC5D,MAAM,IAAI,CAAC,oBAAoB,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;QACnG,CAAC,EAAE,GAAG,CAAC,CAAC;IA8XZ,CAAC;IAhWa,IAAI;QACV,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC;IAES,KAAK,CAAC,MAAM;QAClB,MAAM,OAAO,CAAC,GAAG,CAAC;YACd,IAAI,CAAC,aAAa,EAAE;YACpB,IAAI,CAAC,gBAAgB,EAAE;YACvB,IAAI,CAAC,eAAe,EAAE;SACzB,CAAC,CAAC;IACP,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;IACzC,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;IACtC,CAAC;IAED,6BAA6B,CAAC,IAAa;QACvC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,uCAAuC,CAAC,KAAK,IAAI,EAAE,CAAC;YACzE,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,uCAAuC,EAAE,IAAI,CAAC,CAAC;QAChF,CAAC;QACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC9B,CAAC;IAED,WAAW,CAAC,EAAU;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,YAAY,CAAC,EAAU;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,CAAC,EAAU;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC5B,MAAM,IAAI,CAAC,WAAW,CAAC;YACvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACzC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;YAC1D,CAAC;YACD,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;gBACtB,IAAI,CAAC;oBACD,MAAM,SAAS,GAAG,wBAAc,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;oBAClG,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;oBAC7C,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;gBACjC,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,IAAI,CAAC,6BAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;wBAClD,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,sCAAsC,EAAE,CAAC,CAAC,CAAC;oBACnE,CAAC;gBACL,CAAC;YACL,CAAC;YACD,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,aAAa;QACzB,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC;IACL,CAAC;IAES,KAAK,CAAC,gBAAgB;QAC5B,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACpC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC;IACL,CAAC;IAES,KAAK,CAAC,eAAe;QAC3B,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE;YAC1C,IAAI,MAAM,CAAC,cAAc,KAAK,YAAY,EAAE,CAAC;gBACzC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC7B,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAC7B,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACnC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC;IACL,CAAC;IAES,kCAAkC;QACxC,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC,6BAA6B,GAAG,IAAI,sCAAuB,EAAE,CAAC;IAC9E,CAAC;IAES,YAAY,CAAC,EAAU;QAC7B,IAAI,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAIS,QAAQ,CAAI,IAAsB,EAAE,QAA2B,gCAAiB,CAAC,IAAI;QAC3F,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,IAAI,EAAE;YAClE,IAAI,KAAK,IAAI,KAAK,CAAC,uBAAuB,EAAE,CAAC;gBACzC,OAAO;YACX,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;YAC5B,IAAI,KAAK,IAAI,KAAK,CAAC,uBAAuB,EAAE,CAAC;gBACzC,OAAO;YACX,CAAC;YACD,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC,CAAC;IACP,CAAC;IAES,oBAAoB,CAAC,KAAuB,EAAE,KAAwB;QAC5E,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC5B,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;YACvC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;gBACf,OAAO;YACX,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC;YACjC,IAAI,KAAK,CAAC,uBAAuB,EAAE,CAAC;gBAChC,OAAO;YACX,CAAC;YACD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;gBACnC,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACxE,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;gBACvE,IAAI,CAAC,WAAW,EAAE,CAAC;oBACf,SAAS;gBACb,CAAC;gBACD,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,uCAAuC,CAAC,EAAE,CAAC;oBAChE,IAAI,CAAC,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;wBAC9D,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;4BACf,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;4BACtD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;wBAC7B,CAAC,CAAC,CAAC;oBACP,CAAC,CAAC,CAAC;gBACP,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC;oBAC1C,IAAI,CAAC,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;wBAC9D,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;4BACf,IAAI,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;4BACtC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;4BAClC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;gCAC3B,QAAQ,EAAE,QAAQ;6BACrB,CAAC,CAAC,CAAC;4BACJ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;wBAC7B,CAAC,CAAC,CAAC;oBACP,CAAC,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;QACL,CAAC,EAAE,KAAK,CAAC,CAAC;IACd,CAAC;IAES,KAAK,CAAC,mBAAmB,CAAC,EAAU,EAAE,MAAkB,EAAE,WAA2B;;QAC3F,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,gBAAgB,EAAE,WAAW,CAAC,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QACrH,IAAI,QAAQ,GAAG,MAAA,GAAG,CAAC,UAAU,0CAAG,CAAC,EAAE,QAAQ,CAAC;QAC5C,IAAI,CAAC,QAAQ,IAAI,CAAA,MAAA,GAAG,CAAC,UAAU,0CAAG,CAAC,EAAE,WAAW,CAAC,SAAS,MAAK,UAAU,EAAE,CAAC;YACxE,QAAQ,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAES,aAAa,CAAC,IAAoB,EAAE,EAAU,EAAE,WAA2B,EAAE,QAAkB;QACrG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,uCAAuC,CAAC,IAAI,QAAQ,EAAE,CAAC;YAC7E,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACxC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;gBACjC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAChC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBACxB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;gBAC5B,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;gBAC9B,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,QAAQ,EAAE,QAAQ;aACrB,CAAC,CAAC,CAAC;YACJ,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC;IACL,CAAC;IAES,KAAK,CAAC,eAAe;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC;QACtC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;YAC3C,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;YACxC,MAAM,UAAU,GAAG,EAAE,CAAC;YACtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACxC,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;oBACrC,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC3B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;oBACxC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;oBAChC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;gBAC/C,CAAC;YACL,CAAC;YACD,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;gBACxC,IAAI,CAAC,SAAS,EAAE,CAAC;oBAAC,SAAS;gBAAC,CAAC;gBAC7B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;YACzD,CAAC;YACD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,aAAa,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC;YAChE,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3F,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;YACpD,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACP,CAAC;IAES,iBAAiB;QACvB,OAAO,IAAI,CAAC,QAAQ,CAAkC,KAAK,IAAI,EAAE;YAC7D,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;YAC7C,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAAU,CAAC;YAErD,MAAM,6BAA6B,GAAG,CAAC,KAAgC,EAAE,IAAU,EAAE,EAAE;gBACnF,MAAM,EAAE,eAAe,EAAE,uBAAuB,EAAE,GAAG,IAAI,CAAC,0BAA0B,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBAClG,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;gBAClF,uBAAuB,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC,0BAA0B,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC;YACtH,CAAC,CAAC;YAEF,6BAA6B,CAAC,cAAc,CAAC,CAAC,CAAC,yDAAyD;YACxG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;YAChD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACvB,6BAA6B,CAAC,sBAAsB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzE,CAAC;YACD,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;gBAC9B,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;YACpD,CAAC;YACD,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/G,0BAA0B,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC;YAC/G,IAAI,CAAC,YAAY,GAAG,iBAAiB,CAAC;YACtC,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;IACP,CAAC;IAES,0BAA0B,CAAC,KAAgC,EAAE,IAAU;;QAC7E,MAAM,eAAe,GAAG,MAAA,IAAI,CAAC,WAAW,CAAC,OAAO,CAAkC,YAAY,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EAAE,CAAC,0CAAG,KAAK,CAAC,CAAC;QAC3H,OAAO;YACH,eAAe,EAAE,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,eAAe,mCAAI,EAAE;YACvD,uBAAuB,EAAE,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,uBAAuB,mCAAI,EAAE;SAC1E,CAAC;IACN,CAAC;IAES,aAAa,CAAC,cAAsB;QAC1C,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACrE,OAAO,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,EAAU,EAAE,OAAgB;QAChD,IAAI,CAAC;YACD,IAAI,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACtC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;gBACjC,OAAO,SAAS,CAAC;YACrB,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC3C,IAAI,IAAiC,CAAC;YACtC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBACxB,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;gBACzF,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,EAAE,CAAC;oBACrB,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC;gBACtE,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,gBAAgB,EAAE,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;gBACpH,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,EAAE,CAAC;oBACrB,IAAI,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,CAAC,CAAC,CAAC;gBAC3B,CAAC;YACL,CAAC;YACD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,OAAO;YACX,CAAC;YACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACjB,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;oBAC5C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACzB,CAAC;YACL,CAAC;YACD,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAClC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;gBACjC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAChC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBACxB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;gBAC5B,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;gBAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aAC1B,CAAC,CAAC,CAAC;YACJ,OAAO,SAAS,CAAC;QACrB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACxC,CAAC;IACL,CAAC;IAED;;;OAGG;IACO,aAAa,CAAC,SAAwB;QAC5C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC;IAC9B,CAAC;IAES,gBAAgB,CAAC,EAAU,EAAE,KAAc;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACrC,IAAI,MAAM,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YAC7B,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,+BAA+B,EAAE,KAAK,CAAC,CAAC;QAC5D,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;;;OAIG;IACO,iBAAiB,CAAC,CAAS,EAAE,CAAS;QAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;YAC7B,OAAO,CAAC,CAAC;QACb,CAAC;QACD,IAAI,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;YACnD,OAAO,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,UAAU,CAAC,SAAS,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;YAC/C,OAAO,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACpE,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;CAEJ,CAAA;AA/YY,gDAAkB;AAoBjB;IADT,IAAA,kBAAM,EAAC,yCAAkB,CAAC;;0DACkB;AAG1B;IADlB,IAAA,kBAAM,EAAC,mCAAmB,CAAC;sCACM,mCAAmB;yDAAC;AAGnC;IADlB,IAAA,kBAAM,EAAC,mCAAmB,CAAC;;4DAC6B;AAGtC;IADlB,IAAA,kBAAM,EAAC,kCAAe,CAAC;sCACY,kCAAe;2DAAC;AAGjC;IADlB,IAAA,kBAAM,EAAC,2BAAiB,CAAC;;uDACwB;AAG/B;IADlB,IAAA,kBAAM,EAAC,0BAAgB,CAAC;sCACY,0BAAgB;4DAAC;AAG7C;IADR,IAAA,kBAAM,EAAC,sDAAwB,CAAC;sCAChB,sDAAwB;kDAAC;AAGhC;IADT,IAAA,kBAAM,EAAC,wBAAc,CAAC;;mDACW;AAGxB;IADT,IAAA,kBAAM,EAAC,2BAAa,CAAC;;wDACgB;AAG5B;IADT,IAAA,yBAAa,GAAE;;;;8CAGf;6BAjDQ,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CA+Y9B"}
+{"version":3,"file":"vsx-extensions-model.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-model.ts"],"names":[],"mappings":"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"}

package/lib/common/vsx-registry-common-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-registry-common-module.d.ts","sourceRoot":"","sources":["../../src/common/vsx-registry-common-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAM/D,wBAwCG"}
+{"version":3,"file":"vsx-registry-common-module.d.ts","sourceRoot":"","sources":["../../src/common/vsx-registry-common-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAQ/D,wBAqDG"}

package/lib/common/vsx-registry-common-module.js

@@ -48,11 +48,24 @@ exports.default = new inversify_1.ContainerModule(bind => {
     bind(ovsx_client_1.OVSXApiFilter)
         .toDynamicValue(ctx => {
         const vsxEnvironment = ctx.container.get(vsx_environment_1.VSXEnvironment);
-        const apiFilter = new ovsx_client_1.OVSXApiFilterImpl('-- temporary invalid version value --');
+        const apiFilter = new ovsx_client_1.OVSXApiFilterImpl(undefined, '-- temporary invalid version value --');
         vsxEnvironment.getVscodeApiVersion()
             .then(apiVersion => apiFilter.supportedApiVersion = apiVersion);
+        const clientProvider = ctx.container.get(common_1.OVSXClientProvider);
+        Promise.resolve(clientProvider()).then(client => {
+            apiFilter.client = client;
+        });
         return apiFilter;
     })
         .inSingletonScope();
+    bind(ovsx_client_1.OVSXApiFilterProvider)
+        .toProvider(ctx => async () => {
+        const vsxEnvironment = ctx.container.get(vsx_environment_1.VSXEnvironment);
+        const clientProvider = ctx.container.get(common_1.OVSXClientProvider);
+        const client = await clientProvider();
+        const apiVersion = await vsxEnvironment.getVscodeApiVersion();
+        const apiFilter = new ovsx_client_1.OVSXApiFilterImpl(client, apiVersion);
+        return apiFilter;
+    });
 });
 //# sourceMappingURL=vsx-registry-common-module.js.map

package/lib/common/vsx-registry-common-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-registry-common-module.js","sourceRoot":"","sources":["../../src/common/vsx-registry-common-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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,4DAA+D;AAC/D,sCAAgE;AAChE,+DAAmE;AACnE,oDAAmL;AACnL,uDAAmD;AAEnD,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,wBAAe,CAAC;SAChB,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,2BAAkB,CAAC;SACnB,cAAc,CAAC,GAAG,CAAC,EAAE;;QAClB,MAAM,cAAc,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAiB,gCAAc,CAAC,CAAC;QACzE,MAAM,cAAc,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAiB,wBAAc,CAAC,CAAC;QACzE,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,wBAAe,CAAC,CAAC;QACvD,MAAM,aAAa,GAAG,OAAO;aACxB,GAAG,CAAC;YACD,cAAc,CAAC,iBAAiB,EAAE;YAClC,MAAA,cAAc,CAAC,mBAAmB,8DAAI;SACzC,CAAC;aACD,IAAI,CAAa,KAAK,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE,EAAE;YACnD,IAAI,gBAAgB,EAAE,CAAC;gBACnB,MAAM,aAAa,GAAG,4BAAc,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;gBACzE,OAAO,8BAAgB,CAAC,UAAU,CAC9B,gBAAgB,EAChB,KAAK,EAAC,GAAG,EAAC,EAAE,CAAC,aAAa,CAAC,MAAM,WAAW,CAAC,GAAG,CAAC,CAAC,EAClD,CAAC,0CAA4B,EAAE,6CAA+B,CAAC,CAClE,CAAC;YACN,CAAC;YACD,OAAO,IAAI,4BAAc,CACrB,MAAM,WAAW,CAAC,MAAM,CAAC,EACzB,cAAc,CACjB,CAAC;QACN,CAAC,CAAC,CAAC;QACP,0DAA0D;QAC1D,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC;IAC/B,CAAC,CAAC;SACD,gBAAgB,EAAE,CAAC;IACxB,IAAI,CAAC,2BAAa,CAAC;SACd,cAAc,CAAC,GAAG,CAAC,EAAE;QAClB,MAAM,cAAc,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAiB,gCAAc,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,IAAI,+BAAiB,CAAC,uCAAuC,CAAC,CAAC;QACjF,cAAc,CAAC,mBAAmB,EAAE;aAC/B,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,mBAAmB,GAAG,UAAU,CAAC,CAAC;QACpE,OAAO,SAAS,CAAC;IACrB,CAAC,CAAC;SACD,gBAAgB,EAAE,CAAC;AAC5B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"vsx-registry-common-module.js","sourceRoot":"","sources":["../../src/common/vsx-registry-common-module.ts"],"names":[],"mappings":"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"}

package/lib/node/vsx-extension-resolver.d.ts

@@ -1,6 +1,6 @@
 import { PluginDeployerHandler, PluginDeployerResolver, PluginDeployerResolverContext, PluginDeployOptions } from '@theia/plugin-ext/lib/common/plugin-protocol';
 import { OVSXClientProvider } from '../common/ovsx-client-provider';
-import { OVSXApiFilter, VSXExtensionRaw } from '@theia/ovsx-client';
+import { OVSXApiFilterProvider, VSXExtensionRaw, VSXTargetPlatform } from '@theia/ovsx-client';
 import { RequestService } from '@theia/core/shared/@theia/request';
 import { PluginVSCodeEnvironment } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-environment';
 import { PluginUninstallationManager } from '@theia/plugin-ext/lib/main/node/plugin-uninstallation-manager';
@@ -10,9 +10,10 @@ export declare class VSXExtensionResolver implements PluginDeployerResolver {
     protected requestService: RequestService;
     protected readonly environment: PluginVSCodeEnvironment;
     protected readonly uninstallationManager: PluginUninstallationManager;
-    protected vsxApiFilter: OVSXApiFilter;
+    protected vsxApiFilter: OVSXApiFilterProvider;
     accept(pluginId: string): boolean;
     static readonly TEMP_DIR_PREFIX = "vscode-download";
+    static readonly TARGET_PLATFORM: VSXTargetPlatform;
     resolve(context: PluginDeployerResolverContext, options?: PluginDeployOptions): Promise<void>;
     protected getTempDir(): Promise<string>;
     protected hasSameOrNewerVersion(id: string, extension: VSXExtensionRaw): string | undefined;

package/lib/node/vsx-extension-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vsx-extension-resolver.d.ts","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,mBAAmB,EAAqB,MAAM,8CAA8C,CAAC;AAGpL,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,2BAA2B,EAAE,MAAM,+DAA+D,CAAC;AAE5G,qBACa,oBAAqB,YAAW,sBAAsB;IAEnC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAC1C,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAC9D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,uBAAuB,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;IACpF,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC;IAE7D,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIjC,MAAM,CAAC,QAAQ,CAAC,eAAe,qBAAqB;IAE9C,OAAO,CAAC,OAAO,EAAE,6BAA6B,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;cA8CnF,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAQ7C,SAAS,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS;cAa3E,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAYxF"}
+{"version":3,"file":"vsx-extension-resolver.d.ts","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,mBAAmB,EAAqB,MAAM,8CAA8C,CAAC;AAGpL,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,2BAA2B,EAAE,MAAM,+DAA+D,CAAC;AAE5G,qBACa,oBAAqB,YAAW,sBAAsB;IAEnC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAC1C,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAC9D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,uBAAuB,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;IAC5E,SAAS,CAAC,YAAY,EAAE,qBAAqB,CAAC;IAE7E,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIjC,MAAM,CAAC,QAAQ,CAAC,eAAe,qBAAqB;IACpD,MAAM,CAAC,QAAQ,CAAC,eAAe,oBAA8D;IAEvF,OAAO,CAAC,OAAO,EAAE,6BAA6B,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;cAqDnF,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAQ7C,SAAS,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS;cAa3E,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAYxF"}

package/lib/node/vsx-extension-resolver.js

@@ -41,17 +41,24 @@ let VSXExtensionResolver = VSXExtensionResolver_1 = class VSXExtensionResolver {
             return;
         }
         let extension;
-        const client = await this.clientProvider();
+        const filter = await this.vsxApiFilter();
         const version = (options === null || options === void 0 ? void 0 : options.version) || id.version;
         if (version) {
             console.log(`[${id}]: trying to resolve version ${version}...`);
-            const { extensions } = await client.query({ extensionId: id.id, extensionVersion: version, includeAllVersions: true });
-            extension = extensions[0];
+            extension = await filter.findLatestCompatibleExtension({
+                extensionId: id.id,
+                extensionVersion: version,
+                includeAllVersions: true,
+                targetPlatform: VSXExtensionResolver_1.TARGET_PLATFORM
+            });
         }
         else {
             console.log(`[${id}]: trying to resolve latest version...`);
-            const { extensions } = await client.query({ extensionId: id.id, includeAllVersions: true });
-            extension = this.vsxApiFilter.getLatestCompatibleExtension(extensions);
+            extension = await filter.findLatestCompatibleExtension({
+                extensionId: id.id,
+                includeAllVersions: true,
+                targetPlatform: VSXExtensionResolver_1.TARGET_PLATFORM
+            });
         }
         if (!extension) {
             return;
@@ -118,6 +125,7 @@ let VSXExtensionResolver = VSXExtensionResolver_1 = class VSXExtensionResolver {
 };
 exports.VSXExtensionResolver = VSXExtensionResolver;
 VSXExtensionResolver.TEMP_DIR_PREFIX = 'vscode-download';
+VSXExtensionResolver.TARGET_PLATFORM = `${process.platform}-${process.arch}`;
 tslib_1.__decorate([
     (0, inversify_1.inject)(ovsx_client_provider_1.OVSXClientProvider),
     tslib_1.__metadata("design:type", Function)
@@ -139,8 +147,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", plugin_uninstallation_manager_1.PluginUninstallationManager)
 ], VSXExtensionResolver.prototype, "uninstallationManager", void 0);
 tslib_1.__decorate([
-    (0, inversify_1.inject)(ovsx_client_1.OVSXApiFilter),
-    tslib_1.__metadata("design:type", Object)
+    (0, inversify_1.inject)(ovsx_client_1.OVSXApiFilterProvider),
+    tslib_1.__metadata("design:type", Function)
 ], VSXExtensionResolver.prototype, "vsxApiFilter", void 0);
 exports.VSXExtensionResolver = VSXExtensionResolver = VSXExtensionResolver_1 = tslib_1.__decorate([
     (0, inversify_1.injectable)()

package/lib/node/vsx-extension-resolver.js.map

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

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@theia/vsx-registry",
-  "version": "1.50.0",
+  "version": "1.51.0",
   "description": "Theia - VSX Registry",
   "dependencies": {
-    "@theia/core": "1.50.0",
-    "@theia/filesystem": "1.50.0",
-    "@theia/navigator": "1.50.0",
-    "@theia/ovsx-client": "1.50.0",
-    "@theia/plugin-ext": "1.50.0",
-    "@theia/plugin-ext-vscode": "1.50.0",
-    "@theia/preferences": "1.50.0",
-    "@theia/workspace": "1.50.0",
+    "@theia/core": "1.51.0",
+    "@theia/filesystem": "1.51.0",
+    "@theia/navigator": "1.51.0",
+    "@theia/ovsx-client": "1.51.0",
+    "@theia/plugin-ext": "1.51.0",
+    "@theia/plugin-ext-vscode": "1.51.0",
+    "@theia/preferences": "1.51.0",
+    "@theia/workspace": "1.51.0",
     "luxon": "^2.4.0",
     "p-debounce": "^2.1.0",
     "semver": "^7.5.4",
@@ -54,11 +54,11 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.50.0",
+    "@theia/ext-scripts": "1.51.0",
     "@types/luxon": "^2.3.2"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "63585530b2e32af0ed4bac4edb5ff443bfc248b7"
+  "gitHead": "fe70ec5d445d733038564d81357c78aedf5c7e0e"
 }

package/src/browser/vsx-extensions-contribution.ts

@@ -29,7 +29,7 @@ import { UriAwareCommandHandler } from '@theia/core/lib/common/uri-command-handl
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
 import { FileDialogService, OpenFileDialogProps } from '@theia/filesystem/lib/browser';
 import { NAVIGATOR_CONTEXT_MENU } from '@theia/navigator/lib/browser/navigator-contribution';
-import { OVSXApiFilter, VSXExtensionRaw } from '@theia/ovsx-client';
+import { OVSXApiFilterProvider, VSXExtensionRaw } from '@theia/ovsx-client';
 import { VscodeCommands } from '@theia/plugin-ext-vscode/lib/browser/plugin-vscode-commands-contribution';
 import { DateTime } from 'luxon';
 import { OVSXClientProvider } from '../common/ovsx-client-provider';
@@ -39,6 +39,7 @@ import { VSXExtensionsCommands } from './vsx-extension-commands';
 import { VSXExtensionsModel } from './vsx-extensions-model';
 import { BUILTIN_QUERY, INSTALLED_QUERY, RECOMMENDED_QUERY } from './vsx-extensions-search-model';
 import { VSXExtensionsViewContainer } from './vsx-extensions-view-container';
+import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
 import debounce = require('@theia/core/shared/lodash.debounce');
 
 export namespace VSXCommands {
@@ -58,7 +59,8 @@ export class VSXExtensionsContribution extends AbstractViewContribution<VSXExten
     @inject(ClipboardService) protected clipboardService: ClipboardService;
     @inject(PreferenceService) protected preferenceService: PreferenceService;
     @inject(OVSXClientProvider) protected clientProvider: OVSXClientProvider;
-    @inject(OVSXApiFilter) protected vsxApiFilter: OVSXApiFilter;
+    @inject(OVSXApiFilterProvider) protected vsxApiFilter: OVSXApiFilterProvider;
+    @inject(ApplicationServer) protected applicationServer: ApplicationServer;
     @inject(QuickInputService) protected quickInput: QuickInputService;
     @inject(SelectionService) protected readonly selectionService: SelectionService;
 
@@ -259,8 +261,14 @@ export class VSXExtensionsContribution extends AbstractViewContribution<VSXExten
         const extensionId = extension.id;
         const currentVersion = extension.version;
         const client = await this.clientProvider();
+        const filter = await this.vsxApiFilter();
+        const targetPlatform = await this.applicationServer.getApplicationPlatform();
         const { extensions } = await client.query({ extensionId, includeAllVersions: true });
-        const latestCompatible = this.vsxApiFilter.getLatestCompatibleExtension(extensions);
+        const latestCompatible = await filter.findLatestCompatibleExtension({
+            extensionId,
+            includeAllVersions: true,
+            targetPlatform
+        });
         let compatibleExtensions: VSXExtensionRaw[] = [];
         let activeItem = undefined;
         if (latestCompatible) {

package/src/browser/vsx-extensions-model.ts

@@ -28,10 +28,11 @@ import { PreferenceInspectionScope, PreferenceService } from '@theia/core/lib/br
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { RecommendedExtensions } from './recommended-extensions/recommended-extensions-preference-contribution';
 import URI from '@theia/core/lib/common/uri';
-import { OVSXClient, VSXAllVersions, VSXExtensionRaw, VSXResponseError, VSXSearchEntry, VSXSearchOptions } from '@theia/ovsx-client/lib/ovsx-types';
+import { OVSXClient, VSXAllVersions, VSXExtensionRaw, VSXResponseError, VSXSearchEntry, VSXSearchOptions, VSXTargetPlatform } from '@theia/ovsx-client/lib/ovsx-types';
 import { OVSXClientProvider } from '../common/ovsx-client-provider';
 import { RequestContext, RequestService } from '@theia/core/shared/@theia/request';
-import { OVSXApiFilter } from '@theia/ovsx-client';
+import { OVSXApiFilterProvider } from '@theia/ovsx-client';
+import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
 
 @injectable()
 export class VSXExtensionsModel {
@@ -77,8 +78,11 @@ export class VSXExtensionsModel {
     @inject(RequestService)
     protected request: RequestService;
 
-    @inject(OVSXApiFilter)
-    protected vsxApiFilter: OVSXApiFilter;
+    @inject(OVSXApiFilterProvider)
+    protected vsxApiFilter: OVSXApiFilterProvider;
+
+    @inject(ApplicationServer)
+    protected readonly applicationServer: ApplicationServer;
 
     @postConstruct()
     protected init(): void {
@@ -220,6 +224,7 @@ export class VSXExtensionsModel {
                 return;
             }
             const client = await this.clientProvider();
+            const filter = await this.vsxApiFilter();
             const result = await client.search(param);
             this._searchError = result.error;
             if (token.isCancellationRequested) {
@@ -227,7 +232,7 @@ export class VSXExtensionsModel {
             }
             for (const data of result.extensions) {
                 const id = data.namespace.toLowerCase() + '.' + data.name.toLowerCase();
-                const allVersions = this.vsxApiFilter.getLatestCompatibleVersion(data);
+                const allVersions = filter.getLatestCompatibleVersion(data);
                 if (!allVersions) {
                     continue;
                 }
@@ -257,8 +262,9 @@ export class VSXExtensionsModel {
 
     protected async fetchVerifiedStatus(id: string, client: OVSXClient, allVersions: VSXAllVersions): Promise<boolean | undefined> {
         const res = await client.query({ extensionId: id, extensionVersion: allVersions.version, includeAllVersions: true });
-        let verified = res.extensions?.[0].verified;
-        if (!verified && res.extensions?.[0].publishedBy.loginName === 'open-vsx') {
+        const extension = res.extensions?.[0];
+        let verified = extension?.verified;
+        if (!verified && extension?.publishedBy.loginName === 'open-vsx') {
             verified = true;
         }
         return verified;
@@ -353,18 +359,22 @@ export class VSXExtensionsModel {
             if (!this.shouldRefresh(extension)) {
                 return extension;
             }
-            const client = await this.clientProvider();
+            const filter = await this.vsxApiFilter();
+            const targetPlatform = await this.applicationServer.getApplicationPlatform() as VSXTargetPlatform;
             let data: VSXExtensionRaw | undefined;
             if (version === undefined) {
-                const { extensions } = await client.query({ extensionId: id, includeAllVersions: true });
-                if (extensions?.length) {
-                    data = this.vsxApiFilter.getLatestCompatibleExtension(extensions);
-                }
+                data = await filter.findLatestCompatibleExtension({
+                    extensionId: id,
+                    includeAllVersions: true,
+                    targetPlatform
+                });
             } else {
-                const { extensions } = await client.query({ extensionId: id, extensionVersion: version, includeAllVersions: true });
-                if (extensions?.length) {
-                    data = extensions?.[0];
-                }
+                data = await filter.findLatestCompatibleExtension({
+                    extensionId: id,
+                    extensionVersion: version,
+                    includeAllVersions: true,
+                    targetPlatform
+                });
             }
             if (!data) {
                 return;

package/src/common/vsx-registry-common-module.ts

@@ -17,7 +17,9 @@
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { OVSXClientProvider, OVSXUrlResolver } from '../common';
 import { RequestService } from '@theia/core/shared/@theia/request';
-import { ExtensionIdMatchesFilterFactory, OVSXApiFilter, OVSXApiFilterImpl, OVSXClient, OVSXHttpClient, OVSXRouterClient, RequestContainsFilterFactory } from '@theia/ovsx-client';
+import {
+    ExtensionIdMatchesFilterFactory, OVSXApiFilter, OVSXApiFilterImpl, OVSXApiFilterProvider, OVSXClient, OVSXHttpClient, OVSXRouterClient, RequestContainsFilterFactory
+} from '@theia/ovsx-client';
 import { VSXEnvironment } from './vsx-environment';
 
 export default new ContainerModule(bind => {
@@ -54,10 +56,23 @@ export default new ContainerModule(bind => {
     bind(OVSXApiFilter)
         .toDynamicValue(ctx => {
             const vsxEnvironment = ctx.container.get<VSXEnvironment>(VSXEnvironment);
-            const apiFilter = new OVSXApiFilterImpl('-- temporary invalid version value --');
+            const apiFilter = new OVSXApiFilterImpl(undefined!, '-- temporary invalid version value --');
             vsxEnvironment.getVscodeApiVersion()
                 .then(apiVersion => apiFilter.supportedApiVersion = apiVersion);
+            const clientProvider = ctx.container.get<OVSXClientProvider>(OVSXClientProvider);
+            Promise.resolve(clientProvider()).then(client => {
+                apiFilter.client = client;
+            });
             return apiFilter;
         })
         .inSingletonScope();
+    bind(OVSXApiFilterProvider)
+        .toProvider(ctx => async () => {
+            const vsxEnvironment = ctx.container.get<VSXEnvironment>(VSXEnvironment);
+            const clientProvider = ctx.container.get<OVSXClientProvider>(OVSXClientProvider);
+            const client = await clientProvider();
+            const apiVersion = await vsxEnvironment.getVscodeApiVersion();
+            const apiFilter = new OVSXApiFilterImpl(client, apiVersion);
+            return apiFilter;
+        });
 });

package/src/node/vsx-extension-resolver.ts

@@ -23,7 +23,7 @@ import { PluginDeployerHandler, PluginDeployerResolver, PluginDeployerResolverCo
 import { FileUri } from '@theia/core/lib/node';
 import { VSCodeExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
 import { OVSXClientProvider } from '../common/ovsx-client-provider';
-import { OVSXApiFilter, VSXExtensionRaw } from '@theia/ovsx-client';
+import { OVSXApiFilterProvider, VSXExtensionRaw, VSXTargetPlatform } from '@theia/ovsx-client';
 import { RequestService } from '@theia/core/shared/@theia/request';
 import { PluginVSCodeEnvironment } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-environment';
 import { PluginUninstallationManager } from '@theia/plugin-ext/lib/main/node/plugin-uninstallation-manager';
@@ -36,13 +36,14 @@ export class VSXExtensionResolver implements PluginDeployerResolver {
     @inject(RequestService) protected requestService: RequestService;
     @inject(PluginVSCodeEnvironment) protected readonly environment: PluginVSCodeEnvironment;
     @inject(PluginUninstallationManager) protected readonly uninstallationManager: PluginUninstallationManager;
-    @inject(OVSXApiFilter) protected vsxApiFilter: OVSXApiFilter;
+    @inject(OVSXApiFilterProvider) protected vsxApiFilter: OVSXApiFilterProvider;
 
     accept(pluginId: string): boolean {
         return !!VSCodeExtensionUri.toId(new URI(pluginId));
     }
 
     static readonly TEMP_DIR_PREFIX = 'vscode-download';
+    static readonly TARGET_PLATFORM = `${process.platform}-${process.arch}` as VSXTargetPlatform;
 
     async resolve(context: PluginDeployerResolverContext, options?: PluginDeployOptions): Promise<void> {
         const id = VSCodeExtensionUri.toId(new URI(context.getOriginId()));
@@ -50,16 +51,23 @@ export class VSXExtensionResolver implements PluginDeployerResolver {
             return;
         }
         let extension: VSXExtensionRaw | undefined;
-        const client = await this.clientProvider();
+        const filter = await this.vsxApiFilter();
         const version = options?.version || id.version;
         if (version) {
             console.log(`[${id}]: trying to resolve version ${version}...`);
-            const { extensions } = await client.query({ extensionId: id.id, extensionVersion: version, includeAllVersions: true });
-            extension = extensions[0];
+            extension = await filter.findLatestCompatibleExtension({
+                extensionId: id.id,
+                extensionVersion: version,
+                includeAllVersions: true,
+                targetPlatform: VSXExtensionResolver.TARGET_PLATFORM
+            });
         } else {
             console.log(`[${id}]: trying to resolve latest version...`);
-            const { extensions } = await client.query({ extensionId: id.id, includeAllVersions: true });
-            extension = this.vsxApiFilter.getLatestCompatibleExtension(extensions);
+            extension = await filter.findLatestCompatibleExtension({
+                extensionId: id.id,
+                includeAllVersions: true,
+                targetPlatform: VSXExtensionResolver.TARGET_PLATFORM
+            });
         }
         if (!extension) {
             return;