map-transform 0.4.0-alpha.3 → 0.4.0-alpha.32

package/dist/operations/getSet.js

@@ -1,31 +1,143 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.set = exports.get = void 0;
-const ramda_1 = require("ramda");
-const pathGetter_1 = require("../utils/pathGetter");
-const pathSetter_1 = require("../utils/pathSetter");
+const mapAny = require("map-any");
 const stateHelpers_1 = require("../utils/stateHelpers");
-const root_1 = require("./root");
-const plug_1 = require("./plug");
-const directionals_1 = require("./directionals");
-const isGet = (isGetOperation, isRev = false) => isGetOperation ? !isRev : isRev;
-const setWithOnlyMapped = (state, setFn) => (value) => (state.onlyMapped && typeof value === 'undefined' ? value : setFn(value));
-const getValueFromState = (path) => (0, ramda_1.compose)((0, pathGetter_1.default)(path), stateHelpers_1.getStateValue);
-const setValueFromState = (path) => (state) => {
-    const setFn = setWithOnlyMapped(state, (0, pathSetter_1.default)(path));
-    return setFn((0, stateHelpers_1.getStateValue)(state));
-};
-const getOrSet = (isGetOperation) => (path) => {
-    if (path && path.startsWith('^')) {
-        const rootGetSet = (0, root_1.default)(getOrSet(isGetOperation)(path.substr(1)));
-        return isGetOperation
-            ? (0, directionals_1.divide)(rootGetSet, (0, plug_1.default)())
-            : (0, directionals_1.divide)((0, plug_1.default)(), rootGetSet);
+const is_1 = require("../utils/is");
+const array_1 = require("../utils/array");
+const functional_1 = require("../utils/functional");
+const xor_1 = require("../utils/xor");
+const adjustIsSet = (isSet, { rev = false, flip = false }) => (0, xor_1.default)(isSet, (0, xor_1.default)(rev, flip));
+function flatMapAny(fn) {
+    return (value, target) => Array.isArray(value)
+        ? value.flatMap((value) => fn(value, target))
+        : fn(value, target);
+}
+function preparePath(path) {
+    if (typeof path === 'string' && path.includes('[')) {
+        const pos = path.indexOf('[');
+        if (path[pos - 1] === '\\') {
+            return [path.replace('\\[', '['), false];
+        }
+        else {
+            const isArr = path[pos + 1] === ']';
+            return [path.slice(0, pos), isArr];
+        }
     }
-    const getFn = getValueFromState(path);
-    const setFn = setValueFromState(path);
-    return () => (state) => (0, stateHelpers_1.setStateValue)(state, isGet(isGetOperation, state.rev) ? getFn(state) : setFn(state));
-};
-exports.get = getOrSet(true);
-exports.set = getOrSet(false);
+    return [path, false];
+}
+function getSetProp(path) {
+    if (path === '') {
+        return functional_1.identity;
+    }
+    const getFn = flatMapAny((value) => (0, is_1.isObject)(value) ? value[path] : undefined);
+    const setFn = (value, target) => (0, is_1.isObject)(target) ? { ...target, [path]: value } : { [path]: value };
+    return (value, isSet, target) => {
+        if (isSet) {
+            return setFn(value, target);
+        }
+        else {
+            return getFn(value);
+        }
+    };
+}
+function getSetIndex(index) {
+    return (value, isSet, target) => {
+        if (isSet) {
+            const arr = Array.isArray(target) ? [...target] : [];
+            arr[index] = value;
+            return arr;
+        }
+        else {
+            return Array.isArray(value) ? value[index] : undefined;
+        }
+    };
+}
+function getParent(state) {
+    const nextValue = (0, stateHelpers_1.getLastContext)(state);
+    const nextContext = state.context.slice(0, -1);
+    return { ...state, context: nextContext, value: nextValue };
+}
+function getRoot(state) {
+    const nextValue = (0, stateHelpers_1.getRootFromState)(state);
+    const nextContext = [];
+    return { ...state, context: nextContext, value: nextValue };
+}
+function getSet(isSet = false) {
+    return (path) => {
+        if (typeof path === 'string' && path[0] === '^') {
+            const getFn = path[1] === '^' ? getRoot : getParent;
+            return () => (next) => (state) => {
+                if (adjustIsSet(isSet, state)) {
+                    return (0, stateHelpers_1.setStateValue)(next(state), state.target);
+                }
+                else {
+                    return next(getFn(state));
+                }
+            };
+        }
+        const [basePath, isArr] = preparePath(path);
+        const getArrAwareStateValue = isArr
+            ? (0, functional_1.compose)(array_1.ensureArray, stateHelpers_1.getStateValue)
+            : stateHelpers_1.getStateValue;
+        const getSetFn = typeof basePath === 'number'
+            ? getSetIndex(basePath)
+            : getSetProp(basePath);
+        return (_options) => (next) => (state) => {
+            if (adjustIsSet(isSet, state)) {
+                const target = (0, stateHelpers_1.getTargetFromState)(state);
+                const nextTarget = getSetFn(target, false);
+                const nextState = next((0, stateHelpers_1.setTargetOnState)({ ...state, iterate: state.iterate || isArr }, nextTarget));
+                const setIt = (value, index) => getSetFn(value, true, (0, array_1.indexOfIfArray)(target, index));
+                const thisValue = nextState.iterate && !isArr
+                    ? mapAny(setIt, getArrAwareStateValue(nextState))
+                    : setIt(getArrAwareStateValue(nextState));
+                return (0, stateHelpers_1.setStateValue)(state, thisValue);
+            }
+            else {
+                const nextState = next(state);
+                const thisValue = getSetFn((0, stateHelpers_1.getStateValue)(nextState), false);
+                return (0, stateHelpers_1.setStateValue)(nextState, isArr ? (0, array_1.ensureArray)(thisValue) : thisValue, true);
+            }
+        };
+    };
+}
+function dividePath(path) {
+    const pos = path.indexOf('[');
+    if (pos > -1 && path[pos - 1] !== '\\') {
+        const index = Number.parseInt(path.slice(pos + 1), 10);
+        if (!Number.isNaN(index)) {
+            const basePath = path.slice(0, pos).trim();
+            return basePath ? [basePath, index] : index;
+        }
+    }
+    else if (path.startsWith('^')) {
+        if (path.startsWith('^^') && path.length > 2) {
+            return ['^^', path.slice(2)];
+        }
+        else if (path.length > 1 && path !== '^^') {
+            return ['^^', path.slice(1)];
+        }
+    }
+    return path.trim();
+}
+function pathToNextOperations(path, isSet = false) {
+    if (!path || path === '.') {
+        return [() => (next) => (state) => next(state)];
+    }
+    if (path[0] === '>') {
+        path = path.slice(1);
+        isSet = true;
+    }
+    const parts = path.split('.').flatMap(dividePath);
+    const operations = parts.map(getSet(isSet));
+    if (isSet) {
+        operations.reverse();
+    }
+    return operations;
+}
+const get = (path) => pathToNextOperations(path, false);
+exports.get = get;
+const set = (path) => pathToNextOperations(path, true);
+exports.set = set;
 //# sourceMappingURL=getSet.js.map

package/dist/operations/getSet.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSet.js","sourceRoot":"","sources":["../../src/operations/getSet.ts"],"names":[],"mappings":";;;AAAA,iCAA+B;AAE/B,oDAAwC;AACxC,oDAAyD;AACzD,wDAAoE;AACpE,iCAAyB;AACzB,iCAAyB;AACzB,iDAAuC;AAEvC,MAAM,KAAK,GAAG,CAAC,cAAuB,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE,CACvD,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;AAEjC,MAAM,iBAAiB,GAAG,CAAC,KAAY,EAAE,KAAkB,EAAe,EAAE,CAAC,CAC3E,KAAK,EACL,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,IAAI,OAAO,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;AAE9E,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAE,EAAE,CAAC,IAAA,eAAO,EAAC,IAAA,oBAAM,EAAC,IAAI,CAAC,EAAE,4BAAa,CAAC,CAAA;AAE9E,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAE,EAAE,CAAC,CAAC,KAAY,EAAE,EAAE;IACzD,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,EAAE,IAAA,oBAAM,EAAC,IAAI,CAAC,CAAC,CAAA;IACpD,OAAO,KAAK,CAAC,IAAA,4BAAa,EAAC,KAAK,CAAC,CAAC,CAAA;AACpC,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,cAAuB,EAAE,EAAE,CAAC,CAAC,IAAU,EAAa,EAAE;IACtE,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAChC,MAAM,UAAU,GAAG,IAAA,cAAI,EAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACjE,OAAO,cAAc;YACnB,CAAC,CAAC,IAAA,qBAAM,EAAC,UAAU,EAAE,IAAA,cAAI,GAAE,CAAC;YAC5B,CAAC,CAAC,IAAA,qBAAM,EAAC,IAAA,cAAI,GAAE,EAAE,UAAU,CAAC,CAAA;KAC/B;IAED,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;IACrC,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;IAErC,OAAO,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CACrB,IAAA,4BAAa,EACX,KAAK,EACL,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAC/D,CAAA;AACL,CAAC,CAAA;AAEY,QAAA,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;AACpB,QAAA,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA"}
+{"version":3,"file":"getSet.js","sourceRoot":"","sources":["../../src/operations/getSet.ts"],"names":[],"mappings":"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"}

package/dist/operations/ifelse.d.ts

@@ -1,2 +1,2 @@
 import { DataMapper, MapDefinition, Operation } from '../types';
-export default function (fn: DataMapper, trueDef?: MapDefinition, falseDef?: MapDefinition): Operation;
+export default function (conditionDef: DataMapper | MapDefinition, trueDef?: MapDefinition, falseDef?: MapDefinition): Operation;

package/dist/operations/ifelse.js

@@ -1,17 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ramda_1 = require("ramda");
 const stateHelpers_1 = require("../utils/stateHelpers");
 const definitionHelpers_1 = require("../utils/definitionHelpers");
-function default_1(fn, trueDef, falseDef) {
-    const falseFn = (0, definitionHelpers_1.mapFunctionFromDef)(falseDef);
-    if (typeof fn !== 'function') {
+function runCondition(conditionDef) {
+    return () => (next) => (state) => {
+        const nextState = next(state);
+        return (0, stateHelpers_1.setStateValue)(nextState, conditionDef((0, stateHelpers_1.getStateValue)(nextState), nextState));
+    };
+}
+function default_1(conditionDef, trueDef, falseDef) {
+    const falseFn = (0, definitionHelpers_1.operationFromDef)(falseDef);
+    if (!conditionDef) {
         return falseFn;
     }
-    const trueFn = (0, definitionHelpers_1.mapFunctionFromDef)(trueDef);
-    return (options) => {
-        const run = (0, ramda_1.compose)(stateHelpers_1.getStateValue, (0, ramda_1.ifElse)((state) => !!fn((0, stateHelpers_1.getStateValue)(state), (0, stateHelpers_1.contextFromState)(state)), trueFn(options), falseFn(options)));
-        return (state) => (0, stateHelpers_1.setStateValue)(state, run(state));
+    const conditionFn = typeof conditionDef === 'function'
+        ? runCondition(conditionDef)
+        : (0, definitionHelpers_1.operationFromDef)(conditionDef);
+    const trueFn = (0, definitionHelpers_1.operationFromDef)(trueDef);
+    return (options) => (next) => {
+        const runCondition = conditionFn(options)(next);
+        const runTrue = trueFn(options)(next);
+        const runFalse = falseFn(options)(next);
+        return (state) => {
+            const bool = (0, stateHelpers_1.getStateValue)(runCondition(state));
+            return bool ? runTrue(state) : runFalse(state);
+        };
     };
 }
 exports.default = default_1;

package/dist/operations/ifelse.js.map

@@ -1 +1 @@
-{"version":3,"file":"ifelse.js","sourceRoot":"","sources":["../../src/operations/ifelse.ts"],"names":[],"mappings":";;AAAA,iCAAuC;AAEvC,wDAI8B;AAC9B,kEAA+D;AAE/D,mBACE,EAAc,EACd,OAAuB,EACvB,QAAwB;IAExB,MAAM,OAAO,GAAG,IAAA,sCAAkB,EAAC,QAAQ,CAAC,CAAA;IAC5C,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;QAC5B,OAAO,OAAO,CAAA;KACf;IACD,MAAM,MAAM,GAAG,IAAA,sCAAkB,EAAC,OAAO,CAAC,CAAA;IAE1C,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,GAAG,GAAG,IAAA,eAAO,EACjB,4BAAa,EACb,IAAA,cAAM,EACJ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,4BAAa,EAAC,KAAK,CAAC,EAAE,IAAA,+BAAgB,EAAC,KAAK,CAAC,CAAC,EAC9D,MAAM,CAAC,OAAO,CAAC,EACf,OAAO,CAAC,OAAO,CAAC,CACjB,CACF,CAAA;QAED,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,4BAAa,EAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;IACpD,CAAC,CAAA;AACH,CAAC;AAvBD,4BAuBC"}
+{"version":3,"file":"ifelse.js","sourceRoot":"","sources":["../../src/operations/ifelse.ts"],"names":[],"mappings":";;AACA,wDAAoE;AACpE,kEAA6D;AAE7D,SAAS,YAAY,CAAC,YAAwB;IAC5C,OAAO,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE;QAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAO,IAAA,4BAAa,EAClB,SAAS,EACT,YAAY,CAAC,IAAA,4BAAa,EAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAClD,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAED,mBACE,YAAwC,EACxC,OAAuB,EACvB,QAAwB;IAExB,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,QAAQ,CAAC,CAAA;IAC1C,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,OAAO,CAAA;KACf;IACD,MAAM,WAAW,GACf,OAAO,YAAY,KAAK,UAAU;QAChC,CAAC,CAAC,YAAY,CAAC,YAA0B,CAAC;QAC1C,CAAC,CAAC,IAAA,oCAAgB,EAAC,YAAY,CAAC,CAAA;IACpC,MAAM,MAAM,GAAG,IAAA,oCAAgB,EAAC,OAAO,CAAC,CAAA;IAExC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAA;QAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAA;QACrC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAA;QAEvC,OAAO,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,IAAI,GAAG,IAAA,4BAAa,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAA;YAC/C,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAChD,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAzBD,4BAyBC"}

package/dist/operations/iterate.d.ts

@@ -1,2 +1,3 @@
-import { Operation, MapDefinition } from '../types';
+import { Operation, MapDefinition, State, StateMapper } from '../types';
+export declare const iterateState: (fn: StateMapper) => (state: State, target: unknown) => any;
 export default function iterate(def: MapDefinition): Operation;

package/dist/operations/iterate.js

@@ -1,22 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ramda_1 = require("ramda");
+exports.iterateState = void 0;
 const mapAny = require("map-any");
 const stateHelpers_1 = require("../utils/stateHelpers");
 const definitionHelpers_1 = require("../utils/definitionHelpers");
-const indexOfIfArray = (arr, index) => Array.isArray(arr) && typeof index === 'number' ? arr[index] : arr;
-const iterateWithContext = (state, value, index) => ({
-    ...state,
-    context: indexOfIfArray(state.context, index),
-    value,
-});
+const array_1 = require("../utils/array");
+const functional_1 = require("../utils/functional");
+const iterateState = (fn) => (state, target) => mapAny((value, index) => (0, stateHelpers_1.getStateValue)(fn((0, stateHelpers_1.setTargetOnState)((0, stateHelpers_1.setStateValue)({ ...state, index }, value), (0, array_1.indexOfIfArray)(target, index)))), (0, stateHelpers_1.getStateValue)(state));
+exports.iterateState = iterateState;
 function iterate(def) {
+    if (!def || (typeof def === 'object' && Object.keys(def).length === 0)) {
+        return (_options) => (next) => (state) => (0, stateHelpers_1.setStateValue)(next(state), undefined);
+    }
+    const fn = (0, definitionHelpers_1.operationFromDef)(def);
     return (options) => {
-        if (!def || (typeof def === 'object' && Object.keys(def).length === 0)) {
-            return (state) => (0, stateHelpers_1.setStateValue)(state, undefined);
-        }
-        const fn = (0, ramda_1.compose)(stateHelpers_1.getStateValue, (0, definitionHelpers_1.mapFunctionFromDef)(def)(options), iterateWithContext);
-        return (state) => (0, stateHelpers_1.setStateValue)(state, mapAny((value, index) => fn(state, value, index), (0, stateHelpers_1.getStateValue)(state)));
+        const runIteration = (0, exports.iterateState)(fn(options)(functional_1.identity));
+        return (next) => function doIterate(state) {
+            const nextState = next(state);
+            return (0, stateHelpers_1.setStateValue)(nextState, runIteration((0, stateHelpers_1.pushContext)(nextState, state.value), (0, stateHelpers_1.getTargetFromState)(state)));
+        };
     };
 }
 exports.default = iterate;

package/dist/operations/iterate.js.map

@@ -1 +1 @@
-{"version":3,"file":"iterate.js","sourceRoot":"","sources":["../../src/operations/iterate.ts"],"names":[],"mappings":";;AAAA,iCAA+B;AAC/B,kCAAkC;AAElC,wDAAoE;AACpE,kEAA+D;AAE/D,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,KAAc,EAAE,EAAE,CACtD,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AAEpE,MAAM,kBAAkB,GAAG,CACzB,KAAY,EACZ,KAAc,EACd,KAAyB,EACzB,EAAE,CAAC,CAAC;IACJ,GAAG,KAAK;IACR,OAAO,EAAE,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC;IAC7C,KAAK;CACN,CAAC,CAAA;AAEF,SAAwB,OAAO,CAAC,GAAkB;IAChD,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE;YACtE,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,4BAAa,EAAC,KAAK,EAAE,SAAS,CAAC,CAAA;SAClD;QACD,MAAM,EAAE,GAAG,IAAA,eAAO,EAChB,4BAAa,EACb,IAAA,sCAAkB,EAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAChC,kBAAkB,CACnB,CAAA;QACD,OAAO,CAAC,KAAK,EAAE,EAAE,CACf,IAAA,4BAAa,EACX,KAAK,EACL,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,IAAA,4BAAa,EAAC,KAAK,CAAC,CAAC,CACxE,CAAA;IACL,CAAC,CAAA;AACH,CAAC;AAhBD,0BAgBC"}
+{"version":3,"file":"iterate.js","sourceRoot":"","sources":["../../src/operations/iterate.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAElC,wDAM8B;AAC9B,kEAA6D;AAC7D,0CAA+C;AAC/C,oDAA8C;AAEvC,MAAM,YAAY,GACvB,CAAC,EAAe,EAAE,EAAE,CAAC,CAAC,KAAY,EAAE,MAAe,EAAE,EAAE,CACrD,MAAM,CACJ,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CACf,IAAA,4BAAa,EACX,EAAE,CACA,IAAA,+BAAgB,EACd,IAAA,4BAAa,EAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,EACzC,IAAA,sBAAc,EAAC,MAAM,EAAE,KAAK,CAAC,CAC9B,CACF,CACF,EACH,IAAA,4BAAa,EAAC,KAAK,CAAC,CACrB,CAAA;AAbQ,QAAA,YAAY,gBAapB;AAEL,SAAwB,OAAO,CAAC,GAAkB;IAChD,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE;QACtE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CACvC,IAAA,4BAAa,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAA;KACxC;IACD,MAAM,EAAE,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAA;IAEhC,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,YAAY,GAAG,IAAA,oBAAY,EAAC,EAAE,CAAC,OAAO,CAAC,CAAC,qBAAQ,CAAC,CAAC,CAAA;QACxD,OAAO,CAAC,IAAI,EAAE,EAAE,CACd,SAAS,SAAS,CAAC,KAAK;YACtB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;YAC7B,OAAO,IAAA,4BAAa,EAClB,SAAS,EACT,YAAY,CACV,IAAA,0BAAW,EAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,EACnC,IAAA,iCAAkB,EAAC,KAAK,CAAC,CAC1B,CACF,CAAA;QACH,CAAC,CAAA;IACL,CAAC,CAAA;AACH,CAAC;AArBD,0BAqBC"}

package/dist/operations/logical.d.ts

@@ -0,0 +1,3 @@
+import { MapDefinition, Operation } from '../types';
+export declare const and: (...pipelines: MapDefinition[]) => Operation;
+export declare const or: (...pipelines: MapDefinition[]) => Operation;

package/dist/operations/logical.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.or = exports.and = void 0;
+const stateHelpers_1 = require("../utils/stateHelpers");
+const definitionHelpers_1 = require("../utils/definitionHelpers");
+const functional_1 = require("../utils/functional");
+const prepareLogical = (logicFn) => function logical(...pipelines) {
+    const fns = pipelines.map((pipeline) => (0, definitionHelpers_1.operationFromDef)(pipeline));
+    return (options) => (next) => function doLogical(state) {
+        const nextState = next(state);
+        const values = fns.map((fn) => (0, stateHelpers_1.getStateValue)(fn(options)(functional_1.identity)(nextState)));
+        return (0, stateHelpers_1.setStateValue)(nextState, values.reduce((a, b) => logicFn(Boolean(a), Boolean(b))));
+    };
+};
+exports.and = prepareLogical((a, b) => a && b);
+exports.or = prepareLogical((a, b) => a || b);
+//# sourceMappingURL=logical.js.map

package/dist/operations/logical.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logical.js","sourceRoot":"","sources":["../../src/operations/logical.ts"],"names":[],"mappings":";;;AACA,wDAAoE;AACpE,kEAA6D;AAC7D,oDAA8C;AAI9C,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAE,EAAE,CAC1C,SAAS,OAAO,CAAC,GAAG,SAA0B;IAC5C,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,oCAAgB,EAAC,QAAQ,CAAC,CAAC,CAAA;IAEnE,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3B,SAAS,SAAS,CAAC,KAAK;QACtB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7B,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAC5B,IAAA,4BAAa,EAAC,EAAE,CAAC,OAAO,CAAC,CAAC,qBAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,CAChD,CAAA;QACD,OAAO,IAAA,4BAAa,EAClB,SAAS,EACT,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CACzD,CAAA;IACH,CAAC,CAAA;AACL,CAAC,CAAA;AAEU,QAAA,GAAG,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;AACtC,QAAA,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA"}

package/dist/operations/lookup.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const mapAny = require("map-any");
+const pipe_1 = require("./pipe");
 const pathGetter_1 = require("../utils/pathGetter");
-const getSet_1 = require("./getSet");
 const stateHelpers_1 = require("../utils/stateHelpers");
+const functional_1 = require("../utils/functional");
 const matchPropInArray = (getProp) => (arr) => (value) => arr.find((obj) => getProp(obj) === value);
 const mapValue = (getArray, getProp) => {
     const matchInArray = matchPropInArray(getProp);
@@ -12,15 +13,18 @@ const mapValue = (getArray, getProp) => {
             return getProp;
         }
         else {
-            const { value: arr } = getArray({})(state);
+            const { value: arr } = getArray({})(functional_1.identity)(state);
             return arr ? matchInArray(arr) : () => undefined;
         }
     };
 };
 function lookup(arrayPath, propPath) {
-    return () => {
-        const mapValueFn = mapValue((0, getSet_1.get)(arrayPath), (0, pathGetter_1.default)(propPath));
-        return (state) => (0, stateHelpers_1.setStateValue)(state, mapAny(mapValueFn(state), state.value));
+    return () => (next) => {
+        const mapValueFn = mapValue((0, pipe_1.default)([arrayPath]), (0, pathGetter_1.default)(propPath));
+        return function doLookup(state) {
+            const nextState = next(state);
+            return (0, stateHelpers_1.setStateValue)(nextState, mapAny(mapValueFn(nextState), (0, stateHelpers_1.getStateValue)(nextState)));
+        };
     };
 }
 exports.default = lookup;

package/dist/operations/lookup.js.map

@@ -1 +1 @@
-{"version":3,"file":"lookup.js","sourceRoot":"","sources":["../../src/operations/lookup.ts"],"names":[],"mappings":";;AAAA,kCAAkC;AAElC,oDAAyD;AACzD,qCAA8B;AAC9B,wDAAqD;AAErD,MAAM,gBAAgB,GAAG,CAAC,OAAoB,EAAE,EAAE,CAAC,CAAC,GAAc,EAAE,EAAE,CAAC,CACrE,KAAuC,EACvC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,CAAA;AAE9C,MAAM,QAAQ,GAAG,CAAC,QAAmB,EAAE,OAAoB,EAAE,EAAE;IAC7D,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAC9C,OAAO,CAAC,KAAY,EAAE,EAAE;QACtB,IAAI,KAAK,CAAC,GAAG,EAAE;YACb,OAAO,OAAO,CAAA;SACf;aAAM;YACL,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1C,OAAO,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,GAAgB,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,CAAA;SAC9D;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAED,SAAwB,MAAM,CAAC,SAAe,EAAE,QAAc;IAC5D,OAAO,GAAG,EAAE;QACV,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAA,YAAG,EAAC,SAAS,CAAC,EAAE,IAAA,oBAAM,EAAC,QAAQ,CAAC,CAAC,CAAA;QAE7D,OAAO,CAAC,KAAK,EAAE,EAAE,CACf,IAAA,4BAAa,EAAC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IAChE,CAAC,CAAA;AACH,CAAC;AAPD,yBAOC"}
+{"version":3,"file":"lookup.js","sourceRoot":"","sources":["../../src/operations/lookup.ts"],"names":[],"mappings":";;AAAA,kCAAkC;AAClC,iCAAyB;AAEzB,oDAAoD;AACpD,wDAAoE;AACpE,oDAA8C;AAE9C,MAAM,gBAAgB,GACpB,CAAC,OAAe,EAAE,EAAE,CACpB,CAAC,GAAc,EAAE,EAAE,CACnB,CAAC,KAAuC,EAAE,EAAE,CAC1C,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,CAAA;AAE7C,MAAM,QAAQ,GAAG,CAAC,QAAmB,EAAE,OAAe,EAAE,EAAE;IACxD,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAC9C,OAAO,CAAC,KAAY,EAAE,EAAE;QACtB,IAAI,KAAK,CAAC,GAAG,EAAE;YACb,OAAO,OAAO,CAAA;SACf;aAAM;YACL,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,qBAAQ,CAAC,CAAC,KAAK,CAAC,CAAA;YACpD,OAAO,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,GAAgB,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,CAAA;SAC9D;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAED,SAAwB,MAAM,CAAC,SAAe,EAAE,QAAc;IAC5D,OAAO,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;QACpB,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAA,cAAI,EAAC,CAAC,SAAS,CAAC,CAAC,EAAE,IAAA,oBAAM,EAAC,QAAQ,CAAC,CAAC,CAAA;QAEhE,OAAO,SAAS,QAAQ,CAAC,KAAK;YAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;YAC7B,OAAO,IAAA,4BAAa,EAClB,SAAS,EACT,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,IAAA,4BAAa,EAAC,SAAS,CAAC,CAAC,CACxD,CAAA;QACH,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAZD,yBAYC"}

package/dist/operations/merge.d.ts

@@ -1,2 +1,3 @@
 import { Operation, MapDefinition } from '../types';
+export declare function mergeExisting<T, U>(target: T[], source: U[]): U | (U | T | (U & T))[];
 export default function merge(...defs: MapDefinition[]): Operation;

package/dist/operations/merge.js

@@ -1,19 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const mergeDeep = require("lodash.merge");
+exports.mergeExisting = void 0;
+const deepmerge = require("deepmerge");
 const stateHelpers_1 = require("../utils/stateHelpers");
 const definitionHelpers_1 = require("../utils/definitionHelpers");
-const mergeStates = (state, thisState) => (0, stateHelpers_1.setStateValue)(state, mergeDeep((0, stateHelpers_1.getStateValue)(state), (0, stateHelpers_1.getStateValue)(thisState)));
+const isNullOrUndefined = (value) => value === null || value === undefined;
+function mergeExisting(target, source) {
+    if (Array.isArray(target)) {
+        const arr = source.slice();
+        target.forEach((value, index) => {
+            arr[index] = deepmerge(source[index], value, {
+                arrayMerge: mergeExisting,
+            });
+        });
+        return arr;
+    }
+    return target;
+}
+exports.mergeExisting = mergeExisting;
+function mergeStates(state, thisState) {
+    const target = (0, stateHelpers_1.getStateValue)(state);
+    const source = (0, stateHelpers_1.getStateValue)(thisState);
+    return (0, stateHelpers_1.setStateValue)(state, isNullOrUndefined(source)
+        ? target
+        : isNullOrUndefined(target)
+            ? source
+            : deepmerge(target, source, { arrayMerge: mergeExisting }));
+}
 function merge(...defs) {
-    return (options) => {
-        const skipMutation = (0, stateHelpers_1.shouldSkipMutation)(options);
+    return (options) => (next) => {
         if (defs.length === 0) {
-            return (state) => (0, stateHelpers_1.setStateValue)(state, undefined);
+            return (state) => (0, stateHelpers_1.setStateValue)(next(state), undefined);
         }
-        const pipelines = defs.map((def) => (0, definitionHelpers_1.mapFunctionFromDef)(def)(options));
-        return (state) => skipMutation(state)
-            ? (0, stateHelpers_1.setStateValue)(state, undefined)
-            : pipelines.map((pipeline) => pipeline(state)).reduce(mergeStates);
+        const pipelines = defs.map((def) => (0, definitionHelpers_1.operationFromDef)(def)(options)(next));
+        return function (state) {
+            const nextState = next(state);
+            return (0, stateHelpers_1.isNoneValueState)(nextState, options.noneValues)
+                ? (0, stateHelpers_1.setStateValue)(nextState, undefined)
+                : pipelines.map((pipeline) => pipeline(nextState)).reduce(mergeStates);
+        };
     };
 }
 exports.default = merge;

package/dist/operations/merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/operations/merge.ts"],"names":[],"mappings":";;AAAA,0CAA0C;AAE1C,wDAI8B;AAC9B,kEAA+D;AAE/D,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,SAAgB,EAAE,EAAE,CACrD,IAAA,4BAAa,EACX,KAAK,EACL,SAAS,CAAC,IAAA,4BAAa,EAAC,KAAK,CAAC,EAAE,IAAA,4BAAa,EAAC,SAAS,CAAC,CAAC,CAC1D,CAAA;AAEH,SAAwB,KAAK,CAAC,GAAG,IAAqB;IACpD,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,YAAY,GAAG,IAAA,iCAAkB,EAAC,OAAO,CAAC,CAAA;QAChD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,4BAAa,EAAC,KAAK,EAAE,SAAS,CAAC,CAAA;SAClD;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,sCAAkB,EAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QAErE,OAAO,CAAC,KAAK,EAAE,EAAE,CACf,YAAY,CAAC,KAAK,CAAC;YACjB,CAAC,CAAC,IAAA,4BAAa,EAAC,KAAK,EAAE,SAAS,CAAC;YACjC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IACxE,CAAC,CAAA;AACH,CAAC;AAbD,wBAaC"}
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/operations/merge.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AAEvC,wDAI8B;AAC9B,kEAA6D;AAE7D,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAA6B,EAAE,CACtE,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAA;AAEvC,SAAgB,aAAa,CAC3B,MAAW,EACX,MAAW;IAEX,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACzB,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,CAAA;QAC1B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAE9B,GAAG,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE;gBAC3C,UAAU,EAAE,aAAa;aAC1B,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,OAAO,GAAG,CAAA;KACX;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAfD,sCAeC;AAED,SAAS,WAAW,CAAC,KAAY,EAAE,SAAgB;IACjD,MAAM,MAAM,GAAG,IAAA,4BAAa,EAAC,KAAK,CAAC,CAAA;IACnC,MAAM,MAAM,GAAG,IAAA,4BAAa,EAAC,SAAS,CAAC,CAAA;IACvC,OAAO,IAAA,4BAAa,EAClB,KAAK,EACL,iBAAiB,CAAC,MAAM,CAAC;QACvB,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC;YAC3B,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAC7D,CAAA;AACH,CAAC;AAED,SAAwB,KAAK,CAAC,GAAG,IAAqB;IACpD,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,4BAAa,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAA;SACxD;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAEzE,OAAO,UAAU,KAAK;YACpB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;YAC7B,OAAO,IAAA,+BAAgB,EAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC;gBACpD,CAAC,CAAC,IAAA,4BAAa,EAAC,SAAS,EAAE,SAAS,CAAC;gBACrC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAC1E,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAdD,wBAcC"}

package/dist/operations/modify.d.ts

@@ -1,2 +1,2 @@
 import { Operation, MapDefinition } from '../types';
-export default function merge(def: MapDefinition): Operation;
+export default function modify(def: MapDefinition): Operation;

package/dist/operations/modify.js

@@ -3,16 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const stateHelpers_1 = require("../utils/stateHelpers");
 const definitionHelpers_1 = require("../utils/definitionHelpers");
 const is_1 = require("../utils/is");
-function merge(def) {
-    const runFn = (0, definitionHelpers_1.mapFunctionFromDef)(def);
-    return (options) => (state) => {
-        const nextState = runFn(options)(state);
-        const prevValue = (0, stateHelpers_1.getStateValue)(state);
+const functional_1 = require("../utils/functional");
+function modify(def) {
+    const runFn = (0, definitionHelpers_1.operationFromDef)(def);
+    return (options) => (next) => (state) => {
+        const nextState = next(state);
+        const contextState = (0, stateHelpers_1.setStateValue)(nextState, (0, stateHelpers_1.getTargetFromState)(nextState));
+        const thisState = runFn(options)(functional_1.identity)({
+            ...contextState,
+            rev: false,
+            flip: false,
+        });
+        const thisValue = (0, stateHelpers_1.getStateValue)(thisState);
         const nextValue = (0, stateHelpers_1.getStateValue)(nextState);
-        return (0, stateHelpers_1.setStateValue)(state, (0, is_1.isObject)(prevValue) && (0, is_1.isObject)(nextValue)
-            ? { ...prevValue, ...nextValue }
+        return (0, stateHelpers_1.setStateValue)(nextState, (0, is_1.isObject)(nextValue) && (0, is_1.isObject)(thisValue)
+            ? { ...thisValue, ...nextValue }
             : nextValue);
     };
 }
-exports.default = merge;
+exports.default = modify;
 //# sourceMappingURL=modify.js.map

package/dist/operations/modify.js.map

@@ -1 +1 @@
-{"version":3,"file":"modify.js","sourceRoot":"","sources":["../../src/operations/modify.ts"],"names":[],"mappings":";;AACA,wDAAoE;AACpE,kEAA+D;AAC/D,oCAAsC;AAEtC,SAAwB,KAAK,CAAC,GAAkB;IAC9C,MAAM,KAAK,GAAG,IAAA,sCAAkB,EAAC,GAAG,CAAC,CAAA;IACrC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5B,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAA;QAEvC,MAAM,SAAS,GAAG,IAAA,4BAAa,EAAC,KAAK,CAAC,CAAA;QACtC,MAAM,SAAS,GAAG,IAAA,4BAAa,EAAC,SAAS,CAAC,CAAA;QAE1C,OAAO,IAAA,4BAAa,EAClB,KAAK,EACL,IAAA,aAAQ,EAAC,SAAS,CAAC,IAAI,IAAA,aAAQ,EAAC,SAAS,CAAC;YACxC,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,GAAG,SAAS,EAAE;YAChC,CAAC,CAAC,SAAS,CACd,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAfD,wBAeC"}
+{"version":3,"file":"modify.js","sourceRoot":"","sources":["../../src/operations/modify.ts"],"names":[],"mappings":";;AACA,wDAI8B;AAC9B,kEAA6D;AAC7D,oCAAsC;AACtC,oDAA8C;AAE9C,SAAwB,MAAM,CAAC,GAAkB;IAC/C,MAAM,KAAK,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAA;IAEnC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7B,MAAM,YAAY,GAAG,IAAA,4BAAa,EAAC,SAAS,EAAE,IAAA,iCAAkB,EAAC,SAAS,CAAC,CAAC,CAAA;QAC5E,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,qBAAQ,CAAC,CAAC;YACzC,GAAG,YAAY;YACf,GAAG,EAAE,KAAK;YACV,IAAI,EAAE,KAAK;SACZ,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,IAAA,4BAAa,EAAC,SAAS,CAAC,CAAA;QAC1C,MAAM,SAAS,GAAG,IAAA,4BAAa,EAAC,SAAS,CAAC,CAAA;QAE1C,OAAO,IAAA,4BAAa,EAClB,SAAS,EACT,IAAA,aAAQ,EAAC,SAAS,CAAC,IAAI,IAAA,aAAQ,EAAC,SAAS,CAAC;YACxC,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,GAAG,SAAS,EAAE;YAChC,CAAC,CAAC,SAAS,CACd,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAtBD,yBAsBC"}

package/dist/operations/pipe.js

@@ -1,18 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const functional_1 = require("../utils/functional");
-const stateHelpers_1 = require("../utils/stateHelpers");
 const definitionHelpers_1 = require("../utils/definitionHelpers");
-const liftState = (state) => ({
-    ...state,
-    context: state.value,
-});
+const functional_1 = require("../utils/functional");
+const functional_2 = require("../utils/functional");
+const xor_1 = require("../utils/xor");
 function pipe(defs) {
     return (options) => {
-        const fns = defs.map((def) => (0, definitionHelpers_1.mapFunctionFromDef)(def)(options));
-        const runPipe = (0, functional_1.pipe)(...fns);
-        const runRevPipe = (0, functional_1.compose)(...fns);
-        return (state) => (0, stateHelpers_1.setValueFromState)(state, state.rev ? runRevPipe(liftState(state)) : runPipe(liftState(state)));
+        if (defs.length === 0) {
+            return functional_1.identity;
+        }
+        const fns = defs
+            .flat()
+            .flatMap((def) => (0, definitionHelpers_1.operationsFromDef)(def))
+            .map((fn) => fn(options));
+        return (next) => {
+            const run = (0, functional_2.pipe)(...fns)(next);
+            const runRev = (0, functional_2.compose)(...fns)(next);
+            return function doPipe(state) {
+                const isRev = (0, xor_1.default)(state.rev, state.flip);
+                return isRev ? runRev(state) : run(state);
+            };
+        };
     };
 }
 exports.default = pipe;

package/dist/operations/pipe.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipe.js","sourceRoot":"","sources":["../../src/operations/pipe.ts"],"names":[],"mappings":";;AACA,oDAA6D;AAC7D,wDAAyD;AACzD,kEAA+D;AAE/D,MAAM,SAAS,GAAG,CAAC,KAAY,EAAE,EAAE,CAAC,CAAC;IACnC,GAAG,KAAK;IACR,OAAO,EAAE,KAAK,CAAC,KAAK;CACrB,CAAC,CAAA;AAEF,SAAwB,IAAI,CAAC,IAAa;IACxC,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,sCAAkB,EAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QAC/D,MAAM,OAAO,GAAG,IAAA,iBAAM,EAAC,GAAG,GAAG,CAAC,CAAA;QAC9B,MAAM,UAAU,GAAG,IAAA,oBAAO,EAAC,GAAG,GAAG,CAAC,CAAA;QAElC,OAAO,CAAC,KAAK,EAAE,EAAE,CACf,IAAA,gCAAiB,EACf,KAAK,EACL,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CACrE,CAAA;IACL,CAAC,CAAA;AACH,CAAC;AAZD,uBAYC"}
+{"version":3,"file":"pipe.js","sourceRoot":"","sources":["../../src/operations/pipe.ts"],"names":[],"mappings":";;AACA,kEAA8D;AAC9D,oDAA8C;AAC9C,oDAA0E;AAC1E,sCAA8B;AAE9B,SAAwB,IAAI,CAAC,IAAa;IACxC,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,qBAAQ,CAAA;SAChB;QAED,MAAM,GAAG,GAAG,IAAI;aACb,IAAI,EAAE;aACN,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,qCAAiB,EAAC,GAAG,CAAC,CAAC;aACxC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;QAE3B,OAAO,CAAC,IAAI,EAAE,EAAE;YACd,MAAM,GAAG,GAAG,IAAA,iBAAM,EAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAA;YAChC,MAAM,MAAM,GAAG,IAAA,oBAAS,EAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAA;YACtC,OAAO,SAAS,MAAM,CAAC,KAAK;gBAC1B,MAAM,KAAK,GAAG,IAAA,aAAG,EAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;gBACxC,OAAO,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAC3C,CAAC,CAAA;QACH,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AApBD,uBAoBC"}

package/dist/operations/plug.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const stateHelpers_1 = require("../utils/stateHelpers");
 function plug() {
-    return () => (state) => (0, stateHelpers_1.setStateValue)(state, undefined);
+    return () => (_next) => (state) => (0, stateHelpers_1.setStateValue)(state, (0, stateHelpers_1.getTargetFromState)(state));
 }
 exports.default = plug;
 //# sourceMappingURL=plug.js.map

package/dist/operations/plug.js.map

@@ -1 +1 @@
-{"version":3,"file":"plug.js","sourceRoot":"","sources":["../../src/operations/plug.ts"],"names":[],"mappings":";;AACA,wDAAqD;AAErD,SAAwB,IAAI;IAC1B,OAAO,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,4BAAa,EAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AACzD,CAAC;AAFD,uBAEC"}
+{"version":3,"file":"plug.js","sourceRoot":"","sources":["../../src/operations/plug.ts"],"names":[],"mappings":";;AACA,wDAAyE;AAEzE,SAAwB,IAAI;IAC1B,OAAO,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAChC,IAAA,4BAAa,EAAC,KAAK,EAAE,IAAA,iCAAkB,EAAC,KAAK,CAAC,CAAC,CAAA;AACnD,CAAC;AAHD,uBAGC"}

package/dist/operations/props.d.ts

@@ -0,0 +1,2 @@
+import { Operation, MapObject } from '../types';
+export default function props(def: MapObject): Operation;