Update TypeScript types to go along with #168

TehShrike · Oct 22, 2019 · dacb4bc · dacb4bc
1 parent d7fe2d3
commit dacb4bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;
 	},
 };