@angular/core 15.1.0-next.1 → 15.1.0-next.3
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/esm2020/src/application_init.mjs +2 -1
- package/esm2020/src/application_ref.mjs +21 -14
- package/esm2020/src/core.mjs +2 -1
- package/esm2020/src/core_render3_private_export.mjs +1 -2
- package/esm2020/src/di/create_injector.mjs +1 -1
- package/esm2020/src/di/r3_injector.mjs +8 -8
- package/esm2020/src/errors.mjs +1 -1
- package/esm2020/src/linker/query_list.mjs +7 -7
- package/esm2020/src/render3/assert.mjs +1 -6
- package/esm2020/src/render3/component_ref.mjs +7 -7
- package/esm2020/src/render3/definition.mjs +9 -1
- package/esm2020/src/render3/instructions/shared.mjs +9 -8
- package/esm2020/src/render3/interfaces/context.mjs +5 -5
- package/esm2020/src/render3/jit/module.mjs +2 -3
- package/esm2020/src/render3/namespaces.mjs +1 -8
- package/esm2020/src/render3/node_manipulation.mjs +3 -7
- package/esm2020/src/render3/node_selector_matcher.mjs +1 -4
- package/esm2020/src/render3/query.mjs +1 -6
- package/esm2020/src/render3/state.mjs +1 -4
- package/esm2020/src/render3/util/view_utils.mjs +1 -15
- package/esm2020/src/render3/view_ref.mjs +6 -6
- package/esm2020/src/util/array_utils.mjs +3 -71
- package/esm2020/src/version.mjs +1 -1
- package/esm2020/testing/src/logger.mjs +3 -3
- package/esm2020/testing/src/ng_zone_mock.mjs +3 -3
- package/esm2020/testing/src/test_bed.mjs +1 -1
- package/fesm2015/core.mjs +76 -204
- package/fesm2015/core.mjs.map +1 -1
- package/fesm2015/testing.mjs +54 -190
- package/fesm2015/testing.mjs.map +1 -1
- package/fesm2020/core.mjs +76 -204
- package/fesm2020/core.mjs.map +1 -1
- package/fesm2020/testing.mjs +54 -190
- package/fesm2020/testing.mjs.map +1 -1
- package/index.d.ts +12 -4
- package/package.json +1 -1
- package/schematics/migrations/relative-link-resolution/util.d.ts +1 -1
- package/schematics/migrations/router-link-with-href/util.d.ts +1 -1
- package/schematics/migrations.json +3 -18
- package/schematics/utils/import_manager.js +23 -3
- package/schematics/utils/ng_decorators.d.ts +1 -1
- package/schematics/utils/typescript/compiler_host.d.ts +1 -1
- package/schematics/utils/typescript/imports.d.ts +1 -1
- package/schematics/utils/typescript/property_name.d.ts +1 -1
- package/testing/index.d.ts +4 -1
- package/schematics/migrations/entry-components/index.d.ts +0 -11
- package/schematics/migrations/entry-components/index.js +0 -71
- package/schematics/migrations/entry-components/util.d.ts +0 -16
- package/schematics/migrations/entry-components/util.js +0 -57
- package/schematics/migrations/path-match-type/index.d.ts +0 -11
- package/schematics/migrations/path-match-type/index.js +0 -95
- package/schematics/migrations/path-match-type/transform.d.ts +0 -19
- package/schematics/migrations/path-match-type/transform.js +0 -48
- package/schematics/migrations/path-match-type/update_recorder.d.ts +0 -18
- package/schematics/migrations/path-match-type/update_recorder.js +0 -20
- package/schematics/migrations/path-match-type/util.d.ts +0 -11
- package/schematics/migrations/path-match-type/util.js +0 -106
- package/schematics/migrations/typed-forms/index.d.ts +0 -10
- package/schematics/migrations/typed-forms/index.js +0 -68
- package/schematics/migrations/typed-forms/util.d.ts +0 -19
- package/schematics/migrations/typed-forms/util.js +0 -134
|
@@ -1,95 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
-
});
|
|
16
|
-
};
|
|
17
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
18
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
19
|
-
};
|
|
20
|
-
(function (factory) {
|
|
21
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
22
|
-
var v = factory(require, exports);
|
|
23
|
-
if (v !== undefined) module.exports = v;
|
|
24
|
-
}
|
|
25
|
-
else if (typeof define === "function" && define.amd) {
|
|
26
|
-
define("@angular/core/schematics/migrations/path-match-type", ["require", "exports", "@angular-devkit/schematics", "path", "typescript", "@angular/core/schematics/utils/project_tsconfig_paths", "@angular/core/schematics/utils/typescript/compiler_host", "@angular/core/schematics/migrations/path-match-type/transform"], factory);
|
|
27
|
-
}
|
|
28
|
-
})(function (require, exports) {
|
|
29
|
-
"use strict";
|
|
30
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
|
32
|
-
const path_1 = require("path");
|
|
33
|
-
const typescript_1 = __importDefault(require("typescript"));
|
|
34
|
-
const project_tsconfig_paths_1 = require("@angular/core/schematics/utils/project_tsconfig_paths");
|
|
35
|
-
const compiler_host_1 = require("@angular/core/schematics/utils/typescript/compiler_host");
|
|
36
|
-
const transform_1 = require("@angular/core/schematics/migrations/path-match-type/transform");
|
|
37
|
-
/** Migration that adds explicit type to `Route`/`Routes` which use `patchMatch` */
|
|
38
|
-
function default_1() {
|
|
39
|
-
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
40
|
-
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
41
|
-
const basePath = process.cwd();
|
|
42
|
-
const allPaths = [...buildPaths, ...testPaths];
|
|
43
|
-
if (!allPaths.length) {
|
|
44
|
-
throw new schematics_1.SchematicsException('Could not find any tsconfig file. Cannot perform pathMatch migration.');
|
|
45
|
-
}
|
|
46
|
-
for (const tsconfigPath of allPaths) {
|
|
47
|
-
runMigration(tree, tsconfigPath, basePath);
|
|
48
|
-
}
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
exports.default = default_1;
|
|
52
|
-
function runMigration(tree, tsconfigPath, basePath) {
|
|
53
|
-
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
|
|
54
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
55
|
-
const updateRecorders = new Map();
|
|
56
|
-
const transform = new transform_1.PathMatchTypeTransform(getUpdateRecorder);
|
|
57
|
-
// Migrate all source files in the project.
|
|
58
|
-
transform.migrate(sourceFiles);
|
|
59
|
-
// Record the changes collected in the import manager.
|
|
60
|
-
transform.recordChanges();
|
|
61
|
-
// Walk through each update recorder and commit the update. We need to commit the
|
|
62
|
-
// updates in batches per source file as there can be only one recorder per source
|
|
63
|
-
// file in order to avoid shifted character offsets.
|
|
64
|
-
updateRecorders.forEach(recorder => recorder.commitUpdate());
|
|
65
|
-
/** Gets the update recorder for the specified source file. */
|
|
66
|
-
function getUpdateRecorder(sourceFile) {
|
|
67
|
-
if (updateRecorders.has(sourceFile)) {
|
|
68
|
-
return updateRecorders.get(sourceFile);
|
|
69
|
-
}
|
|
70
|
-
const printer = typescript_1.default.createPrinter();
|
|
71
|
-
const treeRecorder = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
72
|
-
const recorder = {
|
|
73
|
-
updateNode(oldExpr, newExpr) {
|
|
74
|
-
treeRecorder.insertRight(oldExpr.name.getEnd(), ': ' + printer.printNode(typescript_1.default.EmitHint.Unspecified, newExpr.type, sourceFile));
|
|
75
|
-
},
|
|
76
|
-
addNewImport(start, importText) {
|
|
77
|
-
// New imports should be inserted at the left while decorators should be inserted
|
|
78
|
-
// at the right in order to ensure that imports are inserted before the decorator
|
|
79
|
-
// if the start position of import and decorator is the source file start.
|
|
80
|
-
treeRecorder.insertLeft(start, importText);
|
|
81
|
-
},
|
|
82
|
-
updateExistingImport(namedBindings, newNamedBindings) {
|
|
83
|
-
treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());
|
|
84
|
-
treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);
|
|
85
|
-
},
|
|
86
|
-
commitUpdate() {
|
|
87
|
-
tree.commitUpdate(treeRecorder);
|
|
88
|
-
}
|
|
89
|
-
};
|
|
90
|
-
updateRecorders.set(sourceFile, recorder);
|
|
91
|
-
return recorder;
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
});
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9wYXRoLW1hdGNoLXR5cGUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7SUFFSCwyREFBMkU7SUFDM0UsK0JBQThCO0lBQzlCLDREQUE0QjtJQUU1QixrR0FBMkU7SUFDM0UsMkZBQTRGO0lBRTVGLDZGQUFtRDtJQUluRCxtRkFBbUY7SUFDbkY7UUFDRSxPQUFPLENBQU8sSUFBVSxFQUFFLEVBQUU7WUFDMUIsTUFBTSxFQUFDLFVBQVUsRUFBRSxTQUFTLEVBQUMsR0FBRyxNQUFNLElBQUEsZ0RBQXVCLEVBQUMsSUFBSSxDQUFDLENBQUM7WUFDcEUsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQy9CLE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBRyxVQUFVLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztZQUUvQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRTtnQkFDcEIsTUFBTSxJQUFJLGdDQUFtQixDQUN6Qix1RUFBdUUsQ0FBQyxDQUFDO2FBQzlFO1lBRUQsS0FBSyxNQUFNLFlBQVksSUFBSSxRQUFRLEVBQUU7Z0JBQ25DLFlBQVksQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsQ0FBQyxDQUFDO2FBQzVDO1FBQ0gsQ0FBQyxDQUFBLENBQUM7SUFDSixDQUFDO0lBZkQsNEJBZUM7SUFFRCxTQUFTLFlBQVksQ0FBQyxJQUFVLEVBQUUsWUFBb0IsRUFBRSxRQUFnQjtRQUN0RSxNQUFNLEVBQUMsT0FBTyxFQUFDLEdBQUcsSUFBQSxzQ0FBc0IsRUFBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ3ZFLE1BQU0sV0FBVyxHQUNiLE9BQU8sQ0FBQyxjQUFjLEVBQUUsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxJQUFBLDhCQUFjLEVBQUMsUUFBUSxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBQ2pHLE1BQU0sZUFBZSxHQUFHLElBQUksR0FBRyxFQUFpQyxDQUFDO1FBQ2pFLE1BQU0sU0FBUyxHQUFHLElBQUksa0NBQXNCLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUVoRSwyQ0FBMkM7UUFDM0MsU0FBUyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUMvQixzREFBc0Q7UUFDdEQsU0FBUyxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBRTFCLGlGQUFpRjtRQUNqRixrRkFBa0Y7UUFDbEYsb0RBQW9EO1FBQ3BELGVBQWUsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQztRQUU3RCw4REFBOEQ7UUFDOUQsU0FBUyxpQkFBaUIsQ0FBQyxVQUF5QjtZQUNsRCxJQUFJLGVBQWUsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUU7Z0JBQ25DLE9BQU8sZUFBZSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUUsQ0FBQzthQUN6QztZQUNELE1BQU0sT0FBTyxHQUFHLG9CQUFFLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDbkMsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFBLGVBQVEsRUFBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDL0UsTUFBTSxRQUFRLEdBQW1CO2dCQUMvQixVQUFVLENBQUMsT0FBK0IsRUFBRSxPQUErQjtvQkFDekUsWUFBWSxDQUFDLFdBQVcsQ0FDcEIsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsRUFDckIsSUFBSSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsb0JBQUUsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLE9BQU8sQ0FBQyxJQUFLLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztnQkFDcEYsQ0FBQztnQkFDRCxZQUFZLENBQUMsS0FBYSxFQUFFLFVBQWtCO29CQUM1QyxpRkFBaUY7b0JBQ2pGLGlGQUFpRjtvQkFDakYsMEVBQTBFO29CQUMxRSxZQUFZLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztnQkFDN0MsQ0FBQztnQkFDRCxvQkFBb0IsQ0FBQyxhQUE4QixFQUFFLGdCQUF3QjtvQkFDM0UsWUFBWSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7b0JBQ3hFLFlBQVksQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDLFFBQVEsRUFBRSxFQUFFLGdCQUFnQixDQUFDLENBQUM7Z0JBQ3ZFLENBQUM7Z0JBQ0QsWUFBWTtvQkFDVixJQUFJLENBQUMsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDO2dCQUNsQyxDQUFDO2FBQ0YsQ0FBQztZQUNGLGVBQWUsQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBQzFDLE9BQU8sUUFBUSxDQUFDO1FBQ2xCLENBQUM7SUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7UnVsZSwgU2NoZW1hdGljc0V4Y2VwdGlvbiwgVHJlZX0gZnJvbSAnQGFuZ3VsYXItZGV2a2l0L3NjaGVtYXRpY3MnO1xuaW1wb3J0IHtyZWxhdGl2ZX0gZnJvbSAncGF0aCc7XG5pbXBvcnQgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB7Z2V0UHJvamVjdFRzQ29uZmlnUGF0aHN9IGZyb20gJy4uLy4uL3V0aWxzL3Byb2plY3RfdHNjb25maWdfcGF0aHMnO1xuaW1wb3J0IHtjYW5NaWdyYXRlRmlsZSwgY3JlYXRlTWlncmF0aW9uUHJvZ3JhbX0gZnJvbSAnLi4vLi4vdXRpbHMvdHlwZXNjcmlwdC9jb21waWxlcl9ob3N0JztcblxuaW1wb3J0IHtQYXRoTWF0Y2hUeXBlVHJhbnNmb3JtfSBmcm9tICcuL3RyYW5zZm9ybSc7XG5pbXBvcnQge1VwZGF0ZVJlY29yZGVyfSBmcm9tICcuL3VwZGF0ZV9yZWNvcmRlcic7XG5cblxuLyoqIE1pZ3JhdGlvbiB0aGF0IGFkZHMgZXhwbGljaXQgdHlwZSB0byBgUm91dGVgL2BSb3V0ZXNgIHdoaWNoIHVzZSBgcGF0Y2hNYXRjaGAgKi9cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKCk6IFJ1bGUge1xuICByZXR1cm4gYXN5bmMgKHRyZWU6IFRyZWUpID0+IHtcbiAgICBjb25zdCB7YnVpbGRQYXRocywgdGVzdFBhdGhzfSA9IGF3YWl0IGdldFByb2plY3RUc0NvbmZpZ1BhdGhzKHRyZWUpO1xuICAgIGNvbnN0IGJhc2VQYXRoID0gcHJvY2Vzcy5jd2QoKTtcbiAgICBjb25zdCBhbGxQYXRocyA9IFsuLi5idWlsZFBhdGhzLCAuLi50ZXN0UGF0aHNdO1xuXG4gICAgaWYgKCFhbGxQYXRocy5sZW5ndGgpIHtcbiAgICAgIHRocm93IG5ldyBTY2hlbWF0aWNzRXhjZXB0aW9uKFxuICAgICAgICAgICdDb3VsZCBub3QgZmluZCBhbnkgdHNjb25maWcgZmlsZS4gQ2Fubm90IHBlcmZvcm0gcGF0aE1hdGNoIG1pZ3JhdGlvbi4nKTtcbiAgICB9XG5cbiAgICBmb3IgKGNvbnN0IHRzY29uZmlnUGF0aCBvZiBhbGxQYXRocykge1xuICAgICAgcnVuTWlncmF0aW9uKHRyZWUsIHRzY29uZmlnUGF0aCwgYmFzZVBhdGgpO1xuICAgIH1cbiAgfTtcbn1cblxuZnVuY3Rpb24gcnVuTWlncmF0aW9uKHRyZWU6IFRyZWUsIHRzY29uZmlnUGF0aDogc3RyaW5nLCBiYXNlUGF0aDogc3RyaW5nKTogdm9pZCB7XG4gIGNvbnN0IHtwcm9ncmFtfSA9IGNyZWF0ZU1pZ3JhdGlvblByb2dyYW0odHJlZSwgdHNjb25maWdQYXRoLCBiYXNlUGF0aCk7XG4gIGNvbnN0IHNvdXJjZUZpbGVzID1cbiAgICAgIHByb2dyYW0uZ2V0U291cmNlRmlsZXMoKS5maWx0ZXIoc291cmNlRmlsZSA9PiBjYW5NaWdyYXRlRmlsZShiYXNlUGF0aCwgc291cmNlRmlsZSwgcHJvZ3JhbSkpO1xuICBjb25zdCB1cGRhdGVSZWNvcmRlcnMgPSBuZXcgTWFwPHRzLlNvdXJjZUZpbGUsIFVwZGF0ZVJlY29yZGVyPigpO1xuICBjb25zdCB0cmFuc2Zvcm0gPSBuZXcgUGF0aE1hdGNoVHlwZVRyYW5zZm9ybShnZXRVcGRhdGVSZWNvcmRlcik7XG5cbiAgLy8gTWlncmF0ZSBhbGwgc291cmNlIGZpbGVzIGluIHRoZSBwcm9qZWN0LlxuICB0cmFuc2Zvcm0ubWlncmF0ZShzb3VyY2VGaWxlcyk7XG4gIC8vIFJlY29yZCB0aGUgY2hhbmdlcyBjb2xsZWN0ZWQgaW4gdGhlIGltcG9ydCBtYW5hZ2VyLlxuICB0cmFuc2Zvcm0ucmVjb3JkQ2hhbmdlcygpO1xuXG4gIC8vIFdhbGsgdGhyb3VnaCBlYWNoIHVwZGF0ZSByZWNvcmRlciBhbmQgY29tbWl0IHRoZSB1cGRhdGUuIFdlIG5lZWQgdG8gY29tbWl0IHRoZVxuICAvLyB1cGRhdGVzIGluIGJhdGNoZXMgcGVyIHNvdXJjZSBmaWxlIGFzIHRoZXJlIGNhbiBiZSBvbmx5IG9uZSByZWNvcmRlciBwZXIgc291cmNlXG4gIC8vIGZpbGUgaW4gb3JkZXIgdG8gYXZvaWQgc2hpZnRlZCBjaGFyYWN0ZXIgb2Zmc2V0cy5cbiAgdXBkYXRlUmVjb3JkZXJzLmZvckVhY2gocmVjb3JkZXIgPT4gcmVjb3JkZXIuY29tbWl0VXBkYXRlKCkpO1xuXG4gIC8qKiBHZXRzIHRoZSB1cGRhdGUgcmVjb3JkZXIgZm9yIHRoZSBzcGVjaWZpZWQgc291cmNlIGZpbGUuICovXG4gIGZ1bmN0aW9uIGdldFVwZGF0ZVJlY29yZGVyKHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUpOiBVcGRhdGVSZWNvcmRlciB7XG4gICAgaWYgKHVwZGF0ZVJlY29yZGVycy5oYXMoc291cmNlRmlsZSkpIHtcbiAgICAgIHJldHVybiB1cGRhdGVSZWNvcmRlcnMuZ2V0KHNvdXJjZUZpbGUpITtcbiAgICB9XG4gICAgY29uc3QgcHJpbnRlciA9IHRzLmNyZWF0ZVByaW50ZXIoKTtcbiAgICBjb25zdCB0cmVlUmVjb3JkZXIgPSB0cmVlLmJlZ2luVXBkYXRlKHJlbGF0aXZlKGJhc2VQYXRoLCBzb3VyY2VGaWxlLmZpbGVOYW1lKSk7XG4gICAgY29uc3QgcmVjb3JkZXI6IFVwZGF0ZVJlY29yZGVyID0ge1xuICAgICAgdXBkYXRlTm9kZShvbGRFeHByOiB0cy5WYXJpYWJsZURlY2xhcmF0aW9uLCBuZXdFeHByOiB0cy5WYXJpYWJsZURlY2xhcmF0aW9uKSB7XG4gICAgICAgIHRyZWVSZWNvcmRlci5pbnNlcnRSaWdodChcbiAgICAgICAgICAgIG9sZEV4cHIubmFtZS5nZXRFbmQoKSxcbiAgICAgICAgICAgICc6ICcgKyBwcmludGVyLnByaW50Tm9kZSh0cy5FbWl0SGludC5VbnNwZWNpZmllZCwgbmV3RXhwci50eXBlISwgc291cmNlRmlsZSkpO1xuICAgICAgfSxcbiAgICAgIGFkZE5ld0ltcG9ydChzdGFydDogbnVtYmVyLCBpbXBvcnRUZXh0OiBzdHJpbmcpIHtcbiAgICAgICAgLy8gTmV3IGltcG9ydHMgc2hvdWxkIGJlIGluc2VydGVkIGF0IHRoZSBsZWZ0IHdoaWxlIGRlY29yYXRvcnMgc2hvdWxkIGJlIGluc2VydGVkXG4gICAgICAgIC8vIGF0IHRoZSByaWdodCBpbiBvcmRlciB0byBlbnN1cmUgdGhhdCBpbXBvcnRzIGFyZSBpbnNlcnRlZCBiZWZvcmUgdGhlIGRlY29yYXRvclxuICAgICAgICAvLyBpZiB0aGUgc3RhcnQgcG9zaXRpb24gb2YgaW1wb3J0IGFuZCBkZWNvcmF0b3IgaXMgdGhlIHNvdXJjZSBmaWxlIHN0YXJ0LlxuICAgICAgICB0cmVlUmVjb3JkZXIuaW5zZXJ0TGVmdChzdGFydCwgaW1wb3J0VGV4dCk7XG4gICAgICB9LFxuICAgICAgdXBkYXRlRXhpc3RpbmdJbXBvcnQobmFtZWRCaW5kaW5nczogdHMuTmFtZWRJbXBvcnRzLCBuZXdOYW1lZEJpbmRpbmdzOiBzdHJpbmcpIHtcbiAgICAgICAgdHJlZVJlY29yZGVyLnJlbW92ZShuYW1lZEJpbmRpbmdzLmdldFN0YXJ0KCksIG5hbWVkQmluZGluZ3MuZ2V0V2lkdGgoKSk7XG4gICAgICAgIHRyZWVSZWNvcmRlci5pbnNlcnRSaWdodChuYW1lZEJpbmRpbmdzLmdldFN0YXJ0KCksIG5ld05hbWVkQmluZGluZ3MpO1xuICAgICAgfSxcbiAgICAgIGNvbW1pdFVwZGF0ZSgpIHtcbiAgICAgICAgdHJlZS5jb21taXRVcGRhdGUodHJlZVJlY29yZGVyKTtcbiAgICAgIH1cbiAgICB9O1xuICAgIHVwZGF0ZVJlY29yZGVycy5zZXQoc291cmNlRmlsZSwgcmVjb3JkZXIpO1xuICAgIHJldHVybiByZWNvcmRlcjtcbiAgfVxufVxuIl19
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
/// <amd-module name="@angular/core/schematics/migrations/path-match-type/transform" />
|
|
9
|
-
import ts from 'typescript';
|
|
10
|
-
import { UpdateRecorder } from './update_recorder';
|
|
11
|
-
export declare class PathMatchTypeTransform {
|
|
12
|
-
private getUpdateRecorder;
|
|
13
|
-
private printer;
|
|
14
|
-
private importManager;
|
|
15
|
-
constructor(getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder);
|
|
16
|
-
migrate(sourceFiles: ts.SourceFile[]): void;
|
|
17
|
-
/** Records all changes that were made in the import manager. */
|
|
18
|
-
recordChanges(): void;
|
|
19
|
-
}
|
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
-
};
|
|
11
|
-
(function (factory) {
|
|
12
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
13
|
-
var v = factory(require, exports);
|
|
14
|
-
if (v !== undefined) module.exports = v;
|
|
15
|
-
}
|
|
16
|
-
else if (typeof define === "function" && define.amd) {
|
|
17
|
-
define("@angular/core/schematics/migrations/path-match-type/transform", ["require", "exports", "typescript", "@angular/core/schematics/utils/import_manager", "@angular/core/schematics/migrations/path-match-type/util"], factory);
|
|
18
|
-
}
|
|
19
|
-
})(function (require, exports) {
|
|
20
|
-
"use strict";
|
|
21
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.PathMatchTypeTransform = void 0;
|
|
23
|
-
const typescript_1 = __importDefault(require("typescript"));
|
|
24
|
-
const import_manager_1 = require("@angular/core/schematics/utils/import_manager");
|
|
25
|
-
const util_1 = require("@angular/core/schematics/migrations/path-match-type/util");
|
|
26
|
-
class PathMatchTypeTransform {
|
|
27
|
-
constructor(getUpdateRecorder) {
|
|
28
|
-
this.getUpdateRecorder = getUpdateRecorder;
|
|
29
|
-
this.printer = typescript_1.default.createPrinter();
|
|
30
|
-
this.importManager = new import_manager_1.ImportManager(this.getUpdateRecorder, this.printer);
|
|
31
|
-
}
|
|
32
|
-
migrate(sourceFiles) {
|
|
33
|
-
for (const sourceFile of sourceFiles) {
|
|
34
|
-
const toMigrate = (0, util_1.findExpressionsToMigrate)(sourceFile, this.importManager);
|
|
35
|
-
const recorder = this.getUpdateRecorder(sourceFile);
|
|
36
|
-
for (const [oldNode, newNode] of toMigrate) {
|
|
37
|
-
recorder.updateNode(oldNode, newNode, sourceFile);
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
/** Records all changes that were made in the import manager. */
|
|
42
|
-
recordChanges() {
|
|
43
|
-
this.importManager.recordChanges();
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
exports.PathMatchTypeTransform = PathMatchTypeTransform;
|
|
47
|
-
});
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNmb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zY2hlbWF0aWNzL21pZ3JhdGlvbnMvcGF0aC1tYXRjaC10eXBlL3RyYW5zZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7Ozs7SUFFSCw0REFBNEI7SUFFNUIsa0ZBQXlEO0lBR3pELG1GQUFnRDtJQUdoRCxNQUFhLHNCQUFzQjtRQUlqQyxZQUFvQixpQkFBd0Q7WUFBeEQsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUF1QztZQUhwRSxZQUFPLEdBQUcsb0JBQUUsQ0FBQyxhQUFhLEVBQUUsQ0FBQztZQUM3QixrQkFBYSxHQUFHLElBQUksOEJBQWEsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRUQsQ0FBQztRQUVoRixPQUFPLENBQUMsV0FBNEI7WUFDbEMsS0FBSyxNQUFNLFVBQVUsSUFBSSxXQUFXLEVBQUU7Z0JBQ3BDLE1BQU0sU0FBUyxHQUFHLElBQUEsK0JBQXdCLEVBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztnQkFDM0UsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFVBQVUsQ0FBQyxDQUFDO2dCQUNwRCxLQUFLLE1BQU0sQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLElBQUksU0FBUyxFQUFFO29CQUMxQyxRQUFRLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7aUJBQ25EO2FBQ0Y7UUFDSCxDQUFDO1FBQ0QsZ0VBQWdFO1FBQ2hFLGFBQWE7WUFDWCxJQUFJLENBQUMsYUFBYSxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBQ3JDLENBQUM7S0FDRjtJQW5CRCx3REFtQkMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuXG5pbXBvcnQge0ltcG9ydE1hbmFnZXJ9IGZyb20gJy4uLy4uL3V0aWxzL2ltcG9ydF9tYW5hZ2VyJztcblxuaW1wb3J0IHtVcGRhdGVSZWNvcmRlcn0gZnJvbSAnLi91cGRhdGVfcmVjb3JkZXInO1xuaW1wb3J0IHtmaW5kRXhwcmVzc2lvbnNUb01pZ3JhdGV9IGZyb20gJy4vdXRpbCc7XG5cblxuZXhwb3J0IGNsYXNzIFBhdGhNYXRjaFR5cGVUcmFuc2Zvcm0ge1xuICBwcml2YXRlIHByaW50ZXIgPSB0cy5jcmVhdGVQcmludGVyKCk7XG4gIHByaXZhdGUgaW1wb3J0TWFuYWdlciA9IG5ldyBJbXBvcnRNYW5hZ2VyKHRoaXMuZ2V0VXBkYXRlUmVjb3JkZXIsIHRoaXMucHJpbnRlcik7XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSBnZXRVcGRhdGVSZWNvcmRlcjogKHNmOiB0cy5Tb3VyY2VGaWxlKSA9PiBVcGRhdGVSZWNvcmRlcikge31cblxuICBtaWdyYXRlKHNvdXJjZUZpbGVzOiB0cy5Tb3VyY2VGaWxlW10pOiB2b2lkIHtcbiAgICBmb3IgKGNvbnN0IHNvdXJjZUZpbGUgb2Ygc291cmNlRmlsZXMpIHtcbiAgICAgIGNvbnN0IHRvTWlncmF0ZSA9IGZpbmRFeHByZXNzaW9uc1RvTWlncmF0ZShzb3VyY2VGaWxlLCB0aGlzLmltcG9ydE1hbmFnZXIpO1xuICAgICAgY29uc3QgcmVjb3JkZXIgPSB0aGlzLmdldFVwZGF0ZVJlY29yZGVyKHNvdXJjZUZpbGUpO1xuICAgICAgZm9yIChjb25zdCBbb2xkTm9kZSwgbmV3Tm9kZV0gb2YgdG9NaWdyYXRlKSB7XG4gICAgICAgIHJlY29yZGVyLnVwZGF0ZU5vZGUob2xkTm9kZSwgbmV3Tm9kZSwgc291cmNlRmlsZSk7XG4gICAgICB9XG4gICAgfVxuICB9XG4gIC8qKiBSZWNvcmRzIGFsbCBjaGFuZ2VzIHRoYXQgd2VyZSBtYWRlIGluIHRoZSBpbXBvcnQgbWFuYWdlci4gKi9cbiAgcmVjb3JkQ2hhbmdlcygpIHtcbiAgICB0aGlzLmltcG9ydE1hbmFnZXIucmVjb3JkQ2hhbmdlcygpO1xuICB9XG59XG4iXX0=
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
/// <amd-module name="@angular/core/schematics/migrations/path-match-type/update_recorder" />
|
|
9
|
-
import ts from 'typescript';
|
|
10
|
-
import { ImportManagerUpdateRecorder } from '../../utils/import_manager';
|
|
11
|
-
/**
|
|
12
|
-
* Update recorder interface that is used to transform source files
|
|
13
|
-
* in a non-colliding way.
|
|
14
|
-
*/
|
|
15
|
-
export interface UpdateRecorder extends ImportManagerUpdateRecorder {
|
|
16
|
-
updateNode(oldNode: ts.VariableDeclaration, newNode: ts.VariableDeclaration, sourceFile: ts.SourceFile): void;
|
|
17
|
-
commitUpdate(): void;
|
|
18
|
-
}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
(function (factory) {
|
|
9
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
10
|
-
var v = factory(require, exports);
|
|
11
|
-
if (v !== undefined) module.exports = v;
|
|
12
|
-
}
|
|
13
|
-
else if (typeof define === "function" && define.amd) {
|
|
14
|
-
define("@angular/core/schematics/migrations/path-match-type/update_recorder", ["require", "exports"], factory);
|
|
15
|
-
}
|
|
16
|
-
})(function (require, exports) {
|
|
17
|
-
"use strict";
|
|
18
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
-
});
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlX3JlY29yZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zY2hlbWF0aWNzL21pZ3JhdGlvbnMvcGF0aC1tYXRjaC10eXBlL3VwZGF0ZV9yZWNvcmRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUciLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuXG5pbXBvcnQge0ltcG9ydE1hbmFnZXJVcGRhdGVSZWNvcmRlcn0gZnJvbSAnLi4vLi4vdXRpbHMvaW1wb3J0X21hbmFnZXInO1xuXG4vKipcbiAqIFVwZGF0ZSByZWNvcmRlciBpbnRlcmZhY2UgdGhhdCBpcyB1c2VkIHRvIHRyYW5zZm9ybSBzb3VyY2UgZmlsZXNcbiAqIGluIGEgbm9uLWNvbGxpZGluZyB3YXkuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgVXBkYXRlUmVjb3JkZXIgZXh0ZW5kcyBJbXBvcnRNYW5hZ2VyVXBkYXRlUmVjb3JkZXIge1xuICB1cGRhdGVOb2RlKFxuICAgICAgb2xkTm9kZTogdHMuVmFyaWFibGVEZWNsYXJhdGlvbiwgbmV3Tm9kZTogdHMuVmFyaWFibGVEZWNsYXJhdGlvbixcbiAgICAgIHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUpOiB2b2lkO1xuICBjb21taXRVcGRhdGUoKTogdm9pZDtcbn1cbiJdfQ==
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
/// <amd-module name="@angular/core/schematics/migrations/path-match-type/util" />
|
|
9
|
-
import ts from 'typescript';
|
|
10
|
-
import { ImportManager } from '../../utils/import_manager';
|
|
11
|
-
export declare function findExpressionsToMigrate(sourceFile: ts.SourceFile, importManager: ImportManager): Map<ts.VariableDeclaration, ts.VariableDeclaration>;
|
|
@@ -1,106 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
-
};
|
|
11
|
-
(function (factory) {
|
|
12
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
13
|
-
var v = factory(require, exports);
|
|
14
|
-
if (v !== undefined) module.exports = v;
|
|
15
|
-
}
|
|
16
|
-
else if (typeof define === "function" && define.amd) {
|
|
17
|
-
define("@angular/core/schematics/migrations/path-match-type/util", ["require", "exports", "typescript"], factory);
|
|
18
|
-
}
|
|
19
|
-
})(function (require, exports) {
|
|
20
|
-
"use strict";
|
|
21
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.findExpressionsToMigrate = void 0;
|
|
23
|
-
const typescript_1 = __importDefault(require("typescript"));
|
|
24
|
-
function findExpressionsToMigrate(sourceFile, importManager) {
|
|
25
|
-
const migratedNodesMap = new Map();
|
|
26
|
-
let _currentVariableDecl = null;
|
|
27
|
-
(() => {
|
|
28
|
-
sourceFile.forEachChild(function visitNode(node) {
|
|
29
|
-
if (typescript_1.default.isVariableDeclaration(node)) {
|
|
30
|
-
_currentVariableDecl = node;
|
|
31
|
-
node.forEachChild(visitNode);
|
|
32
|
-
_currentVariableDecl = null;
|
|
33
|
-
}
|
|
34
|
-
if (isRouteOrRoutesVariableDeclaration(node)) {
|
|
35
|
-
// The variable declaration is already explicitly typed as `Route` or `Routes` so it does
|
|
36
|
-
// not need a migration.
|
|
37
|
-
return;
|
|
38
|
-
}
|
|
39
|
-
else if (typescript_1.default.isObjectLiteralExpression(node)) {
|
|
40
|
-
if (_currentVariableDecl !== null && _currentVariableDecl.type === undefined) {
|
|
41
|
-
visitObjectLiteral(node);
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
else {
|
|
45
|
-
node.forEachChild(visitNode);
|
|
46
|
-
}
|
|
47
|
-
});
|
|
48
|
-
function visitObjectLiteral(obj) {
|
|
49
|
-
const hasPathMatch = obj.properties.some(p => isPropertyWithName(p, 'pathMatch'));
|
|
50
|
-
const hasPath = obj.properties.some(p => isPropertyWithName(p, 'path'));
|
|
51
|
-
const childrenProperty = obj.properties.find(p => isPropertyWithName(p, 'children'));
|
|
52
|
-
// The object must have _both_ pathMatch _and_ path for us to be reasonably sure that it's
|
|
53
|
-
// a `Route` definition.
|
|
54
|
-
if (hasPath && hasPathMatch) {
|
|
55
|
-
updateCurrentVariableDeclaration();
|
|
56
|
-
}
|
|
57
|
-
else if (childrenProperty !== undefined && typescript_1.default.isPropertyAssignment(childrenProperty) &&
|
|
58
|
-
typescript_1.default.isArrayLiteralExpression(childrenProperty.initializer)) {
|
|
59
|
-
// Also need to check the children if it exists
|
|
60
|
-
for (const child of childrenProperty.initializer.elements) {
|
|
61
|
-
if (typescript_1.default.isObjectLiteralExpression(child)) {
|
|
62
|
-
visitObjectLiteral(child);
|
|
63
|
-
// If the child caused a migration, we can exit early
|
|
64
|
-
if (_currentVariableDecl && migratedNodesMap.has(_currentVariableDecl)) {
|
|
65
|
-
break;
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
function isPropertyWithName(p, name) {
|
|
72
|
-
if (typescript_1.default.isPropertyAssignment(p)) {
|
|
73
|
-
return p.name.getText() === name;
|
|
74
|
-
}
|
|
75
|
-
else if (typescript_1.default.isShorthandPropertyAssignment(p)) {
|
|
76
|
-
return p.name.getText() === name;
|
|
77
|
-
}
|
|
78
|
-
else {
|
|
79
|
-
// Don't attempt to migrate edge case spreadAssignment
|
|
80
|
-
return false;
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
function updateCurrentVariableDeclaration() {
|
|
84
|
-
if (_currentVariableDecl === null || _currentVariableDecl.initializer === undefined) {
|
|
85
|
-
return;
|
|
86
|
-
}
|
|
87
|
-
let typeToUse;
|
|
88
|
-
if (typescript_1.default.isArrayLiteralExpression(_currentVariableDecl.initializer)) {
|
|
89
|
-
typeToUse = importManager.addImportToSourceFile(sourceFile, 'Routes', '@angular/router');
|
|
90
|
-
}
|
|
91
|
-
else {
|
|
92
|
-
typeToUse = importManager.addImportToSourceFile(sourceFile, 'Route', '@angular/router');
|
|
93
|
-
}
|
|
94
|
-
const migrated = typescript_1.default.factory.updateVariableDeclaration(_currentVariableDecl, _currentVariableDecl.name, _currentVariableDecl.exclamationToken, typeToUse, _currentVariableDecl.initializer);
|
|
95
|
-
migratedNodesMap.set(_currentVariableDecl, migrated);
|
|
96
|
-
}
|
|
97
|
-
})();
|
|
98
|
-
return migratedNodesMap;
|
|
99
|
-
}
|
|
100
|
-
exports.findExpressionsToMigrate = findExpressionsToMigrate;
|
|
101
|
-
function isRouteOrRoutesVariableDeclaration(node) {
|
|
102
|
-
return typescript_1.default.isVariableDeclaration(node) && node.type &&
|
|
103
|
-
(node.type.getText() === 'Route' || node.type.getText() === 'Routes');
|
|
104
|
-
}
|
|
105
|
-
});
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/path-match-type/util.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport ts from 'typescript';\n\nimport {ImportManager} from '../../utils/import_manager';\n\n\nexport function findExpressionsToMigrate(sourceFile: ts.SourceFile, importManager: ImportManager) {\n  const migratedNodesMap: Map<ts.VariableDeclaration, ts.VariableDeclaration> = new Map();\n  let _currentVariableDecl: ts.VariableDeclaration|null = null;\n  (() => {\n    sourceFile.forEachChild(function visitNode(node: ts.Node) {\n      if (ts.isVariableDeclaration(node)) {\n        _currentVariableDecl = node;\n        node.forEachChild(visitNode);\n        _currentVariableDecl = null;\n      }\n      if (isRouteOrRoutesVariableDeclaration(node)) {\n        // The variable declaration is already explicitly typed as `Route` or `Routes` so it does\n        // not need a migration.\n        return;\n      } else if (ts.isObjectLiteralExpression(node)) {\n        if (_currentVariableDecl !== null && _currentVariableDecl.type === undefined) {\n          visitObjectLiteral(node);\n        }\n      } else {\n        node.forEachChild(visitNode);\n      }\n    });\n\n    function visitObjectLiteral(obj: ts.ObjectLiteralExpression) {\n      const hasPathMatch = obj.properties.some(p => isPropertyWithName(p, 'pathMatch'));\n      const hasPath = obj.properties.some(p => isPropertyWithName(p, 'path'));\n      const childrenProperty = obj.properties.find(p => isPropertyWithName(p, 'children'));\n      // The object must have _both_ pathMatch _and_ path for us to be reasonably sure that it's\n      // a `Route` definition.\n      if (hasPath && hasPathMatch) {\n        updateCurrentVariableDeclaration();\n      } else if (\n          childrenProperty !== undefined && ts.isPropertyAssignment(childrenProperty) &&\n          ts.isArrayLiteralExpression(childrenProperty.initializer)) {\n        // Also need to check the children if it exists\n        for (const child of childrenProperty.initializer.elements) {\n          if (ts.isObjectLiteralExpression(child)) {\n            visitObjectLiteral(child);\n            // If the child caused a migration, we can exit early\n            if (_currentVariableDecl && migratedNodesMap.has(_currentVariableDecl)) {\n              break;\n            }\n          }\n        }\n      }\n    }\n\n    function isPropertyWithName(p: ts.ObjectLiteralElementLike, name: string) {\n      if (ts.isPropertyAssignment(p)) {\n        return p.name.getText() === name;\n      } else if (ts.isShorthandPropertyAssignment(p)) {\n        return p.name.getText() === name;\n      } else {\n        // Don't attempt to migrate edge case spreadAssignment\n        return false;\n      }\n    }\n\n    function updateCurrentVariableDeclaration() {\n      if (_currentVariableDecl === null || _currentVariableDecl.initializer === undefined) {\n        return;\n      }\n      let typeToUse: ts.TypeNode;\n      if (ts.isArrayLiteralExpression(_currentVariableDecl.initializer)) {\n        typeToUse = importManager.addImportToSourceFile(sourceFile, 'Routes', '@angular/router') as\n            unknown as ts.TypeNode;\n      } else {\n        typeToUse = importManager.addImportToSourceFile(sourceFile, 'Route', '@angular/router') as\n            unknown as ts.TypeNode;\n      }\n\n      const migrated = ts.factory.updateVariableDeclaration(\n          _currentVariableDecl, _currentVariableDecl.name, _currentVariableDecl.exclamationToken,\n          typeToUse, _currentVariableDecl.initializer);\n      migratedNodesMap.set(_currentVariableDecl, migrated);\n    }\n  })();\n\n  return migratedNodesMap;\n}\n\nfunction isRouteOrRoutesVariableDeclaration(node: ts.Node) {\n  return ts.isVariableDeclaration(node) && node.type &&\n      (node.type.getText() === 'Route' || node.type.getText() === 'Routes');\n}\n"]}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
/// <amd-module name="@angular/core/schematics/migrations/typed-forms" />
|
|
9
|
-
import { Rule } from '@angular-devkit/schematics';
|
|
10
|
-
export default function (): Rule;
|
|
@@ -1,68 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
-
});
|
|
16
|
-
};
|
|
17
|
-
(function (factory) {
|
|
18
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
19
|
-
var v = factory(require, exports);
|
|
20
|
-
if (v !== undefined) module.exports = v;
|
|
21
|
-
}
|
|
22
|
-
else if (typeof define === "function" && define.amd) {
|
|
23
|
-
define("@angular/core/schematics/migrations/typed-forms", ["require", "exports", "@angular-devkit/schematics", "path", "@angular/core/schematics/utils/project_tsconfig_paths", "@angular/core/schematics/utils/typescript/compiler_host", "@angular/core/schematics/migrations/typed-forms/util"], factory);
|
|
24
|
-
}
|
|
25
|
-
})(function (require, exports) {
|
|
26
|
-
"use strict";
|
|
27
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
|
29
|
-
const path_1 = require("path");
|
|
30
|
-
const project_tsconfig_paths_1 = require("@angular/core/schematics/utils/project_tsconfig_paths");
|
|
31
|
-
const compiler_host_1 = require("@angular/core/schematics/utils/typescript/compiler_host");
|
|
32
|
-
const util_1 = require("@angular/core/schematics/migrations/typed-forms/util");
|
|
33
|
-
function default_1() {
|
|
34
|
-
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
35
|
-
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
36
|
-
const basePath = process.cwd();
|
|
37
|
-
const allPaths = [...buildPaths, ...testPaths];
|
|
38
|
-
if (!allPaths.length) {
|
|
39
|
-
throw new schematics_1.SchematicsException('Could not find any tsconfig file. Cannot migrate to Typed Forms.');
|
|
40
|
-
}
|
|
41
|
-
for (const tsconfigPath of allPaths) {
|
|
42
|
-
runTypedFormsMigration(tree, tsconfigPath, basePath);
|
|
43
|
-
}
|
|
44
|
-
});
|
|
45
|
-
}
|
|
46
|
-
exports.default = default_1;
|
|
47
|
-
function runTypedFormsMigration(tree, tsconfigPath, basePath) {
|
|
48
|
-
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
|
|
49
|
-
const typeChecker = program.getTypeChecker();
|
|
50
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
51
|
-
for (const sourceFile of sourceFiles) {
|
|
52
|
-
let update = null;
|
|
53
|
-
const rewriter = (startPos, origLength, text) => {
|
|
54
|
-
if (update === null) {
|
|
55
|
-
// Lazily initialize update, because most files will not require migration.
|
|
56
|
-
update = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
57
|
-
}
|
|
58
|
-
update.remove(startPos, origLength);
|
|
59
|
-
update.insertLeft(startPos, text);
|
|
60
|
-
};
|
|
61
|
-
(0, util_1.migrateFile)(sourceFile, typeChecker, rewriter);
|
|
62
|
-
if (update !== null) {
|
|
63
|
-
tree.commitUpdate(update);
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
});
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy90eXBlZC1mb3Jtcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztJQUVILDJEQUEyRjtJQUMzRiwrQkFBOEI7SUFFOUIsa0dBQTJFO0lBQzNFLDJGQUE0RjtJQUU1RiwrRUFBbUM7SUFFbkM7UUFDRSxPQUFPLENBQU8sSUFBVSxFQUFFLEVBQUU7WUFDMUIsTUFBTSxFQUFDLFVBQVUsRUFBRSxTQUFTLEVBQUMsR0FBRyxNQUFNLElBQUEsZ0RBQXVCLEVBQUMsSUFBSSxDQUFDLENBQUM7WUFDcEUsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQy9CLE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBRyxVQUFVLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztZQUUvQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRTtnQkFDcEIsTUFBTSxJQUFJLGdDQUFtQixDQUN6QixrRUFBa0UsQ0FBQyxDQUFDO2FBQ3pFO1lBRUQsS0FBSyxNQUFNLFlBQVksSUFBSSxRQUFRLEVBQUU7Z0JBQ25DLHNCQUFzQixDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUM7YUFDdEQ7UUFDSCxDQUFDLENBQUEsQ0FBQztJQUNKLENBQUM7SUFmRCw0QkFlQztJQUVELFNBQVMsc0JBQXNCLENBQUMsSUFBVSxFQUFFLFlBQW9CLEVBQUUsUUFBZ0I7UUFDaEYsTUFBTSxFQUFDLE9BQU8sRUFBQyxHQUFHLElBQUEsc0NBQXNCLEVBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN2RSxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDN0MsTUFBTSxXQUFXLEdBQ2IsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLElBQUEsOEJBQWMsRUFBQyxRQUFRLEVBQUUsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFFakcsS0FBSyxNQUFNLFVBQVUsSUFBSSxXQUFXLEVBQUU7WUFDcEMsSUFBSSxNQUFNLEdBQXdCLElBQUksQ0FBQztZQUV2QyxNQUFNLFFBQVEsR0FBRyxDQUFDLFFBQWdCLEVBQUUsVUFBa0IsRUFBRSxJQUFZLEVBQUUsRUFBRTtnQkFDdEUsSUFBSSxNQUFNLEtBQUssSUFBSSxFQUFFO29CQUNuQiwyRUFBMkU7b0JBQzNFLE1BQU0sR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUEsZUFBUSxFQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztpQkFDcEU7Z0JBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLENBQUM7Z0JBQ3BDLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQ3BDLENBQUMsQ0FBQztZQUVGLElBQUEsa0JBQVcsRUFBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBRS9DLElBQUksTUFBTSxLQUFLLElBQUksRUFBRTtnQkFDbkIsSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQzthQUMzQjtTQUNGO0lBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge1J1bGUsIFNjaGVtYXRpY3NFeGNlcHRpb24sIFRyZWUsIFVwZGF0ZVJlY29yZGVyfSBmcm9tICdAYW5ndWxhci1kZXZraXQvc2NoZW1hdGljcyc7XG5pbXBvcnQge3JlbGF0aXZlfSBmcm9tICdwYXRoJztcblxuaW1wb3J0IHtnZXRQcm9qZWN0VHNDb25maWdQYXRoc30gZnJvbSAnLi4vLi4vdXRpbHMvcHJvamVjdF90c2NvbmZpZ19wYXRocyc7XG5pbXBvcnQge2Nhbk1pZ3JhdGVGaWxlLCBjcmVhdGVNaWdyYXRpb25Qcm9ncmFtfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L2NvbXBpbGVyX2hvc3QnO1xuXG5pbXBvcnQge21pZ3JhdGVGaWxlfSBmcm9tICcuL3V0aWwnO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbigpOiBSdWxlIHtcbiAgcmV0dXJuIGFzeW5jICh0cmVlOiBUcmVlKSA9PiB7XG4gICAgY29uc3Qge2J1aWxkUGF0aHMsIHRlc3RQYXRoc30gPSBhd2FpdCBnZXRQcm9qZWN0VHNDb25maWdQYXRocyh0cmVlKTtcbiAgICBjb25zdCBiYXNlUGF0aCA9IHByb2Nlc3MuY3dkKCk7XG4gICAgY29uc3QgYWxsUGF0aHMgPSBbLi4uYnVpbGRQYXRocywgLi4udGVzdFBhdGhzXTtcblxuICAgIGlmICghYWxsUGF0aHMubGVuZ3RoKSB7XG4gICAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihcbiAgICAgICAgICAnQ291bGQgbm90IGZpbmQgYW55IHRzY29uZmlnIGZpbGUuIENhbm5vdCBtaWdyYXRlIHRvIFR5cGVkIEZvcm1zLicpO1xuICAgIH1cblxuICAgIGZvciAoY29uc3QgdHNjb25maWdQYXRoIG9mIGFsbFBhdGhzKSB7XG4gICAgICBydW5UeXBlZEZvcm1zTWlncmF0aW9uKHRyZWUsIHRzY29uZmlnUGF0aCwgYmFzZVBhdGgpO1xuICAgIH1cbiAgfTtcbn1cblxuZnVuY3Rpb24gcnVuVHlwZWRGb3Jtc01pZ3JhdGlvbih0cmVlOiBUcmVlLCB0c2NvbmZpZ1BhdGg6IHN0cmluZywgYmFzZVBhdGg6IHN0cmluZykge1xuICBjb25zdCB7cHJvZ3JhbX0gPSBjcmVhdGVNaWdyYXRpb25Qcm9ncmFtKHRyZWUsIHRzY29uZmlnUGF0aCwgYmFzZVBhdGgpO1xuICBjb25zdCB0eXBlQ2hlY2tlciA9IHByb2dyYW0uZ2V0VHlwZUNoZWNrZXIoKTtcbiAgY29uc3Qgc291cmNlRmlsZXMgPVxuICAgICAgcHJvZ3JhbS5nZXRTb3VyY2VGaWxlcygpLmZpbHRlcihzb3VyY2VGaWxlID0+IGNhbk1pZ3JhdGVGaWxlKGJhc2VQYXRoLCBzb3VyY2VGaWxlLCBwcm9ncmFtKSk7XG5cbiAgZm9yIChjb25zdCBzb3VyY2VGaWxlIG9mIHNvdXJjZUZpbGVzKSB7XG4gICAgbGV0IHVwZGF0ZTogVXBkYXRlUmVjb3JkZXJ8bnVsbCA9IG51bGw7XG5cbiAgICBjb25zdCByZXdyaXRlciA9IChzdGFydFBvczogbnVtYmVyLCBvcmlnTGVuZ3RoOiBudW1iZXIsIHRleHQ6IHN0cmluZykgPT4ge1xuICAgICAgaWYgKHVwZGF0ZSA9PT0gbnVsbCkge1xuICAgICAgICAvLyBMYXppbHkgaW5pdGlhbGl6ZSB1cGRhdGUsIGJlY2F1c2UgbW9zdCBmaWxlcyB3aWxsIG5vdCByZXF1aXJlIG1pZ3JhdGlvbi5cbiAgICAgICAgdXBkYXRlID0gdHJlZS5iZWdpblVwZGF0ZShyZWxhdGl2ZShiYXNlUGF0aCwgc291cmNlRmlsZS5maWxlTmFtZSkpO1xuICAgICAgfVxuICAgICAgdXBkYXRlLnJlbW92ZShzdGFydFBvcywgb3JpZ0xlbmd0aCk7XG4gICAgICB1cGRhdGUuaW5zZXJ0TGVmdChzdGFydFBvcywgdGV4dCk7XG4gICAgfTtcblxuICAgIG1pZ3JhdGVGaWxlKHNvdXJjZUZpbGUsIHR5cGVDaGVja2VyLCByZXdyaXRlcik7XG5cbiAgICBpZiAodXBkYXRlICE9PSBudWxsKSB7XG4gICAgICB0cmVlLmNvbW1pdFVwZGF0ZSh1cGRhdGUpO1xuICAgIH1cbiAgfVxufVxuIl19
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
/// <amd-module name="@angular/core/schematics/migrations/typed-forms/util" />
|
|
9
|
-
import ts from 'typescript';
|
|
10
|
-
export declare const classes: Set<string>;
|
|
11
|
-
export declare const formControl = "FormControl";
|
|
12
|
-
export declare const untypedPrefix = "Untyped";
|
|
13
|
-
export declare const forms = "@angular/forms";
|
|
14
|
-
export interface MigratableNode {
|
|
15
|
-
node: ts.Node;
|
|
16
|
-
importName: string;
|
|
17
|
-
}
|
|
18
|
-
export declare type rewriteFn = (startPos: number, origLength: number, text: string) => void;
|
|
19
|
-
export declare function migrateFile(sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker, rewrite: rewriteFn): void;
|
|
@@ -1,134 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
-
};
|
|
11
|
-
(function (factory) {
|
|
12
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
13
|
-
var v = factory(require, exports);
|
|
14
|
-
if (v !== undefined) module.exports = v;
|
|
15
|
-
}
|
|
16
|
-
else if (typeof define === "function" && define.amd) {
|
|
17
|
-
define("@angular/core/schematics/migrations/typed-forms/util", ["require", "exports", "typescript", "@angular/core/schematics/utils/typescript/imports"], factory);
|
|
18
|
-
}
|
|
19
|
-
})(function (require, exports) {
|
|
20
|
-
"use strict";
|
|
21
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.migrateFile = exports.forms = exports.untypedPrefix = exports.formControl = exports.classes = void 0;
|
|
23
|
-
const typescript_1 = __importDefault(require("typescript"));
|
|
24
|
-
const imports_1 = require("@angular/core/schematics/utils/typescript/imports");
|
|
25
|
-
exports.classes = new Set(['FormArray', 'FormBuilder', 'FormControl', 'FormGroup']);
|
|
26
|
-
exports.formControl = 'FormControl';
|
|
27
|
-
exports.untypedPrefix = 'Untyped';
|
|
28
|
-
exports.forms = '@angular/forms';
|
|
29
|
-
function migrateFile(sourceFile, typeChecker, rewrite) {
|
|
30
|
-
const imports = getImports(sourceFile);
|
|
31
|
-
// If no relevant classes are imported, we can exit early.
|
|
32
|
-
if (imports.length === 0)
|
|
33
|
-
return;
|
|
34
|
-
// For each control class, migrate all of its uses.
|
|
35
|
-
for (let i = imports.length; i >= 0; i--) {
|
|
36
|
-
const imp = imports[i];
|
|
37
|
-
const usages = getUsages(sourceFile, typeChecker, imp);
|
|
38
|
-
if (usages.length === 0) {
|
|
39
|
-
// Since there are no usages of this class we need to migrate it, we should completely
|
|
40
|
-
// skip it for the subsequent migration steps.
|
|
41
|
-
imports.splice(i, 1);
|
|
42
|
-
}
|
|
43
|
-
for (const usage of usages) {
|
|
44
|
-
const newName = getUntypedVersionOfImportOrName(usage.importName);
|
|
45
|
-
if (newName === null) {
|
|
46
|
-
// This should never happen.
|
|
47
|
-
console.error(`Typed forms migration error: unknown replacement for usage ${usage.node.getText()}`);
|
|
48
|
-
continue;
|
|
49
|
-
}
|
|
50
|
-
rewrite(usage.node.getStart(), usage.node.getWidth(), newName);
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
// For each imported control class, migrate to the corresponding uptyped import.
|
|
54
|
-
for (const imp of imports) {
|
|
55
|
-
const untypedClass = getUntypedVersionOfImportOrName(imp.getText());
|
|
56
|
-
if (untypedClass === null) {
|
|
57
|
-
// This should never happen.
|
|
58
|
-
console.error(`Typed forms migration error: unknown untyped version of import ${imp.getText()}`);
|
|
59
|
-
continue;
|
|
60
|
-
}
|
|
61
|
-
if ((0, imports_1.getImportSpecifier)(sourceFile, exports.forms, untypedClass)) {
|
|
62
|
-
// In order to make the migration idempotent, we must check whether the untyped version of the
|
|
63
|
-
// class is already present. If present, immediately continue.
|
|
64
|
-
continue;
|
|
65
|
-
}
|
|
66
|
-
rewrite(imp.getStart(), imp.getWidth(), untypedClass);
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
exports.migrateFile = migrateFile;
|
|
70
|
-
function getImports(sourceFile) {
|
|
71
|
-
let imports = [];
|
|
72
|
-
for (const cc of exports.classes) {
|
|
73
|
-
const specifier = (0, imports_1.getImportSpecifier)(sourceFile, exports.forms, cc);
|
|
74
|
-
if (!specifier)
|
|
75
|
-
continue;
|
|
76
|
-
imports.push(specifier);
|
|
77
|
-
}
|
|
78
|
-
return imports;
|
|
79
|
-
}
|
|
80
|
-
function getUntypedVersionOfImportOrName(name) {
|
|
81
|
-
for (const cc of exports.classes) {
|
|
82
|
-
if (name.includes(cc)) {
|
|
83
|
-
return `${exports.untypedPrefix}${cc}`;
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
return null;
|
|
87
|
-
}
|
|
88
|
-
function getUsages(sourceFile, typeChecker, importSpecifier) {
|
|
89
|
-
const usages = [];
|
|
90
|
-
const visitNode = (node) => {
|
|
91
|
-
if (typescript_1.default.isImportSpecifier(node)) {
|
|
92
|
-
// Skip this node and all of its children; imports are a special case.
|
|
93
|
-
return;
|
|
94
|
-
}
|
|
95
|
-
if (typescript_1.default.isIdentifier(node) && isUsageOfFormsImport(typeChecker, node, importSpecifier)) {
|
|
96
|
-
usages.push({ node, importName: importSpecifier.getText() });
|
|
97
|
-
}
|
|
98
|
-
typescript_1.default.forEachChild(node, visitNode);
|
|
99
|
-
};
|
|
100
|
-
typescript_1.default.forEachChild(sourceFile, visitNode);
|
|
101
|
-
return usages;
|
|
102
|
-
}
|
|
103
|
-
function isUsageOfFormsImport(typeChecker, node, importSpecifier) {
|
|
104
|
-
var _a, _b;
|
|
105
|
-
const symbol = typeChecker.getSymbolAtLocation(node);
|
|
106
|
-
// We check symbol.declarations because we actually care about the name at the declaration site,
|
|
107
|
-
// not the usage site. These could be different in the case of overridden constructors.
|
|
108
|
-
if (!symbol || symbol.declarations === undefined || !symbol.declarations.length)
|
|
109
|
-
return false;
|
|
110
|
-
const decl = symbol.declarations[0];
|
|
111
|
-
if (!typescript_1.default.isImportSpecifier(decl))
|
|
112
|
-
return false;
|
|
113
|
-
// As per `typescript/imports.ts`, we must walk up the tree to find the enclosing import
|
|
114
|
-
// declaration. For reasons specific to the TS AST, this is always 3 levels up from an import
|
|
115
|
-
// specifier node.
|
|
116
|
-
const importDecl = decl.parent.parent.parent;
|
|
117
|
-
if (!typescript_1.default.isStringLiteral(importDecl.moduleSpecifier))
|
|
118
|
-
return false;
|
|
119
|
-
const importName = (_b = (_a = typeChecker.getTypeAtLocation(importSpecifier)) === null || _a === void 0 ? void 0 : _a.getSymbol()) === null || _b === void 0 ? void 0 : _b.getName();
|
|
120
|
-
if (!importName)
|
|
121
|
-
return false;
|
|
122
|
-
// Handles aliased imports: e.g. "import {Component as myComp} from ...";
|
|
123
|
-
const declName = decl.propertyName ? decl.propertyName.text : decl.name.text;
|
|
124
|
-
if (importName === declName)
|
|
125
|
-
return true;
|
|
126
|
-
// In the case of FormControl's overridden exported constructor, the value name and declaration
|
|
127
|
-
// name are not exactly the same. For our purposes, it's enough to check whether the latter is a
|
|
128
|
-
// substring of the former.
|
|
129
|
-
if (declName === exports.formControl && importName.includes(declName))
|
|
130
|
-
return true;
|
|
131
|
-
return false;
|
|
132
|
-
}
|
|
133
|
-
});
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/typed-forms/util.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport ts from 'typescript';\n\nimport {getImportSpecifier} from '../../utils/typescript/imports';\n\nexport const classes = new Set(['FormArray', 'FormBuilder', 'FormControl', 'FormGroup']);\nexport const formControl = 'FormControl';\nexport const untypedPrefix = 'Untyped';\nexport const forms = '@angular/forms';\n\nexport interface MigratableNode {\n  node: ts.Node;\n  importName: string;\n}\n\nexport type rewriteFn = (startPos: number, origLength: number, text: string) => void;\n\nexport function migrateFile(\n    sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker, rewrite: rewriteFn) {\n  const imports = getImports(sourceFile);\n\n  // If no relevant classes are imported, we can exit early.\n  if (imports.length === 0) return;\n\n  // For each control class, migrate all of its uses.\n  for (let i = imports.length; i >= 0; i--) {\n    const imp = imports[i];\n    const usages = getUsages(sourceFile, typeChecker, imp);\n    if (usages.length === 0) {\n      // Since there are no usages of this class we need to migrate it, we should completely\n      // skip it for the subsequent migration steps.\n      imports.splice(i, 1);\n    }\n    for (const usage of usages) {\n      const newName = getUntypedVersionOfImportOrName(usage.importName);\n      if (newName === null) {\n        // This should never happen.\n        console.error(\n            `Typed forms migration error: unknown replacement for usage ${usage.node.getText()}`);\n        continue;\n      }\n      rewrite(usage.node.getStart(), usage.node.getWidth(), newName);\n    }\n  }\n\n  // For each imported control class, migrate to the corresponding uptyped import.\n  for (const imp of imports) {\n    const untypedClass = getUntypedVersionOfImportOrName(imp.getText());\n    if (untypedClass === null) {\n      // This should never happen.\n      console.error(\n          `Typed forms migration error: unknown untyped version of import ${imp.getText()}`);\n      continue;\n    }\n    if (getImportSpecifier(sourceFile, forms, untypedClass)) {\n      // In order to make the migration idempotent, we must check whether the untyped version of the\n      // class is already present. If present, immediately continue.\n      continue;\n    }\n    rewrite(imp.getStart(), imp.getWidth(), untypedClass);\n  }\n}\n\nfunction getImports(sourceFile: ts.SourceFile): ts.ImportSpecifier[] {\n  let imports: ts.ImportSpecifier[] = [];\n  for (const cc of classes) {\n    const specifier = getImportSpecifier(sourceFile, forms, cc);\n    if (!specifier) continue;\n    imports.push(specifier);\n  }\n  return imports;\n}\n\nfunction getUntypedVersionOfImportOrName(name: string): string|null {\n  for (const cc of classes) {\n    if (name.includes(cc)) {\n      return `${untypedPrefix}${cc}`;\n    }\n  }\n  return null;\n}\n\nfunction getUsages(\n    sourceFile: ts.SourceFile, typeChecker: ts.TypeChecker,\n    importSpecifier: ts.ImportSpecifier): MigratableNode[] {\n  const usages: MigratableNode[] = [];\n  const visitNode = (node: ts.Node) => {\n    if (ts.isImportSpecifier(node)) {\n      // Skip this node and all of its children; imports are a special case.\n      return;\n    }\n    if (ts.isIdentifier(node) && isUsageOfFormsImport(typeChecker, node, importSpecifier)) {\n      usages.push({node, importName: importSpecifier.getText()});\n    }\n    ts.forEachChild(node, visitNode);\n  };\n  ts.forEachChild(sourceFile, visitNode);\n  return usages;\n}\n\nfunction isUsageOfFormsImport(\n    typeChecker: ts.TypeChecker, node: ts.Identifier,\n    importSpecifier: ts.ImportSpecifier): boolean {\n  const symbol = typeChecker.getSymbolAtLocation(node);\n\n  // We check symbol.declarations because we actually care about the name at the declaration site,\n  // not the usage site. These could be different in the case of overridden constructors.\n  if (!symbol || symbol.declarations === undefined || !symbol.declarations.length) return false;\n\n  const decl = symbol.declarations[0];\n  if (!ts.isImportSpecifier(decl)) return false;\n\n  // As per `typescript/imports.ts`, we must walk up the tree to find the enclosing import\n  // declaration. For reasons specific to the TS AST, this is always 3 levels up from an import\n  // specifier node.\n  const importDecl = decl.parent.parent.parent;\n  if (!ts.isStringLiteral(importDecl.moduleSpecifier)) return false;\n\n  const importName = typeChecker.getTypeAtLocation(importSpecifier)?.getSymbol()?.getName();\n  if (!importName) return false;\n\n  // Handles aliased imports: e.g. \"import {Component as myComp} from ...\";\n  const declName = decl.propertyName ? decl.propertyName.text : decl.name.text;\n\n  if (importName === declName) return true;\n\n  // In the case of FormControl's overridden exported constructor, the value name and declaration\n  // name are not exactly the same. For our purposes, it's enough to check whether the latter is a\n  // substring of the former.\n  if (declName === formControl && importName.includes(declName)) return true;\n\n  return false;\n}\n"]}
|