@mouryaamit/nx-polystack 1.11.2 → 1.11.10
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 +3 -1
- package/dist/migrations.json +5 -0
- package/dist/src/cli/commands/standalone-providers.d.ts +34 -0
- package/dist/src/cli/commands/standalone-providers.js +423 -0
- package/dist/src/cli/commands/standalone-providers.js.map +1 -0
- package/dist/src/cli/commands/upgrade-standalone.d.ts +14 -1
- package/dist/src/cli/commands/upgrade-standalone.js +107 -10
- package/dist/src/cli/commands/upgrade-standalone.js.map +1 -1
- package/dist/src/cli/commands/upgrade.d.ts +1 -1
- package/dist/src/cli/commands/upgrade.js +34 -2
- package/dist/src/cli/commands/upgrade.js.map +1 -1
- package/dist/src/cli/help.js +6 -4
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/executors/build/schema.json +6 -2
- package/dist/src/executors/flutter-build/executor.js +32 -1
- package/dist/src/executors/flutter-build/executor.js.map +1 -1
- package/dist/src/executors/flutter-build/schema.d.ts +8 -0
- package/dist/src/executors/flutter-build/schema.json +53 -0
- package/dist/src/generators/adopt/flutter.d.ts +32 -0
- package/dist/src/generators/adopt/flutter.js +305 -0
- package/dist/src/generators/adopt/flutter.js.map +1 -0
- package/dist/src/generators/adopt/generator.d.ts +17 -0
- package/dist/src/generators/adopt/generator.js +176 -17
- package/dist/src/generators/adopt/generator.js.map +1 -1
- package/dist/src/generators/adopt/old-script-refs.d.ts +12 -0
- package/dist/src/generators/adopt/old-script-refs.js +239 -0
- package/dist/src/generators/adopt/old-script-refs.js.map +1 -0
- package/dist/src/generators/adopt/pipeline.d.ts +3 -1
- package/dist/src/generators/adopt/pipeline.js +13 -2
- package/dist/src/generators/adopt/pipeline.js.map +1 -1
- package/dist/src/generators/adopt/schema.json +2 -2
- package/dist/src/generators/app/files/angular/tsconfig.app.json__template__ +1 -1
- package/dist/src/generators/app/files/angular/tsconfig.json__template__ +1 -1
- package/dist/src/generators/app/generator.js +9 -0
- package/dist/src/generators/app/generator.js.map +1 -1
- package/dist/src/generators/env/generator.js +23 -7
- package/dist/src/generators/env/generator.js.map +1 -1
- package/dist/src/generators/lib/angular-lib.js +15 -0
- package/dist/src/generators/lib/angular-lib.js.map +1 -1
- package/dist/src/generators/lib/files/angular/config/tsconfig.json__template__ +1 -1
- package/dist/src/generators/lib/files/pii/README.md__template__ +1 -1
- package/dist/src/generators/lib/files/pii/src/index.ts__template__ +2 -2
- package/dist/src/generators/lib/files/session/src/index.ts__template__ +2 -2
- package/dist/src/generators/lib/files/state/ngrx/README.md__template__ +2 -2
- package/dist/src/generators/lib/files/state/ngrx/src/index.ts__template__ +2 -2
- package/dist/src/generators/lib/types/state.js +13 -8
- package/dist/src/generators/lib/types/state.js.map +1 -1
- package/dist/src/generators/migrate/nx/build-scripts.d.ts +6 -0
- package/dist/src/generators/migrate/nx/build-scripts.js +33 -1
- package/dist/src/generators/migrate/nx/build-scripts.js.map +1 -1
- package/dist/src/generators/migrate/nx/env-encryption.d.ts +7 -0
- package/dist/src/generators/migrate/nx/env-encryption.js +34 -10
- package/dist/src/generators/migrate/nx/env-encryption.js.map +1 -1
- package/dist/src/generators/preset/files/root/nx.json__template__ +1 -0
- package/dist/src/generators/preset/generator.js +4 -1
- package/dist/src/generators/preset/generator.js.map +1 -1
- package/dist/src/generators/preset/schema.d.ts +1 -1
- package/dist/src/generators/preset/schema.json +1 -1
- package/dist/src/lib/helpers/inject-nonce.d.ts +10 -2
- package/dist/src/lib/helpers/inject-nonce.js +19 -4
- package/dist/src/lib/helpers/inject-nonce.js.map +1 -1
- package/dist/src/lib/release/htaccess-adopt.d.ts +8 -0
- package/dist/src/lib/release/htaccess-adopt.js +39 -14
- package/dist/src/lib/release/htaccess-adopt.js.map +1 -1
- package/dist/src/lib/upgrade/angular15.d.ts +23 -0
- package/dist/src/lib/upgrade/angular15.js +139 -0
- package/dist/src/lib/upgrade/angular15.js.map +1 -0
- package/dist/src/lib/upgrade/pins.d.ts +1 -1
- package/dist/src/lib/upgrade/pins.js +12 -1
- package/dist/src/lib/upgrade/pins.js.map +1 -1
- package/dist/src/lib/utils/angular-deps.d.ts +17 -0
- package/dist/src/lib/utils/angular-deps.js +29 -4
- package/dist/src/lib/utils/angular-deps.js.map +1 -1
- package/dist/src/lib/utils/angular-project.d.ts +1 -1
- package/dist/src/lib/utils/angular-project.js +7 -3
- package/dist/src/lib/utils/angular-project.js.map +1 -1
- package/dist/src/migrations/nx-analytics-off/nx-analytics-off.d.ts +7 -0
- package/dist/src/migrations/nx-analytics-off/nx-analytics-off.js +33 -0
- package/dist/src/migrations/nx-analytics-off/nx-analytics-off.js.map +1 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -79,7 +79,9 @@ session and NgRx state libraries also export `providePiiMask()`, `provideSession
|
|
|
79
79
|
`pstack upgrade standalone --all` moves an existing NgModule workspace with Angular's own schematic
|
|
80
80
|
(Angular 15.2+): convert, prune the NgModules, then `bootstrapApplication`, with a build and lint
|
|
81
81
|
check and one commit per step. It keeps the CSP nonce import first in `main.ts` and, on Angular 21,
|
|
82
|
-
zone.js change detection.
|
|
82
|
+
zone.js change detection. A last step swaps the root routing module for `provideRouter(routes)`
|
|
83
|
+
(in `app.routes.ts`) and drops `BrowserModule`; on an already converted workspace it runs alone.
|
|
84
|
+
`--project=a,b` limits it to some projects; `--dry-run` shows the plan.
|
|
83
85
|
Ionic apps keep `IonicModule`; Ionic's own codemod moves them to Ionic's standalone components.
|
|
84
86
|
|
|
85
87
|
## What you get
|
package/dist/migrations.json
CHANGED
|
@@ -102,6 +102,11 @@
|
|
|
102
102
|
"version": "1.10.4",
|
|
103
103
|
"description": "Fix the lint-staged ESLint script so commits with staged TypeScript files find ESLint 8 and later again (it resolved bin/eslint.js, which ESLint no longer exports)",
|
|
104
104
|
"implementation": "./src/migrations/lint-staged-eslint-resolve/lint-staged-eslint-resolve"
|
|
105
|
+
},
|
|
106
|
+
"nx-analytics-off": {
|
|
107
|
+
"version": "1.11.3",
|
|
108
|
+
"description": "Set nx.json \"analytics\": false when the workspace has not answered Nx's usage-data prompt, so Nx 22 no longer stops to ask",
|
|
109
|
+
"implementation": "./src/migrations/nx-analytics-off/nx-analytics-off"
|
|
105
110
|
}
|
|
106
111
|
}
|
|
107
112
|
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import type * as TS from 'typescript';
|
|
2
|
+
/**
|
|
3
|
+
* The provider tidy-up after Angular's standalone-bootstrap mode, which leaves NgModule leftovers
|
|
4
|
+
* in `importProvidersFrom(...)`:
|
|
5
|
+
*
|
|
6
|
+
* - `BrowserModule`: `bootstrapApplication` already provides it, so it is dropped;
|
|
7
|
+
* - the root routing module (`@NgModule({ imports: [RouterModule.forRoot(routes, options)],
|
|
8
|
+
* exports: [RouterModule] })`): becomes `provideRouter(routes, ...features)`, and the module
|
|
9
|
+
* file becomes a routes file (`app-routing.module.ts` → `app.routes.ts`) exporting the routes.
|
|
10
|
+
*
|
|
11
|
+
* Anything it cannot convert safely (other decorator fields, router options without a feature,
|
|
12
|
+
* other importers of the routing module) is left as it is and named in the notes.
|
|
13
|
+
*/
|
|
14
|
+
type Ts = typeof TS;
|
|
15
|
+
export interface ProvidersResult {
|
|
16
|
+
/** Absolute path → new text (written by the caller). */
|
|
17
|
+
writes: Map<string, string>;
|
|
18
|
+
/** Absolute old path → absolute new path (renamed by the caller, after the writes). */
|
|
19
|
+
renames: Map<string, string>;
|
|
20
|
+
/** What changed, for the log (workspace-relative paths). */
|
|
21
|
+
done: string[];
|
|
22
|
+
/** What was left as it is, and why. */
|
|
23
|
+
notes: string[];
|
|
24
|
+
}
|
|
25
|
+
/** typescript from the workspace (every Angular workspace has it), else undefined. */
|
|
26
|
+
export declare function loadTypescript(root: string): Ts | undefined;
|
|
27
|
+
/** Adds names to the named import from `from` (or a new import after the last import). */
|
|
28
|
+
export declare function addNamedImports(text: string, names: string[], from: string): string;
|
|
29
|
+
/**
|
|
30
|
+
* Rewrites the `importProvidersFrom(...)` calls of one bootstrap file (main.ts or app.config.ts) of
|
|
31
|
+
* an app. `root` is the workspace root (for the log's relative paths).
|
|
32
|
+
*/
|
|
33
|
+
export declare function tidyStandaloneProviders(ts: Ts, root: string, bootstrapFile: string, srcDir: string, angularMajor: number, result: ProvidersResult): void;
|
|
34
|
+
export {};
|
|
@@ -0,0 +1,423 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.tidyStandaloneProviders = exports.addNamedImports = exports.loadTypescript = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const fs = tslib_1.__importStar(require("fs"));
|
|
6
|
+
const path = tslib_1.__importStar(require("path"));
|
|
7
|
+
const upgrade_standalone_1 = require("./upgrade-standalone");
|
|
8
|
+
/** typescript from the workspace (every Angular workspace has it), else undefined. */
|
|
9
|
+
function loadTypescript(root) {
|
|
10
|
+
try {
|
|
11
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
12
|
+
return require(require.resolve('typescript', { paths: [root] }));
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return undefined;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
exports.loadTypescript = loadTypescript;
|
|
19
|
+
const ROUTER_CONFIG_OPTIONS = new Set([
|
|
20
|
+
'onSameUrlNavigation',
|
|
21
|
+
'paramsInheritanceStrategy',
|
|
22
|
+
'urlUpdateStrategy',
|
|
23
|
+
'canceledNavigationResolution',
|
|
24
|
+
]);
|
|
25
|
+
const SCROLLING_OPTIONS = new Set(['scrollPositionRestoration', 'anchorScrolling']);
|
|
26
|
+
const isLiteral = (ts, n) => ts.isStringLiteral(n) ||
|
|
27
|
+
ts.isNoSubstitutionTemplateLiteral(n) ||
|
|
28
|
+
n.kind === ts.SyntaxKind.TrueKeyword ||
|
|
29
|
+
n.kind === ts.SyntaxKind.FalseKeyword;
|
|
30
|
+
const propName = (ts, p) => p.name && (ts.isIdentifier(p.name) || ts.isStringLiteral(p.name)) ? p.name.text : undefined;
|
|
31
|
+
/** Named imports of a file: local name → module specifier. */
|
|
32
|
+
function namedImports(ts, sf) {
|
|
33
|
+
const out = new Map();
|
|
34
|
+
for (const st of sf.statements) {
|
|
35
|
+
if (!ts.isImportDeclaration(st) || !ts.isStringLiteral(st.moduleSpecifier))
|
|
36
|
+
continue;
|
|
37
|
+
const bindings = st.importClause?.namedBindings;
|
|
38
|
+
if (bindings && ts.isNamedImports(bindings)) {
|
|
39
|
+
for (const el of bindings.elements)
|
|
40
|
+
out.set(el.name.text, st.moduleSpecifier.text);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return out;
|
|
44
|
+
}
|
|
45
|
+
/** A relative import specifier → the .ts file it names, when it exists. */
|
|
46
|
+
function resolveRelative(fromFile, spec) {
|
|
47
|
+
if (!spec.startsWith('.'))
|
|
48
|
+
return undefined;
|
|
49
|
+
const base = path.resolve(path.dirname(fromFile), spec);
|
|
50
|
+
for (const f of [`${base}.ts`, path.join(base, 'index.ts')]) {
|
|
51
|
+
if (fs.existsSync(f))
|
|
52
|
+
return f;
|
|
53
|
+
}
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
56
|
+
/** A relative specifier from one file to another, without the .ts extension. */
|
|
57
|
+
function relativeSpec(fromFile, toFile) {
|
|
58
|
+
let rel = path.relative(path.dirname(fromFile), toFile).split(path.sep).join('/');
|
|
59
|
+
rel = rel.replace(/\.ts$/, '');
|
|
60
|
+
return rel.startsWith('.') ? rel : `./${rel}`;
|
|
61
|
+
}
|
|
62
|
+
/** router options → provideRouter features; a string names the option it cannot convert. */
|
|
63
|
+
function routerFeatures(ts, options, imports, angularMajor) {
|
|
64
|
+
if (!options)
|
|
65
|
+
return [];
|
|
66
|
+
if (!ts.isObjectLiteralExpression(options))
|
|
67
|
+
return 'options that are not an object literal';
|
|
68
|
+
const features = [];
|
|
69
|
+
const scrolling = [];
|
|
70
|
+
const config = [];
|
|
71
|
+
for (const p of options.properties) {
|
|
72
|
+
const name = propName(ts, p);
|
|
73
|
+
if (!name || !ts.isPropertyAssignment(p))
|
|
74
|
+
return 'a computed or shorthand option';
|
|
75
|
+
const v = p.initializer;
|
|
76
|
+
const isTrue = v.kind === ts.SyntaxKind.TrueKeyword;
|
|
77
|
+
const isFalse = v.kind === ts.SyntaxKind.FalseKeyword;
|
|
78
|
+
const text = v.getText();
|
|
79
|
+
if (name === 'useHash' && (isTrue || isFalse)) {
|
|
80
|
+
if (isTrue)
|
|
81
|
+
features.push({ call: 'withHashLocation()', names: ['withHashLocation'] });
|
|
82
|
+
}
|
|
83
|
+
else if (name === 'enableTracing' && (isTrue || isFalse)) {
|
|
84
|
+
if (isTrue)
|
|
85
|
+
features.push({ call: 'withDebugTracing()', names: ['withDebugTracing'] });
|
|
86
|
+
}
|
|
87
|
+
else if (name === 'initialNavigation' && ts.isStringLiteral(v)) {
|
|
88
|
+
if (v.text === 'enabledBlocking') {
|
|
89
|
+
features.push({
|
|
90
|
+
call: 'withEnabledBlockingInitialNavigation()',
|
|
91
|
+
names: ['withEnabledBlockingInitialNavigation'],
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
else if (v.text === 'disabled') {
|
|
95
|
+
features.push({
|
|
96
|
+
call: 'withDisabledInitialNavigation()',
|
|
97
|
+
names: ['withDisabledInitialNavigation'],
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
else if (v.text !== 'enabledNonBlocking') {
|
|
101
|
+
return `initialNavigation: ${text}`;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
else if (name === 'preloadingStrategy' && ts.isIdentifier(v)) {
|
|
105
|
+
// Only strategies from @angular/router: others would need their own import moved.
|
|
106
|
+
if (imports.get(v.text) !== '@angular/router')
|
|
107
|
+
return `preloadingStrategy: ${text}`;
|
|
108
|
+
features.push({ call: `withPreloading(${v.text})`, names: ['withPreloading', v.text] });
|
|
109
|
+
}
|
|
110
|
+
else if (name === 'bindToComponentInputs' && (isTrue || isFalse) && angularMajor >= 16) {
|
|
111
|
+
if (isTrue) {
|
|
112
|
+
features.push({
|
|
113
|
+
call: 'withComponentInputBinding()',
|
|
114
|
+
names: ['withComponentInputBinding'],
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
else if (SCROLLING_OPTIONS.has(name) && isLiteral(ts, v)) {
|
|
119
|
+
scrolling.push(`${name}: ${text}`);
|
|
120
|
+
}
|
|
121
|
+
else if (ROUTER_CONFIG_OPTIONS.has(name) && isLiteral(ts, v)) {
|
|
122
|
+
config.push(`${name}: ${text}`);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
return `${name}: ${text}`;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
if (scrolling.length > 0) {
|
|
129
|
+
features.push({
|
|
130
|
+
call: `withInMemoryScrolling({ ${scrolling.join(', ')} })`,
|
|
131
|
+
names: ['withInMemoryScrolling'],
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
if (config.length > 0) {
|
|
135
|
+
features.push({
|
|
136
|
+
call: `withRouterConfig({ ${config.join(', ')} })`,
|
|
137
|
+
names: ['withRouterConfig'],
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
return features;
|
|
141
|
+
}
|
|
142
|
+
/** Files under dir (recursive) that import `target` by a relative specifier. */
|
|
143
|
+
function importersOf(ts, dir, target) {
|
|
144
|
+
const out = [];
|
|
145
|
+
const walk = (d) => {
|
|
146
|
+
if (!fs.existsSync(d))
|
|
147
|
+
return;
|
|
148
|
+
for (const e of fs.readdirSync(d, { withFileTypes: true })) {
|
|
149
|
+
if (e.name === 'node_modules' || e.name.startsWith('.'))
|
|
150
|
+
continue;
|
|
151
|
+
const p = path.join(d, e.name);
|
|
152
|
+
if (e.isDirectory())
|
|
153
|
+
walk(p);
|
|
154
|
+
else if (e.name.endsWith('.ts') && p !== target) {
|
|
155
|
+
const sf = ts.createSourceFile(p, fs.readFileSync(p, 'utf8'), ts.ScriptTarget.Latest);
|
|
156
|
+
const hit = sf.statements.some((st) => (ts.isImportDeclaration(st) || ts.isExportDeclaration(st)) &&
|
|
157
|
+
st.moduleSpecifier !== undefined &&
|
|
158
|
+
ts.isStringLiteral(st.moduleSpecifier) &&
|
|
159
|
+
resolveRelative(p, st.moduleSpecifier.text) === target);
|
|
160
|
+
if (hit)
|
|
161
|
+
out.push(p);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
};
|
|
165
|
+
walk(dir);
|
|
166
|
+
return out;
|
|
167
|
+
}
|
|
168
|
+
/** Removes [start, end) and the line break right after it. */
|
|
169
|
+
function cut(text, start, end) {
|
|
170
|
+
const after = text.slice(end).replace(/^[ \t]*\r?\n/, '');
|
|
171
|
+
return text.slice(0, start) + after;
|
|
172
|
+
}
|
|
173
|
+
/**
|
|
174
|
+
* The root routing module `name` imported by `bootstrapFile`: a plan to turn it into a routes file,
|
|
175
|
+
* or a reason it stays.
|
|
176
|
+
*/
|
|
177
|
+
function planRouting(ts, bootstrapFile, name, spec, srcDir, angularMajor) {
|
|
178
|
+
const file = resolveRelative(bootstrapFile, spec);
|
|
179
|
+
if (!file)
|
|
180
|
+
return `${name}: ${spec} not found`;
|
|
181
|
+
const text = fs.readFileSync(file, 'utf8');
|
|
182
|
+
const sf = ts.createSourceFile(file, text, ts.ScriptTarget.Latest, true);
|
|
183
|
+
const imports = namedImports(ts, sf);
|
|
184
|
+
const cls = sf.statements.find((st) => ts.isClassDeclaration(st) && st.name?.text === name);
|
|
185
|
+
if (!cls)
|
|
186
|
+
return `${name}: no class ${name} in ${path.basename(file)}`;
|
|
187
|
+
if (cls.members.length > 0)
|
|
188
|
+
return `${name} has members`;
|
|
189
|
+
const decorators = (ts.canHaveDecorators?.(cls) ? ts.getDecorators?.(cls) : undefined) ?? [];
|
|
190
|
+
if (decorators.length !== 1)
|
|
191
|
+
return `${name}: not a plain @NgModule`;
|
|
192
|
+
const call = decorators[0].expression;
|
|
193
|
+
if (!ts.isCallExpression(call) ||
|
|
194
|
+
!ts.isIdentifier(call.expression) ||
|
|
195
|
+
call.expression.text !== 'NgModule' ||
|
|
196
|
+
call.arguments.length !== 1 ||
|
|
197
|
+
!ts.isObjectLiteralExpression(call.arguments[0])) {
|
|
198
|
+
return `${name}: not a plain @NgModule`;
|
|
199
|
+
}
|
|
200
|
+
let forRoot;
|
|
201
|
+
for (const p of call.arguments[0].properties) {
|
|
202
|
+
const key = propName(ts, p);
|
|
203
|
+
if (!key || !ts.isPropertyAssignment(p) || !ts.isArrayLiteralExpression(p.initializer)) {
|
|
204
|
+
return `${name}: @NgModule has more than imports and exports`;
|
|
205
|
+
}
|
|
206
|
+
const els = p.initializer.elements;
|
|
207
|
+
if (key === 'exports') {
|
|
208
|
+
if (!els.every((e) => ts.isIdentifier(e) && e.text === 'RouterModule')) {
|
|
209
|
+
return `${name} exports more than RouterModule`;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
else if (key === 'imports') {
|
|
213
|
+
const only = els.length === 1 ? els[0] : undefined;
|
|
214
|
+
if (!only ||
|
|
215
|
+
!ts.isCallExpression(only) ||
|
|
216
|
+
!ts.isPropertyAccessExpression(only.expression) ||
|
|
217
|
+
only.expression.expression.getText() !== 'RouterModule' ||
|
|
218
|
+
only.expression.name.text !== 'forRoot') {
|
|
219
|
+
return `${name} imports more than RouterModule.forRoot(...)`;
|
|
220
|
+
}
|
|
221
|
+
forRoot = only;
|
|
222
|
+
}
|
|
223
|
+
else {
|
|
224
|
+
return `${name}: @NgModule has ${key}`;
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
if (!forRoot || forRoot.arguments.length < 1 || forRoot.arguments.length > 2) {
|
|
228
|
+
return `${name}: no RouterModule.forRoot(routes)`;
|
|
229
|
+
}
|
|
230
|
+
const features = routerFeatures(ts, forRoot.arguments[1], imports, angularMajor);
|
|
231
|
+
if (typeof features === 'string')
|
|
232
|
+
return `${name}: router option ${features} has no feature`;
|
|
233
|
+
const others = importersOf(ts, srcDir, file).filter((f) => f !== bootstrapFile);
|
|
234
|
+
if (others.length > 0) {
|
|
235
|
+
return `${name} is also imported by ${others.map((f) => path.basename(f)).join(', ')}`;
|
|
236
|
+
}
|
|
237
|
+
// The routes: a const declared in the file (exported if it was not), or an inline array.
|
|
238
|
+
const routesArg = forRoot.arguments[0];
|
|
239
|
+
let routesName = 'routes';
|
|
240
|
+
let out = text;
|
|
241
|
+
const edits = [];
|
|
242
|
+
if (ts.isIdentifier(routesArg)) {
|
|
243
|
+
const decl = sf.statements.find((st) => ts.isVariableStatement(st) &&
|
|
244
|
+
st.declarationList.declarations.some((d) => ts.isIdentifier(d.name) && d.name.text === routesArg.text));
|
|
245
|
+
if (!decl)
|
|
246
|
+
return `${name}: ${routesArg.text} is not declared in ${path.basename(file)}`;
|
|
247
|
+
if ((decl.declarationList.flags & ts.NodeFlags.Const) === 0) {
|
|
248
|
+
return `${name}: ${routesArg.text} is not a const`;
|
|
249
|
+
}
|
|
250
|
+
routesName = routesArg.text;
|
|
251
|
+
const exported = decl.modifiers?.some((m) => m.kind === ts.SyntaxKind.ExportKeyword);
|
|
252
|
+
if (!exported) {
|
|
253
|
+
const at = decl.getStart(sf);
|
|
254
|
+
edits.push({ start: at, end: at, text: 'export ' });
|
|
255
|
+
}
|
|
256
|
+
edits.push({ start: cls.getStart(sf, true), end: cls.getEnd(), text: '' });
|
|
257
|
+
}
|
|
258
|
+
else if (ts.isArrayLiteralExpression(routesArg)) {
|
|
259
|
+
if (imports.has('routes') || /\broutes\b/.test(text.replace(routesArg.getText(), ''))) {
|
|
260
|
+
return `${name}: inline routes, and the name "routes" is taken`;
|
|
261
|
+
}
|
|
262
|
+
edits.push({
|
|
263
|
+
start: cls.getStart(sf, true),
|
|
264
|
+
end: cls.getEnd(),
|
|
265
|
+
text: `export const routes: Routes = ${routesArg.getText()};`,
|
|
266
|
+
});
|
|
267
|
+
}
|
|
268
|
+
else {
|
|
269
|
+
return `${name}: routes passed as ${routesArg.getText()}`;
|
|
270
|
+
}
|
|
271
|
+
for (const e of edits.sort((a, b) => b.start - a.start)) {
|
|
272
|
+
out = e.text
|
|
273
|
+
? out.slice(0, e.start) + e.text + out.slice(e.end)
|
|
274
|
+
: cut(out, e.start, e.end).replace(/\n{3,}/g, '\n\n');
|
|
275
|
+
}
|
|
276
|
+
out = (0, upgrade_standalone_1.dropUnusedNamedImport)(out, 'NgModule', '@angular/core');
|
|
277
|
+
out = (0, upgrade_standalone_1.dropUnusedNamedImport)(out, 'RouterModule', '@angular/router');
|
|
278
|
+
if (/\bRoutes\b/.test(out) &&
|
|
279
|
+
!/import\s*\{[^}]*\bRoutes\b[^}]*\}\s*from\s*['"]@angular\/router['"]/.test(out)) {
|
|
280
|
+
out = addNamedImports(out, ['Routes'], '@angular/router');
|
|
281
|
+
}
|
|
282
|
+
out = `${out.replace(/^\n+/, '').replace(/\n*$/, '')}\n`;
|
|
283
|
+
const m = /^(.*)-routing\.module\.ts$/.exec(path.basename(file));
|
|
284
|
+
const renamed = m ? path.join(path.dirname(file), `${m[1]}.routes.ts`) : file;
|
|
285
|
+
const routesFile = renamed !== file && fs.existsSync(renamed) ? file : renamed;
|
|
286
|
+
return { file, routesFile, routesName, features, text: out };
|
|
287
|
+
}
|
|
288
|
+
/** Adds names to the named import from `from` (or a new import after the last import). */
|
|
289
|
+
function addNamedImports(text, names, from) {
|
|
290
|
+
const esc = from.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
|
|
291
|
+
const re = new RegExp(`import\\s*\\{([^}]*)\\}\\s*from\\s*['"]${esc}['"];?`);
|
|
292
|
+
const m = re.exec(text);
|
|
293
|
+
if (m) {
|
|
294
|
+
const have = m[1]
|
|
295
|
+
.split(',')
|
|
296
|
+
.map((n) => n.trim())
|
|
297
|
+
.filter(Boolean);
|
|
298
|
+
const all = [...have, ...names.filter((n) => !have.includes(n))];
|
|
299
|
+
return text.replace(m[0], `import { ${all.join(', ')} } from '${from}';`);
|
|
300
|
+
}
|
|
301
|
+
const line = `import { ${names.join(', ')} } from '${from}';\n`;
|
|
302
|
+
const imports = [...text.matchAll(/^import\b[^;]*;[ \t]*\n/gm)];
|
|
303
|
+
const last = imports[imports.length - 1];
|
|
304
|
+
if (!last || last.index === undefined)
|
|
305
|
+
return line + text;
|
|
306
|
+
const at = last.index + last[0].length;
|
|
307
|
+
return text.slice(0, at) + line + text.slice(at);
|
|
308
|
+
}
|
|
309
|
+
exports.addNamedImports = addNamedImports;
|
|
310
|
+
/**
|
|
311
|
+
* Rewrites the `importProvidersFrom(...)` calls of one bootstrap file (main.ts or app.config.ts) of
|
|
312
|
+
* an app. `root` is the workspace root (for the log's relative paths).
|
|
313
|
+
*/
|
|
314
|
+
function tidyStandaloneProviders(ts, root, bootstrapFile, srcDir, angularMajor, result) {
|
|
315
|
+
const rel = (f) => path.relative(root, f).split(path.sep).join('/');
|
|
316
|
+
const text = result.writes.get(bootstrapFile) ?? fs.readFileSync(bootstrapFile, 'utf8');
|
|
317
|
+
const sf = ts.createSourceFile(bootstrapFile, text, ts.ScriptTarget.Latest, true);
|
|
318
|
+
const imports = namedImports(ts, sf);
|
|
319
|
+
if (imports.get('importProvidersFrom') !== '@angular/core')
|
|
320
|
+
return;
|
|
321
|
+
const calls = [];
|
|
322
|
+
const visit = (n) => {
|
|
323
|
+
if (ts.isCallExpression(n) &&
|
|
324
|
+
ts.isIdentifier(n.expression) &&
|
|
325
|
+
n.expression.text === 'importProvidersFrom' &&
|
|
326
|
+
n.parent &&
|
|
327
|
+
ts.isArrayLiteralExpression(n.parent)) {
|
|
328
|
+
calls.push(n);
|
|
329
|
+
}
|
|
330
|
+
ts.forEachChild(n, visit);
|
|
331
|
+
};
|
|
332
|
+
visit(sf);
|
|
333
|
+
if (calls.length === 0)
|
|
334
|
+
return;
|
|
335
|
+
const edits = [];
|
|
336
|
+
const routerNames = new Set();
|
|
337
|
+
const dropped = [];
|
|
338
|
+
const routeImports = [];
|
|
339
|
+
for (const call of calls) {
|
|
340
|
+
const keep = [];
|
|
341
|
+
const add = [];
|
|
342
|
+
for (const arg of call.arguments) {
|
|
343
|
+
if (ts.isIdentifier(arg) &&
|
|
344
|
+
arg.text === 'BrowserModule' &&
|
|
345
|
+
imports.get('BrowserModule') === '@angular/platform-browser') {
|
|
346
|
+
dropped.push('BrowserModule');
|
|
347
|
+
continue;
|
|
348
|
+
}
|
|
349
|
+
const spec = ts.isIdentifier(arg) ? imports.get(arg.text) : undefined;
|
|
350
|
+
if (ts.isIdentifier(arg) && spec?.startsWith('.')) {
|
|
351
|
+
const file = resolveRelative(bootstrapFile, spec);
|
|
352
|
+
const src = file ? fs.readFileSync(file, 'utf8') : '';
|
|
353
|
+
if (/RouterModule\s*\.\s*forRoot\s*\(/.test(src)) {
|
|
354
|
+
const plan = planRouting(ts, bootstrapFile, arg.text, spec, srcDir, angularMajor);
|
|
355
|
+
if (typeof plan === 'string') {
|
|
356
|
+
result.notes.push(`${rel(bootstrapFile)}: ${plan}; left in importProvidersFrom`);
|
|
357
|
+
keep.push(arg.getText());
|
|
358
|
+
continue;
|
|
359
|
+
}
|
|
360
|
+
result.writes.set(plan.file, plan.text);
|
|
361
|
+
if (plan.routesFile !== plan.file)
|
|
362
|
+
result.renames.set(plan.file, plan.routesFile);
|
|
363
|
+
const routeArgs = [plan.routesName, ...plan.features.map((f) => f.call)];
|
|
364
|
+
add.push(`provideRouter(${routeArgs.join(', ')})`);
|
|
365
|
+
routerNames.add('provideRouter');
|
|
366
|
+
plan.features.forEach((f) => f.names.forEach((n) => routerNames.add(n)));
|
|
367
|
+
dropped.push(arg.text);
|
|
368
|
+
routeImports.push({
|
|
369
|
+
name: plan.routesName,
|
|
370
|
+
spec: relativeSpec(bootstrapFile, plan.routesFile),
|
|
371
|
+
});
|
|
372
|
+
result.done.push(`${rel(plan.file)}: ${arg.text} → ${rel(plan.routesFile)} (export const ${plan.routesName})`);
|
|
373
|
+
continue;
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
keep.push(arg.getText());
|
|
377
|
+
}
|
|
378
|
+
if (keep.length === call.arguments.length && add.length === 0)
|
|
379
|
+
continue;
|
|
380
|
+
const replacement = [
|
|
381
|
+
...(keep.length > 0 ? [`importProvidersFrom(${keep.join(', ')})`] : []),
|
|
382
|
+
...add,
|
|
383
|
+
];
|
|
384
|
+
if (replacement.length > 0) {
|
|
385
|
+
edits.push({ start: call.getStart(sf), end: call.getEnd(), text: replacement.join(', ') });
|
|
386
|
+
}
|
|
387
|
+
else {
|
|
388
|
+
// Drop the element with its separating comma.
|
|
389
|
+
const arr = call.parent;
|
|
390
|
+
const i = arr.elements.indexOf(call);
|
|
391
|
+
const start = i > 0 ? arr.elements[i - 1].getEnd() : call.getStart(sf);
|
|
392
|
+
const end = i > 0
|
|
393
|
+
? call.getEnd()
|
|
394
|
+
: i + 1 < arr.elements.length
|
|
395
|
+
? arr.elements[i + 1].getStart(sf)
|
|
396
|
+
: call.getEnd();
|
|
397
|
+
edits.push({ start, end, text: '' });
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
if (edits.length === 0)
|
|
401
|
+
return;
|
|
402
|
+
let out = text;
|
|
403
|
+
for (const e of edits.sort((a, b) => b.start - a.start)) {
|
|
404
|
+
out = out.slice(0, e.start) + e.text + out.slice(e.end);
|
|
405
|
+
}
|
|
406
|
+
for (const n of [...dropped, 'importProvidersFrom']) {
|
|
407
|
+
const from = n === 'importProvidersFrom' ? '@angular/core' : imports.get(n);
|
|
408
|
+
if (from)
|
|
409
|
+
out = (0, upgrade_standalone_1.dropUnusedNamedImport)(out, n, from);
|
|
410
|
+
}
|
|
411
|
+
if (routerNames.size > 0)
|
|
412
|
+
out = addNamedImports(out, [...routerNames], '@angular/router');
|
|
413
|
+
for (const r of routeImports)
|
|
414
|
+
out = addNamedImports(out, [r.name], r.spec);
|
|
415
|
+
result.writes.set(bootstrapFile, out);
|
|
416
|
+
const what = [
|
|
417
|
+
...dropped.filter((d) => d === 'BrowserModule').map(() => 'BrowserModule dropped'),
|
|
418
|
+
...(routerNames.has('provideRouter') ? ['provideRouter instead of the routing module'] : []),
|
|
419
|
+
];
|
|
420
|
+
result.done.unshift(`${rel(bootstrapFile)}: ${what.join(', ')}`);
|
|
421
|
+
}
|
|
422
|
+
exports.tidyStandaloneProviders = tidyStandaloneProviders;
|
|
423
|
+
//# sourceMappingURL=standalone-providers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"standalone-providers.js","sourceRoot":"","sources":["../../../../src/cli/commands/standalone-providers.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAI7B,6DAA6D;AA4B7D,sFAAsF;AACtF,SAAgB,cAAc,CAAC,IAAY;IACzC,IAAI;QACF,8DAA8D;QAC9D,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAO,CAAC;KACxE;IAAC,MAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAPD,wCAOC;AAoBD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC;IACpC,qBAAqB;IACrB,2BAA2B;IAC3B,mBAAmB;IACnB,8BAA8B;CAC/B,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,2BAA2B,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAEpF,MAAM,SAAS,GAAG,CAAC,EAAM,EAAE,CAAgB,EAAW,EAAE,CACtD,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IACrB,EAAE,CAAC,+BAA+B,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,WAAW;IACpC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;AAExC,MAAM,QAAQ,GAAG,CAAC,EAAM,EAAE,CAA8B,EAAsB,EAAE,CAC9E,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AAE9F,8DAA8D;AAC9D,SAAS,YAAY,CAAC,EAAM,EAAE,EAAiB;IAC7C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;IACtC,KAAK,MAAM,EAAE,IAAI,EAAE,CAAC,UAAU,EAAE;QAC9B,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC;YAAE,SAAS;QACrF,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC;QAChD,IAAI,QAAQ,IAAI,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;YAC3C,KAAK,MAAM,EAAE,IAAI,QAAQ,CAAC,QAAQ;gBAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;SACpF;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,2EAA2E;AAC3E,SAAS,eAAe,CAAC,QAAgB,EAAE,IAAY;IACrD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;IACxD,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE;QAC3D,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;KAChC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,gFAAgF;AAChF,SAAS,YAAY,CAAC,QAAgB,EAAE,MAAc;IACpD,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClF,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC/B,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;AAChD,CAAC;AAED,4FAA4F;AAC5F,SAAS,cAAc,CACrB,EAAM,EACN,OAAkC,EAClC,OAA4B,EAC5B,YAAoB;IAEpB,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC;QAAE,OAAO,wCAAwC,CAAC;IAC5F,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;QAClC,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC;YAAE,OAAO,gCAAgC,CAAC;QAClF,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC;QACxB,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;QACpD,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QACtD,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;QACzB,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,EAAE;YAC7C,IAAI,MAAM;gBAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;SACxF;aAAM,IAAI,IAAI,KAAK,eAAe,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,EAAE;YAC1D,IAAI,MAAM;gBAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;SACxF;aAAM,IAAI,IAAI,KAAK,mBAAmB,IAAI,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE;YAChE,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB,EAAE;gBAChC,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,wCAAwC;oBAC9C,KAAK,EAAE,CAAC,sCAAsC,CAAC;iBAChD,CAAC,CAAC;aACJ;iBAAM,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE;gBAChC,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,iCAAiC;oBACvC,KAAK,EAAE,CAAC,+BAA+B,CAAC;iBACzC,CAAC,CAAC;aACJ;iBAAM,IAAI,CAAC,CAAC,IAAI,KAAK,oBAAoB,EAAE;gBAC1C,OAAO,sBAAsB,IAAI,EAAE,CAAC;aACrC;SACF;aAAM,IAAI,IAAI,KAAK,oBAAoB,IAAI,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;YAC9D,kFAAkF;YAClF,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,iBAAiB;gBAAE,OAAO,uBAAuB,IAAI,EAAE,CAAC;YACpF,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACzF;aAAM,IAAI,IAAI,KAAK,uBAAuB,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,YAAY,IAAI,EAAE,EAAE;YACxF,IAAI,MAAM,EAAE;gBACV,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,6BAA6B;oBACnC,KAAK,EAAE,CAAC,2BAA2B,CAAC;iBACrC,CAAC,CAAC;aACJ;SACF;aAAM,IAAI,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE;YAC1D,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,IAAI,EAAE,CAAC,CAAC;SACpC;aAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE;YAC9D,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,IAAI,EAAE,CAAC,CAAC;SACjC;aAAM;YACL,OAAO,GAAG,IAAI,KAAK,IAAI,EAAE,CAAC;SAC3B;KACF;IACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,2BAA2B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK;YAC1D,KAAK,EAAE,CAAC,uBAAuB,CAAC;SACjC,CAAC,CAAC;KACJ;IACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,sBAAsB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK;YAClD,KAAK,EAAE,CAAC,kBAAkB,CAAC;SAC5B,CAAC,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,gFAAgF;AAChF,SAAS,WAAW,CAAC,EAAM,EAAE,GAAW,EAAE,MAAc;IACtD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,EAAE;QACzB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAAE,OAAO;QAC9B,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE;YAC1D,IAAI,CAAC,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,SAAS;YAClE,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAC/B,IAAI,CAAC,CAAC,WAAW,EAAE;gBAAE,IAAI,CAAC,CAAC,CAAC,CAAC;iBACxB,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,MAAM,EAAE;gBAC/C,MAAM,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;gBACtF,MAAM,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAC5B,CAAC,EAAE,EAAE,EAAE,CACL,CAAC,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;oBAC1D,EAAE,CAAC,eAAe,KAAK,SAAS;oBAChC,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC;oBACtC,eAAe,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,MAAM,CACzD,CAAC;gBACF,IAAI,GAAG;oBAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACtB;SACF;IACH,CAAC,CAAC;IACF,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,GAAG,CAAC;AACb,CAAC;AAED,8DAA8D;AAC9D,SAAS,GAAG,CAAC,IAAY,EAAE,KAAa,EAAE,GAAW;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAC1D,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC;AACtC,CAAC;AAED;;;GAGG;AACH,SAAS,WAAW,CAClB,EAAM,EACN,aAAqB,EACrB,IAAY,EACZ,IAAY,EACZ,MAAc,EACd,YAAoB;IAEpB,MAAM,IAAI,GAAG,eAAe,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAClD,IAAI,CAAC,IAAI;QAAE,OAAO,GAAG,IAAI,KAAK,IAAI,YAAY,CAAC;IAC/C,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,MAAM,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAC5B,CAAC,EAAE,EAA6B,EAAE,CAAC,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CACvF,CAAC;IACF,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,IAAI,cAAc,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IACvE,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,GAAG,IAAI,cAAc,CAAC;IACzD,MAAM,UAAU,GAAG,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IAC7F,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,GAAG,IAAI,yBAAyB,CAAC;IACrE,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IACtC,IACE,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;QAC1B,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC;QACjC,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,UAAU;QACnC,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QAC3B,CAAC,EAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAChD;QACA,OAAO,GAAG,IAAI,yBAAyB,CAAC;KACzC;IACD,IAAI,OAAsC,CAAC;IAC3C,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE;QAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE;YACtF,OAAO,GAAG,IAAI,+CAA+C,CAAC;SAC/D;QACD,MAAM,GAAG,GAAG,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC;QACnC,IAAI,GAAG,KAAK,SAAS,EAAE;YACrB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,EAAE;gBACtE,OAAO,GAAG,IAAI,iCAAiC,CAAC;aACjD;SACF;aAAM,IAAI,GAAG,KAAK,SAAS,EAAE;YAC5B,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACnD,IACE,CAAC,IAAI;gBACL,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBAC1B,CAAC,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC;gBAC/C,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,cAAc;gBACvD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,EACvC;gBACA,OAAO,GAAG,IAAI,8CAA8C,CAAC;aAC9D;YACD,OAAO,GAAG,IAAI,CAAC;SAChB;aAAM;YACL,OAAO,GAAG,IAAI,mBAAmB,GAAG,EAAE,CAAC;SACxC;KACF;IACD,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5E,OAAO,GAAG,IAAI,mCAAmC,CAAC;KACnD;IACD,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IACjF,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAAE,OAAO,GAAG,IAAI,mBAAmB,QAAQ,iBAAiB,CAAC;IAE7F,MAAM,MAAM,GAAG,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC;IAChF,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,OAAO,GAAG,IAAI,wBAAwB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;KACxF;IAED,yFAAyF;IACzF,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvC,IAAI,UAAU,GAAG,QAAQ,CAAC;IAC1B,IAAI,GAAG,GAAG,IAAI,CAAC;IACf,MAAM,KAAK,GAAmD,EAAE,CAAC;IACjE,IAAI,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;QAC9B,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAC7B,CAAC,EAAE,EAA8B,EAAE,CACjC,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC1B,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAClC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CACjE,CACJ,CAAC;QACF,IAAI,CAAC,IAAI;YAAE,OAAO,GAAG,IAAI,KAAK,SAAS,CAAC,IAAI,uBAAuB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACzF,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC3D,OAAO,GAAG,IAAI,KAAK,SAAS,CAAC,IAAI,iBAAiB,CAAC;SACpD;QACD,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACrF,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC7B,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;SACrD;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;KAC5E;SAAM,IAAI,EAAE,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE;QACjD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE;YACrF,OAAO,GAAG,IAAI,iDAAiD,CAAC;SACjE;QACD,KAAK,CAAC,IAAI,CAAC;YACT,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;YAC7B,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE;YACjB,IAAI,EAAE,iCAAiC,SAAS,CAAC,OAAO,EAAE,GAAG;SAC9D,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,GAAG,IAAI,sBAAsB,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;KAC3D;IACD,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;QACvD,GAAG,GAAG,CAAC,CAAC,IAAI;YACV,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;YACnD,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;KACzD;IACD,GAAG,GAAG,IAAA,0CAAqB,EAAC,GAAG,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;IAC9D,GAAG,GAAG,IAAA,0CAAqB,EAAC,GAAG,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC;IACpE,IACE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;QACtB,CAAC,qEAAqE,CAAC,IAAI,CAAC,GAAG,CAAC,EAChF;QACA,GAAG,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,CAAC;KAC3D;IACD,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC;IAEzD,MAAM,CAAC,GAAG,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9E,MAAM,UAAU,GAAG,OAAO,KAAK,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/E,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;AAC/D,CAAC;AAED,0FAA0F;AAC1F,SAAgB,eAAe,CAAC,IAAY,EAAE,KAAe,EAAE,IAAY;IACzE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;IACzD,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,0CAA0C,GAAG,QAAQ,CAAC,CAAC;IAC7E,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,IAAI,CAAC,EAAE;QACL,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;aACd,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACpB,MAAM,CAAC,OAAO,CAAC,CAAC;QACnB,MAAM,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC;KAC3E;IACD,MAAM,IAAI,GAAG,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC;IAChE,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAChE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS;QAAE,OAAO,IAAI,GAAG,IAAI,CAAC;IAC1D,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACvC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AACnD,CAAC;AAlBD,0CAkBC;AAED;;;GAGG;AACH,SAAgB,uBAAuB,CACrC,EAAM,EACN,IAAY,EACZ,aAAqB,EACrB,MAAc,EACd,YAAoB,EACpB,MAAuB;IAEvB,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5E,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACxF,MAAM,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClF,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACrC,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,eAAe;QAAE,OAAO;IAEnE,MAAM,KAAK,GAAwB,EAAE,CAAC;IACtC,MAAM,KAAK,GAAG,CAAC,CAAU,EAAE,EAAE;QAC3B,IACE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACtB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC;YAC7B,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,qBAAqB;YAC3C,CAAC,CAAC,MAAM;YACR,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAC,MAAM,CAAC,EACrC;YACA,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACf;QACD,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAC;IACF,KAAK,CAAC,EAAE,CAAC,CAAC;IACV,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAE/B,MAAM,KAAK,GAAmD,EAAE,CAAC;IACjE,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAqC,EAAE,CAAC;IAC1D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAa,EAAE,CAAC;QACzB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE;YAChC,IACE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC;gBACpB,GAAG,CAAC,IAAI,KAAK,eAAe;gBAC5B,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,2BAA2B,EAC5D;gBACA,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAC9B,SAAS;aACV;YACD,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACtE,IAAI,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE;gBACjD,MAAM,IAAI,GAAG,eAAe,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtD,IAAI,kCAAkC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;oBAChD,MAAM,IAAI,GAAG,WAAW,CAAC,EAAE,EAAE,aAAa,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;oBAClF,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;wBAC5B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,KAAK,IAAI,+BAA+B,CAAC,CAAC;wBACjF,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;wBACzB,SAAS;qBACV;oBACD,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;oBACxC,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI;wBAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;oBAClF,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBACzE,GAAG,CAAC,IAAI,CAAC,iBAAiB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACnD,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;oBACjC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACzE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACvB,YAAY,CAAC,IAAI,CAAC;wBAChB,IAAI,EAAE,IAAI,CAAC,UAAU;wBACrB,IAAI,EAAE,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC;qBACnD,CAAC,CAAC;oBACH,MAAM,CAAC,IAAI,CAAC,IAAI,CACd,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,kBACtD,IAAI,CAAC,UACP,GAAG,CACJ,CAAC;oBACF,SAAS;iBACV;aACF;YACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1B;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACxE,MAAM,WAAW,GAAG;YAClB,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,uBAAuB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,GAAG,GAAG;SACP,CAAC;QACF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC5F;aAAM;YACL,8CAA8C;YAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,MAAmC,CAAC;YACrD,MAAM,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACvE,MAAM,GAAG,GACP,CAAC,GAAG,CAAC;gBACH,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE;gBACf,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM;oBAC7B,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAClC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;SACtC;KACF;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC/B,IAAI,GAAG,GAAG,IAAI,CAAC;IACf,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE;QACvD,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;KACzD;IACD,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,EAAE,qBAAqB,CAAC,EAAE;QACnD,MAAM,IAAI,GAAG,CAAC,KAAK,qBAAqB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5E,IAAI,IAAI;YAAE,GAAG,GAAG,IAAA,0CAAqB,EAAC,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;KACrD;IACD,IAAI,WAAW,CAAC,IAAI,GAAG,CAAC;QAAE,GAAG,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC,GAAG,WAAW,CAAC,EAAE,iBAAiB,CAAC,CAAC;IAC1F,KAAK,MAAM,CAAC,IAAI,YAAY;QAAE,GAAG,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IAC3E,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG;QACX,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,eAAe,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,uBAAuB,CAAC;QAClF,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7F,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACnE,CAAC;AApHD,0DAoHC"}
|
|
@@ -9,8 +9,21 @@ export interface AngularProject {
|
|
|
9
9
|
}
|
|
10
10
|
/** project.json files under apps/ and libs/ (5 levels), as name → root. */
|
|
11
11
|
export declare function workspaceProjects(root: string): AngularProject[];
|
|
12
|
-
/**
|
|
12
|
+
/**
|
|
13
|
+
* Whether any source file of the project declares an NgModule the schematic still has work on.
|
|
14
|
+
* Two kinds do not count, because the schematic keeps them and a rerun would change nothing:
|
|
15
|
+
* - a root routing module (RouterModule.forRoot) of an app already on bootstrapApplication (the
|
|
16
|
+
* standalone-providers step turns it into provideRouter);
|
|
17
|
+
* - a module that only provides services (providers, no declarations or bootstrap).
|
|
18
|
+
*/
|
|
13
19
|
export declare function hasNgModules(root: string, project: AngularProject): boolean;
|
|
20
|
+
/** An NgModule file whose modules declare and bootstrap nothing but provide something. */
|
|
21
|
+
export declare function providersOnly(text: string): boolean;
|
|
22
|
+
/**
|
|
23
|
+
* The standalone-providers step on these apps: writes the changes, renames routing modules to
|
|
24
|
+
* routes files, and returns the files to tidy.
|
|
25
|
+
*/
|
|
26
|
+
export declare function runProvidersStep(root: string, apps: AngularProject[], angularMajor: number, say: (line: string) => void, log: (line: string) => void): string[];
|
|
14
27
|
/** Moves the CSP nonce side-effect import (and the comment right above it) to the top again. */
|
|
15
28
|
export declare function keepNonceImportFirst(text: string): string;
|
|
16
29
|
/**
|