@rxap/plugin-library 16.0.0-dev.41 → 16.0.0-dev.43

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,19 @@
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
+ # [16.0.0-dev.43](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.0.0-dev.42...@rxap/plugin-library@16.0.0-dev.43) (2024-02-05)
7
+
8
+ ### Bug Fixes
9
+
10
+ - ensure the packageJson name is correct ([37dee1a](https://gitlab.com/rxap/packages/commit/37dee1a28c650673d980a1a37d6b82b117ac7933))
11
+ - ensure the packageJson version is correct ([635ff0e](https://gitlab.com/rxap/packages/commit/635ff0e68d571943e0e6ee40ec72627853734628))
12
+
13
+ # [16.0.0-dev.42](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.0.0-dev.41...@rxap/plugin-library@16.0.0-dev.42) (2023-11-16)
14
+
15
+ ### Bug Fixes
16
+
17
+ - support custom inline options ([468985a](https://gitlab.com/rxap/packages/commit/468985a004993bb4dcbf6dd6a55aae973c509935))
18
+
6
19
  # [16.0.0-dev.41](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.0.0-dev.40...@rxap/plugin-library@16.0.0-dev.41) (2023-10-16)
7
20
 
8
21
  ### Bug Fixes
package/README.md CHANGED
@@ -19,7 +19,7 @@ yarn add @rxap/plugin-library
19
19
  ```
20
20
  **Install peer dependencies:**
21
21
  ```bash
22
- yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.1-dev.13 @rxap/generator-utilities@^1.1.0-dev.19 @rxap/node-utilities@^1.1.0-dev.15 @rxap/plugin-angular@^16.1.0-dev.55 @rxap/plugin-nestjs@^16.1.0-dev.45 @rxap/plugin-utilities@^16.1.0-dev.21 @rxap/ts-morph@* @rxap/utilities@^16.0.0-dev.23 @rxap/workspace-utilities@^0.1.0-dev.23 handlebars@^4.7.7 nx@^16.5.0 semver@^7.5.3 ts-morph@^18.0.0 tslib@2.6.2
22
+ yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.1-dev.13 @rxap/generator-utilities@^1.1.0-dev.19 @rxap/node-utilities@^1.1.0-dev.15 @rxap/plugin-angular@^16.1.0-dev.65 @rxap/plugin-nestjs@^16.1.0-dev.48 @rxap/plugin-utilities@^16.1.0-dev.22 @rxap/ts-morph@^0.1.0-dev.21 @rxap/utilities@^16.0.0-dev.23 @rxap/workspace-utilities@^0.1.0-dev.27 handlebars@^4.7.7 nx@^16.5.0 semver@^7.5.3 ts-morph@^18.0.0 tslib@2.6.2
23
23
  ```
24
24
  **Execute the init generator:**
25
25
  ```bash
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "16.0.0-dev.41",
2
+ "version": "16.0.0-dev.43",
3
3
  "name": "@rxap/plugin-library",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -14,18 +14,18 @@
14
14
  "@rxap/generator-ts-morph": "^1.0.1-dev.13",
15
15
  "@rxap/generator-utilities": "^1.1.0-dev.19",
16
16
  "@rxap/node-utilities": "^1.1.0-dev.15",
17
- "@rxap/plugin-angular": "^16.1.0-dev.55",
18
- "@rxap/plugin-nestjs": "^16.1.0-dev.45",
19
- "@rxap/plugin-utilities": "^16.1.0-dev.21",
20
- "@rxap/ts-morph": "*",
17
+ "@rxap/plugin-angular": "^16.1.0-dev.65",
18
+ "@rxap/plugin-nestjs": "^16.1.0-dev.48",
19
+ "@rxap/plugin-utilities": "^16.1.0-dev.22",
20
+ "@rxap/ts-morph": "^0.1.0-dev.21",
21
21
  "@rxap/utilities": "^16.0.0-dev.23",
22
- "@rxap/workspace-utilities": "^0.1.0-dev.23",
22
+ "@rxap/workspace-utilities": "^0.1.0-dev.27",
23
23
  "handlebars": "^4.7.7",
24
24
  "nx": "^16.5.0",
25
25
  "semver": "^7.5.3",
26
26
  "ts-morph": "^18.0.0",
27
27
  "tslib": "2.6.2",
28
- "@rxap/plugin-localazy": "16.1.0-dev.16",
28
+ "@rxap/plugin-localazy": "16.1.0-dev.23",
29
29
  "@rxap/workspace-ts-morph": "0.1.0-dev.12"
30
30
  },
31
31
  "author": {
@@ -62,27 +62,31 @@
62
62
  },
63
63
  {
64
64
  "package": "@rxap/plugin-angular",
65
- "version": "16.1.0-dev.55"
65
+ "version": "16.1.0-dev.65"
66
66
  },
67
67
  {
68
68
  "package": "@rxap/plugin-nestjs",
69
- "version": "16.1.0-dev.45"
69
+ "version": "16.1.0-dev.48"
70
70
  },
71
71
  {
72
72
  "package": "@rxap/plugin-utilities",
73
- "version": "16.1.0-dev.21"
73
+ "version": "16.1.0-dev.22"
74
74
  },
75
75
  {
76
76
  "package": "@rxap/schematics-utilities",
77
77
  "version": "16.0.0-dev.4"
78
78
  },
79
+ {
80
+ "package": "@rxap/ts-morph",
81
+ "version": "0.1.0-dev.21"
82
+ },
79
83
  {
80
84
  "package": "@rxap/utilities",
81
85
  "version": "16.0.0-dev.23"
82
86
  },
83
87
  {
84
88
  "package": "@rxap/workspace-utilities",
85
- "version": "0.1.0-dev.23"
89
+ "version": "0.1.0-dev.27"
86
90
  }
87
91
  ]
88
92
  },
@@ -97,7 +101,7 @@
97
101
  },
98
102
  "schematics": "./generators.json",
99
103
  "type": "commonjs",
100
- "gitHead": "4618ff1e4cbe6cfd826a154d0f361f83c934900a",
104
+ "gitHead": "4d61e510ed77c78b520a388f296a3f0f9fafa49f",
101
105
  "main": "./src/index.js",
102
106
  "types": "./src/index.d.ts"
103
107
  }
@@ -41,6 +41,28 @@ function stringInterpolation(options, params) {
41
41
  }
42
42
  }
