@angular/material 8.0.1 → 8.1.2

package/schematics/ng-update/upgrade-rules/misc-checks/misc-property-names-rule.js

@@ -0,0 +1,46 @@
+"use strict";
+/**
+ * @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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const schematics_1 = require("@angular/cdk/schematics");
+const ts = require("typescript");
+/**
+ * Rule that walks through every property access expression and and reports a failure if
+ * a given property name no longer exists but cannot be automatically migrated.
+ */
+class MiscPropertyNamesRule extends schematics_1.MigrationRule {
+    constructor() {
+        super(...arguments);
+        // Only enable this rule if the migration targets version 6. The rule
+        // currently only includes migrations for V6 deprecations.
+        this.ruleEnabled = this.targetVersion === schematics_1.TargetVersion.V6;
+    }
+    visitNode(node) {
+        if (ts.isPropertyAccessExpression(node)) {
+            this._visitPropertyAccessExpression(node);
+        }
+    }
+    _visitPropertyAccessExpression(node) {
+        const hostType = this.typeChecker.getTypeAtLocation(node.expression);
+        const typeName = hostType && hostType.symbol && hostType.symbol.getName();
+        // Migration for: https://github.com/angular/components/pull/10398 (v6)
+        if (typeName === 'MatListOption' && node.name.text === 'selectionChange') {
+            this.createFailureAtNode(node, `Found deprecated property "selectionChange" of ` +
+                `class "MatListOption". Use the "selectionChange" property on the ` +
+                `parent "MatSelectionList" instead.`);
+        }
+        // Migration for: https://github.com/angular/components/pull/10413 (v6)
+        if (typeName === 'MatDatepicker' && node.name.text === 'selectedChanged') {
+            this.createFailureAtNode(node, `Found deprecated property "selectedChanged" of ` +
+                `class "MatDatepicker". Use the "dateChange" or "dateInput" methods ` +
+                `on "MatDatepickerInput" instead.`);
+        }
+    }
+}
+exports.MiscPropertyNamesRule = MiscPropertyNamesRule;
+//# sourceMappingURL=misc-property-names-rule.js.map

package/schematics/ng-update/upgrade-rules/misc-checks/misc-property-names-rule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"misc-property-names-rule.js","sourceRoot":"","sources":["../../../../../../../src/material/schematics/ng-update/upgrade-rules/misc-checks/misc-property-names-rule.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAEH,wDAAqE;AACrE,iCAAiC;AAEjC;;;GAGG;AACH,MAAa,qBAAsB,SAAQ,0BAAmB;IAA9D;;QAEE,qEAAqE;QACrE,0DAA0D;QAC1D,gBAAW,GAAG,IAAI,CAAC,aAAa,KAAK,0BAAa,CAAC,EAAE,CAAC;IA8BxD,CAAC;IA5BC,SAAS,CAAC,IAAa;QACrB,IAAI,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,EAAE;YACvC,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC;SAC3C;IACH,CAAC;IAEO,8BAA8B,CAAC,IAAiC;QACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACrE,MAAM,QAAQ,GAAG,QAAQ,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAE1E,uEAAuE;QACvE,IAAI,QAAQ,KAAK,eAAe,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE;YACxE,IAAI,CAAC,mBAAmB,CACpB,IAAI,EACJ,iDAAiD;gBAC7C,mEAAmE;gBACnE,oCAAoC,CAAC,CAAC;SAC/C;QAED,uEAAuE;QACvE,IAAI,QAAQ,KAAK,eAAe,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE;YACxE,IAAI,CAAC,mBAAmB,CACpB,IAAI,EACJ,iDAAiD;gBAC7C,qEAAqE;gBACrE,kCAAkC,CAAC,CAAC;SAC7C;IACH,CAAC;CACF;AAlCD,sDAkCC"}

