@theia/vsx-registry 1.22.0-next.6 → 1.22.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/lib/browser/recommended-extensions/recommended-extensions-json-schema.d.ts.map +1 -1
  2. package/lib/browser/recommended-extensions/recommended-extensions-json-schema.js +3 -1
  3. package/lib/browser/recommended-extensions/recommended-extensions-json-schema.js.map +1 -1
  4. package/lib/browser/vsx-extension.js +1 -1
  5. package/lib/browser/vsx-extension.js.map +1 -1
  6. package/lib/node/vsx-extension-resolver.d.ts +4 -1
  7. package/lib/node/vsx-extension-resolver.d.ts.map +1 -1
  8. package/lib/node/vsx-extension-resolver.js +22 -0
  9. package/lib/node/vsx-extension-resolver.js.map +1 -1
  10. package/package.json +10 -12
  11. package/src/browser/recommended-extensions/recommended-extensions-json-schema.ts +3 -1
  12. package/src/browser/vsx-extension.tsx +1 -1
  13. package/src/node/vsx-extension-resolver.ts +24 -1
package/lib/browser/recommended-extensions/recommended-extensions-json-schema.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"recommended-extensions-json-schema.d.ts","sourceRoot":"","sources":["../../../src/browser/recommended-extensions/recommended-extensions-json-schema.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAC9G,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,eAAO,MAAM,kBAAkB,gCAAgC,CAAC;AAChE,eAAO,MAAM,6BAA6B,EAAE,WA2B3C,CAAC;AAEF,qBACa,2BAA4B,YAAW,sBAAsB;IACtE,SAAS,CAAC,QAAQ,CAAC,GAAG,MAA+B;IAC1B,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGhF,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB,eAAe,CAAC,OAAO,EAAE,yBAAyB,GAAG,IAAI;CAO5D"}
1
+ {"version":3,"file":"recommended-extensions-json-schema.d.ts","sourceRoot":"","sources":["../../../src/browser/recommended-extensions/recommended-extensions-json-schema.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAC9G,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,eAAO,MAAM,kBAAkB,gCAAgC,CAAC;AAChE,eAAO,MAAM,6BAA6B,EAAE,WA6B3C,CAAC;AAEF,qBACa,2BAA4B,YAAW,sBAAsB;IACtE,SAAS,CAAC,QAAQ,CAAC,GAAG,MAA+B;IAC1B,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGhF,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB,eAAe,CAAC,OAAO,EAAE,yBAAyB,GAAG,IAAI;CAO5D"}
package/lib/browser/recommended-extensions/recommended-extensions-json-schema.js CHANGED
@@ -55,7 +55,9 @@ exports.extensionsConfigurationSchema = {
55
55
  },
56
56
  default: [],
57
57
  }
58
- }
58
+ },
59
+ allowComments: true,
60
+ allowTrailingCommas: true,
59
61
  };
