From dacb4bcfa4090cf033eb8c66084162d2f2e11b3c Mon Sep 17 00:00:00 2001 From: Josh Duff Date: Tue, 22 Oct 2019 17:21:18 -0500 Subject: [PATCH] Update TypeScript types to go along with #168 --- index.d.ts | 2 +- test/typescript.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.d.ts b/index.d.ts index 7412fcf..20f645a 100644 --- a/index.d.ts +++ b/index.d.ts @@ -6,7 +6,7 @@ declare namespace deepmerge { arrayMerge?(target: any[], source: any[], options?: Options): any[]; clone?: boolean; customMerge?: (key: string, options?: Options) => ((x: any, y: any) => any) | undefined; - isMergeableObject?(value: object): boolean; + isMergeable?(value: object): boolean; } export function all (objects: object[], options?: Options): object; diff --git a/test/typescript.ts b/test/typescript.ts index 23d2c5c..f562095 100644 --- a/test/typescript.ts +++ b/test/typescript.ts @@ -31,7 +31,7 @@ merged3.wat; const options1: merge.Options = { clone: true, - isMergeableObject (obj) { + isMergeable (obj) { return false; }, }; @@ -40,12 +40,12 @@ const options2: merge.Options = { arrayMerge (target, source, options) { target.length; source.length; - options.isMergeableObject(target); + options.isMergeable(target); return []; }, clone: true, - isMergeableObject (obj) { + isMergeable (obj) { return false; }, };