43
43
  }
44
+ function extractFlattenOptions(options) {
45
+ const extracted = {};
46
+ for (const [option, value] of Object.entries(options)) {
47
+ let key = undefined;
48
+ if (option.startsWith('options-')) {
49
+ key = option.replace('options-', '');
50
+ }
51
+ if (option.startsWith('option-')) {
52
+ key = option.replace('option-', '');
53
+ }
54
+ if (option.match(/option[A-Z]/)) {
55
+ key = option.replace(/option([A-Z])/g, (match, letter) => letter.toLowerCase());
56
+ }
57
+ if (option.match(/options[A-Z]/)) {
58
+ key = option.replace(/options([A-Z])/g, (match, letter) => letter.toLowerCase());
59
+ }
60
+ if (key) {
61
+ extracted[key] = value;
62
+ }
63
+ }
64
+ return extracted;
65
+ }
44
66
  function runExecutor(options, context) {
45
67
  var _a, _b;
46
68
  var _c;
@@ -65,7 +87,7 @@ function runExecutor(options, context) {
65
87
  cwd: context.cwd,
66
88
  targetName: context.targetName,
67
89
  });
68
- command += ` ${buildParameters(options.options)}`;
90
+ command += ` ${buildParameters(Object.assign(Object.assign({}, options.options), extractFlattenOptions(options)))}`;
69
91
  if (options.dryRun) {
70
92
  command += ' --dry-run';
71
93
  }
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/run-generator/executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/executors/run-generator/executor.ts"],"names":[],"mappings":"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"}
@@ -37,6 +37,17 @@ function setGeneralTargetDefaults(tree) {
37
37
  (0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'check-version', 'expose-as-schematic');
38
38
  (0, devkit_1.updateNxJson)(tree, nxJson);
39
39
  }
