@dsivd/prestations-ng 19.2.0-beta.3 → 19.2.0-beta.30
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/AI_GUIDELINES.md +152 -0
- package/ANGULAR_SIGNALS.md +6 -2
- package/CHANGELOG.md +476 -0
- package/CONTRIBUTING.md +128 -8
- package/ESLINT_PLUGIN.md +262 -30
- package/GOOD_PRACTICES.md +983 -388
- package/INTRODUCTION_ANGULAR_SIGNALS.md +227 -155
- package/README.md +22 -12
- package/UPGRADING_V18.md +5 -5
- package/UPGRADING_V19.md +636 -19
- package/eslint/configs/spec-ts-recommended.mjs +34 -0
- package/eslint/configs/template-recommended.mjs +2 -0
- package/eslint/configs/template-rules.mjs +14 -2
- package/eslint/configs/ts-recommended.mjs +11 -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 +6 -0
- package/eslint/rules/no-direct-signal-mutation.mjs +162 -41
- package/eslint/rules/no-item-track-in-form-list.mjs +173 -0
- package/eslint/rules/no-uninvoked-signal-in-template.mjs +8 -3
- package/eslint/rules/require-model-change.mjs +89 -0
- package/eslint/rules/require-track-index.mjs +162 -0
- package/eslint/signal-names.mjs +127 -21
- package/eslint/template-ast.mjs +12 -2
- package/fesm2022/dsivd-prestations-ng.mjs +2889 -2061
- 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 +52 -0
- package/schematics/utility/add-allowed-common-js-dependencies.js +39 -29
- package/schematics/utility/form-signal/class-migration.js +795 -0
- package/schematics/utility/form-signal/edits.js +34 -0
- package/schematics/utility/form-signal/form-members.js +318 -0
- package/schematics/utility/form-signal/form-signal-migration.js +134 -0
- package/schematics/utility/form-signal/page-classes.js +139 -0
- package/schematics/utility/form-signal/template-migration.js +775 -0
- package/schematics/utility/never-connected-migration.js +87 -0
- package/schematics/utility/remove-emit-decorator-metadata.js +8 -9
- package/schematics/utility/typescript-files.js +95 -0
- package/src/eslint/configs/__tests__/configs.test.mjs +61 -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 +14 -2
- package/src/eslint/configs/ts-recommended.mjs +11 -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 +200 -0
- package/src/eslint/rules/__tests__/no-item-track-in-form-list.test.mjs +234 -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/__tests__/require-track-index.test.mjs +106 -0
- package/src/eslint/rules/index.mjs +6 -0
- package/src/eslint/rules/no-direct-signal-mutation.mjs +162 -41
- package/src/eslint/rules/no-item-track-in-form-list.mjs +173 -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/rules/require-track-index.mjs +162 -0
- package/src/eslint/signal-names.mjs +127 -21
- package/src/eslint/template-ast.mjs +12 -2
- package/types/dsivd-prestations-ng.d.ts +719 -243
- package/dsivd-prestations-ng-19.2.0-beta.3.tgz +0 -0
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.applyEdits = applyEdits;
|
|
4
|
+
exports.lineOf = lineOf;
|
|
5
|
+
/**
|
|
6
|
+
* Applies edits to a text. Two edits never overlap: an edit inside another one is ignored (the outer one already
|
|
7
|
+
* holds the rewritten text).
|
|
8
|
+
*
|
|
9
|
+
* @param text the original text
|
|
10
|
+
* @param edits the edits, in any order
|
|
11
|
+
* @returns the text with the edits applied
|
|
12
|
+
*/
|
|
13
|
+
function applyEdits(text, edits) {
|
|
14
|
+
const sorted = [...edits].sort((a, b) => a.start - b.start || b.end - a.end);
|
|
15
|
+
let result = '';
|
|
16
|
+
let position = 0;
|
|
17
|
+
for (const edit of sorted) {
|
|
18
|
+
if (edit.start < position) {
|
|
19
|
+
continue;
|
|
20
|
+
}
|
|
21
|
+
result += text.slice(position, edit.start) + edit.text;
|
|
22
|
+
position = edit.end;
|
|
23
|
+
}
|
|
24
|
+
return result + text.slice(position);
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* @param text a text
|
|
28
|
+
* @param offset an offset in it
|
|
29
|
+
* @returns the line of the offset, from 1
|
|
30
|
+
*/
|
|
31
|
+
function lineOf(text, offset) {
|
|
32
|
+
return text.slice(0, offset).split('\n').length;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWRpdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9wcmVzdGF0aW9ucy1uZy9zY2hlbWF0aWNzL3V0aWxpdHkvZm9ybS1zaWduYWwvZWRpdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUEwQkEsZ0NBY0M7QUFPRCx3QkFFQztBQS9CRDs7Ozs7OztHQU9HO0FBQ0gsU0FBZ0IsVUFBVSxDQUFDLElBQVksRUFBRSxLQUFzQjtJQUMzRCxNQUFNLE1BQU0sR0FBRyxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsSUFBSSxDQUMxQixDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLEtBQUssSUFBSSxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQy9DLENBQUM7SUFDRixJQUFJLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFDaEIsSUFBSSxRQUFRLEdBQUcsQ0FBQyxDQUFDO0lBQ2pCLEtBQUssTUFBTSxJQUFJLElBQUksTUFBTSxFQUFFLENBQUM7UUFDeEIsSUFBSSxJQUFJLENBQUMsS0FBSyxHQUFHLFFBQVEsRUFBRSxDQUFDO1lBQ3hCLFNBQVM7UUFDYixDQUFDO1FBQ0QsTUFBTSxJQUFJLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBQ3ZELFFBQVEsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDO0lBQ3hCLENBQUM7SUFDRCxPQUFPLE1BQU0sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQ3pDLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsU0FBZ0IsTUFBTSxDQUFDLElBQVksRUFBRSxNQUFjO0lBQy9DLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQU0sQ0FBQztBQUNwRCxDQUFDIn0=
|
|
@@ -0,0 +1,318 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formMembersOf = formMembersOf;
|
|
4
|
+
exports.formReadOfEffect = formReadOfEffect;
|
|
5
|
+
const ts = require("typescript");
|
|
6
|
+
const FORM = 'form';
|
|
7
|
+
const WRITTEN_SIGNALS = new Set(['form', 'reference']);
|
|
8
|
+
const SIGNAL_WRITES = new Set(['set', 'update']);
|
|
9
|
+
const PAGE_WRITES = new Set([
|
|
10
|
+
'patchForm',
|
|
11
|
+
'patchItem',
|
|
12
|
+
'updateItem',
|
|
13
|
+
'setItem',
|
|
14
|
+
]);
|
|
15
|
+
const MUTATORS = new Set([
|
|
16
|
+
'push',
|
|
17
|
+
'unshift',
|
|
18
|
+
'splice',
|
|
19
|
+
'pop',
|
|
20
|
+
'shift',
|
|
21
|
+
'sort',
|
|
22
|
+
'reverse',
|
|
23
|
+
'fill',
|
|
24
|
+
'copyWithin',
|
|
25
|
+
]);
|
|
26
|
+
/**
|
|
27
|
+
* @param chain the classes of the page in the project, the page first
|
|
28
|
+
*/
|
|
29
|
+
function formMembersOf(chain) {
|
|
30
|
+
const members = ownMembers(chain);
|
|
31
|
+
const getters = new Map();
|
|
32
|
+
const functions = new Map();
|
|
33
|
+
for (const [name, member] of members) {
|
|
34
|
+
if (ts.isGetAccessorDeclaration(member)) {
|
|
35
|
+
getters.set(name, member);
|
|
36
|
+
}
|
|
37
|
+
if ((ts.isGetAccessorDeclaration(member) ||
|
|
38
|
+
ts.isMethodDeclaration(member)) &&
|
|
39
|
+
member.body) {
|
|
40
|
+
functions.set(name, member);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
// A getter returning a path of the form, or of another such getter (`get motif() { return this.step.motif; }`)
|
|
44
|
+
const aliases = new Map();
|
|
45
|
+
let added = true;
|
|
46
|
+
while (added) {
|
|
47
|
+
added = false;
|
|
48
|
+
for (const [name, getter] of getters) {
|
|
49
|
+
if (aliases.has(name)) {
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
const path = aliasPathOf(getter, aliases);
|
|
53
|
+
if (path) {
|
|
54
|
+
aliases.set(name, path);
|
|
55
|
+
added = true;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
const otherFormGetters = new Set();
|
|
60
|
+
for (const [name, getter] of getters) {
|
|
61
|
+
if (!aliases.has(name) && readsFormDirectly(getter, aliases)) {
|
|
62
|
+
otherFormGetters.add(name);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
const formGetters = new Set([...aliases.keys(), ...otherFormGetters]);
|
|
66
|
+
return {
|
|
67
|
+
aliases,
|
|
68
|
+
otherFormGetters,
|
|
69
|
+
writingMembers: closure(functions, (fn) => writesDirectly(fn, formGetters)),
|
|
70
|
+
readingMembers: closure(functions, (fn) => readsFormDirectly(fn, aliases)),
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Whether an `effect()` callback reads the form, outside `untracked()`: directly, through a getter or through a
|
|
75
|
+
* method of the page. The name of the member it is read through, `form` when it is read directly, `null` when it
|
|
76
|
+
* isn't read.
|
|
77
|
+
*/
|
|
78
|
+
function formReadOfEffect(callback, members) {
|
|
79
|
+
let found = null;
|
|
80
|
+
visitTracked(callback, (node) => {
|
|
81
|
+
if (found) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
const name = thisMemberName(node);
|
|
85
|
+
if (!name) {
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
if (name === FORM && isFormRead(node)) {
|
|
89
|
+
found = FORM;
|
|
90
|
+
}
|
|
91
|
+
else if (members.aliases.has(name) ||
|
|
92
|
+
members.otherFormGetters.has(name) ||
|
|
93
|
+
members.readingMembers.has(name)) {
|
|
94
|
+
found = name;
|
|
95
|
+
}
|
|
96
|
+
});
|
|
97
|
+
return found;
|
|
98
|
+
}
|
|
99
|
+
/** The members declared by the classes of the chain, the one of a subclass first */
|
|
100
|
+
function ownMembers(chain) {
|
|
101
|
+
const members = new Map();
|
|
102
|
+
for (const classNode of chain) {
|
|
103
|
+
for (const member of classNode.members) {
|
|
104
|
+
const name = member.name && ts.isIdentifier(member.name)
|
|
105
|
+
? member.name.text
|
|
106
|
+
: null;
|
|
107
|
+
// A setter shares its name with its getter: it is not what reads return
|
|
108
|
+
if (name &&
|
|
109
|
+
!members.has(name) &&
|
|
110
|
+
!ts.isSetAccessorDeclaration(member)) {
|
|
111
|
+
members.set(name, member);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
return members;
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* The members whose function has a property, or calls (`this.member()`, `this.getter`) a member which has it.
|
|
119
|
+
*/
|
|
120
|
+
function closure(functions, hasItDirectly) {
|
|
121
|
+
const result = new Set();
|
|
122
|
+
for (const [name, fn] of functions) {
|
|
123
|
+
if (hasItDirectly(fn)) {
|
|
124
|
+
result.add(name);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
let added = true;
|
|
128
|
+
while (added) {
|
|
129
|
+
added = false;
|
|
130
|
+
for (const [name, fn] of functions) {
|
|
131
|
+
if (result.has(name)) {
|
|
132
|
+
continue;
|
|
133
|
+
}
|
|
134
|
+
let uses = false;
|
|
135
|
+
visitTracked(fn.body, (node) => {
|
|
136
|
+
const member = thisMemberName(node);
|
|
137
|
+
uses || (uses = !!member && member !== name && result.has(member));
|
|
138
|
+
});
|
|
139
|
+
if (uses) {
|
|
140
|
+
result.add(name);
|
|
141
|
+
added = true;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
return result;
|
|
146
|
+
}
|
|
147
|
+
/**
|
|
148
|
+
* The path of the form a getter returns: `this.form.a.b`, `this.form?.a`, `this.form!.a`, `this.form()!.a` (once
|
|
149
|
+
* migrated), or a path of another such getter. `null` for anything else.
|
|
150
|
+
*/
|
|
151
|
+
function aliasPathOf(getter, aliases) {
|
|
152
|
+
var _a, _b;
|
|
153
|
+
const statements = (_b = (_a = getter.body) === null || _a === void 0 ? void 0 : _a.statements) !== null && _b !== void 0 ? _b : [];
|
|
154
|
+
const returned = statements.length === 1 && ts.isReturnStatement(statements[0])
|
|
155
|
+
? statements[0].expression
|
|
156
|
+
: undefined;
|
|
157
|
+
const segments = [];
|
|
158
|
+
let node = returned && skipWrappers(returned);
|
|
159
|
+
while (node) {
|
|
160
|
+
if (ts.isCallExpression(node) &&
|
|
161
|
+
node.arguments.length === 0 &&
|
|
162
|
+
thisMemberName(node.expression) === FORM) {
|
|
163
|
+
return segments.reverse();
|
|
164
|
+
}
|
|
165
|
+
const member = thisMemberName(node);
|
|
166
|
+
if (member) {
|
|
167
|
+
if (member === FORM) {
|
|
168
|
+
return segments.reverse();
|
|
169
|
+
}
|
|
170
|
+
const alias = aliases.get(member);
|
|
171
|
+
return alias ? [...alias, ...segments.reverse()] : null;
|
|
172
|
+
}
|
|
173
|
+
if (ts.isPropertyAccessExpression(node)) {
|
|
174
|
+
segments.push(`'${node.name.text}'`);
|
|
175
|
+
}
|
|
176
|
+
else if (ts.isElementAccessExpression(node) &&
|
|
177
|
+
(ts.isNumericLiteral(node.argumentExpression) ||
|
|
178
|
+
ts.isStringLiteral(node.argumentExpression))) {
|
|
179
|
+
segments.push(ts.isNumericLiteral(node.argumentExpression)
|
|
180
|
+
? node.argumentExpression.text
|
|
181
|
+
: `'${node.argumentExpression.text}'`);
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
return null;
|
|
185
|
+
}
|
|
186
|
+
node = skipWrappers(node.expression);
|
|
187
|
+
}
|
|
188
|
+
return null;
|
|
189
|
+
}
|
|
190
|
+
/** Whether a function reads the form itself, or through a getter returning a path of it */
|
|
191
|
+
function readsFormDirectly(fn, aliases) {
|
|
192
|
+
let reads = false;
|
|
193
|
+
if (fn.body) {
|
|
194
|
+
visitTracked(fn.body, (node) => {
|
|
195
|
+
const name = thisMemberName(node);
|
|
196
|
+
reads || (reads = (name === FORM &&
|
|
197
|
+
isFormRead(node)) ||
|
|
198
|
+
(!!name && aliases.has(name)));
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
return reads;
|
|
202
|
+
}
|
|
203
|
+
/**
|
|
204
|
+
* Whether a function writes the form or the reference itself: an assignment, an increment or an in-place mutation of
|
|
205
|
+
* them or of a value read from them (or from a getter of the form), `this.form.set()`, `this.patchForm()`...
|
|
206
|
+
*/
|
|
207
|
+
function writesDirectly(fn, formGetters) {
|
|
208
|
+
let writes = false;
|
|
209
|
+
const isWritten = (target) => {
|
|
210
|
+
const root = rootOf(target);
|
|
211
|
+
const name = root && thisMemberName(root);
|
|
212
|
+
if (!name) {
|
|
213
|
+
return false;
|
|
214
|
+
}
|
|
215
|
+
// this.form = x, this.form.a = x; not this.step = x, a setter
|
|
216
|
+
return (WRITTEN_SIGNALS.has(name) ||
|
|
217
|
+
(formGetters.has(name) && root !== skipWrappers(target)));
|
|
218
|
+
};
|
|
219
|
+
if (fn.body) {
|
|
220
|
+
visitTracked(fn.body, (node) => {
|
|
221
|
+
var _a;
|
|
222
|
+
if (writes) {
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
if (ts.isBinaryExpression(node) &&
|
|
226
|
+
node.operatorToken.kind >= ts.SyntaxKind.FirstAssignment &&
|
|
227
|
+
node.operatorToken.kind <= ts.SyntaxKind.LastAssignment) {
|
|
228
|
+
writes = isWritten(node.left);
|
|
229
|
+
}
|
|
230
|
+
else if ((ts.isPrefixUnaryExpression(node) ||
|
|
231
|
+
ts.isPostfixUnaryExpression(node)) &&
|
|
232
|
+
(node.operator === ts.SyntaxKind.PlusPlusToken ||
|
|
233
|
+
node.operator === ts.SyntaxKind.MinusMinusToken)) {
|
|
234
|
+
writes = isWritten(node.operand);
|
|
235
|
+
}
|
|
236
|
+
else if (ts.isCallExpression(node) &&
|
|
237
|
+
ts.isPropertyAccessExpression(node.expression)) {
|
|
238
|
+
const callee = node.expression;
|
|
239
|
+
const method = callee.name.text;
|
|
240
|
+
writes =
|
|
241
|
+
(callee.expression.kind === ts.SyntaxKind.ThisKeyword &&
|
|
242
|
+
PAGE_WRITES.has(method)) ||
|
|
243
|
+
(SIGNAL_WRITES.has(method) &&
|
|
244
|
+
WRITTEN_SIGNALS.has((_a = thisMemberName(callee.expression)) !== null && _a !== void 0 ? _a : '')) ||
|
|
245
|
+
(MUTATORS.has(method) && isWrittenValue(callee.expression));
|
|
246
|
+
}
|
|
247
|
+
});
|
|
248
|
+
}
|
|
249
|
+
return writes;
|
|
250
|
+
/** `this.form.list`, `this.step.list`: a value read from the form, mutated in place */
|
|
251
|
+
function isWrittenValue(target) {
|
|
252
|
+
const root = rootOf(target);
|
|
253
|
+
const name = root && thisMemberName(root);
|
|
254
|
+
return (!!name &&
|
|
255
|
+
((name === FORM && root !== skipWrappers(target)) ||
|
|
256
|
+
formGetters.has(name)));
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
/**
|
|
260
|
+
* Visits a node and its descendants, except the arguments of `untracked()`: the reads there are not tracked by an
|
|
261
|
+
* `effect()`.
|
|
262
|
+
*/
|
|
263
|
+
function visitTracked(node, visit) {
|
|
264
|
+
if (ts.isCallExpression(node) &&
|
|
265
|
+
ts.isIdentifier(node.expression) &&
|
|
266
|
+
node.expression.text === 'untracked') {
|
|
267
|
+
return;
|
|
268
|
+
}
|
|
269
|
+
visit(node);
|
|
270
|
+
ts.forEachChild(node, (child) => visitTracked(child, visit));
|
|
271
|
+
}
|
|
272
|
+
/** The name of `this.name`, `null` for anything else */
|
|
273
|
+
function thisMemberName(node) {
|
|
274
|
+
return ts.isPropertyAccessExpression(node) &&
|
|
275
|
+
node.expression.kind === ts.SyntaxKind.ThisKeyword
|
|
276
|
+
? node.name.text
|
|
277
|
+
: null;
|
|
278
|
+
}
|
|
279
|
+
/**
|
|
280
|
+
* Whether `this.form` is read: `this.form()`, `this.form.a`, `this.form` given to a function. Not `this.form.set()`,
|
|
281
|
+
* `this.form.update()`: a write.
|
|
282
|
+
*/
|
|
283
|
+
function isFormRead(node) {
|
|
284
|
+
const parent = node.parent;
|
|
285
|
+
return !(ts.isPropertyAccessExpression(parent) &&
|
|
286
|
+
parent.expression === node &&
|
|
287
|
+
['set', 'update', 'asReadonly'].includes(parent.name.text));
|
|
288
|
+
}
|
|
289
|
+
/** `this.form` for `this.form()!.a.b[0]`: the member read first by a chain of reads */
|
|
290
|
+
function rootOf(expression) {
|
|
291
|
+
let node = skipWrappers(expression);
|
|
292
|
+
for (;;) {
|
|
293
|
+
if (thisMemberName(node)) {
|
|
294
|
+
return node;
|
|
295
|
+
}
|
|
296
|
+
if (ts.isCallExpression(node) && node.arguments.length === 0) {
|
|
297
|
+
node = skipWrappers(node.expression);
|
|
298
|
+
}
|
|
299
|
+
else if (ts.isPropertyAccessExpression(node) ||
|
|
300
|
+
ts.isElementAccessExpression(node)) {
|
|
301
|
+
node = skipWrappers(node.expression);
|
|
302
|
+
}
|
|
303
|
+
else {
|
|
304
|
+
return null;
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
}
|
|
308
|
+
function skipWrappers(node) {
|
|
309
|
+
while (ts.isParenthesizedExpression(node) ||
|
|
310
|
+
ts.isAsExpression(node) ||
|
|
311
|
+
ts.isNonNullExpression(node) ||
|
|
312
|
+
ts.isTypeAssertionExpression(node) ||
|
|
313
|
+
ts.isSatisfiesExpression(node)) {
|
|
314
|
+
node = node.expression;
|
|
315
|
+
}
|
|
316
|
+
return node;
|
|
317
|
+
}
|
|
318
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form-members.js","sourceRoot":"","sources":["../../../../../projects/prestations-ng/schematics/utility/form-signal/form-members.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.migrateFormSignal = migrateFormSignal;
|
|
4
|
+
const core_1 = require("@angular-devkit/core");
|
|
5
|
+
const ts = require("typescript");
|
|
6
|
+
const typescript_files_1 = require("../typescript-files");
|
|
7
|
+
const class_migration_1 = require("./class-migration");
|
|
8
|
+
const edits_1 = require("./edits");
|
|
9
|
+
const form_members_1 = require("./form-members");
|
|
10
|
+
const page_classes_1 = require("./page-classes");
|
|
11
|
+
const template_migration_1 = require("./template-migration");
|
|
12
|
+
/**
|
|
13
|
+
* Migrates the pages of a project to their form and their reference held by signals (prestations-ng 19.2.0): their classes
|
|
14
|
+
* (`migratePageClass()`) and their templates (`migrateTemplate()`), inline or not.
|
|
15
|
+
*
|
|
16
|
+
* @param tree the workspace
|
|
17
|
+
* @param compiler `@angular/compiler`
|
|
18
|
+
* @returns what was migrated, and what must be checked by hand
|
|
19
|
+
*/
|
|
20
|
+
function migrateFormSignal(tree, compiler) {
|
|
21
|
+
const report = {
|
|
22
|
+
pages: 0,
|
|
23
|
+
migratedPages: 0,
|
|
24
|
+
templates: 0,
|
|
25
|
+
writes: 0,
|
|
26
|
+
aliasWrites: 0,
|
|
27
|
+
tracks: 0,
|
|
28
|
+
listPaths: 0,
|
|
29
|
+
redeclarations: 0,
|
|
30
|
+
warnings: [],
|
|
31
|
+
};
|
|
32
|
+
const files = (0, typescript_files_1.typeScriptFiles)(tree.root);
|
|
33
|
+
const pages = (0, page_classes_1.findPageClasses)(files);
|
|
34
|
+
const pagesByFile = new Map();
|
|
35
|
+
pages.forEach((page) => {
|
|
36
|
+
var _a;
|
|
37
|
+
return pagesByFile.set(page.file, [
|
|
38
|
+
...((_a = pagesByFile.get(page.file)) !== null && _a !== void 0 ? _a : []),
|
|
39
|
+
page,
|
|
40
|
+
]);
|
|
41
|
+
});
|
|
42
|
+
const warn = (path, text, warnings, offset = 0) => {
|
|
43
|
+
warnings.forEach((warning) => report.warnings.push(`${path}:${(0, edits_1.lineOf)(text, offset + warning.offset)}: ${warning.message}`));
|
|
44
|
+
};
|
|
45
|
+
for (const [file, filePages] of pagesByFile) {
|
|
46
|
+
const text = file.source.text;
|
|
47
|
+
const edits = [];
|
|
48
|
+
let needsObjectPathImport = false;
|
|
49
|
+
for (const page of filePages) {
|
|
50
|
+
report.pages++;
|
|
51
|
+
const formMembers = (0, form_members_1.formMembersOf)(page.chain);
|
|
52
|
+
const classResult = (0, class_migration_1.migratePageClass)(file.source, page.node, {
|
|
53
|
+
detailPage: page.detailPage,
|
|
54
|
+
formType: page.formType,
|
|
55
|
+
formMembers,
|
|
56
|
+
});
|
|
57
|
+
edits.push(...classResult.edits);
|
|
58
|
+
// A page is migrated when its class or its template changes
|
|
59
|
+
const classMigrated = classResult.edits.length > 0;
|
|
60
|
+
if (classMigrated) {
|
|
61
|
+
report.migratedPages++;
|
|
62
|
+
}
|
|
63
|
+
report.writes += classResult.writes;
|
|
64
|
+
report.aliasWrites += classResult.aliasWrites;
|
|
65
|
+
report.listPaths += classResult.listPaths;
|
|
66
|
+
report.redeclarations += classResult.redeclarations;
|
|
67
|
+
needsObjectPathImport || (needsObjectPathImport = classResult.needsObjectPathImport);
|
|
68
|
+
warn(file.path, text, classResult.warnings);
|
|
69
|
+
if (page.inlineTemplate) {
|
|
70
|
+
const start = page.inlineTemplate.getStart(file.source) + 1;
|
|
71
|
+
const template = text.slice(start, page.inlineTemplate.getEnd() - 1);
|
|
72
|
+
// In a '...' or "..." string, the quotes and the line breaks added by the migration are escaped: the
|
|
73
|
+
// template must have no escape of its own, so that its code is its text.
|
|
74
|
+
const quote = ts.isStringLiteral(page.inlineTemplate)
|
|
75
|
+
? text[start - 1]
|
|
76
|
+
: null;
|
|
77
|
+
if (quote && template.includes('\\')) {
|
|
78
|
+
warn(file.path, text, [
|
|
79
|
+
{
|
|
80
|
+
offset: start,
|
|
81
|
+
message: 'template not migrated: move it to a template literal (`...`) or a templateUrl',
|
|
82
|
+
},
|
|
83
|
+
]);
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
const templateResult = (0, template_migration_1.migrateTemplate)(compiler, template, file.path, { detailPage: page.detailPage, formMembers });
|
|
87
|
+
if (templateResult.content !== template) {
|
|
88
|
+
edits.push({
|
|
89
|
+
start,
|
|
90
|
+
end: page.inlineTemplate.getEnd() - 1,
|
|
91
|
+
text: quote
|
|
92
|
+
? templateResult.content
|
|
93
|
+
.replaceAll(quote, `\\${quote}`)
|
|
94
|
+
.replaceAll('\n', '\\n')
|
|
95
|
+
: templateResult.content,
|
|
96
|
+
});
|
|
97
|
+
report.templates++;
|
|
98
|
+
if (!classMigrated) {
|
|
99
|
+
report.migratedPages++;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
report.writes += templateResult.writes;
|
|
103
|
+
report.aliasWrites += templateResult.aliasWrites;
|
|
104
|
+
report.tracks += templateResult.tracks;
|
|
105
|
+
warn(file.path, text, templateResult.warnings, start);
|
|
106
|
+
}
|
|
107
|
+
else if (page.templateUrl) {
|
|
108
|
+
const templatePath = (0, core_1.join)((0, core_1.dirname)((0, core_1.normalize)(file.path)), page.templateUrl);
|
|
109
|
+
const template = tree.readText(templatePath);
|
|
110
|
+
const templateResult = (0, template_migration_1.migrateTemplate)(compiler, template, templatePath, { detailPage: page.detailPage, formMembers });
|
|
111
|
+
if (templateResult.content !== template) {
|
|
112
|
+
tree.overwrite(templatePath, templateResult.content);
|
|
113
|
+
report.templates++;
|
|
114
|
+
if (!classMigrated) {
|
|
115
|
+
report.migratedPages++;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
report.writes += templateResult.writes;
|
|
119
|
+
report.aliasWrites += templateResult.aliasWrites;
|
|
120
|
+
report.tracks += templateResult.tracks;
|
|
121
|
+
warn(templatePath, template, templateResult.warnings);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
if (needsObjectPathImport) {
|
|
125
|
+
edits.push((0, typescript_files_1.prestationsNgImport)(file.source, 'ObjectPath'));
|
|
126
|
+
}
|
|
127
|
+
const migrated = (0, edits_1.applyEdits)(text, edits);
|
|
128
|
+
if (migrated !== text) {
|
|
129
|
+
tree.overwrite(file.path, migrated);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
return report;
|
|
133
|
+
}
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS1zaWduYWwtbWlncmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvcHJlc3RhdGlvbnMtbmcvc2NoZW1hdGljcy91dGlsaXR5L2Zvcm0tc2lnbmFsL2Zvcm0tc2lnbmFsLW1pZ3JhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQW9DQSw4Q0ErSUM7QUFuTEQsK0NBQWdFO0FBRWhFLGlDQUFpQztBQUVqQywwREFBMkU7QUFDM0UsdURBQXFEO0FBQ3JELG1DQUFxRTtBQUNyRSxpREFBK0M7QUFDL0MsaURBQXlFO0FBQ3pFLDZEQUFpRTtBQW1CakU7Ozs7Ozs7R0FPRztBQUNILFNBQWdCLGlCQUFpQixDQUM3QixJQUFVLEVBQ1YsUUFBa0I7SUFFbEIsTUFBTSxNQUFNLEdBQThCO1FBQ3RDLEtBQUssRUFBRSxDQUFDO1FBQ1IsYUFBYSxFQUFFLENBQUM7UUFDaEIsU0FBUyxFQUFFLENBQUM7UUFDWixNQUFNLEVBQUUsQ0FBQztRQUNULFdBQVcsRUFBRSxDQUFDO1FBQ2QsTUFBTSxFQUFFLENBQUM7UUFDVCxTQUFTLEVBQUUsQ0FBQztRQUNaLGNBQWMsRUFBRSxDQUFDO1FBQ2pCLFFBQVEsRUFBRSxFQUFFO0tBQ2YsQ0FBQztJQUNGLE1BQU0sS0FBSyxHQUFHLElBQUEsa0NBQWUsRUFBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekMsTUFBTSxLQUFLLEdBQUcsSUFBQSw4QkFBZSxFQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3JDLE1BQU0sV0FBVyxHQUFHLElBQUksR0FBRyxFQUE0QixDQUFDO0lBQ3hELEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTs7UUFDbkIsT0FBQSxXQUFXLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDdkIsR0FBRyxDQUFDLE1BQUEsV0FBVyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLG1DQUFJLEVBQUUsQ0FBQztZQUNyQyxJQUFJO1NBQ1AsQ0FBQyxDQUFBO0tBQUEsQ0FDTCxDQUFDO0lBRUYsTUFBTSxJQUFJLEdBQUcsQ0FDVCxJQUFZLEVBQ1osSUFBWSxFQUNaLFFBQTRCLEVBQzVCLE1BQU0sR0FBRyxDQUFDLEVBQ04sRUFBRTtRQUNOLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUN6QixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FDaEIsR0FBRyxJQUFJLElBQUksSUFBQSxjQUFNLEVBQUMsSUFBSSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUN6RSxDQUNKLENBQUM7SUFDTixDQUFDLENBQUM7SUFFRixLQUFLLE1BQU0sQ0FBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLElBQUksV0FBVyxFQUFFLENBQUM7UUFDMUMsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUM7UUFDOUIsTUFBTSxLQUFLLEdBQVcsRUFBRSxDQUFDO1FBQ3pCLElBQUkscUJBQXFCLEdBQUcsS0FBSyxDQUFDO1FBQ2xDLEtBQUssTUFBTSxJQUFJLElBQUksU0FBUyxFQUFFLENBQUM7WUFDM0IsTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2YsTUFBTSxXQUFXLEdBQUcsSUFBQSw0QkFBYSxFQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUM5QyxNQUFNLFdBQVcsR0FBRyxJQUFBLGtDQUFnQixFQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRTtnQkFDekQsVUFBVSxFQUFFLElBQUksQ0FBQyxVQUFVO2dCQUMzQixRQUFRLEVBQUUsSUFBSSxDQUFDLFFBQVE7Z0JBQ3ZCLFdBQVc7YUFDZCxDQUFDLENBQUM7WUFDSCxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ2pDLDREQUE0RDtZQUM1RCxNQUFNLGFBQWEsR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUM7WUFDbkQsSUFBSSxhQUFhLEVBQUUsQ0FBQztnQkFDaEIsTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQzNCLENBQUM7WUFDRCxNQUFNLENBQUMsTUFBTSxJQUFJLFdBQVcsQ0FBQyxNQUFNLENBQUM7WUFDcEMsTUFBTSxDQUFDLFdBQVcsSUFBSSxXQUFXLENBQUMsV0FBVyxDQUFDO1lBQzlDLE1BQU0sQ0FBQyxTQUFTLElBQUksV0FBVyxDQUFDLFNBQVMsQ0FBQztZQUMxQyxNQUFNLENBQUMsY0FBYyxJQUFJLFdBQVcsQ0FBQyxjQUFjLENBQUM7WUFDcEQscUJBQXFCLEtBQXJCLHFCQUFxQixHQUFLLFdBQVcsQ0FBQyxxQkFBcUIsRUFBQztZQUM1RCxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBRTVDLElBQUksSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO2dCQUN0QixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUM1RCxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUN2QixLQUFLLEVBQ0wsSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLENBQ25DLENBQUM7Z0JBQ0YscUdBQXFHO2dCQUNyRyx5RUFBeUU7Z0JBQ3pFLE1BQU0sS0FBSyxHQUFHLEVBQUUsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQztvQkFDakQsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDO29CQUNqQixDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUNYLElBQUksS0FBSyxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztvQkFDbkMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFO3dCQUNsQjs0QkFDSSxNQUFNLEVBQUUsS0FBSzs0QkFDYixPQUFPLEVBQ0gsK0VBQStFO3lCQUN0RjtxQkFDSixDQUFDLENBQUM7b0JBQ0gsU0FBUztnQkFDYixDQUFDO2dCQUNELE1BQU0sY0FBYyxHQUFHLElBQUEsb0NBQWUsRUFDbEMsUUFBUSxFQUNSLFFBQVEsRUFDUixJQUFJLENBQUMsSUFBSSxFQUNULEVBQUUsVUFBVSxFQUFFLElBQUksQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLENBQy9DLENBQUM7Z0JBQ0YsSUFBSSxjQUFjLENBQUMsT0FBTyxLQUFLLFFBQVEsRUFBRSxDQUFDO29CQUN0QyxLQUFLLENBQUMsSUFBSSxDQUFDO3dCQUNQLEtBQUs7d0JBQ0wsR0FBRyxFQUFFLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQzt3QkFDckMsSUFBSSxFQUFFLEtBQUs7NEJBQ1AsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxPQUFPO2lDQUNqQixVQUFVLENBQUMsS0FBSyxFQUFFLEtBQUssS0FBSyxFQUFFLENBQUM7aUNBQy9CLFVBQVUsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDOzRCQUM5QixDQUFDLENBQUMsY0FBYyxDQUFDLE9BQU87cUJBQy9CLENBQUMsQ0FBQztvQkFDSCxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUM7b0JBQ25CLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQzt3QkFDakIsTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFDO29CQUMzQixDQUFDO2dCQUNMLENBQUM7Z0JBQ0QsTUFBTSxDQUFDLE1BQU0sSUFBSSxjQUFjLENBQUMsTUFBTSxDQUFDO2dCQUN2QyxNQUFNLENBQUMsV0FBVyxJQUFJLGNBQWMsQ0FBQyxXQUFXLENBQUM7Z0JBQ2pELE1BQU0sQ0FBQyxNQUFNLElBQUksY0FBYyxDQUFDLE1BQU0sQ0FBQztnQkFDdkMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLGNBQWMsQ0FBQyxRQUFRLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDMUQsQ0FBQztpQkFBTSxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztnQkFDMUIsTUFBTSxZQUFZLEdBQUcsSUFBQSxXQUFJLEVBQ3JCLElBQUEsY0FBTyxFQUFDLElBQUEsZ0JBQVMsRUFBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsRUFDN0IsSUFBSSxDQUFDLFdBQVcsQ0FDbkIsQ0FBQztnQkFDRixNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQyxDQUFDO2dCQUM3QyxNQUFNLGNBQWMsR0FBRyxJQUFBLG9DQUFlLEVBQ2xDLFFBQVEsRUFDUixRQUFRLEVBQ1IsWUFBWSxFQUNaLEVBQUUsVUFBVSxFQUFFLElBQUksQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLENBQy9DLENBQUM7Z0JBQ0YsSUFBSSxjQUFjLENBQUMsT0FBTyxLQUFLLFFBQVEsRUFBRSxDQUFDO29CQUN0QyxJQUFJLENBQUMsU0FBUyxDQUFDLFlBQVksRUFBRSxjQUFjLENBQUMsT0FBTyxDQUFDLENBQUM7b0JBQ3JELE1BQU0sQ0FBQyxTQUFTLEVBQUUsQ0FBQztvQkFDbkIsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO3dCQUNqQixNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7b0JBQzNCLENBQUM7Z0JBQ0wsQ0FBQztnQkFDRCxNQUFNLENBQUMsTUFBTSxJQUFJLGNBQWMsQ0FBQyxNQUFNLENBQUM7Z0JBQ3ZDLE1BQU0sQ0FBQyxXQUFXLElBQUksY0FBYyxDQUFDLFdBQVcsQ0FBQztnQkFDakQsTUFBTSxDQUFDLE1BQU0sSUFBSSxjQUFjLENBQUMsTUFBTSxDQUFDO2dCQUN2QyxJQUFJLENBQUMsWUFBWSxFQUFFLFFBQVEsRUFBRSxjQUFjLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDMUQsQ0FBQztRQUNMLENBQUM7UUFDRCxJQUFJLHFCQUFxQixFQUFFLENBQUM7WUFDeEIsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFBLHNDQUFtQixFQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQztRQUMvRCxDQUFDO1FBQ0QsTUFBTSxRQUFRLEdBQUcsSUFBQSxrQkFBVSxFQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN6QyxJQUFJLFFBQVEsS0FBSyxJQUFJLEVBQUUsQ0FBQztZQUNwQixJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDeEMsQ0FBQztJQUNMLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQztBQUNsQixDQUFDIn0=
|
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.findPageClasses = findPageClasses;
|
|
4
|
+
const ts = require("typescript");
|
|
5
|
+
/**
|
|
6
|
+
* The page classes of prestations-ng, and whether they are detail pages.
|
|
7
|
+
*/
|
|
8
|
+
const LIBRARY_PAGES = {
|
|
9
|
+
AbstractPageComponent: false,
|
|
10
|
+
AbstractMenuPageComponent: false,
|
|
11
|
+
AbstractPageFromMenuComponent: false,
|
|
12
|
+
AbstractListDetailPageComponent: true,
|
|
13
|
+
};
|
|
14
|
+
/**
|
|
15
|
+
* Finds the classes of a project extending a page of prestations-ng, through the classes of the project too
|
|
16
|
+
* (`class MyPage extends MyAbstractPage`, `abstract class MyAbstractPage extends AbstractPageComponent<MyForm>`).
|
|
17
|
+
* Classes are matched by name: a project rarely has two classes of the same name.
|
|
18
|
+
*
|
|
19
|
+
* @param files the TypeScript files of the project
|
|
20
|
+
* @returns the page classes
|
|
21
|
+
*/
|
|
22
|
+
function findPageClasses(files) {
|
|
23
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
24
|
+
const classesByName = new Map();
|
|
25
|
+
for (const file of files) {
|
|
26
|
+
for (const node of classesOf(file.source)) {
|
|
27
|
+
const heritage = (_b = (_a = node.heritageClauses) === null || _a === void 0 ? void 0 : _a.find((clause) => clause.token === ts.SyntaxKind.ExtendsKeyword)) === null || _b === void 0 ? void 0 : _b.types[0];
|
|
28
|
+
const declared = {
|
|
29
|
+
file,
|
|
30
|
+
node,
|
|
31
|
+
extendsName: heritage
|
|
32
|
+
? heritage.expression.getText(file.source)
|
|
33
|
+
: null,
|
|
34
|
+
extendsTypeArguments: (_d = (_c = heritage === null || heritage === void 0 ? void 0 : heritage.typeArguments) === null || _c === void 0 ? void 0 : _c.map((argument) => argument.getText(file.source))) !== null && _d !== void 0 ? _d : [],
|
|
35
|
+
};
|
|
36
|
+
const name = (_e = node.name) === null || _e === void 0 ? void 0 : _e.text;
|
|
37
|
+
if (name) {
|
|
38
|
+
classesByName.set(name, [
|
|
39
|
+
...((_f = classesByName.get(name)) !== null && _f !== void 0 ? _f : []),
|
|
40
|
+
declared,
|
|
41
|
+
]);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
/** Whether a class name is a page, and a detail page; `null` when it is not a page */
|
|
46
|
+
const pageKind = (name, seen) => {
|
|
47
|
+
var _a;
|
|
48
|
+
if (!name || seen.has(name)) {
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
if (name in LIBRARY_PAGES) {
|
|
52
|
+
return { detailPage: LIBRARY_PAGES[name] };
|
|
53
|
+
}
|
|
54
|
+
seen.add(name);
|
|
55
|
+
for (const declared of (_a = classesByName.get(name)) !== null && _a !== void 0 ? _a : []) {
|
|
56
|
+
const kind = pageKind(declared.extendsName, seen);
|
|
57
|
+
if (kind) {
|
|
58
|
+
return kind;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return null;
|
|
62
|
+
};
|
|
63
|
+
/** The class and the classes of the project it extends, through the first class of each name */
|
|
64
|
+
const chainOf = (declared) => {
|
|
65
|
+
var _a, _b, _c, _d;
|
|
66
|
+
const chain = [declared.node];
|
|
67
|
+
for (let parent = (_b = classesByName.get((_a = declared.extendsName) !== null && _a !== void 0 ? _a : '')) === null || _b === void 0 ? void 0 : _b[0]; parent && !chain.includes(parent.node); parent = (_d = classesByName.get((_c = parent.extendsName) !== null && _c !== void 0 ? _c : '')) === null || _d === void 0 ? void 0 : _d[0]) {
|
|
68
|
+
chain.push(parent.node);
|
|
69
|
+
}
|
|
70
|
+
return chain;
|
|
71
|
+
};
|
|
72
|
+
const pages = [];
|
|
73
|
+
for (const declaredClasses of classesByName.values()) {
|
|
74
|
+
for (const declared of declaredClasses) {
|
|
75
|
+
const kind = pageKind(declared.extendsName, new Set());
|
|
76
|
+
if (!kind) {
|
|
77
|
+
continue;
|
|
78
|
+
}
|
|
79
|
+
const component = componentMetadata(declared);
|
|
80
|
+
pages.push({
|
|
81
|
+
file: declared.file,
|
|
82
|
+
node: declared.node,
|
|
83
|
+
detailPage: kind.detailPage,
|
|
84
|
+
formType: (_g = declared.extendsTypeArguments[0]) !== null && _g !== void 0 ? _g : null,
|
|
85
|
+
templateUrl: component.templateUrl,
|
|
86
|
+
inlineTemplate: component.inlineTemplate,
|
|
87
|
+
chain: chainOf(declared),
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
return pages;
|
|
92
|
+
}
|
|
93
|
+
function classesOf(source) {
|
|
94
|
+
const classes = [];
|
|
95
|
+
const visit = (node) => {
|
|
96
|
+
if (ts.isClassDeclaration(node)) {
|
|
97
|
+
classes.push(node);
|
|
98
|
+
}
|
|
99
|
+
ts.forEachChild(node, visit);
|
|
100
|
+
};
|
|
101
|
+
visit(source);
|
|
102
|
+
return classes;
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* `templateUrl` and `template` of the `@Component` decorator of a class.
|
|
106
|
+
*/
|
|
107
|
+
function componentMetadata(declared) {
|
|
108
|
+
var _a;
|
|
109
|
+
const decorator = (_a = ts
|
|
110
|
+
.getDecorators(declared.node)) === null || _a === void 0 ? void 0 : _a.find((candidate) => ts.isCallExpression(candidate.expression) &&
|
|
111
|
+
candidate.expression.expression.getText(declared.file.source) === 'Component');
|
|
112
|
+
const argument = decorator && ts.isCallExpression(decorator.expression)
|
|
113
|
+
? decorator.expression.arguments[0]
|
|
114
|
+
: undefined;
|
|
115
|
+
const metadata = {
|
|
116
|
+
templateUrl: null,
|
|
117
|
+
inlineTemplate: null,
|
|
118
|
+
};
|
|
119
|
+
if (!argument || !ts.isObjectLiteralExpression(argument)) {
|
|
120
|
+
return metadata;
|
|
121
|
+
}
|
|
122
|
+
for (const property of argument.properties) {
|
|
123
|
+
if (!ts.isPropertyAssignment(property) ||
|
|
124
|
+
!ts.isIdentifier(property.name)) {
|
|
125
|
+
continue;
|
|
126
|
+
}
|
|
127
|
+
const value = property.initializer;
|
|
128
|
+
const isText = ts.isStringLiteral(value) ||
|
|
129
|
+
ts.isNoSubstitutionTemplateLiteral(value);
|
|
130
|
+
if (property.name.text === 'templateUrl' && isText) {
|
|
131
|
+
metadata.templateUrl = value.text;
|
|
132
|
+
}
|
|
133
|
+
if (property.name.text === 'template' && isText) {
|
|
134
|
+
metadata.inlineTemplate = value;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
return metadata;
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFnZS1jbGFzc2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvcHJlc3RhdGlvbnMtbmcvc2NoZW1hdGljcy91dGlsaXR5L2Zvcm0tc2lnbmFsL3BhZ2UtY2xhc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQStDQSwwQ0FrRkM7QUFqSUQsaUNBQWlDO0FBRWpDOztHQUVHO0FBQ0gsTUFBTSxhQUFhLEdBQTRCO0lBQzNDLHFCQUFxQixFQUFFLEtBQUs7SUFDNUIseUJBQXlCLEVBQUUsS0FBSztJQUNoQyw2QkFBNkIsRUFBRSxLQUFLO0lBQ3BDLCtCQUErQixFQUFFLElBQUk7Q0FDeEMsQ0FBQztBQTZCRjs7Ozs7OztHQU9HO0FBQ0gsU0FBZ0IsZUFBZSxDQUFDLEtBQW9COztJQUNoRCxNQUFNLGFBQWEsR0FBRyxJQUFJLEdBQUcsRUFBMkIsQ0FBQztJQUN6RCxLQUFLLE1BQU0sSUFBSSxJQUFJLEtBQUssRUFBRSxDQUFDO1FBQ3ZCLEtBQUssTUFBTSxJQUFJLElBQUksU0FBUyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1lBQ3hDLE1BQU0sUUFBUSxHQUFHLE1BQUEsTUFBQSxJQUFJLENBQUMsZUFBZSwwQ0FBRSxJQUFJLENBQ3ZDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsS0FBSyxLQUFLLEVBQUUsQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUM1RCwwQ0FBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDWixNQUFNLFFBQVEsR0FBa0I7Z0JBQzVCLElBQUk7Z0JBQ0osSUFBSTtnQkFDSixXQUFXLEVBQUUsUUFBUTtvQkFDakIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7b0JBQzFDLENBQUMsQ0FBQyxJQUFJO2dCQUNWLG9CQUFvQixFQUNoQixNQUFBLE1BQUEsUUFBUSxhQUFSLFFBQVEsdUJBQVIsUUFBUSxDQUFFLGFBQWEsMENBQUUsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FDdEMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQ2hDLG1DQUFJLEVBQUU7YUFDZCxDQUFDO1lBQ0YsTUFBTSxJQUFJLEdBQUcsTUFBQSxJQUFJLENBQUMsSUFBSSwwQ0FBRSxJQUFJLENBQUM7WUFDN0IsSUFBSSxJQUFJLEVBQUUsQ0FBQztnQkFDUCxhQUFhLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRTtvQkFDcEIsR0FBRyxDQUFDLE1BQUEsYUFBYSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsbUNBQUksRUFBRSxDQUFDO29CQUNsQyxRQUFRO2lCQUNYLENBQUMsQ0FBQztZQUNQLENBQUM7UUFDTCxDQUFDO0lBQ0wsQ0FBQztJQUVELHNGQUFzRjtJQUN0RixNQUFNLFFBQVEsR0FBRyxDQUNiLElBQW1CLEVBQ25CLElBQWlCLEVBQ2EsRUFBRTs7UUFDaEMsSUFBSSxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDMUIsT0FBTyxJQUFJLENBQUM7UUFDaEIsQ0FBQztRQUNELElBQUksSUFBSSxJQUFJLGFBQWEsRUFBRSxDQUFDO1lBQ3hCLE9BQU8sRUFBRSxVQUFVLEVBQUUsYUFBYSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7UUFDL0MsQ0FBQztRQUNELElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDZixLQUFLLE1BQU0sUUFBUSxJQUFJLE1BQUEsYUFBYSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsbUNBQUksRUFBRSxFQUFFLENBQUM7WUFDbkQsTUFBTSxJQUFJLEdBQUcsUUFBUSxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFDbEQsSUFBSSxJQUFJLEVBQUUsQ0FBQztnQkFDUCxPQUFPLElBQUksQ0FBQztZQUNoQixDQUFDO1FBQ0wsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUMsQ0FBQztJQUVGLGdHQUFnRztJQUNoRyxNQUFNLE9BQU8sR0FBRyxDQUFDLFFBQXVCLEVBQXlCLEVBQUU7O1FBQy9ELE1BQU0sS0FBSyxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzlCLEtBQ0ksSUFBSSxNQUFNLEdBQUcsTUFBQSxhQUFhLENBQUMsR0FBRyxDQUFDLE1BQUEsUUFBUSxDQUFDLFdBQVcsbUNBQUksRUFBRSxDQUFDLDBDQUFHLENBQUMsQ0FBQyxFQUMvRCxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFDdEMsTUFBTSxHQUFHLE1BQUEsYUFBYSxDQUFDLEdBQUcsQ0FBQyxNQUFBLE1BQU0sQ0FBQyxXQUFXLG1DQUFJLEVBQUUsQ0FBQywwQ0FBRyxDQUFDLENBQUMsRUFDM0QsQ0FBQztZQUNDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzVCLENBQUM7UUFDRCxPQUFPLEtBQUssQ0FBQztJQUNqQixDQUFDLENBQUM7SUFFRixNQUFNLEtBQUssR0FBZ0IsRUFBRSxDQUFDO0lBQzlCLEtBQUssTUFBTSxlQUFlLElBQUksYUFBYSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7UUFDbkQsS0FBSyxNQUFNLFFBQVEsSUFBSSxlQUFlLEVBQUUsQ0FBQztZQUNyQyxNQUFNLElBQUksR0FBRyxRQUFRLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxJQUFJLEdBQUcsRUFBRSxDQUFDLENBQUM7WUFDdkQsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO2dCQUNSLFNBQVM7WUFDYixDQUFDO1lBQ0QsTUFBTSxTQUFTLEdBQUcsaUJBQWlCLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDOUMsS0FBSyxDQUFDLElBQUksQ0FBQztnQkFDUCxJQUFJLEVBQUUsUUFBUSxDQUFDLElBQUk7Z0JBQ25CLElBQUksRUFBRSxRQUFRLENBQUMsSUFBSTtnQkFDbkIsVUFBVSxFQUFFLElBQUksQ0FBQyxVQUFVO2dCQUMzQixRQUFRLEVBQUUsTUFBQSxRQUFRLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLG1DQUFJLElBQUk7Z0JBQ2xELFdBQVcsRUFBRSxTQUFTLENBQUMsV0FBVztnQkFDbEMsY0FBYyxFQUFFLFNBQVMsQ0FBQyxjQUFjO2dCQUN4QyxLQUFLLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQzthQUMzQixDQUFDLENBQUM7UUFDUCxDQUFDO0lBQ0wsQ0FBQztJQUNELE9BQU8sS0FBSyxDQUFDO0FBQ2pCLENBQUM7QUFFRCxTQUFTLFNBQVMsQ0FBQyxNQUFxQjtJQUNwQyxNQUFNLE9BQU8sR0FBMEIsRUFBRSxDQUFDO0lBQzFDLE1BQU0sS0FBSyxHQUFHLENBQUMsSUFBYSxFQUFRLEVBQUU7UUFDbEMsSUFBSSxFQUFFLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUM5QixPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZCLENBQUM7UUFDRCxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNqQyxDQUFDLENBQUM7SUFDRixLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDZCxPQUFPLE9BQU8sQ0FBQztBQUNuQixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxTQUFTLGlCQUFpQixDQUFDLFFBQXVCOztJQUk5QyxNQUFNLFNBQVMsR0FBRyxNQUFBLEVBQUU7U0FDZixhQUFhLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQywwQ0FDM0IsSUFBSSxDQUNGLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FDVixFQUFFLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQztRQUN6QyxTQUFTLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQ25DLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUN2QixLQUFLLFdBQVcsQ0FDeEIsQ0FBQztJQUNOLE1BQU0sUUFBUSxHQUNWLFNBQVMsSUFBSSxFQUFFLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQztRQUNsRCxDQUFDLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO1FBQ25DLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDcEIsTUFBTSxRQUFRLEdBQUc7UUFDYixXQUFXLEVBQUUsSUFBcUI7UUFDbEMsY0FBYyxFQUFFLElBQzhDO0tBQ2pFLENBQUM7SUFDRixJQUFJLENBQUMsUUFBUSxJQUFJLENBQUMsRUFBRSxDQUFDLHlCQUF5QixDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7UUFDdkQsT0FBTyxRQUFRLENBQUM7SUFDcEIsQ0FBQztJQUNELEtBQUssTUFBTSxRQUFRLElBQUksUUFBUSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3pDLElBQ0ksQ0FBQyxFQUFFLENBQUMsb0JBQW9CLENBQUMsUUFBUSxDQUFDO1lBQ2xDLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQ2pDLENBQUM7WUFDQyxTQUFTO1FBQ2IsQ0FBQztRQUNELE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQyxXQUFXLENBQUM7UUFDbkMsTUFBTSxNQUFNLEdBQ1IsRUFBRSxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUM7WUFDekIsRUFBRSxDQUFDLCtCQUErQixDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzlDLElBQUksUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLEtBQUssYUFBYSxJQUFJLE1BQU0sRUFBRSxDQUFDO1lBQ2pELFFBQVEsQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQztRQUN0QyxDQUFDO1FBQ0QsSUFBSSxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxVQUFVLElBQUksTUFBTSxFQUFFLENBQUM7WUFDOUMsUUFBUSxDQUFDLGNBQWMsR0FBRyxLQUFLLENBQUM7UUFDcEMsQ0FBQztJQUNMLENBQUM7SUFDRCxPQUFPLFFBQVEsQ0FBQztBQUNwQixDQUFDIn0=
|