map-transform 0.4.0-alpha.20 → 0.4.0-alpha.21

package/README.md

@@ -148,8 +148,8 @@ npm install map-transform --save
 - Map objects won't be mapped over an array by default. You have to specify
   `$iterate: true`
 - The `alt` operation now accepts any type of pipeline, but not a helper
-  function
-- The root path prefix is changed from `$` to `^`
+  function, and all alternative pipelines must be given as arguments to `alt()`
+- The root path prefix is changed from `$` to `^^`
 
 ## Usage
 
@@ -305,15 +305,18 @@ below.
 
 MapTransform will treat `undefined` as a value that is not set, and so a
 transform object will not be applied to it. So if an `undefined` value meets
-a transform object, it will produce `undefined`, regardsless of the shape of the
+a transform object, it will produce `undefined`, regardless of the shape of the
 transform object.
 
 This is not the case for `null`, though. MapTransform treats `null` as a value,
 an intended nothing, and will apply a transform object to it, even though it
 will most likely produce nothing but default values. To change this behavior,
-set `mutateNull: false` on the `options` object passed to MapTransform. This
-will essentially make MapTransform treat `null` the same way as `undefined` when
-it comes to the transform object.
+set `noneValues: [undefined, null]` on the `options` object passed to
+MapTransform. This will essentially make MapTransform treat `null` the same way
+as `undefined` when it meets to the transform object.
+
+The example above sets `undefined` and `null` as none-values, but you could in
+principle set any primitive values here.
 
 #### Directional transform objects
 
@@ -716,25 +719,23 @@ import { value, alt } from 'map-transform'
 const def10 = {
   id: 'data.customerNo',
   type: value('customer'),
-  name: ['data.name', alt(value('Anonymous'))],
+  name: alt('data.name', value('Anonymous')),
 }
 ```
 
 The operation will not set anything when mapping with `.onlyMappedValues()`.
 
 If you want to define the `value` operation as an operation object, use
-`$transform` or `$alt`:
+`$transform` or the short form `$value`:
 
 ```javascript
 const def10asObject = {
   id: 'data.customerNo',
   type: { $transform: 'value', value: 'customer' },
-  name: ['data.name', { $alt: 'value', value: 'Anonymous' }],
+  name: { $alt: ['data.name', { $value: 'Anonymous' }] },
 }
 ```
 
-There is also a shortcut for `{ $transform: 'value', value: 'customer' }`: `{ $value: 'customer' }`, which might be useful when typing definitions by hand.
-
 #### `fixed(data)` operation
 
 The data given to the fixed operation, will be inserted in the pipeline in place
@@ -746,14 +747,15 @@ will be included when mapping with `.onlyMappedValues()` as well.
 
 #### `alt(pipeline)` operation
 
-The alt operation will apply the pipeline it is given when the data already in
-the pipeline is `undefined`. This is how you provide default values in
-MapTransform. The pipeline may be as simple as a `value()` operation, a dot
-notation path into the source data, or a full pipeline of several operations.
+The alt operation will apply the pipelines in turn until it gets a value,
+meaning that if the first pipeline returns `undefined`, it will try the next and
+so on. This is how you provide default values in MapTransform. The pipeline may
+be as simple as a `value()` operation, a dot notation path into the source data,
+or a full pipeline of several operations.
 
-When given an array, the `alt` operation will treat it as a value and do
-nothing, as it is not an `undefined` value. To provide the `alt` operation to
-every item in the array, please use the `iterate` operation.
+Note that when the return value is an array, it is treated as a value, as it is
+not an `undefined` value. To provide the `alt` operation to every item in the
+array, use the `iterate` operation.
 
 ```javascript
 import { alt, transform, functions } from 'map-transform'
