@mouryaamit/nx-polystack 1.2.7 → 1.4.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/README.md +35 -2
- package/dist/src/cli/commands/app-from.js +2 -2
- package/dist/src/cli/commands/app-from.js.map +1 -1
- package/dist/src/cli/commands/build.js +2 -2
- package/dist/src/cli/commands/build.js.map +1 -1
- package/dist/src/cli/commands/index.js +2 -0
- package/dist/src/cli/commands/index.js.map +1 -1
- package/dist/src/cli/commands/inspect.d.ts +3 -0
- package/dist/src/cli/commands/inspect.js +105 -0
- package/dist/src/cli/commands/inspect.js.map +1 -0
- package/dist/src/cli/commands/new.d.ts +3 -0
- package/dist/src/cli/commands/new.js +19 -1
- package/dist/src/cli/commands/new.js.map +1 -1
- package/dist/src/cli/commands/preset.js +3 -0
- package/dist/src/cli/commands/preset.js.map +1 -1
- package/dist/src/cli/commands/upgrade.d.ts +51 -0
- package/dist/src/cli/commands/upgrade.js +447 -0
- package/dist/src/cli/commands/upgrade.js.map +1 -0
- package/dist/src/cli/help.js +23 -1
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/cli/launcher.js +3 -1
- package/dist/src/cli/launcher.js.map +1 -1
- package/dist/src/cli/run-tree.js +4 -4
- package/dist/src/cli/run-tree.js.map +1 -1
- package/dist/src/executors/build/executor.js +4 -0
- package/dist/src/executors/build/executor.js.map +1 -1
- package/dist/src/executors/build/schema.d.ts +2 -0
- package/dist/src/executors/build/schema.json +28 -7
- package/dist/src/executors/clean/executor.js +0 -1
- package/dist/src/executors/clean/executor.js.map +1 -1
- package/dist/src/executors/flutter-build/executor.js +19 -2
- package/dist/src/executors/flutter-build/executor.js.map +1 -1
- package/dist/src/executors/flutter-build/schema.d.ts +2 -0
- package/dist/src/executors/flutter-build/schema.json +13 -1
- package/dist/src/generators/app/files/ionic/package.json__template__ +4 -4
- package/dist/src/generators/app/generator.js +5 -3
- package/dist/src/generators/app/generator.js.map +1 -1
- package/dist/src/generators/infra/generator.js +2 -2
- package/dist/src/generators/infra/generator.js.map +1 -1
- package/dist/src/generators/lib/types/ionic.d.ts +2 -2
- package/dist/src/generators/lib/types/ionic.js +4 -3
- package/dist/src/generators/lib/types/ionic.js.map +1 -1
- package/dist/src/generators/migrate/adapters/angular-cli.d.ts +1 -1
- package/dist/src/generators/migrate/adapters/angular-cli.js +16 -10
- package/dist/src/generators/migrate/adapters/angular-cli.js.map +1 -1
- package/dist/src/generators/migrate/adapters/angular-workspace.js +3 -1
- package/dist/src/generators/migrate/adapters/angular-workspace.js.map +1 -1
- package/dist/src/generators/migrate/adapters/npm-workspaces.js +2 -1
- package/dist/src/generators/migrate/adapters/npm-workspaces.js.map +1 -1
- package/dist/src/generators/migrate/adapters/nx-workspace.d.ts +3 -1
- package/dist/src/generators/migrate/adapters/nx-workspace.js +18 -1
- package/dist/src/generators/migrate/adapters/nx-workspace.js.map +1 -1
- package/dist/src/generators/migrate/angular-config-files.js +8 -0
- package/dist/src/generators/migrate/angular-config-files.js.map +1 -1
- package/dist/src/generators/migrate/angular-project-json.d.ts +5 -0
- package/dist/src/generators/migrate/angular-project-json.js +18 -6
- package/dist/src/generators/migrate/angular-project-json.js.map +1 -1
- package/dist/src/generators/migrate/dependencies.d.ts +10 -1
- package/dist/src/generators/migrate/dependencies.js +26 -5
- package/dist/src/generators/migrate/dependencies.js.map +1 -1
- package/dist/src/generators/migrate/nx/detect.d.ts +1 -0
- package/dist/src/generators/migrate/nx/detect.js +3 -2
- package/dist/src/generators/migrate/nx/detect.js.map +1 -1
- package/dist/src/generators/migrate/schema.json +1 -1
- package/dist/src/generators/preset/generator.d.ts +5 -0
- package/dist/src/generators/preset/generator.js +41 -1
- package/dist/src/generators/preset/generator.js.map +1 -1
- package/dist/src/generators/preset/schema.d.ts +2 -0
- package/dist/src/generators/preset/schema.json +5 -0
- package/dist/src/lib/helpers/build-gen.d.ts +26 -0
- package/dist/src/lib/helpers/build-gen.js +68 -0
- package/dist/src/lib/helpers/build-gen.js.map +1 -0
- package/dist/src/lib/helpers/inject-meta.d.ts +3 -0
- package/dist/src/lib/helpers/inject-meta.js +1 -0
- package/dist/src/lib/helpers/inject-meta.js.map +1 -1
- package/dist/src/lib/upgrade/pins.d.ts +34 -0
- package/dist/src/lib/upgrade/pins.js +89 -0
- package/dist/src/lib/upgrade/pins.js.map +1 -0
- package/dist/src/lib/utils/angular-deps.d.ts +33 -6
- package/dist/src/lib/utils/angular-deps.js +91 -37
- package/dist/src/lib/utils/angular-deps.js.map +1 -1
- package/dist/src/lib/utils/angular-project.d.ts +5 -1
- package/dist/src/lib/utils/angular-project.js +13 -7
- package/dist/src/lib/utils/angular-project.js.map +1 -1
- package/dist/src/lib/utils/dependencies.d.ts +5 -0
- package/dist/src/lib/utils/dependencies.js +12 -3
- package/dist/src/lib/utils/dependencies.js.map +1 -1
- package/dist/src/lib/utils/nx-tree.d.ts +5 -0
- package/dist/src/lib/utils/nx-tree.js +39 -0
- package/dist/src/lib/utils/nx-tree.js.map +1 -0
- package/package.json +3 -3
|
@@ -0,0 +1,447 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runUpgrade = exports.stepPlan = exports.repairHttpClientModule = exports.pinNode = exports.pinCapacitor = exports.capacitorApps = exports.buildPackageSpecs = exports.workspaceAngularMajor = exports.declared = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const child_process_1 = require("child_process");
|
|
6
|
+
const fs = tslib_1.__importStar(require("fs"));
|
|
7
|
+
const path = tslib_1.__importStar(require("path"));
|
|
8
|
+
const pins_1 = require("../../lib/upgrade/pins");
|
|
9
|
+
const args_1 = require("../args");
|
|
10
|
+
const context_1 = require("../context");
|
|
11
|
+
const exec_1 = require("../exec");
|
|
12
|
+
const prompt_1 = require("../prompt");
|
|
13
|
+
const types_1 = require("../types");
|
|
14
|
+
const useShell = (cmd) => process.platform === 'win32' && (cmd === 'npm' || cmd === 'npx');
|
|
15
|
+
const defaultDeps = {
|
|
16
|
+
exec(cmd, args, cwd, env) {
|
|
17
|
+
const r = (0, child_process_1.spawnSync)(cmd, args, {
|
|
18
|
+
cwd,
|
|
19
|
+
stdio: 'inherit',
|
|
20
|
+
shell: useShell(cmd),
|
|
21
|
+
env: env ? { ...process.env, ...env } : process.env,
|
|
22
|
+
});
|
|
23
|
+
if (r.error)
|
|
24
|
+
throw r.error;
|
|
25
|
+
if (r.status !== 0) {
|
|
26
|
+
throw new Error(`"${cmd} ${args.join(' ')}" exited with code ${r.status ?? `signal ${r.signal}`}`);
|
|
27
|
+
}
|
|
28
|
+
},
|
|
29
|
+
gitStatus: exec_1.gitStatus,
|
|
30
|
+
nodeMajor: () => Number(process.versions.node.split('.')[0]),
|
|
31
|
+
interactive: (0, prompt_1.isInteractive)(),
|
|
32
|
+
prompter: prompt_1.terminalPrompter,
|
|
33
|
+
log: (line) => console.log(line),
|
|
34
|
+
};
|
|
35
|
+
const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
|
|
36
|
+
function readJsonFile(file) {
|
|
37
|
+
return JSON.parse(fs.readFileSync(file, 'utf8'));
|
|
38
|
+
}
|
|
39
|
+
function writeJsonFile(file, value) {
|
|
40
|
+
fs.writeFileSync(file, JSON.stringify(value, null, 2) + '\n');
|
|
41
|
+
}
|
|
42
|
+
/** Declared version of a package in dependencies, devDependencies or optionalDependencies. */
|
|
43
|
+
function declared(pkg, name) {
|
|
44
|
+
for (const field of ['dependencies', 'devDependencies', 'optionalDependencies']) {
|
|
45
|
+
const deps = pkg[field];
|
|
46
|
+
if (isObject(deps) && typeof deps[name] === 'string')
|
|
47
|
+
return deps[name];
|
|
48
|
+
}
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
exports.declared = declared;
|
|
52
|
+
function installedVersion(root, name) {
|
|
53
|
+
const file = path.join(root, 'node_modules', name, 'package.json');
|
|
54
|
+
if (!fs.existsSync(file))
|
|
55
|
+
return undefined;
|
|
56
|
+
try {
|
|
57
|
+
const v = readJsonFile(file)['version'];
|
|
58
|
+
return typeof v === 'string' ? v : undefined;
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
return undefined;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/** The workspace's Angular major: installed @angular/core, else the declared one. */
|
|
65
|
+
function workspaceAngularMajor(root) {
|
|
66
|
+
const pkg = readJsonFile(path.join(root, 'package.json'));
|
|
67
|
+
return ((0, pins_1.majorOfSpec)(installedVersion(root, '@angular/core')) ??
|
|
68
|
+
(0, pins_1.majorOfSpec)(declared(pkg, '@angular/core')));
|
|
69
|
+
}
|
|
70
|
+
exports.workspaceAngularMajor = workspaceAngularMajor;
|
|
71
|
+
/** Build, CLI and lint packages that move with the Angular major (only those declared). */
|
|
72
|
+
const ANGULAR_BUILD_PACKAGES = [
|
|
73
|
+
'@angular-devkit/build-angular',
|
|
74
|
+
'@angular/build',
|
|
75
|
+
'@angular/cli',
|
|
76
|
+
'@angular/compiler-cli',
|
|
77
|
+
'@angular/language-service',
|
|
78
|
+
'@angular-devkit/core',
|
|
79
|
+
'@angular-devkit/schematics',
|
|
80
|
+
'@schematics/angular',
|
|
81
|
+
];
|
|
82
|
+
const ANGULAR_ESLINT_PACKAGES = [
|
|
83
|
+
'angular-eslint',
|
|
84
|
+
'@angular-eslint/builder',
|
|
85
|
+
'@angular-eslint/eslint-plugin',
|
|
86
|
+
'@angular-eslint/eslint-plugin-template',
|
|
87
|
+
'@angular-eslint/template-parser',
|
|
88
|
+
'@angular-eslint/schematics',
|
|
89
|
+
];
|
|
90
|
+
/**
|
|
91
|
+
* `pkg@range` for every declared build/CLI/lint package and TypeScript whose major (or, for
|
|
92
|
+
* TypeScript, version) is not the step's. Empty when everything already matches.
|
|
93
|
+
*/
|
|
94
|
+
function buildPackageSpecs(pkg, major, pins) {
|
|
95
|
+
const out = [];
|
|
96
|
+
const want = (name, pin) => {
|
|
97
|
+
const has = declared(pkg, name);
|
|
98
|
+
if (has === undefined)
|
|
99
|
+
return;
|
|
100
|
+
if ((0, pins_1.majorOfSpec)(has) !== (0, pins_1.majorOfSpec)(pin))
|
|
101
|
+
out.push(`${name}@${(0, pins_1.pinRange)(pin)}`);
|
|
102
|
+
};
|
|
103
|
+
for (const name of ANGULAR_BUILD_PACKAGES)
|
|
104
|
+
want(name, pins.angular);
|
|
105
|
+
for (const name of ANGULAR_ESLINT_PACKAGES)
|
|
106
|
+
want(name, pins.angularEslint);
|
|
107
|
+
const packagr = declared(pkg, 'ng-packagr');
|
|
108
|
+
if (packagr !== undefined && (0, pins_1.majorOfSpec)(packagr) !== major) {
|
|
109
|
+
out.push(`ng-packagr@^${major}.0.0`);
|
|
110
|
+
}
|
|
111
|
+
const ts = declared(pkg, 'typescript');
|
|
112
|
+
if (ts !== undefined && ts.replace(/^[~^]/, '') !== pins.typescript) {
|
|
113
|
+
out.push(`typescript@~${pins.typescript}`);
|
|
114
|
+
}
|
|
115
|
+
return out;
|
|
116
|
+
}
|
|
117
|
+
exports.buildPackageSpecs = buildPackageSpecs;
|
|
118
|
+
/** package.json files of the apps that declare @capacitor/* (Capacitor lives per app). */
|
|
119
|
+
function capacitorApps(root) {
|
|
120
|
+
const found = [];
|
|
121
|
+
const walk = (dir, depth) => {
|
|
122
|
+
if (depth > 3 || !fs.existsSync(dir))
|
|
123
|
+
return;
|
|
124
|
+
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
|
|
125
|
+
if (!entry.isDirectory() || entry.name === 'node_modules' || entry.name.startsWith('.')) {
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
const sub = path.join(dir, entry.name);
|
|
129
|
+
const pkgFile = path.join(sub, 'package.json');
|
|
130
|
+
if (fs.existsSync(pkgFile)) {
|
|
131
|
+
try {
|
|
132
|
+
const pkg = readJsonFile(pkgFile);
|
|
133
|
+
const all = { ...pkg['dependencies'], ...pkg['devDependencies'] };
|
|
134
|
+
if (Object.keys(all).some((k) => k.startsWith('@capacitor/')))
|
|
135
|
+
found.push(sub);
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
// not JSON: not an app package
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
walk(sub, depth + 1);
|
|
142
|
+
}
|
|
143
|
+
};
|
|
144
|
+
walk(path.join(root, 'apps'), 1);
|
|
145
|
+
return found.sort();
|
|
146
|
+
}
|
|
147
|
+
exports.capacitorApps = capacitorApps;
|
|
148
|
+
/** Sets every @capacitor/* of an app package.json to ^<major>.0.0; true when something changed. */
|
|
149
|
+
function pinCapacitor(appDir, major) {
|
|
150
|
+
const file = path.join(appDir, 'package.json');
|
|
151
|
+
const pkg = readJsonFile(file);
|
|
152
|
+
let changed = false;
|
|
153
|
+
for (const field of ['dependencies', 'devDependencies']) {
|
|
154
|
+
const deps = pkg[field];
|
|
155
|
+
if (!isObject(deps))
|
|
156
|
+
continue;
|
|
157
|
+
for (const k of Object.keys(deps)) {
|
|
158
|
+
if (k.startsWith('@capacitor/') && (0, pins_1.majorOfSpec)(deps[k]) !== major) {
|
|
159
|
+
deps[k] = `^${major}.0.0`;
|
|
160
|
+
changed = true;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
if (changed)
|
|
165
|
+
writeJsonFile(file, pkg);
|
|
166
|
+
return changed;
|
|
167
|
+
}
|
|
168
|
+
exports.pinCapacitor = pinCapacitor;
|
|
169
|
+
/** engines.node and .nvmrc for a Node major; true when something changed. */
|
|
170
|
+
function pinNode(root, node) {
|
|
171
|
+
const pkgFile = path.join(root, 'package.json');
|
|
172
|
+
const pkg = readJsonFile(pkgFile);
|
|
173
|
+
const engines = isObject(pkg['engines']) ? pkg['engines'] : {};
|
|
174
|
+
const range = `>=${node}.12.0 <${node + 1}.0.0`;
|
|
175
|
+
let changed = false;
|
|
176
|
+
if (engines['node'] !== undefined && (0, pins_1.majorOfSpec)(engines['node']) !== node) {
|
|
177
|
+
pkg['engines'] = { ...engines, node: range };
|
|
178
|
+
writeJsonFile(pkgFile, pkg);
|
|
179
|
+
changed = true;
|
|
180
|
+
}
|
|
181
|
+
const nvmrc = path.join(root, '.nvmrc');
|
|
182
|
+
if (fs.existsSync(nvmrc) && (0, pins_1.majorOfSpec)(fs.readFileSync(nvmrc, 'utf8').trim()) !== node) {
|
|
183
|
+
fs.writeFileSync(nvmrc, `${node}\n`);
|
|
184
|
+
changed = true;
|
|
185
|
+
}
|
|
186
|
+
return changed;
|
|
187
|
+
}
|
|
188
|
+
exports.pinNode = pinNode;
|
|
189
|
+
function declaredNodeMajor(root) {
|
|
190
|
+
const nvmrc = path.join(root, '.nvmrc');
|
|
191
|
+
if (fs.existsSync(nvmrc))
|
|
192
|
+
return (0, pins_1.majorOfSpec)(fs.readFileSync(nvmrc, 'utf8').trim());
|
|
193
|
+
const engines = readJsonFile(path.join(root, 'package.json'))['engines'];
|
|
194
|
+
return isObject(engines) ? (0, pins_1.majorOfSpec)(engines['node']) : undefined;
|
|
195
|
+
}
|
|
196
|
+
/** .ts files under apps/ and libs/ (no node_modules, no dot folders). */
|
|
197
|
+
function sourceFiles(root) {
|
|
198
|
+
const out = [];
|
|
199
|
+
const walk = (dir) => {
|
|
200
|
+
if (!fs.existsSync(dir))
|
|
201
|
+
return;
|
|
202
|
+
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
|
|
203
|
+
if (entry.name === 'node_modules' || entry.name.startsWith('.'))
|
|
204
|
+
continue;
|
|
205
|
+
const p = path.join(dir, entry.name);
|
|
206
|
+
if (entry.isDirectory())
|
|
207
|
+
walk(p);
|
|
208
|
+
else if (entry.name.endsWith('.ts') && !entry.name.endsWith('.d.ts'))
|
|
209
|
+
out.push(p);
|
|
210
|
+
}
|
|
211
|
+
};
|
|
212
|
+
walk(path.join(root, 'apps'));
|
|
213
|
+
walk(path.join(root, 'libs'));
|
|
214
|
+
return out;
|
|
215
|
+
}
|
|
216
|
+
const HTTP_CLIENT_IMPORTED = /import\s*(type\s*)?\{[^}]*\bHttpClientModule\b[^}]*\}\s*from/;
|
|
217
|
+
/**
|
|
218
|
+
* Angular 18's HttpClientModule migration drops the import and moves the module to
|
|
219
|
+
* provideHttpClient(), but leaves `HttpClientModule` in an NgModule's `exports` (a shared module
|
|
220
|
+
* that re-exported it), which then fails to compile. Removes those leftover references from array
|
|
221
|
+
* literals in files that no longer import it. Returns the files changed (workspace-relative).
|
|
222
|
+
*/
|
|
223
|
+
function repairHttpClientModule(root) {
|
|
224
|
+
const changed = [];
|
|
225
|
+
for (const file of sourceFiles(root)) {
|
|
226
|
+
const text = fs.readFileSync(file, 'utf8');
|
|
227
|
+
if (!/\bHttpClientModule\b/.test(text) || HTTP_CLIENT_IMPORTED.test(text))
|
|
228
|
+
continue;
|
|
229
|
+
const fixed = text.replace(/\[([^[\]]*)\]/g, (whole, inner) => {
|
|
230
|
+
if (!/\bHttpClientModule\b/.test(inner))
|
|
231
|
+
return whole;
|
|
232
|
+
const items = inner
|
|
233
|
+
.split(',')
|
|
234
|
+
.map((x) => x.trim())
|
|
235
|
+
.filter((x) => x !== '' && x !== 'HttpClientModule');
|
|
236
|
+
return `[${items.join(', ')}]`;
|
|
237
|
+
});
|
|
238
|
+
if (fixed !== text) {
|
|
239
|
+
fs.writeFileSync(file, fixed);
|
|
240
|
+
changed.push(path.relative(root, file));
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
return changed;
|
|
244
|
+
}
|
|
245
|
+
exports.repairHttpClientModule = repairHttpClientModule;
|
|
246
|
+
/** What one step does, in order (the dry-run plan and the log headings). */
|
|
247
|
+
function stepPlan(from, to, root) {
|
|
248
|
+
const pins = pins_1.ANGULAR_PINS[to];
|
|
249
|
+
const pkg = readJsonFile(path.join(root, 'package.json'));
|
|
250
|
+
const lines = [];
|
|
251
|
+
if (declaredNodeMajor(root) !== undefined && declaredNodeMajor(root) !== pins.node) {
|
|
252
|
+
lines.push(`Node: engines.node and .nvmrc → ${pins.node}`);
|
|
253
|
+
}
|
|
254
|
+
lines.push(to === 16 && pins.nx === pins_1.ANGULAR_PINS[from].nx
|
|
255
|
+
? `nx migrate @angular/core@${pins.angular} (Nx stays ${pins.nx})`
|
|
256
|
+
: `nx migrate ${pins.nx}`);
|
|
257
|
+
lines.push('npm install, then the migrations nx migrate wrote (migrations.json)');
|
|
258
|
+
lines.push(`if Angular is still below ${to}: nx migrate @angular/core@${pins.angular} again`);
|
|
259
|
+
lines.push(`build, CLI and lint packages to Angular ${to}, angular-eslint ${(0, pins_1.pinRange)(pins.angularEslint)}, ` + `TypeScript ~${pins.typescript} (only the declared ones that differ)`);
|
|
260
|
+
if (to === pins_1.INJECT_MIGRATION_ANGULAR) {
|
|
261
|
+
lines.push('constructor injection to inject(): nx g @angular/core:inject (prefer-inject lint rule)');
|
|
262
|
+
}
|
|
263
|
+
const ionic = declared(pkg, '@ionic/angular');
|
|
264
|
+
if (ionic !== undefined) {
|
|
265
|
+
lines.push(pins.ionic === '9' && ((0, pins_1.majorOfSpec)(ionic) ?? 0) < 9
|
|
266
|
+
? 'Ionic 9 through npx @ionic/migrate --force (imports, CSS, packages)'
|
|
267
|
+
: `@ionic/angular ${(0, pins_1.pinRange)(pins.ionic)}`);
|
|
268
|
+
}
|
|
269
|
+
for (const app of capacitorApps(root)) {
|
|
270
|
+
lines.push(`Capacitor ${pins.capacitor} in ${path.relative(root, app)}/package.json` +
|
|
271
|
+
' (npm install there; cap migrate when it has native projects)');
|
|
272
|
+
}
|
|
273
|
+
return lines;
|
|
274
|
+
}
|
|
275
|
+
exports.stepPlan = stepPlan;
|
|
276
|
+
function runStep(o, deps) {
|
|
277
|
+
const { root, to } = o;
|
|
278
|
+
const pins = pins_1.ANGULAR_PINS[to];
|
|
279
|
+
const say = (line) => deps.log(`\n▶ Angular ${to}: ${line}`);
|
|
280
|
+
const npm = (args, cwd = root) => deps.exec('npm', args, cwd);
|
|
281
|
+
const npx = (args, cwd = root, env) => deps.exec('npx', args, cwd, env);
|
|
282
|
+
const runMigrations = () => {
|
|
283
|
+
if (!fs.existsSync(path.join(root, 'migrations.json')))
|
|
284
|
+
return;
|
|
285
|
+
say('running migrations.json');
|
|
286
|
+
npx(['nx', 'migrate', '--run-migrations', '--if-exists']);
|
|
287
|
+
fs.rmSync(path.join(root, 'migrations.json'), { force: true });
|
|
288
|
+
};
|
|
289
|
+
if (pinNode(root, pins.node))
|
|
290
|
+
say(`engines.node and .nvmrc set to Node ${pins.node}`);
|
|
291
|
+
if (to === 16 && pins.nx === pins_1.ANGULAR_PINS[o.from].nx) {
|
|
292
|
+
say(`nx migrate @angular/core@${pins.angular}`);
|
|
293
|
+
npx(['nx', 'migrate', `@angular/core@${pins.angular}`, '--interactive=false']);
|
|
294
|
+
}
|
|
295
|
+
else {
|
|
296
|
+
say(`nx migrate ${pins.nx}`);
|
|
297
|
+
npx(['nx', 'migrate', pins.nx, '--interactive=false']);
|
|
298
|
+
}
|
|
299
|
+
say('npm install');
|
|
300
|
+
npm(['install']);
|
|
301
|
+
runMigrations();
|
|
302
|
+
// Nx 22 treats the Angular 21 bump as optional and skips it without prompts.
|
|
303
|
+
const core = (0, pins_1.majorOfSpec)(installedVersion(root, '@angular/core'));
|
|
304
|
+
if (core !== undefined && core < to) {
|
|
305
|
+
say(`Angular is ${core} after nx migrate; nx migrate @angular/core@${pins.angular}`);
|
|
306
|
+
npx(['nx', 'migrate', `@angular/core@${pins.angular}`, '--interactive=false']);
|
|
307
|
+
npm(['install']);
|
|
308
|
+
runMigrations();
|
|
309
|
+
}
|
|
310
|
+
const repaired = repairHttpClientModule(root);
|
|
311
|
+
if (repaired.length > 0) {
|
|
312
|
+
say(`removed leftover HttpClientModule references (Angular 18 migration): ${repaired.join(', ')}`);
|
|
313
|
+
}
|
|
314
|
+
const specs = buildPackageSpecs(readJsonFile(path.join(root, 'package.json')), to, pins);
|
|
315
|
+
if (specs.length > 0) {
|
|
316
|
+
say(`build, CLI, lint packages and TypeScript: ${specs.join(' ')}`);
|
|
317
|
+
npm(['install', '--save-dev', ...specs]);
|
|
318
|
+
}
|
|
319
|
+
if (to === pins_1.INJECT_MIGRATION_ANGULAR) {
|
|
320
|
+
// angular-eslint 20 makes prefer-inject an error; Angular's own migration rewrites the
|
|
321
|
+
// constructors. If it cannot run, the check below reports the lint errors.
|
|
322
|
+
say('constructor injection to inject(): nx g @angular/core:inject');
|
|
323
|
+
try {
|
|
324
|
+
npx(['nx', 'g', '@angular/core:inject', '--path=./', '--interactive=false']);
|
|
325
|
+
}
|
|
326
|
+
catch (e) {
|
|
327
|
+
deps.log(` the inject migration failed (${e.message}); run ` +
|
|
328
|
+
'"npx nx g @angular/core:inject --path=./" yourself, or fix the prefer-inject lint errors.');
|
|
329
|
+
}
|
|
330
|
+
}
|
|
331
|
+
const ionic = declared(readJsonFile(path.join(root, 'package.json')), '@ionic/angular');
|
|
332
|
+
if (ionic !== undefined) {
|
|
333
|
+
if (pins.ionic === '9' && ((0, pins_1.majorOfSpec)(ionic) ?? 0) < 9) {
|
|
334
|
+
// It only acts below 9 (so it runs instead of installing 9) and refuses a dirty tree
|
|
335
|
+
// without --force; the step's changes are committed together below.
|
|
336
|
+
say('Ionic 9: npx @ionic/migrate --force');
|
|
337
|
+
npx(['-y', '@ionic/migrate', '--force'], root, { CI: '1' });
|
|
338
|
+
npm(['install']);
|
|
339
|
+
}
|
|
340
|
+
else if (pins.ionic !== '9' && (0, pins_1.majorOfSpec)(ionic) !== (0, pins_1.majorOfSpec)(pins.ionic)) {
|
|
341
|
+
say(`@ionic/angular ${(0, pins_1.pinRange)(pins.ionic)}`);
|
|
342
|
+
npm(['install', `@ionic/angular@${(0, pins_1.pinRange)(pins.ionic)}`]);
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
for (const app of capacitorApps(root)) {
|
|
346
|
+
if (!pinCapacitor(app, pins.capacitor))
|
|
347
|
+
continue;
|
|
348
|
+
const rel = path.relative(root, app);
|
|
349
|
+
say(`Capacitor ${pins.capacitor} in ${rel}`);
|
|
350
|
+
npm(['install', '--prefix', rel]);
|
|
351
|
+
if (['android', 'ios'].some((d) => fs.existsSync(path.join(app, d)))) {
|
|
352
|
+
npx(['cap', 'migrate', '--noprompt'], app, { CI: '1' });
|
|
353
|
+
}
|
|
354
|
+
}
|
|
355
|
+
if (o.check) {
|
|
356
|
+
say('check: nx run-many -t build lint');
|
|
357
|
+
npx(['nx', 'run-many', '-t', 'build', 'lint']);
|
|
358
|
+
}
|
|
359
|
+
if (o.commit) {
|
|
360
|
+
say('commit');
|
|
361
|
+
deps.exec('git', ['add', '-A'], root);
|
|
362
|
+
deps.exec('git', ['commit', '-m', `chore: upgrade to Angular ${to} (pstack upgrade angular)`], root);
|
|
363
|
+
}
|
|
364
|
+
}
|
|
365
|
+
/** pstack upgrade angular [--to=N] [--yes] [--skip-check] [--no-commit] [--dry-run] */
|
|
366
|
+
async function runUpgrade(ctx, deps = defaultDeps) {
|
|
367
|
+
const what = ctx.positionals[0];
|
|
368
|
+
if (what !== 'angular') {
|
|
369
|
+
throw new types_1.CliError(`pstack upgrade takes what to upgrade: "pstack upgrade angular"${what ? ` (got "${what}")` : ''}.`);
|
|
370
|
+
}
|
|
371
|
+
const root = (0, context_1.findWorkspaceRoot)(ctx.cwd);
|
|
372
|
+
if (!root || !fs.existsSync(path.join(root, 'package.json'))) {
|
|
373
|
+
throw new types_1.CliError('run "pstack upgrade angular" inside an Nx workspace (nx.json, package.json).');
|
|
374
|
+
}
|
|
375
|
+
const current = workspaceAngularMajor(root);
|
|
376
|
+
if (current === undefined)
|
|
377
|
+
throw new types_1.CliError('this workspace has no @angular/core.');
|
|
378
|
+
if (current < pins_1.MIN_ANGULAR || current > pins_1.MAX_ANGULAR) {
|
|
379
|
+
throw new types_1.CliError(`the workspace is on Angular ${current}; pstack upgrades from ${pins_1.MIN_ANGULAR} to ${pins_1.MAX_ANGULAR}.`);
|
|
380
|
+
}
|
|
381
|
+
if (current === pins_1.MAX_ANGULAR) {
|
|
382
|
+
deps.log(`The workspace is on Angular ${current}, the newest pstack supports. Nothing to do.`);
|
|
383
|
+
return 0;
|
|
384
|
+
}
|
|
385
|
+
const toFlag = (0, args_1.flagString)(ctx.flags, 'to');
|
|
386
|
+
if (ctx.flags['to'] === true)
|
|
387
|
+
throw new types_1.CliError('--to needs a major, e.g. --to=18');
|
|
388
|
+
let target = toFlag === undefined ? current + 1 : Number(toFlag);
|
|
389
|
+
if (!Number.isInteger(target) || target <= current || target > pins_1.MAX_ANGULAR) {
|
|
390
|
+
throw new types_1.CliError(`--to must be an Angular major from ${current + 1} to ${pins_1.MAX_ANGULAR} (got "${toFlag}").`);
|
|
391
|
+
}
|
|
392
|
+
const yes = (0, args_1.flagBoolean)(ctx.flags, 'yes') || (0, args_1.flagBoolean)(ctx.flags, 'y');
|
|
393
|
+
const check = !(0, args_1.flagBoolean)(ctx.flags, 'skipCheck');
|
|
394
|
+
const commit = !(0, args_1.flagBoolean)(ctx.flags, 'noCommit');
|
|
395
|
+
if (!commit && target > current + 1) {
|
|
396
|
+
// The next step needs a clean tree; without the commit there is none.
|
|
397
|
+
deps.log(`--no-commit: only the Angular ${current + 1} step runs; commit it, then run again.`);
|
|
398
|
+
target = current + 1;
|
|
399
|
+
}
|
|
400
|
+
for (let from = current; from < target; from++) {
|
|
401
|
+
const to = from + 1;
|
|
402
|
+
deps.log(`\nAngular ${from} → ${to}:`);
|
|
403
|
+
for (const line of stepPlan(from, to, root))
|
|
404
|
+
deps.log(` - ${line}`);
|
|
405
|
+
if (check)
|
|
406
|
+
deps.log(' - check: nx run-many -t build lint');
|
|
407
|
+
if (commit)
|
|
408
|
+
deps.log(' - one commit for the step');
|
|
409
|
+
}
|
|
410
|
+
if (ctx.dryRun) {
|
|
411
|
+
deps.log('\nDry run: nothing was changed.');
|
|
412
|
+
return 0;
|
|
413
|
+
}
|
|
414
|
+
const status = deps.gitStatus(root);
|
|
415
|
+
if (status === null) {
|
|
416
|
+
throw new types_1.CliError('pstack upgrade angular needs a git repository (each step is one commit).');
|
|
417
|
+
}
|
|
418
|
+
if (status.trim() !== '') {
|
|
419
|
+
throw new types_1.CliError('commit or stash your changes first; each upgrade step is its own commit.');
|
|
420
|
+
}
|
|
421
|
+
for (let from = current; from < target; from++) {
|
|
422
|
+
const to = from + 1;
|
|
423
|
+
const node = pins_1.ANGULAR_PINS[to].node;
|
|
424
|
+
if (deps.nodeMajor() !== node) {
|
|
425
|
+
throw new types_1.CliError(`the Angular ${to} step runs on Node ${node} (the workspace declares it for that step); ` +
|
|
426
|
+
`this is Node ${deps.nodeMajor()}. Switch (e.g. nvm use ${node}) and run it again.`);
|
|
427
|
+
}
|
|
428
|
+
if (from > current && !yes) {
|
|
429
|
+
if (!deps.interactive) {
|
|
430
|
+
deps.log(`\nStopped after Angular ${from}. Run again (or pass --yes) for the next step.`);
|
|
431
|
+
return 0;
|
|
432
|
+
}
|
|
433
|
+
const p = deps.prompter();
|
|
434
|
+
const answer = (await p.ask(`Angular ${from} is done. Continue to Angular ${to}? (y/N)`, 'n')).toLowerCase();
|
|
435
|
+
p.close();
|
|
436
|
+
if (answer !== 'y' && answer !== 'yes') {
|
|
437
|
+
deps.log(`Stopped at Angular ${from}.`);
|
|
438
|
+
return 0;
|
|
439
|
+
}
|
|
440
|
+
}
|
|
441
|
+
runStep({ root, from, to, check, commit }, deps);
|
|
442
|
+
deps.log(`\n✔ Angular ${to} done.`);
|
|
443
|
+
}
|
|
444
|
+
return 0;
|
|
445
|
+
}
|
|
446
|
+
exports.runUpgrade = runUpgrade;
|
|
447
|
+
//# sourceMappingURL=upgrade.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../../../src/cli/commands/upgrade.ts"],"names":[],"mappings":"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"}
|
package/dist/src/cli/help.js
CHANGED
|
@@ -13,6 +13,8 @@ USAGE
|
|
|
13
13
|
COMMANDS
|
|
14
14
|
new <dir> Create a new polystack workspace in <dir> (installs deps, initialises git)
|
|
15
15
|
update Upgrade this workspace's nx-polystack version and run its migrations
|
|
16
|
+
upgrade upgrade angular: move the workspace to the next Angular major (Nx, TypeScript,
|
|
17
|
+
build and lint packages, Ionic, Capacitor, Node), one commit per step
|
|
16
18
|
preset Bootstrap a workspace root skeleton in the current directory
|
|
17
19
|
app Scaffold a new application into an existing workspace
|
|
18
20
|
lib Scaffold a shared library (ts, angular, ionic, flutter, assets, styles,
|
|
@@ -24,7 +26,7 @@ COMMANDS
|
|
|
24
26
|
migrate Copy an existing project into the workspace, source never modified: a standalone
|
|
25
27
|
Angular CLI, Ionic/Capacitor or Flutter app (apps/<name>), the apps and libraries
|
|
26
28
|
of a multi-project Angular CLI repo (apps/, libs/), the Angular, Ionic and
|
|
27
|
-
Flutter projects of an Nx 15-
|
|
29
|
+
Flutter projects of an Nx 15-22 workspace (same paths, names and aliases), or the
|
|
28
30
|
app and TypeScript library packages of an npm, Yarn or pnpm workspaces repo
|
|
29
31
|
(apps/, libs/)
|
|
30
32
|
encryption Show or change the env encryption settings of release builds (nx.json
|
|
@@ -38,6 +40,8 @@ COMMANDS
|
|
|
38
40
|
into existing Angular/Ionic apps; new apps get them automatically
|
|
39
41
|
hardening Show or change an app's release hardening (leak check, source maps, comment and
|
|
40
42
|
console stripping, obfuscation, SRI for every chunk)
|
|
43
|
+
inspect Tell whether a build was made by pstack: reads the build meta of a dist folder,
|
|
44
|
+
an index.html or a URL (tool and versions, env, time, branch, commit)
|
|
41
45
|
infra Add repo docs, CI gates (affected lint/test/build, dependency cycles), quality
|
|
42
46
|
checks (knip, pre-push audit + secret scan) and a dependency-upgrade workflow
|
|
43
47
|
|
|
@@ -53,17 +57,33 @@ OPTIONS — new / preset
|
|
|
53
57
|
--llm=<tools> AI-assistant files, as pstack llm: claude | agents | copilot
|
|
54
58
|
(codex, openai-gpt → agents; comma-separated)
|
|
55
59
|
--projectDescription=<text> Short project description
|
|
60
|
+
--angular=<major> Start on this Angular: 15 | 16 | 17 (default: Angular 15, added by the
|
|
61
|
+
first Angular or Ionic app)
|
|
56
62
|
--skipFormat Skip Prettier format pass
|
|
57
63
|
--skip-install new only — do not run npm install
|
|
58
64
|
--skip-git new only — do not initialise git
|
|
59
65
|
--force new only — allow creating inside another Nx workspace
|
|
60
66
|
|
|
67
|
+
OPTIONS — inspect
|
|
68
|
+
pstack inspect <dist folder | index.html | URL>
|
|
69
|
+
--json Print the result as JSON (the aes-gcm key share is never shown)
|
|
70
|
+
Exit code 0 when a pstack build meta is found, 1 when not.
|
|
71
|
+
|
|
61
72
|
OPTIONS — update
|
|
62
73
|
--to=<version> Target version, also as "pstack update <version>"
|
|
63
74
|
(default: this CLI's version)
|
|
64
75
|
--allow-dirty Run with uncommitted changes
|
|
65
76
|
--force Allow downgrading
|
|
66
77
|
|
|
78
|
+
OPTIONS — upgrade angular
|
|
79
|
+
--to=<major> Go up to this Angular major, one step at a time (default: the
|
|
80
|
+
next major); asks before each further step unless --yes
|
|
81
|
+
--yes Do every step up to --to without asking
|
|
82
|
+
--skip-check Skip "nx run-many -t build lint" after each step
|
|
83
|
+
--no-commit Leave each step's changes uncommitted (with --to, stops after one)
|
|
84
|
+
--dry-run Print the steps; change nothing
|
|
85
|
+
Needs a clean git tree and the Node major of the step (Node 22 for Angular 21).
|
|
86
|
+
|
|
67
87
|
OPTIONS — app
|
|
68
88
|
--type=<type> App type: angular | ionic | flutter (required)
|
|
69
89
|
--name=<name> Application name (required)
|
|
@@ -298,6 +318,8 @@ EXAMPLES
|
|
|
298
318
|
pstack hardening --app=portal --configuration=uat --obfuscate=light --sri
|
|
299
319
|
pstack update
|
|
300
320
|
pstack update 0.3.0 --dry-run
|
|
321
|
+
pstack upgrade angular --dry-run
|
|
322
|
+
pstack upgrade angular --to=18
|
|
301
323
|
`.trimStart();
|
|
302
324
|
}
|
|
303
325
|
exports.helpText = helpText;
|
package/dist/src/cli/help.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/help.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,yCAAkD;AAElD,SAAgB,QAAQ,CAAC,OAAe;IACtC,OAAO;yCACgC,OAAO
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/help.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,yCAAkD;AAElD,SAAgB,QAAQ,CAAC,OAAe;IACtC,OAAO;yCACgC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA0Q5C,IAAA,8BAAa,GAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,mDAAmD,CAAC,CAAC,CAAC,EAC5F;IACE,IAAA,+BAAoB,EAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiDhC,CAAC,SAAS,EAAE,CAAC;AACd,CAAC;AAhUD,4BAgUC"}
|
package/dist/src/cli/launcher.js
CHANGED
|
@@ -8,7 +8,7 @@ const path = tslib_1.__importStar(require("path"));
|
|
|
8
8
|
const types_1 = require("./types");
|
|
9
9
|
const versions_1 = require("./versions");
|
|
10
10
|
/** Commands the global CLI always runs itself. */
|
|
11
|
-
exports.NEVER_DELEGATE = new Set(['', 'help', 'new', 'update', '_migrate']);
|
|
11
|
+
exports.NEVER_DELEGATE = new Set(['', 'help', 'new', 'update', '_migrate', 'inspect']);
|
|
12
12
|
/** Generator commands that act on the workspace (run from its root when delegated). */
|
|
13
13
|
exports.WORKSPACE_COMMANDS = new Set([
|
|
14
14
|
'app',
|
|
@@ -23,6 +23,7 @@ exports.WORKSPACE_COMMANDS = new Set([
|
|
|
23
23
|
'release',
|
|
24
24
|
'csp',
|
|
25
25
|
'shared',
|
|
26
|
+
'upgrade',
|
|
26
27
|
]);
|
|
27
28
|
/** First plugin version whose CLI has each command; older pinned copies cannot run them. */
|
|
28
29
|
exports.MIN_LOCAL_VERSION = {
|
|
@@ -36,6 +37,7 @@ exports.MIN_LOCAL_VERSION = {
|
|
|
36
37
|
release: '0.32.0',
|
|
37
38
|
csp: '0.33.0',
|
|
38
39
|
shared: '0.35.0',
|
|
40
|
+
upgrade: '1.2.12',
|
|
39
41
|
};
|
|
40
42
|
/** First plugin version that understands a flag of a command (checked when the flag is given). */
|
|
41
43
|
exports.MIN_LOCAL_FLAG_VERSION = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/cli/launcher.ts"],"names":[],"mappings":";;;;AAAA,iDAA0C;AAC1C,+CAAyB;AACzB,mDAA6B;AAI7B,mCAAmC;AACnC,yCAA6C;AAE7C,kDAAkD;AACrC,QAAA,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/cli/launcher.ts"],"names":[],"mappings":"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"}
|
package/dist/src/cli/run-tree.js
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.runInTree = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const nx_tree_1 = require("../lib/utils/nx-tree");
|
|
6
6
|
/** Run `fn` against an FsTree rooted at `root`, print changes, then flush unless dry-run. Returns change count. */
|
|
7
7
|
async function runInTree(root, opts, fn) {
|
|
8
|
-
const tree =
|
|
8
|
+
const tree = (0, nx_tree_1.fsTree)(root, opts.verbose);
|
|
9
9
|
const callback = await fn(tree);
|
|
10
10
|
const changes = tree.listChanges();
|
|
11
11
|
if (changes.length === 0) {
|
|
@@ -15,12 +15,12 @@ async function runInTree(root, opts, fn) {
|
|
|
15
15
|
await callback();
|
|
16
16
|
return 0;
|
|
17
17
|
}
|
|
18
|
-
(0,
|
|
18
|
+
(0, nx_tree_1.printChanges)(changes);
|
|
19
19
|
if (opts.dryRun) {
|
|
20
20
|
devkit_1.logger.info('\nDry run complete — no files written.');
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
23
|
-
(0,
|
|
23
|
+
(0, nx_tree_1.flushChanges)(root, changes);
|
|
24
24
|
devkit_1.logger.info(`\nDone. ${changes.length} file(s) written.`);
|
|
25
25
|
// Nx GeneratorCallback (e.g. install packages): runs only after files are on disk.
|
|
26
26
|
if (typeof callback === 'function')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-tree.js","sourceRoot":"","sources":["../../../src/cli/run-tree.ts"],"names":[],"mappings":";;;AAAA,uCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"run-tree.js","sourceRoot":"","sources":["../../../src/cli/run-tree.ts"],"names":[],"mappings":";;;AAAA,uCAA0C;AAC1C,kDAA0E;AAS1E,mHAAmH;AAC5G,KAAK,UAAU,SAAS,CAC7B,IAAY,EACZ,IAAoB,EACpB,EAA2B;IAE3B,MAAM,IAAI,GAAG,IAAA,gBAAM,EAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAEnC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,IAAI,CAAC,IAAI,CAAC,kBAAkB;YAAE,eAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,OAAO,QAAQ,KAAK,UAAU;YAAE,MAAM,QAAQ,EAAE,CAAC;QACrE,OAAO,CAAC,CAAC;KACV;IAED,IAAA,sBAAY,EAAC,OAAO,CAAC,CAAC;IAEtB,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,eAAM,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;KACvD;SAAM;QACL,IAAA,sBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5B,eAAM,CAAC,IAAI,CAAC,WAAW,OAAO,CAAC,MAAM,mBAAmB,CAAC,CAAC;QAC1D,mFAAmF;QACnF,IAAI,OAAO,QAAQ,KAAK,UAAU;YAAE,MAAM,QAAQ,EAAE,CAAC;KACtD;IACD,OAAO,OAAO,CAAC,MAAM,CAAC;AACxB,CAAC;AA1BD,8BA0BC"}
|