60
62
  let ExtensionSchemaContribution = class ExtensionSchemaContribution {
61
63
  constructor() {
package/lib/browser/recommended-extensions/recommended-extensions-json-schema.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"recommended-extensions-json-schema.js","sourceRoot":"","sources":["../../../src/browser/recommended-extensions/recommended-extensions-json-schema.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAiF;AACjF,sCAAgD;AAGhD,oDAA6C;AAC7C,0DAAgE;AAEnD,QAAA,kBAAkB,GAAG,6BAA6B,CAAC;AACnD,QAAA,6BAA6B,GAAgB;IACtD,GAAG,EAAE,0BAAkB;IACvB,OAAO,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE;IAChC,IAAI,EAAE,QAAQ;IAEd,UAAU,EAAE;QACR,eAAe,EAAE;YACb,KAAK,EAAE,kHAAkH;YACzH,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,2BAA2B;gBACpC,mBAAmB,EAAE,mEAAmE;aAC3F;YACD,OAAO,EAAE,EAAE;SACd;QACD,uBAAuB,EAAE;YACrB,KAAK,EAAE,2JAA2J;YAClK,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,2BAA2B;gBACpC,mBAAmB,EAAE,mEAAmE;aAC3F;YACD,OAAO,EAAE,EAAE;SACd;KACJ;CACJ,CAAC;AAGF,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAAxC;QACuB,QAAG,GAAG,IAAI,aAAG,CAAC,0BAAkB,CAAC,CAAC;IAgBzD,CAAC;IAXa,IAAI;QACV,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,qCAA6B,CAAC,CAAC,CAAC;IACxF,CAAC;IAED,eAAe,CAAC,OAAkC;QAC9C,OAAO,CAAC,cAAc,CAAC;YACnB,SAAS,EAAE,CAAC,iBAAiB,CAAC;YAC9B,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;SAC3B,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACpF,CAAC;CACJ,CAAA;AAf8B;IAA1B,kBAAM,CAAC,wBAAiB,CAAC;8BAAuC,wBAAiB;sEAAC;AACzD;IAAzB,kBAAM,CAAC,0BAAgB,CAAC;8BAAsC,0BAAgB;qEAAC;AAGhF;IADC,yBAAa,EAAE;;;;uDAGf;AARQ,2BAA2B;IADvC,sBAAU,EAAE;GACA,2BAA2B,CAiBvC;AAjBY,kEAA2B"}
1
+ {"version":3,"file":"recommended-extensions-json-schema.js","sourceRoot":"","sources":["../../../src/browser/recommended-extensions/recommended-extensions-json-schema.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAiF;AACjF,sCAAgD;AAGhD,oDAA6C;AAC7C,0DAAgE;AAEnD,QAAA,kBAAkB,GAAG,6BAA6B,CAAC;AACnD,QAAA,6BAA6B,GAAgB;IACtD,GAAG,EAAE,0BAAkB;IACvB,OAAO,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE;IAChC,IAAI,EAAE,QAAQ;IAEd,UAAU,EAAE;QACR,eAAe,EAAE;YACb,KAAK,EAAE,kHAAkH;YACzH,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,2BAA2B;gBACpC,mBAAmB,EAAE,mEAAmE;aAC3F;YACD,OAAO,EAAE,EAAE;SACd;QACD,uBAAuB,EAAE;YACrB,KAAK,EAAE,2JAA2J;YAClK,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,2BAA2B;gBACpC,mBAAmB,EAAE,mEAAmE;aAC3F;YACD,OAAO,EAAE,EAAE;SACd;KACJ;IACD,aAAa,EAAE,IAAI;IACnB,mBAAmB,EAAE,IAAI;CAC5B,CAAC;AAGF,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAAxC;QACuB,QAAG,GAAG,IAAI,aAAG,CAAC,0BAAkB,CAAC,CAAC;IAgBzD,CAAC;IAXa,IAAI;QACV,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,qCAA6B,CAAC,CAAC,CAAC;IACxF,CAAC;IAED,eAAe,CAAC,OAAkC;QAC9C,OAAO,CAAC,cAAc,CAAC;YACnB,SAAS,EAAE,CAAC,iBAAiB,CAAC;YAC9B,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;SAC3B,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACpF,CAAC;CACJ,CAAA;AAf8B;IAA1B,kBAAM,CAAC,wBAAiB,CAAC;8BAAuC,wBAAiB;sEAAC;AACzD;IAAzB,kBAAM,CAAC,0BAAgB,CAAC;8BAAsC,0BAAgB;qEAAC;AAGhF;IADC,yBAAa,EAAE;;;;uDAGf;AARQ,2BAA2B;IADvC,sBAAU,EAAE;GACA,2BAA2B,CAiBvC;AAjBY,kEAA2B"}
package/lib/browser/vsx-extension.js CHANGED
@@ -25,7 +25,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
25
25
  };
26
26
  Object.defineProperty(exports, "__esModule", { value: true });
27
27
  exports.VSXExtensionEditorComponent = exports.VSXExtensionComponent = exports.AbstractVSXExtensionComponent = exports.VSXExtension = exports.VSXExtensionFactory = exports.VSXExtensionOptions = exports.VSXExtensionData = exports.VSXExtensionsContextMenu = exports.EXTENSIONS_CONTEXT_MENU = void 0;
28
- const markdownit = require("markdown-it");
28
+ const markdownit = require("@theia/core/shared/markdown-it");
29
29
  const React = require("@theia/core/shared/react");
30
30
  const DOMPurify = require("@theia/core/shared/dompurify");
31
31
  const inversify_1 = require("@theia/core/shared/inversify");
package/lib/browser/vsx-extension.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension.js","sourceRoot":"","sources":["../../src/browser/vsx-extension.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vsx-extension.js","sourceRoot":"","sources":["../../src/browser/vsx-extension.tsx"],"names":[],"mappings":"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"}
package/lib/node/vsx-extension-resolver.d.ts CHANGED
@@ -13,14 +13,17 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { PluginDeployerResolver, PluginDeployerResolverContext } from '@theia/plugin-ext/lib/common/plugin-protocol';
16
+ import { PluginDeployerHandler, PluginDeployerResolver, PluginDeployerResolverContext } from '@theia/plugin-ext/lib/common/plugin-protocol';
17
17
  import { OVSXClientProvider } from '../common/ovsx-client-provider';
18
+ import { VSXExtensionRaw } from '@theia/ovsx-client';
18
19
  export declare class VSXExtensionResolver implements PluginDeployerResolver {
19
20
  protected clientProvider: OVSXClientProvider;
21
+ protected pluginDeployerHandler: PluginDeployerHandler;
20
22
  protected readonly downloadPath: string;
21
23
  constructor();
22
24
  accept(pluginId: string): boolean;
23
25
  resolve(context: PluginDeployerResolverContext): Promise<void>;
26
+ protected hasSameOrNewerVersion(id: string, extension: VSXExtensionRaw): string | undefined;
24
27
  protected download(downloadUrl: string, downloadPath: string): Promise<boolean>;
25
28
  }
26
29
  //# sourceMappingURL=vsx-extension-resolver.d.ts.map
package/lib/node/vsx-extension-resolver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension-resolver.d.ts","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AASlF,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAErH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,qBACa,oBAAqB,YAAW,sBAAsB;IAG/D,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAE7C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;;IAQxC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI3B,OAAO,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;cA4BpD,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAoBxF"}
1
+ {"version":3,"file":"vsx-extension-resolver.d.ts","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAUlF,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAE5I,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBACa,oBAAqB,YAAW,sBAAsB;IAG/D,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAG7C,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAEvD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;;IAQxC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI3B,OAAO,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;IAkCpE,SAAS,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS;cAY3E,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAoBxF"}
package/lib/node/vsx-extension-resolver.js CHANGED
@@ -27,11 +27,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
27
27
  exports.VSXExtensionResolver = void 0;
28
28
  const os = require("os");
29
29
  const path = require("path");
30
+ const semver = require("semver");
30
31
  const fs = require("@theia/core/shared/fs-extra");
31
32
  const uuid_1 = require("uuid");
32
33
  const requestretry = require("requestretry");
33
34
  const inversify_1 = require("@theia/core/shared/inversify");
34
35
  const uri_1 = require("@theia/core/lib/common/uri");
36
+ const plugin_protocol_1 = require("@theia/plugin-ext/lib/common/plugin-protocol");
35
37
  const vsx_extension_uri_1 = require("../common/vsx-extension-uri");
36
38
  const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
37
39
  let VSXExtensionResolver = class VSXExtensionResolver {
@@ -60,6 +62,11 @@ let VSXExtensionResolver = class VSXExtensionResolver {
60
62
  const resolvedId = id + '-' + extension.version;
61
63
  const downloadUrl = extension.files.download;
62
64
  console.log(`[${id}]: resolved to '${resolvedId}'`);
65
+ const existingVersion = this.hasSameOrNewerVersion(id, extension);
66
+ if (existingVersion) {
67
+ console.log(`[${id}]: is already installed with the same or newer version '${existingVersion}'`);
68
+ return;
69
+ }
63
70
  const extensionPath = path.resolve(this.downloadPath, path.basename(downloadUrl));
64
71
  console.log(`[${resolvedId}]: trying to download from "${downloadUrl}"...`);
65
72
  if (!await this.download(downloadUrl, extensionPath)) {
@@ -69,6 +76,17 @@ let VSXExtensionResolver = class VSXExtensionResolver {
69
76
  console.log(`[${resolvedId}]: downloaded to ${extensionPath}"`);
70
77
  context.addPlugin(resolvedId, extensionPath);
71
78
  }
79
+ hasSameOrNewerVersion(id, extension) {
80
+ const existingPlugin = this.pluginDeployerHandler.getDeployedPlugin(id);
81
+ if (existingPlugin) {
82
+ const existingVersion = semver.clean(existingPlugin.metadata.model.version);
83
+ const desiredVersion = semver.clean(extension.version);
84
+ if (desiredVersion && existingVersion && semver.gte(existingVersion, desiredVersion)) {
85
+ return existingVersion;
86
+ }
87
+ }
88
+ return undefined;
89
+ }
72
90
  async download(downloadUrl, downloadPath) {
73
91
  return new Promise((resolve, reject) => {
74
92
  requestretry(downloadUrl, {
@@ -96,6 +114,10 @@ __decorate([
96
114
  inversify_1.inject(ovsx_client_provider_1.OVSXClientProvider),
97
115
  __metadata("design:type", Function)
98
116
  ], VSXExtensionResolver.prototype, "clientProvider", void 0);
117
+ __decorate([
118
+ inversify_1.inject(plugin_protocol_1.PluginDeployerHandler),
119
+ __metadata("design:type", Object)
120
+ ], VSXExtensionResolver.prototype, "pluginDeployerHandler", void 0);
99
121
  VSXExtensionResolver = __decorate([
100
122
  inversify_1.injectable(),
101
123
  __metadata("design:paramtypes", [])
package/lib/node/vsx-extension-resolver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension-resolver.js","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,yBAAyB;AACzB,6BAA6B;AAC7B,kDAAkD;AAClD,+BAAoC;AACpC,6CAA6C;AAC7C,4DAAkE;AAClE,oDAA6C;AAE7C,mEAA8D;AAC9D,yEAAoE;AAGpE,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAO7B;QACI,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,SAAM,EAAE,CAAC,CAAC;QACxD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACpC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,QAAgB;QACnB,OAAO,CAAC,CAAC,mCAAe,CAAC,IAAI,CAAC,IAAI,aAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAsC;QAChD,MAAM,EAAE,GAAG,mCAAe,CAAC,IAAI,CAAC,IAAI,aAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,EAAE,EAAE;YACL,OAAO;SACV;QACD,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,wCAAwC,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO;SACV;QACD,IAAI,SAAS,CAAC,KAAK,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SACpC;QACD,MAAM,UAAU,GAAG,EAAE,GAAG,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC;QAChD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,mBAAmB,UAAU,GAAG,CAAC,CAAC;QAEpD,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;QAClF,OAAO,CAAC,GAAG,CAAC,IAAI,UAAU,+BAA+B,WAAW,MAAM,CAAC,CAAC;QAC5E,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE;YAClD,OAAO,CAAC,GAAG,CAAC,IAAI,UAAU,cAAc,CAAC,CAAC;YAC1C,OAAO;SACV;QACD,OAAO,CAAC,GAAG,CAAC,IAAI,UAAU,oBAAoB,aAAa,GAAG,CAAC,CAAC;QAChE,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IACjD,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,WAAmB,EAAE,YAAoB;QAC9D,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,YAAY,CAAC,WAAW,EAAE;gBACtB,MAAM,EAAE,KAAK;gBACb,WAAW,EAAE,CAAC;gBACd,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,YAAY,CAAC,eAAe,CAAC,kBAAkB;aACjE,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;gBACjB,IAAI,GAAG,EAAE;oBACL,MAAM,CAAC,GAAG,CAAC,CAAC;iBACf;qBAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE;oBAChD,OAAO,CAAC,KAAK,CAAC,CAAC;iBAClB;qBAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE;oBAChD,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;iBAC7C;YACL,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;iBACtC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;iBACnB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA9DG;IADC,kBAAM,CAAC,yCAAkB,CAAC;;4DACkB;AAHpC,oBAAoB;IADhC,sBAAU,EAAE;;GACA,oBAAoB,CAiEhC;AAjEY,oDAAoB"}
1
+ {"version":3,"file":"vsx-extension-resolver.js","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,yBAAyB;AACzB,6BAA6B;AAC7B,iCAAiC;AACjC,kDAAkD;AAClD,+BAAoC;AACpC,6CAA6C;AAC7C,4DAAkE;AAClE,oDAA6C;AAC7C,kFAA4I;AAC5I,mEAA8D;AAC9D,yEAAoE;AAIpE,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAU7B;QACI,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,SAAM,EAAE,CAAC,CAAC;QACxD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACpC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,QAAgB;QACnB,OAAO,CAAC,CAAC,mCAAe,CAAC,IAAI,CAAC,IAAI,aAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAsC;QAChD,MAAM,EAAE,GAAG,mCAAe,CAAC,IAAI,CAAC,IAAI,aAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,EAAE,EAAE;YACL,OAAO;SACV;QACD,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,wCAAwC,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO;SACV;QACD,IAAI,SAAS,CAAC,KAAK,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SACpC;QACD,MAAM,UAAU,GAAG,EAAE,GAAG,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC;QAChD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,mBAAmB,UAAU,GAAG,CAAC,CAAC;QAEpD,MAAM,eAAe,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAClE,IAAI,eAAe,EAAE;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,2DAA2D,eAAe,GAAG,CAAC,CAAC;YACjG,OAAO;SACV;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;QAClF,OAAO,CAAC,GAAG,CAAC,IAAI,UAAU,+BAA+B,WAAW,MAAM,CAAC,CAAC;QAC5E,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE;YAClD,OAAO,CAAC,GAAG,CAAC,IAAI,UAAU,cAAc,CAAC,CAAC;YAC1C,OAAO;SACV;QACD,OAAO,CAAC,GAAG,CAAC,IAAI,UAAU,oBAAoB,aAAa,GAAG,CAAC,CAAC;QAChE,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IACjD,CAAC;IAES,qBAAqB,CAAC,EAAU,EAAE,SAA0B;QAClE,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;QACxE,IAAI,cAAc,EAAE;YAChB,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5E,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACvD,IAAI,cAAc,IAAI,eAAe,IAAI,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE;gBAClF,OAAO,eAAe,CAAC;aAC1B;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,WAAmB,EAAE,YAAoB;QAC9D,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,YAAY,CAAC,WAAW,EAAE;gBACtB,MAAM,EAAE,KAAK;gBACb,WAAW,EAAE,CAAC;gBACd,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,YAAY,CAAC,eAAe,CAAC,kBAAkB;aACjE,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;gBACjB,IAAI,GAAG,EAAE;oBACL,MAAM,CAAC,GAAG,CAAC,CAAC;iBACf;qBAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE;oBAChD,OAAO,CAAC,KAAK,CAAC,CAAC;iBAClB;qBAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE;oBAChD,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;iBAC7C;YACL,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;iBACtC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;iBACnB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AAnFG;IADC,kBAAM,CAAC,yCAAkB,CAAC;;4DACkB;AAG7C;IADC,kBAAM,CAAC,uCAAqB,CAAC;;mEACyB;AAN9C,oBAAoB;IADhC,sBAAU,EAAE;;GACA,oBAAoB,CAsFhC;AAtFY,oDAAoB"}
package/package.json CHANGED
@@ -1,20 +1,18 @@
1
1
  {
2
2
  "name": "@theia/vsx-registry",
3
- "version": "1.22.0-next.6+8083f76b4f4",
3
+ "version": "1.22.0",
4
4
  "description": "Theia - VSX Registry",
5
5
  "dependencies": {
6
- "@theia/core": "1.22.0-next.6+8083f76b4f4",
7
- "@theia/filesystem": "1.22.0-next.6+8083f76b4f4",
8
- "@theia/ovsx-client": "1.22.0-next.6+8083f76b4f4",
9
- "@theia/plugin-ext": "1.22.0-next.6+8083f76b4f4",
10
- "@theia/plugin-ext-vscode": "1.22.0-next.6+8083f76b4f4",
11
- "@theia/preferences": "1.22.0-next.6+8083f76b4f4",
12
- "@theia/workspace": "1.22.0-next.6+8083f76b4f4",
6
+ "@theia/core": "1.22.0",
7
+ "@theia/filesystem": "1.22.0",
8
+ "@theia/ovsx-client": "1.22.0",
9
+ "@theia/plugin-ext": "1.22.0",
10
+ "@theia/plugin-ext-vscode": "1.22.0",
11
+ "@theia/preferences": "1.22.0",
12
+ "@theia/workspace": "1.22.0",
13
13
  "@types/bent": "^7.0.1",
14
- "@types/markdown-it": "*",
15
14
  "@types/showdown": "^1.7.1",
16
15
  "bent": "^7.1.0",
17
- "markdown-it": "^8.4.0",
18
16
  "p-debounce": "^2.1.0",
19
17
  "requestretry": "^3.1.0",
20
18
  "semver": "^5.4.1",
@@ -55,10 +53,10 @@
55
53
  "watch": "theiaext watch"
56
54
  },
57
55
  "devDependencies": {
58
- "@theia/ext-scripts": "1.21.0"
56
+ "@theia/ext-scripts": "1.22.0"
59
57
  },
60
58
  "nyc": {
61
59
  "extends": "../../configs/nyc.json"
62
60
  },
63
- "gitHead": "8083f76b4f4969bad12549ebba0a2c1df9591552"
61
+ "gitHead": "84cfe06b4b10720cc9915bc6e2f091a2b09b1087"
64
62
  }
package/src/browser/recommended-extensions/recommended-extensions-json-schema.ts CHANGED
@@ -48,7 +48,9 @@ export const extensionsConfigurationSchema: IJSONSchema = {
48
48
  },
49
49
  default: [],
50
50
  }
51
- }
51
+ },
52
+ allowComments: true,
53
+ allowTrailingCommas: true,
52
54
  };
53
55
 
54
56
  @injectable()
package/src/browser/vsx-extension.tsx CHANGED
@@ -14,7 +14,7 @@
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
16
 
17
- import * as markdownit from 'markdown-it';
17
+ import * as markdownit from '@theia/core/shared/markdown-it';
18
18
  import * as React from '@theia/core/shared/react';
19
19
  import * as DOMPurify from '@theia/core/shared/dompurify';
20
20
  import { injectable, inject } from '@theia/core/shared/inversify';
package/src/node/vsx-extension-resolver.ts CHANGED
@@ -16,14 +16,16 @@
16
16
 
17
17
  import * as os from 'os';
18
18
  import * as path from 'path';
19
+ import * as semver from 'semver';
19
20
  import * as fs from '@theia/core/shared/fs-extra';
20
21
  import { v4 as uuidv4 } from 'uuid';
21
22
  import * as requestretry from 'requestretry';
22
23
  import { injectable, inject } from '@theia/core/shared/inversify';
23
24
  import URI from '@theia/core/lib/common/uri';
24
- import { PluginDeployerResolver, PluginDeployerResolverContext } from '@theia/plugin-ext/lib/common/plugin-protocol';
25
+ import { PluginDeployerHandler, PluginDeployerResolver, PluginDeployerResolverContext } from '@theia/plugin-ext/lib/common/plugin-protocol';
25
26
  import { VSXExtensionUri } from '../common/vsx-extension-uri';
26
27
  import { OVSXClientProvider } from '../common/ovsx-client-provider';
28
+ import { VSXExtensionRaw } from '@theia/ovsx-client';
27
29
 
28
30
  @injectable()
29
31
  export class VSXExtensionResolver implements PluginDeployerResolver {
@@ -31,6 +33,9 @@ export class VSXExtensionResolver implements PluginDeployerResolver {
31
33
  @inject(OVSXClientProvider)
32
34
  protected clientProvider: OVSXClientProvider;
33
35
 
36
+ @inject(PluginDeployerHandler)
37
+ protected pluginDeployerHandler: PluginDeployerHandler;
38
+
34
39
  protected readonly downloadPath: string;
35
40
 
36
41
  constructor() {
@@ -61,6 +66,12 @@ export class VSXExtensionResolver implements PluginDeployerResolver {
61
66
  const downloadUrl = extension.files.download;
62
67
  console.log(`[${id}]: resolved to '${resolvedId}'`);
63
68
 
69
+ const existingVersion = this.hasSameOrNewerVersion(id, extension);
70
+ if (existingVersion) {
71
+ console.log(`[${id}]: is already installed with the same or newer version '${existingVersion}'`);
72
+ return;
73
+ }
74
+
64
75
  const extensionPath = path.resolve(this.downloadPath, path.basename(downloadUrl));
65
76
  console.log(`[${resolvedId}]: trying to download from "${downloadUrl}"...`);
66
77
  if (!await this.download(downloadUrl, extensionPath)) {
@@ -71,6 +82,18 @@ export class VSXExtensionResolver implements PluginDeployerResolver {
71
82
  context.addPlugin(resolvedId, extensionPath);
72
83
  }
73
84
 
85
+ protected hasSameOrNewerVersion(id: string, extension: VSXExtensionRaw): string | undefined {
86
+ const existingPlugin = this.pluginDeployerHandler.getDeployedPlugin(id);
87
+ if (existingPlugin) {
88
+ const existingVersion = semver.clean(existingPlugin.metadata.model.version);
89
+ const desiredVersion = semver.clean(extension.version);
90
+ if (desiredVersion && existingVersion && semver.gte(existingVersion, desiredVersion)) {
91
+ return existingVersion;
92
+ }
93
+ }
94
+ return undefined;
95
+ }
96
+
74
97
  protected async download(downloadUrl: string, downloadPath: string): Promise<boolean> {
75
98
  return new Promise<boolean>((resolve, reject) => {
76
99
  requestretry(downloadUrl, {