@eclipse-che/che-devworkspace-generator 7.92.0 → 7.93.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 (55) hide show
  1. package/lib/api/devfile-context.js +2 -2
  2. package/lib/api/devfile-context.js.map +1 -1
  3. package/lib/bitbucket/bitbucket-module.js +6 -6
  4. package/lib/bitbucket/bitbucket-module.js.map +1 -1
  5. package/lib/bitbucket/bitbucket-resolver.js +23 -26
  6. package/lib/bitbucket/bitbucket-resolver.js.map +1 -1
  7. package/lib/bitbucket/bitbucket-url.js +21 -19
  8. package/lib/bitbucket/bitbucket-url.js.map +1 -1
  9. package/lib/bitbucket-server/bitbucket-server-module.js +6 -6
  10. package/lib/bitbucket-server/bitbucket-server-module.js.map +1 -1
  11. package/lib/bitbucket-server/bitbucket-server-resolver.js +32 -35
  12. package/lib/bitbucket-server/bitbucket-server-resolver.js.map +1 -1
  13. package/lib/bitbucket-server/bitbucket-server-url.js +26 -21
  14. package/lib/bitbucket-server/bitbucket-server-url.js.map +1 -1
  15. package/lib/devfile/dev-container-component-finder.js +39 -81
  16. package/lib/devfile/dev-container-component-finder.js.map +1 -1
  17. package/lib/devfile/dev-container-component-inserter.js +30 -75
  18. package/lib/devfile/dev-container-component-inserter.js.map +1 -1
  19. package/lib/devfile/devfile-module.js +5 -5
  20. package/lib/devfile/devfile-module.js.map +1 -1
  21. package/lib/devfile-schema/devfile-schema-module.js +4 -4
  22. package/lib/devfile-schema/devfile-schema-module.js.map +1 -1
  23. package/lib/devfile-schema/devfile-schema-validator.js +22 -25
  24. package/lib/devfile-schema/devfile-schema-validator.js.map +1 -1
  25. package/lib/entrypoint.js +9 -54
  26. package/lib/entrypoint.js.map +1 -1
  27. package/lib/fetch/fetch-module.js +4 -4
  28. package/lib/fetch/fetch-module.js.map +1 -1
  29. package/lib/fetch/url-fetcher.js +33 -87
  30. package/lib/fetch/url-fetcher.js.map +1 -1
  31. package/lib/generate.js +89 -144
  32. package/lib/generate.js.map +1 -1
  33. package/lib/github/github-module.js +6 -6
  34. package/lib/github/github-module.js.map +1 -1
  35. package/lib/github/github-resolver.js +26 -29
  36. package/lib/github/github-resolver.js.map +1 -1
  37. package/lib/github/github-url.js +24 -19
  38. package/lib/github/github-url.js.map +1 -1
  39. package/lib/inversify/inversify-binding.js +26 -68
  40. package/lib/inversify/inversify-binding.js.map +1 -1
  41. package/lib/main.js +170 -225
  42. package/lib/main.js.map +1 -1
  43. package/lib/plugin-registry/plugin-registry-module.js +4 -4
  44. package/lib/plugin-registry/plugin-registry-module.js.map +1 -1
  45. package/lib/plugin-registry/plugin-registry-resolver.js +23 -70
  46. package/lib/plugin-registry/plugin-registry-resolver.js.map +1 -1
  47. package/lib/resolve/git-url-resolver.js +16 -18
  48. package/lib/resolve/git-url-resolver.js.map +1 -1
  49. package/lib/resolve/resolve-module.js +4 -4
  50. package/lib/resolve/resolve-module.js.map +1 -1
  51. package/lib/resolve/resolver.js +1 -1
  52. package/lib/resolve/url.js +1 -1
  53. package/lib/types.js +3 -3
  54. package/lib/types.js.map +1 -1
  55. package/package.json +2 -2
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
- exports.__esModule = true;
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DevfileSchemaVersion = void 0;
4
4
  /**
5
5
  * Enum for Devfile schema versions
@@ -12,5 +12,5 @@ var DevfileSchemaVersion;
12
12
  DevfileSchemaVersion["V221"] = "2.2.1";
13
13
  DevfileSchemaVersion["V222"] = "2.2.2";
14
14
  DevfileSchemaVersion["V230"] = "2.3.0";
15
- })(DevfileSchemaVersion = exports.DevfileSchemaVersion || (exports.DevfileSchemaVersion = {}));
15
+ })(DevfileSchemaVersion || (exports.DevfileSchemaVersion = DevfileSchemaVersion = {}));
16
16
  //# sourceMappingURL=devfile-context.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"devfile-context.js","sourceRoot":"","sources":["../../src/api/devfile-context.ts"],"names":[],"mappings":";;;AA6BA;;GAEG;AACH,IAAY,oBAOX;AAPD,WAAY,oBAAoB;IAC9B,sCAAc,CAAA;IACd,sCAAc,CAAA;IACd,sCAAc,CAAA;IACd,sCAAc,CAAA;IACd,sCAAc,CAAA;IACd,sCAAc,CAAA;AAChB,CAAC,EAPW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAO/B"}
1
+ {"version":3,"file":"devfile-context.js","sourceRoot":"","sources":["../../src/api/devfile-context.ts"],"names":[],"mappings":";;;AA6BA;;GAEG;AACH,IAAY,oBAOX;AAPD,WAAY,oBAAoB;IAC9B,sCAAc,CAAA;IACd,sCAAc,CAAA;IACd,sCAAc,CAAA;IACd,sCAAc,CAAA;IACd,sCAAc,CAAA;IACd,sCAAc,CAAA;AAChB,CAAC,EAPW,oBAAoB,oCAApB,oBAAoB,QAO/B"}
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
- exports.__esModule = true;
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.bitbucketModule = void 0;
4
4
  /**********************************************************************
5
5
  * Copyright (c) 2022-2024
@@ -10,11 +10,11 @@ exports.bitbucketModule = void 0;
10
10
  *
11
11
  * SPDX-License-Identifier: EPL-2.0
12
12
  ***********************************************************************/
