@nu-art/ts-common 0.102.94 → 0.102.95
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/utils/merge-tools.js +5 -9
- package/utils/merge-tools.js.map +1 -1
package/package.json
CHANGED
package/utils/merge-tools.js
CHANGED
|
@@ -21,9 +21,7 @@ exports.merge = exports.mergeArray = exports.mergeObject = void 0;
|
|
|
21
21
|
var index_1 = require("../index");
|
|
22
22
|
function mergeObject(original, override) {
|
|
23
23
|
if (original === override) {
|
|
24
|
-
|
|
25
|
-
console.log("Override: " + JSON.stringify(override));
|
|
26
|
-
throw new index_1.BadImplementationException("trying to merge same Object instance\n Original: ".concat(typeof original, "\n Override: ").concat(typeof override));
|
|
24
|
+
return override;
|
|
27
25
|
}
|
|
28
26
|
var returnValue = (0, index_1.deepClone)(original);
|
|
29
27
|
return Object.keys(override).reduce(function (obj, key) {
|
|
@@ -36,9 +34,7 @@ function mergeObject(original, override) {
|
|
|
36
34
|
exports.mergeObject = mergeObject;
|
|
37
35
|
function mergeArray(original, override) {
|
|
38
36
|
if (original === override) {
|
|
39
|
-
|
|
40
|
-
console.log("Override: " + JSON.stringify(override));
|
|
41
|
-
throw new index_1.BadImplementationException("trying to merge same Array instance\n Original: ".concat(typeof original, "\n Override: ").concat(typeof override));
|
|
37
|
+
return override;
|
|
42
38
|
}
|
|
43
39
|
// const returnValue = deepClone(original);
|
|
44
40
|
// returnValue.reduce((array, value) => {
|
|
@@ -63,11 +59,11 @@ function merge(original, override) {
|
|
|
63
59
|
return undefined;
|
|
64
60
|
if (!(0, index_1.exists)(original))
|
|
65
61
|
return override;
|
|
66
|
-
if (typeof original !== typeof override || (typeof original ===
|
|
67
|
-
throw new index_1.BadImplementationException("trying to merge object of different types!! \\n Original: ".concat(
|
|
62
|
+
if (typeof original !== typeof override || (typeof original === 'object' && typeof override === 'object' && Array.isArray(original) !== Array.isArray(override)))
|
|
63
|
+
throw new index_1.BadImplementationException("trying to merge object of different types!! \\n Original: ".concat(JSON.stringify(original), "\\n Override: ").concat(JSON.stringify(override)));
|
|
68
64
|
if (Array.isArray(original) && Array.isArray(override))
|
|
69
65
|
return mergeArray(original, override);
|
|
70
|
-
if (typeof original ===
|
|
66
|
+
if (typeof original === 'object' && typeof override === 'object' && !Array.isArray(original) && !Array.isArray(override))
|
|
71
67
|
return mergeObject(original || {}, override);
|
|
72
68
|
return override;
|
|
73
69
|
}
|
package/utils/merge-tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-tools.js","sourceRoot":"","sources":["../../src/main/utils/merge-tools.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"merge-tools.js","sourceRoot":"","sources":["../../src/main/utils/merge-tools.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAEH,kCAIkB;AAGlB,SAAgB,WAAW,CAAC,QAAa,EAAE,QAAa;IACvD,IAAI,QAAQ,KAAK,QAAQ,EAAE;QAC1B,OAAO,QAAQ,CAAC;KAChB;IAED,IAAM,WAAW,GAAG,IAAA,iBAAS,EAAC,QAAQ,CAAC,CAAC;IACxC,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,GAAG;QAC5C,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAE/C,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS;YACzB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;QAEjB,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,WAAW,CAAC,CAAC;AACjB,CAAC;AAdD,kCAcC;AAED,SAAgB,UAAU,CAAC,QAAe,EAAE,QAAe;IAC1D,IAAI,QAAQ,KAAK,QAAQ,EAAE;QAC1B,OAAO,QAAQ,CAAC;KAChB;IAED,2CAA2C;IAC3C,yCAAyC;IACzC,wBAAwB;IACxB,SAAS;IACT,OAAO;IACP,4BAA4B;IAC5B,EAAE;IACF,yCAAyC;IACzC,kCAAkC;IAClC,EAAE;IACF,wCAAwC;IACxC,gCAAgC;IAChC,6DAA6D;IAC7D,OAAO;IACP,MAAM;IAEN,OAAO,QAAQ,CAAC;AACjB,CAAC;AAtBD,gCAsBC;AAED,SAAgB,KAAK,CAAC,QAAa,EAAE,QAAa;IACjD,IAAI,CAAC,IAAA,cAAM,EAAC,QAAQ,CAAC;QACpB,OAAO,SAAS,CAAC;IAElB,IAAI,CAAC,IAAA,cAAM,EAAC,QAAQ,CAAC;QACpB,OAAO,QAAQ,CAAC;IAEjB,IAAI,OAAO,QAAQ,KAAK,OAAO,QAAQ,IAAI,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/J,MAAM,IAAI,kCAA0B,CAAC,oEAA6D,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,2BAAiB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAE,CAAC,CAAC;IAExK,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QACrD,OAAO,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAEvC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QACvH,OAAO,WAAW,CAAC,QAAQ,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;IAE9C,OAAO,QAAQ,CAAC;AACjB,CAAC;AAjBD,sBAiBC"}
|