@theia/vsx-registry 1.27.0-next.37 → 1.27.0-next.41

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 (22) hide show
  1. package/lib/browser/vsx-extension-editor-manager.js +3 -3
  2. package/lib/browser/vsx-extension-editor-manager.js.map +1 -1
  3. package/lib/browser/vsx-extension.d.ts +4 -0
  4. package/lib/browser/vsx-extension.d.ts.map +1 -1
  5. package/lib/browser/vsx-extension.js +31 -11
  6. package/lib/browser/vsx-extension.js.map +1 -1
  7. package/lib/browser/vsx-extensions-widget.d.ts +8 -1
  8. package/lib/browser/vsx-extensions-widget.d.ts.map +1 -1
  9. package/lib/browser/vsx-extensions-widget.js +26 -2
  10. package/lib/browser/vsx-extensions-widget.js.map +1 -1
  11. package/lib/common/vsx-extension-uri.d.ts +3 -5
  12. package/lib/common/vsx-extension-uri.d.ts.map +1 -1
  13. package/lib/common/vsx-extension-uri.js +2 -15
  14. package/lib/common/vsx-extension-uri.js.map +1 -1
  15. package/lib/node/vsx-extension-resolver.js +7 -7
  16. package/lib/node/vsx-extension-resolver.js.map +1 -1
  17. package/package.json +9 -9
  18. package/src/browser/vsx-extension-editor-manager.ts +3 -3
  19. package/src/browser/vsx-extension.tsx +41 -16
  20. package/src/browser/vsx-extensions-widget.ts +30 -3
  21. package/src/common/vsx-extension-uri.ts +3 -12
  22. package/src/node/vsx-extension-resolver.ts +7 -7
package/lib/browser/vsx-extension-editor-manager.js CHANGED
@@ -24,7 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
24
24
  exports.VSXExtensionEditorManager = void 0;
25
25
  const inversify_1 = require("@theia/core/shared/inversify");
26
26
  const browser_1 = require("@theia/core/lib/browser");
27
- const vsx_extension_uri_1 = require("../common/vsx-extension-uri");
27
+ const plugin_vscode_uri_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri");
28
28
  const vsx_extension_editor_1 = require("./vsx-extension-editor");
