@theia/dev-container 1.72.0-next.59 → 1.72.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 (90) hide show
  1. package/lib/electron-browser/container-connection-contribution.d.ts +5 -2
  2. package/lib/electron-browser/container-connection-contribution.d.ts.map +1 -1
  3. package/lib/electron-browser/container-connection-contribution.js +130 -30
  4. package/lib/electron-browser/container-connection-contribution.js.map +1 -1
  5. package/lib/electron-browser/container-output-provider.d.ts.map +1 -1
  6. package/lib/electron-browser/container-output-provider.js +3 -1
  7. package/lib/electron-browser/container-output-provider.js.map +1 -1
  8. package/lib/electron-browser/dev-container-frontend-module.d.ts.map +1 -1
  9. package/lib/electron-browser/dev-container-frontend-module.js +5 -0
  10. package/lib/electron-browser/dev-container-frontend-module.js.map +1 -1
  11. package/lib/electron-browser/dev-container-startup-contribution.d.ts +15 -0
  12. package/lib/electron-browser/dev-container-startup-contribution.d.ts.map +1 -0
  13. package/lib/electron-browser/dev-container-startup-contribution.js +94 -0
  14. package/lib/electron-browser/dev-container-startup-contribution.js.map +1 -0
  15. package/lib/electron-common/dev-container-preferences.d.ts +12 -0
  16. package/lib/electron-common/dev-container-preferences.d.ts.map +1 -0
  17. package/lib/electron-common/dev-container-preferences.js +44 -0
  18. package/lib/electron-common/dev-container-preferences.js.map +1 -0
  19. package/lib/electron-common/remote-container-connection-provider.d.ts +20 -1
  20. package/lib/electron-common/remote-container-connection-provider.d.ts.map +1 -1
  21. package/lib/electron-node/dev-container-backend-module.d.ts.map +1 -1
  22. package/lib/electron-node/dev-container-backend-module.js +4 -0
  23. package/lib/electron-node/dev-container-backend-module.js.map +1 -1
  24. package/lib/electron-node/dev-container-cli-contribution.d.ts +19 -0
  25. package/lib/electron-node/dev-container-cli-contribution.d.ts.map +1 -0
  26. package/lib/electron-node/dev-container-cli-contribution.js +66 -0
  27. package/lib/electron-node/dev-container-cli-contribution.js.map +1 -0
  28. package/lib/electron-node/dev-container-cli-contribution.spec.d.ts +2 -0
  29. package/lib/electron-node/dev-container-cli-contribution.spec.d.ts.map +1 -0
  30. package/lib/electron-node/dev-container-cli-contribution.spec.js +91 -0
  31. package/lib/electron-node/dev-container-cli-contribution.spec.js.map +1 -0
  32. package/lib/electron-node/dev-container-file-service.d.ts +4 -4
  33. package/lib/electron-node/dev-container-file-service.d.ts.map +1 -1
  34. package/lib/electron-node/dev-container-file-service.js +9 -9
  35. package/lib/electron-node/dev-container-file-service.js.map +1 -1
  36. package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts +6 -2
  37. package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts.map +1 -1
  38. package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js +24 -4
  39. package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js.map +1 -1
  40. package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.d.ts +7 -6
  41. package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.d.ts.map +1 -1
  42. package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.js +4 -9
  43. package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.js.map +1 -1
  44. package/lib/electron-node/devcontainer-util.d.ts +19 -0
  45. package/lib/electron-node/devcontainer-util.d.ts.map +1 -0
  46. package/lib/electron-node/devcontainer-util.js +48 -0
  47. package/lib/electron-node/devcontainer-util.js.map +1 -0
  48. package/lib/electron-node/devcontainer-util.spec.d.ts +2 -0
  49. package/lib/electron-node/devcontainer-util.spec.d.ts.map +1 -0
  50. package/lib/electron-node/devcontainer-util.spec.js +128 -0
  51. package/lib/electron-node/devcontainer-util.spec.js.map +1 -0
  52. package/lib/electron-node/docker-container-service.d.ts +3 -3
  53. package/lib/electron-node/docker-container-service.d.ts.map +1 -1
  54. package/lib/electron-node/docker-container-service.js +3 -4
  55. package/lib/electron-node/docker-container-service.js.map +1 -1
  56. package/lib/electron-node/remote-container-connection-provider.d.ts +27 -66
  57. package/lib/electron-node/remote-container-connection-provider.d.ts.map +1 -1
  58. package/lib/electron-node/remote-container-connection-provider.js +269 -311
  59. package/lib/electron-node/remote-container-connection-provider.js.map +1 -1
  60. package/lib/electron-node/remote-docker-container-connection.d.ts +50 -0
  61. package/lib/electron-node/remote-docker-container-connection.d.ts.map +1 -0
  62. package/lib/electron-node/remote-docker-container-connection.js +239 -0
  63. package/lib/electron-node/remote-docker-container-connection.js.map +1 -0
  64. package/lib/electron-node/remote-docker-container-connection.spec.d.ts +2 -0
  65. package/lib/electron-node/remote-docker-container-connection.spec.d.ts.map +1 -0
  66. package/lib/electron-node/remote-docker-container-connection.spec.js +217 -0
  67. package/lib/electron-node/remote-docker-container-connection.spec.js.map +1 -0
  68. package/package.json +7 -7
  69. package/src/electron-browser/container-connection-contribution.ts +155 -38
  70. package/src/electron-browser/container-output-provider.ts +3 -1
  71. package/src/electron-browser/dev-container-frontend-module.ts +6 -0
  72. package/src/electron-browser/dev-container-startup-contribution.ts +99 -0
  73. package/src/electron-common/dev-container-preferences.ts +53 -0
  74. package/src/electron-common/remote-container-connection-provider.ts +23 -1
  75. package/src/electron-node/dev-container-backend-module.ts +5 -0
  76. package/src/electron-node/dev-container-cli-contribution.spec.ts +106 -0
  77. package/src/electron-node/dev-container-cli-contribution.ts +68 -0
  78. package/src/electron-node/dev-container-file-service.ts +10 -10
  79. package/src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts +29 -5
  80. package/src/electron-node/devcontainer-contributions/variable-resolver-contribution.ts +11 -11
  81. package/src/electron-node/devcontainer-util.spec.ts +154 -0
  82. package/src/electron-node/devcontainer-util.ts +49 -0
  83. package/src/electron-node/docker-container-service.ts +6 -7
  84. package/src/electron-node/remote-container-connection-provider.ts +274 -366
  85. package/src/electron-node/{remote-container-connection-provider.spec.ts → remote-docker-container-connection.spec.ts} +105 -4
  86. package/src/electron-node/remote-docker-container-connection.ts +290 -0
  87. package/lib/electron-node/remote-container-connection-provider.spec.d.ts +0 -2
  88. package/lib/electron-node/remote-container-connection-provider.spec.d.ts.map +0 -1
  89. package/lib/electron-node/remote-container-connection-provider.spec.js +0 -131
  90. package/lib/electron-node/remote-container-connection-provider.spec.js.map +0 -1
