@rxap/plugin-angular 19.1.0-dev.2 → 19.1.0-dev.3

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.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,12 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [19.1.0-dev.3](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@19.1.0-dev.2...@rxap/plugin-angular@19.1.0-dev.3) (2024-06-17)
7
+
8
+ ### Features
9
+
10
+ - add get major version functions ([dfb514a](https://gitlab.com/rxap/packages/commit/dfb514ae53c9b603cfd57b425f6d32d9e8f12ead))
11
+
6
12
  # [19.1.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@19.1.0-dev.1...@rxap/plugin-angular@19.1.0-dev.2) (2024-06-17)
7
13
 
8
14
  ### Bug Fixes
package/package.json CHANGED
@@ -1,26 +1,24 @@
1
1
  {
2
- "version": "19.1.0-dev.2",
2
+ "version": "19.1.0-dev.3",
3
3
  "name": "@rxap/plugin-angular",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
6
- "semver": "^7.3.5",
6
+ "@nx/angular": "19.1.1",
7
+ "@nx/devkit": "19.1.1",
8
+ "@rxap/plugin-application": "^19.0.3-dev.2",
9
+ "@rxap/plugin-library": "^19.2.0-dev.5",
10
+ "@rxap/plugin-localazy": "^19.0.2-dev.1",
11
+ "@rxap/plugin-utilities": "^19.0.3-dev.2",
12
+ "@rxap/ts-morph": "^1.4.0-dev.2",
13
+ "@rxap/utilities": "^16.2.3-dev.0",
14
+ "@rxap/workspace-ts-morph": "^19.1.0-dev.2",
15
+ "@rxap/workspace-utilities": "^19.2.0-dev.6",
16
+ "colors": "1.4.0",
17
+ "nx": "19.1.1",
18
+ "semver": "7.5.3",
19
+ "ts-morph": "18.0.0",
7
20
  "tslib": "2.6.2"
8
21
  },
9
- "peerDependencies": {
10
- "@nx/angular": "^19.1.1",
11
- "@nx/devkit": "^19.1.1",
12
- "@rxap/plugin-application": "^19.0.3-dev.0",
13
- "@rxap/plugin-library": "^19.2.0-dev.2",
14
- "@rxap/plugin-localazy": "^19.0.2-dev.0",
15
- "@rxap/plugin-utilities": "^19.0.3-dev.1",
16
- "@rxap/ts-morph": "^1.3.1-dev.3",
17
- "@rxap/utilities": "^16.2.2",
18
- "@rxap/workspace-ts-morph": "^19.1.0-dev.1",
19
- "@rxap/workspace-utilities": "^19.2.0-dev.3",
20
- "colors": "^1.4.0",
21
- "nx": "^19.1.1",
22
- "ts-morph": "^18.0.0"
23
- },
24
22
  "author": {
25
23
  "name": "Merzough Münker",
26
24
  "email": "mmuenker@digitaix.com"
@@ -45,58 +43,6 @@
45
43
  "requirements": {},
46
44
  "migrations": "./migrations.json"
47
45
  },
48
- "nx-migrations": {
49
- "packageGroup": [
50
- {
51
- "package": "@nx/angular",
52
- "version": "19.1.1"
53
- },
54
- {
55
- "package": "@nx/devkit",
56
- "version": "19.1.1"
57
- },
58
- {
59
- "package": "@rxap/generator-ts-morph",
60
- "version": "1.0.8-dev.0"
61
- },
62
- {
63
- "package": "@rxap/node-utilities",
64
- "version": "1.2.2"
65
- },
66
- {
67
- "package": "@rxap/plugin-application",
68
- "version": "19.0.3-dev.0"
69
- },
70
- {
71
- "package": "@rxap/plugin-library",
72
- "version": "19.2.0-dev.2"
73
- },
74
- {
75
- "package": "@rxap/plugin-localazy",
76
- "version": "19.0.2-dev.0"
77
- },
78
- {
79
- "package": "@rxap/plugin-utilities",
80
- "version": "19.0.3-dev.1"
81
- },
82
- {
83
- "package": "@rxap/ts-morph",
84
- "version": "1.3.1-dev.3"
85
- },
86
- {
87
- "package": "@rxap/utilities",
88
- "version": "16.2.2"
89
- },
90
- {
91
- "package": "@rxap/workspace-ts-morph",
92
- "version": "19.1.0-dev.1"
93
- },
94
- {
95
- "package": "@rxap/workspace-utilities",
96
- "version": "19.2.0-dev.3"
97
- }
98
- ]
99
- },
100
46
  "publishConfig": {
101
47
  "access": "public",
102
48
  "directory": "../../../dist/packages/plugin/angular"
@@ -108,6 +54,6 @@
108
54
  },
109
55
  "schematics": "./generators.json",
110
56
  "type": "commonjs",
111
- "gitHead": "5afd8658e3a0ef98b0f57be07094c6be6419a318",
57
+ "gitHead": "a86ff17c44a01ef4a847db848aed3ae7ce6fa954",
112
58
  "main": "./src/index.js"
113
59
  }
@@ -21,8 +21,7 @@ function initGenerator(tree, options) {
21
21
  directory: 'angular',
22
22
  addTailwind: true,
23
23
  buildable: true,
24
- },
25
- indexExport: false,
24
+ }
26
25
  });
