@alarido/ts-utils 1.0.1 → 1.0.2
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compares.d.ts","sourceRoot":"","sources":["../../src/functions/compares.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,EAAE,GAAG,CAAC;CACjB;AAED;;GAEG;AACH,cAAM,YAAY;;IAGd;;;;;;;;;OASG;IACH,kBAAkB,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,aAAa,GAAE,OAAe,GAAG,kBAAkB,EAAE;
|
|
1
|
+
{"version":3,"file":"compares.d.ts","sourceRoot":"","sources":["../../src/functions/compares.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,EAAE,GAAG,CAAC;CACjB;AAED;;GAEG;AACH,cAAM,YAAY;;IAGd;;;;;;;;;OASG;IACH,kBAAkB,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,aAAa,GAAE,OAAe,GAAG,kBAAkB,EAAE;IA6D1F;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,GAAG,OAAO;IAQxC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,OAAO;CAK1C;AAED,eAAO,MAAM,QAAQ,cAAqB,CAAC"}
|
|
@@ -22,6 +22,7 @@ class CompareUtils {
|
|
|
22
22
|
const keys_a = Object.keys(sa);
|
|
23
23
|
const keys_b = Object.keys(sb);
|
|
24
24
|
const is_object = (obj) => obj != null && typeof obj === 'object';
|
|
25
|
+
const regx = /\.(0[Xx][0-9A-Fa-f]+|\d+)/g;
|
|
25
26
|
let result = [];
|
|
26
27
|
if (keys_a.length !== keys_b.length) {
|
|
27
28
|
return [{
|
|
@@ -58,8 +59,10 @@ class CompareUtils {
|
|
|
58
59
|
if (inequal) {
|
|
59
60
|
if (sublist.length > 0) {
|
|
60
61
|
for (const sub of sublist) {
|
|
62
|
+
const subn = key + "." + sub.name;
|
|
63
|
+
let subname = regx.test(subn) ? subn.replace(regx, "[$1]") : subn;
|
|
61
64
|
result.push({
|
|
62
|
-
name:
|
|
65
|
+
name: (subname),
|
|
63
66
|
value: (sub.oldValue),
|
|
64
67
|
oldValue: (sub.value)
|
|
65
68
|
});
|
|
@@ -67,9 +70,9 @@ class CompareUtils {
|
|
|
67
70
|
}
|
|
68
71
|
else {
|
|
69
72
|
result.push({
|
|
70
|
-
name:
|
|
71
|
-
value: (
|
|
72
|
-
oldValue: (
|
|
73
|
+
name: (key),
|
|
74
|
+
value: (val_a),
|
|
75
|
+
oldValue: (val_b)
|
|
73
76
|
});
|
|
74
77
|
}
|
|
75
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compares.js","sourceRoot":"","sources":["../../src/functions/compares.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAS/B,CAAC;AAEF;;GAEG;AACH,MAAM,YAAY;IACd,gBAAe,CAAC;IAEhB;;;;;;;;;OASG;IACH,kBAAkB,CAAC,EAAO,EAAE,EAAO,EAAE,gBAAyB,KAAK;QAC/D,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,CAAC;QACvE,IAAI,MAAM,GAAyB,EAAE,CAAC;QAEtC,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;YAClC,OAAO,CAAC;oBACJ,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,CAAC,EAAE,CAAC;oBACX,QAAQ,EAAE,CAAC,EAAE,CAAC;iBACjB,CAAC,CAAC;QACP,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACvB,MAAM,KAAK,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;YACtB,MAAM,KAAK,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;YACtB,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,IAAI,OAAO,GAA0B,EAAE,CAAC;YACxC,EAAE;YACF,IAAI,KAAK,YAAY,IAAI,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;gBACjD,OAAO,GAAG,CAAE,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/C,CAAC;iBAAM,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;gBAC/B,MAAM,MAAM,GAAG,aAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAClC,OAAO,GAAG,CAAE,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAChD,CAAC;iBAAM,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;gBAC/B,MAAM,MAAM,GAAG,aAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAClC,OAAO,GAAG,CAAE,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAChD,CAAC;iBAAM,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9C,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBAChD,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,CAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;YACvE,CAAC;YACD,EAAE;YACF,IAAI,OAAO,EAAE,CAAC;gBACV,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACrB,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;wBACxB,MAAM,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"compares.js","sourceRoot":"","sources":["../../src/functions/compares.ts"],"names":[],"mappings":"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"}
|