@dsivd/prestations-ng 19.2.0-beta.26 → 19.2.0-beta.28
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 +141 -0
- package/ANGULAR_SIGNALS.md +2 -2
- package/CHANGELOG.md +29 -0
- package/CONTRIBUTING.md +47 -8
- package/ESLINT_PLUGIN.md +56 -11
- package/GOOD_PRACTICES.md +14 -10
- package/README.md +4 -0
- package/UPGRADING_V19.md +85 -6
- package/eslint/configs/template-rules.mjs +3 -0
- package/eslint/rules/index.mjs +2 -0
- package/eslint/rules/no-item-track-in-form-list.mjs +4 -3
- package/eslint/rules/require-track-index.mjs +162 -0
- package/fesm2022/dsivd-prestations-ng.mjs +10 -19
- package/fesm2022/dsivd-prestations-ng.mjs.map +1 -1
- package/package.json +1 -1
- package/schematics/migration-collection.json +1 -1
- package/schematics/ng-update/migrations/update-19_2_0/index.js +13 -2
- package/schematics/utility/form-signal/form-signal-migration.js +4 -73
- package/schematics/utility/never-connected-migration.js +87 -0
- package/schematics/utility/typescript-files.js +95 -0
- package/src/eslint/configs/template-rules.mjs +3 -0
- package/src/eslint/rules/__tests__/require-track-index.test.mjs +106 -0
- package/src/eslint/rules/index.mjs +2 -0
- package/src/eslint/rules/no-item-track-in-form-list.mjs +4 -3
- package/src/eslint/rules/require-track-index.mjs +162 -0
- package/types/dsivd-prestations-ng.d.ts +0 -2
package/package.json
CHANGED
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"ng-update": {
|
|
40
40
|
"migrations": "./schematics/migration-collection.json"
|
|
41
41
|
},
|
|
42
|
-
"version": "19.2.0-beta.
|
|
42
|
+
"version": "19.2.0-beta.28",
|
|
43
43
|
"module": "fesm2022/dsivd-prestations-ng.mjs",
|
|
44
44
|
"typings": "types/dsivd-prestations-ng.d.ts",
|
|
45
45
|
"exports": {
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
},
|
|
24
24
|
"migration-v19_2_0": {
|
|
25
25
|
"version": "19.2.0",
|
|
26
|
-
"description": "The form and the reference of the pages are signals: their templates and classes read them through calls, and write the form with patchForm() and patchItem()",
|
|
26
|
+
"description": "The form and the reference of the pages are signals: their templates and classes read them through calls, and write the form with patchForm() and patchItem(). The string token 'neverConnected' is replaced with NEVER_CONNECTED",
|
|
27
27
|
"factory": "./ng-update/migrations/update-19_2_0"
|
|
28
28
|
}
|
|
29
29
|
}
|
|
@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
13
13
|
const form_signal_migration_1 = require("../../../utility/form-signal/form-signal-migration");
|
|
14
|
+
const never_connected_migration_1 = require("../../../utility/never-connected-migration");
|
|
14
15
|
const version = '19.2.0';
|
|
15
16
|
/**
|
|
16
17
|
* `@angular/compiler` is an ES module: imported, not required. A `Function` keeps TypeScript from turning the import
|
|
@@ -22,7 +23,8 @@ exports.default = () => (tree, context) => __awaiter(void 0, void 0, void 0, fun
|
|
|
22
23
|
if (!tree.exists('angular.json')) {
|
|
23
24
|
throw new schematics_1.SchematicsException('This is not an Angular workspace. Try again in an Angular project.');
|
|
24
25
|
}
|
|
25
|
-
context.logger.info(`Applying migration for prestations-ng to version ${version}: the form and the reference of the pages are signals`
|
|
26
|
+
context.logger.info(`Applying migration for prestations-ng to version ${version}: the form and the reference of the pages are signals, ` +
|
|
27
|
+
`'neverConnected' is provided with NEVER_CONNECTED`);
|
|
26
28
|
const report = (0, form_signal_migration_1.migrateFormSignal)(tree, yield loadCompiler());
|
|
27
29
|
context.logger.info(`Checked ${report.pages} pages, migrated ${report.migratedPages} of them and ${report.templates} templates: ` +
|
|
28
30
|
`${report.writes} writes of the form, ${report.tracks} lists tracked by $index, ` +
|
|
@@ -35,6 +37,15 @@ exports.default = () => (tree, context) => __awaiter(void 0, void 0, void 0, fun
|
|
|
35
37
|
...report.warnings.map((warning) => ` ${warning}`),
|
|
36
38
|
].join('\n'));
|
|
37
39
|
}
|
|
40
|
+
const neverConnected = (0, never_connected_migration_1.migrateNeverConnected)(tree);
|
|
41
|
+
context.logger.info(`Replaced ${neverConnected.replaced} string tokens 'neverConnected' with NEVER_CONNECTED.`);
|
|
42
|
+
if (neverConnected.warnings.length) {
|
|
43
|
+
context.logger.warn([
|
|
44
|
+
`To check by hand (${neverConnected.warnings.length}), see ` +
|
|
45
|
+
`"\`neverConnected\` is provided with \`NEVER_CONNECTED\`" in UPGRADING_V19.md:`,
|
|
46
|
+
...neverConnected.warnings.map((warning) => ` ${warning}`),
|
|
47
|
+
].join('\n'));
|
|
48
|
+
}
|
|
38
49
|
return tree;
|
|
39
50
|
});
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9wcmVzdGF0aW9ucy1uZy9zY2hlbWF0aWNzL25nLXVwZGF0ZS9taWdyYXRpb25zL3VwZGF0ZS0xOV8yXzAvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQSwyREFLb0M7QUFFcEMsOEZBQXVGO0FBRXZGLDBGQUFtRjtBQUVuRixNQUFNLE9BQU8sR0FBRyxRQUFRLENBQUM7QUFFekI7OztHQUdHO0FBQ0gsTUFBTSxZQUFZLEdBQUcsR0FBc0IsRUFBRSxDQUN6QyxJQUFJLFFBQVEsQ0FBQyxXQUFXLEVBQUUsMEJBQTBCLENBQUMsQ0FDakQsbUJBQW1CLENBQ0QsQ0FBQztBQUUzQixrQkFBZSxHQUFTLEVBQUUsQ0FBQyxDQUFPLElBQVUsRUFBRSxPQUF5QixFQUFFLEVBQUU7SUFDdkUsZ0RBQWdEO0lBQ2hELElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUM7UUFDL0IsTUFBTSxJQUFJLGdDQUFtQixDQUN6QixvRUFBb0UsQ0FDdkUsQ0FBQztJQUNOLENBQUM7SUFDRCxPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDZixvREFBb0QsT0FBTyx5REFBeUQ7UUFDaEgsbURBQW1ELENBQzFELENBQUM7SUFDRixNQUFNLE1BQU0sR0FBRyxJQUFBLHlDQUFpQixFQUFDLElBQUksRUFBRSxNQUFNLFlBQVksRUFBRSxDQUFDLENBQUM7SUFDN0QsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2YsV0FBVyxNQUFNLENBQUMsS0FBSyxvQkFBb0IsTUFBTSxDQUFDLGFBQWEsZ0JBQWdCLE1BQU0sQ0FBQyxTQUFTLGNBQWM7UUFDekcsR0FBRyxNQUFNLENBQUMsTUFBTSx3QkFBd0IsTUFBTSxDQUFDLE1BQU0sNEJBQTRCO1FBQ2pGLEdBQUcsTUFBTSxDQUFDLFNBQVMsd0NBQXdDO1FBQzNELEdBQUcsTUFBTSxDQUFDLGNBQWMsOENBQThDLENBQzdFLENBQUM7SUFDRixJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDekIsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2Y7WUFDSSxxQkFBcUIsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLGtEQUFrRDtnQkFDekYsZ0VBQWdFO1lBQ3BFLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLEtBQUssT0FBTyxFQUFFLENBQUM7U0FDdEQsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQ2YsQ0FBQztJQUNOLENBQUM7SUFFRCxNQUFNLGNBQWMsR0FBRyxJQUFBLGlEQUFxQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ25ELE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUNmLFlBQVksY0FBYyxDQUFDLFFBQVEsdURBQXVELENBQzdGLENBQUM7SUFDRixJQUFJLGNBQWMsQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDakMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2Y7WUFDSSxxQkFBcUIsY0FBYyxDQUFDLFFBQVEsQ0FBQyxNQUFNLFNBQVM7Z0JBQ3hELGdGQUFnRjtZQUNwRixHQUFHLGNBQWMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxLQUFLLE9BQU8sRUFBRSxDQUFDO1NBQzlELENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUNmLENBQUM7SUFDTixDQUFDO0lBQ0QsT0FBTyxJQUFJLENBQUM7QUFDaEIsQ0FBQyxDQUFBLENBQUMifQ==
|
|
@@ -3,17 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.migrateFormSignal = migrateFormSignal;
|
|
4
4
|
const core_1 = require("@angular-devkit/core");
|
|
5
5
|
const ts = require("typescript");
|
|
6
|
+
const typescript_files_1 = require("../typescript-files");
|
|
6
7
|
const class_migration_1 = require("./class-migration");
|
|
7
8
|
const edits_1 = require("./edits");
|
|
8
9
|
const page_classes_1 = require("./page-classes");
|
|
9
10
|
const template_migration_1 = require("./template-migration");
|
|
10
|
-
const SKIPPED_DIRECTORIES = new Set([
|
|
11
|
-
'node_modules',
|
|
12
|
-
'dist',
|
|
13
|
-
'.angular',
|
|
14
|
-
'.git',
|
|
15
|
-
'coverage',
|
|
16
|
-
]);
|
|
17
11
|
/**
|
|
18
12
|
* Migrates the pages of a project to their form and their reference held by signals (prestations-ng 19.2.0): their classes
|
|
19
13
|
* (`migratePageClass()`) and their templates (`migrateTemplate()`), inline or not.
|
|
@@ -33,7 +27,7 @@ function migrateFormSignal(tree, compiler) {
|
|
|
33
27
|
redeclarations: 0,
|
|
34
28
|
warnings: [],
|
|
35
29
|
};
|
|
36
|
-
const files = typeScriptFiles(tree.root);
|
|
30
|
+
const files = (0, typescript_files_1.typeScriptFiles)(tree.root);
|
|
37
31
|
const pages = (0, page_classes_1.findPageClasses)(files);
|
|
38
32
|
const pagesByFile = new Map();
|
|
39
33
|
pages.forEach((page) => {
|
|
@@ -121,7 +115,7 @@ function migrateFormSignal(tree, compiler) {
|
|
|
121
115
|
}
|
|
122
116
|
}
|
|
123
117
|
if (needsObjectPathImport) {
|
|
124
|
-
edits.push(
|
|
118
|
+
edits.push((0, typescript_files_1.prestationsNgImport)(file.source, 'ObjectPath'));
|
|
125
119
|
}
|
|
126
120
|
const migrated = (0, edits_1.applyEdits)(text, edits);
|
|
127
121
|
if (migrated !== text) {
|
|
@@ -130,67 +124,4 @@ function migrateFormSignal(tree, compiler) {
|
|
|
130
124
|
}
|
|
131
125
|
return report;
|
|
132
126
|
}
|
|
133
|
-
|
|
134
|
-
const files = [];
|
|
135
|
-
for (const name of directory.subfiles) {
|
|
136
|
-
if (name.endsWith('.ts') && !name.endsWith('.d.ts')) {
|
|
137
|
-
const entry = directory.file(name);
|
|
138
|
-
if (entry) {
|
|
139
|
-
files.push({
|
|
140
|
-
path: entry.path,
|
|
141
|
-
source: ts.createSourceFile(entry.path, entry.content.toString('utf-8'), ts.ScriptTarget.Latest, true),
|
|
142
|
-
});
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
for (const name of directory.subdirs) {
|
|
147
|
-
if (!SKIPPED_DIRECTORIES.has(name)) {
|
|
148
|
-
files.push(...typeScriptFiles(directory.dir(name)));
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
return files;
|
|
152
|
-
}
|
|
153
|
-
/**
|
|
154
|
-
* Adds `ObjectPath` to the import of `@dsivd/prestations-ng`, or a new import.
|
|
155
|
-
*/
|
|
156
|
-
function objectPathImport(source) {
|
|
157
|
-
var _a, _b;
|
|
158
|
-
const imports = source.statements.filter(ts.isImportDeclaration);
|
|
159
|
-
for (const declaration of imports) {
|
|
160
|
-
const namedBindings = (_a = declaration.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings;
|
|
161
|
-
if (ts.isStringLiteral(declaration.moduleSpecifier) &&
|
|
162
|
-
declaration.moduleSpecifier.text === '@dsivd/prestations-ng' &&
|
|
163
|
-
namedBindings &&
|
|
164
|
-
ts.isNamedImports(namedBindings) &&
|
|
165
|
-
!((_b = declaration.importClause) === null || _b === void 0 ? void 0 : _b.isTypeOnly)) {
|
|
166
|
-
if (namedBindings.elements.some((element) => element.name.text === 'ObjectPath')) {
|
|
167
|
-
return { start: 0, end: 0, text: '' };
|
|
168
|
-
}
|
|
169
|
-
// At its alphabetical place (simple-import-sort), with the separator of the other names
|
|
170
|
-
const elements = namedBindings.elements;
|
|
171
|
-
const next = elements.find((element) => element.name.text.localeCompare('ObjectPath', 'en', {
|
|
172
|
-
sensitivity: 'base',
|
|
173
|
-
}) > 0);
|
|
174
|
-
const separator = elements.length > 1
|
|
175
|
-
? source.text.slice(elements[0].getEnd(), elements[1].getStart(source))
|
|
176
|
-
: ', ';
|
|
177
|
-
if (next) {
|
|
178
|
-
const start = next.getStart(source);
|
|
179
|
-
return { start, end: start, text: `ObjectPath${separator}` };
|
|
180
|
-
}
|
|
181
|
-
const last = elements[elements.length - 1];
|
|
182
|
-
return {
|
|
183
|
-
start: last.getEnd(),
|
|
184
|
-
end: last.getEnd(),
|
|
185
|
-
text: `${separator}ObjectPath`,
|
|
186
|
-
};
|
|
187
|
-
}
|
|
188
|
-
}
|
|
189
|
-
const end = imports.length ? imports[imports.length - 1].getEnd() : 0;
|
|
190
|
-
return {
|
|
191
|
-
start: end,
|
|
192
|
-
end,
|
|
193
|
-
text: `${end ? '\n' : ''}import { ObjectPath } from '@dsivd/prestations-ng';${end ? '' : '\n'}`,
|
|
194
|
-
};
|
|
195
|
-
}
|
|
196
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form-signal-migration.js","sourceRoot":"","sources":["../../../../../projects/prestations-ng/schematics/utility/form-signal/form-signal-migration.ts"],"names":[],"mappings":"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"}
|
|
127
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS1zaWduYWwtbWlncmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvcHJlc3RhdGlvbnMtbmcvc2NoZW1hdGljcy91dGlsaXR5L2Zvcm0tc2lnbmFsL2Zvcm0tc2lnbmFsLW1pZ3JhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQWlDQSw4Q0F5SUM7QUExS0QsK0NBQWdFO0FBRWhFLGlDQUFpQztBQUVqQywwREFBMkU7QUFDM0UsdURBQXFEO0FBQ3JELG1DQUFxRTtBQUNyRSxpREFBeUU7QUFDekUsNkRBQWlFO0FBaUJqRTs7Ozs7OztHQU9HO0FBQ0gsU0FBZ0IsaUJBQWlCLENBQzdCLElBQVUsRUFDVixRQUFrQjtJQUVsQixNQUFNLE1BQU0sR0FBOEI7UUFDdEMsS0FBSyxFQUFFLENBQUM7UUFDUixhQUFhLEVBQUUsQ0FBQztRQUNoQixTQUFTLEVBQUUsQ0FBQztRQUNaLE1BQU0sRUFBRSxDQUFDO1FBQ1QsTUFBTSxFQUFFLENBQUM7UUFDVCxTQUFTLEVBQUUsQ0FBQztRQUNaLGNBQWMsRUFBRSxDQUFDO1FBQ2pCLFFBQVEsRUFBRSxFQUFFO0tBQ2YsQ0FBQztJQUNGLE1BQU0sS0FBSyxHQUFHLElBQUEsa0NBQWUsRUFBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekMsTUFBTSxLQUFLLEdBQUcsSUFBQSw4QkFBZSxFQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3JDLE1BQU0sV0FBVyxHQUFHLElBQUksR0FBRyxFQUE0QixDQUFDO0lBQ3hELEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTs7UUFDbkIsT0FBQSxXQUFXLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDdkIsR0FBRyxDQUFDLE1BQUEsV0FBVyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLG1DQUFJLEVBQUUsQ0FBQztZQUNyQyxJQUFJO1NBQ1As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
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.migrateNeverConnected = migrateNeverConnected;
|
|
4
|
+
const ts = require("typescript");
|
|
5
|
+
const edits_1 = require("./form-signal/edits");
|
|
6
|
+
const typescript_files_1 = require("./typescript-files");
|
|
7
|
+
const STRING_TOKEN = 'neverConnected';
|
|
8
|
+
const TOKEN = 'NEVER_CONNECTED';
|
|
9
|
+
// The calls taking a token as their first argument: inject(), @Inject(), TestBed.inject(), injector.get()
|
|
10
|
+
const INJECTING_CALLS = new Set(['inject', 'Inject', 'get']);
|
|
11
|
+
/**
|
|
12
|
+
* Replaces the string token `'neverConnected'` with `NEVER_CONNECTED` (prestations-ng 19.2.0): `SessionInfo` reads the
|
|
13
|
+
* `InjectionToken` only, a provider of the string is ignored without any error. Rewrites the providers
|
|
14
|
+
* (`{ provide: 'neverConnected', ... }`) and the injections (`inject('neverConnected')`, `@Inject('neverConnected')`),
|
|
15
|
+
* and reports the other uses of the string.
|
|
16
|
+
*
|
|
17
|
+
* @param tree the workspace
|
|
18
|
+
* @returns what was replaced, and what must be checked by hand
|
|
19
|
+
*/
|
|
20
|
+
function migrateNeverConnected(tree) {
|
|
21
|
+
const report = { replaced: 0, warnings: [] };
|
|
22
|
+
for (const file of (0, typescript_files_1.typeScriptFiles)(tree.root)) {
|
|
23
|
+
const source = file.source;
|
|
24
|
+
const edits = [];
|
|
25
|
+
const notReplaced = [];
|
|
26
|
+
const visit = (node) => {
|
|
27
|
+
if ((ts.isStringLiteral(node) ||
|
|
28
|
+
ts.isNoSubstitutionTemplateLiteral(node)) &&
|
|
29
|
+
node.text === STRING_TOKEN) {
|
|
30
|
+
// inject<boolean>('neverConnected' as any): the cast goes with the string
|
|
31
|
+
const token = ts.isAsExpression(node.parent)
|
|
32
|
+
? node.parent
|
|
33
|
+
: node;
|
|
34
|
+
if (isToken(token)) {
|
|
35
|
+
edits.push({
|
|
36
|
+
start: token.getStart(source),
|
|
37
|
+
end: token.getEnd(),
|
|
38
|
+
text: TOKEN,
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
notReplaced.push({
|
|
43
|
+
offset: node.getStart(source),
|
|
44
|
+
text: node.parent.getText(source),
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
ts.forEachChild(node, visit);
|
|
49
|
+
};
|
|
50
|
+
visit(source);
|
|
51
|
+
if (edits.length) {
|
|
52
|
+
report.replaced += edits.length;
|
|
53
|
+
edits.push((0, typescript_files_1.prestationsNgImport)(source, TOKEN));
|
|
54
|
+
}
|
|
55
|
+
const migrated = (0, edits_1.applyEdits)(source.text, edits);
|
|
56
|
+
if (migrated !== source.text) {
|
|
57
|
+
tree.overwrite(file.path, migrated);
|
|
58
|
+
}
|
|
59
|
+
// The lines in the migrated file
|
|
60
|
+
for (const { offset, text } of notReplaced) {
|
|
61
|
+
const shift = edits
|
|
62
|
+
.filter((edit) => edit.end <= offset)
|
|
63
|
+
.reduce((total, edit) => total + edit.text.length - (edit.end - edit.start), 0);
|
|
64
|
+
report.warnings.push(`${file.path}:${(0, edits_1.lineOf)(migrated, offset + shift)}: '${STRING_TOKEN}' not replaced: ${text}`);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return report;
|
|
68
|
+
}
|
|
69
|
+
function isToken(expression) {
|
|
70
|
+
const parent = expression.parent;
|
|
71
|
+
if (ts.isPropertyAssignment(parent)) {
|
|
72
|
+
return (parent.initializer === expression &&
|
|
73
|
+
ts.isIdentifier(parent.name) &&
|
|
74
|
+
parent.name.text === 'provide');
|
|
75
|
+
}
|
|
76
|
+
if (ts.isCallExpression(parent) && parent.arguments[0] === expression) {
|
|
77
|
+
const callee = parent.expression;
|
|
78
|
+
const name = ts.isPropertyAccessExpression(callee)
|
|
79
|
+
? callee.name.text
|
|
80
|
+
: ts.isIdentifier(callee)
|
|
81
|
+
? callee.text
|
|
82
|
+
: undefined;
|
|
83
|
+
return !!name && INJECTING_CALLS.has(name);
|
|
84
|
+
}
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV2ZXItY29ubmVjdGVkLW1pZ3JhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3ByZXN0YXRpb25zLW5nL3NjaGVtYXRpY3MvdXRpbGl0eS9uZXZlci1jb25uZWN0ZWQtbWlncmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBMkJBLHNEQXlEQztBQW5GRCxpQ0FBaUM7QUFFakMsK0NBQStEO0FBQy9ELHlEQUEwRTtBQUUxRSxNQUFNLFlBQVksR0FBRyxnQkFBZ0IsQ0FBQztBQUN0QyxNQUFNLEtBQUssR0FBRyxpQkFBaUIsQ0FBQztBQUNoQywwR0FBMEc7QUFDMUcsTUFBTSxlQUFlLEdBQUcsSUFBSSxHQUFHLENBQUMsQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7QUFTN0Q7Ozs7Ozs7O0dBUUc7QUFDSCxTQUFnQixxQkFBcUIsQ0FDakMsSUFBVTtJQUVWLE1BQU0sTUFBTSxHQUFrQyxFQUFFLFFBQVEsRUFBRSxDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQzVFLEtBQUssTUFBTSxJQUFJLElBQUksSUFBQSxrQ0FBZSxFQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQzVDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDM0IsTUFBTSxLQUFLLEdBQVcsRUFBRSxDQUFDO1FBQ3pCLE1BQU0sV0FBVyxHQUF1QyxFQUFFLENBQUM7UUFDM0QsTUFBTSxLQUFLLEdBQUcsQ0FBQyxJQUFhLEVBQVEsRUFBRTtZQUNsQyxJQUNJLENBQUMsRUFBRSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUM7Z0JBQ3JCLEVBQUUsQ0FBQywrQkFBK0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDN0MsSUFBSSxDQUFDLElBQUksS0FBSyxZQUFZLEVBQzVCLENBQUM7Z0JBQ0MsMEVBQTBFO2dCQUMxRSxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7b0JBQ3hDLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTTtvQkFDYixDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUNYLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7b0JBQ2pCLEtBQUssQ0FBQyxJQUFJLENBQUM7d0JBQ1AsS0FBSyxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDO3dCQUM3QixHQUFHLEVBQUUsS0FBSyxDQUFDLE1BQU0sRUFBRTt3QkFDbkIsSUFBSSxFQUFFLEtBQUs7cUJBQ2QsQ0FBQyxDQUFDO2dCQUNQLENBQUM7cUJBQU0sQ0FBQztvQkFDSixXQUFXLENBQUMsSUFBSSxDQUFDO3dCQUNiLE1BQU0sRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQzt3QkFDN0IsSUFBSSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQztxQkFDcEMsQ0FBQyxDQUFDO2dCQUNQLENBQUM7WUFDTCxDQUFDO1lBQ0QsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDakMsQ0FBQyxDQUFDO1FBQ0YsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ2QsSUFBSSxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDZixNQUFNLENBQUMsUUFBUSxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUM7WUFDaEMsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFBLHNDQUFtQixFQUFDLE1BQU0sRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQ25ELENBQUM7UUFDRCxNQUFNLFFBQVEsR0FBRyxJQUFBLGtCQUFVLEVBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNoRCxJQUFJLFFBQVEsS0FBSyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDM0IsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ3hDLENBQUM7UUFDRCxpQ0FBaUM7UUFDakMsS0FBSyxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxJQUFJLFdBQVcsRUFBRSxDQUFDO1lBQ3pDLE1BQU0sS0FBSyxHQUFHLEtBQUs7aUJBQ2QsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFJLE1BQU0sQ0FBQztpQkFDcEMsTUFBTSxDQUNILENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxFQUFFLENBQ1osS0FBSyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQ3RELENBQUMsQ0FDSixDQUFDO1lBQ04sTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQ2hCLEdBQUcsSUFBSSxDQUFDLElBQUksSUFBSSxJQUFBLGNBQU0sRUFBQyxRQUFRLEVBQUUsTUFBTSxHQUFHLEtBQUssQ0FBQyxNQUFNLFlBQVksbUJBQW1CLElBQUksRUFBRSxDQUM5RixDQUFDO1FBQ04sQ0FBQztJQUNMLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQztBQUNsQixDQUFDO0FBRUQsU0FBUyxPQUFPLENBQUMsVUFBeUI7SUFDdEMsTUFBTSxNQUFNLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQztJQUNqQyxJQUFJLEVBQUUsQ0FBQyxvQkFBb0IsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1FBQ2xDLE9BQU8sQ0FDSCxNQUFNLENBQUMsV0FBVyxLQUFLLFVBQVU7WUFDakMsRUFBRSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDO1lBQzVCLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxLQUFLLFNBQVMsQ0FDakMsQ0FBQztJQUNOLENBQUM7SUFDRCxJQUFJLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLFVBQVUsRUFBRSxDQUFDO1FBQ3BFLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUM7UUFDakMsTUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDLDBCQUEwQixDQUFDLE1BQU0sQ0FBQztZQUM5QyxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJO1lBQ2xCLENBQUMsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQztnQkFDdkIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJO2dCQUNiLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDbEIsT0FBTyxDQUFDLENBQUMsSUFBSSxJQUFJLGVBQWUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUNELE9BQU8sS0FBSyxDQUFDO0FBQ2pCLENBQUMifQ==
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.typeScriptFiles = typeScriptFiles;
|
|
4
|
+
exports.prestationsNgImport = prestationsNgImport;
|
|
5
|
+
const ts = require("typescript");
|
|
6
|
+
const SKIPPED_DIRECTORIES = new Set([
|
|
7
|
+
'node_modules',
|
|
8
|
+
'dist',
|
|
9
|
+
'.angular',
|
|
10
|
+
'.git',
|
|
11
|
+
'coverage',
|
|
12
|
+
]);
|
|
13
|
+
/**
|
|
14
|
+
* @param directory a directory of the workspace
|
|
15
|
+
* @returns its TypeScript files and the ones of its subdirectories, parsed, except the declaration files and the
|
|
16
|
+
* generated or installed directories (`node_modules`, `dist`...)
|
|
17
|
+
*/
|
|
18
|
+
function typeScriptFiles(directory) {
|
|
19
|
+
const files = [];
|
|
20
|
+
for (const name of directory.subfiles) {
|
|
21
|
+
if (name.endsWith('.ts') && !name.endsWith('.d.ts')) {
|
|
22
|
+
const entry = directory.file(name);
|
|
23
|
+
if (entry) {
|
|
24
|
+
files.push({
|
|
25
|
+
path: entry.path,
|
|
26
|
+
source: ts.createSourceFile(entry.path, entry.content.toString('utf-8'), ts.ScriptTarget.Latest, true),
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
for (const name of directory.subdirs) {
|
|
32
|
+
if (!SKIPPED_DIRECTORIES.has(name)) {
|
|
33
|
+
files.push(...typeScriptFiles(directory.dir(name)));
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return files;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Imports a name of `@dsivd/prestations-ng`: adds it to the import of `@dsivd/prestations-ng`, or adds a new import.
|
|
40
|
+
* Nothing when the file already imports it, from `@dsivd/prestations-ng` or one of its paths.
|
|
41
|
+
*
|
|
42
|
+
* @param source the file
|
|
43
|
+
* @param name the name to import
|
|
44
|
+
* @returns the edit of the file
|
|
45
|
+
*/
|
|
46
|
+
function prestationsNgImport(source, name) {
|
|
47
|
+
var _a, _b;
|
|
48
|
+
const imports = source.statements.filter(ts.isImportDeclaration);
|
|
49
|
+
const imported = imports.some((declaration) => {
|
|
50
|
+
var _a;
|
|
51
|
+
const namedBindings = (_a = declaration.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings;
|
|
52
|
+
return (ts.isStringLiteral(declaration.moduleSpecifier) &&
|
|
53
|
+
declaration.moduleSpecifier.text.startsWith('@dsivd/prestations-ng') &&
|
|
54
|
+
!!namedBindings &&
|
|
55
|
+
ts.isNamedImports(namedBindings) &&
|
|
56
|
+
namedBindings.elements.some((element) => element.name.text === name));
|
|
57
|
+
});
|
|
58
|
+
if (imported) {
|
|
59
|
+
return { start: 0, end: 0, text: '' };
|
|
60
|
+
}
|
|
61
|
+
for (const declaration of imports) {
|
|
62
|
+
const namedBindings = (_a = declaration.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings;
|
|
63
|
+
if (ts.isStringLiteral(declaration.moduleSpecifier) &&
|
|
64
|
+
declaration.moduleSpecifier.text === '@dsivd/prestations-ng' &&
|
|
65
|
+
namedBindings &&
|
|
66
|
+
ts.isNamedImports(namedBindings) &&
|
|
67
|
+
!((_b = declaration.importClause) === null || _b === void 0 ? void 0 : _b.isTypeOnly)) {
|
|
68
|
+
// At its alphabetical place (simple-import-sort), with the separator of the other names
|
|
69
|
+
const elements = namedBindings.elements;
|
|
70
|
+
const next = elements.find((element) => element.name.text.localeCompare(name, 'en', {
|
|
71
|
+
sensitivity: 'base',
|
|
72
|
+
}) > 0);
|
|
73
|
+
const separator = elements.length > 1
|
|
74
|
+
? source.text.slice(elements[0].getEnd(), elements[1].getStart(source))
|
|
75
|
+
: ', ';
|
|
76
|
+
if (next) {
|
|
77
|
+
const start = next.getStart(source);
|
|
78
|
+
return { start, end: start, text: `${name}${separator}` };
|
|
79
|
+
}
|
|
80
|
+
const last = elements[elements.length - 1];
|
|
81
|
+
return {
|
|
82
|
+
start: last.getEnd(),
|
|
83
|
+
end: last.getEnd(),
|
|
84
|
+
text: `${separator}${name}`,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
const end = imports.length ? imports[imports.length - 1].getEnd() : 0;
|
|
89
|
+
return {
|
|
90
|
+
start: end,
|
|
91
|
+
end,
|
|
92
|
+
text: `${end ? '\n' : ''}import { ${name} } from '@dsivd/prestations-ng';${end ? '' : '\n'}`,
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXNjcmlwdC1maWxlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3ByZXN0YXRpb25zLW5nL3NjaGVtYXRpY3MvdXRpbGl0eS90eXBlc2NyaXB0LWZpbGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBbUJBLDBDQXdCQztBQVVELGtEQTJEQztBQS9HRCxpQ0FBaUM7QUFLakMsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLEdBQUcsQ0FBQztJQUNoQyxjQUFjO0lBQ2QsTUFBTTtJQUNOLFVBQVU7SUFDVixNQUFNO0lBQ04sVUFBVTtDQUNiLENBQUMsQ0FBQztBQUVIOzs7O0dBSUc7QUFDSCxTQUFnQixlQUFlLENBQUMsU0FBbUI7SUFDL0MsTUFBTSxLQUFLLEdBQWtCLEVBQUUsQ0FBQztJQUNoQyxLQUFLLE1BQU0sSUFBSSxJQUFJLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNwQyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDbEQsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuQyxJQUFJLEtBQUssRUFBRSxDQUFDO2dCQUNSLEtBQUssQ0FBQyxJQUFJLENBQUM7b0JBQ1AsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJO29CQUNoQixNQUFNLEVBQUUsRUFBRSxDQUFDLGdCQUFnQixDQUN2QixLQUFLLENBQUMsSUFBSSxFQUNWLEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUMvQixFQUFFLENBQUMsWUFBWSxDQUFDLE1BQU0sRUFDdEIsSUFBSSxDQUNQO2lCQUNKLENBQUMsQ0FBQztZQUNQLENBQUM7UUFDTCxDQUFDO0lBQ0wsQ0FBQztJQUNELEtBQUssTUFBTSxJQUFJLElBQUksU0FBUyxDQUFDLE9BQU8s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
|
|
@@ -20,6 +20,9 @@ const templateRules = (plugin) => [
|
|
|
20
20
|
// loses the focus at every input
|
|
21
21
|
'@dsivd/prestations-ng/require-model-change': 'error',
|
|
22
22
|
'@dsivd/prestations-ng/no-item-track-in-form-list': 'error',
|
|
23
|
+
// The rows naming their fields with their index keep these names
|
|
24
|
+
// only when tracked by $index
|
|
25
|
+
'@dsivd/prestations-ng/require-track-index': 'error',
|
|
23
26
|
},
|
|
24
27
|
},
|
|
25
28
|
];
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import * as templateParser from '@angular-eslint/template-parser';
|
|
2
|
+
import { RuleTester } from 'eslint';
|
|
3
|
+
import { describe, it } from 'vitest';
|
|
4
|
+
import rule from '../require-track-index.mjs';
|
|
5
|
+
|
|
6
|
+
describe('require-track-index', () => {
|
|
7
|
+
const ruleTester = new RuleTester({
|
|
8
|
+
languageOptions: { parser: templateParser },
|
|
9
|
+
});
|
|
10
|
+
|
|
11
|
+
const namedRows = (forHeader, name = `[name]="'children[' + $index + '].firstName'"`) =>
|
|
12
|
+
`@for (${forHeader}) {
|
|
13
|
+
<foehn-input-text
|
|
14
|
+
${name}
|
|
15
|
+
[model]="child.firstName"
|
|
16
|
+
(modelChange)="patchForm(['children', $index, 'firstName'], $event)"
|
|
17
|
+
/>
|
|
18
|
+
}`;
|
|
19
|
+
|
|
20
|
+
const reported = (code, track, binding) => ({
|
|
21
|
+
code,
|
|
22
|
+
errors: [
|
|
23
|
+
{
|
|
24
|
+
messageId: 'indexTrack',
|
|
25
|
+
data: { track, binding },
|
|
26
|
+
suggestions: [
|
|
27
|
+
{
|
|
28
|
+
messageId: 'trackByIndex',
|
|
29
|
+
output: code.replace(`track ${track}`, 'track $index'),
|
|
30
|
+
},
|
|
31
|
+
],
|
|
32
|
+
},
|
|
33
|
+
],
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
it('should report the rows naming their fields with their index, not tracked by it', () => {
|
|
37
|
+
ruleTester.run('require-track-index', rule, {
|
|
38
|
+
valid: [
|
|
39
|
+
namedRows('child of children(); track $index'),
|
|
40
|
+
namedRows(
|
|
41
|
+
'child of children(); track i; let i = $index',
|
|
42
|
+
`[name]="'children[' + i + '].firstName'"`,
|
|
43
|
+
),
|
|
44
|
+
namedRows('child of children(); track $index', 'name="child{{ $index }}"'),
|
|
45
|
+
// The names don't depend on the position of the row
|
|
46
|
+
namedRows('child of children(); track child.id', `[name]="'child-' + child.id"`),
|
|
47
|
+
namedRows('child of children(); track child.id', 'name="firstName"'),
|
|
48
|
+
// Another variable of the @for
|
|
49
|
+
namedRows(
|
|
50
|
+
'child of children(); track child.id; let first = $first',
|
|
51
|
+
`[name]="'children' + first"`,
|
|
52
|
+
),
|
|
53
|
+
// The names use the index of the inner @for only, tracked by it
|
|
54
|
+
`@for (group of groups(); track group.id) {
|
|
55
|
+
@for (child of group.children; track $index) {
|
|
56
|
+
<input [name]="'children[' + $index + ']'" />
|
|
57
|
+
}
|
|
58
|
+
}`,
|
|
59
|
+
// A name read on another object
|
|
60
|
+
namedRows('child of children(); track child.id', `[name]="child.$index"`),
|
|
61
|
+
// An input that isn't a name
|
|
62
|
+
`@for (child of children(); track child.id) {
|
|
63
|
+
<foehn-input-text [label]="'Child ' + $index" name="firstName" />
|
|
64
|
+
}`,
|
|
65
|
+
],
|
|
66
|
+
invalid: [
|
|
67
|
+
reported(
|
|
68
|
+
namedRows('child of children(); track child.id'),
|
|
69
|
+
'child.id',
|
|
70
|
+
`name="'children[' + $index + '].firstName'"`,
|
|
71
|
+
),
|
|
72
|
+
reported(
|
|
73
|
+
namedRows('child of form.children; track child'),
|
|
74
|
+
'child',
|
|
75
|
+
`name="'children[' + $index + '].firstName'"`,
|
|
76
|
+
),
|
|
77
|
+
reported(
|
|
78
|
+
namedRows(
|
|
79
|
+
'child of children(); track child.trackingIndex; let i = $index',
|
|
80
|
+
'name="child{{ i }}"',
|
|
81
|
+
),
|
|
82
|
+
'child.trackingIndex',
|
|
83
|
+
'name="child{{ i }}"',
|
|
84
|
+
),
|
|
85
|
+
// The errors of the row (foehn-list-summary)
|
|
86
|
+
reported(
|
|
87
|
+
`@for (item of model(); track trackFoehnListItem(itemIndex, item); let itemIndex = $index) {
|
|
88
|
+
<foehn-error-pill [errorPrefix]="name() + '[' + itemIndex + ']'" />
|
|
89
|
+
}`,
|
|
90
|
+
'trackFoehnListItem(itemIndex, item)',
|
|
91
|
+
`errorPrefix="name() + '[' + itemIndex + ']'"`,
|
|
92
|
+
),
|
|
93
|
+
// The names use the index of the outer @for: the outer one is reported
|
|
94
|
+
reported(
|
|
95
|
+
`@for (group of groups(); track group.id; let g = $index) {
|
|
96
|
+
@for (child of group.children; track $index) {
|
|
97
|
+
<input [name]="'groups[' + g + '].children[' + $index + ']'" />
|
|
98
|
+
}
|
|
99
|
+
}`,
|
|
100
|
+
'group.id',
|
|
101
|
+
`name="'groups[' + g + '].children[' + $index + ']'"`,
|
|
102
|
+
),
|
|
103
|
+
],
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
});
|
|
@@ -2,10 +2,12 @@ import noDirectSignalMutation from './no-direct-signal-mutation.mjs';
|
|
|
2
2
|
import noItemTrackInFormList from './no-item-track-in-form-list.mjs';
|
|
3
3
|
import noUninvokedSignalInTemplate from './no-uninvoked-signal-in-template.mjs';
|
|
4
4
|
import requireModelChange from './require-model-change.mjs';
|
|
5
|
+
import requireTrackIndex from './require-track-index.mjs';
|
|
5
6
|
|
|
6
7
|
export default {
|
|
7
8
|
'no-direct-signal-mutation': noDirectSignalMutation,
|
|
8
9
|
'no-item-track-in-form-list': noItemTrackInFormList,
|
|
9
10
|
'no-uninvoked-signal-in-template': noUninvokedSignalInTemplate,
|
|
10
11
|
'require-model-change': requireModelChange,
|
|
12
|
+
'require-track-index': requireTrackIndex,
|
|
11
13
|
};
|
|
@@ -11,8 +11,9 @@ import { astOf, resolveRoot } from "../form-reads.mjs";
|
|
|
11
11
|
* `FoehnInputComponent` writes a new list in its model, its items replaced (`updateNgModel()`).
|
|
12
12
|
* A row tracked by its item is then destroyed and created again at every input, and the field
|
|
13
13
|
* being edited loses the focus; two items equal by value (e.g. two empty strings) even collide.
|
|
14
|
-
* Track the rows by `$index
|
|
15
|
-
*
|
|
14
|
+
* Track the rows by `$index`: an identifier of the item (`track child.id`), which the copy keeps,
|
|
15
|
+
* only when the rows name nothing with their index (see `require-track-index`, which reports
|
|
16
|
+
* these lists too when they do).
|
|
16
17
|
*
|
|
17
18
|
* A row edits its item when one of its elements has a `model` read from it
|
|
18
19
|
* (`[model]="child.firstName"`, `[(model)]="child"`), or read from the list at the index of
|
|
@@ -108,7 +109,7 @@ export default {
|
|
|
108
109
|
schema: [],
|
|
109
110
|
messages: {
|
|
110
111
|
itemTrack:
|
|
111
|
-
"The rows of this list are tracked by their item ('track {{item}}'): writing an item replaces it, so its row is created again and the field being edited loses the focus. Track the rows by $index
|
|
112
|
+
"The rows of this list are tracked by their item ('track {{item}}'): writing an item replaces it, so its row is created again and the field being edited loses the focus. Track the rows by $index (by an identifier of the item only when the rows name nothing with their index).",
|
|
112
113
|
trackByIndex: "Track the rows by $index",
|
|
113
114
|
},
|
|
114
115
|
},
|