@eclipse-che/che-devworkspace-generator 7.92.0 → 7.93.0-next-be04ded

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 (69) hide show
  1. package/LICENSE +201 -0
  2. package/README.md +51 -9
  3. package/lib/api/devfile-context.js +2 -2
  4. package/lib/api/devfile-context.js.map +1 -1
  5. package/lib/bitbucket/bitbucket-module.js +6 -6
  6. package/lib/bitbucket/bitbucket-module.js.map +1 -1
  7. package/lib/bitbucket/bitbucket-resolver.js +23 -26
  8. package/lib/bitbucket/bitbucket-resolver.js.map +1 -1
  9. package/lib/bitbucket/bitbucket-url.js +21 -19
  10. package/lib/bitbucket/bitbucket-url.js.map +1 -1
  11. package/lib/bitbucket-server/bitbucket-server-module.js +6 -6
  12. package/lib/bitbucket-server/bitbucket-server-module.js.map +1 -1
  13. package/lib/bitbucket-server/bitbucket-server-resolver.js +32 -35
  14. package/lib/bitbucket-server/bitbucket-server-resolver.js.map +1 -1
  15. package/lib/bitbucket-server/bitbucket-server-url.js +26 -21
  16. package/lib/bitbucket-server/bitbucket-server-url.js.map +1 -1
  17. package/lib/devfile/dev-container-component-finder.js +39 -81
  18. package/lib/devfile/dev-container-component-finder.js.map +1 -1
  19. package/lib/devfile/dev-container-component-inserter.js +30 -75
  20. package/lib/devfile/dev-container-component-inserter.js.map +1 -1
  21. package/lib/devfile/devfile-module.js +5 -5
  22. package/lib/devfile/devfile-module.js.map +1 -1
  23. package/lib/devfile-schema/devfile-schema-module.js +4 -4
  24. package/lib/devfile-schema/devfile-schema-module.js.map +1 -1
  25. package/lib/devfile-schema/devfile-schema-validator.js +22 -25
  26. package/lib/devfile-schema/devfile-schema-validator.js.map +1 -1
  27. package/lib/{plugin-registry/plugin-registry-module.d.ts → editor/editor-module.d.ts} +2 -2
  28. package/lib/editor/editor-module.js +19 -0
  29. package/lib/editor/editor-module.js.map +1 -0
  30. package/lib/{plugin-registry/plugin-registry-resolver.d.ts → editor/editor-resolver.d.ts} +2 -3
  31. package/lib/editor/editor-resolver.js +64 -0
  32. package/lib/editor/editor-resolver.js.map +1 -0
  33. package/lib/entrypoint.js +9 -54
  34. package/lib/entrypoint.js.map +1 -1
  35. package/lib/fetch/fetch-module.js +4 -4
  36. package/lib/fetch/fetch-module.js.map +1 -1
  37. package/lib/fetch/url-fetcher.js +33 -87
  38. package/lib/fetch/url-fetcher.js.map +1 -1
  39. package/lib/generate.js +89 -144
  40. package/lib/generate.js.map +1 -1
  41. package/lib/github/github-module.js +6 -6
  42. package/lib/github/github-module.js.map +1 -1
  43. package/lib/github/github-resolver.js +26 -29
  44. package/lib/github/github-resolver.js.map +1 -1
  45. package/lib/github/github-url.js +24 -19
  46. package/lib/github/github-url.js.map +1 -1
  47. package/lib/inversify/inversify-binding.d.ts +0 -1
  48. package/lib/inversify/inversify-binding.js +25 -68
  49. package/lib/inversify/inversify-binding.js.map +1 -1
  50. package/lib/main.d.ts +1 -2
  51. package/lib/main.js +156 -225
  52. package/lib/main.js.map +1 -1
  53. package/lib/resolve/git-url-resolver.js +16 -18
  54. package/lib/resolve/git-url-resolver.js.map +1 -1
  55. package/lib/resolve/resolve-module.js +4 -4
  56. package/lib/resolve/resolve-module.js.map +1 -1
  57. package/lib/resolve/resolver.js +1 -1
  58. package/lib/resolve/url.js +1 -1
  59. package/lib/types.js +3 -3
  60. package/lib/types.js.map +1 -1
  61. package/package.json +2 -2
  62. package/src/{plugin-registry/plugin-registry-module.ts → editor/editor-module.ts} +4 -4
  63. package/src/{plugin-registry/plugin-registry-resolver.ts → editor/editor-resolver.ts} +5 -10
  64. package/src/inversify/inversify-binding.ts +2 -4
  65. package/src/main.ts +12 -28
  66. package/lib/plugin-registry/plugin-registry-module.js +0 -19
  67. package/lib/plugin-registry/plugin-registry-module.js.map +0 -1
  68. package/lib/plugin-registry/plugin-registry-resolver.js +0 -117
  69. package/lib/plugin-registry/plugin-registry-resolver.js.map +0 -1
