@turbox3d/shared
Advanced tools
Comparing version 1.1.6 to 1.1.7
import _typeof from "@babel/runtime/helpers/esm/typeof"; | ||
/* eslint-disable @typescript-eslint/no-use-before-define */ | ||
function isMergeableObject(val) { | ||
@@ -11,3 +12,2 @@ var nonNullObject = val && _typeof(val) === 'object'; | ||
var clone = optionsArgument && optionsArgument.clone === true; | ||
// eslint-disable-next-line @typescript-eslint/no-use-before-define | ||
return clone && isMergeableObject(value) ? deepMerge(emptyTarget(value), value, optionsArgument) : value; | ||
@@ -21,3 +21,2 @@ } | ||
} else if (isMergeableObject(e)) { | ||
// eslint-disable-next-line @typescript-eslint/no-use-before-define | ||
destination[i] = deepMerge(target[i], e, optionsArgument); | ||
@@ -41,3 +40,2 @@ } else if (target.indexOf(e) === -1) { | ||
} else { | ||
// eslint-disable-next-line @typescript-eslint/no-use-before-define | ||
destination[key] = deepMerge(target[key], source[key], optionsArgument); | ||
@@ -44,0 +42,0 @@ } |
@@ -9,2 +9,3 @@ "use strict"; | ||
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof")); | ||
/* eslint-disable @typescript-eslint/no-use-before-define */ | ||
function isMergeableObject(val) { | ||
@@ -19,3 +20,2 @@ var nonNullObject = val && (0, _typeof2["default"])(val) === 'object'; | ||
var clone = optionsArgument && optionsArgument.clone === true; | ||
// eslint-disable-next-line @typescript-eslint/no-use-before-define | ||
return clone && isMergeableObject(value) ? deepMerge(emptyTarget(value), value, optionsArgument) : value; | ||
@@ -29,3 +29,2 @@ } | ||
} else if (isMergeableObject(e)) { | ||
// eslint-disable-next-line @typescript-eslint/no-use-before-define | ||
destination[i] = deepMerge(target[i], e, optionsArgument); | ||
@@ -49,3 +48,2 @@ } else if (target.indexOf(e) === -1) { | ||
} else { | ||
// eslint-disable-next-line @typescript-eslint/no-use-before-define | ||
destination[key] = deepMerge(target[key], source[key], optionsArgument); | ||
@@ -52,0 +50,0 @@ } |
{ | ||
"name": "@turbox3d/shared", | ||
"version": "1.1.6", | ||
"version": "1.1.7", | ||
"description": "turbox shared internal utility", | ||
@@ -35,5 +35,5 @@ "main": "./lib/index.js", | ||
"ts-jest": "^24.3.0", | ||
"typescript": "^4.9.5", | ||
"webpack": "^4.47.0", | ||
"webpack-cli": "^3.3.12" | ||
"typescript": "4.6.4", | ||
"webpack": "4.42.1", | ||
"webpack-cli": "~3.3.12" | ||
}, | ||
@@ -40,0 +40,0 @@ "files": [ |
@@ -0,1 +1,2 @@ | ||
/* eslint-disable @typescript-eslint/no-use-before-define */ | ||
function isMergeableObject(val) { | ||
@@ -15,3 +16,2 @@ const nonNullObject = val && typeof val === 'object'; | ||
const clone = optionsArgument && optionsArgument.clone === true; | ||
// eslint-disable-next-line @typescript-eslint/no-use-before-define | ||
return (clone && isMergeableObject(value)) ? deepMerge(emptyTarget(value), value, optionsArgument) : value; | ||
@@ -26,3 +26,2 @@ } | ||
} else if (isMergeableObject(e)) { | ||
// eslint-disable-next-line @typescript-eslint/no-use-before-define | ||
destination[i] = deepMerge(target[i], e, optionsArgument); | ||
@@ -47,3 +46,2 @@ } else if (target.indexOf(e) === -1) { | ||
} else { | ||
// eslint-disable-next-line @typescript-eslint/no-use-before-define | ||
destination[key] = deepMerge(target[key], source[key], optionsArgument); | ||
@@ -50,0 +48,0 @@ } |
@@ -7,3 +7,3 @@ export interface IConstructorOf<T> { | ||
} | ||
export type Nullable<T> = { | ||
export declare type Nullable<T> = { | ||
[K in keyof T]?: T[K] | null; | ||
@@ -10,0 +10,0 @@ }; |
74258
2321