package/lib/electron-common/remote-container-connection-provider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/remote-container-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGtD,eAAO,MAAM,qCAAqC,sBAAsB,CAAC;AAEzE,eAAO,MAAM,iCAAiC,eAA8C,CAAC;AAE7F,MAAM,WAAW,0BAA0B;IACvC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,oBAAoB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,iCAAkC,SAAQ,SAAS,CAAC,uBAAuB,CAAC;IACzF,kBAAkB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC5F,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACzE,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAAC;IACjF,qBAAqB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IACzD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC3E,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD"}
1
+ {"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/remote-container-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGtD,eAAO,MAAM,qCAAqC,sBAAsB,CAAC;AAEzE,eAAO,MAAM,iCAAiC,eAA8C,CAAC;AAE7F,MAAM,WAAW,0BAA0B;IACvC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,oBAAoB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,+CAA+C;IAC/C,MAAM,EAAE,aAAa,GAAG,YAAY,GAAG,oBAAoB,GAAG,UAAU,CAAC;CAC5E;AAED,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,iCAAkC,SAAQ,SAAS,CAAC,uBAAuB,CAAC;IACzF,kBAAkB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC5F,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACzE,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAAC;IACjF,qBAAqB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IACzD,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAC3E,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACnG,sBAAsB,IAAI,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;IACnE,iBAAiB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACvF,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD"}
package/lib/electron-node/dev-container-backend-module.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dev-container-backend-module.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAiB/D,eAAO,MAAM,sBAAsB,iBAkBjC,CAAC;;AAEH,wBAeG"}
1
+ {"version":3,"file":"dev-container-backend-module.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAmB/D,eAAO,MAAM,sBAAsB,iBAkBjC,CAAC;;AAEH,wBAkBG"}
package/lib/electron-node/dev-container-backend-module.js CHANGED
@@ -18,6 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.remoteConnectionModule = void 0;
19
19
  const inversify_1 = require("@theia/core/shared/inversify");