package/schematics/ng-update/upgrade-rules/misc-checks/misc-template-rule.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @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
+ */
+import { MigrationRule, ResolvedResource } from '@angular/cdk/schematics';
+/**
+ * Rule that walks through every inline or external template and reports if there
+ * are outdated usages of the Angular Material API that needs to be updated manually.
+ */
+export declare class MiscTemplateRule extends MigrationRule<null> {
+    ruleEnabled: boolean;
+    visitTemplate(template: ResolvedResource): void;
+}

package/schematics/ng-update/upgrade-rules/misc-checks/misc-template-rule.js

@@ -0,0 +1,59 @@
+"use strict";
+/**
+ * @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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const schematics_1 = require("@angular/cdk/schematics");
+/**
+ * Rule that walks through every inline or external template and reports if there
+ * are outdated usages of the Angular Material API that needs to be updated manually.
+ */
+class MiscTemplateRule extends schematics_1.MigrationRule {
+    constructor() {
+        super(...arguments);
+        // Only enable this rule if the migration targets version 6. The rule
+        // currently only includes migrations for V6 deprecations.
+        this.ruleEnabled = this.targetVersion === schematics_1.TargetVersion.V6;
+    }
+    visitTemplate(template) {
+        // Migration for: https://github.com/angular/components/pull/10398 (v6)
+        schematics_1.findOutputsOnElementWithTag(template.content, 'selectionChange', [
+            'mat-list-option'
+        ]).forEach(offset => {
+            this.failures.push({
+                filePath: template.filePath,
+                position: template.getCharacterAndLineOfPosition(template.start + offset),
+                message: `Found deprecated "selectionChange" output binding on "mat-list-option". ` +
+                    `Use "selectionChange" on "mat-selection-list" instead.`
+            });
+        });
+        // Migration for: https://github.com/angular/components/pull/10413 (v6)
+        schematics_1.findOutputsOnElementWithTag(template.content, 'selectedChanged', [
+            'mat-datepicker'
+        ]).forEach(offset => {
+            this.failures.push({
+                filePath: template.filePath,
+                position: template.getCharacterAndLineOfPosition(template.start + offset),
+                message: `Found deprecated "selectedChanged" output binding on "mat-datepicker". ` +
+                    `Use "dateChange" or "dateInput" on "<input [matDatepicker]>" instead.`
+            });
+        });
+        // Migration for: https://github.com/angular/components/commit/f0bf6e7 (v6)
+        schematics_1.findInputsOnElementWithTag(template.content, 'selected', [
+            'mat-button-toggle-group'
+        ]).forEach(offset => {
+            this.failures.push({
+                filePath: template.filePath,
+                position: template.getCharacterAndLineOfPosition(template.start + offset),
+                message: `Found deprecated "selected" input binding on "mat-radio-button-group". ` +
+                    `Use "value" instead.`
+            });
+        });
+    }
+}
+exports.MiscTemplateRule = MiscTemplateRule;
+//# sourceMappingURL=misc-template-rule.js.map

package/schematics/ng-update/upgrade-rules/misc-checks/misc-template-rule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"misc-template-rule.js","sourceRoot":"","sources":["../../../../../../../src/material/schematics/ng-update/upgrade-rules/misc-checks/misc-template-rule.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAEH,wDAMiC;AAEjC;;;GAGG;AACH,MAAa,gBAAiB,SAAQ,0BAAmB;IAAzD;;QAEE,qEAAqE;QACrE,0DAA0D;QAC1D,gBAAW,GAAG,IAAI,CAAC,aAAa,KAAK,0BAAa,CAAC,EAAE,CAAC;IAwCxD,CAAC;IAtCC,aAAa,CAAC,QAA0B;QAEtC,uEAAuE;QACvE,wCAA2B,CAAC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,EAAE;YAC/D,iBAAiB;SAClB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACjB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,QAAQ,CAAC,6BAA6B,CAAC,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC;gBACzE,OAAO,EAAE,0EAA0E;oBAC/E,wDAAwD;aAC7D,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,uEAAuE;QACvE,wCAA2B,CAAC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,EAAE;YAC/D,gBAAgB;SACjB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACjB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,QAAQ,CAAC,6BAA6B,CAAC,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC;gBACzE,OAAO,EAAE,yEAAyE;oBAC9E,uEAAuE;aAC5E,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,2EAA2E;QAC3E,uCAA0B,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE;YACvD,yBAAyB;SAC1B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACjB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,QAAQ,CAAC,6BAA6B,CAAC,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC;gBACzE,OAAO,EAAE,yEAAyE;oBAC9E,sBAAsB;aAC3B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA5CD,4CA4CC"}

