@angular/core 13.0.0-next.7 → 13.0.0-rc.1

package/schematics/migrations/missing-injectable/definition_collector.js

@@ -5,6 +5,9 @@
  * 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);
@@ -17,7 +20,7 @@
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.NgDefinitionCollector = void 0;
-    const ts = require("typescript");
+    const typescript_1 = __importDefault(require("typescript"));
     const ng_decorators_1 = require("@angular/core/schematics/utils/ng_decorators");
     const property_name_1 = require("@angular/core/schematics/utils/typescript/property_name");
     /**
@@ -31,16 +34,16 @@
             this.resolvedDirectives = [];
         }
         visitNode(node) {
-            if (ts.isClassDeclaration(node)) {
+            if (typescript_1.default.isClassDeclaration(node)) {
                 this.visitClassDeclaration(node);
             }
-            ts.forEachChild(node, n => this.visitNode(n));
+            typescript_1.default.forEachChild(node, n => this.visitNode(n));
         }
         visitClassDeclaration(node) {
             if (!node.decorators || !node.decorators.length) {
                 return;
             }
-            const ngDecorators = ng_decorators_1.getAngularDecorators(this.typeChecker, node.decorators);
+            const ngDecorators = (0, ng_decorators_1.getAngularDecorators)(this.typeChecker, node.decorators);
             const directiveDecorator = ngDecorators.find(({ name }) => name === 'Component' || name == 'Directive');
             const ngModuleDecorator = ngDecorators.find(({ name }) => name === 'NgModule');
             if (ngModuleDecorator) {
@@ -53,13 +56,13 @@
         _visitDirectiveClass(node, decorator) {
             const decoratorCall = decorator.node.expression;
             const metadata = decoratorCall.arguments[0];
-            if (!metadata || !ts.isObjectLiteralExpression(metadata)) {
+            if (!metadata || !typescript_1.default.isObjectLiteralExpression(metadata)) {
                 return;
             }
-            const providersNode = metadata.properties.filter(ts.isPropertyAssignment)
-                .find(p => property_name_1.getPropertyNameText(p.name) === 'providers');
-            const viewProvidersNode = metadata.properties.filter(ts.isPropertyAssignment)
-                .find(p => property_name_1.getPropertyNameText(p.name) === 'viewProviders');
+            const providersNode = metadata.properties.filter(typescript_1.default.isPropertyAssignment)
+                .find(p => (0, property_name_1.getPropertyNameText)(p.name) === 'providers');
+            const viewProvidersNode = metadata.properties.filter(typescript_1.default.isPropertyAssignment)
+                .find(p => (0, property_name_1.getPropertyNameText)(p.name) === 'viewProviders');
             this.resolvedDirectives.push({
                 name: node.name ? node.name.text : 'default',
                 node,
@@ -71,11 +74,11 @@
         _visitNgModuleClass(node, decorator) {
             const decoratorCall = decorator.node.expression;
             const metadata = decoratorCall.arguments[0];
-            if (!metadata || !ts.isObjectLiteralExpression(metadata)) {
+            if (!metadata || !typescript_1.default.isObjectLiteralExpression(metadata)) {
                 return;
             }
-            const providersNode = metadata.properties.filter(ts.isPropertyAssignment)
-                .find(p => property_name_1.getPropertyNameText(p.name) === 'providers');
+            const providersNode = metadata.properties.filter(typescript_1.default.isPropertyAssignment)
+                .find(p => (0, property_name_1.getPropertyNameText)(p.name) === 'providers');
             this.resolvedModules.push({
                 name: node.name ? node.name.text : 'default',
                 node,
@@ -86,4 +89,4 @@
     }
     exports.NgDefinitionCollector = NgDefinitionCollector;
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"definition_collector.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/definition_collector.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 * as ts from 'typescript';\n\nimport {getAngularDecorators, NgDecorator} from '../../utils/ng_decorators';\nimport {getPropertyNameText} from '../../utils/typescript/property_name';\n\nexport interface ResolvedNgModule {\n  name: string;\n  node: ts.ClassDeclaration;\n  decorator: NgDecorator;\n  providersExpr: ts.Expression|null;\n}\n\nexport interface ResolvedDirective {\n  name: string;\n  node: ts.ClassDeclaration;\n  decorator: NgDecorator;\n  providersExpr: ts.Expression|null;\n  viewProvidersExpr: ts.Expression|null;\n}\n\n/**\n * Visitor that walks through specified TypeScript nodes and collects all\n * found NgModule, Directive or Component definitions.\n */\nexport class NgDefinitionCollector {\n  resolvedModules: ResolvedNgModule[] = [];\n  resolvedDirectives: ResolvedDirective[] = [];\n\n  constructor(public typeChecker: ts.TypeChecker) {}\n\n  visitNode(node: ts.Node) {\n    if (ts.isClassDeclaration(node)) {\n      this.visitClassDeclaration(node);\n    }\n\n    ts.forEachChild(node, n => this.visitNode(n));\n  }\n\n  private visitClassDeclaration(node: ts.ClassDeclaration) {\n    if (!node.decorators || !node.decorators.length) {\n      return;\n    }\n\n    const ngDecorators = getAngularDecorators(this.typeChecker, node.decorators);\n    const directiveDecorator =\n        ngDecorators.find(({name}) => name === 'Component' || name == 'Directive');\n    const ngModuleDecorator = ngDecorators.find(({name}) => name === 'NgModule');\n\n    if (ngModuleDecorator) {\n      this._visitNgModuleClass(node, ngModuleDecorator);\n    } else if (directiveDecorator) {\n      this._visitDirectiveClass(node, directiveDecorator);\n    }\n  }\n\n  private _visitDirectiveClass(node: ts.ClassDeclaration, decorator: NgDecorator) {\n    const decoratorCall = decorator.node.expression;\n    const metadata = decoratorCall.arguments[0];\n\n    if (!metadata || !ts.isObjectLiteralExpression(metadata)) {\n      return;\n    }\n\n    const providersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                              .find(p => getPropertyNameText(p.name) === 'providers');\n\n    const viewProvidersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                                  .find(p => getPropertyNameText(p.name) === 'viewProviders');\n\n    this.resolvedDirectives.push({\n      name: node.name ? node.name.text : 'default',\n      node,\n      decorator,\n      providersExpr: providersNode !== undefined ? providersNode.initializer : null,\n      viewProvidersExpr: viewProvidersNode !== undefined ? viewProvidersNode.initializer : null,\n    });\n  }\n\n  private _visitNgModuleClass(node: ts.ClassDeclaration, decorator: NgDecorator) {\n    const decoratorCall = decorator.node.expression;\n    const metadata = decoratorCall.arguments[0];\n\n    if (!metadata || !ts.isObjectLiteralExpression(metadata)) {\n      return;\n    }\n\n    const providersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                              .find(p => getPropertyNameText(p.name) === 'providers');\n    this.resolvedModules.push({\n      name: node.name ? node.name.text : 'default',\n      node,\n      decorator,\n      providersExpr: providersNode !== undefined ? providersNode.initializer : null,\n    });\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"definition_collector.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/definition_collector.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 {getAngularDecorators, NgDecorator} from '../../utils/ng_decorators';\nimport {getPropertyNameText} from '../../utils/typescript/property_name';\n\nexport interface ResolvedNgModule {\n  name: string;\n  node: ts.ClassDeclaration;\n  decorator: NgDecorator;\n  providersExpr: ts.Expression|null;\n}\n\nexport interface ResolvedDirective {\n  name: string;\n  node: ts.ClassDeclaration;\n  decorator: NgDecorator;\n  providersExpr: ts.Expression|null;\n  viewProvidersExpr: ts.Expression|null;\n}\n\n/**\n * Visitor that walks through specified TypeScript nodes and collects all\n * found NgModule, Directive or Component definitions.\n */\nexport class NgDefinitionCollector {\n  resolvedModules: ResolvedNgModule[] = [];\n  resolvedDirectives: ResolvedDirective[] = [];\n\n  constructor(public typeChecker: ts.TypeChecker) {}\n\n  visitNode(node: ts.Node) {\n    if (ts.isClassDeclaration(node)) {\n      this.visitClassDeclaration(node);\n    }\n\n    ts.forEachChild(node, n => this.visitNode(n));\n  }\n\n  private visitClassDeclaration(node: ts.ClassDeclaration) {\n    if (!node.decorators || !node.decorators.length) {\n      return;\n    }\n\n    const ngDecorators = getAngularDecorators(this.typeChecker, node.decorators);\n    const directiveDecorator =\n        ngDecorators.find(({name}) => name === 'Component' || name == 'Directive');\n    const ngModuleDecorator = ngDecorators.find(({name}) => name === 'NgModule');\n\n    if (ngModuleDecorator) {\n      this._visitNgModuleClass(node, ngModuleDecorator);\n    } else if (directiveDecorator) {\n      this._visitDirectiveClass(node, directiveDecorator);\n    }\n  }\n\n  private _visitDirectiveClass(node: ts.ClassDeclaration, decorator: NgDecorator) {\n    const decoratorCall = decorator.node.expression;\n    const metadata = decoratorCall.arguments[0];\n\n    if (!metadata || !ts.isObjectLiteralExpression(metadata)) {\n      return;\n    }\n\n    const providersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                              .find(p => getPropertyNameText(p.name) === 'providers');\n\n    const viewProvidersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                                  .find(p => getPropertyNameText(p.name) === 'viewProviders');\n\n    this.resolvedDirectives.push({\n      name: node.name ? node.name.text : 'default',\n      node,\n      decorator,\n      providersExpr: providersNode !== undefined ? providersNode.initializer : null,\n      viewProvidersExpr: viewProvidersNode !== undefined ? viewProvidersNode.initializer : null,\n    });\n  }\n\n  private _visitNgModuleClass(node: ts.ClassDeclaration, decorator: NgDecorator) {\n    const decoratorCall = decorator.node.expression;\n    const metadata = decoratorCall.arguments[0];\n\n    if (!metadata || !ts.isObjectLiteralExpression(metadata)) {\n      return;\n    }\n\n    const providersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                              .find(p => getPropertyNameText(p.name) === 'providers');\n    this.resolvedModules.push({\n      name: node.name ? node.name.text : 'default',\n      node,\n      decorator,\n      providersExpr: providersNode !== undefined ? providersNode.initializer : null,\n    });\n  }\n}\n"]}