20
20
  const connection_container_module_1 = require("@theia/core/lib/node/messaging/connection-container-module");
21
+ const dev_container_cli_contribution_1 = require("./dev-container-cli-contribution");
22
+ const node_1 = require("@theia/core/lib/node");
21
23
  const remote_container_connection_provider_1 = require("./remote-container-connection-provider");
22
24
  const remote_container_connection_provider_2 = require("../electron-common/remote-container-connection-provider");
23
25
  const docker_container_service_1 = require("./docker-container-service");
@@ -59,5 +61,7 @@ exports.default = new inversify_1.ContainerModule((bind, unbind, isBound, rebind
59
61
  bind(remote_cli_contribution_1.RemoteCliContribution).toService(cli_enhancing_creation_contributions_1.SettingsContribution);
60
62
  bind(dev_container_workspace_handler_1.DevContainerWorkspaceHandler).toSelf().inSingletonScope();
61
63
  bind(default_workspace_server_1.WorkspaceHandlerContribution).toService(dev_container_workspace_handler_1.DevContainerWorkspaceHandler);
64
+ bind(dev_container_cli_contribution_1.DevContainerCliContribution).toSelf().inSingletonScope();
65
+ bind(node_1.CliContribution).toService(dev_container_cli_contribution_1.DevContainerCliContribution);
62
66
  });
63
67
  //# sourceMappingURL=dev-container-backend-module.js.map
