@dsivd/prestations-ng 19.2.0-beta.2 → 19.2.0-beta.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ANGULAR_SIGNALS.md +4 -0
- package/CHANGELOG.md +396 -0
- package/CONTRIBUTING.md +74 -4
- package/ESLINT_PLUGIN.md +103 -8
- package/GOOD_PRACTICES.md +731 -380
- package/INTRODUCTION_ANGULAR_SIGNALS.md +199 -154
- package/UPGRADING_V18.md +5 -5
- package/UPGRADING_V19.md +439 -18
- package/eslint/configs/spec-ts-recommended.mjs +34 -0
- package/eslint/configs/template-recommended.mjs +2 -0
- package/eslint/configs/template-rules.mjs +11 -2
- package/eslint/configs/ts-recommended.mjs +6 -0
- package/eslint/configs/ts-rules.mjs +6 -2
- package/eslint/form-reads.mjs +63 -0
- package/eslint/index.mjs +17 -0
- package/eslint/rules/index.mjs +4 -0
- package/eslint/rules/no-direct-signal-mutation.mjs +58 -20
- package/eslint/rules/no-item-track-in-form-list.mjs +99 -0
- package/eslint/rules/no-uninvoked-signal-in-template.mjs +8 -3
- package/eslint/rules/require-model-change.mjs +89 -0
- package/eslint/template-ast.mjs +12 -2
- package/fesm2022/dsivd-prestations-ng.mjs +2766 -2073
- package/fesm2022/dsivd-prestations-ng.mjs.map +1 -1
- package/package.json +1 -2
- package/schematics/migration-collection.json +5 -0
- package/schematics/ng-add/index.js +2 -4
- package/schematics/ng-update/migrations/update-13_2_0/index.js +7 -2
- package/schematics/ng-update/migrations/update-19_2_0/index.js +39 -0
- package/schematics/utility/add-allowed-common-js-dependencies.js +39 -29
- package/schematics/utility/form-signal/class-migration.js +396 -0
- package/schematics/utility/form-signal/edits.js +34 -0
- package/schematics/utility/form-signal/form-signal-migration.js +184 -0
- package/schematics/utility/form-signal/page-classes.js +129 -0
- package/schematics/utility/form-signal/template-migration.js +666 -0
- package/schematics/utility/remove-emit-decorator-metadata.js +8 -9
- package/src/eslint/configs/__tests__/configs.test.mjs +46 -2
- package/src/eslint/configs/spec-ts-recommended.mjs +34 -0
- package/src/eslint/configs/template-recommended.mjs +2 -0
- package/src/eslint/configs/template-rules.mjs +11 -2
- package/src/eslint/configs/ts-recommended.mjs +6 -0
- package/src/eslint/configs/ts-rules.mjs +6 -2
- package/src/eslint/form-reads.mjs +63 -0
- package/src/eslint/index.mjs +17 -0
- package/src/eslint/rules/__tests__/no-direct-signal-mutation.test.mjs +58 -0
- package/src/eslint/rules/__tests__/no-item-track-in-form-list.test.mjs +127 -0
- package/src/eslint/rules/__tests__/no-uninvoked-signal-in-template.test.mjs +6 -0
- package/src/eslint/rules/__tests__/require-model-change.test.mjs +93 -0
- package/src/eslint/rules/index.mjs +4 -0
- package/src/eslint/rules/no-direct-signal-mutation.mjs +58 -20
- package/src/eslint/rules/no-item-track-in-form-list.mjs +99 -0
- package/src/eslint/rules/no-uninvoked-signal-in-template.mjs +8 -3
- package/src/eslint/rules/require-model-change.mjs +89 -0
- package/src/eslint/template-ast.mjs +12 -2
- package/types/dsivd-prestations-ng.d.ts +652 -240
- package/dsivd-prestations-ng-19.2.0-beta.2.tgz +0 -0
package/package.json
CHANGED
|
@@ -27,7 +27,6 @@
|
|
|
27
27
|
"@fortawesome/free-solid-svg-icons": "^7.2.0",
|
|
28
28
|
"@dsivd/foehn": "=2.0.14",
|
|
29
29
|
"rxjs": "^7.8.2",
|
|
30
|
-
"core-js": "^3.49.0",
|
|
31
30
|
"iban": "^0.0.14",
|
|
32
31
|
"ngx-image-cropper": "^9.1.6",
|
|
33
32
|
"dayjs": "^1.11.21",
|
|
@@ -40,7 +39,7 @@
|
|
|
40
39
|
"ng-update": {
|
|
41
40
|
"migrations": "./schematics/migration-collection.json"
|
|
42
41
|
},
|
|
43
|
-
"version": "19.2.0-beta.
|
|
42
|
+
"version": "19.2.0-beta.21",
|
|
44
43
|
"module": "fesm2022/dsivd-prestations-ng.mjs",
|
|
45
44
|
"typings": "types/dsivd-prestations-ng.d.ts",
|
|
46
45
|
"exports": {
|
|
@@ -20,6 +20,11 @@
|
|
|
20
20
|
"version": "14.5.0",
|
|
21
21
|
"description": "Updates prestations-ng for Angular to v14.5.0",
|
|
22
22
|
"factory": "./ng-update/migrations/update-14_5_0"
|
|
23
|
+
},
|
|
24
|
+
"migration-v19_2_0": {
|
|
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()",
|
|
27
|
+
"factory": "./ng-update/migrations/update-19_2_0"
|
|
23
28
|
}
|
|
24
29
|
}
|
|
25
30
|
}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
4
4
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
5
|
-
const add_allow_synthetic_default_imports_1 = require("../utility/add-allow-synthetic-default-imports");
|
|
6
5
|
const add_allowed_common_js_dependencies_1 = require("../utility/add-allowed-common-js-dependencies");
|
|
7
6
|
const migrate_to_karma_coverage_1 = require("../utility/migrate-to-karma-coverage");
|
|
8
7
|
const remove_emit_decorator_metadata_1 = require("../utility/remove-emit-decorator-metadata");
|
|
@@ -15,12 +14,11 @@ exports.default = () => (tree, context) => {
|
|
|
15
14
|
}
|
|
16
15
|
context.logger.info('Thank you for using our library prestations-ng');
|
|
17
16
|
(0, replace_browserslistrc_1.replaceBrowsersList)(tree);
|
|
18
|
-
(0, add_allowed_common_js_dependencies_1.addAllowedCommonJsDependencies)(tree);
|
|
17
|
+
(0, add_allowed_common_js_dependencies_1.addAllowedCommonJsDependencies)(tree, ['iban', 'dayjs']);
|
|
19
18
|
(0, remove_emit_decorator_metadata_1.removeEmitDecoratorMetadata)(tree);
|
|
20
19
|
if ((0, migrate_to_karma_coverage_1.migrateToKarmaCoverage)(tree)) {
|
|
21
20
|
context.addTask(new tasks_1.NodePackageInstallTask());
|
|
22
21
|
}
|
|
23
|
-
(0, add_allow_synthetic_default_imports_1.addAllowSyntheticDefaultImports)(tree);
|
|
24
22
|
return tree;
|
|
25
23
|
};
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9wcmVzdGF0aW9ucy1uZy9zY2hlbWF0aWNzL25nLWFkZC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJEQUtvQztBQUNwQyw0REFBMEU7QUFFMUUsc0dBQStGO0FBQy9GLG9GQUE4RTtBQUM5RSw4RkFBd0Y7QUFDeEYsOEVBQXdFO0FBRXhFLGtCQUFlLEdBQVMsRUFBRSxDQUFDLENBQUMsSUFBVSxFQUFFLE9BQXlCLEVBQUUsRUFBRTtJQUNqRSxNQUFNLGFBQWEsR0FBRyxjQUFjLENBQUM7SUFDckMsZ0RBQWdEO0lBQ2hELElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxFQUFFLENBQUM7UUFDOUIsTUFBTSxJQUFJLGdDQUFtQixDQUN6QixvRUFBb0UsQ0FDdkUsQ0FBQztJQUNOLENBQUM7SUFDRCxPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxnREFBZ0QsQ0FBQyxDQUFDO0lBRXRFLElBQUEsNENBQW1CLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUIsSUFBQSxtRUFBOEIsRUFBQyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUN4RCxJQUFBLDREQUEyQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2xDLElBQUksSUFBQSxrREFBc0IsRUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQy9CLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSw4QkFBc0IsRUFBRSxDQUFDLENBQUM7SUFDbEQsQ0FBQztJQUNELE9BQU8sSUFBSSxDQUFDO0FBQ2hCLENBQUMsQ0FBQyJ9
|
|
@@ -11,8 +11,13 @@ exports.default = () => (tree, context) => {
|
|
|
11
11
|
throw new schematics_1.SchematicsException('This is not an Angular workspace. Try again in an Angular project.');
|
|
12
12
|
}
|
|
13
13
|
context.logger.info(`Applying migration for prestations-ng for Angular to version ${version}`);
|
|
14
|
-
|
|
14
|
+
// The dependencies added by this version, even if some are no longer needed today
|
|
15
|
+
(0, add_allowed_common_js_dependencies_1.addAllowedCommonJsDependencies)(tree, [
|
|
16
|
+
'core-js/modules/es.array.includes',
|
|
17
|
+
'iban',
|
|
18
|
+
'zone.js/dist/zone-error',
|
|
19
|
+
]);
|
|
15
20
|
(0, remove_emit_decorator_metadata_1.removeEmitDecoratorMetadata)(tree);
|
|
16
21
|
return tree;
|
|
17
22
|
};
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9wcmVzdGF0aW9ucy1uZy9zY2hlbWF0aWNzL25nLXVwZGF0ZS9taWdyYXRpb25zL3VwZGF0ZS0xM18yXzAvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwyREFLb0M7QUFFcEMsNEdBQXFHO0FBQ3JHLG9HQUE4RjtBQUU5RixNQUFNLE9BQU8sR0FBRyxRQUFRLENBQUM7QUFFekIsa0JBQWUsR0FBUyxFQUFFLENBQUMsQ0FBQyxJQUFVLEVBQUUsT0FBeUIsRUFBRSxFQUFFO0lBQ2pFLE1BQU0sYUFBYSxHQUFHLGNBQWMsQ0FBQztJQUNyQyxnREFBZ0Q7SUFDaEQsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQztRQUM5QixNQUFNLElBQUksZ0NBQW1CLENBQ3pCLG9FQUFvRSxDQUN2RSxDQUFDO0lBQ04sQ0FBQztJQUNELE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUNmLGdFQUFnRSxPQUFPLEVBQUUsQ0FDNUUsQ0FBQztJQUNGLGtGQUFrRjtJQUNsRixJQUFBLG1FQUE4QixFQUFDLElBQUksRUFBRTtRQUNqQyxtQ0FBbUM7UUFDbkMsTUFBTTtRQUNOLHlCQUF5QjtLQUM1QixDQUFDLENBQUM7SUFDSCxJQUFBLDREQUEyQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2xDLE9BQU8sSUFBSSxDQUFDO0FBQ2hCLENBQUMsQ0FBQyJ9
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
13
|
+
const form_signal_migration_1 = require("../../../utility/form-signal/form-signal-migration");
|
|
14
|
+
const version = '19.2.0';
|
|
15
|
+
/**
|
|
16
|
+
* `@angular/compiler` is an ES module: imported, not required. A `Function` keeps TypeScript from turning the import
|
|
17
|
+
* into a `require()`.
|
|
18
|
+
*/
|
|
19
|
+
const loadCompiler = () => new Function('specifier', 'return import(specifier)')('@angular/compiler');
|
|
20
|
+
exports.default = () => (tree, context) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
+
// Let's make sure we're in an angular workspace
|
|
22
|
+
if (!tree.exists('angular.json')) {
|
|
23
|
+
throw new schematics_1.SchematicsException('This is not an Angular workspace. Try again in an Angular project.');
|
|
24
|
+
}
|
|
25
|
+
context.logger.info(`Applying migration for prestations-ng to version ${version}: the form and the reference of the pages are signals`);
|
|
26
|
+
const report = (0, form_signal_migration_1.migrateFormSignal)(tree, yield loadCompiler());
|
|
27
|
+
context.logger.info(`Migrated ${report.pages} pages and ${report.templates} templates: ${report.writes} writes of the form, ` +
|
|
28
|
+
`${report.tracks} lists tracked by $index, ${report.listPaths} getList() replaced by getListPath(), ` +
|
|
29
|
+
`${report.redeclarations} fields hiding a signal of the page removed.`);
|
|
30
|
+
if (report.warnings.length) {
|
|
31
|
+
context.logger.warn([
|
|
32
|
+
`To check by hand (${report.warnings.length}), see "The form of your pages is a signal" and ` +
|
|
33
|
+
`"\`reference\` of your pages is a signal" in UPGRADING_V19.md:`,
|
|
34
|
+
...report.warnings.map((warning) => ` ${warning}`),
|
|
35
|
+
].join('\n'));
|
|
36
|
+
}
|
|
37
|
+
return tree;
|
|
38
|
+
});
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9wcmVzdGF0aW9ucy1uZy9zY2hlbWF0aWNzL25nLXVwZGF0ZS9taWdyYXRpb25zL3VwZGF0ZS0xOV8yXzAvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQSwyREFLb0M7QUFFcEMsOEZBQXVGO0FBR3ZGLE1BQU0sT0FBTyxHQUFHLFFBQVEsQ0FBQztBQUV6Qjs7O0dBR0c7QUFDSCxNQUFNLFlBQVksR0FBRyxHQUFzQixFQUFFLENBQ3pDLElBQUksUUFBUSxDQUFDLFdBQVcsRUFBRSwwQkFBMEIsQ0FBQyxDQUNqRCxtQkFBbUIsQ0FDRCxDQUFDO0FBRTNCLGtCQUFlLEdBQVMsRUFBRSxDQUFDLENBQU8sSUFBVSxFQUFFLE9BQXlCLEVBQUUsRUFBRTtJQUN2RSxnREFBZ0Q7SUFDaEQsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQztRQUMvQixNQUFNLElBQUksZ0NBQW1CLENBQ3pCLG9FQUFvRSxDQUN2RSxDQUFDO0lBQ04sQ0FBQztJQUNELE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUNmLG9EQUFvRCxPQUFPLHVEQUF1RCxDQUNySCxDQUFDO0lBQ0YsTUFBTSxNQUFNLEdBQUcsSUFBQSx5Q0FBaUIsRUFBQyxJQUFJLEVBQUUsTUFBTSxZQUFZLEVBQUUsQ0FBQyxDQUFDO0lBQzdELE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUNmLFlBQVksTUFBTSxDQUFDLEtBQUssY0FBYyxNQUFNLENBQUMsU0FBUyxlQUFlLE1BQU0sQ0FBQyxNQUFNLHVCQUF1QjtRQUNyRyxHQUFHLE1BQU0sQ0FBQyxNQUFNLDZCQUE2QixNQUFNLENBQUMsU0FBUyx3Q0FBd0M7UUFDckcsR0FBRyxNQUFNLENBQUMsY0FBYyw4Q0FBOEMsQ0FDN0UsQ0FBQztJQUNGLElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUN6QixPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDZjtZQUNJLHFCQUFxQixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sa0RBQWtEO2dCQUN6RixnRUFBZ0U7WUFDcEUsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsS0FBSyxPQUFPLEVBQUUsQ0FBQztTQUN0RCxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FDZixDQUFDO0lBQ04sQ0FBQztJQUNELE9BQU8sSUFBSSxDQUFDO0FBQ2hCLENBQUMsQ0FBQSxDQUFDIn0=
|
|
@@ -2,41 +2,51 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addAllowedCommonJsDependencies = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
-
const
|
|
5
|
+
const json_file_1 = require("@schematics/angular/utility/json-file");
|
|
6
|
+
/**
|
|
7
|
+
* Adds the dependencies missing from the `allowedCommonJsDependencies` of the build of the `defaultProject`,
|
|
8
|
+
* or of every application when there is no `defaultProject` (removed from angular.json since Angular 14).
|
|
9
|
+
*/
|
|
10
|
+
const addAllowedCommonJsDependencies = (tree, dependencies) => {
|
|
11
|
+
var _a;
|
|
6
12
|
const pathToAngularJson = 'angular.json';
|
|
7
|
-
|
|
8
|
-
if (!file) {
|
|
13
|
+
if (!tree.exists(pathToAngularJson)) {
|
|
9
14
|
// Should never happen because always check in rules
|
|
10
15
|
return;
|
|
11
16
|
}
|
|
12
|
-
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const arrayOfDependenciesToAdd = [
|
|
23
|
-
'core-js/modules/es.array.includes',
|
|
24
|
-
'iban',
|
|
25
|
-
'zone.js/dist/zone-error',
|
|
26
|
-
];
|
|
27
|
-
if (Object.hasOwn(buildOptions, 'allowedCommonJsDependencies')) {
|
|
28
|
-
// Do not add dependency if already exist
|
|
29
|
-
const existingDeps = [...buildOptions.allowedCommonJsDependencies];
|
|
30
|
-
arrayOfDependenciesToAdd.forEach((dep) => {
|
|
31
|
-
if (!existingDeps.includes(dep)) {
|
|
32
|
-
buildOptions.allowedCommonJsDependencies.push(dep);
|
|
33
|
-
}
|
|
34
|
-
});
|
|
17
|
+
// JSONFile keeps the formatting and the comments of the file
|
|
18
|
+
const angularJson = new json_file_1.JSONFile(tree, pathToAngularJson);
|
|
19
|
+
const projects = ((_a = angularJson.get(['projects'])) !== null && _a !== void 0 ? _a : {});
|
|
20
|
+
const defaultProject = angularJson.get(['defaultProject']);
|
|
21
|
+
let projectNames;
|
|
22
|
+
if (typeof defaultProject === 'string') {
|
|
23
|
+
if (!projects[defaultProject]) {
|
|
24
|
+
throw new schematics_1.SchematicsException(`Sorry but we could not find project '${defaultProject}' in your angular.json file.`);
|
|
25
|
+
}
|
|
26
|
+
projectNames = [defaultProject];
|
|
35
27
|
}
|
|
36
28
|
else {
|
|
37
|
-
|
|
29
|
+
projectNames = Object.keys(projects).filter((name) => projects[name].projectType === 'application');
|
|
38
30
|
}
|
|
39
|
-
|
|
31
|
+
projectNames
|
|
32
|
+
.filter((name) => { var _a, _b; return (_b = (_a = projects[name].architect) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options; })
|
|
33
|
+
.forEach((name) => {
|
|
34
|
+
var _a;
|
|
35
|
+
const path = [
|
|
36
|
+
'projects',
|
|
37
|
+
name,
|
|
38
|
+
'architect',
|
|
39
|
+
'build',
|
|
40
|
+
'options',
|
|
41
|
+
'allowedCommonJsDependencies',
|
|
42
|
+
];
|
|
43
|
+
const existingDeps = ((_a = angularJson.get(path)) !== null && _a !== void 0 ? _a : []);
|
|
44
|
+
// Do not add dependency if already exist
|
|
45
|
+
const missingDeps = dependencies.filter((dep) => !existingDeps.includes(dep));
|
|
46
|
+
if (missingDeps.length) {
|
|
47
|
+
angularJson.modify(path, [...existingDeps, ...missingDeps]);
|
|
48
|
+
}
|
|
49
|
+
});
|
|
40
50
|
};
|
|
41
51
|
exports.addAllowedCommonJsDependencies = addAllowedCommonJsDependencies;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkLWFsbG93ZWQtY29tbW9uLWpzLWRlcGVuZGVuY2llcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3ByZXN0YXRpb25zLW5nL3NjaGVtYXRpY3MvdXRpbGl0eS9hZGQtYWxsb3dlZC1jb21tb24tanMtZGVwZW5kZW5jaWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDJEQUF1RTtBQUN2RSxxRUFBaUU7QUFPakU7OztHQUdHO0FBQ0ksTUFBTSw4QkFBOEIsR0FBRyxDQUMxQyxJQUFVLEVBQ1YsWUFBc0IsRUFDbEIsRUFBRTs7SUFDTixNQUFNLGlCQUFpQixHQUFHLGNBQWMsQ0FBQztJQUN6QyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLENBQUM7UUFDbEMsb0RBQW9EO1FBQ3BELE9BQU87SUFDWCxDQUFDO0lBRUQsNkRBQTZEO0lBQzdELE1BQU0sV0FBVyxHQUFHLElBQUksb0JBQVEsQ0FBQyxJQUFJLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztJQUMxRCxNQUFNLFFBQVEsR0FBRyxDQUFDLE1BQUEsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLG1DQUFJLEVBQUUsQ0FHcEQsQ0FBQztJQUNGLE1BQU0sY0FBYyxHQUFHLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7SUFFM0QsSUFBSSxZQUFzQixDQUFDO0lBQzNCLElBQUksT0FBTyxjQUFjLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDckMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsRUFBRSxDQUFDO1lBQzVCLE1BQU0sSUFBSSxnQ0FBbUIsQ0FDekIsd0NBQXdDLGNBQWMsOEJBQThCLENBQ3ZGLENBQUM7UUFDTixDQUFDO1FBQ0QsWUFBWSxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDcEMsQ0FBQztTQUFNLENBQUM7UUFDSixZQUFZLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQ3ZDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsV0FBVyxLQUFLLGFBQWEsQ0FDekQsQ0FBQztJQUNOLENBQUM7SUFFRCxZQUFZO1NBQ1AsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsZUFBQyxPQUFBLE1BQUEsTUFBQSxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsU0FBUywwQ0FBRSxLQUFLLDBDQUFFLE9BQU8sQ0FBQSxFQUFBLENBQUM7U0FDMUQsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7O1FBQ2QsTUFBTSxJQUFJLEdBQUc7WUFDVCxVQUFVO1lBQ1YsSUFBSTtZQUNKLFdBQVc7WUFDWCxPQUFPO1lBQ1AsU0FBUztZQUNULDZCQUE2QjtTQUNoQyxDQUFDO1FBQ0YsTUFBTSxZQUFZLEdBQUcsQ0FBQyxNQUFBLFdBQVcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLG1DQUFJLEVBQUUsQ0FBYSxDQUFDO1FBQy9ELHlDQUF5QztRQUN6QyxNQUFNLFdBQVcsR0FBRyxZQUFZLENBQUMsTUFBTSxDQUNuQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUN2QyxDQUFDO1FBQ0YsSUFBSSxXQUFXLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDckIsV0FBVyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxHQUFHLFlBQVksRUFBRSxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFDaEUsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFDO0FBQ1gsQ0FBQyxDQUFDO0FBcERXLFFBQUEsOEJBQThCLGtDQW9EekMifQ==
|
|
@@ -0,0 +1,396 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.migratePageClass = migratePageClass;
|
|
4
|
+
const ts = require("typescript");
|
|
5
|
+
const PAGE_MEMBERS = {
|
|
6
|
+
form: { nullable: true, patch: 'patchForm', writable: true },
|
|
7
|
+
reference: { nullable: false, writable: true },
|
|
8
|
+
};
|
|
9
|
+
/**
|
|
10
|
+
* The signals of the pages that a page may have declared again (`reference: string;`): such a field would hide them.
|
|
11
|
+
*/
|
|
12
|
+
const REDECLARABLE_MEMBERS = new Set(['form', 'reference']);
|
|
13
|
+
const DETAIL_PAGE_MEMBERS = Object.assign(Object.assign({}, PAGE_MEMBERS), { itemToEdit: { nullable: true, patch: 'patchItem', writable: false }, itemIndex: { nullable: false, writable: true }, list: { nullable: false, writable: false } });
|
|
14
|
+
const PREPENDING_MUTATORS = new Set(['unshift']);
|
|
15
|
+
const APPENDING_MUTATORS = new Set(['push']);
|
|
16
|
+
const OTHER_MUTATORS = new Set([
|
|
17
|
+
'splice',
|
|
18
|
+
'pop',
|
|
19
|
+
'shift',
|
|
20
|
+
'sort',
|
|
21
|
+
'reverse',
|
|
22
|
+
'fill',
|
|
23
|
+
'copyWithin',
|
|
24
|
+
]);
|
|
25
|
+
/**
|
|
26
|
+
* Migrates the TypeScript of a page class to its form and its reference held by signals (prestations-ng 19.2.0):
|
|
27
|
+
*
|
|
28
|
+
* - `this.form = x` → `this.form.set(x)`, `this.reference = x` → `this.reference.set(x)`;
|
|
29
|
+
* - `this.form.a.b = x;` → `this.patchForm(['a', 'b'], x);`, `this.form.list.push(x);` →
|
|
30
|
+
* `this.patchForm(['list'], [...(this.form()!.list ?? []), x]);`;
|
|
31
|
+
* - the other reads are called: `this.form.a` → `this.form()!.a` (as before, a form missing throws), `this.form` →
|
|
32
|
+
* `this.form()`, `this.reference` → `this.reference()`;
|
|
33
|
+
* - a field declaring the form or the reference again (`reference: string;`), which would hide the signal, is removed;
|
|
34
|
+
* - on a detail page, the same for `itemToEdit` (`patchItem()`), `itemIndex` and `list` are called, and a `getList()`
|
|
35
|
+
* returning a path of the form becomes `getListPath()`.
|
|
36
|
+
*
|
|
37
|
+
* What it can't rewrite (`this.form.a += 1`, `this.form.list.splice(...)`, a write inside an expression) is left as
|
|
38
|
+
* is: the compiler reports it (`this.form.a` doesn't exist on a signal), and it is listed in the warnings. Running it
|
|
39
|
+
* again changes nothing.
|
|
40
|
+
*
|
|
41
|
+
* @param source the file
|
|
42
|
+
* @param classNode the page class
|
|
43
|
+
* @param options the kind of page
|
|
44
|
+
* @returns the edits of the file
|
|
45
|
+
*/
|
|
46
|
+
function migratePageClass(source, classNode, options) {
|
|
47
|
+
var _a;
|
|
48
|
+
const members = options.detailPage ? DETAIL_PAGE_MEMBERS : PAGE_MEMBERS;
|
|
49
|
+
const result = {
|
|
50
|
+
edits: [],
|
|
51
|
+
writes: 0,
|
|
52
|
+
listPaths: 0,
|
|
53
|
+
redeclarations: 0,
|
|
54
|
+
needsObjectPathImport: false,
|
|
55
|
+
warnings: [],
|
|
56
|
+
};
|
|
57
|
+
const text = (node) => node.getText(source);
|
|
58
|
+
const warn = (node, message) => {
|
|
59
|
+
result.warnings.push({ offset: node.getStart(source), message });
|
|
60
|
+
};
|
|
61
|
+
/**
|
|
62
|
+
* The code of an expression with its reads of the members rewritten (as reads only).
|
|
63
|
+
*/
|
|
64
|
+
const rewrittenText = (node) => {
|
|
65
|
+
const start = node.getStart(source);
|
|
66
|
+
const local = [];
|
|
67
|
+
collect(node, local, true);
|
|
68
|
+
local.sort((a, b) => b.start - a.start);
|
|
69
|
+
let code = text(node);
|
|
70
|
+
for (const edit of local) {
|
|
71
|
+
code =
|
|
72
|
+
code.slice(0, edit.start - start) +
|
|
73
|
+
edit.text +
|
|
74
|
+
code.slice(edit.end - start);
|
|
75
|
+
}
|
|
76
|
+
return code;
|
|
77
|
+
};
|
|
78
|
+
const collect = (node, edits, readsOnly = false) => {
|
|
79
|
+
if (!readsOnly &&
|
|
80
|
+
options.detailPage &&
|
|
81
|
+
ts.isMethodDeclaration(node) &&
|
|
82
|
+
text(node.name) === 'getList') {
|
|
83
|
+
if (migrateGetList(node, edits)) {
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
const member = memberRead(node);
|
|
88
|
+
if (member) {
|
|
89
|
+
migrateMemberRead(node, member, edits, readsOnly);
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
ts.forEachChild(node, (child) => collect(child, edits, readsOnly));
|
|
93
|
+
};
|
|
94
|
+
/**
|
|
95
|
+
* `this.<member>`, not already called (`this.form()`) nor written as a signal (`this.form.set(...)`).
|
|
96
|
+
*/
|
|
97
|
+
const memberRead = (node) => {
|
|
98
|
+
if (!ts.isPropertyAccessExpression(node) ||
|
|
99
|
+
node.expression.kind !== ts.SyntaxKind.ThisKeyword) {
|
|
100
|
+
return null;
|
|
101
|
+
}
|
|
102
|
+
const member = members[node.name.text];
|
|
103
|
+
if (!member) {
|
|
104
|
+
return null;
|
|
105
|
+
}
|
|
106
|
+
const parent = node.parent;
|
|
107
|
+
if (ts.isCallExpression(parent) && parent.expression === node) {
|
|
108
|
+
return null;
|
|
109
|
+
}
|
|
110
|
+
if (ts.isPropertyAccessExpression(parent) &&
|
|
111
|
+
['set', 'update', 'asReadonly'].includes(parent.name.text) &&
|
|
112
|
+
ts.isCallExpression(parent.parent)) {
|
|
113
|
+
return null;
|
|
114
|
+
}
|
|
115
|
+
return member;
|
|
116
|
+
};
|
|
117
|
+
const migrateMemberRead = (node, member, edits, readsOnly) => {
|
|
118
|
+
var _a, _b, _c;
|
|
119
|
+
const parent = node.parent;
|
|
120
|
+
const name = node.name.text;
|
|
121
|
+
if (readsOnly) {
|
|
122
|
+
edits.push(readEdit(node, member));
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
// this.form = x → this.form.set(x)
|
|
126
|
+
if (ts.isBinaryExpression(parent) &&
|
|
127
|
+
parent.left === node &&
|
|
128
|
+
parent.operatorToken.kind === ts.SyntaxKind.EqualsToken) {
|
|
129
|
+
if (!member.writable) {
|
|
130
|
+
warn(parent, `not migrated, ${name} can't be assigned anymore`);
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
edits.push({
|
|
134
|
+
start: parent.getStart(source),
|
|
135
|
+
end: parent.getEnd(),
|
|
136
|
+
text: `this.${name}.set(${rewrittenText(parent.right)})`,
|
|
137
|
+
});
|
|
138
|
+
result.writes++;
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
if (isIncrement(parent) ||
|
|
142
|
+
(ts.isBinaryExpression(parent) &&
|
|
143
|
+
parent.left === node &&
|
|
144
|
+
isAssignment(parent.operatorToken.kind))) {
|
|
145
|
+
warn(parent, `write not migrated: ${text(parent)}`);
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
148
|
+
const chain = memberChain(node);
|
|
149
|
+
const top = chain.top;
|
|
150
|
+
const topParent = top.parent;
|
|
151
|
+
if (top !== node && chain.segments) {
|
|
152
|
+
// this.form.a.b = x; → this.patchForm(['a', 'b'], x);
|
|
153
|
+
if (ts.isBinaryExpression(topParent) &&
|
|
154
|
+
topParent.left === top &&
|
|
155
|
+
isAssignment(topParent.operatorToken.kind)) {
|
|
156
|
+
if (topParent.operatorToken.kind ===
|
|
157
|
+
ts.SyntaxKind.EqualsToken &&
|
|
158
|
+
ts.isExpressionStatement(topParent.parent) &&
|
|
159
|
+
member.patch) {
|
|
160
|
+
edits.push({
|
|
161
|
+
start: topParent.getStart(source),
|
|
162
|
+
end: topParent.getEnd(),
|
|
163
|
+
text: `this.${member.patch}([${chain.segments.join(', ')}], ${rewrittenText(topParent.right)})`,
|
|
164
|
+
});
|
|
165
|
+
result.writes++;
|
|
166
|
+
}
|
|
167
|
+
else {
|
|
168
|
+
warn(topParent, `write not migrated: ${text(topParent)}`);
|
|
169
|
+
}
|
|
170
|
+
return;
|
|
171
|
+
}
|
|
172
|
+
// this.form.list.push(x); → this.patchForm(['list'], [...(this.form()!.list ?? []), x]);
|
|
173
|
+
if (ts.isPropertyAccessExpression(topParent) &&
|
|
174
|
+
topParent.expression === top &&
|
|
175
|
+
ts.isCallExpression(topParent.parent) &&
|
|
176
|
+
topParent.parent.expression === topParent) {
|
|
177
|
+
const mutator = topParent.name.text;
|
|
178
|
+
const call = topParent.parent;
|
|
179
|
+
if ((APPENDING_MUTATORS.has(mutator) ||
|
|
180
|
+
PREPENDING_MUTATORS.has(mutator)) &&
|
|
181
|
+
ts.isExpressionStatement(call.parent) &&
|
|
182
|
+
member.patch) {
|
|
183
|
+
const current = `...(${rewrittenText(top)} ?? [])`;
|
|
184
|
+
const added = call.arguments.map((argument) => rewrittenText(argument));
|
|
185
|
+
const items = APPENDING_MUTATORS.has(mutator)
|
|
186
|
+
? [current, ...added]
|
|
187
|
+
: [...added, current];
|
|
188
|
+
edits.push({
|
|
189
|
+
start: call.getStart(source),
|
|
190
|
+
end: call.getEnd(),
|
|
191
|
+
text: `this.${member.patch}([${chain.segments.join(', ')}], [${items.join(', ')}])`,
|
|
192
|
+
});
|
|
193
|
+
result.writes++;
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
if (APPENDING_MUTATORS.has(mutator) ||
|
|
197
|
+
PREPENDING_MUTATORS.has(mutator) ||
|
|
198
|
+
OTHER_MUTATORS.has(mutator)) {
|
|
199
|
+
warn(call, `in-place mutation not migrated: ${text(call)}`);
|
|
200
|
+
return;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
if (isIncrement(topParent)) {
|
|
204
|
+
warn(topParent, `write not migrated: ${text(topParent)}`);
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
if ((APPENDING_MUTATORS.has((_a = memberCalled(node)) !== null && _a !== void 0 ? _a : '') ||
|
|
209
|
+
OTHER_MUTATORS.has((_b = memberCalled(node)) !== null && _b !== void 0 ? _b : '') ||
|
|
210
|
+
PREPENDING_MUTATORS.has((_c = memberCalled(node)) !== null && _c !== void 0 ? _c : '')) &&
|
|
211
|
+
!member.patch) {
|
|
212
|
+
// this.list.push(x): the list is derived from the form
|
|
213
|
+
warn(node.parent.parent, `in-place mutation not migrated: ${text(node.parent.parent)}`);
|
|
214
|
+
return;
|
|
215
|
+
}
|
|
216
|
+
edits.push(readEdit(node, member));
|
|
217
|
+
};
|
|
218
|
+
/**
|
|
219
|
+
* A read: `this.form.a` → `this.form()!.a`, `this.form?.a` → `this.form()?.a`, `this.form` → `this.form()`.
|
|
220
|
+
*/
|
|
221
|
+
const readEdit = (node, member) => {
|
|
222
|
+
const parent = node.parent;
|
|
223
|
+
const throughMember = member.nullable &&
|
|
224
|
+
(ts.isPropertyAccessExpression(parent) ||
|
|
225
|
+
ts.isElementAccessExpression(parent)) &&
|
|
226
|
+
parent.expression === node &&
|
|
227
|
+
!parent.questionDotToken;
|
|
228
|
+
return {
|
|
229
|
+
start: node.getEnd(),
|
|
230
|
+
end: node.getEnd(),
|
|
231
|
+
text: throughMember ? '()!' : '()',
|
|
232
|
+
};
|
|
233
|
+
};
|
|
234
|
+
/**
|
|
235
|
+
* The longest chain of member accesses starting at `this.form`, and the code of the keys of its path (`null` when a
|
|
236
|
+
* link of the chain isn't a member access, e.g. a call).
|
|
237
|
+
*/
|
|
238
|
+
const memberChain = (node) => {
|
|
239
|
+
let top = node;
|
|
240
|
+
const segments = [];
|
|
241
|
+
for (;;) {
|
|
242
|
+
const parent = top.parent;
|
|
243
|
+
const isMethodCall = ts.isPropertyAccessExpression(parent) &&
|
|
244
|
+
ts.isCallExpression(parent.parent) &&
|
|
245
|
+
parent.parent.expression === parent;
|
|
246
|
+
if (ts.isPropertyAccessExpression(parent) &&
|
|
247
|
+
parent.expression === top &&
|
|
248
|
+
!isMethodCall) {
|
|
249
|
+
segments.push(`'${parent.name.text}'`);
|
|
250
|
+
}
|
|
251
|
+
else if (ts.isElementAccessExpression(parent) &&
|
|
252
|
+
parent.expression === top) {
|
|
253
|
+
segments.push(rewrittenText(parent.argumentExpression));
|
|
254
|
+
}
|
|
255
|
+
else if (ts.isNonNullExpression(parent) &&
|
|
256
|
+
parent.expression === top) {
|
|
257
|
+
top = parent;
|
|
258
|
+
continue;
|
|
259
|
+
}
|
|
260
|
+
else {
|
|
261
|
+
break;
|
|
262
|
+
}
|
|
263
|
+
top = parent;
|
|
264
|
+
}
|
|
265
|
+
return { top, segments: top === node ? [] : segments };
|
|
266
|
+
};
|
|
267
|
+
/**
|
|
268
|
+
* `getList(): Item[] { return this.form.a.b; }` → `getListPath(): ObjectPath<Form> { return ['a', 'b']; }`
|
|
269
|
+
*/
|
|
270
|
+
const migrateGetList = (method, edits) => {
|
|
271
|
+
var _a, _b, _c;
|
|
272
|
+
const statements = (_b = (_a = method.body) === null || _a === void 0 ? void 0 : _a.statements) !== null && _b !== void 0 ? _b : [];
|
|
273
|
+
const returned = statements.length === 1 && ts.isReturnStatement(statements[0])
|
|
274
|
+
? statements[0].expression
|
|
275
|
+
: undefined;
|
|
276
|
+
const path = returned && formPathOf(returned);
|
|
277
|
+
if (!path) {
|
|
278
|
+
warn(method, 'getList() not migrated: implement getListPath(), the path of the list in the form');
|
|
279
|
+
return false;
|
|
280
|
+
}
|
|
281
|
+
const formType = (_c = options.formType) !== null && _c !== void 0 ? _c : 'unknown';
|
|
282
|
+
edits.push({
|
|
283
|
+
start: method.getStart(source),
|
|
284
|
+
end: method.getEnd(),
|
|
285
|
+
text: `getListPath(): ObjectPath<${formType}> {\n return [${path.join(', ')}];\n }`,
|
|
286
|
+
});
|
|
287
|
+
if (!options.formType) {
|
|
288
|
+
warn(method, 'getListPath(): set the type of the form in ObjectPath<...>');
|
|
289
|
+
}
|
|
290
|
+
result.listPaths++;
|
|
291
|
+
result.needsObjectPathImport = true;
|
|
292
|
+
return true;
|
|
293
|
+
};
|
|
294
|
+
/**
|
|
295
|
+
* The path of `this.form.a.b`, `this.form?.a?.b ?? []`, `(this.form as Form).a.b`: `["'a'", "'b'"]`.
|
|
296
|
+
*/
|
|
297
|
+
const formPathOf = (expression) => {
|
|
298
|
+
let node = expression;
|
|
299
|
+
if (ts.isBinaryExpression(node) &&
|
|
300
|
+
node.operatorToken.kind === ts.SyntaxKind.QuestionQuestionToken) {
|
|
301
|
+
node = node.left;
|
|
302
|
+
}
|
|
303
|
+
const segments = [];
|
|
304
|
+
for (;;) {
|
|
305
|
+
node = skipWrappers(node);
|
|
306
|
+
if (ts.isPropertyAccessExpression(node)) {
|
|
307
|
+
if (node.expression.kind === ts.SyntaxKind.ThisKeyword &&
|
|
308
|
+
node.name.text === 'form') {
|
|
309
|
+
return segments.length ? segments.reverse() : null;
|
|
310
|
+
}
|
|
311
|
+
segments.push(`'${node.name.text}'`);
|
|
312
|
+
node = node.expression;
|
|
313
|
+
}
|
|
314
|
+
else if (ts.isCallExpression(node) &&
|
|
315
|
+
node.arguments.length === 0 &&
|
|
316
|
+
ts.isPropertyAccessExpression(node.expression) &&
|
|
317
|
+
node.expression.expression.kind === ts.SyntaxKind.ThisKeyword &&
|
|
318
|
+
node.expression.name.text === 'form') {
|
|
319
|
+
return segments.length ? segments.reverse() : null;
|
|
320
|
+
}
|
|
321
|
+
else {
|
|
322
|
+
return null;
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
};
|
|
326
|
+
// reference: string; → removed: the page inherits the signal
|
|
327
|
+
for (const member of classNode.members) {
|
|
328
|
+
if (!ts.isPropertyDeclaration(member) ||
|
|
329
|
+
!ts.isIdentifier(member.name) ||
|
|
330
|
+
!REDECLARABLE_MEMBERS.has(member.name.text)) {
|
|
331
|
+
continue;
|
|
332
|
+
}
|
|
333
|
+
const initializer = member.initializer;
|
|
334
|
+
const emptyInitializer = !initializer ||
|
|
335
|
+
initializer.kind === ts.SyntaxKind.NullKeyword ||
|
|
336
|
+
(ts.isIdentifier(initializer) && initializer.text === 'undefined');
|
|
337
|
+
if (emptyInitializer && !((_a = ts.getDecorators(member)) === null || _a === void 0 ? void 0 : _a.length)) {
|
|
338
|
+
const lineStart = source.text.lastIndexOf('\n', member.getStart(source)) + 1;
|
|
339
|
+
const lineEnd = source.text.indexOf('\n', member.getEnd());
|
|
340
|
+
const ownLines = source.text.slice(lineStart, member.getStart(source)).trim() ===
|
|
341
|
+
'' &&
|
|
342
|
+
source.text
|
|
343
|
+
.slice(member.getEnd(), lineEnd === -1 ? undefined : lineEnd)
|
|
344
|
+
.trim() === '';
|
|
345
|
+
result.edits.push(ownLines
|
|
346
|
+
? {
|
|
347
|
+
start: lineStart,
|
|
348
|
+
end: lineEnd === -1 ? source.text.length : lineEnd + 1,
|
|
349
|
+
text: '',
|
|
350
|
+
}
|
|
351
|
+
: {
|
|
352
|
+
start: member.getStart(source),
|
|
353
|
+
end: member.getEnd(),
|
|
354
|
+
text: '',
|
|
355
|
+
});
|
|
356
|
+
result.redeclarations++;
|
|
357
|
+
}
|
|
358
|
+
else {
|
|
359
|
+
warn(member, `remove this field: it hides the signal ${member.name.text} of the page`);
|
|
360
|
+
}
|
|
361
|
+
}
|
|
362
|
+
collect(classNode, result.edits);
|
|
363
|
+
return result;
|
|
364
|
+
}
|
|
365
|
+
function skipWrappers(node) {
|
|
366
|
+
while (ts.isParenthesizedExpression(node) ||
|
|
367
|
+
ts.isAsExpression(node) ||
|
|
368
|
+
ts.isNonNullExpression(node) ||
|
|
369
|
+
ts.isTypeAssertionExpression(node)) {
|
|
370
|
+
node = node.expression;
|
|
371
|
+
}
|
|
372
|
+
return node;
|
|
373
|
+
}
|
|
374
|
+
function isAssignment(kind) {
|
|
375
|
+
return (kind >= ts.SyntaxKind.FirstAssignment &&
|
|
376
|
+
kind <= ts.SyntaxKind.LastAssignment);
|
|
377
|
+
}
|
|
378
|
+
function isIncrement(node) {
|
|
379
|
+
return ((ts.isPrefixUnaryExpression(node) ||
|
|
380
|
+
ts.isPostfixUnaryExpression(node)) &&
|
|
381
|
+
(node.operator === ts.SyntaxKind.PlusPlusToken ||
|
|
382
|
+
node.operator === ts.SyntaxKind.MinusMinusToken));
|
|
383
|
+
}
|
|
384
|
+
/**
|
|
385
|
+
* `push` for `this.list.push(...)`.
|
|
386
|
+
*/
|
|
387
|
+
function memberCalled(node) {
|
|
388
|
+
const parent = node.parent;
|
|
389
|
+
return ts.isPropertyAccessExpression(parent) &&
|
|
390
|
+
parent.expression === node &&
|
|
391
|
+
ts.isCallExpression(parent.parent) &&
|
|
392
|
+
parent.parent.expression === parent
|
|
393
|
+
? parent.name.text
|
|
394
|
+
: null;
|
|
395
|
+
}
|
|
396
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"class-migration.js","sourceRoot":"","sources":["../../../../../projects/prestations-ng/schematics/utility/form-signal/class-migration.ts"],"names":[],"mappings":"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"}
|