fix(@angular/cli): apps fixes

packages/@angular/cli/blueprints/class/index.ts

@@ -1,4 +1,5 @@
 import {getAppFromConfig} from '../../utilities/app-utils';
+import {CliConfig} from '../../models/config';
 
 const stringUtils = require('ember-cli-string-utils');
 const dynamicPathParser = require('../../utilities/dynamic-path-parser');
@@ -23,7 +24,9 @@ export default Blueprint.extend({
   ],
 
   normalizeEntityName: function (entityName: string) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName.split('.')[0], appConfig);
 
     this.dynamicPath = parsedPath;
@@ -41,9 +44,10 @@ export default Blueprint.extend({
       this.fileName += '.' + classType.toLowerCase();
     }
 
+    const cliConfig = CliConfig.fromProject();
     options.spec = options.spec !== undefined ?
       options.spec :
-      this.project.ngConfigObj.get('defaults.class.spec');
+      cliConfig && cliConfig.get('defaults.class.spec');
 
     return {
       dynamicPath: this.dynamicPath.dir,

packages/@angular/cli/blueprints/component/index.ts

@@ -1,5 +1,6 @@
 import { NodeHost } from '../../lib/ast-tools';
-import {getAppFromConfig} from '../../utilities/app-utils';
+import { CliConfig } from '../../models/config';
+import { getAppFromConfig } from '../../utilities/app-utils';
 
 import * as fs from 'fs';
 import * as path from 'path';
@@ -82,7 +83,9 @@ export default Blueprint.extend({
   ],
 
   beforeInstall: function (options: any) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     if (options.module) {
       // Resolve path to module
       const modulePath = options.module.endsWith('.ts') ? options.module : `${options.module}.ts`;
@@ -105,7 +108,9 @@ export default Blueprint.extend({
   },
 
   normalizeEntityName: function (entityName: string) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
 
     this.dynamicPath = parsedPath;
@@ -126,36 +131,37 @@ export default Blueprint.extend({
   },
 
   locals: function (options: any) {
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+
     this.styleExt = 'css';
-    if (this.project.ngConfig &&
-        this.project.ngConfig.defaults &&
-        this.project.ngConfig.defaults.styleExt) {
-      this.styleExt = this.project.ngConfig.defaults.styleExt;
+    if (ngConfig && ngConfig.defaults && ngConfig.defaults.styleExt) {
+      this.styleExt = ngConfig.defaults.styleExt;
     }
 
     options.inlineStyle = options.inlineStyle !== undefined ?
       options.inlineStyle :
-      this.project.ngConfigObj.get('defaults.component.inlineStyle');
+      cliConfig && cliConfig.get('defaults.component.inlineStyle');
 
     options.inlineTemplate = options.inlineTemplate !== undefined ?
       options.inlineTemplate :
-      this.project.ngConfigObj.get('defaults.component.inlineTemplate');
+      cliConfig && cliConfig.get('defaults.component.inlineTemplate');
 
     options.flat = options.flat !== undefined ?
       options.flat :
-      this.project.ngConfigObj.get('defaults.component.flat');
+      cliConfig && cliConfig.get('defaults.component.flat');
 
     options.spec = options.spec !== undefined ?
       options.spec :
-      this.project.ngConfigObj.get('defaults.component.spec');
+      cliConfig && cliConfig.get('defaults.component.spec');
 
     options.viewEncapsulation = options.viewEncapsulation !== undefined ?
       options.viewEncapsulation :
-      this.project.ngConfigObj.get('defaults.component.viewEncapsulation');
+      cliConfig && cliConfig.get('defaults.component.viewEncapsulation');
 
     options.changeDetection = options.changeDetection !== undefined ?
       options.changeDetection :
-      this.project.ngConfigObj.get('defaults.component.changeDetection');
+      cliConfig && cliConfig.get('defaults.component.changeDetection');
 
     return {
       dynamicPath: this.dynamicPath.dir.replace(this.dynamicPath.appRoot, ''),
@@ -189,14 +195,17 @@ export default Blueprint.extend({
   },
 
   fileMapTokens: function (options: any) {
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+
     // Return custom template variables here.
     return {
       __path__: () => {
         let dir = this.dynamicPath.dir;
         if (!options.locals.flat) {
           dir += path.sep + options.dasherizedModuleName;
         }
-        const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
         const srcDir = appConfig.root;
         this.appDir = dir.substr(dir.indexOf(srcDir) + srcDir.length);
         this.generatePath = dir;

packages/@angular/cli/blueprints/directive/index.ts

@@ -1,4 +1,5 @@
 import {NodeHost} from '../../lib/ast-tools';
+import {CliConfig} from '../../models/config';
 import {getAppFromConfig} from '../../utilities/app-utils';
 
 const path = require('path');
@@ -57,7 +58,9 @@ export default Blueprint.extend({
   ],
 
   beforeInstall: function(options: any) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     if (options.module) {
       // Resolve path to module
       const modulePath = options.module.endsWith('.ts') ? options.module : `${options.module}.ts`;
@@ -80,7 +83,9 @@ export default Blueprint.extend({
   },
 
   normalizeEntityName: function (entityName: string) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
 
     this.dynamicPath = parsedPath;
@@ -97,13 +102,15 @@ export default Blueprint.extend({
   },
 
   locals: function (options: any) {
+    const cliConfig = CliConfig.fromProject();
+
     options.spec = options.spec !== undefined ?
       options.spec :
-      this.project.ngConfigObj.get('defaults.directive.spec');
+      cliConfig && cliConfig.get('defaults.directive.spec');
 
     options.flat = options.flat !== undefined ?
       options.flat :
-      this.project.ngConfigObj.get('defaults.directive.flat');
+      cliConfig && cliConfig.get('defaults.directive.flat');
 
     return {
       dynamicPath: this.dynamicPath.dir,

packages/@angular/cli/blueprints/guard/index.ts

@@ -1,6 +1,7 @@
-import {NodeHost} from '../../lib/ast-tools';
 import { oneLine } from 'common-tags';
-import {getAppFromConfig} from '../../utilities/app-utils';
+import { NodeHost } from '../../lib/ast-tools';
+import { CliConfig } from '../../models/config';
+import { getAppFromConfig } from '../../utilities/app-utils';
 
 const path = require('path');
 const fs = require('fs');
@@ -34,7 +35,9 @@ export default Blueprint.extend({
   ],
 
   beforeInstall: function(options: any) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     if (options.module) {
       // Resolve path to module
       const modulePath = options.module.endsWith('.ts') ? options.module : `${options.module}.ts`;
@@ -48,21 +51,22 @@ export default Blueprint.extend({
   },
 
   normalizeEntityName: function (entityName: string) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
   },
 
   locals: function (options: any) {
+    const cliConfig = CliConfig.fromProject();
     options.flat = options.flat !== undefined ?
-      options.flat :
-      this.project.ngConfigObj.get('defaults.guard.flat');
+      options.flat : cliConfig.get('defaults.guard.flat');
 
     options.spec = options.spec !== undefined ?
-      options.spec :
-      this.project.ngConfigObj.get('defaults.guard.spec');
+      options.spec : cliConfig.get('defaults.guard.spec');
 
     return {
       dynamicPath: this.dynamicPath.dir,

packages/@angular/cli/blueprints/interface/index.ts

@@ -1,3 +1,4 @@
+import {CliConfig} from '../../models/config';
 import {getAppFromConfig} from '../../utilities/app-utils';
 
 const stringUtils = require('ember-cli-string-utils');
@@ -21,20 +22,24 @@ export default Blueprint.extend({
   ],
 
   normalizeEntityName: function (entityName: string) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
   },
 
   locals: function (options: any) {
+    const cliConfig = CliConfig.fromProject();
+
     const interfaceType = options.args[2];
     this.fileName = stringUtils.dasherize(options.entity.name);
     if (interfaceType) {
       this.fileName += '.' + interfaceType;
     }
-    const prefix = this.project.ngConfigObj.get('defaults.interface.prefix');
+    const prefix = cliConfig && cliConfig.get('defaults.interface.prefix');
     return {
       dynamicPath: this.dynamicPath.dir,
       flat: options.flat,

packages/@angular/cli/blueprints/module/index.ts

@@ -1,3 +1,4 @@
+import {CliConfig} from '../../models/config';
 import {getAppFromConfig} from '../../utilities/app-utils';
 
 const path = require('path');
@@ -35,21 +36,24 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     this.entityName = entityName;
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
   },
 
   locals: function (options: any) {
+    const cliConfig = CliConfig.fromProject();
     options.flat = options.flat !== undefined ?
       options.flat :
-      this.project.ngConfigObj.get('defaults.module.flat');
+      cliConfig && cliConfig.get('defaults.module.flat');
 
     options.spec = options.spec !== undefined ?
       options.spec :
-      this.project.ngConfigObj.get('defaults.module.spec');
+      cliConfig && cliConfig.get('defaults.module.spec');
 
     return {
       dynamicPath: this.dynamicPath.dir,

packages/@angular/cli/blueprints/pipe/index.ts

@@ -1,4 +1,5 @@
 import {NodeHost} from '../../lib/ast-tools';
+import {CliConfig} from '../../models/config';
 import {getAppFromConfig} from '../../utilities/app-utils';
 
 const path = require('path');
@@ -52,7 +53,9 @@ export default Blueprint.extend({
   ],
 
   beforeInstall: function(options: any) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     if (options.module) {
       // Resolve path to module
       const modulePath = options.module.endsWith('.ts') ? options.module : `${options.module}.ts`;
@@ -75,21 +78,24 @@ export default Blueprint.extend({
   },
 
   normalizeEntityName: function (entityName: string) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
   },
 
   locals: function (options: any) {
+    const cliConfig = CliConfig.fromProject();
     options.flat = options.flat !== undefined ?
       options.flat :
-      this.project.ngConfigObj.get('defaults.pipe.flat');
+      cliConfig && cliConfig.get('defaults.pipe.flat');
 
     options.spec = options.spec !== undefined ?
       options.spec :
-      this.project.ngConfigObj.get('defaults.pipe.spec');
+      cliConfig && cliConfig.get('defaults.pipe.spec');
 
     return {
       dynamicPath: this.dynamicPath.dir,

packages/@angular/cli/blueprints/service/index.ts

@@ -1,6 +1,7 @@
 import {NodeHost} from '../../lib/ast-tools';
-import { oneLine } from 'common-tags';
+import {CliConfig} from '../../models/config';
 import {getAppFromConfig} from '../../utilities/app-utils';
+import { oneLine } from 'common-tags';
 
 const path = require('path');
 const fs = require('fs');
@@ -42,7 +43,9 @@ export default Blueprint.extend({
     if (options.module) {
       // Resolve path to module
       const modulePath = options.module.endsWith('.ts') ? options.module : `${options.module}.ts`;
-      const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+      const cliConfig = CliConfig.fromProject();
+      const ngConfig = cliConfig && cliConfig.config;
+      const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
       const parsedPath = dynamicPathParser(this.project, modulePath, appConfig);
       this.pathToModule = path.join(this.project.root, parsedPath.dir, parsedPath.base);
 
@@ -53,21 +56,24 @@ export default Blueprint.extend({
   },
 
   normalizeEntityName: function (entityName: string) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const cliConfig = CliConfig.fromProject();
+    const ngConfig = cliConfig && cliConfig.config;
+    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
   },
 
   locals: function (options: any) {
+    const cliConfig = CliConfig.fromProject();
     options.flat = options.flat !== undefined ?
       options.flat :
-      this.project.ngConfigObj.get('defaults.service.flat');
+      cliConfig && cliConfig.get('defaults.service.flat');
 
     options.spec = options.spec !== undefined ?
       options.spec :
-      this.project.ngConfigObj.get('defaults.service.spec');
+      cliConfig && cliConfig.get('defaults.service.spec');
 
     return {
       dynamicPath: this.dynamicPath.dir,

packages/@angular/cli/commands/generate.ts

@@ -1,6 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
+import {CliConfig} from '../models/config';
 
 const chalk = require('chalk');
 const EmberGenerateCommand = require('../ember-cli/lib/commands/generate');
@@ -25,6 +26,7 @@ const GenerateCommand = EmberGenerateCommand.extend({
 
     // map the blueprint name to allow for aliases
     rawArgs[0] = mapBlueprintName(rawArgs[0]);
+    this.project.ngConfig = this.project.ngConfig || CliConfig.fromProject();
 
     if (rawArgs[0] !== '--help' &&
       !fs.existsSync(path.join(__dirname, '..', 'blueprints', rawArgs[0]))) {