package/lib/electron-node/dev-container-backend-module.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dev-container-backend-module.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dev-container-backend-module.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":"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"}
package/lib/electron-node/dev-container-cli-contribution.d.ts ADDED
@@ -0,0 +1,19 @@
1
+ import { CliContribution } from '@theia/core/lib/node';
2
+ import { Arguments, Argv } from '@theia/core/shared/yargs';
3
+ /**
4
+ * Handles the `--attach-container` CLI argument and stashes the value.
5
+ */
6
+ export declare class DevContainerCliContribution implements CliContribution {
7
+ protected attachContainerId: string | undefined;
8
+ protected scanForDevJson: boolean;
9
+ configure(conf: Argv): void;
10
+ setArguments(args: Arguments): void;
11
+ getAttachContainerId(): string | undefined;
12
+ /**
13
+ * Returns and clears the attach container ID so the startup attach flow
14
+ * runs at most once (the window reloads after connecting to the remote).
15
+ */
16
+ consumeAttachContainerId(): string | undefined;
17
+ shouldScanForDevJson(): boolean;
18
+ }
19
+ //# sourceMappingURL=dev-container-cli-contribution.d.ts.map
package/lib/electron-node/dev-container-cli-contribution.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dev-container-cli-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-cli-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAE3D;;GAEG;AACH,qBACa,2BAA4B,YAAW,eAAe;IAE/D,SAAS,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhD,SAAS,CAAC,cAAc,EAAE,OAAO,CAAQ;IAEzC,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAY3B,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAQnC,oBAAoB,IAAI,MAAM,GAAG,SAAS;IAI1C;;;OAGG;IACH,wBAAwB,IAAI,MAAM,GAAG,SAAS;IAM9C,oBAAoB,IAAI,OAAO;CAGlC"}
package/lib/electron-node/dev-container-cli-contribution.js ADDED
@@ -0,0 +1,66 @@
1
+ "use strict";
2
+ // *****************************************************************************
3
+ // Copyright (C) 2026 EclipseSource GmbH and others.
4
+ //
5
+ // This program and the accompanying materials are made available under the
6
+ // terms of the Eclipse Public License v. 2.0 which is available at
7
+ // http://www.eclipse.org/legal/epl-2.0.
8
+ //
9
+ // This Source Code may also be made available under the following Secondary
10
+ // Licenses when the conditions for such availability set forth in the Eclipse
11
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
+ // with the GNU Classpath Exception which is available at
13
+ // https://www.gnu.org/software/classpath/license.html.
14
+ //
15
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
+ // *****************************************************************************
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ exports.DevContainerCliContribution = void 0;
19
+ const tslib_1 = require("tslib");
20
+ const inversify_1 = require("@theia/core/shared/inversify");
21
+ /**
22
+ * Handles the `--attach-container` CLI argument and stashes the value.
23
+ */
24
+ let DevContainerCliContribution = class DevContainerCliContribution {
25
+ constructor() {
26
+ this.scanForDevJson = true;
27
+ }
28
+ configure(conf) {
29
+ conf.option('attach-container', {
30
+ description: 'Attach to a running Docker container by ID or name on startup',
31
+ type: 'string'
32
+ });
33
+ conf.option('dev-json', {
34
+ description: 'Scan for and apply devcontainer.json when attaching to a container (use --no-dev-json to skip)',
35
+ type: 'boolean',
36
+ default: true
37
+ });
38
+ }
39
+ setArguments(args) {
40
+ if (args['attach-container'] !== undefined) {
41
+ const id = String(args['attach-container']).trim();
42
+ this.attachContainerId = id.length > 0 ? id : undefined;
43
+ }
44
+ this.scanForDevJson = args['dev-json'] !== false;
45
+ }
46
+ getAttachContainerId() {
47
+ return this.attachContainerId;
48
+ }
49
+ /**
50
+ * Returns and clears the attach container ID so the startup attach flow
51
+ * runs at most once (the window reloads after connecting to the remote).
52
+ */
53
+ consumeAttachContainerId() {
54
+ const id = this.attachContainerId;
55
+ this.attachContainerId = undefined;
56
+ return id;
57
+ }
58
+ shouldScanForDevJson() {
59
+ return this.scanForDevJson;
60
+ }
61
+ };
62
+ exports.DevContainerCliContribution = DevContainerCliContribution;
63
+ exports.DevContainerCliContribution = DevContainerCliContribution = tslib_1.__decorate([
64
+ (0, inversify_1.injectable)()
65
+ ], DevContainerCliContribution);
66
+ //# sourceMappingURL=dev-container-cli-contribution.js.map
package/lib/electron-node/dev-container-cli-contribution.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dev-container-cli-contribution.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-cli-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAGhF,4DAA0D;AAG1D;;GAEG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAAjC;QAIO,mBAAc,GAAY,IAAI,CAAC;IAuC7C,CAAC;IArCG,SAAS,CAAC,IAAU;QAChB,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAC5B,WAAW,EAAE,+DAA+D;YAC5E,IAAI,EAAE,QAAQ;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACpB,WAAW,EAAE,gGAAgG;YAC7G,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,IAAI;SAChB,CAAC,CAAC;IACP,CAAC;IAED,YAAY,CAAC,IAAe;QACxB,IAAI,IAAI,CAAC,kBAAkB,CAAC,KAAK,SAAS,EAAE,CAAC;YACzC,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACnD,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5D,CAAC;QACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,CAAC;IACrD,CAAC;IAED,oBAAoB;QAChB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,CAAC;IAED;;;OAGG;IACH,wBAAwB;QACpB,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAClC,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;QACnC,OAAO,EAAE,CAAC;IACd,CAAC;IAED,oBAAoB;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;CACJ,CAAA;AA3CY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CA2CvC"}
package/lib/electron-node/dev-container-cli-contribution.spec.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=dev-container-cli-contribution.spec.d.ts.map
package/lib/electron-node/dev-container-cli-contribution.spec.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dev-container-cli-contribution.spec.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-cli-contribution.spec.ts"],"names":[],"mappings":""}
package/lib/electron-node/dev-container-cli-contribution.spec.js ADDED
@@ -0,0 +1,91 @@
1
+ "use strict";
2
+ // *****************************************************************************
3
+ // Copyright (C) 2026 EclipseSource GmbH and others.
4
+ //
5
+ // This program and the accompanying materials are made available under the
6
+ // terms of the Eclipse Public License v. 2.0 which is available at
7
+ // http://www.eclipse.org/legal/epl-2.0.
8
+ //
9
+ // This Source Code may also be made available under the following Secondary
10
+ // Licenses when the conditions for such availability set forth in the Eclipse
11
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
+ // with the GNU Classpath Exception which is available at
13
+ // https://www.gnu.org/software/classpath/license.html.
14
+ //
15
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
+ // *****************************************************************************
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ const chai_1 = require("chai");
19
+ const dev_container_cli_contribution_1 = require("./dev-container-cli-contribution");
20
+ function createArgs(overrides = {}) {
21
+ return {
22
+ _: [],
23
+ '$0': '',
24
+ ...overrides
25
+ };
26
+ }
27
+ describe('DevContainerCliContribution', () => {
28
+ describe('setArguments / getAttachContainerId', () => {
29
+ it('should return undefined when --attach-container not provided', () => {
30
+ const contribution = new dev_container_cli_contribution_1.DevContainerCliContribution();
31
+ contribution.setArguments(createArgs());
32
+ (0, chai_1.expect)(contribution.getAttachContainerId()).to.be.undefined;
33
+ });
34
+ it('should stash container ID from --attach-container', () => {
35
+ const contribution = new dev_container_cli_contribution_1.DevContainerCliContribution();
36
+ contribution.setArguments(createArgs({ 'attach-container': 'abc123' }));
37
+ (0, chai_1.expect)(contribution.getAttachContainerId()).to.equal('abc123');
38
+ });
39
+ it('should convert numeric container ID to string', () => {
40
+ const contribution = new dev_container_cli_contribution_1.DevContainerCliContribution();
41
+ contribution.setArguments(createArgs({ 'attach-container': 12345 }));
42
+ (0, chai_1.expect)(contribution.getAttachContainerId()).to.equal('12345');
43
+ });
44
+ it('should ignore empty string --attach-container', () => {
45
+ const contribution = new dev_container_cli_contribution_1.DevContainerCliContribution();
46
+ contribution.setArguments(createArgs({ 'attach-container': '' }));
47
+ (0, chai_1.expect)(contribution.getAttachContainerId()).to.be.undefined;
48
+ });
49
+ it('should ignore whitespace-only --attach-container', () => {
50
+ const contribution = new dev_container_cli_contribution_1.DevContainerCliContribution();
51
+ contribution.setArguments(createArgs({ 'attach-container': ' ' }));
52
+ (0, chai_1.expect)(contribution.getAttachContainerId()).to.be.undefined;
53
+ });
54
+ });
55
+ describe('consumeAttachContainerId', () => {
56
+ it('should return the container ID and clear it', () => {
57
+ const contribution = new dev_container_cli_contribution_1.DevContainerCliContribution();
58
+ contribution.setArguments(createArgs({ 'attach-container': 'abc123' }));
59
+ (0, chai_1.expect)(contribution.consumeAttachContainerId()).to.equal('abc123');
60
+ (0, chai_1.expect)(contribution.consumeAttachContainerId()).to.be.undefined;
61
+ (0, chai_1.expect)(contribution.getAttachContainerId()).to.be.undefined;
62
+ });
63
+ it('should return undefined when no ID was set', () => {
64
+ const contribution = new dev_container_cli_contribution_1.DevContainerCliContribution();
65
+ contribution.setArguments(createArgs());
66
+ (0, chai_1.expect)(contribution.consumeAttachContainerId()).to.be.undefined;
67
+ });
68
+ });
69
+ describe('shouldScanForDevJson', () => {
70
+ it('should default to true', () => {
71
+ const contribution = new dev_container_cli_contribution_1.DevContainerCliContribution();
72
+ (0, chai_1.expect)(contribution.shouldScanForDevJson()).to.be.true;
73
+ });
74
+ it('should remain true when --dev-json is true', () => {
75
+ const contribution = new dev_container_cli_contribution_1.DevContainerCliContribution();
76
+ contribution.setArguments(createArgs({ 'dev-json': true }));
77
+ (0, chai_1.expect)(contribution.shouldScanForDevJson()).to.be.true;
78
+ });
79
+ it('should be false when --dev-json is false', () => {
80
+ const contribution = new dev_container_cli_contribution_1.DevContainerCliContribution();
81
+ contribution.setArguments(createArgs({ 'dev-json': false }));
82
+ (0, chai_1.expect)(contribution.shouldScanForDevJson()).to.be.false;
83
+ });
84
+ it('should be true when --dev-json is undefined', () => {
85
+ const contribution = new dev_container_cli_contribution_1.DevContainerCliContribution();
86
+ contribution.setArguments(createArgs({ 'dev-json': undefined }));
87
+ (0, chai_1.expect)(contribution.shouldScanForDevJson()).to.be.true;
88
+ });
89
+ });
90
+ });
91
+ //# sourceMappingURL=dev-container-cli-contribution.spec.js.map
package/lib/electron-node/dev-container-cli-contribution.spec.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dev-container-cli-contribution.spec.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-cli-contribution.spec.ts"],"names":[],"mappings":"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"}
package/lib/electron-node/dev-container-file-service.d.ts CHANGED
@@ -2,13 +2,13 @@ import { WorkspaceServer } from '@theia/workspace/lib/common';
2
2
  import { DevContainerFile } from '../electron-common/remote-container-connection-provider';
