fix(@angular/cli): only values in enum should be allowed to update

Author: sumitarora

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

@@ -1,6 +1,9 @@
-import {CliConfig} from '../models/config';
+import * as fs from 'fs';
+import { CliConfig } from '../models/config';
+import { oneLine } from 'common-tags';
 
 const SilentError = require('silent-error');
+const chalk = require('chalk');
 const Command = require('../ember-cli/lib/models/command');
 
 
@@ -67,13 +70,42 @@ const SetCommand = Command.extend({
         default: value = parseValue(rawValue, jsonPath);
       }
 
-      config.set(jsonPath, value);
-      config.save();
+      if (jsonPath.indexOf('prefix') > 0) {
+        // update tslint if prefix is updated
+        updateLintForPrefix(this.project.root + '/tslint.json', value);
+      }
+
+      try {
+        config.set(jsonPath, value);
+        config.save();
+      } catch (error) {
+        throw new SilentError(error.message);
+      }
       resolve();
     });
   }
 });
 
+function updateLintForPrefix(filePath: string, prefix: string): void {
+    const tsLint = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    const componentLint = tsLint.rules['component-selector'][2];
+    if (componentLint instanceof Array) {
+      tsLint.rules['component-selector'][2].push(prefix);
+    } else {
+      tsLint.rules['component-selector'][2] = prefix;
+    }
+
+    const directiveLint = tsLint.rules['directive-selector'][2];
+    if (directiveLint instanceof Array) {
+      tsLint.rules['directive-selector'][2].push(prefix);
+    } else {
+      tsLint.rules['directive-selector'][2] = prefix;
+    }
+    fs.writeFileSync(filePath, JSON.stringify(tsLint, null, 2));
+    console.log(chalk.yellow(oneLine`we have updated tslint to match prefix,
+     you may want to fix linting errors.`));
+}
+
 function parseValue(rawValue: string, path: string) {
   try {
     return JSON.parse(rawValue);

packages/@ngtools/json-schema/src/schema-class-factory.ts

@@ -4,10 +4,8 @@ import {JsonSchemaErrorBase} from './error';
 
 import './mimetypes';
 
-
 export class InvalidJsonPath extends JsonSchemaErrorBase {}
 
-
 // The schema tree node property of the SchemaClass.
 const kSchemaNode = Symbol('schema-node');
 // The value property of the SchemaClass.
@@ -132,6 +130,7 @@ class SchemaClassBase<T> implements SchemaClass<T> {
   /** Set a value from a JSON path. */
   $$set(path: string, value: any): void {
     const node = _getSchemaNodeForPath(this.$$schema(), path);
+
     if (node) {
       node.set(value);
     } else {

packages/@ngtools/json-schema/src/schema-tree.spec.ts

@@ -53,12 +53,11 @@ describe('@ngtools/json-schema', () => {
       });
 
       expect(proto.a instanceof Array).toBe(true);
-      expect(proto.a).toEqual([undefined, 'v1', undefined, 'v3']);
+      expect(proto.a).toEqual(['v1', 'v3']);
 
       // Set it to a string, which is valid.
       proto.a[0] = 'v2';
-      proto.a[1] = 'INVALID';
-      expect(proto.a).toEqual(['v2', undefined, undefined, 'v3']);
+      expect(proto.a).toEqual(['v2', 'v3']);
     });
 
     it('supports default values', () => {
@@ -70,6 +69,23 @@ describe('@ngtools/json-schema', () => {
 
       expect(schema.children['b'].get()).toEqual('default');
     });
+
+
+    it('should throw error when setting invalid value', () => {
+      const proto: any = Object.create(null);
+      // tslint:disable-next-line
+      new RootSchemaTreeNode(proto, {
+        value: valueJson,
+        schema: schemaJson
+      });
+
+      try {
+        proto.a[0] = 'INVALID';
+      } catch (error) {
+        expect(error.message).toBe('Invalid value can only be one of these: v1,v2,v3');
+      }
+    });
+
   });
 
 });

packages/@ngtools/json-schema/src/schema-tree.ts

@@ -7,7 +7,7 @@ export class InvalidSchema extends JsonSchemaErrorBase {}
 export class InvalidValueError extends JsonSchemaErrorBase {}
 export class MissingImplementationError extends JsonSchemaErrorBase {}
 export class SettingReadOnlyPropertyError extends JsonSchemaErrorBase {}
-
+export class InvalidUpdateValue extends JsonSchemaErrorBase {}
 
 export interface Schema {
   [key: string]: any;
@@ -482,6 +482,13 @@ class EnumSchemaTreeNode extends LeafSchemaTreeNode<any> {
 
   get items() { return this._schema['enum']; }
 
+  set(value: string, init = false, force = false) {
+    if (!(value === undefined || this._isInEnum(value))) {
+      throw new InvalidUpdateValue('Invalid value can only be one of these: ' + this.items);
+    }
+    super.set(value, init, force);
+  }
+
   isCompatible(v: any) {
     return this._isInEnum(v);
   }

packages/@ngtools/json-schema/tests/value2-1.json

@@ -1,8 +1,6 @@
 {
   "a": [
-    "INVALID",
     "v1",
-    "INVALID",
     "v3"
   ]
 }

tests/e2e/tests/commands/set/set-enum-check.ts

@@ -0,0 +1,9 @@
+import {ng} from '../../../utils/process';
+import {expectToFail} from '../../../utils/utils';
+
+export default function() {
+  return Promise.resolve()
+    .then(() => expectToFail(() => ng('set', 'defaults.component.aaa', 'bbb')))
+    .then(() => expectToFail(() => ng('set', 'defaults.component.viewEncapsulation', 'bbb')))
+    .then(() => ng('set', 'defaults.component.viewEncapsulation', 'Emulated'));
+}