@@ -765,11 +767,9 @@ const formatDate = (data) => {
 
 const def11 = {
   id: 'data.id',
-  name: ['data.name', alt(value('Anonymous'))],
+  name: alt('data.name', value('Anonymous')),
   updatedAt: [
-    'data.updateDate',
-    alt('data.createDate'),
-    alt(transform(currentDate)),
+    alt('data.updateDate', 'data.createDate', transform(currentDate)),
     transform(formatDate),
   ],
 }
@@ -783,16 +783,19 @@ we still have `undefined`, the second alt will call the customer function
 another transform operation pipes whatever data we get from all of this through
 the `formatDate` function.
 
+When `alt` is run in reverse, the alternative pipelines are run in the oposite
+order, with the last being run first. The first pipeline is always run, though,
+as it is common practice to let the first be a `get` that acts like a `set` in
+reverse.
+
 You may also define an alt operation as an object:
 
 ```javascript
 const def11asObject = {
   id: 'data.id',
-  name: ['data.name', { $alt: 'value', value: 'Anonymous' }],
+  name: { $alt: ['data.name', { $value: 'Anonymous' }] },
   updatedAt: [
-    'data.updateDate',
-    { $alt: 'get', path: 'data.createDate' },
-    { $alt: 'currentDate' },
+    { $alt: ['data.updateDate', 'data.createDate', 'currentDate'] },
     { $transform: 'formatDate' },
   ],
 }
@@ -1057,6 +1060,12 @@ mapper.rev(mappedData)
 // --> { content: { meta: { authors: ['user1', 'user3'] } } }
 ```
 
+You may also define this as a transform object:
+
+```javascript
+const def18o = ['content.meta.authors[]', { $lookup: '$users[]', path: 'id' }]
+```
+
 #### `and(pipeline, pipeline, ...)` operation
 
 Will run all provided pipelines, force their return values to boolean, according
@@ -1395,7 +1404,7 @@ const def22 = [
   'data.customers[]',
   {
     id: 'customerNo',
-    name: ['fullname', alt(value('Anonymous'))],
+    name: [alt('fullname', value('Anonymous'))],
   },
 ]
 
@@ -1509,8 +1518,8 @@ same goes for flipped transform objects if you want to forward transform.
 
 MapTransform will try its best to map the data it gets to the state you want,
 and will always set all properties, even though the mapping you defined result
-in `undefined`. You may include `alt()` operations to provide default or fallback
-values for these cases.
+in `undefined`. You may include `alt()` operations to provide default or
+fallback values for these cases.
 
 But sometimes, you want just the data that is actually present in the source
 data, without defaults or properties set to `undefined`. MapTransform's
@@ -1526,7 +1535,7 @@ import { mapTransform, alt, value } from 'map-transform'
 
 const def24 = {
   id: 'customerNo',
-  name: ['fullname', alt(value('Anonymous'))],
+  name: alt('fullname', value('Anonymous')),
 }
 
 const mapper = mapTransform(def24)

package/dist/functions/compare.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const mapAny = require("map-any");
 const pathGetter_1 = require("../utils/pathGetter");
 const escape_1 = require("../utils/escape");
+const stateHelpers_1 = require("../utils/stateHelpers");
 const not = (comparer) => (value, match) => !comparer(value, match);
 const compareArrayOrValue = (comparer) => (value, match) => Array.isArray(value)
     ? value.some((value) => comparer(value, match))
@@ -38,8 +39,12 @@ function createComparer(operator) {
 }
 function compare({ path = '.', operator = '=', match, matchPath, not = false, }) {
     const getValue = (0, pathGetter_1.default)(path);
-    const useRoot = typeof matchPath === 'string' && matchPath[0] === '^';
-    const realMatchPath = useRoot ? matchPath.slice(1) : matchPath;
+    const useRoot = typeof matchPath === 'string' &&
+        matchPath[0] === '^' &&
+        matchPath[1] !== '.';
+    const realMatchPath = useRoot
+        ? matchPath.slice(matchPath[1] === '^' ? 2 : 1)
+        : matchPath;
     const realMatchValue = mapAny(escape_1.unescapeValue, match);
     const getMatch = typeof realMatchPath === 'string'
         ? (0, pathGetter_1.default)(realMatchPath)
@@ -47,7 +52,7 @@ function compare({ path = '.', operator = '=', match, matchPath, not = false, })
     const comparer = createComparer(operator);
     return (data, state) => {
         const value = getValue(data);
-        const match = getMatch(useRoot ? state.root : data);
+        const match = getMatch(useRoot ? (0, stateHelpers_1.getRootFromState)(state) : data);
         const result = comparer(value, match);
         return not ? !result : result;
     };

package/dist/functions/compare.js.map

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

package/dist/index.js

@@ -7,6 +7,7 @@ const functions_1 = require("./functions");
 exports.functions = functions_1.default;
 const iterate_1 = require("./operations/iterate");
 exports.iterate = iterate_1.default;
+const functional_1 = require("./utils/functional");
 var getSet_1 = require("./operations/getSet");
 Object.defineProperty(exports, "get", { enumerable: true, get: function () { return getSet_1.get; } });
 Object.defineProperty(exports, "set", { enumerable: true, get: function () { return getSet_1.set; } });
@@ -61,7 +62,7 @@ const mergeOptions = (options) => ({
 });
 function mapTransform(def, options = {}) {
     const completeOptions = mergeOptions(options);
-    const mapFn = (0, definitionHelpers_1.mapFunctionFromDef)(def)(completeOptions);
+    const mapFn = (0, definitionHelpers_1.operationFromDef)(def)(completeOptions)(functional_1.identity);
     return Object.assign(composeMapFunction(mapFn, {}), {
         onlyMappedValues: composeMapFunction(mapFn, { onlyMapped: true }),
         rev: Object.assign(composeMapFunction(mapFn, { rev: true }), {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAOA,iEAA8D;AAC9D,uDAAmE;AACnE,2CAAmC;AAoBjB,oBApBX,mBAAS,CAoBW;AAnB3B,kDAA0C;AAmBjC,kBAnBF,iBAAO,CAmBE;AAjBhB,8CAA8C;AAArC,6FAAA,GAAG,OAAA;AAAE,6FAAA,GAAG,OAAA;AACjB,0CAAmD;AAA1C,4FAAA,OAAO,OAAQ;AACxB,wCAAiD;AAAxC,0FAAA,OAAO,OAAO;AACvB,4CAAqD;AAA5C,8FAAA,OAAO,OAAS;AACzB,4CAAqD;AAA5C,8FAAA,OAAO,OAAS;AACzB,4CAAqD;AAA5C,8FAAA,OAAO,OAAS;AACzB,8CAAuD;AAA9C,gGAAA,OAAO,OAAU;AAC1B,iDAA0D;AAAjD,oGAAA,OAAO,OAAY;AAC5B,uCAAgD;AAAvC,0FAAA,OAAO,OAAO;AACvB,0CAAmD;AAA1C,4FAAA,OAAO,OAAQ;AACxB,8CAAuD;AAA9C,gGAAA,OAAO,OAAU;AAC1B,oDAA6D;AAApD,sGAAA,OAAO,OAAa;AAC7B,8CAAuD;AAA9C,gGAAA,OAAO,OAAU;AAC1B,8CAAuD;AAA9C,gGAAA,OAAO,OAAU;AAC1B,0DAA4D;AAAnD,mGAAA,GAAG,OAAA;AAAE,mGAAA,GAAG,OAAA;AAAE,sGAAA,MAAM,OAAA;AACzB,4CAAqD;AAA5C,8FAAA,OAAO,OAAS;AACzB,8CAAuD;AAA9C,gGAAA,OAAO,OAAU;AAiB1B,iDAA0D;AAAjD,wGAAA,OAAO,OAAc;AAC9B,iDAA0D;AAAjD,wGAAA,OAAO,OAAc;AAE9B,MAAM,kBAAkB,GAAG,CACzB,KAAkB,EAClB,YAA4B,EAC5B,EAAE;IACF,MAAM,WAAW,GAAG,IAAA,4BAAa,EAAC,YAAY,CAAC,CAAA;IAE/C,OAAO,CAAC,IAAa,EAAE,EAAE,CACvB,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,4BAAa,EAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAC5E,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC;IAC1C,GAAG,OAAO;IACV,SAAS,EAAE;QACT,GAAG,mBAAS;QACZ,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;KAC7B;CACF,CAAC,CAAA;AAEF,SAAgB,YAAY,CAC1B,GAAkB,EAClB,UAAmB,EAAE;IAErB,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IAC7C,MAAM,KAAK,GAAG,IAAA,sCAAkB,EAAC,GAAG,CAAC,CAAC,eAAe,CAAC,CAAA;IAEtD,OAAO,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE;QAClD,gBAAgB,EAAE,kBAAkB,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QACjE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE;YAC3D,gBAAgB,EAAE,kBAAkB,CAAC,KAAK,EAAE;gBAC1C,GAAG,EAAE,IAAI;gBACT,UAAU,EAAE,IAAI;aACjB,CAAC;SACH,CAAC;KACH,CAAC,CAAA;AACJ,CAAC;AAhBD,oCAgBC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAOA,iEAA4D;AAC5D,uDAAmE;AACnE,2CAAmC;AAqBjB,oBArBX,mBAAS,CAqBW;AApB3B,kDAA0C;AAoBjC,kBApBF,iBAAO,CAoBE;AAnBhB,mDAA6C;AAE7C,8CAA8C;AAArC,6FAAA,GAAG,OAAA;AAAE,6FAAA,GAAG,OAAA;AACjB,0CAAmD;AAA1C,4FAAA,OAAO,OAAQ;AACxB,wCAAiD;AAAxC,0FAAA,OAAO,OAAO;AACvB,4CAAqD;AAA5C,8FAAA,OAAO,OAAS;AACzB,4CAAqD;AAA5C,8FAAA,OAAO,OAAS;AACzB,4CAAqD;AAA5C,8FAAA,OAAO,OAAS;AACzB,8CAAuD;AAA9C,gGAAA,OAAO,OAAU;AAC1B,iDAA0D;AAAjD,oGAAA,OAAO,OAAY;AAC5B,uCAAgD;AAAvC,0FAAA,OAAO,OAAO;AACvB,0CAAmD;AAA1C,4FAAA,OAAO,OAAQ;AACxB,8CAAuD;AAA9C,gGAAA,OAAO,OAAU;AAC1B,oDAA6D;AAApD,sGAAA,OAAO,OAAa;AAC7B,8CAAuD;AAA9C,gGAAA,OAAO,OAAU;AAC1B,8CAAuD;AAA9C,gGAAA,OAAO,OAAU;AAC1B,0DAA4D;AAAnD,mGAAA,GAAG,OAAA;AAAE,mGAAA,GAAG,OAAA;AAAE,sGAAA,MAAM,OAAA;AACzB,4CAAqD;AAA5C,8FAAA,OAAO,OAAS;AACzB,8CAAuD;AAA9C,gGAAA,OAAO,OAAU;AAiB1B,iDAA0D;AAAjD,wGAAA,OAAO,OAAc;AAC9B,iDAA0D;AAAjD,wGAAA,OAAO,OAAc;AAE9B,MAAM,kBAAkB,GAAG,CACzB,KAAkB,EAClB,YAA4B,EAC5B,EAAE;IACF,MAAM,WAAW,GAAG,IAAA,4BAAa,EAAC,YAAY,CAAC,CAAA;IAE/C,OAAO,CAAC,IAAa,EAAE,EAAE,CACvB,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,4BAAa,EAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAC5E,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC;IAC1C,GAAG,OAAO;IACV,SAAS,EAAE;QACT,GAAG,mBAAS;QACZ,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;KAC7B;CACF,CAAC,CAAA;AAEF,SAAgB,YAAY,CAC1B,GAAkB,EAClB,UAAmB,EAAE;IAErB,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IAC7C,MAAM,KAAK,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC,eAAe,CAAC,CAAC,qBAAQ,CAAC,CAAA;IAE9D,OAAO,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE;QAClD,gBAAgB,EAAE,kBAAkB,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QACjE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE;YAC3D,gBAAgB,EAAE,kBAAkB,CAAC,KAAK,EAAE;gBAC1C,GAAG,EAAE,IAAI;gBACT,UAAU,EAAE,IAAI;aACjB,CAAC;SACH,CAAC;KACH,CAAC,CAAA;AACJ,CAAC;AAhBD,oCAgBC"}

package/dist/operations/alt.d.ts

@@ -1,2 +1,2 @@
 import { Operation, MapDefinition } from '../types';
-export default function alt(fn: MapDefinition, undefinedValues?: unknown[]): Operation;
+export default function alt(...defs: MapDefinition[]): Operation[];

package/dist/operations/alt.js

@@ -2,15 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const stateHelpers_1 = require("../utils/stateHelpers");
 const definitionHelpers_1 = require("../utils/definitionHelpers");
-const escape_1 = require("../utils/escape");
-function alt(fn, undefinedValues = [undefined]) {
-    return (options) => {
-        const undefinedValuesUnescaped = undefinedValues.map(escape_1.unescapeValue);
-        const runAlt = (0, definitionHelpers_1.mapFunctionFromDef)(fn)(options);
-        return (state) => undefinedValuesUnescaped.includes((0, stateHelpers_1.getStateValue)(state))
-            ? runAlt((0, stateHelpers_1.setStateValue)(state, state.context))
-            : state;
+const functional_1 = require("../utils/functional");
+function runAlt(operation, index) {
+    return (options) => (next) => (state) => {
+        const nextState = next(state);
+        const { noneValues } = options;
+        const isFirst = index === 0;
+        if (isFirst) {
+            const thisState = operation(options)(functional_1.identity)(nextState);
+            return (0, stateHelpers_1.isNoneValueState)(thisState, noneValues)
+                ? { ...thisState, context: [...nextState.context, nextState.value] }
+                : thisState;
+        }
+        else {
+            if ((0, stateHelpers_1.isNoneValueState)(nextState, noneValues)) {
+                return operation(options)(functional_1.identity)((0, stateHelpers_1.removeLastContext)((0, stateHelpers_1.setStateValue)(nextState, (0, stateHelpers_1.getLastContext)(nextState))));
+            }
+            else {
+                return nextState;
+            }
+        }
     };
 }
+function alt(...defs) {
+    const altOperations = defs.map((def) => (0, definitionHelpers_1.operationFromDef)(def));
+    return altOperations.map(runAlt);
+}
 exports.default = alt;
 //# sourceMappingURL=alt.js.map

package/dist/operations/alt.js.map

@@ -1 +1 @@
-{"version":3,"file":"alt.js","sourceRoot":"","sources":["../../src/operations/alt.ts"],"names":[],"mappings":";;AACA,wDAAoE;AACpE,kEAA+D;AAC/D,4CAA+C;AAE/C,SAAwB,GAAG,CACzB,EAAiB,EACjB,kBAA6B,CAAC,SAAS,CAAC;IAExC,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,wBAAwB,GAAG,eAAe,CAAC,GAAG,CAAC,sBAAa,CAAC,CAAA;QACnE,MAAM,MAAM,GAAG,IAAA,sCAAkB,EAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;QAE9C,OAAO,CAAC,KAAK,EAAE,EAAE,CACf,wBAAwB,CAAC,QAAQ,CAAC,IAAA,4BAAa,EAAC,KAAK,CAAC,CAAC;YACrD,CAAC,CAAC,MAAM,CAAC,IAAA,4BAAa,EAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC,CAAC,KAAK,CAAA;IACb,CAAC,CAAA;AACH,CAAC;AAbD,sBAaC"}
+{"version":3,"file":"alt.js","sourceRoot":"","sources":["../../src/operations/alt.ts"],"names":[],"mappings":";;AACA,wDAK8B;AAC9B,kEAA6D;AAC7D,oDAA8C;AAE9C,SAAS,MAAM,CAAC,SAAoB,EAAE,KAAa;IACjD,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,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;QAC9B,MAAM,OAAO,GAAG,KAAK,KAAK,CAAC,CAAA;QAE3B,IAAI,OAAO,EAAE;YACX,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,qBAAQ,CAAC,CAAC,SAAS,CAAC,CAAA;YACzD,OAAO,IAAA,+BAAgB,EAAC,SAAS,EAAE,UAAU,CAAC;gBAC5C,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE;gBACpE,CAAC,CAAC,SAAS,CAAA;SACd;aAAM;YACL,IAAI,IAAA,+BAAgB,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE;gBAC3C,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,qBAAQ,CAAC,CACjC,IAAA,gCAAiB,EAAC,IAAA,4BAAa,EAAC,SAAS,EAAE,IAAA,6BAAc,EAAC,SAAS,CAAC,CAAC,CAAC,CACvE,CAAA;aACF;iBAAM;gBACL,OAAO,SAAS,CAAA;aACjB;SACF;IACH,CAAC,CAAA;AACH,CAAC;AAED,SAAwB,GAAG,CAAC,GAAG,IAAqB;IAElD,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC,CAAA;IAK9D,OAAO,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAClC,CAAC;AARD,sBAQC"}

package/dist/operations/apply.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const definitionHelpers_1 = require("../utils/definitionHelpers");
 const extractPipeline = (pipelineId, { pipelines }) => pipelineId && pipelines ? pipelines[pipelineId] : undefined;
 function apply(pipelineId) {
-    return (options) => {
+    return (options) => (next) => {
         const pipeline = extractPipeline(pipelineId, options);
-        return pipeline ? (0, definitionHelpers_1.mapFunctionFromDef)(pipeline)(options) : (state) => state;
+        return pipeline
+            ? (0, definitionHelpers_1.operationFromDef)(pipeline)(options)(next)
+            : (state) => next(state);
     };
 }
 exports.default = apply;

package/dist/operations/apply.js.map

@@ -1 +1 @@
-{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/operations/apply.ts"],"names":[],"mappings":";;AACA,kEAA+D;AAE/D,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAE,EAAE,SAAS,EAAW,EAAE,EAAE,CACrE,UAAU,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAE7D,SAAwB,KAAK,CAAC,UAAkB;IAC9C,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QACrD,OAAO,QAAQ,CAAC,CAAC,CAAC,IAAA,sCAAkB,EAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAA;IAC5E,CAAC,CAAA;AACH,CAAC;AALD,wBAKC"}
+{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/operations/apply.ts"],"names":[],"mappings":";;AACA,kEAA6D;AAE7D,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAE,EAAE,SAAS,EAAW,EAAE,EAAE,CACrE,UAAU,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAE7D,SAAwB,KAAK,CAAC,UAAkB;IAC9C,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QACrD,OAAO,QAAQ;YACb,CAAC,CAAC,IAAA,oCAAgB,EAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC;YAC3C,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC5B,CAAC,CAAA;AACH,CAAC;AAPD,wBAOC"}

package/dist/operations/concat.js

@@ -2,13 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const stateHelpers_1 = require("../utils/stateHelpers");
 const definitionHelpers_1 = require("../utils/definitionHelpers");
+const functional_1 = require("../utils/functional");
 const merge = (left, right) => Array.isArray(right) ? [...left, ...right] : [...left, right];
 function concat(...defs) {
-    return (options) => {
-        const fns = defs.map((def) => (0, definitionHelpers_1.mapFunctionFromDef)(def)(options));
-        return (state) => (0, stateHelpers_1.setStateValue)(state, fns
-            .reduce((value, fn) => merge(value, (0, stateHelpers_1.getStateValue)(fn(state))), [])
-            .filter((val) => val !== undefined));
+    return (options) => (next) => {
+        const fns = defs.map((def) => (0, definitionHelpers_1.operationFromDef)(def)(options)(functional_1.identity));
+        return function doConcat(state) {
+            const nextState = next(state);
+            return (0, stateHelpers_1.setStateValue)(nextState, fns
+                .reduce((value, fn) => merge(value, (0, stateHelpers_1.getStateValue)(fn(nextState))), [])
+                .filter((val) => val !== undefined));
+        };
     };
 }
 exports.default = concat;

package/dist/operations/concat.js.map

@@ -1 +1 @@
-{"version":3,"file":"concat.js","sourceRoot":"","sources":["../../src/operations/concat.ts"],"names":[],"mappings":";;AACA,wDAAoE;AACpE,kEAA+D;AAE/D,MAAM,KAAK,GAAG,CAAO,IAAS,EAAE,KAAc,EAAE,EAAE,CAChD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,CAAA;AAE/D,SAAwB,MAAM,CAAC,GAAG,IAAqB;IACrD,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;QAE/D,OAAO,CAAC,KAAK,EAAE,EAAE,CACf,IAAA,4BAAa,EACX,KAAK,EACL,GAAG;aACA,MAAM,CACL,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,IAAA,4BAAa,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EACrD,EAAe,CAChB;aACA,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,CACtC,CAAA;IACL,CAAC,CAAA;AACH,CAAC;AAfD,yBAeC"}
+{"version":3,"file":"concat.js","sourceRoot":"","sources":["../../src/operations/concat.ts"],"names":[],"mappings":";;AACA,wDAAoE;AACpE,kEAA6D;AAC7D,oDAA8C;AAE9C,MAAM,KAAK,GAAG,CAAO,IAAS,EAAE,KAAc,EAAE,EAAE,CAChD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,CAAA;AAE/D,SAAwB,MAAM,CAAC,GAAG,IAAqB;IACrD,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,qBAAQ,CAAC,CAAC,CAAA;QAEvE,OAAO,SAAS,QAAQ,CAAC,KAAK;YAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;YAC7B,OAAO,IAAA,4BAAa,EAClB,SAAS,EACT,GAAG;iBACA,MAAM,CACL,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,IAAA,4BAAa,EAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EACzD,EAAe,CAChB;iBACA,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,CACtC,CAAA;QACH,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAjBD,yBAiBC"}

package/dist/operations/directionals.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.divide = exports.rev = exports.fwd = void 0;
 const definitionHelpers_1 = require("../utils/definitionHelpers");
+const xor_1 = require("../utils/xor");
 const applyInDirection = (def, rev) => {
-    return (options) => {
-        const fn = (0, definitionHelpers_1.mapFunctionFromDef)(def)(options);
-        return (state) => ((rev ? state.rev : !state.rev) ? fn(state) : state);
+    return (options) => (next) => {
+        const fn = (0, definitionHelpers_1.operationFromDef)(def)(options)(next);
+        return (state) => ((0, xor_1.default)(rev, !state.rev) ? fn(state) : next(state));
     };
 };
 function fwd(def) {
@@ -17,9 +18,9 @@ function rev(def) {
 }
 exports.rev = rev;
 function divide(fwdDef, revDef) {
-    return (options) => {
-        const fwdFn = (0, definitionHelpers_1.mapFunctionFromDef)(fwdDef)(options);
-        const revFn = (0, definitionHelpers_1.mapFunctionFromDef)(revDef)(options);
+    return (options) => (next) => {
+        const fwdFn = (0, definitionHelpers_1.operationFromDef)(fwdDef)(options)(next);
+        const revFn = (0, definitionHelpers_1.operationFromDef)(revDef)(options)(next);
         return (state) => (state.rev ? revFn(state) : fwdFn(state));
     };
 }

package/dist/operations/directionals.js.map

@@ -1 +1 @@
-{"version":3,"file":"directionals.js","sourceRoot":"","sources":["../../src/operations/directionals.ts"],"names":[],"mappings":";;;AACA,kEAA+D;AAE/D,MAAM,gBAAgB,GAAG,CAAC,GAAkB,EAAE,GAAY,EAAa,EAAE;IACvE,OAAO,CAAC,OAAgB,EAAE,EAAE;QAC1B,MAAM,EAAE,GAAG,IAAA,sCAAkB,EAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAA;QAC3C,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACxE,CAAC,CAAA;AACH,CAAC,CAAA;AAED,SAAgB,GAAG,CAAC,GAAkB;IACpC,OAAO,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AACrC,CAAC;AAFD,kBAEC;AAED,SAAgB,GAAG,CAAC,GAAkB;IACpC,OAAO,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;AACpC,CAAC;AAFD,kBAEC;AAED,SAAgB,MAAM,CACpB,MAAqB,EACrB,MAAqB;IAErB,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,KAAK,GAAG,IAAA,sCAAkB,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAA;QACjD,MAAM,KAAK,GAAG,IAAA,sCAAkB,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAA;QACjD,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IAC7D,CAAC,CAAA;AACH,CAAC;AATD,wBASC"}
+{"version":3,"file":"directionals.js","sourceRoot":"","sources":["../../src/operations/directionals.ts"],"names":[],"mappings":";;;AACA,kEAA6D;AAC7D,sCAA8B;AAE9B,MAAM,gBAAgB,GAAG,CAAC,GAAkB,EAAE,GAAY,EAAa,EAAE;IACvE,OAAO,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;QACpC,MAAM,EAAE,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAA;QAC/C,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAA,aAAG,EAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;IACpE,CAAC,CAAA;AACH,CAAC,CAAA;AAED,SAAgB,GAAG,CAAC,GAAkB;IACpC,OAAO,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AACrC,CAAC;AAFD,kBAEC;AAED,SAAgB,GAAG,CAAC,GAAkB;IACpC,OAAO,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;AACpC,CAAC;AAFD,kBAEC;AAED,SAAgB,MAAM,CACpB,MAAqB,EACrB,MAAqB;IAErB,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,MAAM,KAAK,GAAG,IAAA,oCAAgB,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAA;QACrD,MAAM,KAAK,GAAG,IAAA,oCAAgB,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAA;QACrD,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IAC7D,CAAC,CAAA;AACH,CAAC;AATD,wBASC"}

package/dist/operations/filter.js

@@ -1,21 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const stateHelpers_1 = require("../utils/stateHelpers");
-const functional_1 = require("../utils/functional");
 const filterValue = (value, filterFn) => Array.isArray(value)
     ? value.filter(filterFn)
     : filterFn(value)
         ? value
         : undefined;
 function filter(fn) {
-    return (_options) => {
+    return (_options) => (next) => {
         if (typeof fn !== 'function') {
-            return functional_1.identity;
+            return (state) => next(state);
         }
         return (state) => {
-            const filterFn = (data) => !!fn(data, state);
-            const value = (0, stateHelpers_1.getStateValue)(state);
-            return (0, stateHelpers_1.setStateValue)(state, filterValue(value, filterFn));
+            const nextState = next(state);
+            const filterFn = (data) => !!fn(data, nextState);
+            return (0, stateHelpers_1.setStateValue)(nextState, filterValue((0, stateHelpers_1.getStateValue)(nextState), filterFn));
         };
     };
 }

package/dist/operations/filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../src/operations/filter.ts"],"names":[],"mappings":";;AACA,wDAAoE;AACpE,oDAA8C;AAE9C,MAAM,WAAW,GAAG,CAAC,KAAc,EAAE,QAAoC,EAAE,EAAE,CAC3E,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;IAClB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;IACxB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QACjB,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,SAAS,CAAA;AAEf,SAAwB,MAAM,CAAC,EAAc;IAC3C,OAAO,CAAC,QAAQ,EAAE,EAAE;QAClB,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;YAC5B,OAAO,qBAAQ,CAAA;SAChB;QAED,OAAO,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,QAAQ,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YACrD,MAAM,KAAK,GAAG,IAAA,4BAAa,EAAC,KAAK,CAAC,CAAA;YAClC,OAAO,IAAA,4BAAa,EAAC,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;QAC3D,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAZD,yBAYC"}
+{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../src/operations/filter.ts"],"names":[],"mappings":";;AACA,wDAAoE;AAEpE,MAAM,WAAW,GAAG,CAAC,KAAc,EAAE,QAAoC,EAAE,EAAE,CAC3E,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;IAClB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;IACxB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QACjB,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,SAAS,CAAA;AAEf,SAAwB,MAAM,CAAC,EAAc;IAC3C,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5B,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;YAC5B,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;SAC9B;QAED,OAAO,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAA;YAC7B,MAAM,QAAQ,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;YACzD,OAAO,IAAA,4BAAa,EAClB,SAAS,EACT,WAAW,CAAC,IAAA,4BAAa,EAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAChD,CAAA;QACH,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAfD,yBAeC"}

package/dist/operations/fixed.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const value_1 = require("../functions/value");
 function fixed(val) {
-    return () => (state) => ({
+    return () => (_next) => (state) => ({
         ...state,
         value: (0, value_1.extractValue)(val),
     });

package/dist/operations/fixed.js.map

@@ -1 +1 @@
-{"version":3,"file":"fixed.js","sourceRoot":"","sources":["../../src/operations/fixed.ts"],"names":[],"mappings":";;AACA,8CAAiD;AAEjD,SAAwB,KAAK,CAAC,GAA4B;IACxD,OAAO,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvB,GAAG,KAAK;QACR,KAAK,EAAE,IAAA,oBAAY,EAAC,GAAG,CAAC;KACzB,CAAC,CAAA;AACJ,CAAC;AALD,wBAKC"}
+{"version":3,"file":"fixed.js","sourceRoot":"","sources":["../../src/operations/fixed.ts"],"names":[],"mappings":";;AACA,8CAAiD;AAEjD,SAAwB,KAAK,CAAC,GAA4B;IACxD,OAAO,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAClC,GAAG,KAAK;QACR,KAAK,EAAE,IAAA,oBAAY,EAAC,GAAG,CAAC;KACzB,CAAC,CAAA;AACJ,CAAC;AALD,wBAKC"}

package/dist/operations/getSet.d.ts

@@ -1,4 +1,3 @@
-import { Operation, State, Path } from '../types';
-export declare const getValueFromState: (path: Path) => (state: State) => unknown;
-export declare const get: (path: Path) => Operation;
-export declare const set: (path: Path) => Operation;
+import { Path, Operation } from '../types';
+export declare const get: (path: Path) => Operation[];
+export declare const set: (path: Path) => Operation[];

package/dist/operations/getSet.js

@@ -1,37 +1,141 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.set = exports.get = exports.getValueFromState = void 0;
-const pathGetter_1 = require("../utils/pathGetter");
-const pathSetter_1 = require("../utils/pathSetter");
+exports.set = exports.get = void 0;
+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 && value === undefined
-    ? state.target
-    : setFn(value, state.target);
-const getValueFromState = (path) => (state) => (0, pathGetter_1.default)(path)((0, stateHelpers_1.getStateValue)(state));
-exports.getValueFromState = getValueFromState;
-const setValueFromState = (path) => (state) => {
-    const setFn = setWithOnlyMapped(state, (0, pathSetter_1.default)(path));
-    return setFn((0, stateHelpers_1.getStateValue)(state), undefined);
-};
-const getOrSet = (isGetOperation) => (path) => {
-    if (path && path.startsWith('^')) {
-        const rootGetSet = (0, root_1.default)(getOrSet(isGetOperation)(path.slice(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 = (0, exports.getValueFromState)(path);
-    const setFn = setValueFromState(path);
-    return () => Object.assign((state) => (0, stateHelpers_1.setStateValue)(state, isGet(isGetOperation, state.rev) ? getFn(state) : setFn(state)), {
-        getTarget: (state) => !isGet(isGetOperation, state.rev)
-            ? (0, pathGetter_1.default)(path)(state.target)
-            : state.target,
-    });
-};
-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), undefined);
+                }
+                else {
+                    return next(getFn(state));
+                }
+            };
+        }
+        const [basePath, isArr] = preparePath(path);
+        const getSetFn = typeof basePath === 'number'
+            ? getSetIndex(basePath)
+            : getSetProp(basePath);
+        const getValue = isArr ? (0, functional_1.compose)(array_1.ensureArray, stateHelpers_1.getStateValue) : stateHelpers_1.getStateValue;
+        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 nextValue = state.iterate
+                    ? mapAny(setIt, getValue(nextState))
+                    : setIt(getValue(nextState));
+                return (0, stateHelpers_1.setStateValue)(state, nextValue);
+            }
+            else {
+                const nextState = next(state);
+                const nextValue = getSetFn(getValue(nextState), false);
+                return (0, stateHelpers_1.setStateValue)(nextState, nextValue, 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