3
3
  import { DevContainerConfiguration } from './devcontainer-file';
4
4
  import { ContributionProvider } from '@theia/core';
5
- import { VariableResolverContribution } from './devcontainer-contributions/variable-resolver-contribution';
5
+ import { VariableContext, VariableResolverContribution } from './devcontainer-contributions/variable-resolver-contribution';
6
6
  export declare class DevContainerFileService {
7
7
  protected readonly workspaceServer: WorkspaceServer;
8
8
  protected readonly variableResolverContributions: ContributionProvider<VariableResolverContribution>;
9
- protected resolveVariable(value: string): string;
10
- protected resolveVariablesRecursively<T>(obj: T): T;
11
- getConfiguration(path: string): Promise<DevContainerConfiguration>;
9
+ protected resolveVariable(value: string, context?: VariableContext): string;
10
+ protected resolveVariablesRecursively<T>(obj: T, context?: VariableContext): T;
11
+ getConfiguration(path: string, context?: VariableContext): Promise<DevContainerConfiguration>;
12
12
  getAvailableFiles(workspace: string): Promise<DevContainerFile[]>;
13
13
  protected searchForDevontainerJsonFiles(directory: string, depth: number): Promise<string[]>;
14
14
  }
package/lib/electron-node/dev-container-file-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dev-container-file-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAE,oBAAoB,EAAa,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,6DAA6D,CAAC;AAI3G,qBACa,uBAAuB;IAGhC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,EAAE,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;IAErG,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAWhD,SAAS,CAAC,2BAA2B,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAe7C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAWlE,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;cAUvD,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBrG"}
1
+ {"version":3,"file":"dev-container-file-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAE,oBAAoB,EAAa,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,4BAA4B,EAAE,MAAM,6DAA6D,CAAC;AAI5H,qBACa,uBAAuB;IAGhC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,EAAE,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;IAErG,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,MAAM;IAW3E,SAAS,CAAC,2BAA2B,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,CAAC;IAexE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAW7F,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;cAUvD,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBrG"}
package/lib/electron-node/dev-container-file-service.js CHANGED
@@ -25,38 +25,38 @@ const core_1 = require("@theia/core");
25
25
  const variable_resolver_contribution_1 = require("./devcontainer-contributions/variable-resolver-contribution");
