@angular/core 14.0.0-next.7 → 14.0.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/core",
-  "version": "14.0.0-next.7",
+  "version": "14.0.0-rc.0",
   "description": "Angular - the core framework",
   "author": "angular",
   "license": "MIT",
@@ -15,7 +15,7 @@
       "default": "./package.json"
     },
     ".": {
-      "types": "./core.d.ts",
+      "types": "./index.d.ts",
       "esm2020": "./esm2020/core.mjs",
       "es2020": "./fesm2020/core.mjs",
       "es2015": "./fesm2015/core.mjs",
@@ -23,7 +23,7 @@
       "default": "./fesm2020/core.mjs"
     },
     "./testing": {
-      "types": "./testing/testing.d.ts",
+      "types": "./testing/index.d.ts",
       "esm2020": "./esm2020/testing/testing.mjs",
       "es2020": "./fesm2020/testing.mjs",
       "es2015": "./fesm2015/testing.mjs",
@@ -68,7 +68,7 @@
   "fesm2020": "./fesm2020/core.mjs",
   "fesm2015": "./fesm2015/core.mjs",
   "esm2020": "./esm2020/core.mjs",
-  "typings": "./core.d.ts",
+  "typings": "./index.d.ts",
   "module": "./fesm2015/core.mjs",
   "es2020": "./fesm2020/core.mjs",
   "type": "module"

package/schematics/migrations/path-match-type/index.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+/// <amd-module name="@angular/core/schematics/migrations/path-match-type" />
+import { Rule } from '@angular-devkit/schematics';
+/** Migration that adds explicit type to `Route`/`Routes` which use `patchMatch` */
+export default function (): Rule;

package/schematics/migrations/path-match-type/index.js

@@ -0,0 +1,95 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        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);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const schematics_1 = require("@angular-devkit/schematics");
+    const path_1 = require("path");
+    const typescript_1 = __importDefault(require("typescript"));
+    const project_tsconfig_paths_1 = require("@angular/core/schematics/utils/project_tsconfig_paths");
+    const compiler_host_1 = require("@angular/core/schematics/utils/typescript/compiler_host");
+    const transform_1 = require("@angular/core/schematics/migrations/path-match-type/transform");
+    /** Migration that adds explicit type to `Route`/`Routes` which use `patchMatch` */
+    function default_1() {
+        return (tree) => __awaiter(this, void 0, void 0, function* () {
+            const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
+            const basePath = process.cwd();
+            const allPaths = [...buildPaths, ...testPaths];
+            if (!allPaths.length) {
+                throw new schematics_1.SchematicsException('Could not find any tsconfig file. Cannot perform pathMatch migration.');
+            }
+            for (const tsconfigPath of allPaths) {
+                runMigration(tree, tsconfigPath, basePath);
+            }
+        });
+    }
+    exports.default = default_1;
+    function runMigration(tree, tsconfigPath, basePath) {
+        const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
+        const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
+        const updateRecorders = new Map();
+        const transform = new transform_1.PathMatchTypeTransform(getUpdateRecorder);
+        // Migrate all source files in the project.
+        transform.migrate(sourceFiles);
+        // Record the changes collected in the import manager.
+        transform.recordChanges();
+        // Walk through each update recorder and commit the update. We need to commit the
+        // updates in batches per source file as there can be only one recorder per source
+        // file in order to avoid shifted character offsets.
+        updateRecorders.forEach(recorder => recorder.commitUpdate());
+        /** Gets the update recorder for the specified source file. */
+        function getUpdateRecorder(sourceFile) {
+            if (updateRecorders.has(sourceFile)) {
+                return updateRecorders.get(sourceFile);
+            }
+            const printer = typescript_1.default.createPrinter();
+            const treeRecorder = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
+            const recorder = {
+                updateNode(oldExpr, newExpr) {
+                    treeRecorder.insertRight(oldExpr.name.getEnd(), ': ' + printer.printNode(typescript_1.default.EmitHint.Unspecified, newExpr.type, sourceFile));
+                },
+                addNewImport(start, importText) {
+                    // New imports should be inserted at the left while decorators should be inserted
+                    // at the right in order to ensure that imports are inserted before the decorator
+                    // if the start position of import and decorator is the source file start.
+                    treeRecorder.insertLeft(start, importText);
+                },
+                updateExistingImport(namedBindings, newNamedBindings) {
+                    treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());
+                    treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);
+                },
+                commitUpdate() {
+                    tree.commitUpdate(treeRecorder);
+                }
+            };
+            updateRecorders.set(sourceFile, recorder);
+            return recorder;
+        }
+    }
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9wYXRoLW1hdGNoLXR5cGUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7SUFFSCwyREFBMkU7SUFDM0UsK0JBQThCO0lBQzlCLDREQUE0QjtJQUU1QixrR0FBMkU7SUFDM0UsMkZBQTRGO0lBRTVGLDZGQUFtRDtJQUluRCxtRkFBbUY7SUFDbkY7UUFDRSxPQUFPLENBQU8sSUFBVSxFQUFFLEVBQUU7WUFDMUIsTUFBTSxFQUFDLFVBQVUsRUFBRSxTQUFTLEVBQUMsR0FBRyxNQUFNLElBQUEsZ0RBQXVCLEVBQUMsSUFBSSxDQUFDLENBQUM7WUFDcEUsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQy9CLE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBRyxVQUFVLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztZQUUvQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRTtnQkFDcEIsTUFBTSxJQUFJLGdDQUFtQixDQUN6Qix1RUFBdUUsQ0FBQyxDQUFDO2FBQzlFO1lBRUQsS0FBSyxNQUFNLFlBQVksSUFBSSxRQUFRLEVBQUU7Z0JBQ25DLFlBQVksQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsQ0FBQyxDQUFDO2FBQzVDO1FBQ0gsQ0FBQyxDQUFBLENBQUM7SUFDSixDQUFDO0lBZkQsNEJBZUM7SUFFRCxTQUFTLFlBQVksQ0FBQyxJQUFVLEVBQUUsWUFBb0IsRUFBRSxRQUFnQjtRQUN0RSxNQUFNLEVBQUMsT0FBTyxFQUFDLEdBQUcsSUFBQSxzQ0FBc0IsRUFBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ3ZFLE1BQU0sV0FBVyxHQUNiLE9BQU8sQ0FBQyxjQUFjLEVBQUUsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxJQUFBLDhCQUFjLEVBQUMsUUFBUSxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBQ2pHLE1BQU0sZUFBZSxHQUFHLElBQUksR0FBRyxFQUFpQyxDQUFDO1FBQ2pFLE1BQU0sU0FBUyxHQUFHLElBQUksa0NBQXNCLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUVoRSwyQ0FBMkM7UUFDM0MsU0FBUyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUMvQixzREFBc0Q7UUFDdEQsU0FBUyxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBRTFCLGlGQUFpRjtRQUNqRixrRkFBa0Y7UUFDbEYsb0RBQW9EO1FBQ3BELGVBQWUsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQztRQUU3RCw4REFBOEQ7UUFDOUQsU0FBUyxpQkFBaUIsQ0FBQyxVQUF5QjtZQUNsRCxJQUFJLGVBQWUsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUU7Z0JBQ25DLE9BQU8sZUFBZSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUUsQ0FBQzthQUN6QztZQUNELE1BQU0sT0FBTyxHQUFHLG9CQUFFLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDbkMsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFBLGVBQVEsRUFBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDL0UsTUFBTSxRQUFRLEdBQW1CO2dCQUMvQixVQUFVLENBQUMsT0FBK0IsRUFBRSxPQUErQjtvQkFDekUsWUFBWSxDQUFDLFdBQVcsQ0FDcEIsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsRUFDckIsSUFBSSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsb0JBQUUsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLE9BQU8sQ0FBQyxJQUFLLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztnQkFDcEYsQ0FBQztnQkFDRCxZQUFZLENBQUMsS0FBYSxFQUFFLFVBQWtCO29CQUM1QyxpRkFBaUY7b0JBQ2pGLGlGQUFpRjtvQkFDakYsMEVBQTBFO29CQUMxRSxZQUFZLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQztnQkFDN0MsQ0FBQztnQkFDRCxvQkFBb0IsQ0FBQyxhQUE4QixFQUFFLGdCQUF3QjtvQkFDM0UsWUFBWSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7b0JBQ3hFLFlBQVksQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDLFFBQVEsRUFBRSxFQUFFLGdCQUFnQixDQUFDLENBQUM7Z0JBQ3ZFLENBQUM7Z0JBQ0QsWUFBWTtvQkFDVixJQUFJLENBQUMsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDO2dCQUNsQyxDQUFDO2FBQ0YsQ0FBQztZQUNGLGVBQWUsQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBQzFDLE9BQU8sUUFBUSxDQUFDO1FBQ2xCLENBQUM7SUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7UnVsZSwgU2NoZW1hdGljc0V4Y2VwdGlvbiwgVHJlZX0gZnJvbSAnQGFuZ3VsYXItZGV2a2l0L3NjaGVtYXRpY3MnO1xuaW1wb3J0IHtyZWxhdGl2ZX0gZnJvbSAncGF0aCc7XG5pbXBvcnQgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB7Z2V0UHJvamVjdFRzQ29uZmlnUGF0aHN9IGZyb20gJy4uLy4uL3V0aWxzL3Byb2plY3RfdHNjb25maWdfcGF0aHMnO1xuaW1wb3J0IHtjYW5NaWdyYXRlRmlsZSwgY3JlYXRlTWlncmF0aW9uUHJvZ3JhbX0gZnJvbSAnLi4vLi4vdXRpbHMvdHlwZXNjcmlwdC9jb21waWxlcl9ob3N0JztcblxuaW1wb3J0IHtQYXRoTWF0Y2hUeXBlVHJhbnNmb3JtfSBmcm9tICcuL3RyYW5zZm9ybSc7XG5pbXBvcnQge1VwZGF0ZVJlY29yZGVyfSBmcm9tICcuL3VwZGF0ZV9yZWNvcmRlcic7XG5cblxuLyoqIE1pZ3JhdGlvbiB0aGF0IGFkZHMgZXhwbGljaXQgdHlwZSB0byBgUm91dGVgL2BSb3V0ZXNgIHdoaWNoIHVzZSBgcGF0Y2hNYXRjaGAgKi9cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKCk6IFJ1bGUge1xuICByZXR1cm4gYXN5bmMgKHRyZWU6IFRyZWUpID0+IHtcbiAgICBjb25zdCB7YnVpbGRQYXRocywgdGVzdFBhdGhzfSA9IGF3YWl0IGdldFByb2plY3RUc0NvbmZpZ1BhdGhzKHRyZWUpO1xuICAgIGNvbnN0IGJhc2VQYXRoID0gcHJvY2Vzcy5jd2QoKTtcbiAgICBjb25zdCBhbGxQYXRocyA9IFsuLi5idWlsZFBhdGhzLCAuLi50ZXN0UGF0aHNdO1xuXG4gICAgaWYgKCFhbGxQYXRocy5sZW5ndGgpIHtcbiAgICAgIHRocm93IG5ldyBTY2hlbWF0aWNzRXhjZXB0aW9uKFxuICAgICAgICAgICdDb3VsZCBub3QgZmluZCBhbnkgdHNjb25maWcgZmlsZS4gQ2Fubm90IHBlcmZvcm0gcGF0aE1hdGNoIG1pZ3JhdGlvbi4nKTtcbiAgICB9XG5cbiAgICBmb3IgKGNvbnN0IHRzY29uZmlnUGF0aCBvZiBhbGxQYXRocykge1xuICAgICAgcnVuTWlncmF0aW9uKHRyZWUsIHRzY29uZmlnUGF0aCwgYmFzZVBhdGgpO1xuICAgIH1cbiAgfTtcbn1cblxuZnVuY3Rpb24gcnVuTWlncmF0aW9uKHRyZWU6IFRyZWUsIHRzY29uZmlnUGF0aDogc3RyaW5nLCBiYXNlUGF0aDogc3RyaW5nKTogdm9pZCB7XG4gIGNvbnN0IHtwcm9ncmFtfSA9IGNyZWF0ZU1pZ3JhdGlvblByb2dyYW0odHJlZSwgdHNjb25maWdQYXRoLCBiYXNlUGF0aCk7XG4gIGNvbnN0IHNvdXJjZUZpbGVzID1cbiAgICAgIHByb2dyYW0uZ2V0U291cmNlRmlsZXMoKS5maWx0ZXIoc291cmNlRmlsZSA9PiBjYW5NaWdyYXRlRmlsZShiYXNlUGF0aCwgc291cmNlRmlsZSwgcHJvZ3JhbSkpO1xuICBjb25zdCB1cGRhdGVSZWNvcmRlcnMgPSBuZXcgTWFwPHRzLlNvdXJjZUZpbGUsIFVwZGF0ZVJlY29yZGVyPigpO1xuICBjb25zdCB0cmFuc2Zvcm0gPSBuZXcgUGF0aE1hdGNoVHlwZVRyYW5zZm9ybShnZXRVcGRhdGVSZWNvcmRlcik7XG5cbiAgLy8gTWlncmF0ZSBhbGwgc291cmNlIGZpbGVzIGluIHRoZSBwcm9qZWN0LlxuICB0cmFuc2Zvcm0ubWlncmF0ZShzb3VyY2VGaWxlcyk7XG4gIC8vIFJlY29yZCB0aGUgY2hhbmdlcyBjb2xsZWN0ZWQgaW4gdGhlIGltcG9ydCBtYW5hZ2VyLlxuICB0cmFuc2Zvcm0ucmVjb3JkQ2hhbmdlcygpO1xuXG4gIC8vIFdhbGsgdGhyb3VnaCBlYWNoIHVwZGF0ZSByZWNvcmRlciBhbmQgY29tbWl0IHRoZSB1cGRhdGUuIFdlIG5lZWQgdG8gY29tbWl0IHRoZVxuICAvLyB1cGRhdGVzIGluIGJhdGNoZXMgcGVyIHNvdXJjZSBmaWxlIGFzIHRoZXJlIGNhbiBiZSBvbmx5IG9uZSByZWNvcmRlciBwZXIgc291cmNlXG4gIC8vIGZpbGUgaW4gb3JkZXIgdG8gYXZvaWQgc2hpZnRlZCBjaGFyYWN0ZXIgb2Zmc2V0cy5cbiAgdXBkYXRlUmVjb3JkZXJzLmZvckVhY2gocmVjb3JkZXIgPT4gcmVjb3JkZXIuY29tbWl0VXBkYXRlKCkpO1xuXG4gIC8qKiBHZXRzIHRoZSB1cGRhdGUgcmVjb3JkZXIgZm9yIHRoZSBzcGVjaWZpZWQgc291cmNlIGZpbGUuICovXG4gIGZ1bmN0aW9uIGdldFVwZGF0ZVJlY29yZGVyKHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUpOiBVcGRhdGVSZWNvcmRlciB7XG4gICAgaWYgKHVwZGF0ZVJlY29yZGVycy5oYXMoc291cmNlRmlsZSkpIHtcbiAgICAgIHJldHVybiB1cGRhdGVSZWNvcmRlcnMuZ2V0KHNvdXJjZUZpbGUpITtcbiAgICB9XG4gICAgY29uc3QgcHJpbnRlciA9IHRzLmNyZWF0ZVByaW50ZXIoKTtcbiAgICBjb25zdCB0cmVlUmVjb3JkZXIgPSB0cmVlLmJlZ2luVXBkYXRlKHJlbGF0aXZlKGJhc2VQYXRoLCBzb3VyY2VGaWxlLmZpbGVOYW1lKSk7XG4gICAgY29uc3QgcmVjb3JkZXI6IFVwZGF0ZVJlY29yZGVyID0ge1xuICAgICAgdXBkYXRlTm9kZShvbGRFeHByOiB0cy5WYXJpYWJsZURlY2xhcmF0aW9uLCBuZXdFeHByOiB0cy5WYXJpYWJsZURlY2xhcmF0aW9uKSB7XG4gICAgICAgIHRyZWVSZWNvcmRlci5pbnNlcnRSaWdodChcbiAgICAgICAgICAgIG9sZEV4cHIubmFtZS5nZXRFbmQoKSxcbiAgICAgICAgICAgICc6ICcgKyBwcmludGVyLnByaW50Tm9kZSh0cy5FbWl0SGludC5VbnNwZWNpZmllZCwgbmV3RXhwci50eXBlISwgc291cmNlRmlsZSkpO1xuICAgICAgfSxcbiAgICAgIGFkZE5ld0ltcG9ydChzdGFydDogbnVtYmVyLCBpbXBvcnRUZXh0OiBzdHJpbmcpIHtcbiAgICAgICAgLy8gTmV3IGltcG9ydHMgc2hvdWxkIGJlIGluc2VydGVkIGF0IHRoZSBsZWZ0IHdoaWxlIGRlY29yYXRvcnMgc2hvdWxkIGJlIGluc2VydGVkXG4gICAgICAgIC8vIGF0IHRoZSByaWdodCBpbiBvcmRlciB0byBlbnN1cmUgdGhhdCBpbXBvcnRzIGFyZSBpbnNlcnRlZCBiZWZvcmUgdGhlIGRlY29yYXRvclxuICAgICAgICAvLyBpZiB0aGUgc3RhcnQgcG9zaXRpb24gb2YgaW1wb3J0IGFuZCBkZWNvcmF0b3IgaXMgdGhlIHNvdXJjZSBmaWxlIHN0YXJ0LlxuICAgICAgICB0cmVlUmVjb3JkZXIuaW5zZXJ0TGVmdChzdGFydCwgaW1wb3J0VGV4dCk7XG4gICAgICB9LFxuICAgICAgdXBkYXRlRXhpc3RpbmdJbXBvcnQobmFtZWRCaW5kaW5nczogdHMuTmFtZWRJbXBvcnRzLCBuZXdOYW1lZEJpbmRpbmdzOiBzdHJpbmcpIHtcbiAgICAgICAgdHJlZVJlY29yZGVyLnJlbW92ZShuYW1lZEJpbmRpbmdzLmdldFN0YXJ0KCksIG5hbWVkQmluZGluZ3MuZ2V0V2lkdGgoKSk7XG4gICAgICAgIHRyZWVSZWNvcmRlci5pbnNlcnRSaWdodChuYW1lZEJpbmRpbmdzLmdldFN0YXJ0KCksIG5ld05hbWVkQmluZGluZ3MpO1xuICAgICAgfSxcbiAgICAgIGNvbW1pdFVwZGF0ZSgpIHtcbiAgICAgICAgdHJlZS5jb21taXRVcGRhdGUodHJlZVJlY29yZGVyKTtcbiAgICAgIH1cbiAgICB9O1xuICAgIHVwZGF0ZVJlY29yZGVycy5zZXQoc291cmNlRmlsZSwgcmVjb3JkZXIpO1xuICAgIHJldHVybiByZWNvcmRlcjtcbiAgfVxufVxuIl19

