@nu-art/ts-common 0.204.152 → 0.204.154

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/ts-common",
-  "version": "0.204.152",
+  "version": "0.204.154",
   "description": "js and ts infra",
   "keywords": [
     "TacB0sS",

package/utils/merge-tools.d.ts

@@ -1,3 +1,3 @@
-export declare function mergeObject(original: any, override: any): any;
+export declare function mergeObject(original: any, override: any, unsafe?: boolean): any;
 export declare function mergeArray(original: any[], override: any[]): any[];
-export declare function merge(original: any, override: any): any;
+export declare function merge(original: any, override: any, unsafe?: boolean): any;

package/utils/merge-tools.js

@@ -23,7 +23,7 @@ exports.merge = merge;
 const object_tools_1 = require("./object-tools");
 const tools_1 = require("./tools");
 const exceptions_1 = require("../core/exceptions/exceptions");
-function mergeObject(original, override) {
+function mergeObject(original, override, unsafe = false) {
     if (original === override) {
         return override;
     }
@@ -31,7 +31,7 @@ function mergeObject(original, override) {
         return (0, object_tools_1.filterKeys)(override);
     const returnValue = (0, object_tools_1.deepClone)(original);
     return Object.keys(override).reduce((obj, key) => {
-        obj[key] = merge(original[key], override[key]);
+        obj[key] = merge(original[key], override[key], unsafe);
         if (obj[key] === undefined)
             delete obj[key];
         return obj;
@@ -58,16 +58,16 @@ function mergeArray(original, override) {
     // });
     return override;
 }
-function merge(original, override) {
+function merge(original, override, unsafe = false) {
     if (!(0, tools_1.exists)(override))
         return undefined;
     if (!(0, tools_1.exists)(original))
         return typeof override === 'object' ? (0, object_tools_1.filterKeys)(override) : override;
-    if (typeof original !== typeof override || (typeof original === 'object' && typeof override === 'object' && Array.isArray(original) !== Array.isArray(override)))
+    if (((typeof original !== typeof override) && !unsafe) || (typeof original === 'object' && typeof override === 'object' && Array.isArray(original) !== Array.isArray(override)))
         throw new exceptions_1.BadImplementationException(`trying to merge object of different types!! \n Original: ${JSON.stringify(original)}\n Override: ${JSON.stringify(override)}`);
     if (Array.isArray(original) && Array.isArray(override))
         return mergeArray(original, override);
     if (typeof original === 'object' && typeof override === 'object' && !Array.isArray(original) && !Array.isArray(override))
-        return mergeObject(original || {}, override);
+        return mergeObject(original || {}, override, unsafe);
     return override;
 }