package/lib/main.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzE,6CAA+B;AAC/B,6CAA+B;AAC/B,yCAAsC;AACtC,wFAAmF;AACnF,gDAAkC;AAClC,qEAAiE;AACjE,qDAAiD;AACjD,8DAA0D;AAG1D,iEAA4D;AAG5D,MAAa,IAAI;IACf;;OAEG;IACH;QACE,QAAQ;IACV,CAAC;IACD,qDAAqD;IAC9C,KAAK,CAAC,sBAAsB,CACjC,MAWC,EACD,aAAkC;QAElC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YACrE,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YACxE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAI,oCAAgB,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,YAAY,CAAC;YACrD,aAAa;SACd,CAAC,CAAC;QACH,SAAS,CAAC,IAAI,CAAC,mBAAQ,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QAErD,IAAI,cAAc,CAAC;QACnB,IAAI,aAAa,CAAC;QAElB,oBAAoB;QACpB,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,iCAAc,CAAC,CAAC;YAC/C,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAChD,eAAe;YACf,cAAc,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,wBAAU,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC;YAE9F,eAAe;YACf,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAElD,qCAAqC;YACrC,IAAI,aAAa,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;gBAC7C,8CAA8C;gBAC9C,aAAa,CAAC,QAAQ,GAAG;oBACvB;wBACE,IAAI,EAAE,GAAG,CAAC,WAAW,EAAE;wBACvB,GAAG,EAAE;4BACH,OAAO,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,WAAW,EAAE,EAAE;4BACtC,YAAY,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,aAAa,EAAE,EAAE;yBAChD;qBACF;iBACF,CAAC;YACJ,CAAC;YACD,uBAAuB;YACvB,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC9C,CAAC;aAAM,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YAC9B,cAAc,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;QACzC,CAAC;QAED,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,oBAAoB,CAAC,aAAa,CAAC;QACzD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrE,CAAC;QAED,mBAAmB;QACnB,MAAM,sBAAsB,GAAG,SAAS,CAAC,GAAG,CAAC,iDAAsB,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,MAAM,gBAAgB,GAAoB,sBAAsB,CAAC,eAAe,CAC9E,oBAAoB,EACpB,aAAa,CACd,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,4CAA4C,gBAAgB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC7F,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,wCAAwC,aAAa,EAAE,CAAC,CAAC;QAErE,mBAAmB;QACnB,cAAc,GAAG,IAAI,CAAC,yBAAyB,CAAC,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEjF,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QACvC,CAAC;aAAM,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YAC5B,wBAAwB;YACxB,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACvF,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,aAAa,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,mBAAQ,CAAC,CAAC;QACzC,OAAO,QAAQ,CAAC,QAAQ,CACtB,cAAc,EACd,aAAa,EACb,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,sBAAsB,EAC7B,MAAM,CAAC,qBAAqB,CAC7B,CAAC;IACJ,CAAC;IAED,iEAAiE;IAC1D,yBAAyB,CAAC,cAAsB,EAAE,QAA8C;QACrG,4BAA4B;QAC5B,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,MAAM,aAAa,GAAqC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEpF,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC9C,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,aAAa,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC5D,MAAM,wBAAwB,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;YAC7E,IAAI,wBAAwB,EAAE,CAAC;gBAC7B,IAAI,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACvD,yCAAyC;oBACzC,OAAO,OAAO,CAAC,GAAG,CAAC;oBACnB,OAAO,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,wBAAwB,CAAC,QAAQ,EAAE,CAAC;gBAChE,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,wBAAwB,CAAC,QAAQ,CAAC;gBACjE,CAAC;YACH,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,WAA+B,CAAC;QACpC,IAAI,UAA8B,CAAC;QACnC,IAAI,UAA8B,CAAC;QACnC,IAAI,UAA8B,CAAC;QACnC,IAAI,SAA6B,CAAC;QAClC,IAAI,sBAA0C,CAAC;QAC/C,IAAI,qBAAyC,CAAC;QAC9C,MAAM,QAAQ,GAAyC,EAAE,CAAC;QAE1D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACjB,IAAI,GAAG,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBACtC,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACrC,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,GAAG,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;gBACpC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YACpD,CAAC;YACD,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACrC,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACrC,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;gBAClE,IAAI,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;gBACnD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAC;gBAExE,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YACpC,CAAC;YACD,IAAI,GAAG,CAAC,UAAU,CAAC,2BAA2B,CAAC,EAAE,CAAC;gBAChD,sBAAsB,GAAG,GAAG,CAAC,SAAS,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;YAC7E,CAAC;YACD,IAAI,GAAG,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE,CAAC;gBAC/C,qBAAqB,GAAG,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;YACvE,CAAC;YACD,IAAI,CAAC,WAAW,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;YACzE,CAAC;YACD,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACtD,CAAC;YACD,MAAM,IAAI,CAAC,sBAAsB,CAC/B;gBACE,WAAW;gBACX,UAAU;gBACV,UAAU;gBACV,UAAU;gBACV,SAAS;gBACT,QAAQ;gBACR,sBAAsB;gBACtB,qBAAqB;aACtB,EACD,KAAK,CAAC,OAAO,CACd,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;YACtC,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;YACxC,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF;AAlND,oBAkNC"}
@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
5
5
  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;
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  };
8
- exports.__esModule = true;
8
+ Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.GitUrlResolver = void 0;
10
10
  /**********************************************************************
11
11
  * Copyright (c) 2022-2024
@@ -16,28 +16,26 @@ exports.GitUrlResolver = void 0;
16
16
  *
17
17
  * SPDX-License-Identifier: EPL-2.0
18
18
  ***********************************************************************/
