fix(core): fix json diff and implicitJsonChanges part 2

nrwl · Mar 10, 2020 · d9a800f · d9a800f
1 parent ef00ec4
commit d9a800f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/packages/workspace/src/utils/json-diff.spec.ts b/packages/workspace/src/utils/json-diff.spec.ts
@@ -108,6 +108,38 @@ describe('jsonDiff', () => {
     });
   });
 
+  it('should work for added array values', () => {
+    const result = jsonDiff(
+      {
+        rules: undefined
+      },
+      {
+        rules: ['rule1']
+      }
+    );
+
+    expect(result).toEqual(
+      expect.arrayContaining([
+        {
+          type: DiffType.Modified,
+          path: ['rules'],
+          value: {
+            lhs: undefined,
+            rhs: ['rule1']
+          }
+        },
+        {
+          type: DiffType.Added,
+          path: ['rules', '0'],
+          value: {
+            lhs: undefined,
+            rhs: 'rule1'
+          }
+        }
+      ])
+    );
+  });
+
   it('should work for added array items', () => {
     const result = jsonDiff(
       {

diff --git a/packages/workspace/src/utils/json-diff.ts b/packages/workspace/src/utils/json-diff.ts
@@ -49,7 +49,7 @@ export function jsonDiff(lhs: any, rhs: any): JsonChange[] {
         }
       });
     }
-    return typeof lhsValue === 'object';
+    return typeof lhsValue === 'object' || Array.isArray(lhsValue);
   });
 
   walkJsonTree(rhs, [], (path, rhsValue) => {
@@ -63,9 +63,8 @@ export function jsonDiff(lhs: any, rhs: any): JsonChange[] {
           rhs: rhsValue
         }
       });
-      return false;
     }
-    return typeof rhsValue === 'object';
+    return typeof rhsValue === 'object' || Array.isArray(rhsValue);
   });
 
   return result;