@angular-devkit/core 10.1.0-rc.0 → 10.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/core",
-  "version": "10.1.0-rc.0",
+  "version": "10.1.3",
   "description": "Angular DevKit - Core Utility Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",

package/src/analytics/index.d.ts

@@ -16,7 +16,8 @@ export * from './noop';
  *
  * These cannot be in their respective schema.json file because we either change the type
  * (e.g. --buildEventLog is string, but we want to know the usage of it, not its value), or
- * some validation needs to be done (we cannot record ng add --collection if it's not whitelisted).
+ * some validation needs to be done (we cannot record ng add --collection if it's not marked as
+ * allowed).
  */
 export declare enum NgCliAnalyticsDimensions {
     CpuCount = 1,

package/src/analytics/index.js

@@ -29,7 +29,8 @@ __exportStar(require("./noop"), exports);
  *
  * These cannot be in their respective schema.json file because we either change the type
  * (e.g. --buildEventLog is string, but we want to know the usage of it, not its value), or
- * some validation needs to be done (we cannot record ng add --collection if it's not whitelisted).
+ * some validation needs to be done (we cannot record ng add --collection if it's not marked as
+ * allowed).
  */
 var NgCliAnalyticsDimensions;
 (function (NgCliAnalyticsDimensions) {

package/src/workspace/json/test/cases/ObjectRemove.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-foo": {
+    "is": ["good", "great", "awesome"]
+  },
+  "x-bar": 5,
+}

package/src/workspace/json/test/cases/ObjectRemoveMultiple.json

@@ -0,0 +1,8 @@
+{
+  "version": 1,
+  // Comment
+  "x-foo": {
+    "is": ["good", "great", "awesome"]
+  },
+  "x-bar": 5,
+}

package/src/workspace/json/utilities.js

@@ -126,6 +126,11 @@ function create(ast, path, reporter, excluded = new Set(), included, base) {
             return value;
         },
         set(target, p, value) {
+            if (value === undefined) {
+                // setting to undefined is equivalent to a delete
+                // tslint:disable-next-line: no-non-null-assertion
+                return this.deleteProperty(target, p);
+            }
             if (typeof p === 'symbol' || Reflect.has(target, p)) {
                 return Reflect.set(target, p, value);
             }
@@ -169,14 +174,26 @@ function create(ast, path, reporter, excluded = new Set(), included, base) {
                 if (cacheEntry.node) {
                     alteredNodes.add(cacheEntry.node);
                 }
-                reporter(propertyPath, cacheEntry.parent, cacheEntry.node, oldValue, undefined);
+                if (cacheEntry.parent.kind === 'keyvalue') {
+                    // Remove the entire key/value pair from this JSON object
+                    reporter(propertyPath, ast, cacheEntry.node, oldValue, undefined);
+                }
+                else {
+                    reporter(propertyPath, cacheEntry.parent, cacheEntry.node, oldValue, undefined);
+                }
             }
             else {
                 const { node, parent } = findNode(ast, p);
                 if (node) {
                     cache.set(propertyPath, { node, parent, value: undefined });
                     alteredNodes.add(node);
-                    reporter(propertyPath, parent, node, node && node.value, undefined);
+                    if (parent.kind === 'keyvalue') {
+                        // Remove the entire key/value pair from this JSON object
+                        reporter(propertyPath, ast, node, node && node.value, undefined);
+                    }
+                    else {
+                        reporter(propertyPath, parent, node, node && node.value, undefined);
+                    }
                 }
             }
             return true;