fix(@angular/cli): Update schemeatic task & update deps

Author: Brocco

package-lock.json

@@ -41,8 +41,8 @@
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
     "@angular-devkit/build-optimizer": "0.0.13",
-    "@angular-devkit/schematics": "0.0.15",
-    "@schematics/angular": "0.0.21",
+    "@angular-devkit/schematics": "0.0.17",
+    "@schematics/angular": "0.0.26",
     "autoprefixer": "^6.5.3",
     "chalk": "^2.0.1",
     "circular-dependency-plugin": "^3.0.0",

package.json

@@ -28,10 +28,10 @@
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
     "@angular-devkit/build-optimizer": "0.0.13",
-    "@angular-devkit/schematics": "0.0.15",
+    "@angular-devkit/schematics": "0.0.16",
     "@ngtools/json-schema": "1.1.0",
     "@ngtools/webpack": "1.7.0-beta.0",
-    "@schematics/angular": "0.0.21",
+    "@schematics/angular": "0.0.26",
     "autoprefixer": "^6.5.3",
     "chalk": "^2.0.1",
     "circular-dependency-plugin": "^3.0.0",

packages/@angular/cli/package.json

@@ -13,11 +13,9 @@ import { green, red, yellow } from 'chalk';
 import { CliConfig } from '../models/config';
 import 'rxjs/add/operator/concatMap';
 import 'rxjs/add/operator/map';
-import * as fs from 'fs';
 import { getCollection, getSchematic } from '../utilities/schematics';
 import { getAppFromConfig } from '../utilities/app-utils';
 
-const SilentError = require('silent-error');
 
 const Task = require('../ember-cli/lib/models/task');
 