19
- var inversify_1 = require("inversify");
20
- var types_1 = require("../types");
21
- var Resolver = types_1.TYPES.Resolver;
22
- var GitUrlResolver = /** @class */ (function () {
23
- function GitUrlResolver() {
24
- }
25
- GitUrlResolver.prototype.resolve = function (link) {
26
- var resolver = this.resolvers.find(function (r) { return r.isValid(link); });
19
+ const inversify_1 = require("inversify");
20
+ const types_1 = require("../types");
21
+ const { Resolver } = types_1.TYPES;
22
+ let GitUrlResolver = class GitUrlResolver {
23
+ resolvers;
24
+ resolve(link) {
25
+ const resolver = this.resolvers.find(r => r.isValid(link));
27
26
  if (resolver) {
28
27
  return resolver.resolve(link);
29
28
  }
30
29
  else {
31
30
  throw new Error('Can not resolver the URL');
32
31
  }
33
- };
34
- __decorate([
35
- (0, inversify_1.multiInject)(Resolver)
36
- ], GitUrlResolver.prototype, "resolvers");
37
- GitUrlResolver = __decorate([
38
- (0, inversify_1.injectable)()
39
- ], GitUrlResolver);
40
- return GitUrlResolver;
41
- }());
32
+ }
33
+ };
42
34
  exports.GitUrlResolver = GitUrlResolver;
35
+ __decorate([
36
+ (0, inversify_1.multiInject)(Resolver)
37
+ ], GitUrlResolver.prototype, "resolvers", void 0);
38
+ exports.GitUrlResolver = GitUrlResolver = __decorate([
39
+ (0, inversify_1.injectable)()
40
+ ], GitUrlResolver);
43
41
  //# sourceMappingURL=git-url-resolver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"git-url-resolver.js","sourceRoot":"","sources":["../../src/resolve/git-url-resolver.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAoD;AAEpD,kCAAiC;AAGzB,IAAA,QAAQ,GAAK,aAAK,SAAV,CAAW;AAG3B;IAAA;IAYA,CAAC;IARC,gCAAO,GAAP,UAAQ,IAAY;QAClB,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAf,CAAe,CAAC,CAAC;QAC3D,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC/B;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;IACH,CAAC;IATD;QADC,IAAA,uBAAW,EAAC,QAAQ,CAAC;6CACQ;IAFnB,cAAc;QAD1B,IAAA,sBAAU,GAAE;OACA,cAAc,CAY1B;IAAD,qBAAC;CAAA,AAZD,IAYC;AAZY,wCAAc"}
