Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/utils/set-deep.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ function findSiblings(target: any, keys: string[]) {
.reduce((acc, key) => {
acc[key] = target[key];
return acc;
}, Object.create(null));
}, Object.create(target));

return { ...remaining };
return remaining;
}

function isValidKey(key: unknown) {
Expand Down
42 changes: 42 additions & 0 deletions test/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,48 @@ describe('Unit | Utility | changeset', () => {
expect(dummyModel.name.short).toBe('foo');
});

it('#set works for nested class instances', () => {
class Person {
public name: Name;
public age: number;
public original: object;

constructor(name: Name, age: number, org: object) {
this.name = name;
this.age = age;
this.original = org;
}
}

class Name {
public current: object;

constructor(current: object) {
this.current = current;
}
}

const expectedChanges = new Person(new Name({ short: 'bar' }), 30, {});
dummyModel.name = {};
dummyModel.org = {};
dummyModel.age = 30;
const dummyChangeset = Changeset(dummyModel);
const expectedName = new Name({ short: 'foo' });
dummyChangeset.set('name', expectedName);

expect(dummyChangeset.get('name.current.short')).toBe('foo');
expect(dummyChangeset.get('name')).toEqual(expectedName);
dummyChangeset.set('name.current.short', 'bar');

const changes = dummyChangeset.change;
expect(changes.name).toEqual(expectedChanges.name);
expect(dummyChangeset.name).toEqual(expectedChanges.name);
expect(dummyChangeset.age).toEqual(expectedChanges.age);
expect(dummyChangeset.org).toEqual({});

expect(dummyModel.name).toEqual({});
});

it('#set overrides', () => {
const expectedChanges = [{ key: 'age', value: '90' }];
let dummyChangeset = Changeset({ age: '10' });
Expand Down
42 changes: 42 additions & 0 deletions test/validated.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,48 @@ describe('Unit | Utility | validation changeset', () => {
expect(dummyModel.name.short).toBe('foo');
});

it('#set works for nested class instances', () => {
class Person {
public name: Name;
public age: number;
public original: object;

constructor(name: Name, age: number, org: object) {
this.name = name;
this.age = age;
this.original = org;
}
}

class Name {
public current: object;

constructor(current: object) {
this.current = current;
}
}

const expectedChanges = new Person(new Name({ short: 'bar' }), 30, {});
dummyModel.name = {};
dummyModel.org = {};
dummyModel.age = 30;
const dummyChangeset = Changeset(dummyModel);
const expectedName = new Name({ short: 'foo' });
dummyChangeset.set('name', expectedName);

expect(dummyChangeset.get('name.current.short')).toBe('foo');
expect(dummyChangeset.get('name')).toEqual(expectedName);
dummyChangeset.set('name.current.short', 'bar');

const changes = dummyChangeset.changes;
expect(changes.name.current).toEqual(expectedChanges.name);
expect(dummyChangeset.name).toEqual(expectedChanges.name);
expect(dummyChangeset.age).toEqual(expectedChanges.age);
expect(dummyChangeset.org).toEqual({});

expect(dummyModel.name).toEqual({});
});

it('#set overrides', () => {
const expectedChanges = { age: { current: '90', original: '10' } };
let dummyChangeset = Changeset({ age: '10' });
Expand Down