@flowerforce/flower-core 3.3.1-beta.2 → 4.0.1-beta.1

package/dist/index.cjs.js

@@ -1,13 +1,7 @@
 'use strict';
 
 var tinyEmitter = require('tiny-emitter');
-var _set = require('lodash/set');
-var _unset = require('lodash/unset');
 var _get = require('lodash/get');
-var _last = require('lodash/last');
-var _slice = require('lodash/slice');
-var _cloneDeep = require('lodash/cloneDeep');
-var lastIndexOf = require('lodash/lastIndexOf');
 var find = require('lodash/find');
 var keyBy = require('lodash/keyBy');
 var has = require('lodash/has');
@@ -18,10 +12,56 @@ var mapKeys = require('lodash/mapKeys');
 var mapValues = require('lodash/mapValues');
 var _trimStart = require('lodash/trimStart');
 var _intersection = require('lodash/intersection');
+var _set = require('lodash/set');
+var _last = require('lodash/last');
+var _slice = require('lodash/slice');
+var _cloneDeep = require('lodash/cloneDeep');
+var lastIndexOf = require('lodash/lastIndexOf');
+var _unset = require('lodash/unset');
 var flat = require('flat');
 
 const Emitter = new tinyEmitter.TinyEmitter();
 
+exports.REDUCER_NAME = void 0;
+(function (REDUCER_NAME) {
+    REDUCER_NAME["FLOWER_FLOW"] = "FlowerFlow";
+    REDUCER_NAME["FLOWER_DATA"] = "FlowerData";
+})(exports.REDUCER_NAME || (exports.REDUCER_NAME = {}));
+const devtoolState = {};
+
+const FlowerStateUtils = {
+    getAllData: (state) => state &&
+        Object.entries(state ?? {}).reduce((acc, [k, v]) => ({ ...acc, [k]: v?.data ?? v }), {}),
+    selectFlowerDataNode: (name) => (state) => _get(state, name),
+    makeSelectCurrentNextRules: (name) => (state) => {
+        const nextRules = _get(state, [name, 'nextRules']);
+        const currentNodeId = FlowerStateUtils.makeSelectCurrentNodeId(name)(state);
+        return _get(nextRules, [currentNodeId]);
+    },
+    makeSelectCurrentNodeId: (name) => (state) => {
+        const subState = _get(state, [name]);
+        const startId = _get(state, ['startId']);
+        return _get(subState, ['current']) || startId;
+    },
+    makeSelectNodeErrors: (name) => (state) => {
+        const data = FlowerStateUtils.selectFlowerDataNode(name)(state);
+        return generateData(data);
+    }
+};
+const generateData = (data) => {
+    const validationErrors = data && data.errors;
+    const allErrors = Object.values(validationErrors || {});
+    return {
+        isSubmitted: data?.isSubmitted || false,
+        isDirty: Object.values(data?.dirty || {}).some(Boolean) || false,
+        hasFocus: data?.hasFocus,
+        errors: data?.errors,
+        customErrors: data?.customErrors,
+        isValidating: data?.isValidating,
+        isValid: allErrors.flat().length === 0
+    };
+};
+
 const EMPTY_STRING_REGEXP = /^\s*$/;
 /**
  * Defines a utility object named rulesMatcherUtils, which contains various helper functions used for processing rules and data in a rule-matching context.
@@ -227,25 +267,21 @@ const operators = {
         .some((c) => c instanceof RegExp ? c.test(a) : new RegExp(c, opt).test(a))
 };
 
-const rulesMatcher = (rules, formValue = {}, apply = true, options) => {
+const rulesMatcher = (rules, dataValue = {}, apply = true, options) => {
     if (!rules)
         return [apply];
     // if (typeof rules !== 'object' && !Array.isArray(rules)) {
     //   throw new Error('Rules accept only array or object');
     // }
     if (typeof rules === 'function') {
-        return [rules(formValue) === apply];
+        return [rules(dataValue) === apply];
     }
     const conditions = Array.isArray(rules)
         ? { $and: rules }
         : rules;
-    const valid = rulesMatcherUtils.checkRule(conditions, formValue, options ?? {});
+    const valid = rulesMatcherUtils.checkRule(conditions, dataValue, options ?? {});
     return [valid === apply];
 };
-const MatchRules = {
-    rulesMatcher,
-    utils: rulesMatcherUtils
-};
 
 /* eslint-disable no-useless-escape */
 // TODO align this set of functions to selectors and reducers functions