40
+ function updatePackageJson(tree, project) {
41
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
42
+ yield (0, workspace_utilities_1.UpdateProjectPackageJson)(tree, packageJson => {
43
+ if (packageJson.version === '0.0.1') {
44
+ const nxVersion = (0, workspace_utilities_1.GetNxVersion)(tree);
45
+ const major = nxVersion.split('.')[0];
46
+ packageJson.version = `${major}.0.0`;
47
+ }
48
+ }, { projectName: project.name });
49
+ });
50
+ }
40
51
  function initPluginGenerator(tree, options) {
41
52
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
42
53
  console.log('plugin library init generator:', options);
@@ -49,6 +60,7 @@ function initPluginGenerator(tree, options) {
49
60
  console.log(`init project: ${projectName}`);
50
61
  updateProjectTargets(tree, project);
51
62
  (0, devkit_1.updateProjectConfiguration)(tree, project.name, project);
63
+ yield updatePackageJson(tree, project);
52
64
  }
53
65
  }
54
66
  });
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-plugin/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AACpB,mEAAkE;AAClE,6DAAuD;AACvD,mEAKmC;AAGnC,SAAS,WAAW,CAClB,IAAU,EACV,OAAkC,EAClC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,2CAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,IAAI,CAAC,IAAA,qCAAe,EAAC,OAAO,CAAC,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAA6B;IAErE,IAAA,kCAAY,EAAC,OAAO,EAAE,eAAe,EAAE;QACrC,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE;YACP,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IAEH,IAAI,IAAA,gCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;QAChC,IAAA,kCAAY,EAAC,OAAO,EAAE,qBAAqB,EAAE;YAC3C,QAAQ,EAAE,oCAAoC;YAC9C,OAAO,EAAE;gBACP,SAAS,EAAE,0CAA0C;aACtD;SACF,CAAC,CAAC;KACJ;AAEH,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAU;IAC1C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAA,oDAA8B,EAAC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,qBAAqB,CAAC,CAAC;IAExF,IAAA,oDAA8B,EAAC,MAAM,EAAE,eAAe,EAAE,qBAAqB,CAAC,CAAC;IAE/E,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;QAEvD,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YAEzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;gBAE9C,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAEpC,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aAEzD;SAEF;IAEH,CAAC;CAAA;AA1BD,kDA0BC;AAED,kBAAe,mBAAmB,CAAC"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-plugin/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AACpB,mEAImC;AACnC,6DAAuD;AACvD,mEASmC;AAGnC,SAAS,WAAW,CAClB,IAAU,EACV,OAAkC,EAClC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,2CAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,IAAI,CAAC,IAAA,qCAAe,EAAC,OAAO,CAAC,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAA6B;IAErE,IAAA,kCAAY,EAAC,OAAO,EAAE,eAAe,EAAE;QACrC,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE;YACP,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IAEH,IAAI,IAAA,gCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE;QAChC,IAAA,kCAAY,EAAC,OAAO,EAAE,qBAAqB,EAAE;YAC3C,QAAQ,EAAE,oCAAoC;YAC9C,OAAO,EAAE;gBACP,SAAS,EAAE,0CAA0C;aACtD;SACF,CAAC,CAAC;KACJ;AAEH,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAU;IAC1C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAA,oDAA8B,EAAC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,qBAAqB,CAAC,CAAC;IAExF,IAAA,oDAA8B,EAAC,MAAM,EAAE,eAAe,EAAE,qBAAqB,CAAC,CAAC;IAE/E,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAe,iBAAiB,CAAC,IAAU,EAAE,OAA6B;;QACxE,MAAM,IAAA,8CAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE;YAEjD,IAAI,WAAW,CAAC,OAAO,KAAK,OAAO,EAAE;gBACnC,MAAM,SAAS,GAAG,IAAA,kCAAY,EAAC,IAAI,CAAC,CAAC;gBACrC,MAAM,KAAK,GAAM,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzC,WAAW,CAAC,OAAO,GAAG,GAAI,KAAM,MAAM,CAAC;aACxC;QAEH,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACpC,CAAC;CAAA;AAED,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;QAEvD,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YAEzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;gBAE9C,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAEpC,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAExD,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aAExC;SAEF;IAEH,CAAC;CAAA;AA5BD,kDA4BC;AAED,kBAAe,mBAAmB,CAAC"}
@@ -18,10 +18,16 @@ function setGeneralTargetDefaults(tree) {
18
18
  function updateProjectPackageJson(tree, project, projectName, rootPackageJson) {
19
19
  var _a, _b, _c, _d, _e;
20
20
  const packageJson = (0, devkit_1.readJson)(tree, (0, path_1.join)(project.root, 'package.json'));
21
+ const scope = (0, workspace_utilities_1.GetWorkspaceScope)(tree);
21
22
  (_a = packageJson.scripts) !== null && _a !== void 0 ? _a : (packageJson.scripts = {});
22
23
  if (Object.keys(packageJson.scripts).length === 0) {
23
24
  delete packageJson.scripts;
24
25
  }
26
+ if (!packageJson.name.startsWith('@')) {
27
+ const newName = `${scope}/${projectName}`;
28
+ updatePathsAliasInBaseTsConfig(tree, project, packageJson.name, newName);
29
+ packageJson.name = newName;
30
+ }
25
31
  (_b = packageJson.publishConfig) !== null && _b !== void 0 ? _b : (packageJson.publishConfig = {});
26
32
  packageJson.publishConfig.access = 'public';
27
33
  const output = (0, generator_utilities_1.GetBuildOutputForProject)(project);
@@ -49,6 +55,15 @@ function updateProjectPackageJson(tree, project, projectName, rootPackageJson) {
49
55
  packageJson.author = rootPackageJson.author;
50
56
  (0, devkit_1.writeJson)(tree, (0, path_1.join)(project.root, 'package.json'), packageJson);
51
57
  }
58
+ function updatePathsAliasInBaseTsConfig(tree, project, currentPackageJsonName, newPackageJsonName) {
59
+ const tsConfig = (0, devkit_1.readJson)(tree, (0, path_1.join)('/', 'tsconfig.base.json'));
60
+ if (tsConfig.compilerOptions.paths[currentPackageJsonName]) {
61
+ const aliasList = tsConfig.compilerOptions.paths[currentPackageJsonName];
62
+ delete tsConfig.compilerOptions.paths[currentPackageJsonName];
63
+ tsConfig.compilerOptions.paths[newPackageJsonName] = aliasList;
64
+ }
65
+ (0, devkit_1.writeJson)(tree, (0, path_1.join)('/', 'tsconfig.base.json'), tsConfig);
66
+ }
52
67
  function updateProjectTargets(project) {
53
68
  (0, workspace_utilities_1.CoerceTarget)(project, 'update-dependencies', { executor: '@rxap/plugin-library:update-dependencies' });
54
69
  (0, workspace_utilities_1.CoerceTarget)(project, 'update-package-group', { executor: '@rxap/plugin-library:update-package-group' });
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-publishable/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAUoB;AACpB,mEAKmC;AAEnC,mEAQmC;AACnC,+BAGc;AAId,SAAS,wBAAwB,CAAC,IAAU;IAC1C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAA,oDAA8B,EAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC1D,IAAA,oDAA8B,EAAC,MAAM,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;IAEhF,IAAA,+CAAyB,EACvB,MAAM,EACN,QAAQ,EACR,oCAAoC,EACpC,6BAA6B,EAC7B,yBAAyB,EACzB,4BAA4B,EAC5B,+BAA+B,EAC/B,+BAA+B,EAC/B,8BAA8B,EAC9B,6BAA6B,CAC9B,CAAC;IACF,IAAA,gDAA0B,EAAC,MAAM,EAAE,QAAQ,EAAE,yBAAyB,CAAC,CAAC;IAExE,IAAA,oDAA8B,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEjD,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAE7B,CAAC;AAED,SAAS,wBAAwB,CAC/B,IAAU,EACV,OAA6B,EAC7B,WAAmB,EACnB,eAAmC;;IAEnC,MAAM,WAAW,GAAuB,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;IAC3F,MAAM,KAAK,GAAG,IAAA,uCAAiB,EAAC,IAAI,CAAC,CAAC;IACtC,MAAA,WAAW,CAAC,OAAO,oCAAnB,WAAW,CAAC,OAAO,GAAK,EAAE,EAAC;IAC3B,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACjD,OAAO,WAAW,CAAC,OAAO,CAAC;KAC5B;IACD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACrC,MAAM,OAAO,GAAG,GAAI,KAAM,IAAK,WAAY,EAAE,CAAC;QAC9C,8BAA8B,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzE,WAAW,CAAC,IAAI,GAAG,OAAO,CAAC;KAC5B;IACD,MAAA,WAAW,CAAC,aAAa,oCAAzB,WAAW,CAAC,aAAa,GAAK,EAAE,EAAC;IACjC,WAAW,CAAC,aAAa,CAAC,MAAM,GAAG,QAAQ,CAAC;IAC5C,MAAM,MAAM,GAAG,IAAA,8CAAwB,EAAC,OAAO,CAAC,CAAC;IACjD,WAAW,CAAC,aAAa,CAAC,SAAS,GAAG,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAErE,wBAAwB;IACxB,WAAW,CAAC,QAAQ,GAAG;QACrB,GAAG,IAAI,GAAG,CAAC;YACT,GAAG,CAAC,MAAA,WAAW,CAAC,QAAQ,mCAAI,EAAE,CAAC;YAC/B,GAAG,CAAC,MAAA,eAAe,CAAC,QAAQ,mCAAI,EAAE,CAAC;YACnC,GAAG,CAAC,MAAA,OAAO,CAAC,IAAI,mCAAI,EAAE,CAAC;YACvB,WAAW;SACZ,CAAC;KACH,CAAC;IACF,IAAI,eAAe,CAAC,QAAQ,EAAE;QAC5B,WAAW,CAAC,QAAQ,GAAG,IAAA,WAAI,EAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;KACrE;IACD,WAAW,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;IACxC,WAAW,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;IAC9C,WAAW,CAAC,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;IACxD,WAAW,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;IAC9C,WAAW,CAAC,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;IACpD,IAAI,WAAW,CAAC,UAAU,IAAI,OAAO,WAAW,CAAC,UAAU,KAAK,QAAQ,EAAE;QACxE,WAAW,CAAC,UAAU,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;KACjD;IACD,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;IAC5C,IAAA,kBAAS,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,WAAW,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,8BAA8B,CACrC,IAAU,EACV,OAA6B,EAC7B,sBAA8B,EAC9B,kBAA0B;IAE1B,MAAM,QAAQ,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,oBAAoB,CAAC,CAAC,CAAC;IACjE,IAAI,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE;QAC1D,MAAM,SAAS,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACzE,OAAO,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC9D,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,kBAAkB,CAAC,GAAG,SAAS,CAAC;KAChE;IACD,IAAA,kBAAS,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,GAAG,EAAE,oBAAoB,CAAC,EAAE,QAAQ,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,oBAAoB,CAAC,OAA6B;IACzD,IAAA,kCAAY,EAAC,OAAO,EAAE,qBAAqB,EAAE,EAAE,QAAQ,EAAE,0CAA0C,EAAE,CAAC,CAAC;IACvG,IAAA,kCAAY,EAAC,OAAO,EAAE,sBAAsB,EAAE,EAAE,QAAQ,EAAE,2CAA2C,EAAE,CAAC,CAAC;IACzG,IAAA,kCAAY,EAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,6BAA6B,EAAE,CAAC,CAAC;IAC7E,IAAA,kCAAY,EAAC,OAAO,EAAE,kBAAkB,EAAE;QACxC,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE;YACP,4CAA4C;SAC7C;QACD,OAAO,EAAE;YACP,SAAS,EAAE,uCAAuC;YAClD,OAAO,EAAE;gBACP,MAAM,EAAE,IAAI;aACb;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAClB,IAAU,EACV,OAA4B,EAC5B,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,+CAAyB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAClE,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,wBAAwB,CAC5C,IAAU,EACV,OAAuC;;QAEvC,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,OAAO,CAAC,CAAC;QAE5D,MAAM,eAAe,GAAuB,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE3E,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YAEzB,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;oBACpD,SAAS;iBACV;gBAED,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;gBAE9C,oBAAoB,CAAC,OAAO,CAAC,CAAC;gBAC9B,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;gBACtE,IAAA,0CAAoB,EAAC,IAAI,EAAE;oBACzB,SAAS,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC;oBACnC,MAAM,EAAE,OAAO,CAAC,IAAI;oBACpB,SAAS,EAAE,OAAO,CAAC,SAAS;iBAC7B,CAAC,CAAC;gBACH,IAAA,gCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;gBACrD,IAAA,gCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;gBACtD,IAAA,gCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;gBAClD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;oBAC1B,IAAA,gCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;oBACzE,IAAA,gCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;iBACvE;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;iBAC7D;gBACD,IAAA,yCAAmB,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,CAAE,WAAW,CAAE,CAAC,CAAC;gBAE7E,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aAEzD;SAEF;IAEH,CAAC;CAAA;AA5CD,4DA4CC;AAED,kBAAe,wBAAwB,CAAC"}