29
29
  let VSXExtensionEditorManager = class VSXExtensionEditorManager extends browser_1.WidgetOpenHandler {
30
30
  constructor() {
@@ -32,11 +32,11 @@ let VSXExtensionEditorManager = class VSXExtensionEditorManager extends browser_
32
32
  this.id = vsx_extension_editor_1.VSXExtensionEditor.ID;
33
33
  }
34
34
  canHandle(uri) {
35
- const id = vsx_extension_uri_1.VSXExtensionUri.toId(uri);
35
+ const id = plugin_vscode_uri_1.VSCodeExtensionUri.toId(uri);
36
36
  return !!id ? 500 : 0;
37
37
  }
38
38
  createWidgetOptions(uri) {
39
- const id = vsx_extension_uri_1.VSXExtensionUri.toId(uri);
39
+ const id = plugin_vscode_uri_1.VSCodeExtensionUri.toId(uri);
40
40
  if (!id) {
41
41
  throw new Error('Invalid URI: ' + uri.toString());
42
42
  }
package/lib/browser/vsx-extension-editor-manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension-editor-manager.js","sourceRoot":"","sources":["../../src/browser/vsx-extension-editor-manager.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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,4DAA0D;AAE1D,qDAA4D;AAE5D,mEAA8D;AAC9D,iEAA4D;AAG5D,IAAa,yBAAyB,GAAtC,MAAa,yBAA0B,SAAQ,2BAAqC;IAApF;;QAEa,OAAE,GAAG,yCAAkB,CAAC,EAAE,CAAC;IAexC,CAAC;IAbG,SAAS,CAAC,GAAQ;QACd,MAAM,EAAE,GAAG,mCAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAES,mBAAmB,CAAC,GAAQ;QAClC,MAAM,EAAE,GAAG,mCAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,EAAE,EAAE;YACL,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;SACrD;QACD,OAAO,EAAE,EAAE,EAAE,CAAC;IAClB,CAAC;CAEJ,CAAA;AAjBY,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAiBrC;AAjBY,8DAAyB"}
1
+ {"version":3,"file":"vsx-extension-editor-manager.js","sourceRoot":"","sources":["../../src/browser/vsx-extension-editor-manager.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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,4DAA0D;AAE1D,qDAA4D;AAE5D,6FAA2F;AAC3F,iEAA4D;AAG5D,IAAa,yBAAyB,GAAtC,MAAa,yBAA0B,SAAQ,2BAAqC;IAApF;;QAEa,OAAE,GAAG,yCAAkB,CAAC,EAAE,CAAC;IAexC,CAAC;IAbG,SAAS,CAAC,GAAQ;QACd,MAAM,EAAE,GAAG,sCAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAES,mBAAmB,CAAC,GAAQ;QAClC,MAAM,EAAE,GAAG,sCAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,EAAE,EAAE;YACL,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;SACrD;QACD,OAAO,EAAE,EAAE,EAAE,CAAC;IAClB,CAAC;CAEJ,CAAA;AAjBY,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAiBrC;AAjBY,8DAAyB"}
package/lib/browser/vsx-extension.d.ts CHANGED
@@ -11,6 +11,7 @@ import { VSXExtensionsSearchModel } from './vsx-extensions-search-model';
11
11
  import { MenuPath } from '@theia/core/lib/common';
12
12
  import { ContextMenuRenderer, TooltipService, TreeWidget } from '@theia/core/lib/browser';
13
13
  import { VSXExtensionNamespaceAccess, VSXUser } from '@theia/ovsx-client/lib/ovsx-types';
14
+ import { WindowService } from '@theia/core/lib/browser/window/window-service';
14
15
  export declare const EXTENSIONS_CONTEXT_MENU: MenuPath;
15
16
  export declare namespace VSXExtensionsContextMenu {
16
17
  const COPY: string[];
@@ -50,6 +51,7 @@ export declare class VSXExtension implements VSXExtensionData, TreeElement {
50
51
  readonly environment: VSXEnvironment;
51
52
  readonly search: VSXExtensionsSearchModel;
52
53
  readonly tooltipService: TooltipService;
54
+ readonly windowService: WindowService;
53
55
  protected readonly data: Partial<VSXExtensionData>;
54
56
  get uri(): URI;
55
57
  get id(): string;
@@ -58,6 +60,7 @@ export declare class VSXExtension implements VSXExtensionData, TreeElement {
58
60
  get installed(): boolean;
59
61
  get builtin(): boolean;
60
62
  update(data: Partial<VSXExtensionData>): void;
63
+ reloadWindow(): void;
61
64
  protected getData<K extends keyof VSXExtensionData>(key: K): VSXExtensionData[K];
62
65
  get iconUrl(): string | undefined;
63
66
  get publisher(): string | undefined;
@@ -97,6 +100,7 @@ export declare class VSXExtension implements VSXExtensionData, TreeElement {
97
100
  export declare abstract class AbstractVSXExtensionComponent<Props extends AbstractVSXExtensionComponent.Props = AbstractVSXExtensionComponent.Props> extends React.Component<Props> {
98
101
  readonly install: (event?: React.MouseEvent<Element, MouseEvent> | undefined) => Promise<void>;
99
102
  readonly uninstall: (event?: React.MouseEvent<Element, MouseEvent> | undefined) => Promise<void>;
103
+ readonly reloadWindow: (event?: React.MouseEvent<Element, MouseEvent> | undefined) => void;
100
104
  protected readonly manage: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;
101
105
  protected renderAction(host?: TreeWidget): React.ReactNode;
102
106
  }
package/lib/browser/vsx-extension.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extension.tsx"],"names":[],"mappings":";AAiBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAGlD,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAmB,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,aAAa,EAAQ,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAc,MAAM,8CAA8C,CAAC;AAExG,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAW,mBAAmB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACnG,OAAO,EAAE,2BAA2B,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAEzF,eAAO,MAAM,uBAAuB,EAAE,QAAsC,CAAC;AAE7E,yBAAiB,wBAAwB,CAAC;IAC/B,MAAM,IAAI,UAAyC,CAAC;CAC9D;AAED,qBACa,gBAAgB;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,eAAe,CAAC,EAAE,2BAA2B,CAAC;IACvD,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,MAAM,gBAAgB,CAAC,CAAC,CAkBvC;CACN;AAED,qBACa,mBAAmB;IAC5B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AACjE,oBAAY,mBAAmB,GAAG,CAAC,OAAO,EAAE,mBAAmB,KAAK,YAAY,CAAC;AAEjF,qBACa,YAAa,YAAW,gBAAgB,EAAE,WAAW;IAG9D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,mBAAmB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAG9C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC;IAGrC,QAAQ,CAAC,MAAM,EAAE,wBAAwB,CAAC;IAG1C,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAExC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAM;IAExD,IAAI,GAAG,IAAI,GAAG,CAEb;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,MAAM,IAAI,cAAc,GAAG,SAAS,CAEvC;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,OAAO,IAAI,OAAO,CAIrB;IAED,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI;IAQ7C,SAAS,CAAC,OAAO,CAAC,CAAC,SAAS,MAAM,gBAAgB,EAAE,GAAG,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC;IAShF,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAOhC;IAED,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAShC;IAED,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAED,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAOlC;IAED,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAWnC;IAED,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAED,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAE/B;IAED,IAAI,OAAO,IAAI,OAAO,GAAG,SAAS,CAEjC;IAED,IAAI,eAAe,IAAI,2BAA2B,GAAG,SAAS,CAE7D;IAED,IAAI,WAAW,IAAI,OAAO,GAAG,SAAS,CAErC;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,OAAO,IAAI,MAAM,CAgBpB;IAED,SAAS,CAAC,KAAK,SAAK;IACpB,IAAI,IAAI,IAAI,OAAO,CAElB;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAWxB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhC,iBAAiB,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG,IAAI;IAYrE;;;;OAIG;IACG,eAAe,CAAC,IAAI,SAAK,GAAG,OAAO,CAAC,GAAG,CAAC;IAKxC,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAc5B,IAAI,CAAC,OAAO,GAAE,aAAkC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,KAAK,CAAC,SAAS;CAK5C;AAED,8BAAsB,6BAA6B,CAAC,KAAK,SAAS,6BAA6B,CAAC,KAAK,GAAG,6BAA6B,CAAC,KAAK,CAAE,SAAQ,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC;IAEvK,QAAQ,CAAC,OAAO,+EAUd;IAEF,QAAQ,CAAC,SAAS,+EAShB;IAEF,SAAS,CAAC,QAAQ,CAAC,MAAM,MAAO,gBAAgB,CAAC,WAAW,EAAE,UAAU,CAAC,UAGvE;IAEF,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC,SAAS;CAqB7D;AACD,yBAAiB,6BAA6B,CAAC;IAC3C,UAAiB,KAAK;QAClB,SAAS,EAAE,YAAY,CAAC;KAC3B;CACJ;AAMD,yBAAiB,qBAAqB,CAAC;IACnC,UAAiB,KAAM,SAAQ,6BAA6B,CAAC,KAAK;QAC9D,IAAI,EAAE,UAAU,CAAC;KACpB;CACJ;AAED,qBAAa,qBAAqB,CAAC,KAAK,SAAS,qBAAqB,CAAC,KAAK,GAAG,qBAAqB,CAAC,KAAK,CAAE,SAAQ,6BAA6B,CAAC,KAAK,CAAC;IAC3I,MAAM,IAAI,KAAK,CAAC,SAAS;CAyBrC;AAED,qBAAa,2BAA4B,SAAQ,6BAA6B;IAC1E,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAC1C,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IACxC,SAAS,CAAC,gBAAgB,EAAE,WAAW,GAAG,SAAS,CAAC;IAEpD,IAAI,eAAe,IAAI,WAAW,GAAG,SAAS,CAE7C;IAEQ,MAAM,IAAI,KAAK,CAAC,SAAS;IAsDlC,SAAS,CAAC,qBAAqB,IAAI,KAAK,CAAC,SAAS;IAiBlD,SAAS,CAAC,WAAW,IAAI,KAAK,CAAC,SAAS;IAaxC,SAAS,CAAC,qBAAqB,IAAI;QAAE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC;QAAC,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC;KAAE;IASxG,QAAQ,CAAC,QAAQ,UAAW,gBAAgB,UAuB1C;IAEF,QAAQ,CAAC,aAAa,MAAa,gBAAgB,mBAOjD;IACF,QAAQ,CAAC,eAAe,MAAO,gBAAgB,UAQ7C;IACF,QAAQ,CAAC,eAAe,MAAa,gBAAgB,mBASnD;IACF,QAAQ,CAAC,iBAAiB,MAAa,gBAAgB,mBAOrD;IACF,QAAQ,CAAC,cAAc,MAAO,gBAAgB,UAQ5C;IACF,QAAQ,CAAC,WAAW,MAAO,gBAAgB,UASzC;CACL"}
1
+ {"version":3,"file":"vsx-extension.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extension.tsx"],"names":[],"mappings":"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"}
package/lib/browser/vsx-extension.js CHANGED
@@ -33,12 +33,14 @@ const uri_1 = require("@theia/core/lib/common/uri");
33
33
  const opener_service_1 = require("@theia/core/lib/browser/opener-service");
34
34
  const hosted_plugin_1 = require("@theia/plugin-ext/lib/hosted/browser/hosted-plugin");
35
35
  const plugin_protocol_1 = require("@theia/plugin-ext/lib/common/plugin-protocol");
36
- const vsx_extension_uri_1 = require("../common/vsx-extension-uri");
36
+ const plugin_vscode_uri_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri");
37
37
  const progress_service_1 = require("@theia/core/lib/common/progress-service");
38
38
  const endpoint_1 = require("@theia/core/lib/browser/endpoint");
39
39
  const vsx_environment_1 = require("../common/vsx-environment");
40
40
  const vsx_extensions_search_model_1 = require("./vsx-extensions-search-model");
41
+ const common_1 = require("@theia/core/lib/common");
41
42
  const browser_1 = require("@theia/core/lib/browser");
43
+ const window_service_1 = require("@theia/core/lib/browser/window/window-service");
42
44
  exports.EXTENSIONS_CONTEXT_MENU = ['extensions_context_menu'];
43
45
  var VSXExtensionsContextMenu;
44
46
  (function (VSXExtensionsContextMenu) {
@@ -82,7 +84,7 @@ let VSXExtension = class VSXExtension {
82
84
  this._busy = 0;
83
85
  }
84
86
  get uri() {
85
- return vsx_extension_uri_1.VSXExtensionUri.toUri(this.id);
87
+ return plugin_vscode_uri_1.VSCodeExtensionUri.toUri(this.id);
86
88
  }
87
89
  get id() {
88
90
  return this.options.id;
@@ -108,6 +110,9 @@ let VSXExtension = class VSXExtension {
108
110
  }
109
111
  }
110
112
  }
113
+ reloadWindow() {
114
+ this.windowService.reload();
115
+ }
111
116
  getData(key) {
112
117
  const plugin = this.plugin;
113
118
  const model = plugin && plugin.metadata.model;
@@ -212,9 +217,10 @@ let VSXExtension = class VSXExtension {
212
217
  return !!this._busy;
213
218
  }
214
219
  async install() {
220
+ var _a;
215
221
  this._busy++;
216
222
  try {
217
- await this.progressService.withProgress(`"Installing '${this.id}' extension...`, 'extensions', () => this.pluginServer.deploy(this.uri.toString()));
223
+ await this.progressService.withProgress(common_1.nls.localizeByDefault("Installing extension '{0}' v{1}...", this.id, (_a = this.version) !== null && _a !== void 0 ? _a : 0), 'extensions', () => this.pluginServer.deploy(this.uri.toString()));
218
224
  }
219
225
  finally {
220
226
  this._busy--;
@@ -223,7 +229,10 @@ let VSXExtension = class VSXExtension {
223
229
  async uninstall() {
224
230
  this._busy++;
225
231
  try {
226
- await this.progressService.withProgress(`Uninstalling '${this.id}' extension...`, 'extensions', () => this.pluginServer.undeploy(this.id));
232
+ const { plugin } = this;
233
+ if (plugin) {
234
+ await this.progressService.withProgress(common_1.nls.localizeByDefault('Uninstalling {0}...', this.id), 'extensions', () => this.pluginServer.uninstall(plugin_protocol_1.PluginIdentifiers.componentsToVersionedId(plugin.metadata.model)));
235
+ }
227
236
  }
228
237
  finally {
229
238
  this._busy--;
@@ -311,6 +320,10 @@ __decorate([
311
320
  (0, inversify_1.inject)(browser_1.TooltipService),
312
321
  __metadata("design:type", Object)
313
322
  ], VSXExtension.prototype, "tooltipService", void 0);
323
+ __decorate([
324
+ (0, inversify_1.inject)(window_service_1.WindowService),
325
+ __metadata("design:type", Object)
326
+ ], VSXExtension.prototype, "windowService", void 0);
314
327
  VSXExtension = __decorate([
315
328
  (0, inversify_1.injectable)()
316
329
  ], VSXExtension);
@@ -341,6 +354,10 @@ class AbstractVSXExtensionComponent extends React.Component {
341
354
  this.forceUpdate();
342
355
  }
343
356
  };
357
+ this.reloadWindow = (event) => {
358
+ event === null || event === void 0 ? void 0 : event.stopPropagation();
359
+ this.props.extension.reloadWindow();
360
+ };
344
361
  this.manage = (e) => {
345
362
  e.stopPropagation();
346
363
  this.props.extension.handleContextMenu(e);
@@ -348,25 +365,28 @@ class AbstractVSXExtensionComponent extends React.Component {
348
365
  }
349
366
  renderAction(host) {
350
367
  var _a;
351
- const extension = this.props.extension;
352
- const { builtin, busy, installed } = extension;
368
+ const { builtin, busy, plugin } = this.props.extension;
353
369
  const isFocused = ((_a = host === null || host === void 0 ? void 0 : host.model.getFocusedNode()) === null || _a === void 0 ? void 0 : _a.element) === this.props.extension;
354
370
  const tabIndex = (!host || isFocused) ? 0 : undefined;
371
+ const installed = !!plugin;
372
+ const outOfSynch = plugin === null || plugin === void 0 ? void 0 : plugin.metadata.outOfSync;
355
373
  if (builtin) {
356
374
  return React.createElement("div", { className: "codicon codicon-settings-gear action", tabIndex: tabIndex, onClick: this.manage });
357
375
  }
358
376
  if (busy) {
359
377
  if (installed) {
360
- return React.createElement("button", { className: "theia-button action theia-mod-disabled" }, "Uninstalling");
378
+ return React.createElement("button", { className: "theia-button action theia-mod-disabled" }, common_1.nls.localizeByDefault('Uninstalling'));
361
379
  }
362
- return React.createElement("button", { className: "theia-button action prominent theia-mod-disabled" }, "Installing");
380
+ return React.createElement("button", { className: "theia-button action prominent theia-mod-disabled" }, common_1.nls.localizeByDefault('Installing'));
363
381
  }
364
382
  if (installed) {
365
383
  return React.createElement("div", null,
366
- React.createElement("button", { className: "theia-button action", tabIndex: tabIndex, onClick: this.uninstall }, "Uninstall"),
367
- React.createElement("div", { className: "codicon codicon-settings-gear action", tabIndex: tabIndex, onClick: this.manage }));
384
+ outOfSynch
385
+ ? React.createElement("button", { className: "theia-button action", onClick: this.reloadWindow }, common_1.nls.localizeByDefault('Reload Required'))
386
+ : React.createElement("button", { className: "theia-button action", onClick: this.uninstall }, common_1.nls.localizeByDefault('Uninstall')),
387
+ React.createElement("div", { className: "codicon codicon-settings-gear action", onClick: this.manage }));
368
388
  }
369
- return React.createElement("button", { className: "theia-button prominent action", tabIndex: tabIndex, onClick: this.install }, "Install");
389
+ return React.createElement("button", { className: "theia-button prominent action", onClick: this.install }, common_1.nls.localizeByDefault('Install'));
370
390
  }
371
391
  }
372
392
  exports.AbstractVSXExtensionComponent = AbstractVSXExtensionComponent;
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/browser/vsx-extensions-widget.d.ts CHANGED
@@ -2,17 +2,24 @@ import { interfaces } from '@theia/core/shared/inversify';
2
2
  import { TreeNode } from '@theia/core/lib/browser';
3
3
  import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
4
4
  import { VSXExtensionsSource, VSXExtensionsSourceOptions } from './vsx-extensions-source';
5
+ import { BadgeWidget } from '@theia/core/lib/browser/view-container';
6
+ import { Emitter } from '@theia/core/lib/common';
5
7
  export declare class VSXExtensionsWidgetOptions extends VSXExtensionsSourceOptions {
6
8
  title?: string;
7
9
  }
8
10
  export declare const generateExtensionWidgetId: (widgetId: string) => string;
9
- export declare class VSXExtensionsWidget extends SourceTreeWidget {
11
+ export declare class VSXExtensionsWidget extends SourceTreeWidget implements BadgeWidget {
10
12
  static ID: string;
11
13
  static createWidget(parent: interfaces.Container, options: VSXExtensionsWidgetOptions): VSXExtensionsWidget;
12
14
  protected readonly options: VSXExtensionsWidgetOptions;
13
15
  protected readonly extensionsSource: VSXExtensionsSource;
14
16
  protected init(): void;
17
+ private _badge;
18
+ get badge(): number | undefined;
19
+ set badge(count: number | undefined);
20
+ onDidChangeBadge: Emitter<void>;
15
21
  protected computeTitle(): string;
22
+ protected resolveCount(): Promise<number | undefined>;
16
23
  protected tapNode(node?: TreeNode): void;
17
24
  protected handleDblClickEvent(): void;
18
25
  }
package/lib/browser/vsx-extensions-widget.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-widget.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-widget.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAc,UAAU,EAAyB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAG1F,qBACa,0BAA2B,SAAQ,0BAA0B;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,yBAAyB,aAAc,MAAM,KAAG,MAAiD,CAAC;AAE/G,qBACa,mBAAoB,SAAQ,gBAAgB;IAErD,MAAM,CAAC,EAAE,SAAoB;IAE7B,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,0BAA0B,GAAG,mBAAmB;IAc3G,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,mBAAmB,CAAC;cAGtC,IAAI,IAAI,IAAI;IAa/B,SAAS,CAAC,YAAY,IAAI,MAAM;cAeb,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI;cAK9B,mBAAmB,IAAI,IAAI;CAGjD"}
1
+ {"version":3,"file":"vsx-extensions-widget.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-widget.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAc,UAAU,EAAyB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAE1F,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,qBACa,0BAA2B,SAAQ,0BAA0B;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,yBAAyB,aAAc,MAAM,KAAG,MAAiD,CAAC;AAE/G,qBACa,mBAAoB,SAAQ,gBAAiB,YAAW,WAAW;IAE5E,MAAM,CAAC,EAAE,SAAoB;IAE7B,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,0BAA0B,GAAG,mBAAmB;IAc3G,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,mBAAmB,CAAC;cAGtC,IAAI,IAAI,IAAI;IAkB/B,OAAO,CAAC,MAAM,CAAiC;IAC/C,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAGlC;IAEM,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAuB;IAE7D,SAAS,CAAC,YAAY,IAAI,MAAM;cAehB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAQxC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI;cAK9B,mBAAmB,IAAI,IAAI;CAGjD"}
package/lib/browser/vsx-extensions-widget.js CHANGED
@@ -30,6 +30,7 @@ const inversify_1 = require("@theia/core/shared/inversify");
30
30
  const source_tree_1 = require("@theia/core/lib/browser/source-tree");
31
31
  const vsx_extensions_source_1 = require("./vsx-extensions-source");
32
32
  const nls_1 = require("@theia/core/lib/common/nls");
33
+ const common_1 = require("@theia/core/lib/common");
33
34
  let VSXExtensionsWidgetOptions = class VSXExtensionsWidgetOptions extends vsx_extensions_source_1.VSXExtensionsSourceOptions {
34
35
  };
35
36
  VSXExtensionsWidgetOptions = __decorate([
@@ -39,6 +40,11 @@ exports.VSXExtensionsWidgetOptions = VSXExtensionsWidgetOptions;
39
40
  const generateExtensionWidgetId = (widgetId) => VSXExtensionsWidget.ID + ':' + widgetId;
40
41
  exports.generateExtensionWidgetId = generateExtensionWidgetId;
41
42
  let VSXExtensionsWidget = VSXExtensionsWidget_1 = class VSXExtensionsWidget extends source_tree_1.SourceTreeWidget {
43
+ constructor() {
44
+ super(...arguments);
45
+ this._badge = undefined;
46
+ this.onDidChangeBadge = new common_1.Emitter();
47
+ }
42
48
  static createWidget(parent, options) {
43
49
  const child = source_tree_1.SourceTreeWidget.createContainer(parent, {
44
50
  virtualized: false,
@@ -56,11 +62,21 @@ let VSXExtensionsWidget = VSXExtensionsWidget_1 = class VSXExtensionsWidget exte
56
62
  super.init();
57
63
  this.addClass('theia-vsx-extensions');
58
64
  this.id = (0, exports.generateExtensionWidgetId)(this.options.id);
65
+ this.toDispose.push(this.extensionsSource);
66
+ this.source = this.extensionsSource;
59
67
  const title = (_a = this.options.title) !== null && _a !== void 0 ? _a : this.computeTitle();
60
68
  this.title.label = title;
61
69
  this.title.caption = title;
62
- this.toDispose.push(this.extensionsSource);
63
- this.source = this.extensionsSource;
70
+ this.toDispose.push(this.source.onDidChange(async () => {
71
+ this.badge = await this.resolveCount();
72
+ }));
73
+ }
74
+ get badge() {
75
+ return this._badge;
76
+ }
77
+ set badge(count) {
78
+ this._badge = count;
79
+ this.onDidChangeBadge.fire();
64
80
  }
65
81
  computeTitle() {
66
82
  switch (this.options.id) {
@@ -76,6 +92,14 @@ let VSXExtensionsWidget = VSXExtensionsWidget_1 = class VSXExtensionsWidget exte
76
92
  return '';
77
93
  }
78
94
  }
95
+ async resolveCount() {
96
+ var _a;
97
+ if (this.options.id !== vsx_extensions_source_1.VSXExtensionsSourceOptions.SEARCH_RESULT) {
98
+ const elements = await ((_a = this.source) === null || _a === void 0 ? void 0 : _a.getElements()) || [];
99
+ return [...elements].length;
100
+ }
101
+ return undefined;
102
+ }
79
103
  tapNode(node) {
80
104
  super.tapNode(node);
81
105
  this.model.openNode(node);
package/lib/browser/vsx-extensions-widget.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-widget.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-widget.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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;AAEhF,4DAA6F;AAE7F,qEAAuE;AACvE,mEAA0F;AAC1F,oDAAiD;AAGjD,IAAa,0BAA0B,GAAvC,MAAa,0BAA2B,SAAQ,kDAA0B;CAEzE,CAAA;AAFY,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CAEtC;AAFY,gEAA0B;AAIhC,MAAM,yBAAyB,GAAG,CAAC,QAAgB,EAAU,EAAE,CAAC,mBAAmB,CAAC,EAAE,GAAG,GAAG,GAAG,QAAQ,CAAC;AAAlG,QAAA,yBAAyB,6BAAyE;AAG/G,IAAa,mBAAmB,2BAAhC,MAAa,mBAAoB,SAAQ,8BAAgB;IAIrD,MAAM,CAAC,YAAY,CAAC,MAA4B,EAAE,OAAmC;QACjF,MAAM,KAAK,GAAG,8BAAgB,CAAC,eAAe,CAAC,MAAM,EAAE;YACnD,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,kDAA0B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAChE,KAAK,CAAC,IAAI,CAAC,2CAAmB,CAAC,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,CAAC,MAAM,CAAC,8BAAgB,CAAC,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAChE,KAAK,CAAC,IAAI,CAAC,qBAAmB,CAAC,CAAC,MAAM,EAAE,CAAC;QACzC,OAAO,KAAK,CAAC,GAAG,CAAC,qBAAmB,CAAC,CAAC;IAC1C,CAAC;IASkB,IAAI;;QACnB,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;QAEtC,IAAI,CAAC,EAAE,GAAG,IAAA,iCAAyB,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,KAAK,mCAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACxD,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;QAE3B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;IACxC,CAAC;IAES,YAAY;QAClB,QAAQ,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;YACrB,KAAK,kDAA0B,CAAC,SAAS;gBACrC,OAAO,SAAG,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAC9C,KAAK,kDAA0B,CAAC,QAAQ;gBACpC,OAAO,SAAG,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YAC7C,KAAK,kDAA0B,CAAC,WAAW;gBACvC,OAAO,SAAG,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;YAChD,KAAK,kDAA0B,CAAC,aAAa;gBACzC,OAAO,SAAG,CAAC,QAAQ,CAAC,4BAA4B,EAAE,mBAAmB,CAAC,CAAC;YAC3E;gBACI,OAAO,EAAE,CAAC;SACjB;IACL,CAAC;IAEkB,OAAO,CAAC,IAAe;QACtC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAEkB,mBAAmB;QAClC,gDAAgD;IACpD,CAAC;CACJ,CAAA;AA1DU,sBAAE,GAAG,gBAAgB,CAAC;AAgB7B;IADC,IAAA,kBAAM,EAAC,0BAA0B,CAAC;8BACP,0BAA0B;oDAAC;AAGvD;IADC,IAAA,kBAAM,EAAC,2CAAmB,CAAC;8BACS,2CAAmB;6DAAC;AAGzD;IADC,IAAA,yBAAa,GAAE;;;;+CAYf;AAnCQ,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CA4D/B;AA5DY,kDAAmB"}
1
+ {"version":3,"file":"vsx-extensions-widget.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-widget.ts"],"names":[],"mappings":"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"}
package/lib/common/vsx-extension-uri.d.ts CHANGED
@@ -1,6 +1,4 @@
1
- import URI from '@theia/core/lib/common/uri';
2
- export declare namespace VSXExtensionUri {
3
- function toUri(id: string): URI;
4
- function toId(uri: URI): string | undefined;
5
- }
1
+ import { VSCodeExtensionUri as VSXExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
2
+ /** @deprecated since 1.25.0. Import `VSCodeExtensionUri from `plugin-ext-vscode` package instead. */
3
+ export { VSXExtensionUri };
6
4
  //# sourceMappingURL=vsx-extension-uri.d.ts.map
package/lib/common/vsx-extension-uri.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension-uri.d.ts","sourceRoot":"","sources":["../../src/common/vsx-extension-uri.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,GAAG,CAErC;IACD,SAAgB,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAKjD;CACJ"}
1
+ {"version":3,"file":"vsx-extension-uri.d.ts","sourceRoot":"","sources":["../../src/common/vsx-extension-uri.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,kBAAkB,IAAI,eAAe,EAAE,MAAM,uDAAuD,CAAC;AAC9G,qGAAqG;AACrG,OAAO,EAAE,eAAe,EAAE,CAAC"}
package/lib/common/vsx-extension-uri.js CHANGED
@@ -16,19 +16,6 @@
16
16
  // *****************************************************************************
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.VSXExtensionUri = void 0;
19
- const uri_1 = require("@theia/core/lib/common/uri");
20
- var VSXExtensionUri;
21
- (function (VSXExtensionUri) {
22
- function toUri(id) {
23
- return new uri_1.default(`vscode:extension/${id}`);
24
- }
25
- VSXExtensionUri.toUri = toUri;
26
- function toId(uri) {
27
- if (uri.scheme === 'vscode' && uri.path.dir.toString() === 'extension') {
28
- return uri.path.base;
29
- }
30
- return undefined;
31
- }
32
- VSXExtensionUri.toId = toId;
33
- })(VSXExtensionUri = exports.VSXExtensionUri || (exports.VSXExtensionUri = {}));
19
+ const plugin_vscode_uri_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri");
20
+ Object.defineProperty(exports, "VSXExtensionUri", { enumerable: true, get: function () { return plugin_vscode_uri_1.VSCodeExtensionUri; } });
34
21
  //# sourceMappingURL=vsx-extension-uri.js.map
package/lib/common/vsx-extension-uri.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension-uri.js","sourceRoot":"","sources":["../../src/common/vsx-extension-uri.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,2EAA2E;AAC3E,gFAAgF;;;AAEhF,oDAA6C;AAE7C,IAAiB,eAAe,CAU/B;AAVD,WAAiB,eAAe;IAC5B,SAAgB,KAAK,CAAC,EAAU;QAC5B,OAAO,IAAI,aAAG,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC;IAFe,qBAAK,QAEpB,CAAA;IACD,SAAgB,IAAI,CAAC,GAAQ;QACzB,IAAI,GAAG,CAAC,MAAM,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,WAAW,EAAE;YACpE,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;SACxB;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IALe,oBAAI,OAKnB,CAAA;AACL,CAAC,EAVgB,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAU/B"}
1
+ {"version":3,"file":"vsx-extension-uri.js","sourceRoot":"","sources":["../../src/common/vsx-extension-uri.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,2EAA2E;AAC3E,gFAAgF;;;AAEhF,6FAA8G;AAErG,gGAFsB,sCAAe,OAEtB"}
package/lib/node/vsx-extension-resolver.js CHANGED
@@ -33,7 +33,7 @@ const uuid_1 = require("uuid");
33
33
  const inversify_1 = require("@theia/core/shared/inversify");
34
34
  const uri_1 = require("@theia/core/lib/common/uri");
35
35
  const plugin_protocol_1 = require("@theia/plugin-ext/lib/common/plugin-protocol");
36
- const vsx_extension_uri_1 = require("../common/vsx-extension-uri");
36
+ const plugin_vscode_uri_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri");
37
37
  const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
38
38
  const request_1 = require("@theia/core/shared/@theia/request");
39
39
  let VSXExtensionResolver = class VSXExtensionResolver {
@@ -43,10 +43,10 @@ let VSXExtensionResolver = class VSXExtensionResolver {
43
43
  fs.emptyDirSync(this.downloadPath);
44
44
  }
45
45
  accept(pluginId) {
46
- return !!vsx_extension_uri_1.VSXExtensionUri.toId(new uri_1.default(pluginId));
46
+ return !!plugin_vscode_uri_1.VSCodeExtensionUri.toId(new uri_1.default(pluginId));
47
47
  }
48
48
  async resolve(context) {
49
- const id = vsx_extension_uri_1.VSXExtensionUri.toId(new uri_1.default(context.getOriginId()));
49
+ const id = plugin_vscode_uri_1.VSCodeExtensionUri.toId(new uri_1.default(context.getOriginId()));
50
50
  if (!id) {
51
51
  return;
52
52
  }
@@ -77,15 +77,15 @@ let VSXExtensionResolver = class VSXExtensionResolver {
77
77
  context.addPlugin(resolvedId, extensionPath);
78
78
  }
79
79
  hasSameOrNewerVersion(id, extension) {
80
- const existingPlugin = this.pluginDeployerHandler.getDeployedPlugin(id);
81
- if (existingPlugin) {
80
+ const existingPlugins = this.pluginDeployerHandler.getDeployedPluginsById(id);
81
+ const sufficientVersion = existingPlugins.find(existingPlugin => {
82
82
  const existingVersion = semver.clean(existingPlugin.metadata.model.version);
83
83
  const desiredVersion = semver.clean(extension.version);
84
84
  if (desiredVersion && existingVersion && semver.gte(existingVersion, desiredVersion)) {
85
85
  return existingVersion;
86
86
  }
87
- }
88
- return undefined;
87
+ });
88
+ return sufficientVersion === null || sufficientVersion === void 0 ? void 0 : sufficientVersion.metadata.model.version;
89
89
  }
90
90
  async download(downloadUrl, downloadPath) {
91
91
  const context = await this.requestService.request({ url: downloadUrl });
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":"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"}
1
+ {"version":3,"file":"vsx-extension-resolver.js","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "name": "@theia/vsx-registry",
3
- "version": "1.27.0-next.37+5bfa6dd243c",
3
+ "version": "1.27.0-next.41+f6c0689dde8",
4
4
  "description": "Theia - VSX Registry",
5
5
  "dependencies": {
6
- "@theia/core": "1.27.0-next.37+5bfa6dd243c",
7
- "@theia/filesystem": "1.27.0-next.37+5bfa6dd243c",
8
- "@theia/ovsx-client": "1.27.0-next.37+5bfa6dd243c",
9
- "@theia/plugin-ext": "1.27.0-next.37+5bfa6dd243c",
10
- "@theia/plugin-ext-vscode": "1.27.0-next.37+5bfa6dd243c",
11
- "@theia/preferences": "1.27.0-next.37+5bfa6dd243c",
12
- "@theia/workspace": "1.27.0-next.37+5bfa6dd243c",
6
+ "@theia/core": "1.27.0-next.41+f6c0689dde8",
7
+ "@theia/filesystem": "1.27.0-next.41+f6c0689dde8",
8
+ "@theia/ovsx-client": "1.27.0-next.41+f6c0689dde8",
9
+ "@theia/plugin-ext": "1.27.0-next.41+f6c0689dde8",
10
+ "@theia/plugin-ext-vscode": "1.27.0-next.41+f6c0689dde8",
11
+ "@theia/preferences": "1.27.0-next.41+f6c0689dde8",
12
+ "@theia/workspace": "1.27.0-next.41+f6c0689dde8",
13
13
  "@types/showdown": "^1.7.1",
14
14
  "p-debounce": "^2.1.0",
15
15
  "semver": "^5.4.1",
@@ -55,5 +55,5 @@
55
55
  "nyc": {
56
56
  "extends": "../../configs/nyc.json"
57
57
  },
58
- "gitHead": "5bfa6dd243c0f6a3035eb4ae180a8af77d964e2b"
58
+ "gitHead": "f6c0689dde8b207726deab75bc3cb5cfdae6acfb"
59
59
  }
package/src/browser/vsx-extension-editor-manager.ts CHANGED
@@ -18,7 +18,7 @@ import { injectable } from '@theia/core/shared/inversify';
18
18
  import URI from '@theia/core/lib/common/uri';
19
19
  import { WidgetOpenHandler } from '@theia/core/lib/browser';
20
20
  import { VSXExtensionOptions } from './vsx-extension';
21
- import { VSXExtensionUri } from '../common/vsx-extension-uri';
21
+ import { VSCodeExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
22
22
  import { VSXExtensionEditor } from './vsx-extension-editor';
23
23
 
24
24
  @injectable()
@@ -27,12 +27,12 @@ export class VSXExtensionEditorManager extends WidgetOpenHandler<VSXExtensionEdi
27
27
  readonly id = VSXExtensionEditor.ID;
28
28
 
29
29
  canHandle(uri: URI): number {
30
- const id = VSXExtensionUri.toId(uri);
30
+ const id = VSCodeExtensionUri.toId(uri);
31
31
  return !!id ? 500 : 0;
32
32
  }
33
33
 
34
34
  protected createWidgetOptions(uri: URI): VSXExtensionOptions {
35
- const id = VSXExtensionUri.toId(uri);
35
+ const id = VSCodeExtensionUri.toId(uri);
36
36
  if (!id) {
37
37
  throw new Error('Invalid URI: ' + uri.toString());
38
38
  }
package/src/browser/vsx-extension.tsx CHANGED
@@ -22,15 +22,16 @@ import URI from '@theia/core/lib/common/uri';
22
22
  import { TreeElement, TreeElementNode } from '@theia/core/lib/browser/source-tree';
23
23
  import { OpenerService, open, OpenerOptions } from '@theia/core/lib/browser/opener-service';
24
24
  import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
25
- import { PluginServer, DeployedPlugin, PluginType } from '@theia/plugin-ext/lib/common/plugin-protocol';
26
- import { VSXExtensionUri } from '../common/vsx-extension-uri';
25
+ import { PluginServer, DeployedPlugin, PluginType, PluginIdentifiers } from '@theia/plugin-ext/lib/common/plugin-protocol';
26
+ import { VSCodeExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
27
27
  import { ProgressService } from '@theia/core/lib/common/progress-service';
28
28
  import { Endpoint } from '@theia/core/lib/browser/endpoint';
29
29
  import { VSXEnvironment } from '../common/vsx-environment';
30
30
  import { VSXExtensionsSearchModel } from './vsx-extensions-search-model';
31
- import { MenuPath } from '@theia/core/lib/common';
31
+ import { MenuPath, nls } from '@theia/core/lib/common';
32
32
  import { codicon, ContextMenuRenderer, TooltipService, TreeWidget } from '@theia/core/lib/browser';
33
33
  import { VSXExtensionNamespaceAccess, VSXUser } from '@theia/ovsx-client/lib/ovsx-types';
34
+ import { WindowService } from '@theia/core/lib/browser/window/window-service';
34
35
 
35
36
  export const EXTENSIONS_CONTEXT_MENU: MenuPath = ['extensions_context_menu'];
36
37
 
@@ -116,10 +117,13 @@ export class VSXExtension implements VSXExtensionData, TreeElement {
116
117
  @inject(TooltipService)
117
118
  readonly tooltipService: TooltipService;
118
119
 
120
+ @inject(WindowService)
121
+ readonly windowService: WindowService;
122
+
119
123
  protected readonly data: Partial<VSXExtensionData> = {};
120
124
 
121
125
  get uri(): URI {
122
- return VSXExtensionUri.toUri(this.id);
126
+ return VSCodeExtensionUri.toUri(this.id);
123
127
  }
124
128
 
125
129
  get id(): string {
@@ -131,7 +135,7 @@ export class VSXExtension implements VSXExtensionData, TreeElement {
131
135
  }
132
136
 
133
137
  get plugin(): DeployedPlugin | undefined {
134
- return this.pluginSupport.getPlugin(this.id);
138
+ return this.pluginSupport.getPlugin(this.id as PluginIdentifiers.UnversionedId);
135
139
  }
136
140
 
137
141
  get installed(): boolean {
@@ -152,6 +156,10 @@ export class VSXExtension implements VSXExtensionData, TreeElement {
152
156
  }
153
157
  }
154
158
 
159
+ reloadWindow(): void {
160
+ this.windowService.reload();
161
+ }
162
+
155
163
  protected getData<K extends keyof VSXExtensionData>(key: K): VSXExtensionData[K] {
156
164
  const plugin = this.plugin;
157
165
  const model = plugin && plugin.metadata.model;
@@ -285,7 +293,7 @@ export class VSXExtension implements VSXExtensionData, TreeElement {
285
293
  async install(): Promise<void> {
286
294
  this._busy++;
287
295
  try {
288
- await this.progressService.withProgress(`"Installing '${this.id}' extension...`, 'extensions', () =>
296
+ await this.progressService.withProgress(nls.localizeByDefault("Installing extension '{0}' v{1}...", this.id, this.version ?? 0), 'extensions', () =>
289
297
  this.pluginServer.deploy(this.uri.toString())
290
298
  );
291
299
  } finally {
@@ -296,9 +304,13 @@ export class VSXExtension implements VSXExtensionData, TreeElement {
296
304
  async uninstall(): Promise<void> {
297
305
  this._busy++;
298
306
  try {
299
- await this.progressService.withProgress(`Uninstalling '${this.id}' extension...`, 'extensions', () =>
300
- this.pluginServer.undeploy(this.id)
301
- );
307
+ const { plugin } = this;
308
+ if (plugin) {
309
+ await this.progressService.withProgress(
310
+ nls.localizeByDefault('Uninstalling {0}...', this.id), 'extensions',
311
+ () => this.pluginServer.uninstall(PluginIdentifiers.componentsToVersionedId(plugin.metadata.model))
312
+ );
313
+ }
302
314
  } finally {
303
315
  this._busy--;
304
316
  }
@@ -380,30 +392,43 @@ export abstract class AbstractVSXExtensionComponent<Props extends AbstractVSXExt
380
392
  }
381
393
  };
382
394
 
395
+ readonly reloadWindow = (event?: React.MouseEvent) => {
396
+ event?.stopPropagation();
397
+ this.props.extension.reloadWindow();
398
+ };
399
+
383
400
  protected readonly manage = (e: React.MouseEvent<HTMLElement, MouseEvent>) => {
384
401
  e.stopPropagation();
385
402
  this.props.extension.handleContextMenu(e);
386
403
  };
387
404
 
388
405
  protected renderAction(host?: TreeWidget): React.ReactNode {
389
- const extension = this.props.extension;
390
- const { builtin, busy, installed } = extension;
406
+ const { builtin, busy, plugin } = this.props.extension;
391
407
  const isFocused = (host?.model.getFocusedNode() as TreeElementNode)?.element === this.props.extension;
392
408
  const tabIndex = (!host || isFocused) ? 0 : undefined;
409
+ const installed = !!plugin;
410
+ const outOfSynch = plugin?.metadata.outOfSync;
393
411
  if (builtin) {
394
412
  return <div className="codicon codicon-settings-gear action" tabIndex={tabIndex} onClick={this.manage}></div>;
395
413
  }
396
414
  if (busy) {
397
415
  if (installed) {
398
- return <button className="theia-button action theia-mod-disabled">Uninstalling</button>;
416
+ return <button className="theia-button action theia-mod-disabled">{nls.localizeByDefault('Uninstalling')}</button>;
399
417
  }
400
- return <button className="theia-button action prominent theia-mod-disabled">Installing</button>;
418
+ return <button className="theia-button action prominent theia-mod-disabled">{nls.localizeByDefault('Installing')}</button>;
401
419
  }
402
420
  if (installed) {
403
- return <div><button className="theia-button action" tabIndex={tabIndex} onClick={this.uninstall}>Uninstall</button>
404
- <div className="codicon codicon-settings-gear action" tabIndex={tabIndex} onClick={this.manage}></div></div>;
421
+ return <div>
422
+ {
423
+ outOfSynch
424
+ ? <button className="theia-button action" onClick={this.reloadWindow}>{nls.localizeByDefault('Reload Required')}</button>
425
+ : <button className="theia-button action" onClick={this.uninstall}>{nls.localizeByDefault('Uninstall')}</button>
426
+ }
427
+
428
+ <div className="codicon codicon-settings-gear action" onClick={this.manage}></div>
429
+ </div>;
405
430
  }
406
- return <button className="theia-button prominent action" tabIndex={tabIndex} onClick={this.install}>Install</button>;
431
+ return <button className="theia-button prominent action" onClick={this.install}>{nls.localizeByDefault('Install')}</button>;
407
432
  }
408
433
 
409
434
  }
package/src/browser/vsx-extensions-widget.ts CHANGED
@@ -19,6 +19,8 @@ import { TreeNode } from '@theia/core/lib/browser';
19
19
  import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
20
20
  import { VSXExtensionsSource, VSXExtensionsSourceOptions } from './vsx-extensions-source';
21
21
  import { nls } from '@theia/core/lib/common/nls';
22
+ import { BadgeWidget } from '@theia/core/lib/browser/view-container';
23
+ import { Emitter } from '@theia/core/lib/common';
22
24
 
23
25
  @injectable()
24
26
  export class VSXExtensionsWidgetOptions extends VSXExtensionsSourceOptions {
@@ -28,7 +30,7 @@ export class VSXExtensionsWidgetOptions extends VSXExtensionsSourceOptions {
28
30
  export const generateExtensionWidgetId = (widgetId: string): string => VSXExtensionsWidget.ID + ':' + widgetId;
29
31
 
30
32
  @injectable()
31
- export class VSXExtensionsWidget extends SourceTreeWidget {
33
+ export class VSXExtensionsWidget extends SourceTreeWidget implements BadgeWidget {
32
34
 
33
35
  static ID = 'vsx-extensions';
34
36
 
@@ -57,14 +59,31 @@ export class VSXExtensionsWidget extends SourceTreeWidget {
57
59
  this.addClass('theia-vsx-extensions');
58
60
 
59
61
  this.id = generateExtensionWidgetId(this.options.id);
62
+
63
+ this.toDispose.push(this.extensionsSource);
64
+ this.source = this.extensionsSource;
65
+
60
66
  const title = this.options.title ?? this.computeTitle();
61
67
  this.title.label = title;
62
68
  this.title.caption = title;
63
69
 
64
- this.toDispose.push(this.extensionsSource);
65
- this.source = this.extensionsSource;
70
+ this.toDispose.push(this.source.onDidChange(async () => {
71
+ this.badge = await this.resolveCount();
72
+ }));
73
+ }
74
+
75
+ private _badge: number | undefined = undefined;
76
+ get badge(): number | undefined {
77
+ return this._badge;
78
+ }
79
+
80
+ set badge(count: number | undefined) {
81
+ this._badge = count;
82
+ this.onDidChangeBadge.fire();
66
83
  }
67
84
 
85
+ public onDidChangeBadge: Emitter<void> = new Emitter<void>();
86
+
68
87
  protected computeTitle(): string {
69
88
  switch (this.options.id) {
70
89
  case VSXExtensionsSourceOptions.INSTALLED:
@@ -80,6 +99,14 @@ export class VSXExtensionsWidget extends SourceTreeWidget {
80
99
  }
81
100
  }
82
101
 
102
+ protected async resolveCount(): Promise<number | undefined> {
103
+ if (this.options.id !== VSXExtensionsSourceOptions.SEARCH_RESULT) {
104
+ const elements = await this.source?.getElements() || [];
105
+ return [...elements].length;
106
+ }
107
+ return undefined;
108
+ }
109
+
83
110
  protected override tapNode(node?: TreeNode): void {
84
111
  super.tapNode(node);
85
112
  this.model.openNode(node);
package/src/common/vsx-extension-uri.ts CHANGED
@@ -14,16 +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 URI from '@theia/core/lib/common/uri';
17
+ import { VSCodeExtensionUri as VSXExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
18
+ /** @deprecated since 1.25.0. Import `VSCodeExtensionUri from `plugin-ext-vscode` package instead. */
19
+ export { VSXExtensionUri };
18
20
 
19
- export namespace VSXExtensionUri {
20
- export function toUri(id: string): URI {
21
- return new URI(`vscode:extension/${id}`);
22
- }
23
- export function toId(uri: URI): string | undefined {
24
- if (uri.scheme === 'vscode' && uri.path.dir.toString() === 'extension') {
25
- return uri.path.base;
26
- }
27
- return undefined;
28
- }
29
- }
package/src/node/vsx-extension-resolver.ts CHANGED
@@ -22,7 +22,7 @@ import { v4 as uuidv4 } from 'uuid';
22
22
  import { injectable, inject } from '@theia/core/shared/inversify';
23
23
  import URI from '@theia/core/lib/common/uri';
24
24
  import { PluginDeployerHandler, PluginDeployerResolver, PluginDeployerResolverContext } from '@theia/plugin-ext/lib/common/plugin-protocol';
25
- import { VSXExtensionUri } from '../common/vsx-extension-uri';
25
+ import { VSCodeExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
26
26
  import { OVSXClientProvider } from '../common/ovsx-client-provider';
27
27
  import { VSXExtensionRaw } from '@theia/ovsx-client';
28
28
  import { RequestService } from '@theia/core/shared/@theia/request';
@@ -48,11 +48,11 @@ export class VSXExtensionResolver implements PluginDeployerResolver {
48
48
  }
49
49
 
50
50
  accept(pluginId: string): boolean {
51
- return !!VSXExtensionUri.toId(new URI(pluginId));
51
+ return !!VSCodeExtensionUri.toId(new URI(pluginId));
52
52
  }
53
53
 
54
54
  async resolve(context: PluginDeployerResolverContext): Promise<void> {
55
- const id = VSXExtensionUri.toId(new URI(context.getOriginId()));
55
+ const id = VSCodeExtensionUri.toId(new URI(context.getOriginId()));
56
56
  if (!id) {
57
57
  return;
58
58
  }
@@ -86,15 +86,15 @@ export class VSXExtensionResolver implements PluginDeployerResolver {
86
86
  }
87
87
 
88
88
  protected hasSameOrNewerVersion(id: string, extension: VSXExtensionRaw): string | undefined {
89
- const existingPlugin = this.pluginDeployerHandler.getDeployedPlugin(id);
90
- if (existingPlugin) {
89
+ const existingPlugins = this.pluginDeployerHandler.getDeployedPluginsById(id);
90
+ const sufficientVersion = existingPlugins.find(existingPlugin => {
91
91
  const existingVersion = semver.clean(existingPlugin.metadata.model.version);
92
92
  const desiredVersion = semver.clean(extension.version);
93
93
  if (desiredVersion && existingVersion && semver.gte(existingVersion, desiredVersion)) {
94
94
  return existingVersion;
95
95
  }
96
- }
97
- return undefined;
96
+ });
97
+ return sufficientVersion?.metadata.model.version;
98
98
  }
99
99
 
100
100
  protected async download(downloadUrl: string, downloadPath: string): Promise<boolean> {