@@ -268,36 +304,12 @@ const flattenRules = (ob) => {
     }
     return result;
 };
-// export const searchEmptyKeyRecursively = <T extends object>(
-//   _key: "$and" | "$or",
-//   obj: T
-// ) => {
-//   if (
-//     isEmpty(obj) ||
-//     typeof obj !== "object" ||
-//     Object.keys(obj).length === 0
-//   ) {
-//     return true;
-//   }
-//   if (Object.keys(obj).includes(_key)) {
-//     if (obj[_key] && obj[_key].length === 0) return true;
-//     return Object.keys(obj).map((key) =>
-//       searchEmptyKeyRecursively(_key, obj[key])
-//     );
-//   }
-//   return Object.keys(obj)
-//     .map((key) => searchEmptyKeyRecursively(_key, obj[key]))
-//     .every((v) => v === true);
-// };
 const getRulesExists = (rules) => {
-    return Object.keys(rules).length ? CoreUtils.mapEdge(rules) : undefined;
+    return Object.keys(rules).length ? FlowUtils.mapEdge(rules) : undefined;
 };
-/**
- * Defines a collection of utility functions for processing rules, nodes and graph-like structures
- */
-const CoreUtils = {
+const FlowUtils = {
     generateRulesName: (nextRules) => {
-        const a = nextRules.reduce((acc, inc) => {
+        return nextRules.reduce((acc, inc) => {
             const n = typeof inc.rules === 'string'
                 ? inc.rules || '__ERROR_NAME__'
                 : inc.rules?.name || '__ERROR_NAME__';
@@ -306,7 +318,6 @@ const CoreUtils = {
                 [n]: inc.nodeId
             };
         }, {});
-        return a;
     },
     mapKeysDeepLodash: (obj, cb, isRecursive) => {
         /* istanbul ignore next */
@@ -322,13 +333,13 @@ const CoreUtils = {
             }
         }
         if (Array.isArray(obj)) {
-            return obj.map((item) => CoreUtils.mapKeysDeepLodash(item, cb, true));
+            return obj.map((item) => FlowUtils.mapKeysDeepLodash(item, cb, true));
         }
         if (!isPlainObject(obj)) {
             return obj;
         }
         const result = mapKeys(obj, cb);
-        return mapValues(result, (value) => CoreUtils.mapKeysDeepLodash(value, cb, true));
+        return mapValues(result, (value) => FlowUtils.mapKeysDeepLodash(value, cb, true));
     },
     generateNodes: (nodes) => keyBy(nodes.map((s) => omit(s, 'nextRules')), 'nodeId'),
     makeObjectRules: (nodes) => nodes.reduce((acc, inc) => ({ ...acc, [inc.nodeId]: inc.nextRules }), {}),
@@ -345,17 +356,18 @@ const CoreUtils = {
     },
     mapEdge: (nextNode) => {
         const res = nextNode.sort((a, b) => {
-            const x = CoreUtils.isEmptyRules(a.rules);
-            const y = CoreUtils.isEmptyRules(b.rules);
+            const x = FlowUtils.isEmptyRules(a.rules);
+            const y = FlowUtils.isEmptyRules(b.rules);
             return Number(x) - Number(y);
         });
         return res;
     },
     makeRules: (rules) => Object.entries(rules).reduce((acc2, [k, v]) => [...acc2, { nodeId: k, rules: v }], []),
+    // TODO: This function is strictly related to React nodes, could make sense to move it in the flower-react folder
     generateNodesForFlowerJson: (nodes) => nodes
         .filter((e) => !!_get(e, 'props.id'))
         .map((e) => {
-        const rules = CoreUtils.makeRules(e.props.to ?? {});
+        const rules = FlowUtils.makeRules(e.props.to ?? {});
         const nextRules = getRulesExists(rules);
         const children = e.props.data?.children;
         return {
@@ -368,29 +380,6 @@ const CoreUtils = {
             disabled: e.props.disabled
         };
     }),
-    cleanPath: (name, char = '^') => _trimStart(name, char),
-    getPath: (idValue) => {
-        if (!idValue) {
-            return {
-                path: []
-            };
-        }
-        if (idValue === '*') {
-            return {
-                path: '*'
-            };
-        }
-        if (idValue.indexOf('^') === 0) {
-            const [flowNameFromPath, ...rest] = CoreUtils.cleanPath(idValue).split('.');
-            return {
-                flowNameFromPath,
-                path: rest
-            };
-        }
-        return {
-            path: idValue.split('.')
-        };
-    },
     allEqual: (arr, arr2) => arr.length === arr2.length && arr.every((v) => arr2.includes(v)),
     findValidRule: (nextRules, value, prefix) => find(nextRules, (rule) => {
         // fix per evitare di entrare in un nodo senza regole, ma con un name,
@@ -410,53 +399,52 @@ const CoreUtils = {
         if (typeof rule.rules.rules === 'string') {
             return false;
         }
-        const [valid] = MatchRules.rulesMatcher(rule.rules.rules, value, true, {
+        const [valid] = rulesMatcher(rule.rules.rules, value, true, {
             prefix
         });
         return valid;
     })
 };
 
-const FlowerStateUtils = {
-    getAllData: (state) => state &&
-        Object.entries(state ?? {}).reduce((acc, [k, v]) => ({ ...acc, [k]: v.data }), {}),
-    selectFlowerFormNode: (name, id) => (state) => _get(state, [name, 'form', id]),
-    makeSelectCurrentNextRules: (name) => (state) => {
-        const nextRules = _get(state, [name, 'nextRules']);
-        const currentNodeId = FlowerStateUtils.makeSelectCurrentNodeId(name)(state);
-        return _get(nextRules, [currentNodeId]);
-    },
-    makeSelectCurrentNodeId: (name) => (state) => {
-        const subState = _get(state, [name]);
-        const startId = _get(state, ['startId']);
-        return _get(subState, ['current']) || startId;
-    },
-    makeSelectNodeErrors: (name, currentNodeId) => (state) => {
-        const form = FlowerStateUtils.selectFlowerFormNode(name, currentNodeId)(state);
-        return createFormData(form);
+const DataUtils = {
+    cleanPath: (name, char = '^') => _trimStart(name, char),
+    getPath: (idValue) => {
+        if (!idValue) {
+            return {
+                path: []
+            };
+        }
+        if (idValue === '*') {
+            return {
+                path: '*'
+            };
+        }
+        if (idValue.indexOf('^') === 0) {
+            const [rootName, ...rest] = DataUtils.cleanPath(idValue).split('.');
+            return {
+                rootName,
+                path: rest
+            };
+        }
+        return {
+            path: idValue.split('.')
+        };
     }
 };
-const createFormData = (form) => {
-    const validationErrors = form && form.errors;
-    const allErrors = Object.values(validationErrors || {});
-    return {
-        isSubmitted: form?.isSubmitted || false,
-        isDirty: Object.values(form?.dirty || {}).some(Boolean) || false,
-        hasFocus: form?.hasFocus,
-        errors: form?.errors,
-        customErrors: form?.customErrors,
-        isValidating: form?.isValidating,
-        isValid: allErrors.flat().length === 0
-    };
-};
 
-const devtoolState = {};
+/**
+ * Defines a collection of utility functions for processing rules, nodes and graph-like structures
+ */
+const CoreUtils = {
+    ...FlowUtils,
+    ...DataUtils
+};
 
-const { generateNodes, hasNode, makeObjectRules, generateRulesName, findValidRule, getPath } = CoreUtils;
+const { generateNodes, hasNode, makeObjectRules, generateRulesName, findValidRule } = CoreUtils;
 /**
  * These functions are Redux reducers used in a Flux architecture for managing state transitions and updates in a Flower application.
  */
-const FlowerCoreReducers = {
+const FlowerCoreBaseReducers = {
     historyAdd: (state, { payload }) => {
         if (hasNode(state, payload.name, payload.node)) {
             state[payload.name].history.push(payload.node);
@@ -475,27 +463,11 @@ const FlowerCoreReducers = {
         }
         return state;
     },
-    setFormTouched: (state, { payload }) => {
-        if (!_get(state, [
-            typeof payload === 'string' ? payload : payload.flowName,
-            'nodes',
-            typeof payload === 'string' ? payload : payload.currentNode
-        ])) {
-            return state;
-        }
-        _set(state, [
-            typeof payload === 'string' ? payload : payload.flowName,
-            'form',
-            typeof payload === 'string' ? payload : payload.currentNode,
-            'isSubmitted'
-        ], true);
-        return state;
-    },
     // TODO check internal logic and use case
     /* istanbul ignore next */
     forceAddHistory: (state, { payload }) => {
         const { name, flowName, history } = payload;
-        const key = name || flowName || '' || '';
+        const key = name || flowName || '';
         const resultHistory = history.slice(1, -1);
         state[key].history.push(...resultHistory);
         return state;
@@ -568,7 +540,8 @@ const FlowerCoreReducers = {
         return state;
     },
     destroy: (state, { payload }) => {
-        _set(state, [payload.name], {});
+        delete state[payload.name];
+        return state;
     },
     initNodes: (state, { payload }) => {
         if (payload.persist && _get(state, [payload.name, 'persist']))
@@ -591,8 +564,7 @@ const FlowerCoreReducers = {
             current,
             history,
             nodes: generateNodes(payload.nodes),
-            nextRules: makeObjectRules(payload.nodes),
-            data: payload.initialData
+            nextRules: makeObjectRules(payload.nodes)
         });
     },
     // TODO usato solo da flower su vscode
@@ -609,91 +581,14 @@ const FlowerCoreReducers = {
             }
         }
     },
-    formAddCustomErrors: (state, { payload }) => {
-        _set(state, [payload.name, 'form', payload.currentNode, 'customErrors', payload.id], payload.errors);
-    },
-    formAddErrors: (state, { payload }) => {
-        _set(state, [payload.name, 'form', payload.currentNode, 'errors', payload.id], payload.errors);
-    },
-    formRemoveErrors: (state, { payload }) => {
-        _unset(state, [
-            payload.name,
-            'form',
-            payload.currentNode,
-            'errors',
-            payload.id
-        ]);
-        _unset(state, [
-            payload.name,
-            'form',
-            payload.currentNode,
-            'customErrors',
-            payload.id
-        ]);
-        _unset(state, [payload.name, 'form', payload.currentNode, 'isValidating']);
-    },
-    formFieldTouch: (state, { payload }) => {
-        _set(state, [payload.name, 'form', payload.currentNode, 'touches', payload.id], payload.touched);
-    },
-    formFieldDirty: (state, { payload }) => {
-        _set(state, [payload.name, 'form', payload.currentNode, 'dirty', payload.id], payload.dirty);
-    },
-    formFieldFocus: (state, { payload }) => {
-        if (!payload.focused) {
-            _unset(state, [payload.name, 'form', payload.currentNode, 'hasFocus']);
-            return;
-        }
-        _set(state, [payload.name, 'form', payload.currentNode, 'hasFocus'], payload.id);
-    },
-    addData: (state, { payload }) => {
-        const prevData = _get(state, [payload.flowName, 'data']);
-        _set(state, [payload.flowName, 'data'], { ...prevData, ...payload.value });
-    },
-    addDataByPath: (state, { payload }) => {
-        const { path: newpath } = getPath(payload.id);
-        const currentNode = FlowerStateUtils.makeSelectCurrentNodeId(payload.flowName)(state);
-        if (payload.id && payload.id.length) {
-            _set(state, [payload.flowName, 'data', ...newpath], payload.value);
-            if (payload && payload.dirty) {
-                _set(state, [payload.flowName, 'form', currentNode, 'dirty', payload.id], payload.dirty);
-            }
-        }
-    },
-    // TODO usato al momento solo il devtool
-    replaceData: /* istanbul ignore next */ (state, { payload }) => {
-        /* istanbul ignore next */
-        _set(state, [payload.flowName, 'data'], payload.value);
-    },
-    unsetData: (state, { payload }) => {
-        _unset(state, [payload.flowName, 'data', ...payload.id]);
-    },
-    setFormIsValidating: (state, { payload }) => {
-        _set(state, [payload.name, 'form', payload.currentNode, 'isValidating'], payload.isValidating);
-    },
-    resetForm: (state, { payload }) => {
-        const touchedFields = _get(state, [payload.flowName, 'form', payload.id, 'errors'], {});
-        Object.keys(touchedFields).forEach((key) => {
-            const { flowNameFromPath = payload.flowName, path } = getPath(key);
-            _unset(state, [flowNameFromPath, 'data', ...path]);
-        });
-        _unset(state, [payload.flowName, 'form', payload.id, 'touches']);
-        _unset(state, [payload.flowName, 'form', payload.id, 'dirty']);
-        _unset(state, [payload.flowName, 'form', payload.id, 'isSubmitted']);
-    },
     node: (state, { payload }) => {
         const { name, history } = payload;
         const node = payload.nodeId || payload.node || '';
         const flowName = name || payload.flowName || '';
-        const startNode = _get(state, [payload.name, 'startId']);
-        const currentNodeId = _get(state, [payload.name, 'current'], startNode);
-        FlowerCoreReducers.setFormTouched(state, {
-            type: 'setFormTouched',
-            payload: { flowName, currentNode: currentNodeId }
-        });
         /* istanbul ignore next */
         // eslint-disable-next-line no-underscore-dangle
         if (devtoolState && _get(devtoolState, '__FLOWER_DEVTOOLS__') && history) {
-            FlowerCoreReducers.forceAddHistory(state, {
+            FlowerCoreBaseReducers.forceAddHistory(state, {
                 type: 'forceAddHistory',
                 payload: {
                     name,
@@ -702,34 +597,35 @@ const FlowerCoreReducers = {
                 }
             });
         }
-        FlowerCoreReducers.historyAdd(state, {
+        FlowerCoreBaseReducers.historyAdd(state, {
             type: 'historyAdd',
             payload: { name: name || flowName || '', node }
         });
     },
     prevToNode: (state, { payload }) => {
         const { node, name, flowName } = payload;
-        FlowerCoreReducers.historyPrevToNode(state, {
+        FlowerCoreBaseReducers.historyPrevToNode(state, {
             type: 'historyPrevToNode',
             payload: { name: name || flowName || '', node }
         });
     },
     next: (state, { payload }) => {
-        const { name, data = {}, route } = payload;
-        const flowName = name || payload.flowName || '';
+        const { name, route, flowName: flow, data = {}, dataIn = {} } = payload;
+        const flowName = name || flow || '';
+        const { FlowerData, FlowerFlow, ...external } = data;
         const currentNodeId = FlowerStateUtils.makeSelectCurrentNodeId(flowName)(state);
         const currentNextRules = FlowerStateUtils.makeSelectCurrentNextRules(flowName)(state);
-        const form = FlowerStateUtils.makeSelectNodeErrors(flowName, currentNodeId)(state);
-        const clonedData = _cloneDeep(FlowerStateUtils.getAllData(state));
+        const $data = FlowerStateUtils.makeSelectNodeErrors(flowName, currentNodeId)(FlowerData);
+        const internalClonedData = _cloneDeep(FlowerStateUtils.getAllData(FlowerData));
+        const externalClonedData = _cloneDeep(FlowerStateUtils.getAllData(external));
         const stateWithNodeData = {
-            $in: data,
-            $form: form,
-            ...clonedData
+            $in: dataIn,
+            /** @deprecated use $data instead */
+            $form: $data,
+            $data,
+            ...externalClonedData,
+            ...internalClonedData
         };
-        FlowerCoreReducers.setFormTouched(state, {
-            type: 'setFormTouched',
-            payload: { flowName, currentNode: currentNodeId }
-        });
         if (!currentNextRules) {
             return;
         }
@@ -738,7 +634,7 @@ const FlowerCoreReducers = {
             if (!rulesByName[route]) {
                 return;
             }
-            FlowerCoreReducers.historyAdd(state, {
+            FlowerCoreBaseReducers.historyAdd(state, {
                 type: 'historyAdd',
                 payload: { name: flowName, node: rulesByName[route] }
             });
@@ -749,51 +645,120 @@ const FlowerCoreReducers = {
         if (!nextNumberNode) {
             return;
         }
-        FlowerCoreReducers.historyAdd(state, {
+        FlowerCoreBaseReducers.historyAdd(state, {
             type: 'historyAdd',
             payload: { name: flowName, node: nextNumberNode }
         });
     },
     prev: (state, { payload }) => {
         const { name, flowName } = payload;
-        FlowerCoreReducers.historyPop(state, {
+        FlowerCoreBaseReducers.historyPop(state, {
             type: 'historyPop',
             payload: { name: name || flowName || '' }
         });
     },
     restart: (state, { payload }) => {
         const { name, flowName } = payload;
-        FlowerCoreReducers.restoreHistory(state, {
+        FlowerCoreBaseReducers.restoreHistory(state, {
             type: 'restoreHistory',
             payload: { name: name || flowName || '' }
         });
     },
     reset: (state, { payload }) => {
-        const { name, flowName, initialData } = payload;
-        FlowerCoreReducers.restoreHistory(state, {
+        const { name, flowName } = payload;
+        FlowerCoreBaseReducers.restoreHistory(state, {
             type: 'restoreHistory',
             payload: { name: name || flowName || '' }
         });
-        _set(state, [name || flowName || '', 'form'], {});
-        _set(state, [name || flowName || '', 'data'], initialData);
     }
 };
 
-const FlowerCoreStateSelectors = {
-    selectGlobal: (state) => state && state.flower,
+const { getPath } = CoreUtils;
+const FlowerCoreDataReducers = {
+    setFormSubmitted: (state, { payload }) => {
+        const rootPath = typeof payload === 'string' ? payload : payload.rootName;
+        if (!_get(state, [rootPath])) {
+            return state;
+        }
+        _set(state, [rootPath, 'isSubmitted'], true);
+        return state;
+    },
+    addCustomDataErrors: (state, { payload }) => {
+        _set(state, [payload.rootName, 'customErrors', payload.id], payload.errors);
+    },
+    addDataErrors: (state, { payload }) => {
+        _set(state, [payload.rootName, 'errors', payload.id], payload.errors);
+    },
+    removeDataErrors: (state, { payload }) => {
+        _unset(state, [payload.rootName, 'errors', payload.id]);
+        _unset(state, [payload.rootName, 'customErrors', payload.id]);
+        _unset(state, [payload.rootName, 'isValidating']);
+    },
+    fieldTouch: (state, { payload }) => {
+        _set(state, [payload.rootName, 'touches', payload.id], payload.touched);
+    },
+    fieldDirty: (state, { payload }) => {
+        _set(state, [payload.rootName, 'dirty', payload.id], payload.dirty);
+    },
+    fieldFocus: (state, { payload }) => {
+        if (!payload.focused) {
+            _unset(state, [payload.rootName, 'hasFocus']);
+            return;
+        }
+        _set(state, [payload.rootName, 'hasFocus'], payload.id);
+    },
+    addData: (state, { payload }) => {
+        const prevData = _get(state, [payload.rootName, 'data'], {});
+        _set(state, [payload.rootName, 'data'], { ...prevData, ...payload.value });
+    },
+    addDataByPath: (state, { payload }) => {
+        const { path: newpath } = getPath(payload.id);
+        if (payload.id && payload.id.length) {
+            _set(state, [payload.rootName, 'data', ...newpath], payload.value);
+            if (payload && payload.dirty) {
+                _set(state, [payload.rootName, 'dirty', payload.id], payload.dirty);
+            }
+        }
+    },
+    // TODO usato al momento solo il devtool
+    replaceData: /* istanbul ignore next */ (state, { payload }) => {
+        /* istanbul ignore next */
+        _set(state, [payload.rootName, 'data'], payload.value);
+    },
+    unsetData: (state, { payload }) => {
+        _unset(state, [payload.rootName, 'data', ...payload.id]);
+    },
+    setIsDataValidating: (state, { payload }) => {
+        _set(state, [payload.rootName, 'isValidating'], payload.isValidating);
+    },
+    resetData: (state, { payload: { rootName, initialData } }) => {
+        const touchedFields = _get(state, [rootName, 'errors'], {});
+        const newStateData = initialData
+            ? Object.keys(touchedFields).reduce((acc, key) => {
+                const { path } = getPath(key);
+                const initialDataByPath = _get(initialData, [...path], undefined);
+                _set(acc, [...path], initialDataByPath);
+                return acc;
+            }, {})
+            : {};
+        _set(state, [rootName, 'data'], newStateData);
+        _unset(state, [rootName, 'touches']);
+        _unset(state, [rootName, 'dirty']);
+        _unset(state, [rootName, 'isSubmitted']);
+    },
+    initData: (state, { payload: { rootName, initialData } }) => {
+        _set(state, [rootName, 'data'], initialData);
+    }
+};
+
+const FlowerCoreReducers = { ...FlowerCoreBaseReducers, ...FlowerCoreDataReducers };
+
+const FlowerCoreStateBaseSelectors = {
+    selectGlobal: (state) => state && state[exports.REDUCER_NAME.FLOWER_FLOW],
     selectFlower: (name) => (state) => _get(state, [name]),
-    selectFlowerFormNode: (id) => (state) => _get(state, ['form', id]),
     selectFlowerHistory: (flower) => _get(flower, ['history'], []),
     makeSelectNodesIds: (flower) => _get(flower, ['nodes']),
     makeSelectStartNodeId: (flower) => _get(flower, ['startId']),
-    getDataByFlow: (flower) => _get(flower, ['data']) ?? {},
-    getDataFromState: (id) => (data) => (id === '*' ? data : _get(data, id)),
-    makeSelectNodeFormSubmitted: (form) => form && form.isSubmitted,
-    makeSelectNodeFormFieldTouched: (id) => (form) => form && form.touches && form.touches[id],
-    makeSelectNodeFormFieldFocused: (id) => (form) => {
-        return form && form.hasFocus === id ? id : undefined;
-    },
-    makeSelectNodeFormFieldDirty: (id) => (form) => form && form.dirty && form.dirty[id],
     makeSelectCurrentNodeId: (flower, startNodeId) => _get(flower, ['current']) || startNodeId,
     makeSelectCurrentNodeDisabled: (nodes, current) => !!_get(nodes, [current, 'disabled']),
     makeSelectPrevNodeRetain: (nodes, history, current) => {
@@ -814,14 +779,29 @@ const FlowerCoreStateSelectors = {
         return nodes[prevFlowerNode] && nodes[prevFlowerNode].retain
             ? prevFlowerNode
             : undefined;
+    }
+};
+
+const FlowerCoreStateDataSelectors = {
+    selectGlobalReducerByName: (name) => (state) => state[name] ?? state[exports.REDUCER_NAME.FLOWER_DATA][name],
+    selectGlobalData: (state) => {
+        return state && state[exports.REDUCER_NAME.FLOWER_DATA];
     },
-    makeSelectNodeErrors: createFormData,
-    makeSelectFieldError: (name, id, validate) => (data, form) => {
-        const customErrors = Object.entries((form && form.customErrors) || {})
+    // getDataByFlow: (flower) => _get(flower, 'data') ?? {},
+    getDataFromState: (id) => (data) => (id === '*' ? data : _get(data, id)),
+    makeSelectNodeDataSubmitted: (data) => data && data.isSubmitted,
+    makeSelectNodeDataFieldTouched: (id) => (data) => data && data.touches && data.touches[id],
+    makeSelectNodeDataFieldFocused: (id) => (data) => {
+        return data && data.hasFocus === id ? id : undefined;
+    },
+    makeSelectNodeDataFieldDirty: (id) => (data) => data && data.dirty && data.dirty[id],
+    makeSelectNodeErrors: generateData,
+    makeSelectFieldError: (name, id, validate) => (globalData, data) => {
+        const customErrors = Object.entries((data && data.customErrors) || {})
             .filter(([k]) => k === id)
             .map(([, v]) => v)
             .flat();
-        if (!validate || !data)
+        if (!validate || !globalData)
             return [];
         const errors = validate.filter((rule) => {
             if (!rule)
@@ -829,7 +809,7 @@ const FlowerCoreStateSelectors = {
             if (!rule.rules)
                 return true;
             const transformSelf = CoreUtils.mapKeysDeepLodash(rule.rules, (v, key) => key === '$self' ? id : key);
-            const [hasError] = MatchRules.rulesMatcher(transformSelf, data, false, {
+            const [hasError] = rulesMatcher(transformSelf, globalData, false, {
                 prefix: name
             });
             return hasError;
@@ -837,8 +817,8 @@ const FlowerCoreStateSelectors = {
         const result = errors.map((r) => (r && r.message) || 'error');
         return [...customErrors, ...(result.length === 0 ? [] : result)];
     },
-    selectorRulesDisabled: (id, rules, keys, flowName, value) => (data, form) => {
-        const newState = { ...data, ...value, $form: form };
+    selectorRulesDisabled: (id, rules, keys, flowName, value) => (globalData, data) => {
+        const newState = { ...globalData, ...value, $data: data, $form: data };
         const state = Object.assign(newState, id ? { $self: _get(newState, [flowName, ...id.split('.')]) } : {});
         if (!rules)
             return false;
@@ -851,39 +831,31 @@ const FlowerCoreStateSelectors = {
             const k = inc;
             return Object.assign(acc, { [k]: _get(state, k) });
         }, {});
-        const [disabled] = MatchRules.rulesMatcher(rules, { ...flat.unflatten(res) }, false, { prefix: flowName });
+        const [disabled] = rulesMatcher(rules, { ...flat.unflatten(res) }, false, {
+            prefix: flowName
+        });
         return disabled;
     }
 };
 
-exports.RulesOperators = void 0;
-(function (RulesOperators) {
-    RulesOperators["$exists"] = "$exists";
-    RulesOperators["$eq"] = "$eq";
-    RulesOperators["$ne"] = "$ne";
-    RulesOperators["$gt"] = "$gt";
-    RulesOperators["$gte"] = "$gte";
-    RulesOperators["$lt"] = "$lt";
-    RulesOperators["$lte"] = "$lte";
-    RulesOperators["$strGt"] = "$strGt";
-    RulesOperators["$strGte"] = "$strGte";
-    RulesOperators["$strLt"] = "$strLt";
-    RulesOperators["$strLte"] = "$strLte";
-    RulesOperators["$in"] = "$in";
-    RulesOperators["$nin"] = "$nin";
-    RulesOperators["$all"] = "$all";
-    RulesOperators["$regex"] = "$regex";
-})(exports.RulesOperators || (exports.RulesOperators = {}));
-exports.RulesModes = void 0;
-(function (RulesModes) {
-    RulesModes["$and"] = "$and";
-    RulesModes["$or"] = "$or";
-})(exports.RulesModes || (exports.RulesModes = {}));
+const FlowerCoreStateSelectors = {
+    ...FlowerCoreStateBaseSelectors,
+    ...FlowerCoreStateDataSelectors
+};
 
 exports.CoreUtils = CoreUtils;
+exports.DataUtils = DataUtils;
 exports.Emitter = Emitter;
+exports.FlowUtils = FlowUtils;
+exports.FlowerCoreBaseReducers = FlowerCoreBaseReducers;
+exports.FlowerCoreDataReducers = FlowerCoreDataReducers;
 exports.FlowerCoreReducers = FlowerCoreReducers;
+exports.FlowerCoreStateBaseSelectors = FlowerCoreStateBaseSelectors;
+exports.FlowerCoreStateDataSelectors = FlowerCoreStateDataSelectors;
+exports.FlowerCoreStateSelectors = FlowerCoreStateSelectors;
 exports.FlowerStateUtils = FlowerStateUtils;
-exports.MatchRules = MatchRules;
-exports.Selectors = FlowerCoreStateSelectors;
 exports.devtoolState = devtoolState;
+exports.flattenRules = flattenRules;
+exports.generateData = generateData;
+exports.rulesMatcher = rulesMatcher;
+exports.rulesMatcherUtils = rulesMatcherUtils;