Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: correctly merge the date key #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
171h wants to merge 1 commit into from
Closed

fix: correctly merge the date key #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/defu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ function isObject(value: any) {
return value !== null && typeof value === "object";
}

function isDate(value: any) {
return Object.prototype.toString.call(value) === "[object Date]";
}

// Base function to apply defaults
function _defu<T>(
baseObject: T,
Expand All @@ -14,7 +18,9 @@ function _defu<T>(
if (!isObject(defaults)) {
return _defu(baseObject, {}, namespace, merger);
}

if (isDate(defaults)) {
return baseObject || defaults;
}
const object = Object.assign({}, defaults);

for (const key in baseObject) {
Expand Down
6 changes: 6 additions & 0 deletions test/defu.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ describe("defu", () => {
expectTypeOf(result).toEqualTypeOf<{ a: string; d: string }>();
});

it('should return date value by Object.assign', () => {
const defaultObj = { date: new Date('2021-01-01'), date2: new Date('2021-01-02') }
const obj2 = { date: new Date('2021-01-03') }
expect(defu(obj2, defaultObj)).toEqual({ date:obj2.date, date2:defaultObj.date2 })
})

it("should fill in values that are null", () => {
const result1 = defu({ a: null as null }, { a: "c", d: "c" });
expect(result1).toEqual({ a: "c", d: "c" });
Expand Down