@@ -49,27 +47,14 @@ export default Task.extend({
 
     let modifiedFiles: string[] = [];
 
-    let appDir = workingDir;
     let appConfig;
     try {
       appConfig = getAppFromConfig(taskOptions.app);
     } catch (err) {}
 
     const projectRoot = !!this.project ? this.project.root : workingDir;
 
-    if (appConfig) {
-      const sourceRoot = path.join(projectRoot, appConfig.root);
-      const appRoot = path.join(sourceRoot, 'app');
-      if (workingDir.indexOf(appRoot) === 0) {
-        appDir = workingDir;
-      } else if (workingDir.indexOf(sourceRoot) === 0) {
-        appDir = path.join(sourceRoot, 'app');
-      } else {
-        appDir = path.join(projectRoot, appConfig.root, 'app');
-      }
-    }
-
-    const preppedOptions = prepOptions(schematic, appDir, taskOptions, projectRoot);
+    const preppedOptions = prepOptions(schematic, taskOptions);
     const opts = { ...taskOptions, ...preppedOptions };
 
     const host = Observable.of(new FileSystemTree(new FileSystemHost(workingDir)));
@@ -163,8 +148,7 @@ export default Task.extend({
   }
 });
 
-function prepOptions(schematic: Schematic<{}, {}>, workingDirectory: string,
-  options: SchematicOptions, projectRoot: string): SchematicOptions {
+function prepOptions(schematic: Schematic<{}, {}>, options: SchematicOptions): SchematicOptions {
 
   const properties = (<any>schematic.description).schemaJson.properties;
   const keys = Object.keys(properties);
@@ -174,11 +158,6 @@ function prepOptions(schematic: Schematic<{}, {}>, workingDirectory: string,
       ? '' : options.prefix;
   }
 
-  const filepathKeys = keys
-    .filter(key => {
-      const prop = properties[key];
-      return prop.type === 'string' && prop.subtype === 'filepath';
-    });
   let preppedOptions = {
     ...options,
     ...readDefaults(schematic.description.name, keys, options)
@@ -187,32 +166,6 @@ function prepOptions(schematic: Schematic<{}, {}>, workingDirectory: string,
     ...preppedOptions,
     ...normalizeOptions(schematic.description.name, keys, options)
   };
-  preppedOptions = {
-    ...preppedOptions,
-    ...prepFilepaths(filepathKeys, options, workingDirectory, projectRoot)
-  };
-
-  if (preppedOptions.module) {
-    if (!preppedOptions.module.endsWith('.module.ts')) {
-      let newModuleValue = preppedOptions.module;
-      const fullPath = path.join(projectRoot, preppedOptions.module);
-      if (fs.existsSync(fullPath) && fs.lstatSync(fullPath).isDirectory()) {
-        const files = fs.readdirSync(path.join(projectRoot, preppedOptions.module));
-        const moduleFiles = files.filter(f => f.endsWith('.module.ts'));
-        if (moduleFiles.length === 1) {
-          newModuleValue = path.join(preppedOptions.module, moduleFiles[0]);
-        }
-      } else if (preppedOptions.module.endsWith('.module')) {
-        newModuleValue = `${newModuleValue}.ts`;
-      } else {
-        newModuleValue = `${newModuleValue}.module.ts`;
-      }
-      preppedOptions = {
-        ...preppedOptions,
-        module: newModuleValue
-      };
-    }
-  }
 
   return preppedOptions;
 }
@@ -253,29 +206,3 @@ function readDefault(schematicName: String, key: string) {
   const jsonPath = `defaults.${schematicName}.${key}`;
   return CliConfig.getValue(jsonPath);
 }
-
-function prepFilepaths(keys: string[],
-                       options: SchematicOptions,
-                       workingDirectory: string,
-                       projectRoot: string): any {
-  return keys
-    .reduce((acc: any, key) => {
-      acc[key] = prepFilepath(options[key], workingDirectory, projectRoot);
-      return acc;
-    }, {});
-}
-
-function prepFilepath(value: string, workingDirectory: string, projectRoot: string): string {
-  if (!value) {
-    return undefined;
-  }
-  const modulePath = path.resolve(workingDirectory, value);
-
-  // ensure it starts with projectRoot
-  if (!modulePath.startsWith(projectRoot)) {
-    throw new SilentError('invalid module path');
-  }
-
-  return modulePath.substr(projectRoot.length);
-}
-

packages/@angular/cli/tasks/schematic-run.ts

@@ -1,5 +1,5 @@
 import {ng} from '../../../utils/process';
-import {appendToFile, expectFileToMatch, prependToFile, replaceInFile} from '../../../utils/fs';
+import { appendToFile, expectFileToMatch, prependToFile, replaceInFile } from '../../../utils/fs';
 import {expectToFail} from '../../../utils/utils';
 
 export default function() {

tests/e2e/tests/build/aot/aot-decorators.ts

@@ -10,13 +10,13 @@ export default function() {
   const componentDir = join(rootDir, 'test-component');
   const componentTwoDir = join(rootDir, 'test-component-two');
 
-  return ng('generate', 'component', `${upperDirs}/test-component`)
+  return ng('generate', 'component', join(upperDirs, 'test-component'))
     .then(() => expectFileToExist(componentDir))
     .then(() => expectFileToExist(join(componentDir, 'test-component.component.ts')))
     .then(() => expectFileToExist(join(componentDir, 'test-component.component.spec.ts')))
     .then(() => expectFileToExist(join(componentDir, 'test-component.component.html')))
     .then(() => expectFileToExist(join(componentDir, 'test-component.component.css')))
-    .then(() => ng('generate', 'component', `${upperDirs}/Test-Component-Two`))
+    .then(() => ng('generate', 'component', join(upperDirs, 'Test-Component-Two')))
     .then(() => expectFileToExist(join(componentTwoDir, 'test-component-two.component.ts')))
     .then(() => expectFileToExist(join(componentTwoDir, 'test-component-two.component.spec.ts')))
     .then(() => expectFileToExist(join(componentTwoDir, 'test-component-two.component.html')))