Fix snapshot/restore methods to separate keys and values

adopted-ember-addons · Aug 4, 2022 · 1ec241d · 1ec241d
1 parent 6dd774f
commit 1ec241d
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 25 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -721,22 +721,15 @@ export class BufferedChangeset implements IChangeset {
     return this;
   }
 
-  private getChangesFromSnapshot(changes: Changes) {
-    return keys(changes).reduce((newObj, key) => {
-      newObj[key] = this.getChangeForProp(changes[key]);
-      return newObj;
-    }, {} as Changes);
-  }
-
-  private getChangeForProp(value: any) {
+  private getChangesFromSnapshot(value: any) {
     if (!isObject(value)) {
       return new Change(value);
     }
 
     return keys(value).reduce((newObj, key) => {
-      newObj[key] = this.getChangeForProp(value[key]);
+      newObj[key] = this.getChangesFromSnapshot(value[key]);
       return newObj;
-    }, {} as Changes);
+    }, Object.create(value, {}) as Changes);
   }
 
   /**

diff --git a/src/validated.ts b/src/validated.ts
@@ -527,22 +527,15 @@ export class ValidatedChangeset {
     return this;
   }
 
-  private getChangesFromSnapshot(changes: Changes) {
-    return keys(changes).reduce((newObj, key) => {
-      newObj[key] = this.getChangeForProp(changes[key]);
-      return newObj;
-    }, {} as Changes);
-  }
-
-  private getChangeForProp(value: any) {
+  private getChangesFromSnapshot(value: any) {
     if (!isObject(value)) {
       return new Change(value);
     }
 
     return keys(value).reduce((newObj, key) => {
-      newObj[key] = this.getChangeForProp(value[key]);
+      newObj[key] = this.getChangesFromSnapshot(value[key]);
       return newObj;
-    }, {} as Changes);
+    }, Object.create(value, {}) as Changes);
   }
 
   /**

diff --git a/test/index.test.ts b/test/index.test.ts
@@ -3277,6 +3277,32 @@ describe('Unit | Utility | changeset', () => {
     ]);
   });
 
+  it('#restore restores a snapshot of the changeset when nested value is a class instance', () => {
+    class Country {
+      constructor(public id: string, public name: string) {}
+    }
+    let us = new Country('US', 'United States');
+    let prk = new Country('PRK', 'North Korea');
+    let aus = new Country('AUS', 'Australia');
+
+    let user = {
+      name: 'Adam',
+      address: { country: us }
+    };
+    let changeset = Changeset(user);
+    changeset.set('name', 'Jim Bob');
+    changeset.set('address.country', prk);
+    let snapshot1 = changeset.snapshot();
+
+    changeset.set('name', 'Poteto');
+    changeset.set('address.country', aus);
+
+    changeset.restore(snapshot1);
+
+    expect(changeset.get('name')).toBe('Jim Bob');
+    expect(changeset.get('address.country')).toStrictEqual(prk);
+  });
+
   /**
    * #cast
    */

diff --git a/test/validated.test.ts b/test/validated.test.ts
@@ -2455,13 +2455,13 @@ describe('Unit | Utility | validation changeset', () => {
     expect(snapshot).toEqual(expectedResult);
   });
 
-  // /**
-  //  * #restore
-  //  */
+  /**
+   * #restore
+   */
 
   // it('#restore restores a snapshot of the changeset', () => {
-  //   let dummyChangesetA = Changeset(dummyModel));
-  //   let dummyChangesetB = Changeset(dummyModel));
+  //   let dummyChangesetA = Changeset(dummyModel);
+  //   let dummyChangesetB = Changeset(dummyModel);
   //   dummyChangesetA.set('name', 'Pokemon Go');
   //   dummyChangesetA.set('password', false);
   //   let snapshot = dummyChangesetA.snapshot();
@@ -2497,6 +2497,32 @@ describe('Unit | Utility | validation changeset', () => {
   //   ]);
   // });
 
+  it('#restore restores a snapshot of the changeset when nested value is a class instance', () => {
+    class Country {
+      constructor(public id: string, public name: string) {}
+    }
+    let us = new Country('US', 'United States');
+    let prk = new Country('PRK', 'North Korea');
+    let aus = new Country('AUS', 'Australia');
+
+    let user = {
+      name: 'Adam',
+      address: { country: us }
+    };
+    let changeset = Changeset(user);
+    changeset.set('name', 'Jim Bob');
+    changeset.set('address.country', prk);
+    let snapshot1 = changeset.snapshot();
+
+    changeset.set('name', 'Poteto');
+    changeset.set('address.country', aus);
+
+    changeset.restore(snapshot1);
+
+    expect(changeset.get('name')).toBe('Jim Bob');
+    expect(changeset.get('address.country')).toStrictEqual(prk);
+  });
+
   // /**
   //  * #cast
   //  */