package/schematics/ng-update/upgrade-rules/misc-ripples-v7/{rippleSpeedFactorAssignmentRule.d.ts → ripple-speed-factor-rule.d.ts}

@@ -5,22 +5,24 @@
  * 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
  */
-import { ProgramAwareRuleWalker, RuleFailure, Rules } from 'tslint';
+import { MigrationRule, ResolvedResource } from '@angular/cdk/schematics';
 import * as ts from 'typescript';
 /**
  * Rule that walks through every property assignment and switches the global `baseSpeedFactor`
  * ripple option to the new global animation config. Also updates every class member assignment
  * that refers to MatRipple#speedFactor.
  */
-export declare class Rule extends Rules.TypedRule {
-    applyWithProgram(sourceFile: ts.SourceFile, program: ts.Program): RuleFailure[];
-}
-export declare class Walker extends ProgramAwareRuleWalker {
+export declare class RippleSpeedFactorRule extends MigrationRule<null> {
+    ruleEnabled: boolean;
+    visitNode(node: ts.Node): void;
+    visitTemplate(template: ResolvedResource): void;
     /** Switches binary expressions (e.g. myRipple.speedFactor = 0.5) to the new animation config. */
-    visitBinaryExpression(expression: ts.BinaryExpression): void;
+    private _visitBinaryExpression;
     /**
-     * Switches a potential global option `baseSpeedFactor` to the new animation config. For this
-     * we assume that the `baseSpeedFactor` is not used in combination with individual speed factors.
+     * Switches the global option `baseSpeedFactor` to the new animation config. For this
+     * we assume that the `baseSpeedFactor` is not used in combination with individual
+     * speed factors.
      */
-    visitPropertyAssignment(assignment: ts.PropertyAssignment): void;
+    private _visitPropertyAssignment;
+    private _replaceText;
 }

package/schematics/ng-update/upgrade-rules/misc-ripples-v7/{rippleSpeedFactorAssignmentRule.js → ripple-speed-factor-rule.js}

@@ -7,10 +7,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk_1 = require("chalk");
-const tslint_1 = require("tslint");
+const schematics_1 = require("@angular/cdk/schematics");
 const ts = require("typescript");
 const ripple_speed_factor_1 = require("./ripple-speed-factor");
+/** Regular expression that matches [matRippleSpeedFactor]="$NUMBER" in templates. */
+const speedFactorNumberRegex = /\[matRippleSpeedFactor]="(\d+(?:\.\d+)?)"/g;
+/** Regular expression that matches [matRippleSpeedFactor]="$NOT_A_NUMBER" in templates. */
+const speedFactorNotParseable = /\[matRippleSpeedFactor]="(?!\d+(?:\.\d+)?")(.*)"/g;
 /**
  * Note that will be added whenever a speed factor expression has been converted to calculate
  * the according duration. This note should encourage people to clean up their code by switching
@@ -22,35 +25,54 @@ const removeNote = `TODO: Cleanup duration calculation.`;
  * ripple option to the new global animation config. Also updates every class member assignment
  * that refers to MatRipple#speedFactor.
  */
