@theia/vsx-registry 1.34.2 → 1.34.3

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

@@ -1,138 +1,138 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2020 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VSXExtensionResolver = void 0;
-const path = require("path");
-const semver = require("semver");
-const fs = require("@theia/core/shared/fs-extra");
-const inversify_1 = require("@theia/core/shared/inversify");
-const uri_1 = require("@theia/core/lib/common/uri");
-const plugin_protocol_1 = require("@theia/plugin-ext/lib/common/plugin-protocol");
-const plugin_vscode_uri_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri");
-const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
-const request_1 = require("@theia/core/shared/@theia/request");
-const plugin_vscode_environment_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-environment");
-const plugin_uninstallation_manager_1 = require("@theia/plugin-ext/lib/main/node/plugin-uninstallation-manager");
-let VSXExtensionResolver = class VSXExtensionResolver {
-    accept(pluginId) {
-        return !!plugin_vscode_uri_1.VSCodeExtensionUri.toId(new uri_1.default(pluginId));
-    }
-    async resolve(context, options) {
-        const id = plugin_vscode_uri_1.VSCodeExtensionUri.toId(new uri_1.default(context.getOriginId()));
-        if (!id) {
-            return;
-        }
-        let extension;
-        const client = await this.clientProvider();
-        if (options) {
-            console.log(`[${id}]: trying to resolve version ${options.version}...`);
-            extension = await client.getExtension(id, { extensionVersion: options.version, includeAllVersions: true });
-        }
-        else {
-            console.log(`[${id}]: trying to resolve latest version...`);
-            extension = await client.getLatestCompatibleExtensionVersion(id);
-        }
-        if (!extension) {
-            return;
-        }
-        if (extension.error) {
-            throw new Error(extension.error);
-        }
-        const resolvedId = id + '-' + extension.version;
-        const downloadUrl = extension.files.download;
-        console.log(`[${id}]: resolved to '${resolvedId}'`);
-        if (!(options === null || options === void 0 ? void 0 : options.ignoreOtherVersions)) {
-            const existingVersion = this.hasSameOrNewerVersion(id, extension);
-            if (existingVersion) {
-                console.log(`[${id}]: is already installed with the same or newer version '${existingVersion}'`);
-                return;
-            }
-        }
-        const downloadPath = (await this.environment.getExtensionsDirUri()).path.fsPath();
-        await fs.ensureDir(downloadPath);
-        const extensionPath = path.resolve(downloadPath, path.basename(downloadUrl));
-        console.log(`[${resolvedId}]: trying to download from "${downloadUrl}"...`, 'to path', downloadPath);
-        if (!await this.download(downloadUrl, extensionPath)) {
-            console.log(`[${resolvedId}]: not found`);
-            return;
-        }
-        console.log(`[${resolvedId}]: downloaded to ${extensionPath}"`);
-        context.addPlugin(resolvedId, extensionPath);
-    }
-    hasSameOrNewerVersion(id, extension) {
-        const existingPlugins = this.pluginDeployerHandler.getDeployedPluginsById(id)
-            .filter(plugin => !this.uninstallationManager.isUninstalled(plugin_protocol_1.PluginIdentifiers.componentsToVersionedId(plugin.metadata.model)));
-        const sufficientVersion = existingPlugins.find(existingPlugin => {
-            const existingVersion = semver.clean(existingPlugin.metadata.model.version);
-            const desiredVersion = semver.clean(extension.version);
-            if (desiredVersion && existingVersion && semver.gte(existingVersion, desiredVersion)) {
-                return existingVersion;
-            }
-        });
-        return sufficientVersion === null || sufficientVersion === void 0 ? void 0 : sufficientVersion.metadata.model.version;
-    }
-    async download(downloadUrl, downloadPath) {
-        if (await fs.pathExists(downloadPath)) {
-            return true;
-        }
-        const context = await this.requestService.request({ url: downloadUrl });
-        if (context.res.statusCode === 404) {
-            return false;
-        }
-        else if (context.res.statusCode !== 200) {
-            throw new Error('Request returned status code: ' + context.res.statusCode);
-        }
-        else {
-            await fs.writeFile(downloadPath, context.buffer);
-            return true;
-        }
-    }
-};
-__decorate([
-    (0, inversify_1.inject)(ovsx_client_provider_1.OVSXClientProvider),
-    __metadata("design:type", Function)
-], VSXExtensionResolver.prototype, "clientProvider", void 0);
-__decorate([
-    (0, inversify_1.inject)(plugin_protocol_1.PluginDeployerHandler),
-    __metadata("design:type", Object)
-], VSXExtensionResolver.prototype, "pluginDeployerHandler", void 0);
-__decorate([
-    (0, inversify_1.inject)(request_1.RequestService),
-    __metadata("design:type", Object)
-], VSXExtensionResolver.prototype, "requestService", void 0);
-__decorate([
-    (0, inversify_1.inject)(plugin_vscode_environment_1.PluginVSCodeEnvironment),
-    __metadata("design:type", plugin_vscode_environment_1.PluginVSCodeEnvironment)
-], VSXExtensionResolver.prototype, "environment", void 0);
-__decorate([
-    (0, inversify_1.inject)(plugin_uninstallation_manager_1.PluginUninstallationManager),
-    __metadata("design:type", plugin_uninstallation_manager_1.PluginUninstallationManager)
-], VSXExtensionResolver.prototype, "uninstallationManager", void 0);
-VSXExtensionResolver = __decorate([
-    (0, inversify_1.injectable)()
-], VSXExtensionResolver);
-exports.VSXExtensionResolver = VSXExtensionResolver;
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2020 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VSXExtensionResolver = void 0;
+const path = require("path");
+const semver = require("semver");
+const fs = require("@theia/core/shared/fs-extra");
+const inversify_1 = require("@theia/core/shared/inversify");
+const uri_1 = require("@theia/core/lib/common/uri");
+const plugin_protocol_1 = require("@theia/plugin-ext/lib/common/plugin-protocol");
+const plugin_vscode_uri_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri");
+const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
+const request_1 = require("@theia/core/shared/@theia/request");
+const plugin_vscode_environment_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-environment");
+const plugin_uninstallation_manager_1 = require("@theia/plugin-ext/lib/main/node/plugin-uninstallation-manager");
+let VSXExtensionResolver = class VSXExtensionResolver {
+    accept(pluginId) {
+        return !!plugin_vscode_uri_1.VSCodeExtensionUri.toId(new uri_1.default(pluginId));
+    }
+    async resolve(context, options) {
+        const id = plugin_vscode_uri_1.VSCodeExtensionUri.toId(new uri_1.default(context.getOriginId()));
+        if (!id) {
+            return;
+        }
+        let extension;
+        const client = await this.clientProvider();
+        if (options) {
+            console.log(`[${id}]: trying to resolve version ${options.version}...`);
+            extension = await client.getExtension(id, { extensionVersion: options.version, includeAllVersions: true });
+        }
+        else {
+            console.log(`[${id}]: trying to resolve latest version...`);
+            extension = await client.getLatestCompatibleExtensionVersion(id);
+        }
+        if (!extension) {
+            return;
+        }
+        if (extension.error) {
+            throw new Error(extension.error);
+        }
+        const resolvedId = id + '-' + extension.version;
+        const downloadUrl = extension.files.download;
+        console.log(`[${id}]: resolved to '${resolvedId}'`);
+        if (!(options === null || options === void 0 ? void 0 : options.ignoreOtherVersions)) {
+            const existingVersion = this.hasSameOrNewerVersion(id, extension);
+            if (existingVersion) {
+                console.log(`[${id}]: is already installed with the same or newer version '${existingVersion}'`);
+                return;
+            }
+        }
+        const downloadPath = (await this.environment.getExtensionsDirUri()).path.fsPath();
+        await fs.ensureDir(downloadPath);
+        const extensionPath = path.resolve(downloadPath, path.basename(downloadUrl));
+        console.log(`[${resolvedId}]: trying to download from "${downloadUrl}"...`, 'to path', downloadPath);
+        if (!await this.download(downloadUrl, extensionPath)) {
+            console.log(`[${resolvedId}]: not found`);
+            return;
+        }
+        console.log(`[${resolvedId}]: downloaded to ${extensionPath}"`);
+        context.addPlugin(resolvedId, extensionPath);
+    }
+    hasSameOrNewerVersion(id, extension) {
+        const existingPlugins = this.pluginDeployerHandler.getDeployedPluginsById(id)
+            .filter(plugin => !this.uninstallationManager.isUninstalled(plugin_protocol_1.PluginIdentifiers.componentsToVersionedId(plugin.metadata.model)));
+        const sufficientVersion = existingPlugins.find(existingPlugin => {
+            const existingVersion = semver.clean(existingPlugin.metadata.model.version);
+            const desiredVersion = semver.clean(extension.version);
+            if (desiredVersion && existingVersion && semver.gte(existingVersion, desiredVersion)) {
+                return existingVersion;
+            }
+        });
+        return sufficientVersion === null || sufficientVersion === void 0 ? void 0 : sufficientVersion.metadata.model.version;
+    }
+    async download(downloadUrl, downloadPath) {
+        if (await fs.pathExists(downloadPath)) {
+            return true;
+        }
+        const context = await this.requestService.request({ url: downloadUrl });
+        if (context.res.statusCode === 404) {
+            return false;
+        }
+        else if (context.res.statusCode !== 200) {
+            throw new Error('Request returned status code: ' + context.res.statusCode);
+        }
+        else {
+            await fs.writeFile(downloadPath, context.buffer);
+            return true;
+        }
+    }
+};
+__decorate([
+    (0, inversify_1.inject)(ovsx_client_provider_1.OVSXClientProvider),
+    __metadata("design:type", Function)
+], VSXExtensionResolver.prototype, "clientProvider", void 0);
+__decorate([
+    (0, inversify_1.inject)(plugin_protocol_1.PluginDeployerHandler),
+    __metadata("design:type", Object)
+], VSXExtensionResolver.prototype, "pluginDeployerHandler", void 0);
+__decorate([
+    (0, inversify_1.inject)(request_1.RequestService),
+    __metadata("design:type", Object)
+], VSXExtensionResolver.prototype, "requestService", void 0);
+__decorate([
+    (0, inversify_1.inject)(plugin_vscode_environment_1.PluginVSCodeEnvironment),
+    __metadata("design:type", plugin_vscode_environment_1.PluginVSCodeEnvironment)
+], VSXExtensionResolver.prototype, "environment", void 0);
+__decorate([
+    (0, inversify_1.inject)(plugin_uninstallation_manager_1.PluginUninstallationManager),
+    __metadata("design:type", plugin_uninstallation_manager_1.PluginUninstallationManager)
+], VSXExtensionResolver.prototype, "uninstallationManager", void 0);
+VSXExtensionResolver = __decorate([
+    (0, inversify_1.injectable)()
+], VSXExtensionResolver);
+exports.VSXExtensionResolver = VSXExtensionResolver;
 //# sourceMappingURL=vsx-extension-resolver.js.map

