@rimbu/deep 0.9.2 → 0.11.0

package/dist/module/match.js

@@ -1,139 +1,222 @@
-import { RimbuError } from '@rimbu/base';
-import { Literal } from './internal';
+import { RimbuError, isPlainObj, isIterable, } from '@rimbu/base';
 export var Match;
 (function (Match) {
     /**
-     * Returns true if the given `value` matches all of the given objects in the `matchers` array.
-     * @typeparam T - the type of the object to match
-     * @param value - the value to match
-     * @param matchers - one or more `Match` objects
+     * Returns a matcher that returns true if every given `matchItem` matches the given value.
+     * @typeparam T - the type of value to match
+     * @typeparam R - the root object type
+     * @typeparam Q - a utility type for the matcher
+     * @param matchItems - the match specifications to test
      * @example
      * ```ts
-     * matchAll({ g: { h: 'abc' }})({ g: { h: 'a' }}) => false
-     * matchAll({ g: { h: 'abc' }})({ g: { h: v => v.length > 1 }}) => true
+     * const input = { a: 1, b: { c: true, d: 'a' } }
+     * match(input, Match.every({ a: 1, { c: true } } )) // => true
+     * match(input, Match.every({ a: 1, { c: false } } )) // => false
      * ```
      */
-    function all(value) {
-        return (...matchers) => {
-            for (const matcher of matchers) {
-                if (!matchSingle(value, matcher, value, value)) {
-                    return false;
-                }
-            }
-            return true;
-        };
+    function every(...matchItems) {
+        return new Every(matchItems);
     }
-    Match.all = all;
+    Match.every = every;
     /**
-     * Returns true if the given `value` matches any of the given objects in the `matchers` array.
-     * @typeparam T - the type of the object to match
-     * @param value - the value to match
-     * @param matchers - one or more `Match` objects
+     * Returns a matcher that returns true if at least one of given `matchItem` matches the given value.
+     * @typeparam T - the type of value to match
+     * @typeparam R - the root object type
+     * @typeparam Q - a utility type for the matcher
+     * @param matchItems - the match specifications to test
      * @example
      * ```ts
-     * matchAny({ g: { h: 'abc' }})({ g: { h: 'a' }}, { g: { h: v => v.length < 2 }}) => false
-     * matchAny({ g: { h: 'abc' }})({ g: { h: 'a' }}, { g: { h: v => v.length > 1 }}) => true
+     * const input = { a: 1, b: { c: true, d: 'a' } }
+     * match(input, Match.some({ a: 5, { c: true } } )) // => true
+     * match(input, Match.some({ a: 5, { c: false } } )) // => false
      * ```
      */
-    function any(value) {
-        return (...matchers) => {
-            for (const matcher of matchers) {
-                if (matchSingle(value, matcher, value, value)) {
-                    return true;
-                }
-            }
-            return false;
-        };
+    function some(...matchItems) {
+        return new Some(matchItems);
     }
-    Match.any = any;
+    Match.some = some;
     /**
-     * Returns a function that takes a value of type T, and returns true if the value matches all the
-     * given `matches` array of Match instances.
-     * @typeparam T - the type of the object to match
-     * @typeparam T2 - the type to use for the Match, should be equal to T
-     * @param matches - at least one Match instance to perform on a given `value`
+     * Returns a matcher that returns true if none of given `matchItem` matches the given value.
+     * @typeparam T - the type of value to match
+     * @typeparam R - the root object type
+     * @typeparam Q - a utility type for the matcher
+     * @param matchItems - the match specifications to test
      * @example
      * ```ts
-     * type Person = { name: string, age: number }
-     * const m = Match.createAll<Person>({ age: v => v > 20 }, { name: v => v.length > 2 })
-     *
-     * console.log(m({ name: 'abc', age: 10 }))
-     * // => false
-     * console.log(m({ name: 'abc', age: 20 }))
-     * // => true
-     * console.log(m({ name: 'a', age: 20 }))
-     * // => false
+     * const input = { a: 1, b: { c: true, d: 'a' } }
+     * match(input, Match.none({ a: 5, { c: true } } )) // => false
+     * match(input, Match.none({ a: 5, { c: false } } )) // => true
      * ```
      */
-    function createAll(...matches) {
-        return (value) => Match.all(value)(...matches);
+    function none(...matchItems) {
+        return new None(matchItems);
     }
-    Match.createAll = createAll;
+    Match.none = none;
     /**
-     * Returns a function that takes a value of type T, and returns true if the value matches any of the
-     * given `matches` array of Match instances.
-     * @typeparam T - the type of the object to match
-     * @typeparam T2 - the type to use for the Match, should be equal to T
-     * @param matches - at least one Match instance to perform on a given `value`
+     * Returns a matcher that returns true if exactly one of given `matchItem` matches the given value.
+     * @typeparam T - the type of value to match
+     * @typeparam R - the root object type
+     * @typeparam Q - a utility type for the matcher
+     * @param matchItems - the match specifications to test
      * @example
      * ```ts
-     * type Person = { name: string, age: number }
-     * const m = Match.createAny<Person>({ age: v => v > 20 }, { name: v => v.length > 2 })
-     *
-     * console.log(m({ name: 'abc', age: 10 }))
-     * // => true
-     * console.log(m({ name: 'abc', age: 20 }))
-     * // => true
-     * console.log(m({ name: 'a', age: 20 }))
-     * // => true
-     * console.log(m({ name: 'a', age: 10 }))
-     * // => false
+     * const input = { a: 1, b: { c: true, d: 'a' } }
+     * match(input, Match.single({ a: 1, { c: true } } )) // => false
+     * match(input, Match.single({ a: 1, { c: false } } )) // => true
      * ```
      */
-    function createAny(...matches) {
-        return (value) => Match.any(value)(...matches);
+    function single(...matchItems) {
+        return new Single(matchItems);
     }
-    Match.createAny = createAny;
+    Match.single = single;
 })(Match || (Match = {}));
-function matchSingle(value, matcher, parent, root) {
-    if (typeof matcher === 'function') {
-        return matcher(value, parent, root);
+class Every {
+    constructor(matchItems) {
+        this.matchItems = matchItems;
     }
-    if (null === value || undefined === value || typeof value !== 'object') {
-        if (typeof matcher !== 'object' || null === matcher) {
-            return matcher === value;
+}
+class Some {
+    constructor(matchItems) {
+        this.matchItems = matchItems;
+    }
+}
+class None {
+    constructor(matchItems) {
+        this.matchItems = matchItems;
+    }
+}
+class Single {
+    constructor(matchItems) {
+        this.matchItems = matchItems;
+    }
+}
+/**
+ * Returns true if the given `value` object matches the given `matcher`, false otherwise.
+ * @typeparam T - the input value type
+ * @param value - the value to match (should be a plain object)
+ * @param matcher - a matcher object or a function taking the matcher API and returning a match object
+ * @example
+ * ```ts
+ * const input = { a: 1, b: { c: true, d: 'a' } }
+ * match(input, { a: 1 }) // => true
+ * match(input, { a: 2 }) // => false
+ * match(input, { a: v => v > 10 }) // => false
+ * match(input, { b: { c: true }}) // => true
+ * match(input, ({ every }) => every({ a: v => v > 0 }, { b: { c: true } } )) // => true
+ * match(input, { b: { c: (v, parent, root) => v && parent.d.length > 0 && root.a > 0 } })
+ *  // => true
+ * ```
+ */
+export function match(value, matcher) {
+    if (matcher instanceof Function) {
+        return matchOptions(value, value, matcher(Match));
+    }
+    return matchOptions(value, value, matcher);
+}
+function matchOptions(value, root, matcher) {
+    if (matcher instanceof Every) {
+        let i = -1;
+        const { matchItems } = matcher;
+        const len = matchItems.length;
+        while (++i < len) {
+            if (!matchOptions(value, root, matchItems[i])) {
+                return false;
+            }
         }
-        if (Literal.isLiteral(matcher)) {
-            return Literal.getValue(matcher) === value;
+        return true;
+    }
+    if (matcher instanceof Some) {
+        let i = -1;
+        const { matchItems } = matcher;
+        const len = matchItems.length;
+        while (++i < len) {
+            if (matchOptions(value, root, matchItems[i])) {
+                return true;
+            }
         }
-        return matcher === value;
+        return false;
     }
-    if (Array.isArray(matcher)) {
-        RimbuError.throwInvalidUsageError('Do not use arrays directly in match object, but use Literal.of(array) instead due to type limittions.');
+    if (matcher instanceof None) {
+        let i = -1;
+        const { matchItems } = matcher;
+        const len = matchItems.length;
+        while (++i < len) {
+            if (matchOptions(value, root, matchItems[i])) {
+                return false;
+            }
+        }
+        return true;
     }
-    if (typeof matcher !== 'object')
-        RimbuError.throwInvalidStateError();
-    if (null === matcher)
-        return false;
-    if (Literal.isLiteral(matcher)) {
-        return Literal.getValue(matcher) === value;
+    if (matcher instanceof Single) {
+        let i = -1;
+        const { matchItems } = matcher;
+        const len = matchItems.length;
+        let matched = false;
+        while (++i < len) {
+            if (matchOptions(value, root, matchItems[i])) {
+                if (matched) {
+                    return false;
+                }
+                matched = true;
+            }
+        }
+        return matched;
     }
-    const valueIsArray = Array.isArray(value);
-    // check if plain object
-    if (!valueIsArray && !Literal.isPlainObject(value)) {
-        return matcher === value;
+    if (isPlainObj(matcher)) {
+        return matchRecord(value, root, matcher);
+    }
+    return Object.is(value, matcher);
+}
+function matchRecord(value, root, matcher) {
+    if (!isPlainObj(matcher)) {
+        RimbuError.throwInvalidUsageError('match: to prevent accidental errors, match only supports plain objects as input.');
     }
     for (const key in matcher) {
         if (!(key in value))
             return false;
-        const matchKey = matcher[key];
-        if (undefined === matchKey) {
-            RimbuError.throwInvalidUsageError('Do not use undefined directly in match objects, but use Literal.of(undefined) instead due to type limitations.');
+        const matchValue = matcher[key];
+        const target = value[key];
+        if (matchValue instanceof Function) {
+            if (target instanceof Function && Object.is(target, matchValue)) {
+                return true;
+            }
+            const result = matchValue(target, value, root);
+            if (typeof result === 'boolean') {
+                if (result) {
+                    continue;
+                }
+                return false;
+            }
+            if (!matchRecordItem(target, root, result)) {
+                return false;
+            }
+        }
+        else {
+            if (!matchRecordItem(target, root, matchValue)) {
+                return false;
+            }
         }
-        const result = matchSingle(value[key], matchKey, value, root);
-        if (!result)
-            return false;
     }
     return true;
 }
+function matchRecordItem(value, root, matcher) {
+    if (isIterable(matcher) && isIterable(value)) {
+        const it1 = value[Symbol.iterator]();
+        const it2 = matcher[Symbol.iterator]();
+        while (true) {
+            const v1 = it1.next();
+            const v2 = it2.next();
+            if (v1.done !== v2.done || v1.value !== v2.value) {
+                return false;
+            }
+            if (v1.done) {
+                return true;
+            }
+        }
+    }
+    if (isPlainObj(value)) {
+        return matchOptions(value, root, matcher);
+    }
+    return Object.is(value, matcher);
+}
 //# sourceMappingURL=match.js.map

package/dist/module/match.js.map

@@ -1 +1 @@
-{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/match.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/match.ts"],"names":[],"mappings":"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"}

package/dist/module/patch.js

@@ -1,110 +1,136 @@
-import { RimbuError } from '@rimbu/base';
-import { Literal } from './internal';
-/**
- * Returns an updated version of given `value`, without modifying the value, where the contents
- * are updated according to the given `patches` Patch array.
- * @typeparam T - the type of the value to patch
- * @param value - the value to update
- * @param patches - one or more `Patch` objects indicating modifications to the value
- * @example
- * ```ts
- * patch({ g: { h: 5 }})({ g: { h: 6 }})          // => { g: { h: 6 }}
- * patch({ g: { h: 5 }})({ g: { h: v => v + 1 }}) // => { g: { h: 6 }}
- * patch({ g: { h: 5 }})({ g: { h: 1 }}, { g: { h: v => v + 1 }})
- * // => { g: { h: 2 }}
- * patch({ a: 1, b: 3 })({ a: (v, p) => v * p.b, (v, p) => v + p.a })
- * // => { a: 3, b: 4 }
- * ```
- */
-export function patch(value) {
-    return function (...patches) {
-        let result = value;
-        for (const p of patches) {
-            result = patchSingle(result, p, result, result);
-        }
-        return result;
-    };
-}
+import { RimbuError, isPlainObj, } from '@rimbu/base';
 export var Patch;
 (function (Patch) {
-    Patch.MAP = Symbol('Patch.ALL');
     /**
-     * Returns a function that patches a given object of type `T` with the given `patches`
-     * Patch array.
-     * @typeparam T - the value type to operate on
-     * @typeparam T2 - the type the Patch is done for, should be equal to T
-     * @param patches - the patches to apply to a given object
+     * Returns a function that patches a given `value` with the given `patchItems`.
+     * @typeparam T - the patch value type
+     * @typeparam Q - the input value type
+     * @param patchItems - a number of `Patch` objects that patch a given value of type T.
      * @example
      * ```ts
-     * const r = Patch.create<{ a: number, b: number }>({ b: v => v + 1 })({ a: 1, b: 2})
-     * console.log(r)
-     * // => { a: 1, b: 3 }
+     * const items = [{ a: 1, b: 'a' }, { a: 2, b: 'b' }]
+     * items.map(Patch.create({ a: v => v + 1 }))
+     * // => [{ a: 2, b: 'a' }, { a: 3, b: 'b' }]
      * ```
      */
-    function create(...patches) {
-        return (value) => patch(value)(...patches);
+    function create(...patchItems) {
+        return (value) => patch(value, ...patchItems);
     }
     Patch.create = create;
 })(Patch || (Patch = {}));
-function patchSingle(value, patcher, parent, root) {
-    if (typeof patcher === 'function') {
-        return patcher(value, parent, root);
+class NestedObj {
+    constructor(patchDataItems) {
+        this.patchDataItems = patchDataItems;
     }
-    if (null === value || undefined === value || typeof value !== 'object') {
-        if (typeof patcher !== 'object' || null === patcher)
-            return patcher;
-        if (Literal.isLiteral(patcher)) {
-            return Literal.getValue(patcher);
+}
+/**
+ * Returns a nested patch object based on the given `patchDataItems` that work on a subpart
+ * of a larger object to be patched.
+ * @typeparam T - the input value type
+ * @typeparam R - the root object type
+ * @typeparam Q - the patch type
+ * @param patchDataItems - a number of `Patch` objects to be applied to the subpart of the object
+ * @example
+ * ```ts
+ * patch({ a: 1, b: { c: true, d: 'a' } }, { b: patchNested({ d: 'b' }) })
+ * // => { a: 1, b: { c: true, d: 'b' } }
+ * ```
+ */
+export function patchNested(...patchDataItems) {
+    return new NestedObj(patchDataItems);
+}
+/**
+ * Returns an immutably updated version of the given `value` where the given `patchItems` have been
+ * applied to the result.
+ * @param value - the input value to patch
+ * @param patchItems - the `Patch` objects to apply to the input value
+ * @example
+ * ```ts
+ * const input = { a: 1, b: { c: true, d: 'a' } }
+ * patch(input, { a: 2 })  // => { a: 2, b: { c: true, d: 'a' } }
+ * patch(input: ($) => ({ b: $({ c: v => !v }) }) )
+ * // => { a: 1, b: { c: false, d: 'a' } }
+ * patch(input: ($) => ({ a: v => v + 1, b: $({ d: 'q' }) }) )
+ * // => { a: 2, b: { c: true, d: 'q' } }
+ * ```
+ */
+export function patch(value, ...patchItems) {
+    const newValue = isPlainObj(value) ? Object.assign({}, value) : value;
+    const changedRef = { changed: false };
+    const result = processPatch(newValue, newValue, patchItems, changedRef);
+    if (changedRef.changed)
+        return result;
+    return value;
+}
+function processPatch(value, root, patchDataItems, changedRef) {
+    let i = -1;
+    const len = patchDataItems.length;
+    while (++i < len) {
+        const patchItem = patchDataItems[i];
+        if (patchItem instanceof Function) {
+            const item = patchItem(patchNested);
+            if (item instanceof NestedObj) {
+                processPatch(value, root, item.patchDataItems, changedRef);
+            }
+            else {
+                processPatchObj(value, root, item, changedRef);
+            }
+        }
+        else {
+            processPatchObj(value, root, patchItem, changedRef);
         }
+    }
+    return value;
+}
+function processPatchObj(value, root, patchData, changedRef) {
+    if (undefined === value || null === value) {
         return value;
     }
-    if (Array.isArray(patcher)) {
-        RimbuError.throwInvalidStateError();
+    if (!isPlainObj(patchData)) {
+        RimbuError.throwInvalidUsageError('patch: received patch object should be a plain object');
     }
-    if (typeof patcher !== 'object')
-        return patcher;
-    if (null === patcher)
-        return null;
-    if (Literal.isLiteral(patcher)) {
-        return Literal.getValue(patcher);
+    if (!isPlainObj(value)) {
+        RimbuError.throwInvalidUsageError('patch: received source object should be a plain object');
     }
-    const valueIsArray = Array.isArray(value);
-    if (!valueIsArray && !Literal.isPlainObject(value))
-        return patcher;
-    if (valueIsArray && Patch.MAP in patcher) {
-        const arr = value;
-        const itemPatch = patcher[Patch.MAP];
-        let result = undefined;
-        for (let i = 0; i < arr.length; i++) {
-            const currentItem = arr[i];
-            const newItem = patchSingle(currentItem, itemPatch, value, root);
-            if (!Object.is(newItem, currentItem)) {
-                if (undefined === result) {
-                    result = arr.slice();
-                }
-                result[i] = newItem;
-            }
+    for (const key in patchData) {
+        const target = value[key];
+        // prevent prototype pollution
+        if (key === '__proto__' ||
+            (key === 'constructor' && target instanceof Function)) {
+            RimbuError.throwInvalidUsageError(`patch: received patch object key '${key}' which is not allowed to prevent prototype pollution`);
         }
-        return (result !== null && result !== void 0 ? result : arr);
-    }
-    const clone = valueIsArray ? [...value] : Object.assign({}, value);
-    let changed = false;
-    for (const key in patcher) {
-        const patchKey = patcher[key];
-        if (!(key in clone) && typeof patchKey === 'function')
-            continue;
-        const oldValue = clone[key];
-        if (undefined === patchKey) {
-            RimbuError.throwInvalidUsageError('Do not use undefined directly in patch objects, but use Literal.of(undefined) instead due to type limitations.');
+        const update = patchData[key];
+        if (!(key in value) && update instanceof Function) {
+            RimbuError.throwInvalidUsageError(`patch: received update function object key ${key} but the key was not present in the source object. Either explicitely set the value in the source to undefined or use a direct value.`);
+        }
+        if (undefined === update) {
+            RimbuError.throwInvalidUsageError("patch: received 'undefined' as patch value. Due to type system issues we cannot prevent this through typing, but please use '() => undefined'  or '() => yourVar' instead. This value will be ignored for safety.");
+        }
+        let newValue;
+        if (update instanceof Function) {
+            newValue = processPatchObjItem(target, root, update(target, value, root), changedRef);
+        }
+        else {
+            newValue = processPatchObjItem(target, root, update, changedRef);
         }
-        const newValue = patchSingle(oldValue, patchKey, value, root);
-        if (oldValue !== newValue) {
-            changed = true;
-            clone[key] = newValue;
+        if (!Object.is(newValue, target)) {
+            value[key] = newValue;
+            changedRef.changed = true;
         }
     }
-    if (changed)
-        return clone;
     return value;
 }
+function processPatchObjItem(value, root, patchResult, superChangedRef) {
+    if (patchResult instanceof NestedObj) {
+        const newValue = isPlainObj(value) ? Object.assign({}, value) : value;
+        const changedRef = { changed: false };
+        const result = processPatch(newValue, root, patchResult.patchDataItems, changedRef);
+        if (changedRef.changed) {
+            superChangedRef.changed = true;
+            return result;
+        }
+        return value;
+    }
+    return patchResult;
+}
 //# sourceMappingURL=patch.js.map

package/dist/module/patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../src/patch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../src/patch.ts"],"names":[],"mappings":"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"}