@o3r/workspace 12.2.0-prerelease.9 → 12.3.0-prerelease.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.
- package/package.json +28 -29
- package/schematics/ng-add/helpers/commit-hooks/index.js +2 -2
- package/schematics/ng-add/helpers/commit-hooks/index.js.map +1 -1
- package/schematics/ng-add/helpers/renovate/templates/__dot__renovaterc.json.template +1 -1
- package/schematics/ng-add/schema.d.ts +1 -1
- package/schematics/ng-add/schema.d.ts.map +1 -1
- package/schematics/ng-add/schema.json +1 -1
- package/schematics/ng-update/v12.1/renovate-version.d.ts.map +1 -1
- package/schematics/ng-update/v12.1/renovate-version.js +5 -2
- package/schematics/ng-update/v12.1/renovate-version.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.3.0-prerelease.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -29,7 +29,6 @@
|
|
|
29
29
|
"build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest",
|
|
30
30
|
"build:source": "tsc -b tsconfig.build.json --pretty && yarn cpy ./package.json dist",
|
|
31
31
|
"prepare:build:builders": "yarn cpy 'builders/**/*.json' dist/builders && yarn cpy 'schematics/**/*.json' 'schematics/**/templates/**' dist/schematics && yarn cpy '{builders,collection,migration}.json' dist",
|
|
32
|
-
"prepare:publish": "prepare-publish ./dist",
|
|
33
32
|
"postbuild": "patch-package-json-main"
|
|
34
33
|
},
|
|
35
34
|
"main": "./src/public_api.js",
|
|
@@ -42,7 +41,7 @@
|
|
|
42
41
|
"@angular/common": "^19.0.0",
|
|
43
42
|
"@angular/compiler-cli": "^19.0.0",
|
|
44
43
|
"@angular/core": "^19.0.0",
|
|
45
|
-
"@o3r/telemetry": "^12.
|
|
44
|
+
"@o3r/telemetry": "^12.3.0-prerelease.0",
|
|
46
45
|
"@schematics/angular": "^19.0.0",
|
|
47
46
|
"ts-node": "~10.9.2",
|
|
48
47
|
"type-fest": "^4.10.2",
|
|
@@ -60,7 +59,7 @@
|
|
|
60
59
|
}
|
|
61
60
|
},
|
|
62
61
|
"dependencies": {
|
|
63
|
-
"@o3r/schematics": "^12.
|
|
62
|
+
"@o3r/schematics": "^12.3.0-prerelease.0",
|
|
64
63
|
"commander": "^13.0.0",
|
|
65
64
|
"globby": "^11.1.0",
|
|
66
65
|
"semver": "^7.5.2",
|
|
@@ -83,22 +82,22 @@
|
|
|
83
82
|
"@angular/platform-browser-dynamic": "~19.2.0",
|
|
84
83
|
"@angular/router": "~19.2.0",
|
|
85
84
|
"@babel/core": "~7.26.0",
|
|
86
|
-
"@babel/preset-typescript": "~7.
|
|
85
|
+
"@babel/preset-typescript": "~7.27.0",
|
|
87
86
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
88
|
-
"@ngrx/entity": "~19.
|
|
89
|
-
"@ngrx/store": "~19.
|
|
90
|
-
"@nx/angular": "~20.
|
|
91
|
-
"@nx/eslint": "~20.
|
|
92
|
-
"@nx/eslint-plugin": "~20.
|
|
93
|
-
"@nx/jest": "~20.
|
|
94
|
-
"@nx/js": "~20.
|
|
95
|
-
"@nx/workspace": "~20.
|
|
96
|
-
"@o3r/build-helpers": "^12.
|
|
97
|
-
"@o3r/core": "^12.
|
|
98
|
-
"@o3r/eslint-plugin": "^12.
|
|
99
|
-
"@o3r/schematics": "^12.
|
|
100
|
-
"@o3r/telemetry": "^12.
|
|
101
|
-
"@o3r/test-helpers": "^12.
|
|
87
|
+
"@ngrx/entity": "~19.1.0",
|
|
88
|
+
"@ngrx/store": "~19.1.0",
|
|
89
|
+
"@nx/angular": "~20.6.0",
|
|
90
|
+
"@nx/eslint": "~20.6.0",
|
|
91
|
+
"@nx/eslint-plugin": "~20.6.0",
|
|
92
|
+
"@nx/jest": "~20.6.0",
|
|
93
|
+
"@nx/js": "~20.6.0",
|
|
94
|
+
"@nx/workspace": "~20.6.0",
|
|
95
|
+
"@o3r/build-helpers": "^12.3.0-prerelease.0",
|
|
96
|
+
"@o3r/core": "^12.3.0-prerelease.0",
|
|
97
|
+
"@o3r/eslint-plugin": "^12.3.0-prerelease.0",
|
|
98
|
+
"@o3r/schematics": "^12.3.0-prerelease.0",
|
|
99
|
+
"@o3r/telemetry": "^12.3.0-prerelease.0",
|
|
100
|
+
"@o3r/test-helpers": "^12.3.0-prerelease.0",
|
|
102
101
|
"@schematics/angular": "~19.2.0",
|
|
103
102
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
104
103
|
"@types/jest": "~29.5.2",
|
|
@@ -107,12 +106,12 @@
|
|
|
107
106
|
"@types/pid-from-port": "^1.1.0",
|
|
108
107
|
"@types/semver": "^7.3.13",
|
|
109
108
|
"@types/uuid": "^10.0.0",
|
|
110
|
-
"@typescript-eslint/parser": "~8.
|
|
111
|
-
"angular-eslint": "~19.
|
|
109
|
+
"@typescript-eslint/parser": "~8.29.0",
|
|
110
|
+
"angular-eslint": "~19.3.0",
|
|
112
111
|
"cpy-cli": "^5.0.0",
|
|
113
|
-
"eslint": "~9.
|
|
112
|
+
"eslint": "~9.23.0",
|
|
114
113
|
"eslint-import-resolver-node": "~0.3.9",
|
|
115
|
-
"eslint-import-resolver-typescript": "~3.
|
|
114
|
+
"eslint-import-resolver-typescript": "~3.10.0",
|
|
116
115
|
"eslint-plugin-import": "~2.31.0",
|
|
117
116
|
"eslint-plugin-import-newlines": "~1.4.0",
|
|
118
117
|
"eslint-plugin-jest": "~28.11.0",
|
|
@@ -127,14 +126,14 @@
|
|
|
127
126
|
"jest-preset-angular": "~14.5.0",
|
|
128
127
|
"jsonc-eslint-parser": "~2.4.0",
|
|
129
128
|
"minimist": "^1.2.6",
|
|
130
|
-
"nx": "~20.
|
|
129
|
+
"nx": "~20.6.0",
|
|
131
130
|
"pid-from-port": "^1.1.3",
|
|
132
131
|
"rxjs": "^7.8.1",
|
|
133
|
-
"ts-jest": "~29.
|
|
132
|
+
"ts-jest": "~29.3.0",
|
|
134
133
|
"ts-node": "~10.9.2",
|
|
135
134
|
"type-fest": "^4.30.1",
|
|
136
135
|
"typescript": "~5.8.2",
|
|
137
|
-
"typescript-eslint": "~8.
|
|
136
|
+
"typescript-eslint": "~8.29.0",
|
|
138
137
|
"zone.js": "~0.15.0"
|
|
139
138
|
},
|
|
140
139
|
"generatorDependencies": {
|
|
@@ -144,9 +143,9 @@
|
|
|
144
143
|
"@commitlint/config-angular": "^19.0.0",
|
|
145
144
|
"@commitlint/config-conventional": "^19.0.0",
|
|
146
145
|
"@commitlint/types": "^19.0.0",
|
|
147
|
-
"@ngrx/router-store": "~19.
|
|
148
|
-
"@ngrx/effects": "~19.
|
|
149
|
-
"@ngrx/store-devtools": "~19.
|
|
146
|
+
"@ngrx/router-store": "~19.1.0",
|
|
147
|
+
"@ngrx/effects": "~19.1.0",
|
|
148
|
+
"@ngrx/store-devtools": "~19.1.0",
|
|
150
149
|
"editorconfig-checker": "^6.0.1",
|
|
151
150
|
"husky": "~9.1.0",
|
|
152
151
|
"lerna": "^8.1.7",
|
|
@@ -24,7 +24,7 @@ function getCommitHookInitTask(context) {
|
|
|
24
24
|
const packageManager = (0, schematics_2.getPackageManager)();
|
|
25
25
|
const huskyTask = new schematics_2.NpmExecTask('husky init');
|
|
26
26
|
const taskId = context.addTask(huskyTask, taskIds);
|
|
27
|
-
const setupLintStage = new schematics_2.NodeRunScriptTask(`require('node:fs').writeFileSync('.husky/pre-commit', '${packageManager} exec lint-
|
|
27
|
+
const setupLintStage = new schematics_2.NodeRunScriptTask(`require('node:fs').writeFileSync('.husky/pre-commit', '${packageManager} exec lint-staged');`);
|
|
28
28
|
context.addTask(setupLintStage, [taskId]);
|
|
29
29
|
};
|
|
30
30
|
}
|
|
@@ -36,7 +36,7 @@ function getCommitHookInitTask(context) {
|
|
|
36
36
|
const editPackageJson = (tree, context) => {
|
|
37
37
|
const packageJson = tree.readJson('/package.json');
|
|
38
38
|
if (packageJson['lint-staged']) {
|
|
39
|
-
context.logger.debug('A Lint-
|
|
39
|
+
context.logger.debug('A Lint-staged configuration is already defined, the default value will not be applied');
|
|
40
40
|
return tree;
|
|
41
41
|
}
|
|
42
42
|
packageJson['lint-staged'] = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/commit-hooks/index.ts"],"names":[],"mappings":";;;AAoCA,sDAQC;AAwBD,4DAgBC;AApFD,2DAWoC;AACpC,gDAIyB;AAKzB,wDAAwD;AAC3C,QAAA,yBAAyB,GAAG;IACvC,OAAO;IACP,aAAa;IACb,sBAAsB;IACtB,iBAAiB;IACjB,4BAA4B;IAC5B,iCAAiC;IACjC,mBAAmB;CACpB,CAAC;AAEF;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,OAAyB;IAC7D,OAAO,CAAC,OAAkB,EAAE,EAAE;QAC5B,MAAM,cAAc,GAAG,IAAA,8BAAiB,GAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,IAAI,wBAAW,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,cAAc,GAAG,IAAI,8BAAiB,CAAC,0DAA0D,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/helpers/commit-hooks/index.ts"],"names":[],"mappings":";;;AAoCA,sDAQC;AAwBD,4DAgBC;AApFD,2DAWoC;AACpC,gDAIyB;AAKzB,wDAAwD;AAC3C,QAAA,yBAAyB,GAAG;IACvC,OAAO;IACP,aAAa;IACb,sBAAsB;IACtB,iBAAiB;IACjB,4BAA4B;IAC5B,iCAAiC;IACjC,mBAAmB;CACpB,CAAC;AAEF;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,OAAyB;IAC7D,OAAO,CAAC,OAAkB,EAAE,EAAE;QAC5B,MAAM,cAAc,GAAG,IAAA,8BAAiB,GAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,IAAI,wBAAW,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,cAAc,GAAG,IAAI,8BAAiB,CAAC,0DAA0D,cAAc,sBAAsB,CAAC,CAAC;QAC7I,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACI,MAAM,eAAe,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IACrD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAgB,CAAC;IAClE,IAAI,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uFAAuF,CAAC,CAAC;QAC9G,OAAO,IAAI,CAAC;IACd,CAAC;IACD,WAAW,CAAC,aAAa,CAAC,GAAG;QAC3B,GAAG,EAAE;YACH,gCAAgC;SACjC;KACF,CAAC;IACF,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;AAC/D,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B;AAEF;;GAEG;AACH,SAAgB,wBAAwB;IACtC,OAAO,GAAG,EAAE;QACV,MAAM,cAAc,GAAG,IAAA,8BAAiB,GAAE,CAAC;QAC3C,MAAM,cAAc,GAAG,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,kCAAkC,CAAC,EAAE;YACpE,IAAA,qBAAQ,EAAC;gBACP,KAAK,EAAE,EAAE;gBACT,cAAc;aACf,CAAC;YACF,IAAA,gCAAmB,GAAE;SACtB,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,IAAA,sBAAS,EAAC,cAAc,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;QAChE,OAAO,IAAA,kBAAK,EAAC;YACX,uBAAe;YACf,IAAI;SACL,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -5,6 +5,6 @@
|
|
|
5
5
|
"github>AmadeusITGroup/otter//tools/renovate/otter-project#v<%= version %>"<% } else { %>
|
|
6
6
|
"github>AmadeusITGroup/otter//tools/renovate/group/otter#v<%= version %>",
|
|
7
7
|
"github>AmadeusITGroup/otter//tools/renovate/tasks/base#v<%= version %>",
|
|
8
|
-
"github>AmadeusITGroup/otter//tools/renovate/tasks/otter-ng-update
|
|
8
|
+
"github>AmadeusITGroup/otter//tools/renovate/tasks/otter-ng-update#v<%= version %>(npm)"<% } %>
|
|
9
9
|
]
|
|
10
10
|
}
|
|
@@ -13,7 +13,7 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
|
|
|
13
13
|
};
|
|
14
14
|
/** Do not initialize a git repository. */
|
|
15
15
|
skipGit: boolean;
|
|
16
|
-
/** Skip the setup of CommitLint and Lint-
|
|
16
|
+
/** Skip the setup of CommitLint and Lint-Staged configurations and pre-commit checks */
|
|
17
17
|
skipPreCommitChecks: boolean;
|
|
18
18
|
/** Use a pinned version for otter packages */
|
|
19
19
|
exactO3rVersion?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,8BAA8B;AAC9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,8BAA8B;AAC9B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,wFAAwF;IACxF,mBAAmB,EAAE,OAAO,CAAC;IAE7B,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,8BAA8B;IAC9B,eAAe,EAAE,eAAe,CAAC;IAEjC,+BAA+B;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,kCAAkC;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB"}
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"alias": "g"
|
|
47
47
|
},
|
|
48
48
|
"skipPreCommitChecks": {
|
|
49
|
-
"description": "Skip the setup of CommitLint and Lint-
|
|
49
|
+
"description": "Skip the setup of CommitLint and Lint-Staged configurations and pre-commit checks.",
|
|
50
50
|
"type": "boolean",
|
|
51
51
|
"default": false
|
|
52
52
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renovate-version.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v12.1/renovate-version.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAMpC,eAAO,MAAM,qBAAqB,QAAO,
|
|
1
|
+
{"version":3,"file":"renovate-version.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v12.1/renovate-version.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAMpC,eAAO,MAAM,qBAAqB,QAAO,IAyBxC,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.updateRenovateVersion = void 0;
|
|
|
4
4
|
const node_fs_1 = require("node:fs");
|
|
5
5
|
const node_path_1 = require("node:path");
|
|
6
6
|
const otterRenovatePathPrefix = 'github>AmadeusITGroup/otter//';
|
|
7
|
-
const withVersionPattern = /#[0-9.]+(?:-.+)?$/;
|
|
7
|
+
const withVersionPattern = /#v[0-9.]+(?:-.+)?$/;
|
|
8
8
|
const supportedRenovateFiles = ['.renovaterc.json', 'renovaterc.json', 'renovate.json'];
|
|
9
9
|
const updateRenovateVersion = () => {
|
|
10
10
|
const version = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(__dirname, '..', '..', '..', 'package.json'), { encoding: 'utf8' })).version;
|
|
@@ -21,7 +21,10 @@ const updateRenovateVersion = () => {
|
|
|
21
21
|
if (!extensionPath.startsWith(otterRenovatePathPrefix) || withVersionPattern.test(extensionPath)) {
|
|
22
22
|
return extensionPath;
|
|
23
23
|
}
|
|
24
|
-
|
|
24
|
+
const splitExtensionPath = extensionPath.split('(');
|
|
25
|
+
return splitExtensionPath.length < 2
|
|
26
|
+
? `${extensionPath}#v${version}`
|
|
27
|
+
: `${splitExtensionPath[0]}#v${version}(${splitExtensionPath.slice(1).join('(')}`;
|
|
25
28
|
});
|
|
26
29
|
tree.overwrite(renovateFile, JSON.stringify(renovateConfig, null, 2));
|
|
27
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renovate-version.js","sourceRoot":"","sources":["../../../../schematics/ng-update/v12.1/renovate-version.ts"],"names":[],"mappings":";;;AAAA,qCAEiB;AACjB,yCAEmB;AAKnB,MAAM,uBAAuB,GAAG,+BAA+B,CAAC;AAChE,MAAM,kBAAkB,GAAG,
|
|
1
|
+
{"version":3,"file":"renovate-version.js","sourceRoot":"","sources":["../../../../schematics/ng-update/v12.1/renovate-version.ts"],"names":[],"mappings":";;;AAAA,qCAEiB;AACjB,yCAEmB;AAKnB,MAAM,uBAAuB,GAAG,+BAA+B,CAAC;AAChE,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAChD,MAAM,sBAAsB,GAAG,CAAC,kBAAkB,EAAE,iBAAiB,EAAE,eAAe,CAAC,CAAC;AAEjF,MAAM,qBAAqB,GAAG,GAAS,EAAE;IAC9C,MAAM,OAAO,GAAuB,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAA,mBAAO,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;IACjJ,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,sBAAsB;aACnB,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;aACnD,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YACxB,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAQ,CAAC;YAC1D,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,aAAqB,EAAE,EAAE;gBAC7E,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;oBACjG,OAAO,aAAa,CAAC;gBACvB,CAAC;gBAED,MAAM,kBAAkB,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACpD,OAAO,kBAAkB,CAAC,MAAM,GAAG,CAAC;oBAClC,CAAC,CAAC,GAAG,aAAa,KAAK,OAAO,EAAE;oBAChC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,KAAK,OAAO,IAAI,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACtF,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,qBAAqB,yBAyBhC"}
|