package/schematics/migrations/path-match-type/transform.d.ts

@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+/// <amd-module name="@angular/core/schematics/migrations/path-match-type/transform" />
+import ts from 'typescript';
+import { UpdateRecorder } from './update_recorder';
+export declare class PathMatchTypeTransform {
+    private getUpdateRecorder;
+    private printer;
+    private importManager;
+    constructor(getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder);
+    migrate(sourceFiles: ts.SourceFile[]): void;
+    /** Records all changes that were made in the import manager. */
+    recordChanges(): void;
+}

package/schematics/migrations/path-match-type/transform.js

@@ -0,0 +1,48 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        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);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.PathMatchTypeTransform = void 0;
+    const typescript_1 = __importDefault(require("typescript"));
+    const import_manager_1 = require("@angular/core/schematics/utils/import_manager");
+    const util_1 = require("@angular/core/schematics/migrations/path-match-type/util");
+    class PathMatchTypeTransform {
+        constructor(getUpdateRecorder) {
+            this.getUpdateRecorder = getUpdateRecorder;
+            this.printer = typescript_1.default.createPrinter();
+            this.importManager = new import_manager_1.ImportManager(this.getUpdateRecorder, this.printer);
+        }
+        migrate(sourceFiles) {
+            for (const sourceFile of sourceFiles) {
+                const toMigrate = (0, util_1.findExpressionsToMigrate)(sourceFile, this.importManager);
+                const recorder = this.getUpdateRecorder(sourceFile);
+                for (const [oldNode, newNode] of toMigrate) {
+                    recorder.updateNode(oldNode, newNode, sourceFile);
+                }
+            }
+        }
+        /** Records all changes that were made in the import manager. */
+        recordChanges() {
+            this.importManager.recordChanges();
+        }
+    }
+    exports.PathMatchTypeTransform = PathMatchTypeTransform;
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNmb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zY2hlbWF0aWNzL21pZ3JhdGlvbnMvcGF0aC1tYXRjaC10eXBlL3RyYW5zZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7Ozs7SUFFSCw0REFBNEI7SUFFNUIsa0ZBQXlEO0lBR3pELG1GQUFnRDtJQUdoRCxNQUFhLHNCQUFzQjtRQUlqQyxZQUFvQixpQkFBd0Q7WUFBeEQsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUF1QztZQUhwRSxZQUFPLEdBQUcsb0JBQUUsQ0FBQyxhQUFhLEVBQUUsQ0FBQztZQUM3QixrQkFBYSxHQUFHLElBQUksOEJBQWEsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRUQsQ0FBQztRQUVoRixPQUFPLENBQUMsV0FBNEI7WUFDbEMsS0FBSyxNQUFNLFVBQVUsSUFBSSxXQUFXLEVBQUU7Z0JBQ3BDLE1BQU0sU0FBUyxHQUFHLElBQUEsK0JBQXdCLEVBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztnQkFDM0UsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFVBQVUsQ0FBQyxDQUFDO2dCQUNwRCxLQUFLLE1BQU0sQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLElBQUksU0FBUyxFQUFFO29CQUMxQyxRQUFRLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7aUJBQ25EO2FBQ0Y7UUFDSCxDQUFDO1FBQ0QsZ0VBQWdFO1FBQ2hFLGFBQWE7WUFDWCxJQUFJLENBQUMsYUFBYSxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBQ3JDLENBQUM7S0FDRjtJQW5CRCx3REFtQkMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuXG5pbXBvcnQge0ltcG9ydE1hbmFnZXJ9IGZyb20gJy4uLy4uL3V0aWxzL2ltcG9ydF9tYW5hZ2VyJztcblxuaW1wb3J0IHtVcGRhdGVSZWNvcmRlcn0gZnJvbSAnLi91cGRhdGVfcmVjb3JkZXInO1xuaW1wb3J0IHtmaW5kRXhwcmVzc2lvbnNUb01pZ3JhdGV9IGZyb20gJy4vdXRpbCc7XG5cblxuZXhwb3J0IGNsYXNzIFBhdGhNYXRjaFR5cGVUcmFuc2Zvcm0ge1xuICBwcml2YXRlIHByaW50ZXIgPSB0cy5jcmVhdGVQcmludGVyKCk7XG4gIHByaXZhdGUgaW1wb3J0TWFuYWdlciA9IG5ldyBJbXBvcnRNYW5hZ2VyKHRoaXMuZ2V0VXBkYXRlUmVjb3JkZXIsIHRoaXMucHJpbnRlcik7XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSBnZXRVcGRhdGVSZWNvcmRlcjogKHNmOiB0cy5Tb3VyY2VGaWxlKSA9PiBVcGRhdGVSZWNvcmRlcikge31cblxuICBtaWdyYXRlKHNvdXJjZUZpbGVzOiB0cy5Tb3VyY2VGaWxlW10pOiB2b2lkIHtcbiAgICBmb3IgKGNvbnN0IHNvdXJjZUZpbGUgb2Ygc291cmNlRmlsZXMpIHtcbiAgICAgIGNvbnN0IHRvTWlncmF0ZSA9IGZpbmRFeHByZXNzaW9uc1RvTWlncmF0ZShzb3VyY2VGaWxlLCB0aGlzLmltcG9ydE1hbmFnZXIpO1xuICAgICAgY29uc3QgcmVjb3JkZXIgPSB0aGlzLmdldFVwZGF0ZVJlY29yZGVyKHNvdXJjZUZpbGUpO1xuICAgICAgZm9yIChjb25zdCBbb2xkTm9kZSwgbmV3Tm9kZV0gb2YgdG9NaWdyYXRlKSB7XG4gICAgICAgIHJlY29yZGVyLnVwZGF0ZU5vZGUob2xkTm9kZSwgbmV3Tm9kZSwgc291cmNlRmlsZSk7XG4gICAgICB9XG4gICAgfVxuICB9XG4gIC8qKiBSZWNvcmRzIGFsbCBjaGFuZ2VzIHRoYXQgd2VyZSBtYWRlIGluIHRoZSBpbXBvcnQgbWFuYWdlci4gKi9cbiAgcmVjb3JkQ2hhbmdlcygpIHtcbiAgICB0aGlzLmltcG9ydE1hbmFnZXIucmVjb3JkQ2hhbmdlcygpO1xuICB9XG59XG4iXX0=