27
26
  yield (0, generator_1.default)(tree, {
28
27
  projects: [
@@ -38,9 +37,9 @@ function initGenerator(tree, options) {
38
37
  'http-interceptors',
39
38
  ],
40
39
  coerce: {
41
- directory: 'angular'
42
- },
43
- indexExport: false,
40
+ directory: 'angular',
41
+ buildable: true,
42
+ }
44
43
  });
45
44
  if (!options.skipFormat) {
46
45
  yield (0, devkit_1.formatFiles)(tree);
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,+CAAmD;AACnD,mEAA4E;AAC5E,yDAA6D;AAG7D,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAA,qDAA+B,EAC7B,IAAI,EACJ,GAAG,EACH,sBAAsB,EACtB,MAAM,EACN,IAAA,4BAAgB,EAAC,OAAO,EAAE,CAAE,UAAU,EAAE,WAAW,EAAE,cAAc,CAAE,CAAC,CACvE,CAAC;QAEF,MAAM,IAAA,mBAAoB,EAAC,IAAI,EAAE;YAC/B,QAAQ,EAAE;gBACR,YAAY;gBACZ,OAAO;gBACP,UAAU;gBACV,QAAQ;aACT;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,IAAI;gBACjB,SAAS,EAAE,IAAI;aAChB;YACD,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QAEH,MAAM,IAAA,mBAAoB,EAAC,IAAI,EAAE;YAC/B,QAAQ,EAAE;gBACR,SAAS;gBACT,cAAc;gBACd,OAAO;gBACP,YAAY;gBACZ,QAAQ;gBACR,UAAU;gBACV,uBAAuB;gBACvB,SAAS;gBACT,WAAW;gBACX,mBAAmB;aACpB;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,SAAS;aACrB;YACD,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;IAEH,CAAC;CAAA;AAjDD,sCAiDC;AAED,kBAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,+CAAmD;AACnD,mEAA4E;AAC5E,yDAA6D;AAG7D,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAA,qDAA+B,EAC7B,IAAI,EACJ,GAAG,EACH,sBAAsB,EACtB,MAAM,EACN,IAAA,4BAAgB,EAAC,OAAO,EAAE,CAAE,UAAU,EAAE,WAAW,EAAE,cAAc,CAAE,CAAC,CACvE,CAAC;QAEF,MAAM,IAAA,mBAAoB,EAAC,IAAI,EAAE;YAC/B,QAAQ,EAAE;gBACR,YAAY;gBACZ,OAAO;gBACP,UAAU;gBACV,QAAQ;aACT;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,IAAI;gBACjB,SAAS,EAAE,IAAI;aAChB;SACF,CAAC,CAAC;QAEH,MAAM,IAAA,mBAAoB,EAAC,IAAI,EAAE;YAC/B,QAAQ,EAAE;gBACR,SAAS;gBACT,cAAc;gBACd,OAAO;gBACP,YAAY;gBACZ,QAAQ;gBACR,UAAU;gBACV,uBAAuB;gBACvB,SAAS;gBACT,WAAW;gBACX,mBAAmB;aACpB;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,IAAI;aAChB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;IAEH,CAAC;CAAA;AAhDD,sCAgDC;AAED,kBAAe,aAAa,CAAC"}
@@ -17,10 +17,9 @@ const update_ts_config_1 = require("./update-ts-config");
17
17
  function initProject(tree, projectName, project, options) {
18
18
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
19
19
  console.log(`init angular library project: ${projectName}`);
20
- const rootPackageJson = (0, devkit_1.readJson)(tree, 'package.json');
21
20
  yield (0, plugin_library_1.LibraryInitProject)(tree, projectName, project, options);
22
21
  (0, cleanup_1.cleanup)(tree, project, projectName);
23
- (0, update_package_json_1.updatePackageJson)(tree, project, rootPackageJson);
22
+ (0, update_package_json_1.updatePackageJson)(tree, projectName, project);
24
23
  (0, check_if_secondary_entrypoint_include_in_the_ts_config_1.checkIfSecondaryEntrypointIncludeInTheTsConfig)(tree, project);
25
24
  if ((0, workspace_utilities_1.IsBuildable)(project)) {
26
25
  (0, update_project_ng_package_configuration_1.updateProjectNgPackageConfiguration)(tree, project);
@@ -1 +1 @@
1
- {"version":3,"file":"init-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-library/init-project.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,yDAA0D;AAE1D,mEAAwD;AACxD,mEAA8D;AAC9D,qIAA0H;AAC1H,uCAAoC;AACpC,6EAAuE;AACvE,qFAA+E;AAE/E,+DAA0D;AAC1D,uGAAgG;AAChG,qEAAgE;AAChE,yDAAoD;AAEpD,SAAsB,WAAW,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAAmC;;QACnI,OAAO,CAAC,GAAG,CAAC,iCAAkC,WAAY,EAAE,CAAC,CAAC;QAE9D,MAAM,eAAe,GAAuB,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE3E,MAAM,IAAA,mCAAkB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAE9D,IAAA,iBAAO,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QACpC,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;QAElD,IAAA,uGAA8C,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE9D,IAAI,IAAA,iCAAW,EAAC,OAAO,CAAC,EAAE,CAAC;YACzB,IAAA,6EAAmC,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnD,IAAA,oDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,CAAC;QACD,IAAA,4DAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3C,IAAA,6CAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,iCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAClC,IAAA,mCAAe,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEnC,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAEzD,CAAC;CAAA;AAvBD,kCAuBC"}
1
+ {"version":3,"file":"init-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-library/init-project.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,yDAA0D;AAE1D,mEAAwD;AACxD,mEAA8D;AAC9D,qIAA0H;AAC1H,uCAAoC;AACpC,6EAAuE;AACvE,qFAA+E;AAE/E,+DAA0D;AAC1D,uGAAgG;AAChG,qEAAgE;AAChE,yDAAoD;AAEpD,SAAsB,WAAW,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAAmC;;QACnI,OAAO,CAAC,GAAG,CAAC,iCAAkC,WAAY,EAAE,CAAC,CAAC;QAE9D,MAAM,IAAA,mCAAkB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAE9D,IAAA,iBAAO,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QACpC,IAAA,uCAAiB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAE9C,IAAA,uGAA8C,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE9D,IAAI,IAAA,iCAAW,EAAC,OAAO,CAAC,EAAE,CAAC;YACzB,IAAA,6EAAmC,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnD,IAAA,oDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,CAAC;QACD,IAAA,4DAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3C,IAAA,6CAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,iCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAClC,IAAA,mCAAe,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEnC,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAEzD,CAAC;CAAA;AArBD,kCAqBC"}
@@ -1,3 +1,2 @@
1
1
  import { ProjectConfiguration, Tree } from '@nx/devkit';
2
- import { ProjectPackageJson } from '@rxap/plugin-utilities';
3
- export declare function updatePackageJson(tree: Tree, project: ProjectConfiguration, rootPackageJson: ProjectPackageJson): void;
2
+ export declare function updatePackageJson(tree: Tree, projectName: string, project: ProjectConfiguration): void;
@@ -1,23 +1,17 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.updatePackageJson = void 0;
4
- const devkit_1 = require("@nx/devkit");
5
4
  const workspace_utilities_1 = require("@rxap/workspace-utilities");
6
- const path_1 = require("path");
7
5
  const semver_1 = require("semver");
8
- const get_angular_major_version_1 = require("./get-angular-major-version");
9
- function updatePackageJson(tree, project, rootPackageJson) {
10
- var _a;
11
- if ((0, workspace_utilities_1.IsPublishable)(tree, project) && tree.exists((0, path_1.join)(project.root, 'package.json'))) {
12
- const packageJson = (0, devkit_1.readJson)(tree, (0, path_1.join)(project.root, 'package.json'));
13
- const version = (_a = (0, get_angular_major_version_1.getAngularMajorVersion)(rootPackageJson)) !== null && _a !== void 0 ? _a : packageJson.version;
14
- if (!version) {
15
- throw new Error('Unable to determine the angular major version from the root package.json');
16
- }
17
- if (!packageJson.version || (0, semver_1.gte)(version, packageJson.version)) {
18
- packageJson.version = version;
19
- }
20
- (0, devkit_1.writeJson)(tree, (0, path_1.join)(project.root, 'package.json'), packageJson);
6
+ function updatePackageJson(tree, projectName, project) {
7
+ if ((0, workspace_utilities_1.IsPublishable)(tree, project)) {
8
+ (0, workspace_utilities_1.UpdateProjectPackageJson)(tree, packageJson => {
9
+ const majorAngularVersion = (0, workspace_utilities_1.GetMajorAngularVersion)(tree);
10
+ const version = `${majorAngularVersion}.0.0`;
11
+ if (!packageJson.version || (0, semver_1.gte)(version, packageJson.version)) {
12
+ packageJson.version = version;
13
+ }
14
+ }, { projectName });
21
15
  }
22
16
  }
23
17
  exports.updatePackageJson = updatePackageJson;
@@ -1 +1 @@
1
- {"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-library/update-package-json.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAEpB,mEAA0D;AAC1D,+BAA4B;AAC5B,mCAA6B;AAC7B,2EAAqE;AAErE,SAAgB,iBAAiB,CAC/B,IAAU,EACV,OAA6B,EAC7B,eAAmC;;IAEnC,IAAI,IAAA,mCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;QACpF,MAAM,WAAW,GAAuB,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;QAC3F,MAAM,OAAO,GAAG,MAAA,IAAA,kDAAsB,EAAC,eAAe,CAAC,mCAAI,WAAW,CAAC,OAAO,CAAC;QAC/E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;QAC9F,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,OAAO,IAAI,IAAA,YAAG,EAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9D,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC;QAChC,CAAC;QACD,IAAA,kBAAS,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,WAAW,CAAC,CAAC;IACnE,CAAC;AACH,CAAC;AAhBD,8CAgBC"}
1
+ {"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-library/update-package-json.ts"],"names":[],"mappings":";;;AAIA,mEAImC;AACnC,mCAA6B;AAE7B,SAAgB,iBAAiB,CAC/B,IAAU,EACV,WAAmB,EACnB,OAA6B;IAE7B,IAAI,IAAA,mCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QACjC,IAAA,8CAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE;YAC3C,MAAM,mBAAmB,GAAG,IAAA,4CAAsB,EAAC,IAAI,CAAC,CAAC;YACzD,MAAM,OAAO,GAAG,GAAI,mBAAoB,MAAM,CAAC;YAC/C,IAAI,CAAC,WAAW,CAAC,OAAO,IAAI,IAAA,YAAG,EAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC9D,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC;YAChC,CAAC;QACH,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAdD,8CAcC"}
@@ -1,2 +0,0 @@
1
- import { ProjectPackageJson } from '@rxap/plugin-utilities';
2
- export declare function getAngularMajorVersion(rootPackageJson: ProjectPackageJson): string | null;
@@ -1,20 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getAngularMajorVersion = void 0;
4
- const semver_1 = require("semver");
5
- function getAngularMajorVersion(rootPackageJson) {
6
- var _a, _b, _c;
7
- let targetVersion = (_b = (_a = rootPackageJson.dependencies) === null || _a === void 0 ? void 0 : _a['@angular/core']) !== null && _b !== void 0 ? _b : (_c = rootPackageJson.devDependencies) === null || _c === void 0 ? void 0 : _c['@angular/cli'];
8
- if (!targetVersion) {
9
- console.error(`The package @angular/core and @angular/cli are not installed in the root package.json`);
10
- return null;
11
- }
12
- targetVersion = targetVersion.replace(/^[~^]/, '');
13
- const version = (0, semver_1.parse)(targetVersion);
14
- if (!version) {
15
- throw new Error(`Unable to parse the version ${targetVersion}`);
16
- }
17
- return `${version.major}.0.0`;
18
- }
19
- exports.getAngularMajorVersion = getAngularMajorVersion;
20
- //# sourceMappingURL=get-angular-major-version.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"get-angular-major-version.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init-library/get-angular-major-version.ts"],"names":[],"mappings":";;;AACA,mCAA+B;AAE/B,SAAgB,sBAAsB,CAAC,eAAmC;;IACxE,IAAI,aAAa,GAAG,MAAA,MAAA,eAAe,CAAC,YAAY,0CAAG,eAAe,CAAC,mCAC/C,MAAA,eAAe,CAAC,eAAe,0CAAG,cAAc,CAAC,CAAC;IAEtE,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,CAAC,KAAK,CAAC,uFAAuF,CAAC,CAAC;QACvG,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAEnD,MAAM,OAAO,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC;IAErC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,+BAAgC,aAAc,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,OAAO,GAAI,OAAO,CAAC,KAAM,MAAM,CAAC;AAClC,CAAC;AAlBD,wDAkBC"}