deepmerge-plus
Advanced tools
Comparing version 2.0.1 to 2.0.2
@@ -38,3 +38,3 @@ var isMergeableObject = function isMergeableObject(value) { | ||
if (optionsArgument && optionsArgument.isMergeableObject) { | ||
ret = optionsArgument.isMergeableObject(value, optionsArgument, key); | ||
ret = optionsArgument.isMergeableObject(value, isMergeableObject, optionsArgument, key); | ||
} | ||
@@ -41,0 +41,0 @@ if (ret === null || typeof ret === 'undefined') { |
@@ -44,3 +44,3 @@ (function (global, factory) { | ||
if (optionsArgument && optionsArgument.isMergeableObject) { | ||
ret = optionsArgument.isMergeableObject(value, optionsArgument, key); | ||
ret = optionsArgument.isMergeableObject(value, isMergeableObject, optionsArgument, key); | ||
} | ||
@@ -47,0 +47,0 @@ if (ret === null || typeof ret === 'undefined') { |
@@ -7,6 +7,6 @@ declare function deepmerge<T>(x: Partial<T>, y: Partial<T>, options?: deepmerge.Options): T; | ||
arrayMerge?(destination: any[], source: any[], options?: Options): any[]; | ||
isMergeableObject?(value: any, optionsArgument?: Options, key?: any): void; | ||
isMergeableObject?(value: any, optionsArgument?: Options, key?: any): boolean; | ||
isMergeableObject?(value: any, isMergeableObject: (value) => boolean, optionsArgument?: Options, key?: any): void; | ||
isMergeableObject?(value: any, isMergeableObject: (value) => boolean, optionsArgument?: Options, key?: any): boolean; | ||
} | ||
const isMergeable: any; | ||
const isMergeable: (value) => boolean; | ||
const all: <T>(array: Partial<T>[], optionsArgument?: Options) => T; | ||
@@ -13,0 +13,0 @@ } |
@@ -15,3 +15,3 @@ "use strict"; | ||
if (optionsArgument && optionsArgument.isMergeableObject) { | ||
ret = optionsArgument.isMergeableObject(value, optionsArgument, key); | ||
ret = optionsArgument.isMergeableObject(value, isMergeableObject, optionsArgument, key); | ||
} | ||
@@ -18,0 +18,0 @@ if (ret === null || typeof ret === 'undefined') { |
16
index.ts
@@ -8,3 +8,3 @@ import * as isMergeableObject from 'is-mergeable-object'; | ||
function cloneUnlessOtherwiseSpecified(value, optionsArgument, key?) | ||
function cloneUnlessOtherwiseSpecified(value, optionsArgument: deepmerge.Options, key?) | ||
{ | ||
@@ -18,3 +18,3 @@ let clone = !optionsArgument || optionsArgument.clone !== false; | ||
function _isMergeableObject(value, optionsArgument, key?) | ||
function _isMergeableObject(value, optionsArgument: deepmerge.Options, key?) | ||
{ | ||
@@ -24,3 +24,3 @@ let ret; | ||
{ | ||
ret = optionsArgument.isMergeableObject(value, optionsArgument, key) | ||
ret = optionsArgument.isMergeableObject(value, isMergeableObject, optionsArgument, key) | ||
} | ||
@@ -34,3 +34,3 @@ if (ret === null || typeof ret === 'undefined') | ||
function defaultArrayMerge(target, source, optionsArgument) | ||
function defaultArrayMerge(target, source, optionsArgument: deepmerge.Options) | ||
{ | ||
@@ -43,3 +43,3 @@ return target.concat(source).map(function (element, index) | ||
function mergeObject(target, source, optionsArgument) | ||
function mergeObject(target, source, optionsArgument: deepmerge.Options) | ||
{ | ||
@@ -100,8 +100,8 @@ let destination = {}; | ||
isMergeableObject?(value, optionsArgument?: Options, key?): void; | ||
isMergeableObject?(value, isMergeableObject: (value) => boolean, optionsArgument?: Options, key?): void; | ||
isMergeableObject?(value, optionsArgument?: Options, key?): boolean; | ||
isMergeableObject?(value, isMergeableObject: (value) => boolean, optionsArgument?: Options, key?): boolean; | ||
} | ||
export const isMergeable = isMergeableObject; | ||
export const isMergeable: (value) => boolean = isMergeableObject; | ||
@@ -108,0 +108,0 @@ export const all = function deepmergeAll<T>(array: Array<Partial<T>>, optionsArgument?: Options): T |
{ | ||
"name": "deepmerge-plus", | ||
"version": "2.0.1", | ||
"version": "2.0.2", | ||
"description": "A library for deep (recursive) merging of Javascript objects", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -0,0 +0,0 @@ { |
27244