26
26
  const VARIABLE_REGEX = /\$\{(.+?)(?::(.+?))?\}/g;
27
27
  let DevContainerFileService = class DevContainerFileService {
28
- resolveVariable(value) {
28
+ resolveVariable(value, context) {
29
29
  return value.replace(VARIABLE_REGEX, (match, type, variable) => {
30
30
  for (const contribution of this.variableResolverContributions.getContributions()) {
31
- if (contribution.canResolve(type)) {
32
- return contribution.resolve(variable ?? type);
31
+ if (contribution.canResolve(type, context)) {
32
+ return contribution.resolve(variable ?? type, context);
33
33
  }
34
34
  }
35
35
  return match;
36
36
  });
37
37
  }
38
- resolveVariablesRecursively(obj) {
38
+ resolveVariablesRecursively(obj, context) {
39
39
  if (typeof obj === 'string') {
40
- return this.resolveVariable(obj);
40
+ return this.resolveVariable(obj, context);
41
41
  }
42
42
  else if (Array.isArray(obj)) {
43
- return obj.map(item => this.resolveVariablesRecursively(item));
43
+ return obj.map(item => this.resolveVariablesRecursively(item, context));
44
44
  }
45
45
  else if (obj && typeof obj === 'object') {
46
46
  const newObj = {};
47
47
  for (const [key, value] of Object.entries(obj)) {
48
- newObj[key] = this.resolveVariablesRecursively(value);
48
+ newObj[key] = this.resolveVariablesRecursively(value, context);
49
49
  }
50
50
  return newObj;
51
51
  }
52
52
  return obj;
53
53
  }
54
- async getConfiguration(path) {
54
+ async getConfiguration(path, context) {
55
55
  let configuration = (0, jsonc_parser_1.parse)(await fs.readFile(path, 'utf-8').catch(() => '0'));
56
56
  if (!configuration) {
57
57
  throw new Error(`devcontainer file ${path} could not be parsed`);
58
58
  }
59
- configuration = this.resolveVariablesRecursively(configuration);
59
+ configuration = this.resolveVariablesRecursively(configuration, context);
60
60
  configuration.location = path;
61
61
  return configuration;
62
62
  }
package/lib/electron-node/dev-container-file-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dev-container-file-service.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dev-container-file-service.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"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"}
package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts CHANGED
@@ -5,7 +5,7 @@ import { DevContainerConfiguration, DockerfileContainer, ImageContainer } from '
5
5
  import { ILogger } from '@theia/core';
6
6
  import { ContainerOutputProvider } from '../../electron-common/container-output-provider';
7
7
  import { ForwardedPort, RemotePortForwardingProvider } from '@theia/remote/lib/electron-common/remote-port-forwarding-provider';
8
- import { RemoteDockerContainerConnection } from '../remote-container-connection-provider';
8
+ import { RemoteDockerContainerConnection } from '../remote-docker-container-connection';
9
9
  export declare function registerContainerCreationContributions(bind: interfaces.Bind): void;
10
10
  export declare class ImageFileContribution implements ContainerCreationContribution {
11
11
  handleContainerCreation(createOptions: Docker.ContainerCreateOptions, containerConfig: ImageContainer, api: Docker, outputprovider: ContainerOutputProvider): Promise<void>;
@@ -62,6 +62,10 @@ export declare namespace OutputHelper {
62
62
  status?: string;
63
63
  progress?: string;
64
64
  }
65
- function parseProgress(progress: Progress): string;
65
+ interface DedupContext {
66
+ lastMessage: string;
67
+ }
68
+ function createDedupContext(): DedupContext;
69
+ function parseProgress(progress: Progress, dedup?: DedupContext): string;
66
70
  }
67
71
  //# sourceMappingURL=main-container-creation-contributions.d.ts.map
package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"main-container-creation-contributions.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main-container-creation-contributions.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts"],"names":[],"mappings":"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"}
package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js CHANGED
@@ -32,6 +32,7 @@ let ImageFileContribution = class ImageFileContribution {
32
32
  const platform = process.platform;
33
33
  const arch = process.arch;
34
34
  const options = platform === 'darwin' && arch === 'arm64' ? { platform: 'amd64' } : {};
35
+ const dedup = OutputHelper.createDedupContext();
35
36
  await new Promise((res, rej) => api.pull(containerConfig.image, options, (err, stream) => {
36
37
  if (err) {
37
38
  rej(err);
@@ -42,7 +43,7 @@ let ImageFileContribution = class ImageFileContribution {
42
43
  else {
43
44
  api.modem.followProgress(stream, (error, output) => error ?
44
45
  rej(error) :
45
- res(), progress => outputprovider.onRemoteOutput(OutputHelper.parseProgress(progress)));
46
+ res(), progress => outputprovider.onRemoteOutput(OutputHelper.parseProgress(progress, dedup)));
46
47
  }
47
48
  }));
48
49
  createOptions.Image = containerConfig.image;
@@ -69,6 +70,7 @@ let DockerFileContribution = class DockerFileContribution {
69
70
  buildargs: containerConfig.build?.args
70
71
  });
71
72
  // TODO probably have some console windows showing the output of the build
73
+ const dedup = OutputHelper.createDedupContext();
72
74
  const imageId = await new Promise((res, rej) => api.modem.followProgress(buildStream, (err, outputs) => {
73
75
  if (err) {
74
76
  rej(err);
@@ -81,7 +83,7 @@ let DockerFileContribution = class DockerFileContribution {
81
83
  }
82
84
  }
83
85
  }
84
- }, progress => outputprovider.onRemoteOutput(OutputHelper.parseProgress(progress))));
86
+ }, progress => outputprovider.onRemoteOutput(OutputHelper.parseProgress(progress, dedup))));
85
87
  createOptions.Image = imageId;
