refactor(@angular/cli): consolidate config reading logic (angular#5023)

deebloo · Feb 28, 2017 · 1609554 · 1609554
1 parent 211270d
commit 1609554
Show file tree

Hide file tree

Showing 22 changed files with 64 additions and 117 deletions.
diff --git a/packages/@angular/cli/addon/index.js b/packages/@angular/cli/addon/index.js
@@ -1,18 +1,11 @@
 /* jshint node: true */
 'use strict';
 
-const config = require('../models/config');
 const path = require('path');
 
 module.exports = {
   name: 'ng',
 
-  config: function () {
-    this.project.ngConfigObj = this.project.ngConfigObj || config.CliConfig.fromProject();
-    this.project.ngConfig = this.project.ngConfig || (
-        this.project.ngConfigObj && this.project.ngConfigObj.config);
-  },
-
   blueprintsPath: function () {
     return path.join(__dirname, '../blueprints');
   },

diff --git a/packages/@angular/cli/blueprints/class/index.ts b/packages/@angular/cli/blueprints/class/index.ts
@@ -24,9 +24,7 @@ export default Blueprint.extend({
   ],
 
   normalizeEntityName: function (entityName: string) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName.split('.')[0], appConfig);
 
     this.dynamicPath = parsedPath;
@@ -44,10 +42,8 @@ export default Blueprint.extend({
       this.fileName += '.' + classType.toLowerCase();
     }
 
-    const cliConfig = CliConfig.fromProject();
     options.spec = options.spec !== undefined ?
-      options.spec :
-      cliConfig && cliConfig.get('defaults.class.spec');
+      options.spec : CliConfig.getValue('defaults.class.spec');
 
     return {
       dynamicPath: this.dynamicPath.dir,

diff --git a/packages/@angular/cli/blueprints/component/index.ts b/packages/@angular/cli/blueprints/component/index.ts
@@ -83,9 +83,7 @@ export default Blueprint.extend({
   ],
 
   beforeInstall: function (options: any) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(this.options.app);
     if (options.module) {
       // Resolve path to module
       const modulePath = options.module.endsWith('.ts') ? options.module : `${options.module}.ts`;
@@ -108,9 +106,7 @@ export default Blueprint.extend({
   },
 
   normalizeEntityName: function (entityName: string) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
 
     this.dynamicPath = parsedPath;
@@ -131,37 +127,25 @@ export default Blueprint.extend({
   },
 
   locals: function (options: any) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-
-    this.styleExt = 'css';
-    if (ngConfig && ngConfig.defaults && ngConfig.defaults.styleExt) {
-      this.styleExt = ngConfig.defaults.styleExt;
-    }
+    this.styleExt = CliConfig.getValue('defaults.styleExt') || 'css';
 
     options.inlineStyle = options.inlineStyle !== undefined ?
-      options.inlineStyle :
-      cliConfig && cliConfig.get('defaults.component.inlineStyle');
+      options.inlineStyle : CliConfig.getValue('defaults.component.inlineStyle');
 
     options.inlineTemplate = options.inlineTemplate !== undefined ?
-      options.inlineTemplate :
-      cliConfig && cliConfig.get('defaults.component.inlineTemplate');
+      options.inlineTemplate : CliConfig.getValue('defaults.component.inlineTemplate');
 
     options.flat = options.flat !== undefined ?
-      options.flat :
-      cliConfig && cliConfig.get('defaults.component.flat');
+      options.flat : CliConfig.getValue('defaults.component.flat');
 
     options.spec = options.spec !== undefined ?
-      options.spec :
-      cliConfig && cliConfig.get('defaults.component.spec');
+      options.spec : CliConfig.getValue('defaults.component.spec');
 
     options.viewEncapsulation = options.viewEncapsulation !== undefined ?
-      options.viewEncapsulation :
-      cliConfig && cliConfig.get('defaults.component.viewEncapsulation');
+      options.viewEncapsulation : CliConfig.getValue('defaults.component.viewEncapsulation');
 
     options.changeDetection = options.changeDetection !== undefined ?
-      options.changeDetection :
-      cliConfig && cliConfig.get('defaults.component.changeDetection');
+      options.changeDetection : CliConfig.getValue('defaults.component.changeDetection');
 
     return {
       dynamicPath: this.dynamicPath.dir.replace(this.dynamicPath.appRoot, ''),
@@ -195,9 +179,7 @@ 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);
+    const appConfig = getAppFromConfig(this.options.app);
 
     // Return custom template variables here.
     return {

diff --git a/packages/@angular/cli/blueprints/directive/index.ts b/packages/@angular/cli/blueprints/directive/index.ts
@@ -58,9 +58,7 @@ export default Blueprint.extend({
   ],
 
   beforeInstall: function(options: any) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(this.options.app);
     if (options.module) {
       // Resolve path to module
       const modulePath = options.module.endsWith('.ts') ? options.module : `${options.module}.ts`;
@@ -83,9 +81,7 @@ export default Blueprint.extend({
   },
 
   normalizeEntityName: function (entityName: string) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
 
     this.dynamicPath = parsedPath;
@@ -102,15 +98,11 @@ export default Blueprint.extend({
   },
 
   locals: function (options: any) {
-    const cliConfig = CliConfig.fromProject();
-
     options.spec = options.spec !== undefined ?
-      options.spec :
-      cliConfig && cliConfig.get('defaults.directive.spec');
+      options.spec : CliConfig.getValue('defaults.directive.spec');
 
     options.flat = options.flat !== undefined ?
-      options.flat :
-      cliConfig && cliConfig.get('defaults.directive.flat');
+      options.flat : CliConfig.getValue('defaults.directive.flat');
 
     return {
       dynamicPath: this.dynamicPath.dir,

diff --git a/packages/@angular/cli/blueprints/enum/index.ts b/packages/@angular/cli/blueprints/enum/index.ts
@@ -17,7 +17,7 @@ export default Blueprint.extend({
   ],
 
   normalizeEntityName: function (entityName: string) {
-    const appConfig = getAppFromConfig(this.project.ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(this.options.app);
     const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
 
     this.dynamicPath = parsedPath;

diff --git a/packages/@angular/cli/blueprints/guard/index.ts b/packages/@angular/cli/blueprints/guard/index.ts
@@ -35,9 +35,7 @@ export default Blueprint.extend({
   ],
 
   beforeInstall: function(options: any) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(this.options.app);
     if (options.module) {
       // Resolve path to module
       const modulePath = options.module.endsWith('.ts') ? options.module : `${options.module}.ts`;
@@ -51,22 +49,19 @@ export default Blueprint.extend({
   },
 
   normalizeEntityName: function (entityName: string) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(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 : cliConfig.get('defaults.guard.flat');
+      options.flat : CliConfig.getValue('defaults.guard.flat');
 
     options.spec = options.spec !== undefined ?
-      options.spec : cliConfig.get('defaults.guard.spec');
+      options.spec : CliConfig.getValue('defaults.guard.spec');
 
     return {
       dynamicPath: this.dynamicPath.dir,

diff --git a/packages/@angular/cli/blueprints/interface/index.ts b/packages/@angular/cli/blueprints/interface/index.ts
@@ -22,24 +22,20 @@ export default Blueprint.extend({
   ],
 
   normalizeEntityName: function (entityName: string) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(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 = cliConfig && cliConfig.get('defaults.interface.prefix');
+    const prefix = CliConfig.getValue('defaults.interface.prefix');
     return {
       dynamicPath: this.dynamicPath.dir,
       flat: options.flat,

diff --git a/packages/@angular/cli/blueprints/module/index.ts b/packages/@angular/cli/blueprints/module/index.ts
@@ -36,24 +36,19 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     this.entityName = entityName;
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(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 :
-      cliConfig && cliConfig.get('defaults.module.flat');
+      options.flat : CliConfig.getValue('defaults.module.flat');
 
     options.spec = options.spec !== undefined ?
-      options.spec :
-      cliConfig && cliConfig.get('defaults.module.spec');
+      options.spec : CliConfig.getValue('defaults.module.spec');
 
     return {
       dynamicPath: this.dynamicPath.dir,

diff --git a/packages/@angular/cli/blueprints/ng/index.ts b/packages/@angular/cli/blueprints/ng/index.ts
@@ -11,7 +11,7 @@ export default Blueprint.extend({
   availableOptions: [
     { name: 'source-dir', type: String, default: 'src', aliases: ['sd'] },
     { name: 'prefix', type: String, default: 'app', aliases: ['p'] },
-    { name: 'style', type: String, default: 'css' },
+    { name: 'style', type: String },
     { name: 'routing', type: Boolean, default: false },
     { name: 'inline-style', type: Boolean, default: false, aliases: ['is'] },
     { name: 'inline-template', type: Boolean, default: false, aliases: ['it'] },
@@ -27,6 +27,10 @@ export default Blueprint.extend({
 
   locals: function(options: any) {
     this.styleExt = options.style === 'stylus' ? 'styl' : options.style;
+    if (!options.style) {
+      this.styleExt = CliConfig.getValue('defaults.styleExt') || 'css';
+    }
+
     this.version = require(path.resolve(__dirname, '../../package.json')).version;
     // set this.tests to opposite of skipTest options,
     // meaning if tests are being skipped then the default.spec.BLUEPRINT will be false

diff --git a/packages/@angular/cli/blueprints/pipe/index.ts b/packages/@angular/cli/blueprints/pipe/index.ts
@@ -53,9 +53,7 @@ export default Blueprint.extend({
   ],
 
   beforeInstall: function(options: any) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(this.options.app);
     if (options.module) {
       // Resolve path to module
       const modulePath = options.module.endsWith('.ts') ? options.module : `${options.module}.ts`;
@@ -78,24 +76,19 @@ export default Blueprint.extend({
   },
 
   normalizeEntityName: function (entityName: string) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(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 :
-      cliConfig && cliConfig.get('defaults.pipe.flat');
+      options.flat : CliConfig.getValue('defaults.pipe.flat');
 
     options.spec = options.spec !== undefined ?
-      options.spec :
-      cliConfig && cliConfig.get('defaults.pipe.spec');
+      options.spec : CliConfig.getValue('defaults.pipe.spec');
 
     return {
       dynamicPath: this.dynamicPath.dir,

diff --git a/packages/@angular/cli/blueprints/service/index.ts b/packages/@angular/cli/blueprints/service/index.ts
@@ -43,9 +43,7 @@ export default Blueprint.extend({
     if (options.module) {
       // Resolve path to module
       const modulePath = options.module.endsWith('.ts') ? options.module : `${options.module}.ts`;
-      const cliConfig = CliConfig.fromProject();
-      const ngConfig = cliConfig && cliConfig.config;
-      const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+      const appConfig = getAppFromConfig(this.options.app);
       const parsedPath = dynamicPathParser(this.project, modulePath, appConfig);
       this.pathToModule = path.join(this.project.root, parsedPath.dir, parsedPath.base);
 
@@ -56,24 +54,19 @@ export default Blueprint.extend({
   },
 
   normalizeEntityName: function (entityName: string) {
-    const cliConfig = CliConfig.fromProject();
-    const ngConfig = cliConfig && cliConfig.config;
-    const appConfig = getAppFromConfig(ngConfig.apps, this.options.app);
+    const appConfig = getAppFromConfig(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 :
-      cliConfig && cliConfig.get('defaults.service.flat');
+      options.flat : CliConfig.getValue('defaults.service.flat');
 
     options.spec = options.spec !== undefined ?
-      options.spec :
-      cliConfig && cliConfig.get('defaults.service.spec');
+      options.spec : CliConfig.getValue('defaults.service.spec');
 
     return {
       dynamicPath: this.dynamicPath.dir,

diff --git a/packages/@angular/cli/commands/e2e.ts b/packages/@angular/cli/commands/e2e.ts
@@ -80,7 +80,6 @@ const E2eCommand = Command.extend({
   ]),
   run: function (commandOptions: E2eTaskOptions) {
     const E2eTask = require('../tasks/e2e').E2eTask;
-    this.project.ngConfig = this.project.ngConfig || CliConfig.fromProject();
 
     const e2eTask = new E2eTask({
       ui: this.ui,

diff --git a/packages/@angular/cli/commands/generate.ts b/packages/@angular/cli/commands/generate.ts
@@ -1,7 +1,6 @@
 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');
@@ -26,7 +25,6 @@ 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]))) {

diff --git a/packages/@angular/cli/commands/test.ts b/packages/@angular/cli/commands/test.ts
@@ -113,8 +113,6 @@ const TestCommand = EmberTestCommand.extend({
   ],
 
   run: function(commandOptions: TestOptions) {
-    this.project.ngConfig = this.project.ngConfig || CliConfig.fromProject();
-
     const testTask = new TestTask({
       ui: this.ui,
       project: this.project