@rimbu/deep 0.13.1 → 0.14.1
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/README.md +0 -4
- package/dist/main/match.js +25 -23
- package/dist/main/match.js.map +1 -1
- package/dist/main/patch.js +3 -1
- package/dist/main/patch.js.map +1 -1
- package/dist/module/match.js +25 -23
- package/dist/module/match.js.map +1 -1
- package/dist/module/patch.js +3 -1
- package/dist/module/patch.js.map +1 -1
- package/dist/types/match.d.ts +1 -1
- package/dist/types/patch.d.ts +1 -1
- package/dist/types/protected.d.ts +1 -1
- package/dist/types/selector.d.ts +1 -1
- package/dist/types/tuple.d.ts +1 -1
- package/package.json +5 -9
- package/src/match.ts +74 -72
- package/src/patch.ts +4 -1
package/README.md
CHANGED
|
@@ -57,10 +57,6 @@ To run your script (let's assume the entry point is in `src/main.ts`):
|
|
|
57
57
|
|
|
58
58
|
`deno run --import-map import_map.json src/main.ts`
|
|
59
59
|
|
|
60
|
-
Because Rimbu uses advanced types, this may slow down the type checking part when running your code. If you're able to rely on your code editor to provide type errors, you can skip the Deno type check using the `--no-check` flag:
|
|
61
|
-
|
|
62
|
-
`deno run --import-map import_map.json --no-check src/main.ts`
|
|
63
|
-
|
|
64
60
|
## Usage
|
|
65
61
|
|
|
66
62
|
```ts
|
package/dist/main/match.js
CHANGED
|
@@ -98,29 +98,31 @@ function matchArr(source, parent, root, matcher, failureLog) {
|
|
|
98
98
|
return true;
|
|
99
99
|
}
|
|
100
100
|
// matcher is plain object
|
|
101
|
-
if (
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
101
|
+
if (typeof matcher === 'object' && null !== matcher) {
|
|
102
|
+
if ("every" in matcher) {
|
|
103
|
+
return matchCompound(source, parent, root, tslib_1.__spreadArray(['every'], tslib_1.__read(matcher.every), false), failureLog);
|
|
104
|
+
}
|
|
105
|
+
if ("some" in matcher) {
|
|
106
|
+
return matchCompound(source, parent, root, tslib_1.__spreadArray(['some'], tslib_1.__read(matcher.some), false), failureLog);
|
|
107
|
+
}
|
|
108
|
+
if ("none" in matcher) {
|
|
109
|
+
return matchCompound(source, parent, root, tslib_1.__spreadArray(['none'], tslib_1.__read(matcher.none), false), failureLog);
|
|
110
|
+
}
|
|
111
|
+
if ("single" in matcher) {
|
|
112
|
+
return matchCompound(source, parent, root, tslib_1.__spreadArray(['single'], tslib_1.__read(matcher.single), false), failureLog);
|
|
113
|
+
}
|
|
114
|
+
if ("someItem" in matcher) {
|
|
115
|
+
return matchTraversal(source, root, 'someItem', matcher.someItem, failureLog);
|
|
116
|
+
}
|
|
117
|
+
if ("everyItem" in matcher) {
|
|
118
|
+
return matchTraversal(source, root, 'everyItem', matcher.everyItem, failureLog);
|
|
119
|
+
}
|
|
120
|
+
if ("noneItem" in matcher) {
|
|
121
|
+
return matchTraversal(source, root, 'noneItem', matcher.noneItem, failureLog);
|
|
122
|
+
}
|
|
123
|
+
if ("singleItem" in matcher) {
|
|
124
|
+
return matchTraversal(source, root, 'singleItem', matcher.singleItem, failureLog);
|
|
125
|
+
}
|
|
124
126
|
}
|
|
125
127
|
// matcher is plain object with index keys
|
|
126
128
|
for (var index in matcher) {
|
package/dist/main/match.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/match.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/match.ts"],"names":[],"mappings":"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"}
|
package/dist/main/patch.js
CHANGED
|
@@ -70,11 +70,13 @@ function patchPlainObj(value, root, patchItem) {
|
|
|
70
70
|
var entry = patchItem_1_1.value;
|
|
71
71
|
// update root if needed
|
|
72
72
|
var currentRoot = value === root ? tslib_1.__assign({}, result) : root;
|
|
73
|
+
// keep current updated result as parent
|
|
74
|
+
var parent_1 = tslib_1.__assign({}, result);
|
|
73
75
|
// loop over all the patch keys
|
|
74
76
|
for (var key in entry) {
|
|
75
77
|
// patch the value at the given key with the patch at that key
|
|
76
78
|
var currentValue = result[key];
|
|
77
|
-
var newValue = patchEntry(currentValue,
|
|
79
|
+
var newValue = patchEntry(currentValue, parent_1, currentRoot, entry[key]);
|
|
78
80
|
if (!Object.is(currentValue, newValue)) {
|
|
79
81
|
// if value changed, set it in result and mark change
|
|
80
82
|
anyChange = true;
|
package/dist/main/patch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../src/patch.ts"],"names":[],"mappings":";;;;AAAA,oCAAyE;AAwFzE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,SAAgB,KAAK,CACnB,KAAQ,EACR,SAA4B;IAE5B,OAAO,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAqB,CAAC,CAAC;AAChE,CAAC;AALD,sBAKC;AAED,SAAS,UAAU,CACjB,KAAQ,EACR,MAAS,EACT,IAAO,EACP,SAAkC;IAElC,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;QAC/B,uDAAuD;QACvD,OAAO,KAAK,CAAC;KACd;IAED,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;QAC/B,wCAAwC;QACxC,OAAO,SAAc,CAAC;KACvB;IAED,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE;QACnC,mDAAmD;QACnD,IAAM,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAE5C,OAAO,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;KAC9C;IAED,IAAI,IAAA,iBAAU,EAAC,KAAK,CAAC,EAAE;QACrB,wBAAwB;QACxB,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,SAAgB,CAAC,CAAC;KACrD;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,0BAA0B;QAC1B,OAAO,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,SAAgB,CAAC,CAAC;KAChD;IAED,4CAA4C;IAE5C,OAAO,SAAc,CAAC;AACxB,CAAC;AAED,SAAS,aAAa,CACpB,KAAQ,EACR,IAAO,EACP,SAAiC;;IAEjC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC7B,2DAA2D;QAE3D,OAAO,SAAc,CAAC;KACvB;IAED,uCAAuC;IAEvC,uBAAuB;IACvB,IAAM,MAAM,wBAAQ,KAAK,CAAE,CAAC;IAE5B,IAAI,SAAS,GAAG,KAAK,CAAC;;QAEtB,6BAA6B;QAC7B,KAAoB,IAAA,cAAA,iBAAA,SAAS,CAAA,oCAAA,2DAAE;YAA1B,IAAM,KAAK,sBAAA;YACd,wBAAwB;YACxB,IAAM,WAAW,GAAI,KAAa,KAAK,IAAI,CAAC,CAAC,sBAAM,MAAM,EAAG,CAAC,CAAC,IAAI,CAAC;YAEnE,+BAA+B;YAC/B,KAAK,IAAM,GAAG,IAAI,KAAU,EAAE;gBAC5B,8DAA8D;gBAC9D,IAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjC,IAAM,QAAQ,GAAG,UAAU,CACzB,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../src/patch.ts"],"names":[],"mappings":";;;;AAAA,oCAAyE;AAwFzE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,SAAgB,KAAK,CACnB,KAAQ,EACR,SAA4B;IAE5B,OAAO,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAqB,CAAC,CAAC;AAChE,CAAC;AALD,sBAKC;AAED,SAAS,UAAU,CACjB,KAAQ,EACR,MAAS,EACT,IAAO,EACP,SAAkC;IAElC,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;QAC/B,uDAAuD;QACvD,OAAO,KAAK,CAAC;KACd;IAED,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;QAC/B,wCAAwC;QACxC,OAAO,SAAc,CAAC;KACvB;IAED,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE;QACnC,mDAAmD;QACnD,IAAM,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAE5C,OAAO,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;KAC9C;IAED,IAAI,IAAA,iBAAU,EAAC,KAAK,CAAC,EAAE;QACrB,wBAAwB;QACxB,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,SAAgB,CAAC,CAAC;KACrD;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,0BAA0B;QAC1B,OAAO,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,SAAgB,CAAC,CAAC;KAChD;IAED,4CAA4C;IAE5C,OAAO,SAAc,CAAC;AACxB,CAAC;AAED,SAAS,aAAa,CACpB,KAAQ,EACR,IAAO,EACP,SAAiC;;IAEjC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC7B,2DAA2D;QAE3D,OAAO,SAAc,CAAC;KACvB;IAED,uCAAuC;IAEvC,uBAAuB;IACvB,IAAM,MAAM,wBAAQ,KAAK,CAAE,CAAC;IAE5B,IAAI,SAAS,GAAG,KAAK,CAAC;;QAEtB,6BAA6B;QAC7B,KAAoB,IAAA,cAAA,iBAAA,SAAS,CAAA,oCAAA,2DAAE;YAA1B,IAAM,KAAK,sBAAA;YACd,wBAAwB;YACxB,IAAM,WAAW,GAAI,KAAa,KAAK,IAAI,CAAC,CAAC,sBAAM,MAAM,EAAG,CAAC,CAAC,IAAI,CAAC;YAEnE,wCAAwC;YACxC,IAAM,QAAM,wBAAQ,MAAM,CAAE,CAAC;YAE7B,+BAA+B;YAC/B,KAAK,IAAM,GAAG,IAAI,KAAU,EAAE;gBAC5B,8DAA8D;gBAC9D,IAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjC,IAAM,QAAQ,GAAG,UAAU,CACzB,YAAY,EACZ,QAAM,EACN,WAAW,EACV,KAAa,CAAC,GAAG,CAAC,CACpB,CAAC;gBAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE;oBACtC,qDAAqD;oBACrD,SAAS,GAAG,IAAI,CAAC;oBACjB,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;iBACxB;aACF;SACF;;;;;;;;;IAED,IAAI,SAAS,EAAE;QACb,sCAAsC;QACtC,OAAO,MAAM,CAAC;KACf;IAED,oCAAoC;IACpC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,QAAQ,CACf,KAAQ,EACR,IAAO,EACP,SAAiC;IAEjC,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,0BAA0B;QAC1B,mDAAmD;QAEnD,OAAO,SAAS,CAAC;KAClB;IAED,mBAAmB;IACnB,kEAAkE;IAClE,6CAA6C;IAE7C,iBAAiB;IACjB,IAAM,MAAM,GAAG,yCAAI,KAAK,SAAM,CAAC;IAC/B,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,qCAAqC;IACrC,KAAK,IAAM,KAAK,IAAI,SAAS,EAAE;QAC7B,IAAM,QAAQ,GAAG,KAAsB,CAAC;QAExC,qCAAqC;QACrC,IAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAM,QAAQ,GAAG,UAAU,CACzB,YAAY,EACZ,KAAK,EACL,IAAI,EACH,SAAiB,CAAC,KAAK,CAAC,CAC1B,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE;YACtC,qDAAqD;YACrD,SAAS,GAAG,IAAI,CAAC;YACjB,MAAM,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;SAC7B;KACF;IAED,IAAI,SAAS,EAAE;QACb,sCAAsC;QACtC,OAAO,MAAM,CAAC;KACf;IAED,oCAAoC;IACpC,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/dist/module/match.js
CHANGED
|
@@ -93,29 +93,31 @@ function matchArr(source, parent, root, matcher, failureLog) {
|
|
|
93
93
|
return true;
|
|
94
94
|
}
|
|
95
95
|
// matcher is plain object
|
|
96
|
-
if (
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
96
|
+
if (typeof matcher === 'object' && null !== matcher) {
|
|
97
|
+
if (`every` in matcher) {
|
|
98
|
+
return matchCompound(source, parent, root, ['every', ...matcher.every], failureLog);
|
|
99
|
+
}
|
|
100
|
+
if (`some` in matcher) {
|
|
101
|
+
return matchCompound(source, parent, root, ['some', ...matcher.some], failureLog);
|
|
102
|
+
}
|
|
103
|
+
if (`none` in matcher) {
|
|
104
|
+
return matchCompound(source, parent, root, ['none', ...matcher.none], failureLog);
|
|
105
|
+
}
|
|
106
|
+
if (`single` in matcher) {
|
|
107
|
+
return matchCompound(source, parent, root, ['single', ...matcher.single], failureLog);
|
|
108
|
+
}
|
|
109
|
+
if (`someItem` in matcher) {
|
|
110
|
+
return matchTraversal(source, root, 'someItem', matcher.someItem, failureLog);
|
|
111
|
+
}
|
|
112
|
+
if (`everyItem` in matcher) {
|
|
113
|
+
return matchTraversal(source, root, 'everyItem', matcher.everyItem, failureLog);
|
|
114
|
+
}
|
|
115
|
+
if (`noneItem` in matcher) {
|
|
116
|
+
return matchTraversal(source, root, 'noneItem', matcher.noneItem, failureLog);
|
|
117
|
+
}
|
|
118
|
+
if (`singleItem` in matcher) {
|
|
119
|
+
return matchTraversal(source, root, 'singleItem', matcher.singleItem, failureLog);
|
|
120
|
+
}
|
|
119
121
|
}
|
|
120
122
|
// matcher is plain object with index keys
|
|
121
123
|
for (const index in matcher) {
|
package/dist/module/match.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/match.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/match.ts"],"names":[],"mappings":"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"}
|
package/dist/module/patch.js
CHANGED
|
@@ -62,11 +62,13 @@ function patchPlainObj(value, root, patchItem) {
|
|
|
62
62
|
for (const entry of patchItem) {
|
|
63
63
|
// update root if needed
|
|
64
64
|
const currentRoot = value === root ? Object.assign({}, result) : root;
|
|
65
|
+
// keep current updated result as parent
|
|
66
|
+
const parent = Object.assign({}, result);
|
|
65
67
|
// loop over all the patch keys
|
|
66
68
|
for (const key in entry) {
|
|
67
69
|
// patch the value at the given key with the patch at that key
|
|
68
70
|
const currentValue = result[key];
|
|
69
|
-
const newValue = patchEntry(currentValue,
|
|
71
|
+
const newValue = patchEntry(currentValue, parent, currentRoot, entry[key]);
|
|
70
72
|
if (!Object.is(currentValue, newValue)) {
|
|
71
73
|
// if value changed, set it in result and mark change
|
|
72
74
|
anyChange = true;
|
package/dist/module/patch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../src/patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,UAAU,EAAc,MAAM,aAAa,CAAC;AAwFzE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,KAAK,CACnB,KAAQ,EACR,SAA4B;IAE5B,OAAO,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAqB,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,UAAU,CACjB,KAAQ,EACR,MAAS,EACT,IAAO,EACP,SAAkC;IAElC,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;QAC/B,uDAAuD;QACvD,OAAO,KAAK,CAAC;KACd;IAED,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;QAC/B,wCAAwC;QACxC,OAAO,SAAc,CAAC;KACvB;IAED,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE;QACnC,mDAAmD;QACnD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAE5C,OAAO,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;KAC9C;IAED,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;QACrB,wBAAwB;QACxB,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,SAAgB,CAAC,CAAC;KACrD;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,0BAA0B;QAC1B,OAAO,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,SAAgB,CAAC,CAAC;KAChD;IAED,4CAA4C;IAE5C,OAAO,SAAc,CAAC;AACxB,CAAC;AAED,SAAS,aAAa,CACpB,KAAQ,EACR,IAAO,EACP,SAAiC;IAEjC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC7B,2DAA2D;QAE3D,OAAO,SAAc,CAAC;KACvB;IAED,uCAAuC;IAEvC,uBAAuB;IACvB,MAAM,MAAM,qBAAQ,KAAK,CAAE,CAAC;IAE5B,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,6BAA6B;IAC7B,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE;QAC7B,wBAAwB;QACxB,MAAM,WAAW,GAAI,KAAa,KAAK,IAAI,CAAC,CAAC,mBAAM,MAAM,EAAG,CAAC,CAAC,IAAI,CAAC;QAEnE,+BAA+B;QAC/B,KAAK,MAAM,GAAG,IAAI,KAAU,EAAE;YAC5B,8DAA8D;YAC9D,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACjC,MAAM,QAAQ,GAAG,UAAU,CACzB,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../src/patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,UAAU,EAAc,MAAM,aAAa,CAAC;AAwFzE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,KAAK,CACnB,KAAQ,EACR,SAA4B;IAE5B,OAAO,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAqB,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,UAAU,CACjB,KAAQ,EACR,MAAS,EACT,IAAO,EACP,SAAkC;IAElC,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;QAC/B,uDAAuD;QACvD,OAAO,KAAK,CAAC;KACd;IAED,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;QAC/B,wCAAwC;QACxC,OAAO,SAAc,CAAC;KACvB;IAED,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE;QACnC,mDAAmD;QACnD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAE5C,OAAO,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;KAC9C;IAED,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;QACrB,wBAAwB;QACxB,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,SAAgB,CAAC,CAAC;KACrD;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,0BAA0B;QAC1B,OAAO,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,SAAgB,CAAC,CAAC;KAChD;IAED,4CAA4C;IAE5C,OAAO,SAAc,CAAC;AACxB,CAAC;AAED,SAAS,aAAa,CACpB,KAAQ,EACR,IAAO,EACP,SAAiC;IAEjC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC7B,2DAA2D;QAE3D,OAAO,SAAc,CAAC;KACvB;IAED,uCAAuC;IAEvC,uBAAuB;IACvB,MAAM,MAAM,qBAAQ,KAAK,CAAE,CAAC;IAE5B,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,6BAA6B;IAC7B,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE;QAC7B,wBAAwB;QACxB,MAAM,WAAW,GAAI,KAAa,KAAK,IAAI,CAAC,CAAC,mBAAM,MAAM,EAAG,CAAC,CAAC,IAAI,CAAC;QAEnE,wCAAwC;QACxC,MAAM,MAAM,qBAAQ,MAAM,CAAE,CAAC;QAE7B,+BAA+B;QAC/B,KAAK,MAAM,GAAG,IAAI,KAAU,EAAE;YAC5B,8DAA8D;YAC9D,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACjC,MAAM,QAAQ,GAAG,UAAU,CACzB,YAAY,EACZ,MAAM,EACN,WAAW,EACV,KAAa,CAAC,GAAG,CAAC,CACpB,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE;gBACtC,qDAAqD;gBACrD,SAAS,GAAG,IAAI,CAAC;gBACjB,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;aACxB;SACF;KACF;IAED,IAAI,SAAS,EAAE;QACb,sCAAsC;QACtC,OAAO,MAAM,CAAC;KACf;IAED,oCAAoC;IACpC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,QAAQ,CACf,KAAQ,EACR,IAAO,EACP,SAAiC;IAEjC,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,0BAA0B;QAC1B,mDAAmD;QAEnD,OAAO,SAAS,CAAC;KAClB;IAED,mBAAmB;IACnB,kEAAkE;IAClE,6CAA6C;IAE7C,iBAAiB;IACjB,MAAM,MAAM,GAAG,CAAC,GAAG,KAAK,CAAM,CAAC;IAC/B,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,qCAAqC;IACrC,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE;QAC7B,MAAM,QAAQ,GAAG,KAAsB,CAAC;QAExC,qCAAqC;QACrC,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,QAAQ,GAAG,UAAU,CACzB,YAAY,EACZ,KAAK,EACL,IAAI,EACH,SAAiB,CAAC,KAAK,CAAC,CAC1B,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE;YACtC,qDAAqD;YACrD,SAAS,GAAG,IAAI,CAAC;YACjB,MAAM,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;SAC7B;KACF;IAED,IAAI,SAAS,EAAE;QACb,sCAAsC;QACtC,OAAO,MAAM,CAAC;KACf;IAED,oCAAoC;IACpC,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/dist/types/match.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ import type { Tuple } from './tuple';
|
|
|
6
6
|
* @typeparam T - the type of value to match
|
|
7
7
|
* @typeparam C - utility type
|
|
8
8
|
*/
|
|
9
|
-
export
|
|
9
|
+
export type Match<T, C extends Partial<T> = Partial<T>> = Match.Entry<T, C, T, T>;
|
|
10
10
|
export declare namespace Match {
|
|
11
11
|
/**
|
|
12
12
|
* Determines the various allowed match types for given type `T`.
|
package/dist/types/patch.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import type { Tuple } from './tuple';
|
|
|
5
5
|
* A type to determine the allowed input type for the `patch` function.
|
|
6
6
|
* @typeparam T - the input type to be patched
|
|
7
7
|
*/
|
|
8
|
-
export
|
|
8
|
+
export type Patch<T, C = T> = Patch.Entry<T, C, T, T>;
|
|
9
9
|
export declare namespace Patch {
|
|
10
10
|
/**
|
|
11
11
|
* The entry type for a (nested) patch. Can be either a patch object or a function accepting the nested patch function and returning a patch object.
|
|
@@ -10,7 +10,7 @@ import type { IsAny, IsPlainObj } from '@rimbu/base';
|
|
|
10
10
|
* - Any other type will not be mapped
|
|
11
11
|
* @typeparam T - the input type
|
|
12
12
|
*/
|
|
13
|
-
export
|
|
13
|
+
export type Protected<T> = IsAny<T> extends true ? T : T extends readonly any[] & infer A ? {
|
|
14
14
|
readonly [K in keyof A]: Protected<A[K]>;
|
|
15
15
|
} : T extends Map<infer K, infer V> ? Omit<Map<Protected<K>, Protected<V>>, 'clear' | 'delete' | 'set'> : T extends Set<infer E> ? Omit<Set<Protected<E>>, 'add' | 'clear' | 'delete'> : T extends Promise<infer E> ? Promise<Protected<E>> : IsPlainObj<T> extends true ? {
|
|
16
16
|
readonly [K in keyof T]: Protected<T[K]>;
|
package/dist/types/selector.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { Path, type Protected } from './internal';
|
|
|
9
9
|
* - an object where the property values are `Selectors` for type `T`.
|
|
10
10
|
* @typeparam T - the source value type.
|
|
11
11
|
*/
|
|
12
|
-
export
|
|
12
|
+
export type Selector<T> = Path.Get<T> | ((value: Protected<T>) => any) | readonly Selector<T>[] | {
|
|
13
13
|
readonly [key: string | symbol]: Selector<T>;
|
|
14
14
|
};
|
|
15
15
|
export declare namespace Selector {
|
package/dist/types/tuple.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { Update } from '@rimbu/common';
|
|
|
2
2
|
/**
|
|
3
3
|
* A readonly array of fixed length and types.
|
|
4
4
|
*/
|
|
5
|
-
export
|
|
5
|
+
export type Tuple<T extends Tuple.Source> = Readonly<T>;
|
|
6
6
|
export declare namespace Tuple {
|
|
7
7
|
/**
|
|
8
8
|
* A non-empty readonly array that can serve as a source for a Tuple.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rimbu/deep",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.14.1",
|
|
4
4
|
"description": "Tools to use handle plain JS objects as immutable objects",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"immutable",
|
|
@@ -57,16 +57,12 @@
|
|
|
57
57
|
},
|
|
58
58
|
"sideEffects": false,
|
|
59
59
|
"dependencies": {
|
|
60
|
-
"@rimbu/base": "^0.
|
|
61
|
-
"@rimbu/common": "^0.
|
|
62
|
-
"tslib": "^2.
|
|
60
|
+
"@rimbu/base": "^0.11.1",
|
|
61
|
+
"@rimbu/common": "^0.12.1",
|
|
62
|
+
"tslib": "^2.5.0"
|
|
63
63
|
},
|
|
64
64
|
"publishConfig": {
|
|
65
65
|
"access": "public"
|
|
66
66
|
},
|
|
67
|
-
"
|
|
68
|
-
"index": "src/index.ts",
|
|
69
|
-
"replacer": "../../config/denoify-rimbu-replacer.js"
|
|
70
|
-
},
|
|
71
|
-
"gitHead": "28454fe17a4e51a42f6107f7b1733270d0d88de5"
|
|
67
|
+
"gitHead": "f7a7662f81e9246b244cab22c14776617652833f"
|
|
72
68
|
}
|
package/src/match.ts
CHANGED
|
@@ -328,77 +328,79 @@ function matchArr<T extends any[], C, P, R>(
|
|
|
328
328
|
|
|
329
329
|
// matcher is plain object
|
|
330
330
|
|
|
331
|
-
if (
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
331
|
+
if (typeof matcher === 'object' && null !== matcher) {
|
|
332
|
+
if (`every` in matcher) {
|
|
333
|
+
return matchCompound(
|
|
334
|
+
source,
|
|
335
|
+
parent,
|
|
336
|
+
root,
|
|
337
|
+
['every', ...(matcher.every as any)],
|
|
338
|
+
failureLog
|
|
339
|
+
);
|
|
340
|
+
}
|
|
341
|
+
if (`some` in matcher) {
|
|
342
|
+
return matchCompound(
|
|
343
|
+
source,
|
|
344
|
+
parent,
|
|
345
|
+
root,
|
|
346
|
+
['some', ...(matcher.some as any)],
|
|
347
|
+
failureLog
|
|
348
|
+
);
|
|
349
|
+
}
|
|
350
|
+
if (`none` in matcher) {
|
|
351
|
+
return matchCompound(
|
|
352
|
+
source,
|
|
353
|
+
parent,
|
|
354
|
+
root,
|
|
355
|
+
['none', ...(matcher.none as any)],
|
|
356
|
+
failureLog
|
|
357
|
+
);
|
|
358
|
+
}
|
|
359
|
+
if (`single` in matcher) {
|
|
360
|
+
return matchCompound(
|
|
361
|
+
source,
|
|
362
|
+
parent,
|
|
363
|
+
root,
|
|
364
|
+
['single', ...(matcher.single as any)],
|
|
365
|
+
failureLog
|
|
366
|
+
);
|
|
367
|
+
}
|
|
368
|
+
if (`someItem` in matcher) {
|
|
369
|
+
return matchTraversal(
|
|
370
|
+
source,
|
|
371
|
+
root,
|
|
372
|
+
'someItem',
|
|
373
|
+
matcher.someItem as any,
|
|
374
|
+
failureLog
|
|
375
|
+
);
|
|
376
|
+
}
|
|
377
|
+
if (`everyItem` in matcher) {
|
|
378
|
+
return matchTraversal(
|
|
379
|
+
source,
|
|
380
|
+
root,
|
|
381
|
+
'everyItem',
|
|
382
|
+
matcher.everyItem as any,
|
|
383
|
+
failureLog
|
|
384
|
+
);
|
|
385
|
+
}
|
|
386
|
+
if (`noneItem` in matcher) {
|
|
387
|
+
return matchTraversal(
|
|
388
|
+
source,
|
|
389
|
+
root,
|
|
390
|
+
'noneItem',
|
|
391
|
+
matcher.noneItem as any,
|
|
392
|
+
failureLog
|
|
393
|
+
);
|
|
394
|
+
}
|
|
395
|
+
if (`singleItem` in matcher) {
|
|
396
|
+
return matchTraversal(
|
|
397
|
+
source,
|
|
398
|
+
root,
|
|
399
|
+
'singleItem',
|
|
400
|
+
matcher.singleItem as any,
|
|
401
|
+
failureLog
|
|
402
|
+
);
|
|
403
|
+
}
|
|
402
404
|
}
|
|
403
405
|
|
|
404
406
|
// matcher is plain object with index keys
|
|
@@ -448,7 +450,7 @@ function matchArr<T extends any[], C, P, R>(
|
|
|
448
450
|
/**
|
|
449
451
|
* Match an object matcher against the given source.
|
|
450
452
|
*/
|
|
451
|
-
function matchPlainObj<T, C, P, R>(
|
|
453
|
+
function matchPlainObj<T extends object, C, P, R>(
|
|
452
454
|
source: T,
|
|
453
455
|
parent: P,
|
|
454
456
|
root: R,
|
package/src/patch.ts
CHANGED
|
@@ -176,13 +176,16 @@ function patchPlainObj<T, C, R>(
|
|
|
176
176
|
// update root if needed
|
|
177
177
|
const currentRoot = (value as any) === root ? { ...result } : root;
|
|
178
178
|
|
|
179
|
+
// keep current updated result as parent
|
|
180
|
+
const parent = { ...result };
|
|
181
|
+
|
|
179
182
|
// loop over all the patch keys
|
|
180
183
|
for (const key in entry as T) {
|
|
181
184
|
// patch the value at the given key with the patch at that key
|
|
182
185
|
const currentValue = result[key];
|
|
183
186
|
const newValue = patchEntry(
|
|
184
187
|
currentValue,
|
|
185
|
-
|
|
188
|
+
parent,
|
|
186
189
|
currentRoot,
|
|
187
190
|
(entry as any)[key]
|
|
188
191
|
);
|