86
88
  }
87
89
  catch (error) {
@@ -489,8 +491,26 @@ exports.DefaultShellContribution = DefaultShellContribution = tslib_1.__decorate
489
491
  ], DefaultShellContribution);
490
492
  var OutputHelper;
491
493
  (function (OutputHelper) {
492
- function parseProgress(progress) {
493
- return progress.stream ?? progress.progress ?? progress.status ?? '';
494
+ function createDedupContext() {
495
+ return { lastMessage: '' };
496
+ }
497
+ OutputHelper.createDedupContext = createDedupContext;
498
+ function parseProgress(progress, dedup) {
499
+ if (progress.stream) {
500
+ if (dedup) {
501
+ dedup.lastMessage = '';
502
+ }
503
+ return progress.stream;
504
+ }
505
+ const message = progress.progress ?? progress.status ?? '';
506
+ const formatted = progress.id ? `${progress.id}: ${message}` : message;
507
+ if (dedup && formatted === dedup.lastMessage) {
508
+ return '';
509
+ }
510
+ if (dedup) {
511
+ dedup.lastMessage = formatted;
512
+ }
513
+ return formatted;
494
514
  }
495
515
  OutputHelper.parseProgress = parseProgress;
496
516
  })(OutputHelper || (exports.OutputHelper = OutputHelper = {}));
package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"main-container-creation-contributions.js","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main-container-creation-contributions.js","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts"],"names":[],"mappings":"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"}
package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.d.ts CHANGED
@@ -1,9 +1,11 @@
1
1
  import { interfaces } from '@theia/core/shared/inversify';