package/lib/node/vsx-registry-backend-module.d.ts

@@ -1,4 +1,4 @@
-import { ContainerModule } from '@theia/core/shared/inversify';
-declare const _default: ContainerModule;
-export default _default;
+import { ContainerModule } from '@theia/core/shared/inversify';
+declare const _default: ContainerModule;
+export default _default;
 //# sourceMappingURL=vsx-registry-backend-module.d.ts.map

package/lib/node/vsx-registry-backend-module.js

@@ -1,36 +1,36 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2020 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-const inversify_1 = require("@theia/core/shared/inversify");
-const vsx_extension_resolver_1 = require("./vsx-extension-resolver");
-const plugin_protocol_1 = require("@theia/plugin-ext/lib/common/plugin-protocol");
-const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
-const vsx_environment_1 = require("../common/vsx-environment");
-const vsx_environment_impl_1 = require("./vsx-environment-impl");
-const core_1 = require("@theia/core");
-const request_1 = require("@theia/core/shared/@theia/request");
-exports.default = new inversify_1.ContainerModule(bind => {
-    bind(ovsx_client_provider_1.OVSXClientProvider).toDynamicValue(ctx => {
-        const clientPromise = (0, ovsx_client_provider_1.createOVSXClient)(ctx.container.get(vsx_environment_1.VSXEnvironment), ctx.container.get(request_1.RequestService));
-        return () => clientPromise;
-    }).inSingletonScope();
-    bind(vsx_environment_1.VSXEnvironment).to(vsx_environment_impl_1.VSXEnvironmentImpl).inSingletonScope();
-    bind(core_1.ConnectionHandler).toDynamicValue(ctx => new core_1.JsonRpcConnectionHandler(vsx_environment_1.VSX_ENVIRONMENT_PATH, () => ctx.container.get(vsx_environment_1.VSXEnvironment))).inSingletonScope();
-    bind(vsx_extension_resolver_1.VSXExtensionResolver).toSelf().inSingletonScope();
-    bind(plugin_protocol_1.PluginDeployerResolver).toService(vsx_extension_resolver_1.VSXExtensionResolver);
-});
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2020 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const inversify_1 = require("@theia/core/shared/inversify");
+const vsx_extension_resolver_1 = require("./vsx-extension-resolver");
+const plugin_protocol_1 = require("@theia/plugin-ext/lib/common/plugin-protocol");
+const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
+const vsx_environment_1 = require("../common/vsx-environment");
+const vsx_environment_impl_1 = require("./vsx-environment-impl");
+const core_1 = require("@theia/core");
+const request_1 = require("@theia/core/shared/@theia/request");
+exports.default = new inversify_1.ContainerModule(bind => {
+    bind(ovsx_client_provider_1.OVSXClientProvider).toDynamicValue(ctx => {
+        const clientPromise = (0, ovsx_client_provider_1.createOVSXClient)(ctx.container.get(vsx_environment_1.VSXEnvironment), ctx.container.get(request_1.RequestService));
+        return () => clientPromise;
+    }).inSingletonScope();
+    bind(vsx_environment_1.VSXEnvironment).to(vsx_environment_impl_1.VSXEnvironmentImpl).inSingletonScope();
+    bind(core_1.ConnectionHandler).toDynamicValue(ctx => new core_1.JsonRpcConnectionHandler(vsx_environment_1.VSX_ENVIRONMENT_PATH, () => ctx.container.get(vsx_environment_1.VSXEnvironment))).inSingletonScope();
+    bind(vsx_extension_resolver_1.VSXExtensionResolver).toSelf().inSingletonScope();
+    bind(plugin_protocol_1.PluginDeployerResolver).toService(vsx_extension_resolver_1.VSXExtensionResolver);
+});
 //# sourceMappingURL=vsx-registry-backend-module.js.map