package/schematics/migrations/path-match-type/update_recorder.d.ts

@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+/// <amd-module name="@angular/core/schematics/migrations/path-match-type/update_recorder" />
+import ts from 'typescript';
+import { ImportManagerUpdateRecorder } from '../../utils/import_manager';
+/**
+ * Update recorder interface that is used to transform source files
+ * in a non-colliding way.
+ */
+export interface UpdateRecorder extends ImportManagerUpdateRecorder {
+    updateNode(oldNode: ts.VariableDeclaration, newNode: ts.VariableDeclaration, sourceFile: ts.SourceFile): void;
+    commitUpdate(): void;
+}

package/schematics/migrations/path-match-type/update_recorder.js

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define("@angular/core/schematics/migrations/path-match-type/update_recorder", ["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlX3JlY29yZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zY2hlbWF0aWNzL21pZ3JhdGlvbnMvcGF0aC1tYXRjaC10eXBlL3VwZGF0ZV9yZWNvcmRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUciLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuXG5pbXBvcnQge0ltcG9ydE1hbmFnZXJVcGRhdGVSZWNvcmRlcn0gZnJvbSAnLi4vLi4vdXRpbHMvaW1wb3J0X21hbmFnZXInO1xuXG4vKipcbiAqIFVwZGF0ZSByZWNvcmRlciBpbnRlcmZhY2UgdGhhdCBpcyB1c2VkIHRvIHRyYW5zZm9ybSBzb3VyY2UgZmlsZXNcbiAqIGluIGEgbm9uLWNvbGxpZGluZyB3YXkuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgVXBkYXRlUmVjb3JkZXIgZXh0ZW5kcyBJbXBvcnRNYW5hZ2VyVXBkYXRlUmVjb3JkZXIge1xuICB1cGRhdGVOb2RlKFxuICAgICAgb2xkTm9kZTogdHMuVmFyaWFibGVEZWNsYXJhdGlvbiwgbmV3Tm9kZTogdHMuVmFyaWFibGVEZWNsYXJhdGlvbixcbiAgICAgIHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUpOiB2b2lkO1xuICBjb21taXRVcGRhdGUoKTogdm9pZDtcbn1cbiJdfQ==

package/schematics/migrations/path-match-type/util.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+/// <amd-module name="@angular/core/schematics/migrations/path-match-type/util" />
+import ts from 'typescript';
+import { ImportManager } from '../../utils/import_manager';
+export declare function findExpressionsToMigrate(sourceFile: ts.SourceFile, importManager: ImportManager): Map<ts.VariableDeclaration, ts.VariableDeclaration>;

package/schematics/migrations/path-match-type/util.js

@@ -0,0 +1,106 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define("@angular/core/schematics/migrations/path-match-type/util", ["require", "exports", "typescript"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.findExpressionsToMigrate = void 0;
+    const typescript_1 = __importDefault(require("typescript"));
+    function findExpressionsToMigrate(sourceFile, importManager) {
+        const migratedNodesMap = new Map();
+        let _currentVariableDecl = null;
+        (() => {
+            sourceFile.forEachChild(function visitNode(node) {
+                if (typescript_1.default.isVariableDeclaration(node)) {
+                    _currentVariableDecl = node;
+                    node.forEachChild(visitNode);
+                    _currentVariableDecl = null;
+                }
+                if (isRouteOrRoutesVariableDeclaration(node)) {
+                    // The variable declaration is already explicitly typed as `Route` or `Routes` so it does
+                    // not need a migration.
+                    return;
+                }
+                else if (typescript_1.default.isObjectLiteralExpression(node)) {
+                    if (_currentVariableDecl !== null && _currentVariableDecl.type === undefined) {
+                        visitObjectLiteral(node);
+                    }
+                }
+                else {
+                    node.forEachChild(visitNode);
+                }
+            });
+            function visitObjectLiteral(obj) {
+                const hasPathMatch = obj.properties.some(p => isPropertyWithName(p, 'pathMatch'));
+                const hasPath = obj.properties.some(p => isPropertyWithName(p, 'path'));
+                const childrenProperty = obj.properties.find(p => isPropertyWithName(p, 'children'));
+                // The object must have _both_ pathMatch _and_ path for us to be reasonably sure that it's
+                // a `Route` definition.
+                if (hasPath && hasPathMatch) {
+                    updateCurrentVariableDeclaration();
+                }
+                else if (childrenProperty !== undefined && typescript_1.default.isPropertyAssignment(childrenProperty) &&
+                    typescript_1.default.isArrayLiteralExpression(childrenProperty.initializer)) {
+                    // Also need to check the children if it exists
+                    for (const child of childrenProperty.initializer.elements) {
+                        if (typescript_1.default.isObjectLiteralExpression(child)) {
+                            visitObjectLiteral(child);
+                            // If the child caused a migration, we can exit early
+                            if (_currentVariableDecl && migratedNodesMap.has(_currentVariableDecl)) {
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            function isPropertyWithName(p, name) {
+                if (typescript_1.default.isPropertyAssignment(p)) {
+                    return p.name.getText() === name;
+                }
+                else if (typescript_1.default.isShorthandPropertyAssignment(p)) {
+                    return p.name.getText() === name;
+                }
+                else {
+                    // Don't attempt to migrate edge case spreadAssignment
+                    return false;
+                }
+            }
+            function updateCurrentVariableDeclaration() {
+                if (_currentVariableDecl === null || _currentVariableDecl.initializer === undefined) {
+                    return;
+                }
+                let typeToUse;
+                if (typescript_1.default.isArrayLiteralExpression(_currentVariableDecl.initializer)) {
+                    typeToUse = importManager.addImportToSourceFile(sourceFile, 'Routes', '@angular/router');
+                }
+                else {
+                    typeToUse = importManager.addImportToSourceFile(sourceFile, 'Route', '@angular/router');
+                }
+                const migrated = typescript_1.default.factory.updateVariableDeclaration(_currentVariableDecl, _currentVariableDecl.name, _currentVariableDecl.exclamationToken, typeToUse, _currentVariableDecl.initializer);
+                migratedNodesMap.set(_currentVariableDecl, migrated);
+            }
+        })();
+        return migratedNodesMap;
+    }
+    exports.findExpressionsToMigrate = findExpressionsToMigrate;
+    function isRouteOrRoutesVariableDeclaration(node) {
+        return typescript_1.default.isVariableDeclaration(node) && node.type &&
+            (node.type.getText() === 'Route' || node.type.getText() === 'Routes');
+    }
+});
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/path-match-type/util.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;IAEH,4DAA4B;IAK5B,SAAgB,wBAAwB,CAAC,UAAyB,EAAE,aAA4B;QAC9F,MAAM,gBAAgB,GAAwD,IAAI,GAAG,EAAE,CAAC;QACxF,IAAI,oBAAoB,GAAgC,IAAI,CAAC;QAC7D,CAAC,GAAG,EAAE;YACJ,UAAU,CAAC,YAAY,CAAC,SAAS,SAAS,CAAC,IAAa;gBACtD,IAAI,oBAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE;oBAClC,oBAAoB,GAAG,IAAI,CAAC;oBAC5B,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAC7B,oBAAoB,GAAG,IAAI,CAAC;iBAC7B;gBACD,IAAI,kCAAkC,CAAC,IAAI,CAAC,EAAE;oBAC5C,yFAAyF;oBACzF,wBAAwB;oBACxB,OAAO;iBACR;qBAAM,IAAI,oBAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE;oBAC7C,IAAI,oBAAoB,KAAK,IAAI,IAAI,oBAAoB,CAAC,IAAI,KAAK,SAAS,EAAE;wBAC5E,kBAAkB,CAAC,IAAI,CAAC,CAAC;qBAC1B;iBACF;qBAAM;oBACL,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;iBAC9B;YACH,CAAC,CAAC,CAAC;YAEH,SAAS,kBAAkB,CAAC,GAA+B;gBACzD,MAAM,YAAY,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;gBAClF,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;gBACxE,MAAM,gBAAgB,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;gBACrF,0FAA0F;gBAC1F,wBAAwB;gBACxB,IAAI,OAAO,IAAI,YAAY,EAAE;oBAC3B,gCAAgC,EAAE,CAAC;iBACpC;qBAAM,IACH,gBAAgB,KAAK,SAAS,IAAI,oBAAE,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;oBAC3E,oBAAE,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE;oBAC7D,+CAA+C;oBAC/C,KAAK,MAAM,KAAK,IAAI,gBAAgB,CAAC,WAAW,CAAC,QAAQ,EAAE;wBACzD,IAAI,oBAAE,CAAC,yBAAyB,CAAC,KAAK,CAAC,EAAE;4BACvC,kBAAkB,CAAC,KAAK,CAAC,CAAC;4BAC1B,qDAAqD;4BACrD,IAAI,oBAAoB,IAAI,gBAAgB,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE;gCACtE,MAAM;6BACP;yBACF;qBACF;iBACF;YACH,CAAC;YAED,SAAS,kBAAkB,CAAC,CAA8B,EAAE,IAAY;gBACtE,IAAI,oBAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;oBAC9B,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC;iBAClC;qBAAM,IAAI,oBAAE,CAAC,6BAA6B,CAAC,CAAC,CAAC,EAAE;oBAC9C,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC;iBAClC;qBAAM;oBACL,sDAAsD;oBACtD,OAAO,KAAK,CAAC;iBACd;YACH,CAAC;YAED,SAAS,gCAAgC;gBACvC,IAAI,oBAAoB,KAAK,IAAI,IAAI,oBAAoB,CAAC,WAAW,KAAK,SAAS,EAAE;oBACnF,OAAO;iBACR;gBACD,IAAI,SAAsB,CAAC;gBAC3B,IAAI,oBAAE,CAAC,wBAAwB,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE;oBACjE,SAAS,GAAG,aAAa,CAAC,qBAAqB,CAAC,UAAU,EAAE,QAAQ,EAAE,iBAAiB,CAC7D,CAAC;iBAC5B;qBAAM;oBACL,SAAS,GAAG,aAAa,CAAC,qBAAqB,CAAC,UAAU,EAAE,OAAO,EAAE,iBAAiB,CAC5D,CAAC;iBAC5B;gBAED,MAAM,QAAQ,GAAG,oBAAE,CAAC,OAAO,CAAC,yBAAyB,CACjD,oBAAoB,EAAE,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,CAAC,gBAAgB,EACtF,SAAS,EAAE,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBACjD,gBAAgB,CAAC,GAAG,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;YACvD,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QAEL,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IA/ED,4DA+EC;IAED,SAAS,kCAAkC,CAAC,IAAa;QACvD,OAAO,oBAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI;YAC9C,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC;IAC5E,CAAC","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"]}

package/schematics/migrations/typed-forms/util.d.ts

@@ -8,10 +8,11 @@
 /// <amd-module name="@angular/core/schematics/migrations/typed-forms/util" />
 import ts from 'typescript';
 export declare const classes: Set<string>;
+export declare const formControl = "FormControl";
 export declare const untypedPrefix = "Untyped";
 export declare const forms = "@angular/forms";
 export interface MigratableNode {
-    node: ts.Expression;
+    node: ts.Node;
     importName: string;
 }
 export declare type rewriteFn = (startPos: number, origLength: number, text: string) => void;

package/schematics/migrations/typed-forms/util.js

@@ -14,16 +14,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define("@angular/core/schematics/migrations/typed-forms/util", ["require", "exports", "typescript", "@angular/core/schematics/utils/typescript/imports", "@angular/core/schematics/utils/typescript/symbol"], factory);
+        define("@angular/core/schematics/migrations/typed-forms/util", ["require", "exports", "typescript", "@angular/core/schematics/utils/typescript/imports"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.migrateFile = exports.forms = exports.untypedPrefix = exports.classes = void 0;
+    exports.migrateFile = exports.forms = exports.untypedPrefix = exports.formControl = exports.classes = void 0;
     const typescript_1 = __importDefault(require("typescript"));
     const imports_1 = require("@angular/core/schematics/utils/typescript/imports");
-    const symbol_1 = require("@angular/core/schematics/utils/typescript/symbol");
     exports.classes = new Set(['FormArray', 'FormBuilder', 'FormControl', 'FormGroup']);
+    exports.formControl = 'FormControl';
     exports.untypedPrefix = 'Untyped';
     exports.forms = '@angular/forms';
     function migrateFile(sourceFile, typeChecker, rewrite) {
@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 rewrite(usage.node.getStart(), usage.node.getWidth(), newName);
             }
         }
-        // For each imported control class, insert the corresponding uptyped import.
+        // For each imported control class, migrate to the corresponding uptyped import.
         for (const imp of imports) {
             const untypedClass = getUntypedVersionOfImportOrName(imp.getText());
             if (untypedClass === null) {
@@ -63,7 +63,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 // class is already present. If present, immediately continue.
                 continue;
             }
-            rewrite(imp.getEnd(), 0, `, ${untypedClass}`);
+            rewrite(imp.getStart(), imp.getWidth(), untypedClass);
         }
     }
     exports.migrateFile = migrateFile;
@@ -86,20 +86,49 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         return null;
     }
     function getUsages(sourceFile, typeChecker, importSpecifier) {
-        if (importSpecifier === null)
-            return [];
         const usages = [];
         const visitNode = (node) => {
-            // Look for a `new` expression with no type arguments which references an import we care about:
-            // `new FormControl()`
-            if (typescript_1.default.isNewExpression(node) && !node.typeArguments &&
-                (0, symbol_1.isReferenceToImport)(typeChecker, node.expression, importSpecifier)) {
-                usages.push({ node: node.expression, importName: importSpecifier.getText() });
+            if (typescript_1.default.isImportSpecifier(node)) {
+                // Skip this node and all of its children; imports are a special case.
+                return;
+            }
+            if (typescript_1.default.isIdentifier(node) && isUsageOfFormsImport(typeChecker, node, importSpecifier)) {
+                usages.push({ node, importName: importSpecifier.getText() });
             }
             typescript_1.default.forEachChild(node, visitNode);
         };
         typescript_1.default.forEachChild(sourceFile, visitNode);
         return usages;
     }
+    function isUsageOfFormsImport(typeChecker, node, importSpecifier) {
+        var _a, _b;
+        const symbol = typeChecker.getSymbolAtLocation(node);
+        // We check symbol.declarations because we actually care about the name at the declaration site,
+        // not the usage site. These could be different in the case of overriden constructors.
+        if (!symbol || symbol.declarations === undefined || !symbol.declarations.length)
+            return false;
+        const decl = symbol.declarations[0];
+        if (!typescript_1.default.isImportSpecifier(decl))
+            return false;
+        // As per `typescript/imports.ts`, we must walk up the tree to find the enclosing import
+        // declaration. For reasons specific to the TS AST, this is always 3 levels up from an import
+        // specifier node.
+        const importDecl = decl.parent.parent.parent;
+        if (!typescript_1.default.isStringLiteral(importDecl.moduleSpecifier))
+            return false;
+        const importName = (_b = (_a = typeChecker.getTypeAtLocation(importSpecifier)) === null || _a === void 0 ? void 0 : _a.getSymbol()) === null || _b === void 0 ? void 0 : _b.getName();
+        if (!importName)
+            return false;
+        // Handles aliased imports: e.g. "import {Component as myComp} from ...";
+        const declName = decl.propertyName ? decl.propertyName.text : decl.name.text;
+        if (importName === declName)
+            return true;
+        // In the case of FormControl's overridden exported constructor, the value name and declaration
+        // name are not exactly the same. For our purposes, it's enough to check whether the latter is a
+        // substring of the former.
+        if (declName === exports.formControl && importName.includes(declName))
+            return true;
+        return false;
+    }
 });
-//# 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';\nimport {isReferenceToImport} from '../../utils/typescript/symbol';\n\nexport const classes = new Set(['FormArray', 'FormBuilder', 'FormControl', 'FormGroup']);\nexport const untypedPrefix = 'Untyped';\nexport const forms = '@angular/forms';\n\nexport interface MigratableNode {\n  node: ts.Expression;\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, insert 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.getEnd(), 0, `, ${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|null): MigratableNode[] {\n  if (importSpecifier === null) return [];\n  const usages: MigratableNode[] = [];\n  const visitNode = (node: ts.Node) => {\n    // Look for a `new` expression with no type arguments which references an import we care about:\n    // `new FormControl()`\n    if (ts.isNewExpression(node) && !node.typeArguments &&\n        isReferenceToImport(typeChecker, node.expression, importSpecifier)) {\n      usages.push({node: node.expression, importName: importSpecifier.getText()});\n    }\n    ts.forEachChild(node, visitNode);\n  };\n  ts.forEachChild(sourceFile, visitNode);\n  return usages;\n}\n"]}
+//# 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 overriden 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"]}

package/schematics/migrations.json

@@ -6,9 +6,14 @@
       "factory": "./migrations/entry-components/index"
     },
     "migration-v14-typed-forms": {
-      "version": "9999.0.0",
-      "description": "Experimental migration that adds <any>s for Typed Forms.",
+      "version": "14.0.0-beta",
+      "description": "As of Angular version 14, Forms model classes accept a type parameter, and existing usages must be opted out to preserve backwards-compatibility.",
       "factory": "./migrations/typed-forms/index"
+    },
+    "migration-v14-path-match-type": {
+      "version": "14.0.0-beta",
+      "description": "In Angular version 14, the `pathMatch` property of `Routes` was updated to be a strict union of the two valid options: `'full'|'prefix'`. `Routes` and `Route` variables need an explicit type so TypeScript does not infer the property as the looser `string`.",
+      "factory": "./migrations/path-match-type/index"
     }
   }
-}
+}