@dsivd/prestations-ng 19.2.0-beta.2 → 19.2.0-beta.21
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/ANGULAR_SIGNALS.md +4 -0
- package/CHANGELOG.md +396 -0
- package/CONTRIBUTING.md +74 -4
- package/ESLINT_PLUGIN.md +103 -8
- package/GOOD_PRACTICES.md +731 -380
- package/INTRODUCTION_ANGULAR_SIGNALS.md +199 -154
- package/UPGRADING_V18.md +5 -5
- package/UPGRADING_V19.md +439 -18
- package/eslint/configs/spec-ts-recommended.mjs +34 -0
- package/eslint/configs/template-recommended.mjs +2 -0
- package/eslint/configs/template-rules.mjs +11 -2
- package/eslint/configs/ts-recommended.mjs +6 -0
- package/eslint/configs/ts-rules.mjs +6 -2
- package/eslint/form-reads.mjs +63 -0
- package/eslint/index.mjs +17 -0
- package/eslint/rules/index.mjs +4 -0
- package/eslint/rules/no-direct-signal-mutation.mjs +58 -20
- package/eslint/rules/no-item-track-in-form-list.mjs +99 -0
- package/eslint/rules/no-uninvoked-signal-in-template.mjs +8 -3
- package/eslint/rules/require-model-change.mjs +89 -0
- package/eslint/template-ast.mjs +12 -2
- package/fesm2022/dsivd-prestations-ng.mjs +2766 -2073
- package/fesm2022/dsivd-prestations-ng.mjs.map +1 -1
- package/package.json +1 -2
- package/schematics/migration-collection.json +5 -0
- package/schematics/ng-add/index.js +2 -4
- package/schematics/ng-update/migrations/update-13_2_0/index.js +7 -2
- package/schematics/ng-update/migrations/update-19_2_0/index.js +39 -0
- package/schematics/utility/add-allowed-common-js-dependencies.js +39 -29
- package/schematics/utility/form-signal/class-migration.js +396 -0
- package/schematics/utility/form-signal/edits.js +34 -0
- package/schematics/utility/form-signal/form-signal-migration.js +184 -0
- package/schematics/utility/form-signal/page-classes.js +129 -0
- package/schematics/utility/form-signal/template-migration.js +666 -0
- package/schematics/utility/remove-emit-decorator-metadata.js +8 -9
- package/src/eslint/configs/__tests__/configs.test.mjs +46 -2
- package/src/eslint/configs/spec-ts-recommended.mjs +34 -0
- package/src/eslint/configs/template-recommended.mjs +2 -0
- package/src/eslint/configs/template-rules.mjs +11 -2
- package/src/eslint/configs/ts-recommended.mjs +6 -0
- package/src/eslint/configs/ts-rules.mjs +6 -2
- package/src/eslint/form-reads.mjs +63 -0
- package/src/eslint/index.mjs +17 -0
- package/src/eslint/rules/__tests__/no-direct-signal-mutation.test.mjs +58 -0
- package/src/eslint/rules/__tests__/no-item-track-in-form-list.test.mjs +127 -0
- package/src/eslint/rules/__tests__/no-uninvoked-signal-in-template.test.mjs +6 -0
- package/src/eslint/rules/__tests__/require-model-change.test.mjs +93 -0
- package/src/eslint/rules/index.mjs +4 -0
- package/src/eslint/rules/no-direct-signal-mutation.mjs +58 -20
- package/src/eslint/rules/no-item-track-in-form-list.mjs +99 -0
- package/src/eslint/rules/no-uninvoked-signal-in-template.mjs +8 -3
- package/src/eslint/rules/require-model-change.mjs +89 -0
- package/src/eslint/template-ast.mjs +12 -2
- package/types/dsivd-prestations-ng.d.ts +652 -240
- package/dsivd-prestations-ng-19.2.0-beta.2.tgz +0 -0
|
@@ -0,0 +1,666 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.migrateTemplate = migrateTemplate;
|
|
4
|
+
const edits_1 = require("./edits");
|
|
5
|
+
const PAGE_MEMBERS = {
|
|
6
|
+
form: { nullable: true, root: 'form' },
|
|
7
|
+
reference: { nullable: false },
|
|
8
|
+
};
|
|
9
|
+
const DETAIL_PAGE_MEMBERS = Object.assign(Object.assign({}, PAGE_MEMBERS), { itemToEdit: { nullable: true, root: 'item' }, itemIndex: { nullable: false }, list: { nullable: false, root: 'list' } });
|
|
10
|
+
class Scope {
|
|
11
|
+
constructor(parent,
|
|
12
|
+
/** The `@for` blocks enclosing this scope, the innermost last */
|
|
13
|
+
loops,
|
|
14
|
+
/** Called when a name is read through the `@let` of a member */
|
|
15
|
+
onMemberRead) {
|
|
16
|
+
this.parent = parent;
|
|
17
|
+
this.loops = loops;
|
|
18
|
+
this.onMemberRead = onMemberRead;
|
|
19
|
+
this.names = new Map();
|
|
20
|
+
}
|
|
21
|
+
declare(name, binding) {
|
|
22
|
+
this.names.set(name, binding);
|
|
23
|
+
}
|
|
24
|
+
lookup(name) {
|
|
25
|
+
var _a, _b;
|
|
26
|
+
const binding = (_a = this.names.get(name)) !== null && _a !== void 0 ? _a : (_b = this.parent) === null || _b === void 0 ? void 0 : _b.lookup(name);
|
|
27
|
+
if (binding && 'member' in binding && binding.member) {
|
|
28
|
+
this.onMemberRead(binding.member);
|
|
29
|
+
}
|
|
30
|
+
return binding;
|
|
31
|
+
}
|
|
32
|
+
child(loops = this.loops) {
|
|
33
|
+
return new Scope(this, loops, this.onMemberRead);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Migrates the template of a page to its form held by a signal (prestations-ng 19.2.0):
|
|
38
|
+
*
|
|
39
|
+
* - `@let form = this.form();` is added at its top: the reads of `form` and their narrowing (`@if (form)`) are
|
|
40
|
+
* unchanged;
|
|
41
|
+
* - `[(model)]="form.address.street"` becomes
|
|
42
|
+
* `[model]="form.address.street" (modelChange)="patchForm(['address', 'street'], $event)"`, through the `@for`
|
|
43
|
+
* items and the `@if` aliases too (`['children', $index, 'firstName']`), and `(click)="form.a = 1"` becomes
|
|
44
|
+
* `patchForm(['a'], 1)`;
|
|
45
|
+
* - a `@for` whose rows edit its items is tracked by `$index` instead of its item, which a write replaces;
|
|
46
|
+
* - on a detail page, the same for `itemToEdit` (`patchItem()`, `setItem()`), `itemIndex` and `list`;
|
|
47
|
+
* - `this.form.a` → `this.form()!.a` (rare: `this` reads the member, not the `@let`).
|
|
48
|
+
*
|
|
49
|
+
* Running it again changes nothing.
|
|
50
|
+
*
|
|
51
|
+
* @param compiler `@angular/compiler`
|
|
52
|
+
* @param template the template
|
|
53
|
+
* @param url its path, for the messages
|
|
54
|
+
* @param options the kind of page
|
|
55
|
+
* @returns the migrated template, with what could not be migrated
|
|
56
|
+
*/
|
|
57
|
+
function migrateTemplate(compiler, template, url, options) {
|
|
58
|
+
var _a;
|
|
59
|
+
const migration = new TemplateMigration(compiler, template, options.detailPage ? DETAIL_PAGE_MEMBERS : PAGE_MEMBERS);
|
|
60
|
+
const parsed = compiler.parseTemplate(template, url, {
|
|
61
|
+
preserveWhitespaces: true,
|
|
62
|
+
preserveLineEndings: true,
|
|
63
|
+
});
|
|
64
|
+
if ((_a = parsed.errors) === null || _a === void 0 ? void 0 : _a.length) {
|
|
65
|
+
return {
|
|
66
|
+
content: template,
|
|
67
|
+
writes: 0,
|
|
68
|
+
tracks: 0,
|
|
69
|
+
warnings: [
|
|
70
|
+
{
|
|
71
|
+
offset: 0,
|
|
72
|
+
message: `template not migrated, it doesn't parse: ${parsed.errors[0].msg}`,
|
|
73
|
+
},
|
|
74
|
+
],
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
const shadowingReference = migration.findShadowingReference(parsed.nodes);
|
|
78
|
+
if (shadowingReference) {
|
|
79
|
+
return {
|
|
80
|
+
content: template,
|
|
81
|
+
writes: 0,
|
|
82
|
+
tracks: 0,
|
|
83
|
+
warnings: [
|
|
84
|
+
{
|
|
85
|
+
offset: 0,
|
|
86
|
+
message: `template not migrated: the reference #${shadowingReference} hides the member of the page`,
|
|
87
|
+
},
|
|
88
|
+
],
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
// A member already called in the template (`reference()`, migrated by hand) isn't read through a `@let`, which
|
|
92
|
+
// would hide the signal: its other reads are called too.
|
|
93
|
+
const probe = new TemplateMigration(compiler, template, migration.members);
|
|
94
|
+
probe.visitTemplate(parsed.nodes);
|
|
95
|
+
migration.calledMembers = probe.calledMembers;
|
|
96
|
+
migration.visitTemplate(parsed.nodes);
|
|
97
|
+
migration.fixTracks();
|
|
98
|
+
return {
|
|
99
|
+
content: (0, edits_1.applyEdits)(template, migration.edits),
|
|
100
|
+
writes: migration.writes,
|
|
101
|
+
tracks: migration.tracks,
|
|
102
|
+
warnings: migration.warnings,
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
class TemplateMigration {
|
|
106
|
+
constructor(ng, template, members) {
|
|
107
|
+
this.ng = ng;
|
|
108
|
+
this.template = template;
|
|
109
|
+
this.members = members;
|
|
110
|
+
this.edits = [];
|
|
111
|
+
this.warnings = [];
|
|
112
|
+
this.writes = 0;
|
|
113
|
+
this.tracks = 0;
|
|
114
|
+
/** The members called by the template (`reference()`): already signals there */
|
|
115
|
+
this.calledMembers = new Set();
|
|
116
|
+
this.editedLoops = new Set();
|
|
117
|
+
this.readMembers = new Set();
|
|
118
|
+
}
|
|
119
|
+
/**
|
|
120
|
+
* @returns the name of a reference (`#form`) hiding a member of the page, which would make the migration wrong
|
|
121
|
+
*/
|
|
122
|
+
findShadowingReference(nodes) {
|
|
123
|
+
for (const node of nodes) {
|
|
124
|
+
const references = node instanceof this.ng.TmplAstElement ||
|
|
125
|
+
node instanceof this.ng.TmplAstTemplate
|
|
126
|
+
? node.references
|
|
127
|
+
: [];
|
|
128
|
+
const shadowing = references.find((reference) => reference.name in this.members);
|
|
129
|
+
if (shadowing) {
|
|
130
|
+
return shadowing.name;
|
|
131
|
+
}
|
|
132
|
+
const found = this.findShadowingReference(this.childrenOf(node));
|
|
133
|
+
if (found) {
|
|
134
|
+
return found;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
return null;
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* Visits the template, its members read through a `@let` of the same name, added at its top when it reads them.
|
|
141
|
+
*/
|
|
142
|
+
visitTemplate(nodes) {
|
|
143
|
+
const scope = new Scope(null, [], (member) => this.readMembers.add(member));
|
|
144
|
+
for (const [name, member] of Object.entries(this.members)) {
|
|
145
|
+
if (this.calledMembers.has(name)) {
|
|
146
|
+
continue;
|
|
147
|
+
}
|
|
148
|
+
scope.declare(name, member.root
|
|
149
|
+
? {
|
|
150
|
+
kind: 'path',
|
|
151
|
+
resolved: {
|
|
152
|
+
root: member.root,
|
|
153
|
+
segments: [],
|
|
154
|
+
loops: [],
|
|
155
|
+
},
|
|
156
|
+
member: name,
|
|
157
|
+
}
|
|
158
|
+
: { kind: 'opaque', member: name });
|
|
159
|
+
}
|
|
160
|
+
const declared = new Set(nodes
|
|
161
|
+
.filter((node) => node instanceof this.ng.TmplAstLetDeclaration)
|
|
162
|
+
.map((declaration) => declaration.name));
|
|
163
|
+
this.visitNodes(nodes, scope);
|
|
164
|
+
const lets = Object.keys(this.members)
|
|
165
|
+
.filter((name) => this.readMembers.has(name) && !declared.has(name))
|
|
166
|
+
.map((name) => `@let ${name} = this.${name}();\n`);
|
|
167
|
+
if (lets.length) {
|
|
168
|
+
this.edits.push({ start: 0, end: 0, text: lets.join('') });
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
visitNodes(nodes, scope) {
|
|
172
|
+
for (const node of nodes) {
|
|
173
|
+
this.visitNode(node, scope);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* The `@for` blocks whose rows edit their item, tracked by the item itself: a write replaces the item, the row
|
|
178
|
+
* would be created again and lose the focus.
|
|
179
|
+
*/
|
|
180
|
+
fixTracks() {
|
|
181
|
+
for (const loop of this.editedLoops) {
|
|
182
|
+
let track = this.unwrap(loop.node.trackBy);
|
|
183
|
+
if (track instanceof this.ng.Call &&
|
|
184
|
+
this.isImplicitRead(track.receiver, '$any') &&
|
|
185
|
+
track.args.length === 1) {
|
|
186
|
+
track = track.args[0];
|
|
187
|
+
}
|
|
188
|
+
if (this.isImplicitRead(track, loop.node.item.name)) {
|
|
189
|
+
const span = this.unwrap(loop.node.trackBy).sourceSpan;
|
|
190
|
+
this.edits.push({
|
|
191
|
+
start: span.start,
|
|
192
|
+
end: span.end,
|
|
193
|
+
text: '$index',
|
|
194
|
+
});
|
|
195
|
+
this.tracks++;
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
visitNode(node, scope) {
|
|
200
|
+
const ng = this.ng;
|
|
201
|
+
if (node instanceof ng.TmplAstElement) {
|
|
202
|
+
this.visitBindings(node.inputs, node.outputs, scope);
|
|
203
|
+
this.visitNodes(node.children, scope.child());
|
|
204
|
+
}
|
|
205
|
+
else if (node instanceof ng.TmplAstTemplate) {
|
|
206
|
+
this.visitBindings([
|
|
207
|
+
...node.templateAttrs.filter((attribute) => attribute instanceof ng.TmplAstBoundAttribute),
|
|
208
|
+
...node.inputs,
|
|
209
|
+
], node.outputs, scope);
|
|
210
|
+
const childScope = scope.child();
|
|
211
|
+
// *ngFor="let child of form.children": not migrated, its rows would be written through @for only
|
|
212
|
+
const ngForOf = node.templateAttrs.find((attribute) => attribute instanceof ng.TmplAstBoundAttribute &&
|
|
213
|
+
attribute.name === 'ngForOf');
|
|
214
|
+
const ngForOfForm = !!ngForOf && !!this.resolve(ngForOf.value, scope);
|
|
215
|
+
node.variables.forEach((variable) => childScope.declare(variable.name, {
|
|
216
|
+
kind: 'opaque',
|
|
217
|
+
ngForOfForm: ngForOfForm && variable.value === '$implicit',
|
|
218
|
+
}));
|
|
219
|
+
this.visitNodes(node.children, childScope);
|
|
220
|
+
}
|
|
221
|
+
else if (node instanceof ng.TmplAstBoundText) {
|
|
222
|
+
this.visitExpression(node.value, scope);
|
|
223
|
+
}
|
|
224
|
+
else if (node instanceof ng.TmplAstIfBlock) {
|
|
225
|
+
node.branches.forEach((branch) => this.visitIfBranch(branch, scope));
|
|
226
|
+
}
|
|
227
|
+
else if (node instanceof ng.TmplAstForLoopBlock) {
|
|
228
|
+
this.visitForLoop(node, scope);
|
|
229
|
+
}
|
|
230
|
+
else if (node instanceof ng.TmplAstSwitchBlock) {
|
|
231
|
+
this.visitExpression(node.expression, scope);
|
|
232
|
+
this.switchGroups(node).forEach((group) => {
|
|
233
|
+
group.cases.forEach((switchCase) => {
|
|
234
|
+
if (switchCase.expression) {
|
|
235
|
+
this.visitExpression(switchCase.expression, scope);
|
|
236
|
+
}
|
|
237
|
+
});
|
|
238
|
+
this.visitNodes(group.children, scope.child());
|
|
239
|
+
});
|
|
240
|
+
}
|
|
241
|
+
else if (node instanceof ng.TmplAstDeferredBlock) {
|
|
242
|
+
this.visitNodes(node.children, scope.child());
|
|
243
|
+
[node.placeholder, node.loading, node.error].forEach((block) => {
|
|
244
|
+
if (block) {
|
|
245
|
+
this.visitNodes(block.children, scope.child());
|
|
246
|
+
}
|
|
247
|
+
});
|
|
248
|
+
}
|
|
249
|
+
else if (node instanceof ng.TmplAstLetDeclaration) {
|
|
250
|
+
this.visitExpression(node.value, scope);
|
|
251
|
+
scope.declare(node.name, {
|
|
252
|
+
kind: 'path',
|
|
253
|
+
resolved: this.resolve(node.value, scope),
|
|
254
|
+
});
|
|
255
|
+
}
|
|
256
|
+
else {
|
|
257
|
+
this.visitNodes(this.childrenOf(node), scope.child());
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
childrenOf(node) {
|
|
261
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
262
|
+
const ng = this.ng;
|
|
263
|
+
if (node instanceof ng.TmplAstIfBlock) {
|
|
264
|
+
return node.branches.flatMap((branch) => branch.children);
|
|
265
|
+
}
|
|
266
|
+
if (node instanceof ng.TmplAstForLoopBlock) {
|
|
267
|
+
return [...node.children, ...((_b = (_a = node.empty) === null || _a === void 0 ? void 0 : _a.children) !== null && _b !== void 0 ? _b : [])];
|
|
268
|
+
}
|
|
269
|
+
if (node instanceof ng.TmplAstSwitchBlock) {
|
|
270
|
+
return this.switchGroups(node).flatMap((group) => group.children);
|
|
271
|
+
}
|
|
272
|
+
if (node instanceof ng.TmplAstDeferredBlock) {
|
|
273
|
+
return [
|
|
274
|
+
...node.children,
|
|
275
|
+
...((_d = (_c = node.placeholder) === null || _c === void 0 ? void 0 : _c.children) !== null && _d !== void 0 ? _d : []),
|
|
276
|
+
...((_f = (_e = node.loading) === null || _e === void 0 ? void 0 : _e.children) !== null && _f !== void 0 ? _f : []),
|
|
277
|
+
...((_h = (_g = node.error) === null || _g === void 0 ? void 0 : _g.children) !== null && _h !== void 0 ? _h : []),
|
|
278
|
+
];
|
|
279
|
+
}
|
|
280
|
+
const children = node.children;
|
|
281
|
+
return Array.isArray(children) ? children : [];
|
|
282
|
+
}
|
|
283
|
+
/**
|
|
284
|
+
* The cases of a `@switch` with their content: grouped since Angular 21.1 (several `@case` sharing a content),
|
|
285
|
+
* a content per case before.
|
|
286
|
+
*/
|
|
287
|
+
switchGroups(node) {
|
|
288
|
+
var _a, _b;
|
|
289
|
+
const shape = node;
|
|
290
|
+
return ((_a = shape.groups) !== null && _a !== void 0 ? _a : ((_b = shape.cases) !== null && _b !== void 0 ? _b : []).map((switchCase) => ({
|
|
291
|
+
cases: [switchCase],
|
|
292
|
+
children: switchCase.children,
|
|
293
|
+
})));
|
|
294
|
+
}
|
|
295
|
+
visitIfBranch(branch, scope) {
|
|
296
|
+
const childScope = scope.child();
|
|
297
|
+
if (branch.expression) {
|
|
298
|
+
this.visitExpression(branch.expression, scope);
|
|
299
|
+
if (branch.expressionAlias) {
|
|
300
|
+
childScope.declare(branch.expressionAlias.name, {
|
|
301
|
+
kind: 'path',
|
|
302
|
+
resolved: this.resolve(branch.expression, scope),
|
|
303
|
+
});
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
this.visitNodes(branch.children, childScope);
|
|
307
|
+
}
|
|
308
|
+
visitForLoop(node, scope) {
|
|
309
|
+
var _a, _b;
|
|
310
|
+
this.visitExpression(node.expression, scope);
|
|
311
|
+
const loop = {
|
|
312
|
+
node,
|
|
313
|
+
iterable: this.resolve(node.expression, scope),
|
|
314
|
+
indexAlias: (_b = (_a = node.contextVariables.find((variable) => variable.value === '$index' &&
|
|
315
|
+
variable.name !== '$index')) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : null,
|
|
316
|
+
generatedAlias: null,
|
|
317
|
+
};
|
|
318
|
+
const childScope = scope.child([...scope.loops, loop]);
|
|
319
|
+
childScope.declare(node.item.name, { kind: 'item', loop });
|
|
320
|
+
node.contextVariables
|
|
321
|
+
.filter((variable) => !variable.name.startsWith('$'))
|
|
322
|
+
.forEach((variable) => childScope.declare(variable.name, { kind: 'opaque' }));
|
|
323
|
+
this.visitExpression(node.trackBy, childScope);
|
|
324
|
+
this.visitNodes(node.children, childScope);
|
|
325
|
+
if (node.empty) {
|
|
326
|
+
this.visitNodes(node.empty.children, scope.child());
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
visitBindings(inputs, outputs, scope) {
|
|
330
|
+
var _a;
|
|
331
|
+
const ng = this.ng;
|
|
332
|
+
for (const input of inputs) {
|
|
333
|
+
if (input.type === ng.BindingType.TwoWay) {
|
|
334
|
+
this.visitTwoWayBinding(input, scope);
|
|
335
|
+
}
|
|
336
|
+
else if (input.value) {
|
|
337
|
+
this.visitExpression(input.value, scope);
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
for (const output of outputs) {
|
|
341
|
+
// The handler of a two-way binding is its input: already migrated
|
|
342
|
+
if (output.type !== ng.ParsedEventType.TwoWay) {
|
|
343
|
+
this.visitExpression(output.handler, scope, this.quoteBefore((_a = output.handlerSpan) === null || _a === void 0 ? void 0 : _a.start.offset));
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
/**
|
|
348
|
+
* `[(model)]="form.a"` → `[model]="form.a" (modelChange)="patchForm(['a'], $event)"`
|
|
349
|
+
*/
|
|
350
|
+
visitTwoWayBinding(input, scope) {
|
|
351
|
+
const resolved = this.resolve(input.value, scope);
|
|
352
|
+
const quote = this.quoteOf(input);
|
|
353
|
+
const handler = resolved && this.writeCall(resolved, '$event', quote, scope);
|
|
354
|
+
if (!resolved || !handler) {
|
|
355
|
+
const root = this.rootBinding(input.value, scope);
|
|
356
|
+
if ((root === null || root === void 0 ? void 0 : root.kind) === 'opaque' && root.ngForOfForm) {
|
|
357
|
+
this.warn(input.sourceSpan.start.offset, `two-way binding not migrated, in a *ngFor over the form: migrate the *ngFor to @for ` +
|
|
358
|
+
`(ng generate @angular/core:control-flow), then run this migration again: ${this.textOf(input.value)}`);
|
|
359
|
+
}
|
|
360
|
+
else if (this.readsMember(input.value, scope)) {
|
|
361
|
+
this.warn(input.sourceSpan.start.offset, `two-way binding not migrated, its target is not a path of the form: ${this.textOf(input.value)}`);
|
|
362
|
+
}
|
|
363
|
+
this.visitExpression(input.value, scope);
|
|
364
|
+
return;
|
|
365
|
+
}
|
|
366
|
+
const value = this.rewrittenText(input.value, scope);
|
|
367
|
+
this.edits.push({
|
|
368
|
+
start: input.sourceSpan.start.offset,
|
|
369
|
+
end: input.sourceSpan.end.offset,
|
|
370
|
+
text: `[${input.name}]=${quote}${value}${quote} (${input.name}Change)=${quote}${handler}${quote}`,
|
|
371
|
+
});
|
|
372
|
+
resolved.loops.forEach((loop) => this.editedLoops.add(loop));
|
|
373
|
+
this.writes++;
|
|
374
|
+
}
|
|
375
|
+
/**
|
|
376
|
+
* The call writing a value at a path, `null` when it can't be written (a list not indexed by `itemIndex`).
|
|
377
|
+
*/
|
|
378
|
+
writeCall(resolved, value, quote, scope) {
|
|
379
|
+
const innerQuote = quote === "'" ? '"' : "'";
|
|
380
|
+
const segments = resolved.segments.map((segment) => {
|
|
381
|
+
if (typeof segment !== 'string') {
|
|
382
|
+
return this.indexOf(segment, scope);
|
|
383
|
+
}
|
|
384
|
+
return segment.startsWith("'")
|
|
385
|
+
? `${innerQuote}${segment.slice(1, -1)}${innerQuote}`
|
|
386
|
+
: segment;
|
|
387
|
+
});
|
|
388
|
+
if (resolved.root === 'list') {
|
|
389
|
+
if (segments[0] !== 'itemIndex' && segments[0] !== 'itemIndex()') {
|
|
390
|
+
return null;
|
|
391
|
+
}
|
|
392
|
+
segments.shift();
|
|
393
|
+
return segments.length
|
|
394
|
+
? `patchItem([${segments.join(', ')}], ${value})`
|
|
395
|
+
: `setItem(${value})`;
|
|
396
|
+
}
|
|
397
|
+
if (resolved.root === 'item') {
|
|
398
|
+
return segments.length
|
|
399
|
+
? `patchItem([${segments.join(', ')}], ${value})`
|
|
400
|
+
: `setItem(${value})`;
|
|
401
|
+
}
|
|
402
|
+
return segments.length
|
|
403
|
+
? `patchForm([${segments.join(', ')}], ${value})`
|
|
404
|
+
: `form.set(${value})`;
|
|
405
|
+
}
|
|
406
|
+
/**
|
|
407
|
+
* Rewrites the reads of the members in an expression, and its assignments to the form.
|
|
408
|
+
*
|
|
409
|
+
* @param quote the quote of the attribute holding the expression: the strings written are quoted with the other one
|
|
410
|
+
*/
|
|
411
|
+
visitExpression(expression, scope, quote = '"') {
|
|
412
|
+
this.edits.push(...this.expressionEdits(expression, scope, quote));
|
|
413
|
+
}
|
|
414
|
+
expressionEdits(expression, scope, quote = '"') {
|
|
415
|
+
const edits = [];
|
|
416
|
+
const walk = (node, parent) => {
|
|
417
|
+
const ng = this.ng;
|
|
418
|
+
if (node instanceof ng.Binary &&
|
|
419
|
+
ng.Binary.isAssignmentOperation(node.operation)) {
|
|
420
|
+
const resolved = this.resolve(node.left, scope);
|
|
421
|
+
if (resolved) {
|
|
422
|
+
const call = node.operation === '='
|
|
423
|
+
? this.writeCall(resolved, this.rewrittenText(node.right, scope), quote, scope)
|
|
424
|
+
: null;
|
|
425
|
+
if (call) {
|
|
426
|
+
edits.push({
|
|
427
|
+
start: node.sourceSpan.start,
|
|
428
|
+
end: node.sourceSpan.end,
|
|
429
|
+
text: call,
|
|
430
|
+
});
|
|
431
|
+
resolved.loops.forEach((loop) => this.editedLoops.add(loop));
|
|
432
|
+
this.writes++;
|
|
433
|
+
return;
|
|
434
|
+
}
|
|
435
|
+
this.warn(node.sourceSpan.start, `assignment not migrated: ${this.template.slice(node.sourceSpan.start, node.sourceSpan.end)}`);
|
|
436
|
+
}
|
|
437
|
+
}
|
|
438
|
+
if ((node instanceof ng.Call || node instanceof ng.SafeCall) &&
|
|
439
|
+
node.args.length === 0 &&
|
|
440
|
+
node.receiver instanceof ng.PropertyRead &&
|
|
441
|
+
node.receiver.receiver instanceof ng.ImplicitReceiver &&
|
|
442
|
+
!(node.receiver.receiver instanceof ng.ThisReceiver) &&
|
|
443
|
+
node.receiver.name in this.members) {
|
|
444
|
+
this.calledMembers.add(node.receiver.name);
|
|
445
|
+
}
|
|
446
|
+
const read = this.unshadowedMember(node, scope);
|
|
447
|
+
if (read && !this.isCallReceiver(node, parent)) {
|
|
448
|
+
const throughMember = read.member.nullable &&
|
|
449
|
+
(parent instanceof ng.PropertyRead ||
|
|
450
|
+
parent instanceof ng.KeyedRead) &&
|
|
451
|
+
parent.receiver === node;
|
|
452
|
+
edits.push({
|
|
453
|
+
start: node.sourceSpan.end,
|
|
454
|
+
end: node.sourceSpan.end,
|
|
455
|
+
text: throughMember ? '()!' : '()',
|
|
456
|
+
});
|
|
457
|
+
return;
|
|
458
|
+
}
|
|
459
|
+
this.childrenOfExpression(node).forEach((child) => walk(child, node));
|
|
460
|
+
};
|
|
461
|
+
if (expression) {
|
|
462
|
+
walk(expression, null);
|
|
463
|
+
}
|
|
464
|
+
return edits;
|
|
465
|
+
}
|
|
466
|
+
/**
|
|
467
|
+
* The code of an expression with the reads of the members rewritten.
|
|
468
|
+
*/
|
|
469
|
+
rewrittenText(expression, scope) {
|
|
470
|
+
const node = this.unwrap(expression);
|
|
471
|
+
const start = node.sourceSpan.start;
|
|
472
|
+
const edits = this.expressionEdits(node, scope).map((edit) => (Object.assign(Object.assign({}, edit), { start: edit.start - start, end: edit.end - start })));
|
|
473
|
+
return (0, edits_1.applyEdits)(this.template.slice(start, node.sourceSpan.end), edits);
|
|
474
|
+
}
|
|
475
|
+
/**
|
|
476
|
+
* Where an expression reads its value from, `null` when it is not a path of the form (a call, a pipe...).
|
|
477
|
+
*/
|
|
478
|
+
resolve(expression, scope) {
|
|
479
|
+
const ng = this.ng;
|
|
480
|
+
const node = expression && this.unwrap(expression);
|
|
481
|
+
if (!node) {
|
|
482
|
+
return null;
|
|
483
|
+
}
|
|
484
|
+
if (node instanceof ng.NonNullAssert) {
|
|
485
|
+
return this.resolve(node.expression, scope);
|
|
486
|
+
}
|
|
487
|
+
if ((node instanceof ng.Call || node instanceof ng.SafeCall) &&
|
|
488
|
+
node.args.length === 0) {
|
|
489
|
+
// form(): already migrated
|
|
490
|
+
const called = this.unshadowedMember(node.receiver, scope);
|
|
491
|
+
return (called === null || called === void 0 ? void 0 : called.member.root)
|
|
492
|
+
? { root: called.member.root, segments: [], loops: [] }
|
|
493
|
+
: null;
|
|
494
|
+
}
|
|
495
|
+
if (node instanceof ng.PropertyRead ||
|
|
496
|
+
node instanceof ng.SafePropertyRead) {
|
|
497
|
+
if (this.isImplicit(node.receiver)) {
|
|
498
|
+
return this.resolveName(node.name, scope);
|
|
499
|
+
}
|
|
500
|
+
const receiver = this.resolve(node.receiver, scope);
|
|
501
|
+
return (receiver && Object.assign(Object.assign({}, receiver), { segments: [...receiver.segments, `'${node.name}'`] }));
|
|
502
|
+
}
|
|
503
|
+
if (node instanceof ng.KeyedRead || node instanceof ng.SafeKeyedRead) {
|
|
504
|
+
const receiver = this.resolve(node.receiver, scope);
|
|
505
|
+
return (receiver && Object.assign(Object.assign({}, receiver), { segments: [
|
|
506
|
+
...receiver.segments,
|
|
507
|
+
this.rewrittenText(node.key, scope),
|
|
508
|
+
] }));
|
|
509
|
+
}
|
|
510
|
+
return null;
|
|
511
|
+
}
|
|
512
|
+
resolveName(name, scope) {
|
|
513
|
+
var _a;
|
|
514
|
+
const binding = scope.lookup(name);
|
|
515
|
+
if ((binding === null || binding === void 0 ? void 0 : binding.kind) === 'path') {
|
|
516
|
+
return binding.resolved;
|
|
517
|
+
}
|
|
518
|
+
if ((binding === null || binding === void 0 ? void 0 : binding.kind) === 'item') {
|
|
519
|
+
const iterable = binding.loop.iterable;
|
|
520
|
+
return (iterable && {
|
|
521
|
+
root: iterable.root,
|
|
522
|
+
segments: [...iterable.segments, binding.loop],
|
|
523
|
+
loops: [...iterable.loops, binding.loop],
|
|
524
|
+
});
|
|
525
|
+
}
|
|
526
|
+
if (binding) {
|
|
527
|
+
return null;
|
|
528
|
+
}
|
|
529
|
+
const root = (_a = this.members[name]) === null || _a === void 0 ? void 0 : _a.root;
|
|
530
|
+
return root ? { root, segments: [], loops: [] } : null;
|
|
531
|
+
}
|
|
532
|
+
/**
|
|
533
|
+
* The code of the index of a `@for` block, where the scope is: `$index` in its own rows, a variable of its header
|
|
534
|
+
* in a nested block (added when it has none).
|
|
535
|
+
*/
|
|
536
|
+
indexOf(loop, scope) {
|
|
537
|
+
if (scope.loops[scope.loops.length - 1] === loop) {
|
|
538
|
+
return '$index';
|
|
539
|
+
}
|
|
540
|
+
if (loop.indexAlias) {
|
|
541
|
+
return loop.indexAlias;
|
|
542
|
+
}
|
|
543
|
+
if (!loop.generatedAlias) {
|
|
544
|
+
loop.generatedAlias = `${loop.node.item.name}Index`;
|
|
545
|
+
const header = this.template.slice(loop.node.startSourceSpan.start.offset, loop.node.startSourceSpan.end.offset);
|
|
546
|
+
const closingParenthesis = loop.node.startSourceSpan.start.offset +
|
|
547
|
+
header.lastIndexOf(')');
|
|
548
|
+
this.edits.push({
|
|
549
|
+
start: closingParenthesis,
|
|
550
|
+
end: closingParenthesis,
|
|
551
|
+
text: `; let ${loop.generatedAlias} = $index`,
|
|
552
|
+
});
|
|
553
|
+
}
|
|
554
|
+
return loop.generatedAlias;
|
|
555
|
+
}
|
|
556
|
+
/**
|
|
557
|
+
* A read of a member which became a signal (`form`, `this.form`), not hidden by a variable of the template.
|
|
558
|
+
*/
|
|
559
|
+
unshadowedMember(node, scope) {
|
|
560
|
+
const ng = this.ng;
|
|
561
|
+
if (!(node instanceof ng.PropertyRead) ||
|
|
562
|
+
!this.isImplicit(node.receiver)) {
|
|
563
|
+
return null;
|
|
564
|
+
}
|
|
565
|
+
const member = this.members[node.name];
|
|
566
|
+
const shadowed = !(node.receiver instanceof ng.ThisReceiver) &&
|
|
567
|
+
scope.lookup(node.name) !== undefined;
|
|
568
|
+
return member && !shadowed ? { name: node.name, member } : null;
|
|
569
|
+
}
|
|
570
|
+
/**
|
|
571
|
+
* The binding of the name an expression is read from (`child` for `child.firstName`).
|
|
572
|
+
*/
|
|
573
|
+
rootBinding(expression, scope) {
|
|
574
|
+
let node = this.unwrap(expression);
|
|
575
|
+
while ((node instanceof this.ng.PropertyRead ||
|
|
576
|
+
node instanceof this.ng.SafePropertyRead ||
|
|
577
|
+
node instanceof this.ng.KeyedRead ||
|
|
578
|
+
node instanceof this.ng.SafeKeyedRead) &&
|
|
579
|
+
!this.isImplicit(node.receiver)) {
|
|
580
|
+
node = node.receiver;
|
|
581
|
+
}
|
|
582
|
+
return node instanceof this.ng.PropertyRead &&
|
|
583
|
+
this.isImplicit(node.receiver)
|
|
584
|
+
? scope.lookup(node.name)
|
|
585
|
+
: undefined;
|
|
586
|
+
}
|
|
587
|
+
/**
|
|
588
|
+
* Whether an expression reads a member which became a signal, through its `@let` or `this`.
|
|
589
|
+
*/
|
|
590
|
+
readsMember(expression, scope) {
|
|
591
|
+
let found = false;
|
|
592
|
+
const walk = (node) => {
|
|
593
|
+
if (node instanceof this.ng.PropertyRead &&
|
|
594
|
+
this.isImplicit(node.receiver)) {
|
|
595
|
+
const binding = node.receiver instanceof this.ng.ThisReceiver
|
|
596
|
+
? undefined
|
|
597
|
+
: scope.lookup(node.name);
|
|
598
|
+
if ((binding && 'member' in binding && binding.member) ||
|
|
599
|
+
(node.receiver instanceof this.ng.ThisReceiver &&
|
|
600
|
+
node.name in this.members)) {
|
|
601
|
+
found = true;
|
|
602
|
+
}
|
|
603
|
+
}
|
|
604
|
+
this.childrenOfExpression(node).forEach(walk);
|
|
605
|
+
};
|
|
606
|
+
walk(expression);
|
|
607
|
+
return found;
|
|
608
|
+
}
|
|
609
|
+
isCallReceiver(node, parent) {
|
|
610
|
+
const ng = this.ng;
|
|
611
|
+
return ((parent instanceof ng.Call || parent instanceof ng.SafeCall) &&
|
|
612
|
+
parent.receiver === node);
|
|
613
|
+
}
|
|
614
|
+
/**
|
|
615
|
+
* `form` or `this.form`: `ThisReceiver` doesn't extend `ImplicitReceiver` since Angular 21.
|
|
616
|
+
*/
|
|
617
|
+
isImplicit(node) {
|
|
618
|
+
return (node instanceof this.ng.ImplicitReceiver ||
|
|
619
|
+
node instanceof this.ng.ThisReceiver);
|
|
620
|
+
}
|
|
621
|
+
isImplicitRead(node, name) {
|
|
622
|
+
return (node instanceof this.ng.PropertyRead &&
|
|
623
|
+
this.isImplicit(node.receiver) &&
|
|
624
|
+
node.name === name);
|
|
625
|
+
}
|
|
626
|
+
unwrap(node) {
|
|
627
|
+
return node instanceof this.ng.ASTWithSource && node.ast
|
|
628
|
+
? node.ast
|
|
629
|
+
: node;
|
|
630
|
+
}
|
|
631
|
+
childrenOfExpression(node) {
|
|
632
|
+
const children = [];
|
|
633
|
+
for (const value of Object.values(node)) {
|
|
634
|
+
if (value instanceof this.ng.AST) {
|
|
635
|
+
children.push(value);
|
|
636
|
+
}
|
|
637
|
+
else if (Array.isArray(value)) {
|
|
638
|
+
children.push(...value.filter((item) => item instanceof this.ng.AST));
|
|
639
|
+
}
|
|
640
|
+
}
|
|
641
|
+
return children;
|
|
642
|
+
}
|
|
643
|
+
textOf(expression) {
|
|
644
|
+
const node = this.unwrap(expression);
|
|
645
|
+
return this.template.slice(node.sourceSpan.start, node.sourceSpan.end);
|
|
646
|
+
}
|
|
647
|
+
/**
|
|
648
|
+
* The quote of the value of an attribute, `"` by default.
|
|
649
|
+
*/
|
|
650
|
+
quoteOf(input) {
|
|
651
|
+
var _a;
|
|
652
|
+
return this.quoteBefore((_a = input.valueSpan) === null || _a === void 0 ? void 0 : _a.start.offset);
|
|
653
|
+
}
|
|
654
|
+
/**
|
|
655
|
+
* The quote opening the value of an attribute starting at an offset, `"` by default. Not a quote inside the value:
|
|
656
|
+
* `(click)="mode === 'A' ? reset() : form.a = 1"` is quoted with `"`.
|
|
657
|
+
*/
|
|
658
|
+
quoteBefore(offset) {
|
|
659
|
+
const char = offset === undefined ? undefined : this.template[offset - 1];
|
|
660
|
+
return char === "'" ? "'" : '"';
|
|
661
|
+
}
|
|
662
|
+
warn(offset, message) {
|
|
663
|
+
this.warnings.push({ offset, message });
|
|
664
|
+
}
|
|
665
|
+
}
|
|
666
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"template-migration.js","sourceRoot":"","sources":["../../../../../projects/prestations-ng/schematics/utility/form-signal/template-migration.ts"],"names":[],"mappings":"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"}
|