1
+ {"version":3,"file":"git-url-resolver.js","sourceRoot":"","sources":["../../src/resolve/git-url-resolver.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;yEAQyE;AACzE,yCAAoD;AAEpD,oCAAiC;AAGjC,MAAM,EAAE,QAAQ,EAAE,GAAG,aAAK,CAAC;AAGpB,IAAM,cAAc,GAApB,MAAM,cAAc;IAEjB,SAAS,CAAa;IAE9B,OAAO,CAAC,IAAY;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;CACF,CAAA;AAZY,wCAAc;AAEjB;IADP,IAAA,uBAAW,EAAC,QAAQ,CAAC;iDACQ;yBAFnB,cAAc;IAD1B,IAAA,sBAAU,GAAE;GACA,cAAc,CAY1B"}
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
- exports.__esModule = true;
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.resolveModule = void 0;
4
4
  /**********************************************************************
5
5
  * Copyright (c) 2022-2024
@@ -10,9 +10,9 @@ exports.resolveModule = void 0;
10
10
  *
11
11
  * SPDX-License-Identifier: EPL-2.0
12
12
  ***********************************************************************/
13
- var inversify_1 = require("inversify");
14
- var git_url_resolver_1 = require("./git-url-resolver");
15
- var resolveModule = new inversify_1.ContainerModule(function (bind) {
13
+ const inversify_1 = require("inversify");
14
+ const git_url_resolver_1 = require("./git-url-resolver");
15
+ const resolveModule = new inversify_1.ContainerModule((bind) => {
16
16
  bind(git_url_resolver_1.GitUrlResolver).toSelf().inSingletonScope();
17
17
  });
18
18
  exports.resolveModule = resolveModule;
@@ -1 +1 @@
1
- {"version":3,"file":"resolve-module.js","sourceRoot":"","sources":["../../src/resolve/resolve-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,uDAAoD;AAEpD,IAAM,aAAa,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IAC9D,IAAI,CAAC,iCAAc,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AACnD,CAAC,CAAC,CAAC;AAEM,sCAAa"}
1
+ {"version":3,"file":"resolve-module.js","sourceRoot":"","sources":["../../src/resolve/resolve-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,yCAAwD;AAExD,yDAAoD;AAEpD,MAAM,aAAa,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAqB,EAAE,EAAE;IAClE,IAAI,CAAC,iCAAc,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AACnD,CAAC,CAAC,CAAC;AAEM,sCAAa"}
@@ -8,5 +8,5 @@
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
  //# sourceMappingURL=resolver.js.map
@@ -8,5 +8,5 @@
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
  //# sourceMappingURL=url.js.map
package/lib/types.js CHANGED
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
- exports.__esModule = true;
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.TYPES = void 0;
4
4
  /**********************************************************************
5
5
  * Copyright (c) 2022-2024
@@ -10,8 +10,8 @@ exports.TYPES = void 0;
10
10
  *
11
11
  * SPDX-License-Identifier: EPL-2.0
12
12
  ***********************************************************************/
13
- var TYPES = {
14
- Resolver: Symbol["for"]('Resolver')
13
+ const TYPES = {
14
+ Resolver: Symbol.for('Resolver'),
15
15
  };
16
16
  exports.TYPES = TYPES;
17
17
  //# sourceMappingURL=types.js.map
package/lib/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,IAAM,KAAK,GAAG;IACZ,QAAQ,EAAE,MAAM,CAAC,KAAG,CAAA,CAAC,UAAU,CAAC;CACjC,CAAC;AAEO,sBAAK"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,MAAM,KAAK,GAAG;IACZ,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;CACjC,CAAC;AAEO,sBAAK"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-che/che-devworkspace-generator",
3
- "version": "7.92.0",
3
+ "version": "7.93.0-next-be04ded",
4
4
  "private": false,
5
5
  "description": "Generates DevWorkspaces by transforming existing devfiles",
6
6
  "main": "lib/entrypoint.js",
@@ -58,7 +58,7 @@
58
58
  "rimraf": "^5.0.7",
59
59
  "rollup": "^4.18.0",
60
60
  "ts-jest": "^27.0.7",
61
- "typescript": "^4.4.4"
61
+ "typescript": "^5.6.2"
62
62
  },
63
63
  "prettier": {
64
64
  "printWidth": 120,
@@ -9,10 +9,10 @@
9
9
  ***********************************************************************/
10
10
  import { ContainerModule, interfaces } from 'inversify';
11
11
 
12
- import { PluginRegistryResolver } from './plugin-registry-resolver';
12
+ import { EditorResolver } from './editor-resolver';
13
13
 
14
- const pluginRegistryModule = new ContainerModule((bind: interfaces.Bind) => {
15
- bind(PluginRegistryResolver).toSelf().inSingletonScope();
14
+ const editorModule = new ContainerModule((bind: interfaces.Bind) => {
15
+ bind(EditorResolver).toSelf().inSingletonScope();
16
16
  });
17
17
 
18
- export { pluginRegistryModule };
18
+ export { editorModule };
@@ -10,7 +10,7 @@
10
10
 
11
11
  import * as jsYaml from 'js-yaml';
12
12
 
13
- import { inject, injectable, named } from 'inversify';
13
+ import { inject, injectable } from 'inversify';
14
14
 
15
15
  import { UrlFetcher } from '../fetch/url-fetcher';
16
16
 
@@ -18,19 +18,14 @@ import { UrlFetcher } from '../fetch/url-fetcher';
18
18
  * Resolve plug-ins by grabbing the definition from the plug-in registry.
19
19
  */
20
20
  @injectable()
21
- export class PluginRegistryResolver {
22
- @inject('string')
23
- @named('PLUGIN_REGISTRY_URL')
24
- private pluginRegistryUrl: string;
25
-
21
+ export class EditorResolver {
26
22
  @inject(UrlFetcher)
27
23
  private urlFetcher: UrlFetcher;
28
24
 
29
- // FQN id (like che-incubator/che-code/next)
25
+ // Editor URL (like https://raw.githubusercontent.com/eclipse-che/che-operator/refs/heads/main/editors-definitions/che-code-latest.yaml)
30
26
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
31
- async loadDevfilePlugin(devfileId: string): Promise<any> {
32
- const devfileUrl = `${this.pluginRegistryUrl}/plugins/${devfileId}/devfile.yaml`;
33
- const devfileContent = await this.urlFetcher.fetchText(devfileUrl);
27
+ async loadEditor(editorUrl: string): Promise<any> {
28
+ const devfileContent = await this.urlFetcher.fetchText(editorUrl);
34
29
  return jsYaml.load(devfileContent);
35
30
  }
36
31
  }
@@ -15,7 +15,7 @@ import { devfileModule } from '../devfile/devfile-module';
15
15
  import { fetchModule } from '../fetch/fetch-module';
16
16
  import { githubModule } from '../github/github-module';
17
17
  import { resolveModule } from '../resolve/resolve-module';
18
- import { pluginRegistryModule } from '../plugin-registry/plugin-registry-module';
18
+ import { editorModule } from '../editor/editor-module';
19
19
  import { devfileSchemaModule } from '../devfile-schema/devfile-schema-module';
20
20
  import { bitbucketModule } from '../bitbucket/bitbucket-module';
21
21
  import { bitbucketServerModule } from '../bitbucket-server/bitbucket-server-module';
@@ -35,11 +35,10 @@ export class InversifyBinding {
35
35
  this.container.load(bitbucketModule);
36
36
  this.container.load(bitbucketServerModule);
37
37
  this.container.load(resolveModule);
38
- this.container.load(pluginRegistryModule);
38
+ this.container.load(editorModule);
39
39
  this.container.load(devfileSchemaModule);
40
40
 
41
41
  this.container.bind(Symbol.for('AxiosInstance')).toConstantValue(options.axiosInstance);
42
- this.container.bind('string').toConstantValue(options.pluginRegistryUrl).whenTargetNamed('PLUGIN_REGISTRY_URL');
43
42
 
44
43
  return this.container;
45
44
  }
@@ -49,6 +48,5 @@ export class InversifyBinding {
49
48
  * Options for inversify bindings
50
49
  */
51
50
  export interface InversifyBindingOptions {
52
- pluginRegistryUrl: string;
53
51
  axiosInstance: AxiosInstance;
54
52
  }
package/src/main.ts CHANGED
@@ -15,7 +15,7 @@ import { DevfileSchemaValidator } from './devfile-schema/devfile-schema-validato
15
15
  import * as jsYaml from 'js-yaml';
16
16
  import { InversifyBinding } from './inversify/inversify-binding';
17
17
  import { UrlFetcher } from './fetch/url-fetcher';
18
- import { PluginRegistryResolver } from './plugin-registry/plugin-registry-resolver';
18
+ import { EditorResolver } from './editor/editor-resolver';
19
19
  import { V1alpha2DevWorkspaceSpecTemplate } from '@devfile/api';
20
20
  import { DevfileContext } from './api/devfile-context';
21
21
  import { GitUrlResolver } from './resolve/git-url-resolver';
@@ -37,33 +37,22 @@ export class Main {
37
37
  outputFile?: string;
38
38
  editorPath?: string;
39
39
  editorContent?: string;
40
- editorEntry?: string;
41
- pluginRegistryUrl?: string;
40
+ editorUrl?: string;
42
41
  projects: { name: string; location: string }[];
43
42
  injectDefaultComponent?: string;
44
43
  defaultComponentImage?: string;
45
44
  },
46
45
  axiosInstance: axios.AxiosInstance,
47
46
  ): Promise<DevfileContext> {
48
- if (!params.editorPath && !params.editorEntry && !params.editorContent) {
49
- throw new Error('missing editorPath or editorEntry or editorContent');
47
+ if (!params.editorPath && !params.editorUrl && !params.editorContent) {
48
+ throw new Error('missing editorPath or editorUrl or editorContent');
50
49
  }
51
50
  if (!params.devfilePath && !params.devfileUrl && !params.devfileContent) {
52
51
  throw new Error('missing devfilePath or devfileUrl or devfileContent');
53
52
  }
54
53
 
55
- let pluginRegistryUrl: string;
56
-
57
- if (params.pluginRegistryUrl) {
58
- pluginRegistryUrl = params.pluginRegistryUrl;
59
- } else {
60
- pluginRegistryUrl = 'https://eclipse-che.github.io/che-plugin-registry/main/v3';
61
- console.log(`No plug-in registry url. Setting to ${pluginRegistryUrl}`);
62
- }
63
-
64
54
  const inversifyBinbding = new InversifyBinding();
65
55
  const container = await inversifyBinbding.initBindings({
66
- pluginRegistryUrl,
67
56
  axiosInstance,
68
57
  });
69
58
  container.bind(Generate).toSelf().inSingletonScope();
@@ -125,9 +114,9 @@ export class Main {
125
114
 
126
115
  if (params.editorContent) {
127
116
  editorContent = params.editorContent;
128
- } else if (params.editorEntry) {
117
+ } else if (params.editorUrl) {
129
118
  // devfile of the editor
130
- const editorDevfile = await container.get(PluginRegistryResolver).loadDevfilePlugin(params.editorEntry);
119
+ const editorDevfile = await container.get(EditorResolver).loadEditor(params.editorUrl);
131
120
  editorContent = jsYaml.dump(editorDevfile);
132
121
  } else {
133
122
  editorContent = await fs.readFile(params.editorPath);
@@ -175,8 +164,7 @@ export class Main {
175
164
  let devfileUrl: string | undefined;
176
165
  let outputFile: string | undefined;
177
166
  let editorPath: string | undefined;
178
- let pluginRegistryUrl: string | undefined;
179
- let editorEntry: string | undefined;
167
+ let editorUrl: string | undefined;
180
168
  let injectDefaultComponent: string | undefined;
181
169
  let defaultComponentImage: string | undefined;
182
170
  const projects: { name: string; location: string }[] = [];
@@ -189,11 +177,8 @@ export class Main {
189
177
  if (arg.startsWith('--devfile-url:')) {
190
178
  devfileUrl = arg.substring('--devfile-url:'.length);
191
179
  }
192
- if (arg.startsWith('--plugin-registry-url:')) {
193
- pluginRegistryUrl = arg.substring('--plugin-registry-url:'.length);
194
- }
195
- if (arg.startsWith('--editor-entry:')) {
196
- editorEntry = arg.substring('--editor-entry:'.length);
180
+ if (arg.startsWith('--editor-url:')) {
181
+ editorUrl = arg.substring('--editor-url:'.length);
197
182
  }
198
183
  if (arg.startsWith('--editor-path:')) {
199
184
  editorPath = arg.substring('--editor-path:'.length);
@@ -217,8 +202,8 @@ export class Main {
217
202
  });
218
203
 
219
204
  try {
220
- if (!editorPath && !editorEntry) {
221
- throw new Error('missing --editor-path: or --editor-entry: parameter');
205
+ if (!editorPath && !editorUrl) {
206
+ throw new Error('missing --editor-path: or --editor-url: parameter');
222
207
  }
223
208
  if (!devfilePath && !devfileUrl) {
224
209
  throw new Error('missing --devfile-path: or --devfile-url: parameter');
@@ -232,8 +217,7 @@ export class Main {
232
217
  devfileUrl,
233
218
  editorPath,
234
219
  outputFile,
235
- pluginRegistryUrl,
236
- editorEntry,
220
+ editorUrl,
237
221
  projects,
238
222
  injectDefaultComponent,
239
223
  defaultComponentImage,
@@ -1,19 +0,0 @@
1
- "use strict";
2
- exports.__esModule = true;
3
- exports.pluginRegistryModule = void 0;
4
- /**********************************************************************
5
- * Copyright (c) 2022-2024
6
- *
7
- * This program and the accompanying materials are made
8
- * available under the terms of the Eclipse Public License 2.0
9
- * which is available at https://www.eclipse.org/legal/epl-2.0/
10
- *
11
- * SPDX-License-Identifier: EPL-2.0
12
- ***********************************************************************/
13
- var inversify_1 = require("inversify");
14
- var plugin_registry_resolver_1 = require("./plugin-registry-resolver");
15
- var pluginRegistryModule = new inversify_1.ContainerModule(function (bind) {
16
- bind(plugin_registry_resolver_1.PluginRegistryResolver).toSelf().inSingletonScope();
17
- });
18
- exports.pluginRegistryModule = pluginRegistryModule;
19
- //# sourceMappingURL=plugin-registry-module.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"plugin-registry-module.js","sourceRoot":"","sources":["../../src/plugin-registry/plugin-registry-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,uEAAoE;AAEpE,IAAM,oBAAoB,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IACrE,IAAI,CAAC,iDAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAC3D,CAAC,CAAC,CAAC;AAEM,oDAAoB"}
@@ -1,117 +0,0 @@
1
- "use strict";
2
- /**********************************************************************
3
- * Copyright (c) 2022-2024
4
- *
5
- * This program and the accompanying materials are made
6
- * available under the terms of the Eclipse Public License 2.0
7
- * which is available at https://www.eclipse.org/legal/epl-2.0/
8
- *
9
- * SPDX-License-Identifier: EPL-2.0
10
- ***********************************************************************/
11
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
12
- if (k2 === undefined) k2 = k;
13
- var desc = Object.getOwnPropertyDescriptor(m, k);
14
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
15
- desc = { enumerable: true, get: function() { return m[k]; } };
16
- }
17
- Object.defineProperty(o, k2, desc);
18
- }) : (function(o, m, k, k2) {
19
- if (k2 === undefined) k2 = k;
20
- o[k2] = m[k];
21
- }));
22
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
23
- Object.defineProperty(o, "default", { enumerable: true, value: v });
24
- }) : function(o, v) {
25
- o["default"] = v;
26
- });
27
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
28
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
29
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
30
- 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;
31
- return c > 3 && r && Object.defineProperty(target, key, r), r;
32
- };
33
- var __importStar = (this && this.__importStar) || function (mod) {
34
- if (mod && mod.__esModule) return mod;
35
- var result = {};
36
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
37
- __setModuleDefault(result, mod);
38
- return result;
39
- };
40
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
41
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
42
- return new (P || (P = Promise))(function (resolve, reject) {
43
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
44
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
45
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
46
- step((generator = generator.apply(thisArg, _arguments || [])).next());
47
- });
48
- };
49
- var __generator = (this && this.__generator) || function (thisArg, body) {
50
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
51
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
52
- function verb(n) { return function (v) { return step([n, v]); }; }
53
- function step(op) {
54
- if (f) throw new TypeError("Generator is already executing.");
55
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
56
- 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;
57
- if (y = 0, t) op = [op[0] & 2, t.value];
58
- switch (op[0]) {
59
- case 0: case 1: t = op; break;
60
- case 4: _.label++; return { value: op[1], done: false };
61
- case 5: _.label++; y = op[1]; op = [0]; continue;
62
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
63
- default:
64
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
65
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
66
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
67
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
68
- if (t[2]) _.ops.pop();
69
- _.trys.pop(); continue;
70
- }
71
- op = body.call(thisArg, _);
72
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
73
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
74
- }
75
- };
76
- exports.__esModule = true;
77
- exports.PluginRegistryResolver = void 0;
78
- var jsYaml = __importStar(require("js-yaml"));
79
- var inversify_1 = require("inversify");
80
- var url_fetcher_1 = require("../fetch/url-fetcher");
81
- /**
82
- * Resolve plug-ins by grabbing the definition from the plug-in registry.
83
- */
84
- var PluginRegistryResolver = /** @class */ (function () {
85
- function PluginRegistryResolver() {
86
- }
87
- // FQN id (like che-incubator/che-code/next)
88
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
89
- PluginRegistryResolver.prototype.loadDevfilePlugin = function (devfileId) {
90
- return __awaiter(this, void 0, void 0, function () {
91
- var devfileUrl, devfileContent;
92
- return __generator(this, function (_a) {
93
- switch (_a.label) {
94
- case 0:
95
- devfileUrl = "".concat(this.pluginRegistryUrl, "/plugins/").concat(devfileId, "/devfile.yaml");
96
- return [4 /*yield*/, this.urlFetcher.fetchText(devfileUrl)];
97
- case 1:
98
- devfileContent = _a.sent();
99
- return [2 /*return*/, jsYaml.load(devfileContent)];
100
- }
101
- });
102
- });
103
- };
104
- __decorate([
105
- (0, inversify_1.inject)('string'),
106
- (0, inversify_1.named)('PLUGIN_REGISTRY_URL')
107
- ], PluginRegistryResolver.prototype, "pluginRegistryUrl");
108
- __decorate([
109
- (0, inversify_1.inject)(url_fetcher_1.UrlFetcher)
110
- ], PluginRegistryResolver.prototype, "urlFetcher");
111
- PluginRegistryResolver = __decorate([
112
- (0, inversify_1.injectable)()
113
- ], PluginRegistryResolver);
114
- return PluginRegistryResolver;
115
- }());
116
- exports.PluginRegistryResolver = PluginRegistryResolver;
117
- //# sourceMappingURL=plugin-registry-resolver.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"plugin-registry-resolver.js","sourceRoot":"","sources":["../../src/plugin-registry/plugin-registry-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzE,8CAAkC;AAElC,uCAAsD;AAEtD,oDAAkD;AAElD;;GAEG;AAEH;IAAA;IAeA,CAAC;IAPC,4CAA4C;IAC5C,8DAA8D;IACxD,kDAAiB,GAAvB,UAAwB,SAAiB;;;;;;wBACjC,UAAU,GAAG,UAAG,IAAI,CAAC,iBAAiB,sBAAY,SAAS,kBAAe,CAAC;wBAC1D,qBAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,EAAA;;wBAA5D,cAAc,GAAG,SAA2C;wBAClE,sBAAO,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAC;;;;KACpC;IAXD;QAFC,IAAA,kBAAM,EAAC,QAAQ,CAAC;QAChB,IAAA,iBAAK,EAAC,qBAAqB,CAAC;6DACK;IAGlC;QADC,IAAA,kBAAM,EAAC,wBAAU,CAAC;sDACY;IANpB,sBAAsB;QADlC,IAAA,sBAAU,GAAE;OACA,sBAAsB,CAelC;IAAD,6BAAC;CAAA,AAfD,IAeC;AAfY,wDAAsB"}