2
- import { DockerContainerService } from '../docker-container-service';
2
+ export interface VariableContext {
3
+ containerId?: string;
4
+ }
3
5
  export declare const VariableResolverContribution: unique symbol;
4
6
  export interface VariableResolverContribution {
5
- canResolve(variable: string): boolean;
6
- resolve(variable: string): string;
7
+ canResolve(variable: string, context?: VariableContext): boolean;
8
+ resolve(variable: string, context?: VariableContext): string;
7
9
  }
8
10
  export declare function registerVariableResolverContributions(bind: interfaces.Bind): void;
9
11
  export declare class LocalEnvVariableResolver implements VariableResolverContribution {
@@ -11,8 +13,7 @@ export declare class LocalEnvVariableResolver implements VariableResolverContrib
11
13
  resolve(variable: string): string;
12
14
  }
13
15
  export declare class ContainerIdResolver implements VariableResolverContribution {
14
- protected readonly dockerContainerService: DockerContainerService;
15
- canResolve(type: string): boolean;
16
- resolve(variable: string): string;
16
+ canResolve(type: string, context?: VariableContext): boolean;
17
+ resolve(_variable: string, context?: VariableContext): string;
17
18
  }
18
19
  //# sourceMappingURL=variable-resolver-contribution.d.ts.map
package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"variable-resolver-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/variable-resolver-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,UAAU,EAAyB,MAAM,8BAA8B,CAAC;AACrG,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,eAAO,MAAM,4BAA4B,eAAyC,CAAC;AACnF,MAAM,WAAW,4BAA4B;IACzC,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IACtC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CACrC;AAED,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAGjF;AAED,qBACa,wBAAyB,YAAW,4BAA4B;IACzE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIjC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;CAGpC;AAED,qBACa,mBAAoB,YAAW,4BAA4B;IAEhE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAEtE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAGjC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;CAGpC"}
1
+ {"version":3,"file":"variable-resolver-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/variable-resolver-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAc,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAEtE,MAAM,WAAW,eAAe;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,eAAO,MAAM,4BAA4B,eAAyC,CAAC;AACnF,MAAM,WAAW,4BAA4B;IACzC,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC;IACjE,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC;CAChE;AAED,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAGjF;AAED,qBACa,wBAAyB,YAAW,4BAA4B;IACzE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIjC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;CAGpC;AAED,qBACa,mBAAoB,YAAW,4BAA4B;IACpE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO;IAG5D,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,MAAM;CAGhE"}
package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.js CHANGED
@@ -19,7 +19,6 @@ exports.ContainerIdResolver = exports.LocalEnvVariableResolver = exports.Variabl
19
19
  exports.registerVariableResolverContributions = registerVariableResolverContributions;
20
20
  const tslib_1 = require("tslib");
21
21
  const inversify_1 = require("@theia/core/shared/inversify");
22
- const docker_container_service_1 = require("../docker-container-service");
23
22
  exports.VariableResolverContribution = Symbol('VariableResolverContribution');
24
23
  function registerVariableResolverContributions(bind) {
25
24
  bind(exports.VariableResolverContribution).to(LocalEnvVariableResolver).inSingletonScope();
@@ -38,18 +37,14 @@ exports.LocalEnvVariableResolver = LocalEnvVariableResolver = tslib_1.__decorate
38
37
  (0, inversify_1.injectable)()
39
38
  ], LocalEnvVariableResolver);
40
39
  let ContainerIdResolver = class ContainerIdResolver {
41
- canResolve(type) {
42
- return type === 'devcontainerId' && !!this.dockerContainerService.container;
40
+ canResolve(type, context) {
41
+ return type === 'devcontainerId' && !!context?.containerId;
43
42
  }
44
- resolve(variable) {
45
- return this.dockerContainerService.container?.id || variable;
43
+ resolve(_variable, context) {
44
+ return context?.containerId ?? _variable;
46
45
  }
47
46
  };
48
47
  exports.ContainerIdResolver = ContainerIdResolver;
49
- tslib_1.__decorate([
50
- (0, inversify_1.inject)(new inversify_1.LazyServiceIdentifier(() => docker_container_service_1.DockerContainerService)),
51
- tslib_1.__metadata("design:type", docker_container_service_1.DockerContainerService)
52
- ], ContainerIdResolver.prototype, "dockerContainerService", void 0);
53
48
  exports.ContainerIdResolver = ContainerIdResolver = tslib_1.__decorate([
54
49
  (0, inversify_1.injectable)()
55
50
  ], ContainerIdResolver);