From 11631b5e6fc6170bb76eab909cd621893f69aabc Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 21 May 2019 23:58:23 -0400
Subject: [PATCH] fix(@angular-devkit/core): properly replace an added value in
 workspace API

Replacing a previous added value in the same session should cause the replace operation to become an add operation with the original add operation elided.
---
 .../core/src/workspace/json/metadata.ts       |   3 +
 .../core/src/workspace/json/reader_spec.ts    | 182 ++++++++++++++++++
 2 files changed, 185 insertions(+)

diff --git a/packages/angular_devkit/core/src/workspace/json/metadata.ts b/packages/angular_devkit/core/src/workspace/json/metadata.ts
index 6d8b94d4529d..bc7d2c58bd5d 100644
--- a/packages/angular_devkit/core/src/workspace/json/metadata.ts
+++ b/packages/angular_devkit/core/src/workspace/json/metadata.ts
@@ -60,6 +60,9 @@ export class JsonWorkspaceMetadata {
       for (let i = this.changes.length - 1; i >= 0; --i) {
         const currentPath = this.changes[i].path;
         if (currentPath === path || currentPath.startsWith(path + '/')) {
+          if (op === 'replace' && currentPath === path && this.changes[i].op === 'add') {
+            op = 'add';
+          }
           this.changes.splice(i, 1);
         }
       }
diff --git a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
index 914e7df007d8..b5c84591dde6 100644
--- a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
@@ -183,6 +183,188 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
     }
   });
 
+  it('tracks complex extension additions with Object.assign target', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const value = { a: 1, b: 2, c: { d: 'abc' } };
+    workspace.extensions['x-baz'] = value;
+    expect(workspace.extensions['x-baz']).toEqual({ a: 1, b: 2, c: { d: 'abc' } });
+
+    Object.assign(value, { x: 9, y: 8, z: 7 });
+    expect(workspace.extensions['x-baz'])
+      .toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/x-baz')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+    }
+  });
+
+  it('tracks complex extension additions with Object.assign return', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const value = { a: 1, b: 2, c: { d: 'abc' } };
+    workspace.extensions['x-baz'] = value;
+    expect(workspace.extensions['x-baz']).toEqual({ a: 1, b: 2, c: { d: 'abc' } });
+
+    workspace.extensions['x-baz'] = Object.assign(value, { x: 9, y: 8, z: 7 });
+    expect(workspace.extensions['x-baz'])
+      .toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/x-baz')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+    }
+  });
+
+  it('tracks complex extension additions with spread operator', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const value = { a: 1, b: 2, c: { d: 'abc' } };
+    workspace.extensions['x-baz'] = value;
+    expect(workspace.extensions['x-baz']).toEqual({ a: 1, b: 2, c: { d: 'abc' } });
+
+    workspace.extensions['x-baz'] = { ...value, ...{ x: 9, y: 8 }, z: 7 };
+    expect(workspace.extensions['x-baz'])
+      .toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/x-baz')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+    }
+  });
+
+  it('tracks modifying an existing extension object with spread operator', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-foo'] = {
+      ...workspace.extensions['x-foo'] as JsonObject,
+      ...{ x: 9, y: 8 }, z: 7 };
+    expect(workspace.extensions['x-foo'])
+      .toEqual({ is: ['good', 'great', 'awesome'], x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/x-foo')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('replace');
+      expect(change.value).toEqual({ is: ['good', 'great', 'awesome'], x: 9, y: 8, z: 7 });
+    }
+  });
+
+  it('tracks modifying an existing extension object with Object.assign target', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    Object.assign(
+      workspace.extensions['x-foo'],
+      { x: 9, y: 8 },
+      { z: 7 },
+    );
+    expect(workspace.extensions['x-foo'])
+      .toEqual({ is: ['good', 'great', 'awesome'], x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(3);
+
+    let change = metadata.findChangesForPath('/x-foo/x')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(9);
+    }
+
+    change = metadata.findChangesForPath('/x-foo/y')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(8);
+    }
+
+    change = metadata.findChangesForPath('/x-foo/z')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(7);
+    }
+  });
+
+  it('tracks modifying an existing extension object with Object.assign return', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-foo'] = Object.assign(
+      workspace.extensions['x-foo'],
+      { x: 9, y: 8 },
+      { z: 7 },
+    );
+    expect(workspace.extensions['x-foo'])
+      .toEqual({ is: ['good', 'great', 'awesome'], x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(3);
+
+    let change = metadata.findChangesForPath('/x-foo/x')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(9);
+    }
+
+    change = metadata.findChangesForPath('/x-foo/y')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(8);
+    }
+
+    change = metadata.findChangesForPath('/x-foo/z')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(7);
+    }
+  });
+
   it('tracks add and remove of an existing extension object', async () => {
     const host = createTestHost(basicFile);