package/lib/package.spec.js

@@ -1,26 +1,26 @@
-// *****************************************************************************
-// Copyright (C) 2020 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-/* note: this bogus test file is required so that
-   we are able to run mocha unit tests on this
-   package, without having any actual unit tests in it.
-   This way a coverage report will be generated,
-   showing 0% coverage, instead of no report.
-   This file can be removed once we have real unit
-   tests in place. */
-describe('vsx-registry package', () => {
-    it('support code coverage statistics', () => true);
-});
+// *****************************************************************************
+// Copyright (C) 2020 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+/* note: this bogus test file is required so that
+   we are able to run mocha unit tests on this
+   package, without having any actual unit tests in it.
+   This way a coverage report will be generated,
+   showing 0% coverage, instead of no report.
+   This file can be removed once we have real unit
+   tests in place. */
+describe('vsx-registry package', () => {
+    it('support code coverage statistics', () => true);
+});
 //# sourceMappingURL=package.spec.js.map

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@theia/vsx-registry",
-  "version": "1.34.2",
+  "version": "1.34.3",
   "description": "Theia - VSX Registry",
   "dependencies": {
-    "@theia/core": "1.34.2",
-    "@theia/filesystem": "1.34.2",
-    "@theia/ovsx-client": "1.34.2",
-    "@theia/plugin-ext": "1.34.2",
-    "@theia/plugin-ext-vscode": "1.34.2",
-    "@theia/preferences": "1.34.2",
-    "@theia/workspace": "1.34.2",
+    "@theia/core": "1.34.3",
+    "@theia/filesystem": "1.34.3",
+    "@theia/ovsx-client": "1.34.3",
+    "@theia/plugin-ext": "1.34.3",
+    "@theia/plugin-ext-vscode": "1.34.3",
+    "@theia/preferences": "1.34.3",
+    "@theia/workspace": "1.34.3",
     "luxon": "^2.4.0",
     "p-debounce": "^2.1.0",
     "semver": "^5.4.1",
@@ -49,11 +49,11 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.34.2",
+    "@theia/ext-scripts": "1.34.3",
     "@types/luxon": "^2.3.2"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "dba940bd8c0f9f4b324dad0e90d570d499456f60"
+  "gitHead": "a6cf9fe96b1624d6e27a11dce2ebdeae820478e5"
 }