package/schematics/migrations/missing-injectable/index.js

@@ -14,20 +14,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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/missing-injectable", ["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/missing-injectable/definition_collector", "@angular/core/schematics/migrations/missing-injectable/transform"], factory);
+        define("@angular/core/schematics/migrations/missing-injectable", ["require", "exports", "@angular-devkit/schematics", "path", "typescript", "@angular/core/schematics/utils/load_esm", "@angular/core/schematics/utils/project_tsconfig_paths", "@angular/core/schematics/utils/typescript/compiler_host", "@angular/core/schematics/migrations/missing-injectable/definition_collector", "@angular/core/schematics/migrations/missing-injectable/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 ts = require("typescript");
+    const typescript_1 = __importDefault(require("typescript"));
+    const load_esm_1 = require("@angular/core/schematics/utils/load_esm");
     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 definition_collector_1 = require("@angular/core/schematics/migrations/missing-injectable/definition_collector");
@@ -35,15 +39,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     /** Entry point for the V9 "missing @Injectable" schematic. */
     function default_1() {
         return (tree, ctx) => __awaiter(this, void 0, void 0, function* () {
-            const { buildPaths, testPaths } = yield project_tsconfig_paths_1.getProjectTsConfigPaths(tree);
+            const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
             const basePath = process.cwd();
             const failures = [];
             if (!buildPaths.length && !testPaths.length) {
                 throw new schematics_1.SchematicsException('Could not find any tsconfig file. Cannot add the "@Injectable" decorator to providers ' +
                     'which don\'t have that decorator set.');
             }
+            let compilerCliMigrationsModule;
+            try {
+                // Load ESM `@angular/compiler/private/migrations` using the TypeScript dynamic import
+                // workaround. Once TypeScript provides support for keeping the dynamic import this workaround
+                // can be changed to a direct dynamic import.
+                compilerCliMigrationsModule = yield (0, load_esm_1.loadCompilerCliMigrationsModule)();
+            }
+            catch (e) {
+                throw new schematics_1.SchematicsException(`Unable to load the '@angular/compiler-cli' package. Details: ${e.message}`);
+            }
             for (const tsconfigPath of [...buildPaths, ...testPaths]) {
-                failures.push(...runMissingInjectableMigration(tree, tsconfigPath, basePath));
+                failures.push(...runMissingInjectableMigration(tree, tsconfigPath, basePath, compilerCliMigrationsModule));
             }
             if (failures.length) {
                 ctx.logger.info('Could not migrate all providers automatically. Please');
@@ -53,23 +67,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         });
     }
     exports.default = default_1;
-    function runMissingInjectableMigration(tree, tsconfigPath, basePath) {
-        const { program } = compiler_host_1.createMigrationProgram(tree, tsconfigPath, basePath);
+    function runMissingInjectableMigration(tree, tsconfigPath, basePath, compilerCliMigrationsModule) {
+        const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
         const failures = [];
         const typeChecker = program.getTypeChecker();
         const definitionCollector = new definition_collector_1.NgDefinitionCollector(typeChecker);
-        const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
+        const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
         // Analyze source files by detecting all modules, directives and components.
         sourceFiles.forEach(sourceFile => definitionCollector.visitNode(sourceFile));
         const { resolvedModules, resolvedDirectives } = definitionCollector;
-        const transformer = new transform_1.MissingInjectableTransform(typeChecker, getUpdateRecorder);
+        const transformer = new transform_1.MissingInjectableTransform(typeChecker, getUpdateRecorder, compilerCliMigrationsModule);
         const updateRecorders = new Map();
         [...transformer.migrateModules(resolvedModules),
             ...transformer.migrateDirectives(resolvedDirectives),
         ].forEach(({ message, node }) => {
             const nodeSourceFile = node.getSourceFile();
-            const relativeFilePath = path_1.relative(basePath, nodeSourceFile.fileName);
-            const { line, character } = ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());
+            const relativeFilePath = (0, path_1.relative)(basePath, nodeSourceFile.fileName);
+            const { line, character } = typescript_1.default.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());
             failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);
         });
         // Record the changes collected in the import manager and transformer.
@@ -84,7 +98,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             if (updateRecorders.has(sourceFile)) {
                 return updateRecorders.get(sourceFile);
             }
-            const treeRecorder = tree.beginUpdate(path_1.relative(basePath, sourceFile.fileName));
+            const treeRecorder = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
             const recorder = {
                 addClassDecorator(node, text) {
                     // New imports should be inserted at the left while decorators should be inserted
@@ -119,4 +133,4 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         }
     }
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/index.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 {Rule, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {relative} from 'path';\nimport * as ts from 'typescript';\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\nimport {NgDefinitionCollector} from './definition_collector';\nimport {MissingInjectableTransform} from './transform';\nimport {UpdateRecorder} from './update_recorder';\n\n/** Entry point for the V9 \"missing @Injectable\" schematic. */\nexport default function(): Rule {\n  return async (tree: Tree, ctx: SchematicContext) => {\n    const {buildPaths, testPaths} = await getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const failures: string[] = [];\n\n    if (!buildPaths.length && !testPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot add the \"@Injectable\" decorator to providers ' +\n          'which don\\'t have that decorator set.');\n    }\n\n    for (const tsconfigPath of [...buildPaths, ...testPaths]) {\n      failures.push(...runMissingInjectableMigration(tree, tsconfigPath, basePath));\n    }\n\n    if (failures.length) {\n      ctx.logger.info('Could not migrate all providers automatically. Please');\n      ctx.logger.info('manually migrate the following instances:');\n      failures.forEach(message => ctx.logger.warn(`⮑   ${message}`));\n    }\n  };\n}\n\nfunction runMissingInjectableMigration(\n    tree: Tree, tsconfigPath: string, basePath: string): string[] {\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);\n  const failures: string[] = [];\n  const typeChecker = program.getTypeChecker();\n  const definitionCollector = new NgDefinitionCollector(typeChecker);\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  // Analyze source files by detecting all modules, directives and components.\n  sourceFiles.forEach(sourceFile => definitionCollector.visitNode(sourceFile));\n\n  const {resolvedModules, resolvedDirectives} = definitionCollector;\n  const transformer = new MissingInjectableTransform(typeChecker, getUpdateRecorder);\n  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();\n\n  [...transformer.migrateModules(resolvedModules),\n   ...transformer.migrateDirectives(resolvedDirectives),\n  ].forEach(({message, node}) => {\n    const nodeSourceFile = node.getSourceFile();\n    const relativeFilePath = relative(basePath, nodeSourceFile.fileName);\n    const {line, character} =\n        ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());\n    failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);\n  });\n\n  // Record the changes collected in the import manager and transformer.\n  transformer.recordChanges();\n\n  // Walk through each update recorder and commit the update. We need to commit the\n  // updates in batches per source file as there can be only one recorder per source\n  // file in order to avoid shift character offsets.\n  updateRecorders.forEach(recorder => recorder.commitUpdate());\n\n  return failures;\n\n  /** Gets the update recorder for the specified source file. */\n  function getUpdateRecorder(sourceFile: ts.SourceFile): UpdateRecorder {\n    if (updateRecorders.has(sourceFile)) {\n      return updateRecorders.get(sourceFile)!;\n    }\n    const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    const recorder: UpdateRecorder = {\n      addClassDecorator(node: ts.ClassDeclaration, text: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertRight(node.getStart(), `${text}\\n`);\n      },\n      replaceDecorator(decorator: ts.Decorator, newText: string) {\n        treeRecorder.remove(decorator.getStart(), decorator.getWidth());\n        treeRecorder.insertRight(decorator.getStart(), newText);\n      },\n      addNewImport(start: number, importText: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertLeft(start, importText);\n      },\n      updateExistingImport(namedBindings: ts.NamedImports, newNamedBindings: string) {\n        treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());\n        treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);\n      },\n      updateObjectLiteral(node: ts.ObjectLiteralExpression, newText: string) {\n        treeRecorder.remove(node.getStart(), node.getWidth());\n        treeRecorder.insertRight(node.getStart(), newText);\n      },\n      commitUpdate() {\n        tree.commitUpdate(treeRecorder);\n      }\n    };\n    updateRecorders.set(sourceFile, recorder);\n    return recorder;\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/index.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 {Rule, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {relative} from 'path';\nimport ts from 'typescript';\n\nimport {loadCompilerCliMigrationsModule, loadEsmModule} from '../../utils/load_esm';\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\nimport {NgDefinitionCollector} from './definition_collector';\nimport {MissingInjectableTransform} from './transform';\nimport {UpdateRecorder} from './update_recorder';\n\n/** Entry point for the V9 \"missing @Injectable\" schematic. */\nexport default function(): Rule {\n  return async (tree: Tree, ctx: SchematicContext) => {\n    const {buildPaths, testPaths} = await getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const failures: string[] = [];\n\n    if (!buildPaths.length && !testPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot add the \"@Injectable\" decorator to providers ' +\n          'which don\\'t have that decorator set.');\n    }\n\n    let compilerCliMigrationsModule;\n    try {\n      // Load ESM `@angular/compiler/private/migrations` using the TypeScript dynamic import\n      // workaround. Once TypeScript provides support for keeping the dynamic import this workaround\n      // can be changed to a direct dynamic import.\n      compilerCliMigrationsModule = await loadCompilerCliMigrationsModule();\n    } catch (e) {\n      throw new SchematicsException(\n          `Unable to load the '@angular/compiler-cli' package. Details: ${e.message}`);\n    }\n\n    for (const tsconfigPath of [...buildPaths, ...testPaths]) {\n      failures.push(...runMissingInjectableMigration(\n          tree, tsconfigPath, basePath, compilerCliMigrationsModule));\n    }\n\n    if (failures.length) {\n      ctx.logger.info('Could not migrate all providers automatically. Please');\n      ctx.logger.info('manually migrate the following instances:');\n      failures.forEach(message => ctx.logger.warn(`⮑   ${message}`));\n    }\n  };\n}\n\nfunction runMissingInjectableMigration(\n    tree: Tree, tsconfigPath: string, basePath: string,\n    compilerCliMigrationsModule: typeof import('@angular/compiler-cli/private/migrations')):\n    string[] {\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);\n  const failures: string[] = [];\n  const typeChecker = program.getTypeChecker();\n  const definitionCollector = new NgDefinitionCollector(typeChecker);\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  // Analyze source files by detecting all modules, directives and components.\n  sourceFiles.forEach(sourceFile => definitionCollector.visitNode(sourceFile));\n\n  const {resolvedModules, resolvedDirectives} = definitionCollector;\n  const transformer =\n      new MissingInjectableTransform(typeChecker, getUpdateRecorder, compilerCliMigrationsModule);\n  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();\n\n  [...transformer.migrateModules(resolvedModules),\n   ...transformer.migrateDirectives(resolvedDirectives),\n  ].forEach(({message, node}) => {\n    const nodeSourceFile = node.getSourceFile();\n    const relativeFilePath = relative(basePath, nodeSourceFile.fileName);\n    const {line, character} =\n        ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());\n    failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);\n  });\n\n  // Record the changes collected in the import manager and transformer.\n  transformer.recordChanges();\n\n  // Walk through each update recorder and commit the update. We need to commit the\n  // updates in batches per source file as there can be only one recorder per source\n  // file in order to avoid shift character offsets.\n  updateRecorders.forEach(recorder => recorder.commitUpdate());\n\n  return failures;\n\n  /** Gets the update recorder for the specified source file. */\n  function getUpdateRecorder(sourceFile: ts.SourceFile): UpdateRecorder {\n    if (updateRecorders.has(sourceFile)) {\n      return updateRecorders.get(sourceFile)!;\n    }\n    const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    const recorder: UpdateRecorder = {\n      addClassDecorator(node: ts.ClassDeclaration, text: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertRight(node.getStart(), `${text}\\n`);\n      },\n      replaceDecorator(decorator: ts.Decorator, newText: string) {\n        treeRecorder.remove(decorator.getStart(), decorator.getWidth());\n        treeRecorder.insertRight(decorator.getStart(), newText);\n      },\n      addNewImport(start: number, importText: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertLeft(start, importText);\n      },\n      updateExistingImport(namedBindings: ts.NamedImports, newNamedBindings: string) {\n        treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());\n        treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);\n      },\n      updateObjectLiteral(node: ts.ObjectLiteralExpression, newText: string) {\n        treeRecorder.remove(node.getStart(), node.getWidth());\n        treeRecorder.insertRight(node.getStart(), newText);\n      },\n      commitUpdate() {\n        tree.commitUpdate(treeRecorder);\n      }\n    };\n    updateRecorders.set(sourceFile, recorder);\n    return recorder;\n  }\n}\n"]}

package/schematics/migrations/missing-injectable/providers_evaluator.d.ts

@@ -6,31 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <amd-module name="@angular/core/schematics/migrations/missing-injectable/providers_evaluator" />
-import { ResolvedValue } from '@angular/compiler-cli/src/ngtsc/partial_evaluator';
-import { StaticInterpreter } from '@angular/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter';
-import * as ts from 'typescript';
+import ts from 'typescript';
+import type { ResolvedValue, TypeScriptReflectionHost } from '@angular/compiler-cli/private/migrations';
 export interface ProviderLiteral {
     node: ts.ObjectLiteralExpression;
     resolvedValue: ResolvedValue;
 }
 /**
- * Providers evaluator that extends the ngtsc static interpreter. This is necessary because
- * the static interpreter by default only exposes the resolved value, but we are also interested
- * in the TypeScript nodes that declare providers. It would be possible to manually traverse the
- * AST to collect these nodes, but that would mean that we need to re-implement the static
- * interpreter in order to handle all possible scenarios. (e.g. spread operator, function calls,
- * callee scope). This can be avoided by simply extending the static interpreter and intercepting
- * the "visitObjectLiteralExpression" method.
+ * A factory function to create an evaluator for providers. This is required to be a
+ * factory function because the underlying class extends a class that is only available
+ * from within a dynamically imported module (`@angular/compiler-cli/private/migrations`)
+ * and is therefore not available at module evaluation time.
  */
-export declare class ProvidersEvaluator extends StaticInterpreter {
-    private _providerLiterals;
-    visitObjectLiteralExpression(node: ts.ObjectLiteralExpression, context: any): ResolvedValue;
-    /**
-     * Evaluates the given expression and returns its statically resolved value
-     * and a list of object literals which define Angular providers.
-     */
-    evaluate(expr: ts.Expression): {
+export declare function createProvidersEvaluator(compilerCliMigrationsModule: typeof import('@angular/compiler-cli/private/migrations'), host: TypeScriptReflectionHost, checker: ts.TypeChecker): {
+    evaluate: (expr: ts.Expression) => {
         resolvedValue: ResolvedValue;
         literals: ProviderLiteral[];
     };
-}
+};

package/schematics/migrations/missing-injectable/providers_evaluator.js

@@ -11,54 +11,61 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define("@angular/core/schematics/migrations/missing-injectable/providers_evaluator", ["require", "exports", "@angular/compiler-cli/src/ngtsc/annotations", "@angular/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter"], factory);
+        define("@angular/core/schematics/migrations/missing-injectable/providers_evaluator", ["require", "exports"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.ProvidersEvaluator = void 0;
-    const annotations_1 = require("@angular/compiler-cli/src/ngtsc/annotations");
-    const interpreter_1 = require("@angular/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter");
+    exports.createProvidersEvaluator = void 0;
     /**
-     * Providers evaluator that extends the ngtsc static interpreter. This is necessary because
-     * the static interpreter by default only exposes the resolved value, but we are also interested
-     * in the TypeScript nodes that declare providers. It would be possible to manually traverse the
-     * AST to collect these nodes, but that would mean that we need to re-implement the static
-     * interpreter in order to handle all possible scenarios. (e.g. spread operator, function calls,
-     * callee scope). This can be avoided by simply extending the static interpreter and intercepting
-     * the "visitObjectLiteralExpression" method.
+     * A factory function to create an evaluator for providers. This is required to be a
+     * factory function because the underlying class extends a class that is only available
+     * from within a dynamically imported module (`@angular/compiler-cli/private/migrations`)
+     * and is therefore not available at module evaluation time.
      */
-    class ProvidersEvaluator extends interpreter_1.StaticInterpreter {
-        constructor() {
-            super(...arguments);
-            this._providerLiterals = [];
-        }
-        visitObjectLiteralExpression(node, context) {
-            const resolvedValue = super.visitObjectLiteralExpression(node, Object.assign(Object.assign({}, context), { insideProviderDef: true }));
-            // do not collect nested object literals. e.g. a provider could use a
-            // spread assignment (which resolves to another object literal). In that
-            // case the referenced object literal is not a provider object literal.
-            if (!context.insideProviderDef) {
-                this._providerLiterals.push({ node, resolvedValue });
-            }
-            return resolvedValue;
-        }
+    function createProvidersEvaluator(compilerCliMigrationsModule, host, checker) {
         /**
-         * Evaluates the given expression and returns its statically resolved value
-         * and a list of object literals which define Angular providers.
+         * Providers evaluator that extends the ngtsc static interpreter. This is necessary because
+         * the static interpreter by default only exposes the resolved value, but we are also interested
+         * in the TypeScript nodes that declare providers. It would be possible to manually traverse the
+         * AST to collect these nodes, but that would mean that we need to re-implement the static
+         * interpreter in order to handle all possible scenarios. (e.g. spread operator, function calls,
+         * callee scope). This can be avoided by simply extending the static interpreter and intercepting
+         * the "visitObjectLiteralExpression" method.
          */
-        evaluate(expr) {
-            this._providerLiterals = [];
-            const resolvedValue = this.visit(expr, {
-                originatingFile: expr.getSourceFile(),
-                absoluteModuleName: null,
-                resolutionContext: expr.getSourceFile().fileName,
-                scope: new Map(),
-                foreignFunctionResolver: annotations_1.forwardRefResolver
-            });
-            return { resolvedValue, literals: this._providerLiterals };
+        class ProvidersEvaluator extends compilerCliMigrationsModule.StaticInterpreter {
+            constructor() {
+                super(...arguments);
+                this._providerLiterals = [];
+            }
+            visitObjectLiteralExpression(node, context) {
+                const resolvedValue = super.visitObjectLiteralExpression(node, Object.assign(Object.assign({}, context), { insideProviderDef: true }));
+                // do not collect nested object literals. e.g. a provider could use a
+                // spread assignment (which resolves to another object literal). In that
+                // case the referenced object literal is not a provider object literal.
+                if (!context.insideProviderDef) {
+                    this._providerLiterals.push({ node, resolvedValue });
+                }
+                return resolvedValue;
+            }
+            /**
+             * Evaluates the given expression and returns its statically resolved value
+             * and a list of object literals which define Angular providers.
+             */
+            evaluate(expr) {
+                this._providerLiterals = [];
+                const resolvedValue = this.visit(expr, {
+                    originatingFile: expr.getSourceFile(),
+                    absoluteModuleName: null,
+                    resolutionContext: expr.getSourceFile().fileName,
+                    scope: new Map(),
+                    foreignFunctionResolver: compilerCliMigrationsModule.forwardRefResolver
+                });
+                return { resolvedValue, literals: this._providerLiterals };
+            }
         }
+        return new ProvidersEvaluator(host, checker, /* dependencyTracker */ null);
     }
-    exports.ProvidersEvaluator = ProvidersEvaluator;
+    exports.createProvidersEvaluator = createProvidersEvaluator;
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmlkZXJzX2V2YWx1YXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL21pc3NpbmctaW5qZWN0YWJsZS9wcm92aWRlcnNfZXZhbHVhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7OztJQUVILDZFQUErRTtJQUUvRSxtR0FBb0c7SUFRcEc7Ozs7Ozs7O09BUUc7SUFDSCxNQUFhLGtCQUFtQixTQUFRLCtCQUFpQjtRQUF6RDs7WUFDVSxzQkFBaUIsR0FBc0IsRUFBRSxDQUFDO1FBNkJwRCxDQUFDO1FBM0JVLDRCQUE0QixDQUFDLElBQWdDLEVBQUUsT0FBWTtZQUNsRixNQUFNLGFBQWEsR0FDZixLQUFLLENBQUMsNEJBQTRCLENBQUMsSUFBSSxrQ0FBTSxPQUFPLEtBQUUsaUJBQWlCLEVBQUUsSUFBSSxJQUFFLENBQUM7WUFDcEYscUVBQXFFO1lBQ3JFLHdFQUF3RTtZQUN4RSx1RUFBdUU7WUFDdkUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxpQkFBaUIsRUFBRTtnQkFDOUIsSUFBSSxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxFQUFDLElBQUksRUFBRSxhQUFhLEVBQUMsQ0FBQyxDQUFDO2FBQ3BEO1lBQ0QsT0FBTyxhQUFhLENBQUM7UUFDdkIsQ0FBQztRQUVEOzs7V0FHRztRQUNILFFBQVEsQ0FBQyxJQUFtQjtZQUMxQixJQUFJLENBQUMsaUJBQWlCLEdBQUcsRUFBRSxDQUFDO1lBQzVCLE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFO2dCQUNyQyxlQUFlLEVBQUUsSUFBSSxDQUFDLGFBQWEsRUFBRTtnQkFDckMsa0JBQWtCLEVBQUUsSUFBSTtnQkFDeEIsaUJBQWlCLEVBQUUsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDLFFBQVE7Z0JBQ2hELEtBQUssRUFBRSxJQUFJLEdBQUcsRUFBRTtnQkFDaEIsdUJBQXVCLEVBQUUsZ0NBQWtCO2FBQzVDLENBQUMsQ0FBQztZQUNILE9BQU8sRUFBQyxhQUFhLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxpQkFBaUIsRUFBQyxDQUFDO1FBQzNELENBQUM7S0FDRjtJQTlCRCxnREE4QkMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtmb3J3YXJkUmVmUmVzb2x2ZXJ9IGZyb20gJ0Bhbmd1bGFyL2NvbXBpbGVyLWNsaS9zcmMvbmd0c2MvYW5ub3RhdGlvbnMnO1xuaW1wb3J0IHtSZXNvbHZlZFZhbHVlfSBmcm9tICdAYW5ndWxhci9jb21waWxlci1jbGkvc3JjL25ndHNjL3BhcnRpYWxfZXZhbHVhdG9yJztcbmltcG9ydCB7U3RhdGljSW50ZXJwcmV0ZXJ9IGZyb20gJ0Bhbmd1bGFyL2NvbXBpbGVyLWNsaS9zcmMvbmd0c2MvcGFydGlhbF9ldmFsdWF0b3Ivc3JjL2ludGVycHJldGVyJztcbmltcG9ydCAqIGFzIHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFByb3ZpZGVyTGl0ZXJhbCB7XG4gIG5vZGU6IHRzLk9iamVjdExpdGVyYWxFeHByZXNzaW9uO1xuICByZXNvbHZlZFZhbHVlOiBSZXNvbHZlZFZhbHVlO1xufVxuXG4vKipcbiAqIFByb3ZpZGVycyBldmFsdWF0b3IgdGhhdCBleHRlbmRzIHRoZSBuZ3RzYyBzdGF0aWMgaW50ZXJwcmV0ZXIuIFRoaXMgaXMgbmVjZXNzYXJ5IGJlY2F1c2VcbiAqIHRoZSBzdGF0aWMgaW50ZXJwcmV0ZXIgYnkgZGVmYXVsdCBvbmx5IGV4cG9zZXMgdGhlIHJlc29sdmVkIHZhbHVlLCBidXQgd2UgYXJlIGFsc28gaW50ZXJlc3RlZFxuICogaW4gdGhlIFR5cGVTY3JpcHQgbm9kZXMgdGhhdCBkZWNsYXJlIHByb3ZpZGVycy4gSXQgd291bGQgYmUgcG9zc2libGUgdG8gbWFudWFsbHkgdHJhdmVyc2UgdGhlXG4gKiBBU1QgdG8gY29sbGVjdCB0aGVzZSBub2RlcywgYnV0IHRoYXQgd291bGQgbWVhbiB0aGF0IHdlIG5lZWQgdG8gcmUtaW1wbGVtZW50IHRoZSBzdGF0aWNcbiAqIGludGVycHJldGVyIGluIG9yZGVyIHRvIGhhbmRsZSBhbGwgcG9zc2libGUgc2NlbmFyaW9zLiAoZS5nLiBzcHJlYWQgb3BlcmF0b3IsIGZ1bmN0aW9uIGNhbGxzLFxuICogY2FsbGVlIHNjb3BlKS4gVGhpcyBjYW4gYmUgYXZvaWRlZCBieSBzaW1wbHkgZXh0ZW5kaW5nIHRoZSBzdGF0aWMgaW50ZXJwcmV0ZXIgYW5kIGludGVyY2VwdGluZ1xuICogdGhlIFwidmlzaXRPYmplY3RMaXRlcmFsRXhwcmVzc2lvblwiIG1ldGhvZC5cbiAqL1xuZXhwb3J0IGNsYXNzIFByb3ZpZGVyc0V2YWx1YXRvciBleHRlbmRzIFN0YXRpY0ludGVycHJldGVyIHtcbiAgcHJpdmF0ZSBfcHJvdmlkZXJMaXRlcmFsczogUHJvdmlkZXJMaXRlcmFsW10gPSBbXTtcblxuICBvdmVycmlkZSB2aXNpdE9iamVjdExpdGVyYWxFeHByZXNzaW9uKG5vZGU6IHRzLk9iamVjdExpdGVyYWxFeHByZXNzaW9uLCBjb250ZXh0OiBhbnkpIHtcbiAgICBjb25zdCByZXNvbHZlZFZhbHVlID1cbiAgICAgICAgc3VwZXIudmlzaXRPYmplY3RMaXRlcmFsRXhwcmVzc2lvbihub2RlLCB7Li4uY29udGV4dCwgaW5zaWRlUHJvdmlkZXJEZWY6IHRydWV9KTtcbiAgICAvLyBkbyBub3QgY29sbGVjdCBuZXN0ZWQgb2JqZWN0IGxpdGVyYWxzLiBlLmcuIGEgcHJvdmlkZXIgY291bGQgdXNlIGFcbiAgICAvLyBzcHJlYWQgYXNzaWdubWVudCAod2hpY2ggcmVzb2x2ZXMgdG8gYW5vdGhlciBvYmplY3QgbGl0ZXJhbCkuIEluIHRoYXRcbiAgICAvLyBjYXNlIHRoZSByZWZlcmVuY2VkIG9iamVjdCBsaXRlcmFsIGlzIG5vdCBhIHByb3ZpZGVyIG9iamVjdCBsaXRlcmFsLlxuICAgIGlmICghY29udGV4dC5pbnNpZGVQcm92aWRlckRlZikge1xuICAgICAgdGhpcy5fcHJvdmlkZXJMaXRlcmFscy5wdXNoKHtub2RlLCByZXNvbHZlZFZhbHVlfSk7XG4gICAgfVxuICAgIHJldHVybiByZXNvbHZlZFZhbHVlO1xuICB9XG5cbiAgLyoqXG4gICAqIEV2YWx1YXRlcyB0aGUgZ2l2ZW4gZXhwcmVzc2lvbiBhbmQgcmV0dXJucyBpdHMgc3RhdGljYWxseSByZXNvbHZlZCB2YWx1ZVxuICAgKiBhbmQgYSBsaXN0IG9mIG9iamVjdCBsaXRlcmFscyB3aGljaCBkZWZpbmUgQW5ndWxhciBwcm92aWRlcnMuXG4gICAqL1xuICBldmFsdWF0ZShleHByOiB0cy5FeHByZXNzaW9uKSB7XG4gICAgdGhpcy5fcHJvdmlkZXJMaXRlcmFscyA9IFtdO1xuICAgIGNvbnN0IHJlc29sdmVkVmFsdWUgPSB0aGlzLnZpc2l0KGV4cHIsIHtcbiAgICAgIG9yaWdpbmF0aW5nRmlsZTogZXhwci5nZXRTb3VyY2VGaWxlKCksXG4gICAgICBhYnNvbHV0ZU1vZHVsZU5hbWU6IG51bGwsXG4gICAgICByZXNvbHV0aW9uQ29udGV4dDogZXhwci5nZXRTb3VyY2VGaWxlKCkuZmlsZU5hbWUsXG4gICAgICBzY29wZTogbmV3IE1hcCgpLFxuICAgICAgZm9yZWlnbkZ1bmN0aW9uUmVzb2x2ZXI6IGZvcndhcmRSZWZSZXNvbHZlclxuICAgIH0pO1xuICAgIHJldHVybiB7cmVzb2x2ZWRWYWx1ZSwgbGl0ZXJhbHM6IHRoaXMuX3Byb3ZpZGVyTGl0ZXJhbHN9O1xuICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmlkZXJzX2V2YWx1YXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL21pc3NpbmctaW5qZWN0YWJsZS9wcm92aWRlcnNfZXZhbHVhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7OztJQVdIOzs7OztPQUtHO0lBQ0gsU0FBZ0Isd0JBQXdCLENBQ3BDLDJCQUFzRixFQUN0RixJQUE4QixFQUFFLE9BQXVCO1FBTXpEOzs7Ozs7OztXQVFHO1FBQ0gsTUFBTSxrQkFBbUIsU0FBUSwyQkFBMkIsQ0FBQyxpQkFBaUI7WUFBOUU7O2dCQUNVLHNCQUFpQixHQUFzQixFQUFFLENBQUM7WUE2QnBELENBQUM7WUEzQlUsNEJBQTRCLENBQUMsSUFBZ0MsRUFBRSxPQUFZO2dCQUNsRixNQUFNLGFBQWEsR0FDZixLQUFLLENBQUMsNEJBQTRCLENBQUMsSUFBSSxrQ0FBTSxPQUFPLEtBQUUsaUJBQWlCLEVBQUUsSUFBSSxJQUFFLENBQUM7Z0JBQ3BGLHFFQUFxRTtnQkFDckUsd0VBQXdFO2dCQUN4RSx1RUFBdUU7Z0JBQ3ZFLElBQUksQ0FBQyxPQUFPLENBQUMsaUJBQWlCLEVBQUU7b0JBQzlCLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFBQyxJQUFJLEVBQUUsYUFBYSxFQUFDLENBQUMsQ0FBQztpQkFDcEQ7Z0JBQ0QsT0FBTyxhQUFhLENBQUM7WUFDdkIsQ0FBQztZQUVEOzs7ZUFHRztZQUNILFFBQVEsQ0FBQyxJQUFtQjtnQkFDMUIsSUFBSSxDQUFDLGlCQUFpQixHQUFHLEVBQUUsQ0FBQztnQkFDNUIsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUU7b0JBQ3JDLGVBQWUsRUFBRSxJQUFJLENBQUMsYUFBYSxFQUFFO29CQUNyQyxrQkFBa0IsRUFBRSxJQUFJO29CQUN4QixpQkFBaUIsRUFBRSxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUMsUUFBUTtvQkFDaEQsS0FBSyxFQUFFLElBQUksR0FBRyxFQUFFO29CQUNoQix1QkFBdUIsRUFBRSwyQkFBMkIsQ0FBQyxrQkFBa0I7aUJBQ3hFLENBQUMsQ0FBQztnQkFDSCxPQUFPLEVBQUMsYUFBYSxFQUFFLFFBQVEsRUFBRSxJQUFJLENBQUMsaUJBQWlCLEVBQUMsQ0FBQztZQUMzRCxDQUFDO1NBQ0Y7UUFFRCxPQUFPLElBQUksa0JBQWtCLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUM3RSxDQUFDO0lBbERELDREQWtEQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB0eXBlIHtSZXNvbHZlZFZhbHVlLCBUeXBlU2NyaXB0UmVmbGVjdGlvbkhvc3R9IGZyb20gJ0Bhbmd1bGFyL2NvbXBpbGVyLWNsaS9wcml2YXRlL21pZ3JhdGlvbnMnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFByb3ZpZGVyTGl0ZXJhbCB7XG4gIG5vZGU6IHRzLk9iamVjdExpdGVyYWxFeHByZXNzaW9uO1xuICByZXNvbHZlZFZhbHVlOiBSZXNvbHZlZFZhbHVlO1xufVxuXG4vKipcbiAqIEEgZmFjdG9yeSBmdW5jdGlvbiB0byBjcmVhdGUgYW4gZXZhbHVhdG9yIGZvciBwcm92aWRlcnMuIFRoaXMgaXMgcmVxdWlyZWQgdG8gYmUgYVxuICogZmFjdG9yeSBmdW5jdGlvbiBiZWNhdXNlIHRoZSB1bmRlcmx5aW5nIGNsYXNzIGV4dGVuZHMgYSBjbGFzcyB0aGF0IGlzIG9ubHkgYXZhaWxhYmxlXG4gKiBmcm9tIHdpdGhpbiBhIGR5bmFtaWNhbGx5IGltcG9ydGVkIG1vZHVsZSAoYEBhbmd1bGFyL2NvbXBpbGVyLWNsaS9wcml2YXRlL21pZ3JhdGlvbnNgKVxuICogYW5kIGlzIHRoZXJlZm9yZSBub3QgYXZhaWxhYmxlIGF0IG1vZHVsZSBldmFsdWF0aW9uIHRpbWUuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBjcmVhdGVQcm92aWRlcnNFdmFsdWF0b3IoXG4gICAgY29tcGlsZXJDbGlNaWdyYXRpb25zTW9kdWxlOiB0eXBlb2YgaW1wb3J0KCdAYW5ndWxhci9jb21waWxlci1jbGkvcHJpdmF0ZS9taWdyYXRpb25zJyksXG4gICAgaG9zdDogVHlwZVNjcmlwdFJlZmxlY3Rpb25Ib3N0LCBjaGVja2VyOiB0cy5UeXBlQ2hlY2tlcik6IHtcbiAgZXZhbHVhdGU6XG4gICAgICAoZXhwcjogdHMuRXhwcmVzc2lvbikgPT4ge1xuICAgICAgICByZXNvbHZlZFZhbHVlOiBSZXNvbHZlZFZhbHVlLCBsaXRlcmFsczogUHJvdmlkZXJMaXRlcmFsW11cbiAgICAgIH1cbn0ge1xuICAvKipcbiAgICogUHJvdmlkZXJzIGV2YWx1YXRvciB0aGF0IGV4dGVuZHMgdGhlIG5ndHNjIHN0YXRpYyBpbnRlcnByZXRlci4gVGhpcyBpcyBuZWNlc3NhcnkgYmVjYXVzZVxuICAgKiB0aGUgc3RhdGljIGludGVycHJldGVyIGJ5IGRlZmF1bHQgb25seSBleHBvc2VzIHRoZSByZXNvbHZlZCB2YWx1ZSwgYnV0IHdlIGFyZSBhbHNvIGludGVyZXN0ZWRcbiAgICogaW4gdGhlIFR5cGVTY3JpcHQgbm9kZXMgdGhhdCBkZWNsYXJlIHByb3ZpZGVycy4gSXQgd291bGQgYmUgcG9zc2libGUgdG8gbWFudWFsbHkgdHJhdmVyc2UgdGhlXG4gICAqIEFTVCB0byBjb2xsZWN0IHRoZXNlIG5vZGVzLCBidXQgdGhhdCB3b3VsZCBtZWFuIHRoYXQgd2UgbmVlZCB0byByZS1pbXBsZW1lbnQgdGhlIHN0YXRpY1xuICAgKiBpbnRlcnByZXRlciBpbiBvcmRlciB0byBoYW5kbGUgYWxsIHBvc3NpYmxlIHNjZW5hcmlvcy4gKGUuZy4gc3ByZWFkIG9wZXJhdG9yLCBmdW5jdGlvbiBjYWxscyxcbiAgICogY2FsbGVlIHNjb3BlKS4gVGhpcyBjYW4gYmUgYXZvaWRlZCBieSBzaW1wbHkgZXh0ZW5kaW5nIHRoZSBzdGF0aWMgaW50ZXJwcmV0ZXIgYW5kIGludGVyY2VwdGluZ1xuICAgKiB0aGUgXCJ2aXNpdE9iamVjdExpdGVyYWxFeHByZXNzaW9uXCIgbWV0aG9kLlxuICAgKi9cbiAgY2xhc3MgUHJvdmlkZXJzRXZhbHVhdG9yIGV4dGVuZHMgY29tcGlsZXJDbGlNaWdyYXRpb25zTW9kdWxlLlN0YXRpY0ludGVycHJldGVyIHtcbiAgICBwcml2YXRlIF9wcm92aWRlckxpdGVyYWxzOiBQcm92aWRlckxpdGVyYWxbXSA9IFtdO1xuXG4gICAgb3ZlcnJpZGUgdmlzaXRPYmplY3RMaXRlcmFsRXhwcmVzc2lvbihub2RlOiB0cy5PYmplY3RMaXRlcmFsRXhwcmVzc2lvbiwgY29udGV4dDogYW55KSB7XG4gICAgICBjb25zdCByZXNvbHZlZFZhbHVlID1cbiAgICAgICAgICBzdXBlci52aXNpdE9iamVjdExpdGVyYWxFeHByZXNzaW9uKG5vZGUsIHsuLi5jb250ZXh0LCBpbnNpZGVQcm92aWRlckRlZjogdHJ1ZX0pO1xuICAgICAgLy8gZG8gbm90IGNvbGxlY3QgbmVzdGVkIG9iamVjdCBsaXRlcmFscy4gZS5nLiBhIHByb3ZpZGVyIGNvdWxkIHVzZSBhXG4gICAgICAvLyBzcHJlYWQgYXNzaWdubWVudCAod2hpY2ggcmVzb2x2ZXMgdG8gYW5vdGhlciBvYmplY3QgbGl0ZXJhbCkuIEluIHRoYXRcbiAgICAgIC8vIGNhc2UgdGhlIHJlZmVyZW5jZWQgb2JqZWN0IGxpdGVyYWwgaXMgbm90IGEgcHJvdmlkZXIgb2JqZWN0IGxpdGVyYWwuXG4gICAgICBpZiAoIWNvbnRleHQuaW5zaWRlUHJvdmlkZXJEZWYpIHtcbiAgICAgICAgdGhpcy5fcHJvdmlkZXJMaXRlcmFscy5wdXNoKHtub2RlLCByZXNvbHZlZFZhbHVlfSk7XG4gICAgICB9XG4gICAgICByZXR1cm4gcmVzb2x2ZWRWYWx1ZTtcbiAgICB9XG5cbiAgICAvKipcbiAgICAgKiBFdmFsdWF0ZXMgdGhlIGdpdmVuIGV4cHJlc3Npb24gYW5kIHJldHVybnMgaXRzIHN0YXRpY2FsbHkgcmVzb2x2ZWQgdmFsdWVcbiAgICAgKiBhbmQgYSBsaXN0IG9mIG9iamVjdCBsaXRlcmFscyB3aGljaCBkZWZpbmUgQW5ndWxhciBwcm92aWRlcnMuXG4gICAgICovXG4gICAgZXZhbHVhdGUoZXhwcjogdHMuRXhwcmVzc2lvbikge1xuICAgICAgdGhpcy5fcHJvdmlkZXJMaXRlcmFscyA9IFtdO1xuICAgICAgY29uc3QgcmVzb2x2ZWRWYWx1ZSA9IHRoaXMudmlzaXQoZXhwciwge1xuICAgICAgICBvcmlnaW5hdGluZ0ZpbGU6IGV4cHIuZ2V0U291cmNlRmlsZSgpLFxuICAgICAgICBhYnNvbHV0ZU1vZHVsZU5hbWU6IG51bGwsXG4gICAgICAgIHJlc29sdXRpb25Db250ZXh0OiBleHByLmdldFNvdXJjZUZpbGUoKS5maWxlTmFtZSxcbiAgICAgICAgc2NvcGU6IG5ldyBNYXAoKSxcbiAgICAgICAgZm9yZWlnbkZ1bmN0aW9uUmVzb2x2ZXI6IGNvbXBpbGVyQ2xpTWlncmF0aW9uc01vZHVsZS5mb3J3YXJkUmVmUmVzb2x2ZXJcbiAgICAgIH0pO1xuICAgICAgcmV0dXJuIHtyZXNvbHZlZFZhbHVlLCBsaXRlcmFsczogdGhpcy5fcHJvdmlkZXJMaXRlcmFsc307XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIG5ldyBQcm92aWRlcnNFdmFsdWF0b3IoaG9zdCwgY2hlY2tlciwgLyogZGVwZW5kZW5jeVRyYWNrZXIgKi8gbnVsbCk7XG59XG4iXX0=

package/schematics/migrations/missing-injectable/transform.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <amd-module name="@angular/core/schematics/migrations/missing-injectable/transform" />
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { ResolvedDirective, ResolvedNgModule } from './definition_collector';
 import { UpdateRecorder } from './update_recorder';
 export interface AnalysisFailure {
@@ -16,6 +16,7 @@ export interface AnalysisFailure {
 export declare class MissingInjectableTransform {
     private typeChecker;
     private getUpdateRecorder;
+    private compilerCliMigrationsModule;
     private printer;
     private importManager;
     private providersEvaluator;
@@ -23,7 +24,7 @@ export declare class MissingInjectableTransform {
     private visitedProviderClasses;
     /** Set of provider object literals which were already checked or migrated. */
     private visitedProviderLiterals;
-    constructor(typeChecker: ts.TypeChecker, getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder);
+    constructor(typeChecker: ts.TypeChecker, getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder, compilerCliMigrationsModule: typeof import('@angular/compiler-cli/private/migrations'));
     recordChanges(): void;
     /**
      * Migrates all specified NgModule's by walking through referenced providers