-class Rule extends tslint_1.Rules.TypedRule {
-    applyWithProgram(sourceFile, program) {
-        return this.applyWithWalker(new Walker(sourceFile, this.getOptions(), program));
+class RippleSpeedFactorRule extends schematics_1.MigrationRule {
+    constructor() {
+        super(...arguments);
+        // Only enable this rule if the migration targets version 7 as the ripple
+        // speed factor has been removed in that version.
+        this.ruleEnabled = this.targetVersion === schematics_1.TargetVersion.V7;
+    }
+    visitNode(node) {
+        if (ts.isBinaryExpression(node)) {
+            this._visitBinaryExpression(node);
+        }
+        else if (ts.isPropertyAssignment(node)) {
+            this._visitPropertyAssignment(node);
+        }
+    }
+    visitTemplate(template) {
+        let match;
+        while ((match = speedFactorNumberRegex.exec(template.content)) !== null) {
+            const newEnterDuration = ripple_speed_factor_1.convertSpeedFactorToDuration(parseFloat(match[1]));
+            this._replaceText(template.filePath, template.start + match.index, match[0].length, `[matRippleAnimation]="{enterDuration: ${newEnterDuration}}"`);
+        }
+        while ((match = speedFactorNotParseable.exec(template.content)) !== null) {
+            const newDurationExpression = ripple_speed_factor_1.createSpeedFactorConvertExpression(match[1]);
+            this._replaceText(template.filePath, template.start + match.index, match[0].length, `[matRippleAnimation]="{enterDuration: (${newDurationExpression})}"`);
+        }
     }
-}
-exports.Rule = Rule;
-class Walker extends tslint_1.ProgramAwareRuleWalker {
     /** Switches binary expressions (e.g. myRipple.speedFactor = 0.5) to the new animation config. */
-    visitBinaryExpression(expression) {
+    _visitBinaryExpression(expression) {
         if (!ts.isPropertyAccessExpression(expression.left)) {
             return;
         }
         // Left side expression consists of target object and property name (e.g. myInstance.val)
         const leftExpression = expression.left;
-        const targetTypeNode = this.getTypeChecker().getTypeAtLocation(leftExpression.expression);
+        const targetTypeNode = this.typeChecker.getTypeAtLocation(leftExpression.expression);
         if (!targetTypeNode.symbol) {
             return;
         }
         const targetTypeName = targetTypeNode.symbol.getName();
         const propertyName = leftExpression.name.getText();
+        const filePath = leftExpression.getSourceFile().fileName;
         if (targetTypeName === 'MatRipple' && propertyName === 'speedFactor') {
             if (ts.isNumericLiteral(expression.right)) {
                 const numericValue = parseFloat(expression.right.text);
                 const newEnterDurationValue = ripple_speed_factor_1.convertSpeedFactorToDuration(numericValue);
                 // Replace the `speedFactor` property name with `animation`.
-                const propertyNameReplacement = this.createReplacement(leftExpression.name.getStart(), leftExpression.name.getWidth(), 'animation');
+                this._replaceText(filePath, leftExpression.name.getStart(), leftExpression.name.getWidth(), 'animation');
                 // Replace the value assignment with the new animation config.
-                const rightExpressionReplacement = this.createReplacement(expression.right.getStart(), expression.right.getWidth(), `{enterDuration: ${newEnterDurationValue}}`);
-                this.addFailureAtNode(expression, `Found deprecated variable assignment for "${chalk_1.bold('MatRipple')}#${chalk_1.red('speedFactor')}"`, [propertyNameReplacement, rightExpressionReplacement]);
+                this._replaceText(filePath, expression.right.getStart(), expression.right.getWidth(), `{enterDuration: ${newEnterDurationValue}}`);
             }
             else {
                 // Handle the right expression differently if the previous speed factor value can't
@@ -58,21 +80,21 @@ class Walker extends tslint_1.ProgramAwareRuleWalker {
                 // calculates the explicit duration based on the non-static speed factor expression.
                 const newExpression = ripple_speed_factor_1.createSpeedFactorConvertExpression(expression.right.getText());
                 // Replace the `speedFactor` property name with `animation`.
-                const propertyNameReplacement = this.createReplacement(leftExpression.name.getStart(), leftExpression.name.getWidth(), 'animation');
+                this._replaceText(filePath, leftExpression.name.getStart(), leftExpression.name.getWidth(), 'animation');
                 // Replace the value assignment with the new animation config and remove TODO.
-                const rightExpressionReplacement = this.createReplacement(expression.right.getStart(), expression.right.getWidth(), `/** ${removeNote} */ {enterDuration: ${newExpression}}`);
-                this.addFailureAtNode(expression, `Found deprecated variable assignment for "${chalk_1.bold('MatRipple')}#${chalk_1.red('speedFactor')}"`, [propertyNameReplacement, rightExpressionReplacement]);
+                this._replaceText(filePath, expression.right.getStart(), expression.right.getWidth(), `/** ${removeNote} */ {enterDuration: ${newExpression}}`);
             }
         }
     }
     /**
-     * Switches a potential global option `baseSpeedFactor` to the new animation config. For this
-     * we assume that the `baseSpeedFactor` is not used in combination with individual speed factors.
+     * Switches the global option `baseSpeedFactor` to the new animation config. For this
+     * we assume that the `baseSpeedFactor` is not used in combination with individual
+     * speed factors.
      */
-    visitPropertyAssignment(assignment) {
+    _visitPropertyAssignment(assignment) {
         // For switching the `baseSpeedFactor` global option we expect the property assignment
-        // to be inside of a normal object literal. Custom ripple global options cannot be switched
-        // automatically.
+        // to be inside of a normal object literal. Custom ripple global options cannot be
+        // witched automatically.
         if (!ts.isObjectLiteralExpression(assignment.parent)) {
             return;
         }
@@ -85,13 +107,14 @@ class Walker extends tslint_1.ProgramAwareRuleWalker {
         // immediately in the provider object (e.g. it can happen that someone just imports the
         // config from a separate file).
         const { initializer, name } = assignment;
+        const filePath = assignment.getSourceFile().fileName;
         if (ts.isNumericLiteral(initializer)) {
             const numericValue = parseFloat(initializer.text);
             const newEnterDurationValue = ripple_speed_factor_1.convertSpeedFactorToDuration(numericValue);
-            const keyNameReplacement = this.createReplacement(name.getStart(), assignment.name.getWidth(), `animation`);
-            const initializerReplacement = this.createReplacement(initializer.getStart(), initializer.getWidth(), `{enterDuration: ${newEnterDurationValue}}`);
-            this.addFailureAtNode(assignment, `Found deprecated property assignment for "${chalk_1.bold('MAT_RIPPLE_GLOBAL_OPTIONS')}:` +
-                `${chalk_1.red('baseSpeedFactor')}"`, [keyNameReplacement, initializerReplacement]);
+            // Replace the `baseSpeedFactor` property name with `animation`.
+            this._replaceText(filePath, name.getStart(), name.getWidth(), 'animation');
+            // Replace the value assignment initializer with the new animation config.
+            this._replaceText(filePath, initializer.getStart(), initializer.getWidth(), `{enterDuration: ${newEnterDurationValue}}`);
         }
         else {
             // Handle the right expression differently if the previous speed factor value can't
@@ -99,13 +122,16 @@ class Walker extends tslint_1.ProgramAwareRuleWalker {
             // calculates the explicit duration based on the non-static speed factor expression.
             const newExpression = ripple_speed_factor_1.createSpeedFactorConvertExpression(initializer.getText());
             // Replace the `baseSpeedFactor` property name with `animation`.
-            const propertyNameReplacement = this.createReplacement(name.getStart(), name.getWidth(), 'animation');
+            this._replaceText(filePath, name.getStart(), name.getWidth(), 'animation');
             // Replace the value assignment with the new animation config and remove TODO.
-            const rightExpressionReplacement = this.createReplacement(initializer.getStart(), initializer.getWidth(), `/** ${removeNote} */ {enterDuration: ${newExpression}}`);
-            this.addFailureAtNode(assignment, `Found a deprecated property assignment for "${chalk_1.bold('MAT_RIPPLE_GLOBAL_OPTIONS')}:` +
-                `${chalk_1.red('baseSpeedFactor')}.`, [propertyNameReplacement, rightExpressionReplacement]);
+            this._replaceText(filePath, initializer.getStart(), initializer.getWidth(), `/** ${removeNote} */ {enterDuration: ${newExpression}}`);
         }
     }
+    _replaceText(filePath, start, width, newText) {
+        const recorder = this.getUpdateRecorder(filePath);
+        recorder.remove(start, width);
+        recorder.insertRight(start, newText);
+    }
 }
-exports.Walker = Walker;
-//# sourceMappingURL=rippleSpeedFactorAssignmentRule.js.map
+exports.RippleSpeedFactorRule = RippleSpeedFactorRule;
+//# sourceMappingURL=ripple-speed-factor-rule.js.map

package/schematics/ng-update/upgrade-rules/misc-ripples-v7/ripple-speed-factor-rule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ripple-speed-factor-rule.js","sourceRoot":"","sources":["../../../../../../../src/material/schematics/ng-update/upgrade-rules/misc-ripples-v7/ripple-speed-factor-rule.ts"],"names":[],"mappings":"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"}

package/schematics/ng-update/upgrade-rules/package-imports-v8/secondary-entry-points-rule.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
+ */
+import { MigrationRule } from '@angular/cdk/schematics';
+import * as ts from 'typescript';
+/**
+ * A migration rule that updates imports which refer to the primary Angular Material
+ * entry-point to use the appropriate secondary entry points (e.g. @angular/material/button).
+ */
+export declare class SecondaryEntryPointsRule extends MigrationRule<null> {
+    printer: ts.Printer;
+    ruleEnabled: boolean;
+    visitNode(declaration: ts.Node): void;
+}

package/schematics/ng-update/upgrade-rules/package-imports-v8/{updateAngularMaterialImportsRule.js → secondary-entry-points-rule.js}

@@ -7,53 +7,31 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const Lint = require("tslint");
+const schematics_1 = require("@angular/cdk/schematics");
 const ts = require("typescript");
 const module_specifiers_1 = require("../../../ng-update/typescript/module-specifiers");
+const ONLY_SUBPACKAGE_FAILURE_STR = `Importing from "@angular/material" is deprecated. ` +
+    `Instead import from the entry-point the symbol belongs to.`;
+const NO_IMPORT_NAMED_SYMBOLS_FAILURE_STR = `Imports from Angular Material should import ` +
+    `specific symbols rather than importing the entire library.`;
 /**
  * Regex for testing file paths against to determine if the file is from the
  * Angular Material library.
  */
 const ANGULAR_MATERIAL_FILEPATH_REGEX = new RegExp(`${module_specifiers_1.materialModuleSpecifier}/(.*?)/`);
 /**
- * A TSLint rule correcting symbols imports to using Angular Material
- * subpackages (e.g. @angular/material/button) rather than the top level
- * package (e.g. @angular/material).
+ * A migration rule that updates imports which refer to the primary Angular Material
+ * entry-point to use the appropriate secondary entry points (e.g. @angular/material/button).
  */
-class Rule extends Lint.Rules.TypedRule {
-    applyWithProgram(sourceFile, program) {
-        return this.applyWithFunction(sourceFile, walk, true, program.getTypeChecker());
+class SecondaryEntryPointsRule extends schematics_1.MigrationRule {
+    constructor() {
+        super(...arguments);
+        this.printer = ts.createPrinter();
+        // Only enable this rule if the migration targets version 8. The primary
+        // entry-point of Material has been marked as deprecated in version 8.
+        this.ruleEnabled = this.targetVersion === schematics_1.TargetVersion.V8;
     }
-}
-Rule.metadata = {
-    ruleName: 'update-angular-material-imports',
-    description: Lint.Utils.dedent `
-        Require all imports for Angular Material to be done via
-        @angular/material subpackages`,
-    options: null,
-    optionsDescription: '',
-    type: 'functionality',
-    typescriptOnly: true,
-};
-Rule.ONLY_SUBPACKAGE_FAILURE_STR = Lint.Utils.dedent `
-      Importing from @angular/material is deprecated. Instead import from
-      subpackage the symbol belongs to. e.g. import {MatButtonModule} from
-      '@angular/material/button'`;
-Rule.NO_IMPORT_NAMED_SYMBOLS_FAILURE_STR = Lint.Utils.dedent `
-      Imports from Angular Material should import specific symbols rather than
-      importing the entire Angular Material library.`;
-Rule.SYMBOL_NOT_FOUND_FAILURE_STR = ` was not found in the Material library.`;
-Rule.SYMBOL_FILE_NOT_FOUND_FAILURE_STR = ` was found to be imported from a file outside the Material library.`;
-exports.Rule = Rule;
-/**
- * A walker to walk a given source file to check for imports from the
- * "@angular/material" module.
- */
-function walk(ctx, checker) {
-    // The source file to walk.
-    const sf = ctx.sourceFile;
-    const printer = ts.createPrinter();
-    const cb = (declaration) => {
+    visitNode(declaration) {
         // Only look at import declarations.
         if (!ts.isImportDeclaration(declaration) ||
             !ts.isStringLiteralLike(declaration.moduleSpecifier)) {
@@ -67,17 +45,20 @@ function walk(ctx, checker) {
         // If no import clause is found, or nothing is named as a binding in the
         // import, add failure saying to import symbols in clause.
         if (!declaration.importClause || !declaration.importClause.namedBindings) {
-            return ctx.addFailureAtNode(declaration, Rule.NO_IMPORT_NAMED_SYMBOLS_FAILURE_STR);
+            this.createFailureAtNode(declaration, NO_IMPORT_NAMED_SYMBOLS_FAILURE_STR);
+            return;
         }
         // All named bindings in import clauses must be named symbols, otherwise add
         // failure saying to import symbols in clause.
         if (!ts.isNamedImports(declaration.importClause.namedBindings)) {
-            return ctx.addFailureAtNode(declaration, Rule.NO_IMPORT_NAMED_SYMBOLS_FAILURE_STR);
+            this.createFailureAtNode(declaration, NO_IMPORT_NAMED_SYMBOLS_FAILURE_STR);
+            return;
         }
         // If no symbols are in the named bindings then add failure saying to
         // import symbols in clause.
         if (!declaration.importClause.namedBindings.elements.length) {
-            return ctx.addFailureAtNode(declaration, Rule.NO_IMPORT_NAMED_SYMBOLS_FAILURE_STR);
+            this.createFailureAtNode(declaration, NO_IMPORT_NAMED_SYMBOLS_FAILURE_STR);
+            return;
         }
         // Whether the existing import declaration is using a single quote module specifier.
         const singleQuoteImport = declaration.moduleSpecifier.getText()[0] === `'`;
@@ -91,11 +72,13 @@ function walk(ctx, checker) {
             // value declaration based on the type of the element as types are not necessarily
             // specific to a given secondary entry-point (e.g. exports with the type of "string")
             // would resolve to the module types provided by TypeScript itself.
-            const symbol = getDeclarationSymbolOfNode(elementName, checker);
+            const symbol = getDeclarationSymbolOfNode(elementName, this.typeChecker);
             // If the symbol can't be found, or no declaration could be found within
             // the symbol, add failure to report that the given symbol can't be found.
-            if (!symbol || (!symbol.valueDeclaration && symbol.declarations.length === 0)) {
-                return ctx.addFailureAtNode(element, element.getText() + Rule.SYMBOL_NOT_FOUND_FAILURE_STR);
+            if (!symbol ||
+                !(symbol.valueDeclaration || (symbol.declarations && symbol.declarations.length !== 0))) {
+                this.createFailureAtNode(element, `"${element.getText()}" was not found in the Material library.`);
+                return;
             }
             // The filename for the source file of the node that contains the
             // first declaration of the symbol. All symbol declarations must be
@@ -107,7 +90,9 @@ function walk(ctx, checker) {
             // elements are analyzed.
             const matches = sourceFile.match(ANGULAR_MATERIAL_FILEPATH_REGEX);
             if (!matches) {
-                return ctx.addFailureAtNode(element, element.getText() + Rule.SYMBOL_FILE_NOT_FOUND_FAILURE_STR);
+                this.createFailureAtNode(element, `"${element.getText()}" was found to be imported ` +
+                    `from a file outside the Material library.`);
+                return;
             }
             const [, moduleName] = matches;
             // The module name where the symbol is defined e.g. card, dialog. The
@@ -127,21 +112,24 @@ function walk(ctx, checker) {
             .sort()
             .map(([name, elements]) => {
             const newImport = ts.createImportDeclaration(undefined, undefined, ts.createImportClause(undefined, ts.createNamedImports(elements)), createStringLiteral(`${module_specifiers_1.materialModuleSpecifier}/${name}`, singleQuoteImport));
-            return printer.printNode(ts.EmitHint.Unspecified, newImport, sf);
+            return this.printer.printNode(ts.EmitHint.Unspecified, newImport, declaration.getSourceFile());
         })
             .join('\n');
         // Without any import statements that were generated, we can assume that this was an empty
         // import declaration. We still want to add a failure in order to make developers aware that
         // importing from "@angular/material" is deprecated.
         if (!newImportStatements) {
-            return ctx.addFailureAtNode(declaration.moduleSpecifier, Rule.ONLY_SUBPACKAGE_FAILURE_STR);
+            this.createFailureAtNode(declaration.moduleSpecifier, ONLY_SUBPACKAGE_FAILURE_STR);
+            return;
         }
-        // Mark the lint failure at the module specifier, providing the replacement that switches
-        // the import to individual secondary entry-point imports.
-        ctx.addFailureAtNode(declaration.moduleSpecifier, Rule.ONLY_SUBPACKAGE_FAILURE_STR, new Lint.Replacement(declaration.getStart(), declaration.getWidth(), newImportStatements));
-    };
-    sf.statements.forEach(cb);
+        const recorder = this.getUpdateRecorder(declaration.moduleSpecifier.getSourceFile().fileName);
+        // Perform the replacement that switches the primary entry-point import to
+        // the individual secondary entry-point imports.
+        recorder.remove(declaration.getStart(), declaration.getWidth());
+        recorder.insertRight(declaration.getStart(), newImportStatements);
+    }
 }
+exports.SecondaryEntryPointsRule = SecondaryEntryPointsRule;
 /**
  * Creates a string literal from the specified text.
  * @param text Text of the string literal.
@@ -164,4 +152,4 @@ function getDeclarationSymbolOfNode(node, checker) {
     }
     return symbol;
 }
-//# sourceMappingURL=updateAngularMaterialImportsRule.js.map
+//# sourceMappingURL=secondary-entry-points-rule.js.map

package/schematics/ng-update/upgrade-rules/package-imports-v8/secondary-entry-points-rule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"secondary-entry-points-rule.js","sourceRoot":"","sources":["../../../../../../../src/material/schematics/ng-update/upgrade-rules/package-imports-v8/secondary-entry-points-rule.ts"],"names":[],"mappings":"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"}