13
- var inversify_1 = require("inversify");
14
- var bitbucket_resolver_1 = require("./bitbucket-resolver");
15
- var types_1 = require("../types");
16
- var Resolver = types_1.TYPES.Resolver;
17
- var bitbucketModule = new inversify_1.ContainerModule(function (bind) {
13
+ const inversify_1 = require("inversify");
14
+ const bitbucket_resolver_1 = require("./bitbucket-resolver");
15
+ const types_1 = require("../types");
16
+ const { Resolver } = types_1.TYPES;
17
+ const bitbucketModule = new inversify_1.ContainerModule((bind) => {
18
18
  bind(Resolver).to(bitbucket_resolver_1.BitbucketResolver).inSingletonScope();
19
19
  });
20
20
  exports.bitbucketModule = bitbucketModule;
@@ -1 +1 @@
1
- {"version":3,"file":"bitbucket-module.js","sourceRoot":"","sources":["../../src/bitbucket/bitbucket-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,2DAAyD;AACzD,kCAAiC;AAEzB,IAAA,QAAQ,GAAK,aAAK,SAAV,CAAW;AAE3B,IAAM,eAAe,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IAChE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,sCAAiB,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC1D,CAAC,CAAC,CAAC;AAEM,0CAAe"}
1
+ {"version":3,"file":"bitbucket-module.js","sourceRoot":"","sources":["../../src/bitbucket/bitbucket-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,yCAAwD;AAExD,6DAAyD;AACzD,oCAAiC;AAEjC,MAAM,EAAE,QAAQ,EAAE,GAAG,aAAK,CAAC;AAE3B,MAAM,eAAe,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAqB,EAAE,EAAE;IACpE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,sCAAiB,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC1D,CAAC,CAAC,CAAC;AAEM,0CAAe"}
@@ -14,43 +14,40 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
14
14
  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
15
15
  return c > 3 && r && Object.defineProperty(target, key, r), r;
16
16
  };
17
- exports.__esModule = true;
17
+ var BitbucketResolver_1;
18
+ Object.defineProperty(exports, "__esModule", { value: true });
18
19
  exports.BitbucketResolver = void 0;
19
- var bitbucket_url_1 = require("./bitbucket-url");
20
- var inversify_1 = require("inversify");
21
- var BitbucketResolver = /** @class */ (function () {
22
- function BitbucketResolver() {
23
- }
24
- BitbucketResolver_1 = BitbucketResolver;
25
- BitbucketResolver.prototype.isValid = function (url) {
20
+ const bitbucket_url_1 = require("./bitbucket-url");
21
+ const inversify_1 = require("inversify");
22
+ let BitbucketResolver = class BitbucketResolver {
23
+ static { BitbucketResolver_1 = this; }
24
+ // eslint-disable-next-line max-len
25
+ static BITBUCKET_URL_PATTERN = /^https:\/\/.*@?bitbucket\.org\/(?<workspaceId>[^\/]+)\/(?<repoName>[^\/]+)(\/(src|branch)\/(?<branchName>[^\/]+))?\/?$/;
26
+ isValid(url) {
26
27
  return BitbucketResolver_1.BITBUCKET_URL_PATTERN.test(url);
27
- };
28
- BitbucketResolver.prototype.resolve = function (url) {
29
- var match = BitbucketResolver_1.BITBUCKET_URL_PATTERN.exec(url);
28
+ }
29
+ resolve(url) {
30
+ const match = BitbucketResolver_1.BITBUCKET_URL_PATTERN.exec(url);
30
31
  if (!match) {
31
- throw new Error("Invalid bitbucket URL: ".concat(url));
32
+ throw new Error(`Invalid bitbucket URL: ${url}`);
32
33
  }
33
- var workspaceId = this.getGroup(match, 'workspaceId');
34
- var repoName = this.getGroup(match, 'repoName');
34
+ const workspaceId = this.getGroup(match, 'workspaceId');
35
+ let repoName = this.getGroup(match, 'repoName');
35
36
  if (/^[\w-][\w.-]*?\.git$/.test(repoName)) {
36
37
  repoName = repoName.substring(0, repoName.length - 4);
37
38
  }
38
- var branchName = this.getGroup(match, 'branchName', 'HEAD');
39
+ const branchName = this.getGroup(match, 'branchName', 'HEAD');
39
40
  return new bitbucket_url_1.BitbucketUrl(workspaceId, repoName, branchName);
40
- };
41
- BitbucketResolver.prototype.getGroup = function (match, groupName, defaultValue) {
41
+ }
42
+ getGroup(match, groupName, defaultValue) {
42
43
  if (match.groups && match.groups[groupName]) {
43
44
  return match.groups[groupName];
44
45
  }
45
46
  return defaultValue;
46
- };
47
- var BitbucketResolver_1;
48
- // eslint-disable-next-line max-len
49
- BitbucketResolver.BITBUCKET_URL_PATTERN = /^https:\/\/.*@?bitbucket\.org\/(?<workspaceId>[^\/]+)\/(?<repoName>[^\/]+)(\/(src|branch)\/(?<branchName>[^\/]+))?\/?$/;
50
- BitbucketResolver = BitbucketResolver_1 = __decorate([
51
- (0, inversify_1.injectable)()
52
- ], BitbucketResolver);
53
- return BitbucketResolver;
54
- }());
47
+ }
48
+ };
55
49
  exports.BitbucketResolver = BitbucketResolver;
50
+ exports.BitbucketResolver = BitbucketResolver = BitbucketResolver_1 = __decorate([
51
+ (0, inversify_1.injectable)()
52
+ ], BitbucketResolver);
56
53
  //# sourceMappingURL=bitbucket-resolver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"bitbucket-resolver.js","sourceRoot":"","sources":["../../src/bitbucket/bitbucket-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;AAEzE,iDAA+C;AAC/C,uCAAuC;AAKvC;IAAA;IA6BA,CAAC;0BA7BY,iBAAiB;IAK5B,mCAAO,GAAP,UAAQ,GAAW;QACjB,OAAO,mBAAiB,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,mCAAO,GAAP,UAAQ,GAAW;QACjB,IAAM,KAAK,GAAG,mBAAiB,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,iCAA0B,GAAG,CAAE,CAAC,CAAC;SAClD;QACD,IAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACxD,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAChD,IAAI,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACzC,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SACvD;QACD,IAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QAC9D,OAAO,IAAI,4BAAY,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC7D,CAAC;IAEO,oCAAQ,GAAhB,UAAiB,KAAsB,EAAE,SAAiB,EAAE,YAAqB;QAC/E,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAChC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;;IA3BD,mCAAmC;IACnB,uCAAqB,GACnC,wHAAwH,CAAC;IAHhH,iBAAiB;QAD7B,IAAA,sBAAU,GAAE;OACA,iBAAiB,CA6B7B;IAAD,wBAAC;CAAA,AA7BD,IA6BC;AA7BY,8CAAiB"}
1
+ {"version":3,"file":"bitbucket-resolver.js","sourceRoot":"","sources":["../../src/bitbucket/bitbucket-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;;AAEzE,mDAA+C;AAC/C,yCAAuC;AAKhC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;;IAC5B,mCAAmC;IACnC,MAAM,CAAU,qBAAqB,GACnC,wHAAwH,CAAC;IAE3H,OAAO,CAAC,GAAW;QACjB,OAAO,mBAAiB,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,CAAC,GAAW;QACjB,MAAM,KAAK,GAAG,mBAAiB,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACxD,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAChD,IAAI,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QAC9D,OAAO,IAAI,4BAAY,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC7D,CAAC;IAEO,QAAQ,CAAC,KAAsB,EAAE,SAAiB,EAAE,YAAqB;QAC/E,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5C,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;;AA5BU,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,sBAAU,GAAE;GACA,iBAAiB,CA6B7B"}
@@ -8,31 +8,33 @@
8
8
  *
9
9
  * SPDX-License-Identifier: EPL-2.0
10
10
  ***********************************************************************/
11
- exports.__esModule = true;
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.BitbucketUrl = void 0;
13
- var BitbucketUrl = /** @class */ (function () {
14
- function BitbucketUrl(workspaceId, repoName, branchName) {
13
+ class BitbucketUrl {
14
+ workspaceId;
15
+ repoName;
16
+ branchName;
17
+ static BITBUCKET_URL = 'https://bitbucket.org';
18
+ constructor(workspaceId, repoName, branchName) {
15
19
  this.workspaceId = workspaceId;
16
20
  this.repoName = repoName;
17
21
  this.branchName = branchName;
18
22
  }
19
- BitbucketUrl.prototype.getContentUrl = function (path) {
20
- return "".concat(BitbucketUrl.BITBUCKET_URL, "/").concat(this.workspaceId, "/").concat(this.repoName, "/raw/").concat(this.branchName, "/").concat(path);
21
- };
22
- BitbucketUrl.prototype.getUrl = function () {
23
- return "".concat(BitbucketUrl.BITBUCKET_URL, "/").concat(this.workspaceId, "/").concat(this.repoName, "/src/").concat(this.branchName);
24
- };
25
- BitbucketUrl.prototype.getCloneUrl = function () {
26
- return "".concat(BitbucketUrl.BITBUCKET_URL, "/").concat(this.workspaceId, "/").concat(this.repoName, ".git");
27
- };
28
- BitbucketUrl.prototype.getRepoName = function () {
23
+ getContentUrl(path) {
24
+ return `${BitbucketUrl.BITBUCKET_URL}/${this.workspaceId}/${this.repoName}/raw/${this.branchName}/${path}`;
25
+ }
26
+ getUrl() {
27
+ return `${BitbucketUrl.BITBUCKET_URL}/${this.workspaceId}/${this.repoName}/src/${this.branchName}`;
28
+ }
29
+ getCloneUrl() {
30
+ return `${BitbucketUrl.BITBUCKET_URL}/${this.workspaceId}/${this.repoName}.git`;
31
+ }
32
+ getRepoName() {
29
33
  return this.repoName;
30
- };
31
- BitbucketUrl.prototype.getBranchName = function () {
34
+ }
35
+ getBranchName() {
32
36
  return this.branchName;
33
- };
34
- BitbucketUrl.BITBUCKET_URL = 'https://bitbucket.org';
35
- return BitbucketUrl;
36
- }());
37
+ }
38
+ }
37
39
  exports.BitbucketUrl = BitbucketUrl;
38
40
  //# sourceMappingURL=bitbucket-url.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"bitbucket-url.js","sourceRoot":"","sources":["../../src/bitbucket/bitbucket-url.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;AAIzE;IAGE,sBACmB,WAAmB,EACnB,QAAgB,EAChB,UAAkB;QAFlB,gBAAW,GAAX,WAAW,CAAQ;QACnB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAQ;IAClC,CAAC;IAEJ,oCAAa,GAAb,UAAc,IAAY;QACxB,OAAO,UAAG,YAAY,CAAC,aAAa,cAAI,IAAI,CAAC,WAAW,cAAI,IAAI,CAAC,QAAQ,kBAAQ,IAAI,CAAC,UAAU,cAAI,IAAI,CAAE,CAAC;IAC7G,CAAC;IAED,6BAAM,GAAN;QACE,OAAO,UAAG,YAAY,CAAC,aAAa,cAAI,IAAI,CAAC,WAAW,cAAI,IAAI,CAAC,QAAQ,kBAAQ,IAAI,CAAC,UAAU,CAAE,CAAC;IACrG,CAAC;IAED,kCAAW,GAAX;QACE,OAAO,UAAG,YAAY,CAAC,aAAa,cAAI,IAAI,CAAC,WAAW,cAAI,IAAI,CAAC,QAAQ,SAAM,CAAC;IAClF,CAAC;IAED,kCAAW,GAAX;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,oCAAa,GAAb;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IA1BuB,0BAAa,GAAG,uBAAuB,CAAC;IA2BlE,mBAAC;CAAA,AA5BD,IA4BC;AA5BY,oCAAY"}
1
+ {"version":3,"file":"bitbucket-url.js","sourceRoot":"","sources":["../../src/bitbucket/bitbucket-url.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;AAIzE,MAAa,YAAY;IAIJ;IACA;IACA;IALX,MAAM,CAAU,aAAa,GAAG,uBAAuB,CAAC;IAEhE,YACmB,WAAmB,EACnB,QAAgB,EAChB,UAAkB;QAFlB,gBAAW,GAAX,WAAW,CAAQ;QACnB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAQ;IAClC,CAAC;IAEJ,aAAa,CAAC,IAAY;QACxB,OAAO,GAAG,YAAY,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,QAAQ,QAAQ,IAAI,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;IAC7G,CAAC;IAED,MAAM;QACJ,OAAO,GAAG,YAAY,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,QAAQ,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;IACrG,CAAC;IAED,WAAW;QACT,OAAO,GAAG,YAAY,CAAC,aAAa,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,QAAQ,MAAM,CAAC;IAClF,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;;AA3BH,oCA4BC"}
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
- exports.__esModule = true;
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.bitbucketServerModule = void 0;
4
4
  /**********************************************************************
5
5
  * Copyright (c) 2022-2024
@@ -10,11 +10,11 @@ exports.bitbucketServerModule = void 0;
10
10
  *
11
11
  * SPDX-License-Identifier: EPL-2.0
12
12
  ***********************************************************************/
13
- var inversify_1 = require("inversify");
14
- var bitbucket_server_resolver_1 = require("./bitbucket-server-resolver");
15
- var types_1 = require("../types");
16
- var Resolver = types_1.TYPES.Resolver;
17
- var bitbucketServerModule = new inversify_1.ContainerModule(function (bind) {
13
+ const inversify_1 = require("inversify");
14
+ const bitbucket_server_resolver_1 = require("./bitbucket-server-resolver");
15
+ const types_1 = require("../types");
16
+ const { Resolver } = types_1.TYPES;
17
+ const bitbucketServerModule = new inversify_1.ContainerModule((bind) => {
18
18
  bind(Resolver).to(bitbucket_server_resolver_1.BitbucketServerResolver).inSingletonScope();
19
19
  });
20
20
  exports.bitbucketServerModule = bitbucketServerModule;
@@ -1 +1 @@
1
- {"version":3,"file":"bitbucket-server-module.js","sourceRoot":"","sources":["../../src/bitbucket-server/bitbucket-server-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,yEAAsE;AACtE,kCAAiC;AAEzB,IAAA,QAAQ,GAAK,aAAK,SAAV,CAAW;AAE3B,IAAM,qBAAqB,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IACtE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,mDAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC;AAEM,sDAAqB"}
1
+ {"version":3,"file":"bitbucket-server-module.js","sourceRoot":"","sources":["../../src/bitbucket-server/bitbucket-server-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,yCAAwD;AAExD,2EAAsE;AACtE,oCAAiC;AAEjC,MAAM,EAAE,QAAQ,EAAE,GAAG,aAAK,CAAC;AAE3B,MAAM,qBAAqB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAqB,EAAE,EAAE;IAC1E,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,mDAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC;AAEM,sDAAqB"}
@@ -14,51 +14,48 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
14
14
  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
15
15
  return c > 3 && r && Object.defineProperty(target, key, r), r;
16
16
  };
17
- exports.__esModule = true;
17
+ var BitbucketServerResolver_1;
18
+ Object.defineProperty(exports, "__esModule", { value: true });
18
19
  exports.BitbucketServerResolver = void 0;
19
- var bitbucket_server_url_1 = require("./bitbucket-server-url");
20
- var inversify_1 = require("inversify");
21
- var BitbucketServerResolver = /** @class */ (function () {
22
- function BitbucketServerResolver() {
20
+ const bitbucket_server_url_1 = require("./bitbucket-server-url");
21
+ const inversify_1 = require("inversify");
22
+ let BitbucketServerResolver = class BitbucketServerResolver {
23
+ static { BitbucketServerResolver_1 = this; }
24
+ // eslint-disable-next-line max-len
25
+ static BITBUCKET_URL_PATTERNS = [
26
+ /^(?<scheme>https?):\/\/(?<host>.*)\/scm\/~(?<user>[^\/]+)\/(?<repo>.*).git$/,
27
+ /^(?<scheme>https?):\/\/(?<host>.*)\/users\/(?<user>[^\/]+)\/repos\/(?<repo>[^\/]+)\/browse(\?at=(?<branch>.*))?$/,
28
+ /^(?<scheme>https?):\/\/(?<host>.*)\/scm\/(?<project>[^\/~]+)\/(?<repo>[^\/]+).git$/,
29
+ /^(?<scheme>https?):\/\/(?<host>.*)\/projects\/(?<project>[^\/]+)\/repos\/(?<repo>[^\/]+)\/browse(\?at=(?<branch>.*))?$/,
30
+ ];
31
+ isValid(url) {
32
+ return BitbucketServerResolver_1.BITBUCKET_URL_PATTERNS.some(p => p.test(url));
23
33
  }
24
- BitbucketServerResolver_1 = BitbucketServerResolver;
25
- BitbucketServerResolver.prototype.isValid = function (url) {
26
- return BitbucketServerResolver_1.BITBUCKET_URL_PATTERNS.some(function (p) { return p.test(url); });
27
- };
28
- BitbucketServerResolver.prototype.resolve = function (url) {
29
- var regExp = BitbucketServerResolver_1.BITBUCKET_URL_PATTERNS.find(function (p) { return p.test(url); });
34
+ resolve(url) {
35
+ const regExp = BitbucketServerResolver_1.BITBUCKET_URL_PATTERNS.find(p => p.test(url));
30
36
  if (!regExp) {
31
- throw new Error("Invalid bitbucket-server URL: ".concat(url));
37
+ throw new Error(`Invalid bitbucket-server URL: ${url}`);
32
38
  }
33
- var match = regExp.exec(url);
34
- var scheme = this.getGroup(match, 'scheme');
35
- var hostName = this.getGroup(match, 'host');
36
- var user = this.getGroup(match, 'user');
37
- var project = this.getGroup(match, 'project');
38
- var repo = this.getGroup(match, 'repo');
39
- var branch = this.getGroup(match, 'branch');
39
+ const match = regExp.exec(url);
40
+ const scheme = this.getGroup(match, 'scheme');
41
+ const hostName = this.getGroup(match, 'host');
42
+ const user = this.getGroup(match, 'user');
43
+ const project = this.getGroup(match, 'project');
44
+ const repo = this.getGroup(match, 'repo');
45
+ let branch = this.getGroup(match, 'branch');
40
46
  if (branch !== undefined && branch.startsWith('refs%2Fheads%2F')) {
41
47
  branch = branch.substring(15);
42
48
  }
43
49
  return new bitbucket_server_url_1.BitbucketServerUrl(scheme, hostName, user, project, repo, branch);
44
- };
45
- BitbucketServerResolver.prototype.getGroup = function (match, groupName) {
50
+ }
51
+ getGroup(match, groupName) {
46
52
  if (match.groups && match.groups[groupName]) {
47
53
  return match.groups[groupName];
48
54
  }
49
- };
50
- var BitbucketServerResolver_1;
51
- // eslint-disable-next-line max-len
52
- BitbucketServerResolver.BITBUCKET_URL_PATTERNS = [
53
- /^(?<scheme>https?):\/\/(?<host>.*)\/scm\/~(?<user>[^\/]+)\/(?<repo>.*).git$/,
54
- /^(?<scheme>https?):\/\/(?<host>.*)\/users\/(?<user>[^\/]+)\/repos\/(?<repo>[^\/]+)\/browse(\?at=(?<branch>.*))?$/,
55
- /^(?<scheme>https?):\/\/(?<host>.*)\/scm\/(?<project>[^\/~]+)\/(?<repo>[^\/]+).git$/,
56
- /^(?<scheme>https?):\/\/(?<host>.*)\/projects\/(?<project>[^\/]+)\/repos\/(?<repo>[^\/]+)\/browse(\?at=(?<branch>.*))?$/,
57
- ];
58
- BitbucketServerResolver = BitbucketServerResolver_1 = __decorate([
59
- (0, inversify_1.injectable)()
60
- ], BitbucketServerResolver);
61
- return BitbucketServerResolver;
62
- }());
55
+ }
56
+ };
63
57
  exports.BitbucketServerResolver = BitbucketServerResolver;
58
+ exports.BitbucketServerResolver = BitbucketServerResolver = BitbucketServerResolver_1 = __decorate([
59
+ (0, inversify_1.injectable)()
60
+ ], BitbucketServerResolver);
64
61
  //# sourceMappingURL=bitbucket-server-resolver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"bitbucket-server-resolver.js","sourceRoot":"","sources":["../../src/bitbucket-server/bitbucket-server-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;AAEzE,+DAA4D;AAC5D,uCAAuC;AAKvC;IAAA;IAoCA,CAAC;gCApCY,uBAAuB;IASlC,yCAAO,GAAP,UAAQ,GAAW;QACjB,OAAO,yBAAuB,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAX,CAAW,CAAC,CAAC;IAC/E,CAAC;IAED,yCAAO,GAAP,UAAQ,GAAW;QACjB,IAAM,MAAM,GAAG,yBAAuB,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAX,CAAW,CAAC,CAAC;QACrF,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,wCAAiC,GAAG,CAAE,CAAC,CAAC;SACzD;QACD,IAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,IAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAChD,IAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC5C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YAChE,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,yCAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/E,CAAC;IAEO,0CAAQ,GAAhB,UAAiB,KAAsB,EAAE,SAAiB;QACxD,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAChC;IACH,CAAC;;IAlCD,mCAAmC;IACnB,8CAAsB,GAAa;QACjD,6EAA6E;QAC7E,kHAAkH;QAClH,oFAAoF;QACpF,wHAAwH;KACzH,CAAC;IAPS,uBAAuB;QADnC,IAAA,sBAAU,GAAE;OACA,uBAAuB,CAoCnC;IAAD,8BAAC;CAAA,AApCD,IAoCC;AApCY,0DAAuB"}
1
+ {"version":3,"file":"bitbucket-server-resolver.js","sourceRoot":"","sources":["../../src/bitbucket-server/bitbucket-server-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;;AAEzE,iEAA4D;AAC5D,yCAAuC;AAKhC,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;;IAClC,mCAAmC;IACnC,MAAM,CAAU,sBAAsB,GAAa;QACjD,6EAA6E;QAC7E,kHAAkH;QAClH,oFAAoF;QACpF,wHAAwH;KACzH,CAAC;IAEF,OAAO,CAAC,GAAW;QACjB,OAAO,yBAAuB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,OAAO,CAAC,GAAW;QACjB,MAAM,MAAM,GAAG,yBAAuB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACrF,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC5C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACjE,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,IAAI,yCAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/E,CAAC;IAEO,QAAQ,CAAC,KAAsB,EAAE,SAAiB;QACxD,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5C,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;;AAnCU,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CAoCnC"}
@@ -8,10 +8,16 @@
8
8
  *
9
9
  * SPDX-License-Identifier: EPL-2.0
10
10
  ***********************************************************************/
11
- exports.__esModule = true;
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.BitbucketServerUrl = void 0;
13
- var BitbucketServerUrl = /** @class */ (function () {
14
- function BitbucketServerUrl(scheme, hostName, user, project, repo, branch) {
13
+ class BitbucketServerUrl {
14
+ scheme;
15
+ hostName;
16
+ user;
17
+ project;
18
+ repo;
19
+ branch;
20
+ constructor(scheme, hostName, user, project, repo, branch) {
15
21
  this.scheme = scheme;
16
22
  this.hostName = hostName;
17
23
  this.user = user;
@@ -19,25 +25,24 @@ var BitbucketServerUrl = /** @class */ (function () {
19
25
  this.repo = repo;
20
26
  this.branch = branch;
21
27
  }
22
- BitbucketServerUrl.prototype.getContentUrl = function (path) {
23
- var isUser = this.user !== undefined;
24
- return "".concat(this.scheme, "://").concat(this.hostName, "/").concat(isUser ? 'users' : 'projects', "/").concat(isUser ? this.user : this.project, "/repos/").concat(this.repo, "/raw/").concat(path).concat(this.branch !== undefined ? '?/at=' + this.branch : '');
25
- };
26
- BitbucketServerUrl.prototype.getUrl = function () {
27
- var isUser = this.user !== undefined;
28
- return "".concat(this.scheme, "://").concat(this.hostName, "/").concat(isUser ? 'users' : 'projects', "/").concat(isUser ? this.user : this.project, "/repos/").concat(this.repo).concat(this.branch !== undefined ? '/browse?at=' + this.branch : '');
29
- };
30
- BitbucketServerUrl.prototype.getCloneUrl = function () {
31
- var isUser = this.user !== undefined;
32
- return "".concat(this.scheme, "://").concat(this.hostName, "/scm/").concat(isUser ? '~' + this.user : this.project.toLowerCase(), "/").concat(this.repo, ".git");
33
- };
34
- BitbucketServerUrl.prototype.getRepoName = function () {
28
+ getContentUrl(path) {
29
+ const isUser = this.user !== undefined;
30
+ return `${this.scheme}://${this.hostName}/${isUser ? 'users' : 'projects'}/${isUser ? this.user : this.project}/repos/${this.repo}/raw/${path}${this.branch !== undefined ? '?/at=' + this.branch : ''}`;
31
+ }
32
+ getUrl() {
33
+ const isUser = this.user !== undefined;
34
+ return `${this.scheme}://${this.hostName}/${isUser ? 'users' : 'projects'}/${isUser ? this.user : this.project}/repos/${this.repo}${this.branch !== undefined ? '/browse?at=' + this.branch : ''}`;
35
+ }
36
+ getCloneUrl() {
37
+ const isUser = this.user !== undefined;
38
+ return `${this.scheme}://${this.hostName}/scm/${isUser ? '~' + this.user : this.project.toLowerCase()}/${this.repo}.git`;
39
+ }
40
+ getRepoName() {
35
41
  return this.repo;
36
- };
37
- BitbucketServerUrl.prototype.getBranchName = function () {
42
+ }
43
+ getBranchName() {
38
44
  return this.branch;
39
- };
40
- return BitbucketServerUrl;
41
- }());
45
+ }
46
+ }
42
47
  exports.BitbucketServerUrl = BitbucketServerUrl;
43
48
  //# sourceMappingURL=bitbucket-server-url.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"bitbucket-server-url.js","sourceRoot":"","sources":["../../src/bitbucket-server/bitbucket-server-url.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;AAIzE;IACE,4BACmB,MAAc,EACd,QAAgB,EAChB,IAAwB,EACxB,OAA2B,EAC3B,IAAY,EACZ,MAA0B;QAL1B,WAAM,GAAN,MAAM,CAAQ;QACd,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAAoB;QACxB,YAAO,GAAP,OAAO,CAAoB;QAC3B,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAoB;IAC1C,CAAC;IAEJ,0CAAa,GAAb,UAAc,IAAY;QACxB,IAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;QACvC,OAAO,UAAG,IAAI,CAAC,MAAM,gBAAM,IAAI,CAAC,QAAQ,cAAI,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,cACvE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,oBACzB,IAAI,CAAC,IAAI,kBAAQ,IAAI,SAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAC;IAC7F,CAAC;IAED,mCAAM,GAAN;QACE,IAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;QACvC,OAAO,UAAG,IAAI,CAAC,MAAM,gBAAM,IAAI,CAAC,QAAQ,cAAI,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,cACvE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,oBACzB,IAAI,CAAC,IAAI,SAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAC;IACvF,CAAC;IAED,wCAAW,GAAX;QACE,IAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;QACvC,OAAO,UAAG,IAAI,CAAC,MAAM,gBAAM,IAAI,CAAC,QAAQ,kBAAQ,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cACnG,IAAI,CAAC,IAAI,SACL,CAAC;IACT,CAAC;IAED,wCAAW,GAAX;QACE,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,0CAAa,GAAb;QACE,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IACH,yBAAC;AAAD,CAAC,AAtCD,IAsCC;AAtCY,gDAAkB"}
1
+ {"version":3,"file":"bitbucket-server-url.js","sourceRoot":"","sources":["../../src/bitbucket-server/bitbucket-server-url.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;AAIzE,MAAa,kBAAkB;IAEV;IACA;IACA;IACA;IACA;IACA;IANnB,YACmB,MAAc,EACd,QAAgB,EAChB,IAAwB,EACxB,OAA2B,EAC3B,IAAY,EACZ,MAA0B;QAL1B,WAAM,GAAN,MAAM,CAAQ;QACd,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAAoB;QACxB,YAAO,GAAP,OAAO,CAAoB;QAC3B,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAoB;IAC1C,CAAC;IAEJ,aAAa,CAAC,IAAY;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;QACvC,OAAO,GAAG,IAAI,CAAC,MAAM,MAAM,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,IACvE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAC5B,UAAU,IAAI,CAAC,IAAI,QAAQ,IAAI,GAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAC7F,CAAC;IAED,MAAM;QACJ,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;QACvC,OAAO,GAAG,IAAI,CAAC,MAAM,MAAM,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,IACvE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAC5B,UAAU,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACvF,CAAC;IAED,WAAW;QACT,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;QACvC,OAAO,GAAG,IAAI,CAAC,MAAM,MAAM,IAAI,CAAC,QAAQ,QAAQ,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IACnG,IAAI,CAAC,IACP,MAAM,CAAC;IACT,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CACF;AAtCD,gDAsCC"}
@@ -14,91 +14,49 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
14
14
  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
15
15
  return c > 3 && r && Object.defineProperty(target, key, r), r;
16
16
  };
17
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
18
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
19
- return new (P || (P = Promise))(function (resolve, reject) {
20
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
21
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
22
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
23
- step((generator = generator.apply(thisArg, _arguments || [])).next());
24
- });
25
- };
26
- var __generator = (this && this.__generator) || function (thisArg, body) {
27
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
28
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
29
- function verb(n) { return function (v) { return step([n, v]); }; }
30
- function step(op) {
31
- if (f) throw new TypeError("Generator is already executing.");
32
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
33
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
34
- if (y = 0, t) op = [op[0] & 2, t.value];
35
- switch (op[0]) {
36
- case 0: case 1: t = op; break;
37
- case 4: _.label++; return { value: op[1], done: false };
38
- case 5: _.label++; y = op[1]; op = [0]; continue;
39
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
40
- default:
41
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
42
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
43
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
44
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
45
- if (t[2]) _.ops.pop();
46
- _.trys.pop(); continue;
47
- }
48
- op = body.call(thisArg, _);
49
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
50
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
51
- }
52
- };
53
- exports.__esModule = true;
17
+ Object.defineProperty(exports, "__esModule", { value: true });
54
18
  exports.DevContainerComponentFinder = void 0;
55
- var inversify_1 = require("inversify");
56
- var dev_container_component_inserter_1 = require("./dev-container-component-inserter");
19
+ const inversify_1 = require("inversify");
20
+ const dev_container_component_inserter_1 = require("./dev-container-component-inserter");
57
21
  /**
58
22
  * Need to find dev container from main dev workspace
59
23
  */
60
- var DevContainerComponentFinder = /** @class */ (function () {
61
- function DevContainerComponentFinder() {
24
+ let DevContainerComponentFinder = class DevContainerComponentFinder {
25
+ devContainerComponentInserter;
26
+ async find(devfileContext, injectDefaultComponent, defaultComponentImage) {
27
+ // if a devfile contains a parent, we should not add a default dev container
28
+ if (devfileContext.devfile?.parent) {
29
+ return undefined;
30
+ }
31
+ // search in main devWorkspace
32
+ const devComponents = devfileContext.devWorkspace.spec?.template?.components
33
+ ?.filter(component => component.container)
34
+ .filter(
35
+ // we should ignore component that do not mount the sources
36
+ component => component.container && component.container.mountSources !== false);
37
+ if (!devComponents || devComponents.length === 0) {
38
+ // do not inject a default component if injectDefaultComponent parameter is false
39
+ if (!injectDefaultComponent || injectDefaultComponent !== 'true') {
40
+ return undefined;
41
+ }
42
+ this.devContainerComponentInserter.insert(devfileContext, defaultComponentImage);
43
+ let devComponents = devfileContext.devWorkspace.spec.template.components.filter(component => component.container);
44
+ return devComponents[0];
45
+ }
46
+ else if (devComponents.length === 1) {
47
+ return devComponents[0];
48
+ }
49
+ else {
50
+ console.warn(`More than one dev container component has been potentially found, taking the first one of ${devComponents.map(component => component.name)}`);
51
+ return devComponents[0];
52
+ }
62
53
  }
63
- DevContainerComponentFinder.prototype.find = function (devfileContext, injectDefaultComponent, defaultComponentImage) {
64
- var _a, _b, _c, _d;
65
- return __awaiter(this, void 0, void 0, function () {
66
- var devComponents, devComponents_1;
67
- return __generator(this, function (_e) {
68
- // if a devfile contains a parent, we should not add a default dev container
69
- if ((_a = devfileContext.devfile) === null || _a === void 0 ? void 0 : _a.parent) {
70
- return [2 /*return*/, undefined];
71
- }
72
- devComponents = (_d = (_c = (_b = devfileContext.devWorkspace.spec) === null || _b === void 0 ? void 0 : _b.template) === null || _c === void 0 ? void 0 : _c.components) === null || _d === void 0 ? void 0 : _d.filter(function (component) { return component.container; }).filter(
73
- // we should ignore component that do not mount the sources
74
- function (component) { return component.container && component.container.mountSources !== false; });
75
- if (!devComponents || devComponents.length === 0) {
76
- // do not inject a default component if injectDefaultComponent parameter is false
77
- if (!injectDefaultComponent || injectDefaultComponent !== 'true') {
78
- return [2 /*return*/, undefined];
79
- }
80
- this.devContainerComponentInserter.insert(devfileContext, defaultComponentImage);
81
- devComponents_1 = devfileContext.devWorkspace.spec.template.components.filter(function (component) { return component.container; });
82
- return [2 /*return*/, devComponents_1[0]];
83
- }
84
- else if (devComponents.length === 1) {
85
- return [2 /*return*/, devComponents[0]];
86
- }
87
- else {
88
- console.warn("More than one dev container component has been potentially found, taking the first one of ".concat(devComponents.map(function (component) { return component.name; })));
89
- return [2 /*return*/, devComponents[0]];
90
- }
91
- return [2 /*return*/];
92
- });
93
- });
94
- };
95
- __decorate([
96
- (0, inversify_1.inject)(dev_container_component_inserter_1.DevContainerComponentInserter)
97
- ], DevContainerComponentFinder.prototype, "devContainerComponentInserter");
98
- DevContainerComponentFinder = __decorate([
99
- (0, inversify_1.injectable)()
100
- ], DevContainerComponentFinder);
101
- return DevContainerComponentFinder;
102
- }());
54
+ };
103
55
  exports.DevContainerComponentFinder = DevContainerComponentFinder;
56
+ __decorate([
57
+ (0, inversify_1.inject)(dev_container_component_inserter_1.DevContainerComponentInserter)
58
+ ], DevContainerComponentFinder.prototype, "devContainerComponentInserter", void 0);
59
+ exports.DevContainerComponentFinder = DevContainerComponentFinder = __decorate([
60
+ (0, inversify_1.injectable)()
61
+ ], DevContainerComponentFinder);
104
62
  //# sourceMappingURL=dev-container-component-finder.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"dev-container-component-finder.js","sourceRoot":"","sources":["../../src/devfile/dev-container-component-finder.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIzE,uCAA+C;AAC/C,uFAAmF;AAEnF;;GAEG;AAEH;IAAA;IA0CA,CAAC;IAtCO,0CAAI,GAAV,UACE,cAA8B,EAC9B,sBAA+B,EAC/B,qBAA8B;;;;;gBAE9B,4EAA4E;gBAC5E,IAAI,MAAA,cAAc,CAAC,OAAO,0CAAE,MAAM,EAAE;oBAClC,sBAAO,SAAS,EAAC;iBAClB;gBAEK,aAAa,GAAG,MAAA,MAAA,MAAA,cAAc,CAAC,YAAY,CAAC,IAAI,0CAAE,QAAQ,0CAAE,UAAU,0CACxE,MAAM,CAAC,UAAA,SAAS,IAAI,OAAA,SAAS,CAAC,SAAS,EAAnB,CAAmB,EACxC,MAAM;gBACL,2DAA2D;gBAC3D,UAAA,SAAS,IAAI,OAAA,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,YAAY,KAAK,KAAK,EAAjE,CAAiE,CAC/E,CAAC;gBAEJ,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;oBAChD,iFAAiF;oBACjF,IAAI,CAAC,sBAAsB,IAAI,sBAAsB,KAAK,MAAM,EAAE;wBAChE,sBAAO,SAAS,EAAC;qBAClB;oBACD,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;oBAE7E,kBAAgB,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,UAAA,SAAS,IAAI,OAAA,SAAS,CAAC,SAAS,EAAnB,CAAmB,CAAC,CAAC;oBAElH,sBAAO,eAAa,CAAC,CAAC,CAAC,EAAC;iBACzB;qBAAM,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;oBACrC,sBAAO,aAAa,CAAC,CAAC,CAAC,EAAC;iBACzB;qBAAM;oBACL,OAAO,CAAC,IAAI,CACV,oGAA6F,aAAa,CAAC,GAAG,CAC5G,UAAA,SAAS,IAAI,OAAA,SAAS,CAAC,IAAI,EAAd,CAAc,CAC5B,CAAE,CACJ,CAAC;oBACF,sBAAO,aAAa,CAAC,CAAC,CAAC,EAAC;iBACzB;;;;KACF;IAvCD;QADC,IAAA,kBAAM,EAAC,gEAA6B,CAAC;8EAC+B;IAF1D,2BAA2B;QADvC,IAAA,sBAAU,GAAE;OACA,2BAA2B,CA0CvC;IAAD,kCAAC;CAAA,AA1CD,IA0CC;AA1CY,kEAA2B"}
1
+ {"version":3,"file":"dev-container-component-finder.js","sourceRoot":"","sources":["../../src/devfile/dev-container-component-finder.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;AAIzE,yCAA+C;AAC/C,yFAAmF;AAEnF;;GAEG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAE9B,6BAA6B,CAAgC;IAErE,KAAK,CAAC,IAAI,CACR,cAA8B,EAC9B,sBAA+B,EAC/B,qBAA8B;QAE9B,4EAA4E;QAC5E,IAAI,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;YACnC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,8BAA8B;QAC9B,MAAM,aAAa,GAAG,cAAc,CAAC,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU;YAC1E,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC;aACzC,MAAM;QACL,2DAA2D;QAC3D,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,YAAY,KAAK,KAAK,CAC/E,CAAC;QAEJ,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjD,iFAAiF;YACjF,IAAI,CAAC,sBAAsB,IAAI,sBAAsB,KAAK,MAAM,EAAE,CAAC;gBACjE,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;YAEjF,IAAI,aAAa,GAAG,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAElH,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;aAAM,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CACV,6FAA6F,aAAa,CAAC,GAAG,CAC5G,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAC5B,EAAE,CACJ,CAAC;YACF,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;CACF,CAAA;AA1CY,kEAA2B;AAE9B;IADP,IAAA,kBAAM,EAAC,gEAA6B,CAAC;kFAC+B;sCAF1D,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CA0CvC"}