@dsivd/prestations-ng 19.1.0 → 19.2.0-beta.1
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/CHANGELOG.md +21 -0
- package/GOOD_PRACTICES.md +150 -102
- package/UPGRADING_V18.md +1 -0
- package/UPGRADING_V19.md +43 -2
- package/dsivd-prestations-ng-19.2.0-beta.1.tgz +0 -0
- package/eslint/signal-names.mjs +66 -35
- package/fesm2022/dsivd-prestations-ng.mjs +3885 -3436
- package/fesm2022/dsivd-prestations-ng.mjs.map +1 -1
- package/package.json +1 -1
- package/schematics/utility/add-allow-synthetic-default-imports.js +2 -2
- package/schematics/utility/add-allowed-common-js-dependencies.js +2 -2
- package/schematics/utility/foehn2-bootstrap5-migration.js +20 -20
- package/schematics/utility/migrate-to-karma-coverage.js +2 -2
- package/schematics/utility/remove-emit-decorator-metadata.js +2 -2
- package/src/eslint/__tests__/signal-names.test.mjs +129 -0
- package/src/eslint/signal-names.mjs +66 -35
- package/types/dsivd-prestations-ng.d.ts +942 -913
- package/dsivd-prestations-ng-19.1.0.tgz +0 -0
package/package.json
CHANGED
|
@@ -9,11 +9,11 @@ const addAllowSyntheticDefaultImports = (tree) => {
|
|
|
9
9
|
}
|
|
10
10
|
const json = JSON.parse(file.toString());
|
|
11
11
|
const compilerOptions = json.compilerOptions;
|
|
12
|
-
if (!Object.
|
|
12
|
+
if (!Object.hasOwn(compilerOptions, 'allowSyntheticDefaultImports') ||
|
|
13
13
|
!json.compilerOptions.allowSyntheticDefaultImports) {
|
|
14
14
|
json.compilerOptions.allowSyntheticDefaultImports = true;
|
|
15
15
|
tree.overwrite(tsConfig, JSON.stringify(json, null, 2));
|
|
16
16
|
}
|
|
17
17
|
};
|
|
18
18
|
exports.addAllowSyntheticDefaultImports = addAllowSyntheticDefaultImports;
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkLWFsbG93LXN5bnRoZXRpYy1kZWZhdWx0LWltcG9ydHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9wcmVzdGF0aW9ucy1uZy9zY2hlbWF0aWNzL3V0aWxpdHkvYWRkLWFsbG93LXN5bnRoZXRpYy1kZWZhdWx0LWltcG9ydHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRU8sTUFBTSwrQkFBK0IsR0FBRyxDQUFDLElBQVUsRUFBUSxFQUFFO0lBQ2hFLE1BQU0sUUFBUSxHQUFHLGVBQWUsQ0FBQztJQUNqQyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2pDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNSLE9BQU87SUFDWCxDQUFDO0lBRUQsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUN6QyxNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDO0lBQzdDLElBQ0ksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLGVBQWUsRUFBRSw4QkFBOEIsQ0FBQztRQUMvRCxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsNEJBQTRCLEVBQ3BELENBQUM7UUFDQyxJQUFJLENBQUMsZUFBZSxDQUFDLDRCQUE0QixHQUFHLElBQUksQ0FBQztRQUV6RCxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM1RCxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBakJXLFFBQUEsK0JBQStCLG1DQWlCMUMifQ==
|
|
@@ -24,7 +24,7 @@ const addAllowedCommonJsDependencies = (tree) => {
|
|
|
24
24
|
'iban',
|
|
25
25
|
'zone.js/dist/zone-error',
|
|
26
26
|
];
|
|
27
|
-
if (Object.
|
|
27
|
+
if (Object.hasOwn(buildOptions, 'allowedCommonJsDependencies')) {
|
|
28
28
|
// Do not add dependency if already exist
|
|
29
29
|
const existingDeps = [...buildOptions.allowedCommonJsDependencies];
|
|
30
30
|
arrayOfDependenciesToAdd.forEach((dep) => {
|
|
@@ -39,4 +39,4 @@ const addAllowedCommonJsDependencies = (tree) => {
|
|
|
39
39
|
tree.overwrite(pathToAngularJson, JSON.stringify(json, null, 2));
|
|
40
40
|
};
|
|
41
41
|
exports.addAllowedCommonJsDependencies = addAllowedCommonJsDependencies;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkLWFsbG93ZWQtY29tbW9uLWpzLWRlcGVuZGVuY2llcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3ByZXN0YXRpb25zLW5nL3NjaGVtYXRpY3MvdXRpbGl0eS9hZGQtYWxsb3dlZC1jb21tb24tanMtZGVwZW5kZW5jaWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDJEQUF1RTtBQUVoRSxNQUFNLDhCQUE4QixHQUFHLENBQUMsSUFBVSxFQUFRLEVBQUU7SUFDL0QsTUFBTSxpQkFBaUIsR0FBRyxjQUFjLENBQUM7SUFDekMsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQzFDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNSLG9EQUFvRDtRQUNwRCxPQUFPO0lBQ1gsQ0FBQztJQUVELE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDekMsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQztJQUN4QyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDZixNQUFNLElBQUksZ0NBQW1CLENBQ3pCLGtGQUFrRixDQUNyRixDQUFDO0lBQ04sQ0FBQztJQUVELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDM0MsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ1gsTUFBTSxJQUFJLGdDQUFtQixDQUN6Qix3Q0FBd0MsV0FBVyw4QkFBOEIsQ0FDcEYsQ0FBQztJQUNOLENBQUM7SUFFRCxNQUFNLFlBQVksR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUM7SUFDckQsTUFBTSx3QkFBd0IsR0FBRztRQUM3QixtQ0FBbUM7UUFDbkMsTUFBTTtRQUNOLHlCQUF5QjtLQUM1QixDQUFDO0lBRUYsSUFBSSxNQUFNLENBQUMsTUFBTSxDQUFDLFlBQVksRUFBRSw2QkFBNkIsQ0FBQyxFQUFFLENBQUM7UUFDN0QseUNBQXlDO1FBQ3pDLE1BQU0sWUFBWSxHQUFHLENBQUMsR0FBRyxZQUFZLENBQUMsMkJBQTJCLENBQUMsQ0FBQztRQUNuRSx3QkFBd0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFXLEVBQUUsRUFBRTtZQUM3QyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUM5QixZQUFZLENBQUMsMkJBQTJCLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3ZELENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7U0FBTSxDQUFDO1FBQ0osWUFBWSxDQUFDLDJCQUEyQixHQUFHLHdCQUF3QixDQUFDO0lBQ3hFLENBQUM7SUFFRCxJQUFJLENBQUMsU0FBUyxDQUFDLGlCQUFpQixFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3JFLENBQUMsQ0FBQztBQTNDVyxRQUFBLDhCQUE4QixrQ0EyQ3pDIn0=
|
|
@@ -164,23 +164,23 @@ exports.foehn2ClassNamesToMigrate = [
|
|
|
164
164
|
];
|
|
165
165
|
const fixWrongReplacementsForCss = (migrationResult, classNameToMigrate) => {
|
|
166
166
|
if (classNameToMigrate.className === 'vd-highlight') {
|
|
167
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
167
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/\.vd-highlight\.highlight-dark\.highlight-dark/g, () => {
|
|
168
168
|
migrationResult.nbCssClassChanged--;
|
|
169
169
|
return '.vd-highlight.highlight-dark';
|
|
170
170
|
});
|
|
171
171
|
}
|
|
172
172
|
if (classNameToMigrate.className === 'form-group') {
|
|
173
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
173
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/\.form-group\.mb-3\.mb-3/g, () => {
|
|
174
174
|
migrationResult.nbCssClassChanged--;
|
|
175
175
|
return '.form-group.mb-3';
|
|
176
176
|
});
|
|
177
177
|
}
|
|
178
178
|
if (classNameToMigrate.className === 'btn-link') {
|
|
179
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
179
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/\.btn\.btn\.btn-link/g, () => {
|
|
180
180
|
migrationResult.nbCssClassChanged--;
|
|
181
181
|
return '.btn.btn-link';
|
|
182
182
|
});
|
|
183
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
183
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/\.btn \.btn\.btn-link/g, () => {
|
|
184
184
|
migrationResult.nbCssClassChanged--;
|
|
185
185
|
return '.btn .btn-link';
|
|
186
186
|
});
|
|
@@ -188,55 +188,55 @@ const fixWrongReplacementsForCss = (migrationResult, classNameToMigrate) => {
|
|
|
188
188
|
};
|
|
189
189
|
const fixWrongReplacementsForHtmlOrTs = (migrationResult, classNameToMigrate) => {
|
|
190
190
|
if (classNameToMigrate.className === 'form-group') {
|
|
191
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
191
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/autocomplete-mb-3/g, () => {
|
|
192
192
|
migrationResult.nbCssClassChanged--;
|
|
193
193
|
return 'autocomplete-form-group';
|
|
194
194
|
});
|
|
195
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
195
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/autocomplete-form-group mb-3/g, () => {
|
|
196
196
|
migrationResult.nbCssClassChanged--;
|
|
197
197
|
return 'autocomplete-form-group';
|
|
198
198
|
});
|
|
199
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
199
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/clearable-input-mb-3/g, () => {
|
|
200
200
|
migrationResult.nbCssClassChanged--;
|
|
201
201
|
return 'clearable-input-form-group';
|
|
202
202
|
});
|
|
203
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
203
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/clearable-input-form-group mb-3/g, () => {
|
|
204
204
|
migrationResult.nbCssClassChanged--;
|
|
205
205
|
return 'clearable-input-form-group';
|
|
206
206
|
});
|
|
207
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
207
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/form-group mb-3 mb-3/g, () => {
|
|
208
208
|
migrationResult.nbCssClassChanged--;
|
|
209
209
|
return 'form-group mb-3';
|
|
210
210
|
});
|
|
211
211
|
}
|
|
212
212
|
if (classNameToMigrate.className === 'close') {
|
|
213
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
213
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/btn-btn-close/g, () => {
|
|
214
214
|
migrationResult.nbCssClassChanged--;
|
|
215
215
|
return 'btn-close';
|
|
216
216
|
});
|
|
217
217
|
}
|
|
218
218
|
if (classNameToMigrate.className === 'vd-highlight') {
|
|
219
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
219
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/vd-highlight highlight-dark highlight-dark/g, () => {
|
|
220
220
|
migrationResult.nbCssClassChanged--;
|
|
221
221
|
return 'vd-highlight highlight-dark';
|
|
222
222
|
});
|
|
223
223
|
}
|
|
224
224
|
if (classNameToMigrate.className === 'btn-link') {
|
|
225
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
225
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/btn btn btn-link/g, () => {
|
|
226
226
|
migrationResult.nbCssClassChanged--;
|
|
227
227
|
return 'btn btn-link';
|
|
228
228
|
});
|
|
229
229
|
}
|
|
230
230
|
};
|
|
231
231
|
const manageHtmlSpecialCases = (migrationResult) => {
|
|
232
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
232
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/(<select[^>]*(class|\[ngClass])\s*=[-"'\s\w?:{]*)\bform-control\b([^'"]*'?['"])/g,
|
|
233
233
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
234
234
|
// @ts-ignore
|
|
235
235
|
(match, p1, p2, p3) => {
|
|
236
236
|
migrationResult.nbCssClassChanged++;
|
|
237
237
|
return `${p1}form-select${p3}`;
|
|
238
238
|
});
|
|
239
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
239
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(/(<select[^>]*\[class\.\s*)\bform-control\b([-\w]*]=\s*['"]'?[^'"]*[^'"]*'?['"])/g,
|
|
240
240
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
241
241
|
// @ts-ignore
|
|
242
242
|
(match, p1, p2) => {
|
|
@@ -255,7 +255,7 @@ const renameInCssFile = (migrationResult, classNameToMigrate) => {
|
|
|
255
255
|
const regex = new RegExp(classNameToMigrate.isTag
|
|
256
256
|
? classNameToMigrate.className
|
|
257
257
|
: `.${classNameToMigrate.className}`.replaceAll('.', '\\.'), 'g');
|
|
258
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
258
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(regex, () => {
|
|
259
259
|
migrationResult.nbCssClassChanged++;
|
|
260
260
|
return classNameToMigrate.isTag ? replacement : `.${replacement}`;
|
|
261
261
|
});
|
|
@@ -265,7 +265,7 @@ const renameInHtmlOrTsFile = (migrationResult, classNameToMigrate) => {
|
|
|
265
265
|
return;
|
|
266
266
|
}
|
|
267
267
|
const classRegex = new RegExp(`(<[^>]*class\\s*=\\s*['"][^'"]*)\\b${classNameToMigrate.className}\\b([^'"]*['"])`, 'g');
|
|
268
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
268
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(classRegex,
|
|
269
269
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
270
270
|
// @ts-ignore
|
|
271
271
|
(match, p1, p2) => {
|
|
@@ -273,7 +273,7 @@ const renameInHtmlOrTsFile = (migrationResult, classNameToMigrate) => {
|
|
|
273
273
|
return `${p1}${classNameToMigrate.replacement}${p2}`;
|
|
274
274
|
});
|
|
275
275
|
const ngClassRegex = new RegExp(`(<[^>]*ngClass]\\s*=\\s*[-"'\\s\\w?:{]*)\\b${classNameToMigrate.className}\\b([^'"]*'?['"])`, 'g');
|
|
276
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
276
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(ngClassRegex,
|
|
277
277
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
278
278
|
// @ts-ignore
|
|
279
279
|
(match, p1, p2) => {
|
|
@@ -281,7 +281,7 @@ const renameInHtmlOrTsFile = (migrationResult, classNameToMigrate) => {
|
|
|
281
281
|
return `${p1}${classNameToMigrate.replacement}${p2}`;
|
|
282
282
|
});
|
|
283
283
|
const classDotRegex = new RegExp(`(<[^>]*\\[class\\.\\s*)\\b${classNameToMigrate.className}\\b([-\\w]*])`, 'g');
|
|
284
|
-
migrationResult.fileContent = migrationResult.fileContent.
|
|
284
|
+
migrationResult.fileContent = migrationResult.fileContent.replaceAll(classDotRegex,
|
|
285
285
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
286
286
|
// @ts-ignore
|
|
287
287
|
(match, p1, p2) => {
|
|
@@ -344,7 +344,7 @@ const migrateToFoehn2 = (migrationResult, fileExtension) => {
|
|
|
344
344
|
const getFilesPath = (tree, dir, filesPath, fileExtension) => {
|
|
345
345
|
var _a;
|
|
346
346
|
const subdirs = dir.subdirs;
|
|
347
|
-
if (
|
|
347
|
+
if (subdirs === null || subdirs === void 0 ? void 0 : subdirs.length) {
|
|
348
348
|
subdirs.forEach((subDir) => {
|
|
349
349
|
const subDirValue = tree.getDir(`${dir.path}/${subDir}`);
|
|
350
350
|
getFilesPath(tree, subDirValue, filesPath, fileExtension);
|
|
@@ -387,4 +387,4 @@ const migrateToFoehn2Bootstrap5 = (tree, fileExtension, migrationResult, sourceR
|
|
|
387
387
|
});
|
|
388
388
|
};
|
|
389
389
|
exports.migrateToFoehn2Bootstrap5 = migrateToFoehn2Bootstrap5;
|
|
390
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"foehn2-bootstrap5-migration.js","sourceRoot":"","sources":["../../../../projects/prestations-ng/schematics/utility/foehn2-bootstrap5-migration.ts"],"names":[],"mappings":"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"}
|
|
390
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"foehn2-bootstrap5-migration.js","sourceRoot":"","sources":["../../../../projects/prestations-ng/schematics/utility/foehn2-bootstrap5-migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ const modifyPackageJson = (tree) => {
|
|
|
15
15
|
return;
|
|
16
16
|
}
|
|
17
17
|
const karmaCoverageIstanbulReporter = 'karma-coverage-istanbul-reporter';
|
|
18
|
-
if (!Object.
|
|
18
|
+
if (!Object.hasOwn(devDependencies, karmaCoverageIstanbulReporter)) {
|
|
19
19
|
// nothing to do
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
@@ -48,4 +48,4 @@ const migrateToKarmaCoverage = (tree) => {
|
|
|
48
48
|
return true;
|
|
49
49
|
};
|
|
50
50
|
exports.migrateToKarmaCoverage = migrateToKarmaCoverage;
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlncmF0ZS10by1rYXJtYS1jb3ZlcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3ByZXN0YXRpb25zLW5nL3NjaGVtYXRpY3MvdXRpbGl0eS9taWdyYXRlLXRvLWthcm1hLWNvdmVyYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVPLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxJQUFVLEVBQVEsRUFBRTtJQUNsRCxNQUFNLGlCQUFpQixHQUFHLGNBQWMsQ0FBQztJQUN6QyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDMUMsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ1IsZ0JBQWdCO1FBQ2hCLE9BQU87SUFDWCxDQUFDO0lBRUQsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUN6QyxNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDO0lBQzdDLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztRQUNuQixnQkFBZ0I7UUFDaEIsT0FBTztJQUNYLENBQUM7SUFFRCxNQUFNLDZCQUE2QixHQUFHLGtDQUFrQyxDQUFDO0lBQ3pFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLGVBQWUsRUFBRSw2QkFBNkIsQ0FBQyxFQUFFLENBQUM7UUFDakUsZ0JBQWdCO1FBQ2hCLE9BQU87SUFDWCxDQUFDO0lBRUQsT0FBTyxlQUFlLENBQUMsNkJBQTZCLENBQUMsQ0FBQztJQUV0RCxxQkFBcUI7SUFDckIsZUFBZSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsUUFBUSxDQUFDO0lBRTdDLElBQUksQ0FBQyxTQUFTLENBQUMsaUJBQWlCLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDckUsQ0FBQyxDQUFDO0FBM0JXLFFBQUEsaUJBQWlCLHFCQTJCNUI7QUFFSyxNQUFNLGlCQUFpQixHQUFHLENBQUMsSUFBVSxFQUFRLEVBQUU7SUFDbEQsTUFBTSxpQkFBaUIsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUMvQiw2RUFBNkUsQ0FDaEYsQ0FBQztJQUNGLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1FBQ3JCLE9BQU87SUFDWCxDQUFDO0lBRUQsTUFBTSxpQkFBaUIsR0FBRyxlQUFlLENBQUM7SUFDMUMsTUFBTSxrQkFBa0IsR0FBRyxpQkFBaUIsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUN4RCxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsaUJBQWlCLENBQUMsRUFBRSxDQUFDO1FBQ2pDLElBQUksQ0FBQyxTQUFTLENBQUMsaUJBQWlCLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztJQUMxRCxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBYlcsUUFBQSxpQkFBaUIscUJBYTVCO0FBRUssTUFBTSxzQkFBc0IsR0FBRyxDQUFDLElBQVUsRUFBVyxFQUFFO0lBQzFELE1BQU0saUJBQWlCLEdBQUcsZUFBZSxDQUFDO0lBQzFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGlCQUFpQixDQUFDLEVBQUUsQ0FBQztRQUNsQyx5REFBeUQ7UUFDekQsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUNELElBQUEseUJBQWlCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEIsSUFBQSx5QkFBaUIsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUV4QixPQUFPLElBQUksQ0FBQztBQUNoQixDQUFDLENBQUM7QUFWVyxRQUFBLHNCQUFzQiwwQkFVakMifQ==
|
|
@@ -9,10 +9,10 @@ const removeEmitDecoratorMetadata = (tree) => {
|
|
|
9
9
|
}
|
|
10
10
|
const json = JSON.parse(file.toString());
|
|
11
11
|
const compilerOptions = json.compilerOptions;
|
|
12
|
-
if (Object.
|
|
12
|
+
if (Object.hasOwn(compilerOptions, 'emitDecoratorMetadata')) {
|
|
13
13
|
delete json.compilerOptions.emitDecoratorMetadata;
|
|
14
14
|
tree.overwrite(tsConfig, JSON.stringify(json, null, 2));
|
|
15
15
|
}
|
|
16
16
|
};
|
|
17
17
|
exports.removeEmitDecoratorMetadata = removeEmitDecoratorMetadata;
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3ZlLWVtaXQtZGVjb3JhdG9yLW1ldGFkYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvcHJlc3RhdGlvbnMtbmcvc2NoZW1hdGljcy91dGlsaXR5L3JlbW92ZS1lbWl0LWRlY29yYXRvci1tZXRhZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFTyxNQUFNLDJCQUEyQixHQUFHLENBQUMsSUFBVSxFQUFRLEVBQUU7SUFDNUQsTUFBTSxRQUFRLEdBQUcsZUFBZSxDQUFDO0lBQ2pDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDakMsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ1IsT0FBTztJQUNYLENBQUM7SUFFRCxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQ3pDLE1BQU0sZUFBZSxHQUFHLElBQUksQ0FBQyxlQUFlLENBQUM7SUFDN0MsSUFBSSxNQUFNLENBQUMsTUFBTSxDQUFDLGVBQWUsRUFBRSx1QkFBdUIsQ0FBQyxFQUFFLENBQUM7UUFDMUQsT0FBTyxJQUFJLENBQUMsZUFBZSxDQUFDLHFCQUFxQixDQUFDO1FBRWxELElBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzVELENBQUM7QUFDTCxDQUFDLENBQUM7QUFkVyxRQUFBLDJCQUEyQiwrQkFjdEMifQ==
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import { mkdirSync, mkdtempSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { tmpdir } from 'node:os';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { beforeAll, describe, expect, it } from 'vitest';
|
|
5
|
+
|
|
6
|
+
import {
|
|
7
|
+
AMBIGUOUS,
|
|
8
|
+
COMPUTED,
|
|
9
|
+
FROM_OBSERVABLE,
|
|
10
|
+
INPUT,
|
|
11
|
+
VIEW_QUERY,
|
|
12
|
+
WRITABLE,
|
|
13
|
+
} from '../signal-kinds.mjs';
|
|
14
|
+
import { collectSignalKinds, collectSignalNames } from '../signal-names.mjs';
|
|
15
|
+
|
|
16
|
+
describe('signal-names', () => {
|
|
17
|
+
let componentPath;
|
|
18
|
+
let missingPath;
|
|
19
|
+
|
|
20
|
+
const write = (path, content) => {
|
|
21
|
+
mkdirSync(join(path, '..'), { recursive: true });
|
|
22
|
+
writeFileSync(path, content, 'utf8');
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
beforeAll(() => {
|
|
26
|
+
const root = mkdtempSync(join(tmpdir(), 'signal-names-'));
|
|
27
|
+
|
|
28
|
+
write(
|
|
29
|
+
join(root, 'node_modules', '@fake', 'barrel', 'package.json'),
|
|
30
|
+
JSON.stringify({ name: '@fake/barrel', types: 'index.d.ts' }),
|
|
31
|
+
);
|
|
32
|
+
write(
|
|
33
|
+
join(root, 'node_modules', '@fake', 'barrel', 'index.d.ts'),
|
|
34
|
+
`export { ReExportedBase } from './external-base';`,
|
|
35
|
+
);
|
|
36
|
+
write(
|
|
37
|
+
join(root, 'node_modules', '@fake', 'barrel', 'external-base.d.ts'),
|
|
38
|
+
`import * as _angular_core from '@angular/core';
|
|
39
|
+
declare class ReExportedBase {
|
|
40
|
+
readonly fromPackageInput: _angular_core.InputSignal<string>;
|
|
41
|
+
readonly fromPackageAmbiguous: _angular_core.Signal<string>;
|
|
42
|
+
readonly overridable: _angular_core.InputSignal<string>;
|
|
43
|
+
}
|
|
44
|
+
export { ReExportedBase };`,
|
|
45
|
+
);
|
|
46
|
+
|
|
47
|
+
write(
|
|
48
|
+
join(root, 'src', 'local-base.ts'),
|
|
49
|
+
`import { input, signal, viewChild } from '@angular/core';
|
|
50
|
+
import { ReExportedBase as PackageBase } from '@fake/barrel';
|
|
51
|
+
|
|
52
|
+
export class LocalBase extends PackageBase {
|
|
53
|
+
readonly fromLocal = signal(1);
|
|
54
|
+
readonly fromLocalInput = input.required<string>();
|
|
55
|
+
readonly requiredQuery = viewChild.required('panel');
|
|
56
|
+
readonly overridable = signal('child-wins');
|
|
57
|
+
|
|
58
|
+
get fromLocalType(): Signal<number> {
|
|
59
|
+
return this.fromLocal;
|
|
60
|
+
}
|
|
61
|
+
}`,
|
|
62
|
+
);
|
|
63
|
+
|
|
64
|
+
componentPath = join(root, 'src', 'sample.component.ts');
|
|
65
|
+
write(
|
|
66
|
+
componentPath,
|
|
67
|
+
`import { computed, contentChildren, input, model, signal, viewChild } from '@angular/core';
|
|
68
|
+
import { toSignal } from '@angular/core/rxjs-interop';
|
|
69
|
+
import { LocalBase } from './local-base';
|
|
70
|
+
|
|
71
|
+
export class SampleComponent extends LocalBase {
|
|
72
|
+
readonly fromChild = signal(0);
|
|
73
|
+
readonly fromChildModel = model('');
|
|
74
|
+
readonly fromChildComputed = computed(() => this.fromChild());
|
|
75
|
+
readonly fromChildInput = input('');
|
|
76
|
+
readonly fromChildQuery = viewChild('panel');
|
|
77
|
+
readonly fromChildChildren = contentChildren('item');
|
|
78
|
+
readonly fromChildStream = toSignal(this.source$);
|
|
79
|
+
plainField = 1;
|
|
80
|
+
|
|
81
|
+
helper() {
|
|
82
|
+
return this.fromChild();
|
|
83
|
+
}
|
|
84
|
+
}`,
|
|
85
|
+
);
|
|
86
|
+
|
|
87
|
+
missingPath = join(root, 'src', 'missing.component.ts');
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
it('returns undefined when the component cannot be read', () => {
|
|
91
|
+
expect(collectSignalKinds(missingPath)).toBeUndefined();
|
|
92
|
+
expect(collectSignalNames(missingPath)).toEqual(new Set());
|
|
93
|
+
});
|
|
94
|
+
|
|
95
|
+
it('collects kinds through local inheritance and barrel re-exports', () => {
|
|
96
|
+
const kinds = collectSignalKinds(componentPath);
|
|
97
|
+
|
|
98
|
+
expect(kinds).toBeDefined();
|
|
99
|
+
expect(kinds.get('fromChild')).toBe(WRITABLE);
|
|
100
|
+
expect(kinds.get('fromChildModel')).toBe(WRITABLE);
|
|
101
|
+
expect(kinds.get('fromChildComputed')).toBe(COMPUTED);
|
|
102
|
+
expect(kinds.get('fromChildInput')).toBe(INPUT);
|
|
103
|
+
expect(kinds.get('fromChildQuery')).toBe(VIEW_QUERY);
|
|
104
|
+
expect(kinds.get('fromChildChildren')).toBe(VIEW_QUERY);
|
|
105
|
+
expect(kinds.get('fromChildStream')).toBe(FROM_OBSERVABLE);
|
|
106
|
+
|
|
107
|
+
expect(kinds.get('fromLocal')).toBe(WRITABLE);
|
|
108
|
+
expect(kinds.get('fromLocalInput')).toBe(INPUT);
|
|
109
|
+
expect(kinds.get('requiredQuery')).toBe(VIEW_QUERY);
|
|
110
|
+
expect(kinds.get('fromLocalType')).toBe(AMBIGUOUS);
|
|
111
|
+
|
|
112
|
+
expect(kinds.get('fromPackageInput')).toBe(INPUT);
|
|
113
|
+
expect(kinds.get('fromPackageAmbiguous')).toBe(AMBIGUOUS);
|
|
114
|
+
expect(kinds.get('overridable')).toBe(WRITABLE);
|
|
115
|
+
|
|
116
|
+
expect(kinds.has('plainField')).toBe(false);
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
it('collects only signal member names', () => {
|
|
120
|
+
const names = collectSignalNames(componentPath);
|
|
121
|
+
|
|
122
|
+
expect(names.has('fromChild')).toBe(true);
|
|
123
|
+
expect(names.has('fromLocal')).toBe(true);
|
|
124
|
+
expect(names.has('fromPackageInput')).toBe(true);
|
|
125
|
+
expect(names.has('plainField')).toBe(false);
|
|
126
|
+
expect(names.has('helper')).toBe(false);
|
|
127
|
+
});
|
|
128
|
+
});
|
|
129
|
+
|
|
@@ -153,6 +153,67 @@ const reExportedModulesOf = (sourceFile) =>
|
|
|
153
153
|
.filter((statement) => ts.isExportDeclaration(statement) && statement.moduleSpecifier)
|
|
154
154
|
.map((statement) => statement.moduleSpecifier.text);
|
|
155
155
|
|
|
156
|
+
const classDeclarationsOf = (sourceFile, className) =>
|
|
157
|
+
className
|
|
158
|
+
? [findClass(sourceFile, className)].filter(Boolean)
|
|
159
|
+
: sourceFile.statements.filter(ts.isClassDeclaration);
|
|
160
|
+
|
|
161
|
+
const isBarrelMiss = (className, classDeclarations) =>
|
|
162
|
+
Boolean(className) && classDeclarations.length === 0;
|
|
163
|
+
|
|
164
|
+
const collectFromReExports = (sourceFile, path, className, kinds, visited) => {
|
|
165
|
+
for (const specifier of reExportedModulesOf(sourceFile)) {
|
|
166
|
+
const target = resolveModule(specifier, path);
|
|
167
|
+
if (target) {
|
|
168
|
+
collect(target, className, kinds, visited);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
};
|
|
172
|
+
|
|
173
|
+
const addMemberKindIfEligible = (member, kinds) => {
|
|
174
|
+
if (!member.name || !ts.isIdentifier(member.name)) {
|
|
175
|
+
return;
|
|
176
|
+
}
|
|
177
|
+
const kind = kindOfMember(member);
|
|
178
|
+
// A subclass overriding a member wins: it is collected first.
|
|
179
|
+
if (kind && !kinds.has(member.name.text)) {
|
|
180
|
+
kinds.set(member.name.text, kind);
|
|
181
|
+
}
|
|
182
|
+
};
|
|
183
|
+
|
|
184
|
+
const collectMemberKinds = (classDeclaration, kinds) => {
|
|
185
|
+
for (const member of classDeclaration.members) {
|
|
186
|
+
addMemberKindIfEligible(member, kinds);
|
|
187
|
+
}
|
|
188
|
+
};
|
|
189
|
+
|
|
190
|
+
const baseTargetOf = (sourceFile, path, classDeclaration) => {
|
|
191
|
+
const baseName = extendedClassNameOf(classDeclaration);
|
|
192
|
+
if (!baseName) {
|
|
193
|
+
return undefined;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
// Declaration bundles are flattened: the base class often sits in the same file.
|
|
197
|
+
if (findClass(sourceFile, baseName)) {
|
|
198
|
+
return { path, className: baseName };
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
const imported = importOf(sourceFile, baseName);
|
|
202
|
+
if (!imported) {
|
|
203
|
+
return undefined;
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
const target = resolveModule(imported.specifier, path);
|
|
207
|
+
return target ? { path: target, className: imported.exportedName } : undefined;
|
|
208
|
+
};
|
|
209
|
+
|
|
210
|
+
const collectBase = (sourceFile, path, classDeclaration, kinds, visited) => {
|
|
211
|
+
const target = baseTargetOf(sourceFile, path, classDeclaration);
|
|
212
|
+
if (target) {
|
|
213
|
+
collect(target.path, target.className, kinds, visited);
|
|
214
|
+
}
|
|
215
|
+
};
|
|
216
|
+
|
|
156
217
|
const collect = (path, className, kinds, visited) => {
|
|
157
218
|
const key = `${path}::${className ?? "*"}`;
|
|
158
219
|
if (visited.has(key)) {
|
|
@@ -165,47 +226,17 @@ const collect = (path, className, kinds, visited) => {
|
|
|
165
226
|
return;
|
|
166
227
|
}
|
|
167
228
|
|
|
168
|
-
const classDeclarations = className
|
|
169
|
-
? [findClass(sourceFile, className)].filter(Boolean)
|
|
170
|
-
: sourceFile.statements.filter(ts.isClassDeclaration);
|
|
229
|
+
const classDeclarations = classDeclarationsOf(sourceFile, className);
|
|
171
230
|
|
|
172
231
|
// A barrel: the class is only re-exported from here.
|
|
173
|
-
if (className
|
|
174
|
-
|
|
175
|
-
const target = resolveModule(specifier, path);
|
|
176
|
-
if (target) {
|
|
177
|
-
collect(target, className, kinds, visited);
|
|
178
|
-
}
|
|
179
|
-
}
|
|
232
|
+
if (isBarrelMiss(className, classDeclarations)) {
|
|
233
|
+
collectFromReExports(sourceFile, path, className, kinds, visited);
|
|
180
234
|
return;
|
|
181
235
|
}
|
|
182
236
|
|
|
183
237
|
for (const classDeclaration of classDeclarations) {
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
continue;
|
|
187
|
-
}
|
|
188
|
-
const kind = kindOfMember(member);
|
|
189
|
-
// A subclass overriding a member wins: it is collected first.
|
|
190
|
-
if (kind && !kinds.has(member.name.text)) {
|
|
191
|
-
kinds.set(member.name.text, kind);
|
|
192
|
-
}
|
|
193
|
-
}
|
|
194
|
-
|
|
195
|
-
const baseName = extendedClassNameOf(classDeclaration);
|
|
196
|
-
if (!baseName) {
|
|
197
|
-
continue;
|
|
198
|
-
}
|
|
199
|
-
// Declaration bundles are flattened: the base class often sits in the same file.
|
|
200
|
-
if (findClass(sourceFile, baseName)) {
|
|
201
|
-
collect(path, baseName, kinds, visited);
|
|
202
|
-
continue;
|
|
203
|
-
}
|
|
204
|
-
const imported = importOf(sourceFile, baseName);
|
|
205
|
-
const target = imported && resolveModule(imported.specifier, path);
|
|
206
|
-
if (target) {
|
|
207
|
-
collect(target, imported.exportedName, kinds, visited);
|
|
208
|
-
}
|
|
238
|
+
collectMemberKinds(classDeclaration, kinds);
|
|
239
|
+
collectBase(sourceFile, path, classDeclaration, kinds, visited);
|
|
209
240
|
}
|
|
210
241
|
};
|
|
211
242
|
|