Add test case; fix NodeJS version target circular dependency; Support for rule version constraints

devversion · devversion · commit 1d8e392d3faa · 2018-09-19T14:14:15.000+02:00
diff --git a/src/lib/schematics/update/index.ts b/src/lib/schematics/update/index.ts
@@ -7,14 +7,9 @@
  */
 
 import {Rule} from '@angular-devkit/schematics';
+import {TargetVersion} from './target-version';
 import {createUpdateRule} from './update';
 
-/** Possible versions that can be automatically migrated by `ng update`. */
-export enum TargetVersion {
-  V6,
-  V7,
-}
-
 /** Entry point for the migration schematics with target of Angular Material 6.0.0 */
 export function updateToV6(): Rule {
   return createUpdateRule(TargetVersion.V6);
diff --git a/src/lib/schematics/update/material/data/attribute-selectors.ts b/src/lib/schematics/update/material/data/attribute-selectors.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {TargetVersion} from '../../target-version';
 import {VersionChanges} from '../transform-change-data';
-import {TargetVersion} from '../../index';
 
 export interface MaterialAttributeSelectorData {
   /** The attribute name to replace. */
diff --git a/src/lib/schematics/update/material/data/class-names.ts b/src/lib/schematics/update/material/data/class-names.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TargetVersion} from '../../index';
+import {TargetVersion} from '../../target-version';
 import {VersionChanges} from '../transform-change-data';
 
 export interface MaterialClassNameData {
diff --git a/src/lib/schematics/update/material/data/constructor-checks.ts b/src/lib/schematics/update/material/data/constructor-checks.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TargetVersion} from '../../index';
+import {TargetVersion} from '../../target-version';
 import {VersionChanges} from '../transform-change-data';
 
 /**
diff --git a/src/lib/schematics/update/material/data/css-selectors.ts b/src/lib/schematics/update/material/data/css-selectors.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TargetVersion} from '../../index';
+import {TargetVersion} from '../../target-version';
 import {VersionChanges} from '../transform-change-data';
 
 export interface MaterialCssSelectorData {
diff --git a/src/lib/schematics/update/material/data/element-selectors.ts b/src/lib/schematics/update/material/data/element-selectors.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TargetVersion} from '../../index';
+import {TargetVersion} from '../../target-version';
 import {VersionChanges} from '../transform-change-data';
 
 export interface MaterialElementSelectorData {
diff --git a/src/lib/schematics/update/material/data/input-names.ts b/src/lib/schematics/update/material/data/input-names.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TargetVersion} from '../../index';
+import {TargetVersion} from '../../target-version';
 import {VersionChanges} from '../transform-change-data';
 
 export interface MaterialInputNameData {
diff --git a/src/lib/schematics/update/material/data/method-call-checks.ts b/src/lib/schematics/update/material/data/method-call-checks.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TargetVersion} from '../../index';
+import {TargetVersion} from '../../target-version';
 import {VersionChanges} from '../transform-change-data';
 
 export interface MaterialMethodCallData {
diff --git a/src/lib/schematics/update/material/data/output-names.ts b/src/lib/schematics/update/material/data/output-names.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TargetVersion} from '../../index';
+import {TargetVersion} from '../../target-version';
 import {VersionChanges} from '../transform-change-data';
 
 export interface MaterialOutputNameData {
diff --git a/src/lib/schematics/update/material/data/property-names.ts b/src/lib/schematics/update/material/data/property-names.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TargetVersion} from '../../index';
+import {TargetVersion} from '../../target-version';
 import {VersionChanges} from '../transform-change-data';
 
 export interface MaterialPropertyNameData {
diff --git a/src/lib/schematics/update/material/transform-change-data.ts b/src/lib/schematics/update/material/transform-change-data.ts
@@ -5,7 +5,8 @@
  * 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 {TargetVersion} from '../index';
+
+import {TargetVersion} from '../target-version';
 
 export type VersionChanges<T> = {
   [target in TargetVersion]?: ReadableChange<T>[];
diff --git a/src/lib/schematics/update/rules/misc-ripples-v7/rippleSpeedFactorAssignmentRule.ts b/src/lib/schematics/update/rules/misc-ripples-v7/rippleSpeedFactorAssignmentRule.ts
diff --git a/src/lib/schematics/update/rules/misc-ripples-v7/rippleSpeedFactorTemplateRule.ts b/src/lib/schematics/update/rules/misc-ripples-v7/rippleSpeedFactorTemplateRule.ts
diff --git a/src/lib/schematics/update/target-version.ts b/src/lib/schematics/update/target-version.ts
@@ -0,0 +1,13 @@
+/**
+ * @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
+ */
+
+/** Possible versions that can be automatically migrated by `ng update`. */
+export enum TargetVersion {
+  V6,
+  V7,
+}
diff --git a/src/lib/schematics/update/test-cases/v7-test-cases.spec.ts b/src/lib/schematics/update/test-cases/v7-test-cases.spec.ts
@@ -10,7 +10,8 @@ describe('v7 upgrade test cases', () => {
    * a developers application.
    */
   const testCases = [
-    'v7/property-names'
+    'v7/property-names',
+    'v7/ripple-speed-factor',
   ];
 
   // Iterates through every test case directory and generates a jasmine test block that will
diff --git a/src/lib/schematics/update/test-cases/v7/ripple-speed-factor_expected_output.ts b/src/lib/schematics/update/test-cases/v7/ripple-speed-factor_expected_output.ts
@@ -0,0 +1,33 @@
+import {Component} from '@angular/core';
+
+class MatRipple {
+  speedFactor: number;
+}
+
+class A {
+  self = {me: this.ripple};
+
+  constructor(protected ripple: MatRipple) {}
+
+  onClick() {
+    this.ripple.animation = {enterDuration: 900};
+    this.self.me.animation = {enterDuration: 300};
+  }
+}
+
+const b = new MatRipple();
+const myConstant = 1;
+
+b.animation = /** TODO: Cleanup duration calculation. */ {enterDuration: 450 / (0.5 + myConstant)};
+
+@Component({
+  template: `<div matRipple [matRippleAnimation]="{enterDuration: 900}"></div>`
+})
+class C {}
+
+@Component({
+  template: `<div matRipple [matRippleAnimation]="{enterDuration: (450 / (myValue))}"></div>`
+})
+class D {
+  myValue = 1.5;
+}
diff --git a/src/lib/schematics/update/test-cases/v7/ripple-speed-factor_input.ts b/src/lib/schematics/update/test-cases/v7/ripple-speed-factor_input.ts
@@ -0,0 +1,33 @@
+import {Component} from '@angular/core';
+
+class MatRipple {
+  speedFactor: number;
+}
+
+class A {
+  self = {me: this.ripple};
+
+  constructor(protected ripple: MatRipple) {}
+
+  onClick() {
+    this.ripple.speedFactor = 0.5;
+    this.self.me.speedFactor = 1.5;
+  }
+}
+
+const b = new MatRipple();
+const myConstant = 1;
+
+b.speedFactor = 0.5 + myConstant;
+
+@Component({
+  template: `<div matRipple [matRippleSpeedFactor]="0.5"></div>`
+})
+class C {}
+
+@Component({
+  template: `<div matRipple [matRippleSpeedFactor]="myValue"></div>`
+})
+class D {
+  myValue = 1.5;
+}
diff --git a/src/lib/schematics/update/tslint-config.ts b/src/lib/schematics/update/tslint-config.ts
@@ -7,7 +7,7 @@
  */
 
 import {sync as globSync} from 'glob';
-import {TargetVersion} from './index';
+import {TargetVersion} from './target-version';
 
 /** List of rules that need to be enabled when running the TSLint fix task. */
 const upgradeRules = [
@@ -52,6 +52,10 @@ const upgradeRules = [
   // Additional misc rules.
   'check-import-misc',
   'check-template-misc',
+
+  // Ripple misc V7
+  ['ripple-speed-factor-assignment', TargetVersion.V7],
+  ['ripple-speed-factor-template', TargetVersion.V7],
 ];
 
 /** List of absolute paths that refer to directories that contain the upgrade rules. */
@@ -66,8 +70,14 @@ const rulesDirectory = globSync('rules/**/', {cwd: __dirname, absolute: true});
  * walker is not able to detect stylesheets which are not referenced by Angular.
  */
 export function createTslintConfig(target: TargetVersion, extraStyleFiles: string[]) {
-  const rules = upgradeRules.reduce((result, ruleName) => {
-    result[ruleName] = [true, target, extraStyleFiles];
+  const rules = upgradeRules.reduce((result, data) => {
+    const ruleName = data instanceof Array ? data[0] : data;
+    const versionConstraints = data instanceof Array ? data.slice(1) : null;
+
+    if (!versionConstraints || versionConstraints.includes(target)) {
+      result[ruleName] = [true, target, extraStyleFiles];
+    }
+
     return result;
   }, {});
 
diff --git a/src/lib/schematics/update/update.ts b/src/lib/schematics/update/update.ts
@@ -9,8 +9,8 @@
 import {Rule, SchematicContext, TaskId, Tree} from '@angular-devkit/schematics';
 import {RunSchematicTask, TslintFixTask} from '@angular-devkit/schematics/tasks';
 import {sync as globSync} from 'glob';
-import {TargetVersion} from './index';
 import {getProjectTsConfigPaths} from './project-tsconfig-paths';
+import {TargetVersion} from './target-version';
 import {createTslintConfig} from './tslint-config';
 
 /** Entry point for `ng update` from Angular CLI. */
