@flowerforce/flower-core 4.0.1-beta.0 → 4.0.1-beta.1

package/dist/index.cjs.js

@@ -32,7 +32,7 @@ const devtoolState = {};
 const FlowerStateUtils = {
     getAllData: (state) => state &&
         Object.entries(state ?? {}).reduce((acc, [k, v]) => ({ ...acc, [k]: v?.data ?? v }), {}),
-    selectFlowerFormNode: (name) => (state) => _get(state, name),
+    selectFlowerDataNode: (name) => (state) => _get(state, name),
     makeSelectCurrentNextRules: (name) => (state) => {
         const nextRules = _get(state, [name, 'nextRules']);
         const currentNodeId = FlowerStateUtils.makeSelectCurrentNodeId(name)(state);
@@ -44,20 +44,20 @@ const FlowerStateUtils = {
         return _get(subState, ['current']) || startId;
     },
     makeSelectNodeErrors: (name) => (state) => {
-        const form = FlowerStateUtils.selectFlowerFormNode(name)(state);
-        return createFormData(form);
+        const data = FlowerStateUtils.selectFlowerDataNode(name)(state);
+        return generateData(data);
     }
 };
-const createFormData = (form) => {
-    const validationErrors = form && form.errors;
+const generateData = (data) => {
+    const validationErrors = data && data.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,
+        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
     };
 };
@@ -267,19 +267,19 @@ 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];
 };
 
@@ -406,7 +406,7 @@ const FlowUtils = {
     })
 };
 
-const FormUtils = {
+const DataUtils = {
     cleanPath: (name, char = '^') => _trimStart(name, char),
     getPath: (idValue) => {
         if (!idValue) {
@@ -420,9 +420,9 @@ const FormUtils = {
             };
         }
         if (idValue.indexOf('^') === 0) {
-            const [formName, ...rest] = FormUtils.cleanPath(idValue).split('.');
+            const [rootName, ...rest] = DataUtils.cleanPath(idValue).split('.');
             return {
-                formName,
+                rootName,
                 path: rest
             };
         }
@@ -437,7 +437,7 @@ const FormUtils = {
  */
 const CoreUtils = {
     ...FlowUtils,
-    ...FormUtils
+    ...DataUtils
 };
 
 const { generateNodes, hasNode, makeObjectRules, generateRulesName, findValidRule } = CoreUtils;
@@ -674,75 +674,65 @@ const FlowerCoreBaseReducers = {
 };
 
 const { getPath } = CoreUtils;
-/**
- * formName => FlowerForm
- * initialData => FlowerForm
- * fieldName => FlowerField
- * fieldValue => FlowerField
- * errors => FlowerField
- * customErrors => FlowerField
- * fieldTouched => FlowerField
- * fieldDirty => FlowerField
- * fieldHasFocus => FlowerField
- */
 const FlowerCoreDataReducers = {
-    setFormTouched: (state, { payload }) => {
-        if (!_get(state, typeof payload === 'string' ? payload : payload.formName)) {
+    setFormSubmitted: (state, { payload }) => {
+        const rootPath = typeof payload === 'string' ? payload : payload.rootName;
+        if (!_get(state, [rootPath])) {
             return state;
         }
-        _set(state, typeof payload === 'string' ? payload : payload.formName, true);
+        _set(state, [rootPath, 'isSubmitted'], true);
         return state;
     },
-    formAddCustomErrors: (state, { payload }) => {
-        _set(state, [payload.formName, 'customErrors', payload.id], payload.errors);
+    addCustomDataErrors: (state, { payload }) => {
+        _set(state, [payload.rootName, 'customErrors', payload.id], payload.errors);
     },
-    formAddErrors: (state, { payload }) => {
-        _set(state, [payload.formName, 'errors', payload.id], payload.errors);
+    addDataErrors: (state, { payload }) => {
+        _set(state, [payload.rootName, 'errors', payload.id], payload.errors);
     },
-    formRemoveErrors: (state, { payload }) => {
-        _unset(state, [payload.formName, 'errors', payload.id]);
-        _unset(state, [payload.formName, 'customErrors', payload.id]);
-        _unset(state, [payload.formName, 'isValidating']);
+    removeDataErrors: (state, { payload }) => {
+        _unset(state, [payload.rootName, 'errors', payload.id]);
+        _unset(state, [payload.rootName, 'customErrors', payload.id]);
+        _unset(state, [payload.rootName, 'isValidating']);
     },
-    formFieldTouch: (state, { payload }) => {
-        _set(state, [payload.formName, 'touches', payload.id], payload.touched);
+    fieldTouch: (state, { payload }) => {
+        _set(state, [payload.rootName, 'touches', payload.id], payload.touched);
     },
-    formFieldDirty: (state, { payload }) => {
-        _set(state, [payload.formName, 'dirty', payload.id], payload.dirty);
+    fieldDirty: (state, { payload }) => {
+        _set(state, [payload.rootName, 'dirty', payload.id], payload.dirty);
     },
-    formFieldFocus: (state, { payload }) => {
+    fieldFocus: (state, { payload }) => {
         if (!payload.focused) {
-            _unset(state, [payload.formName, 'hasFocus']);
+            _unset(state, [payload.rootName, 'hasFocus']);
             return;
         }
-        _set(state, [payload.formName, 'hasFocus'], payload.id);
+        _set(state, [payload.rootName, 'hasFocus'], payload.id);
     },
     addData: (state, { payload }) => {
-        const prevData = _get(state, [payload.formName, 'data'], {});
-        _set(state, [payload.formName, 'data'], { ...prevData, ...payload.value });
+        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.formName, 'data', ...newpath], payload.value);
+            _set(state, [payload.rootName, 'data', ...newpath], payload.value);
             if (payload && payload.dirty) {
-                _set(state, [payload.formName, 'dirty', payload.id], 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.formName, 'data'], payload.value);
+        _set(state, [payload.rootName, 'data'], payload.value);
     },
     unsetData: (state, { payload }) => {
-        _unset(state, [payload.formName, 'data', ...payload.id]);
+        _unset(state, [payload.rootName, 'data', ...payload.id]);
     },
-    setFormIsValidating: (state, { payload }) => {
-        _set(state, [payload.formName, 'isValidating'], payload.isValidating);
+    setIsDataValidating: (state, { payload }) => {
+        _set(state, [payload.rootName, 'isValidating'], payload.isValidating);
     },
-    resetForm: (state, { payload: { formName, initialData } }) => {
-        const touchedFields = _get(state, [formName, 'errors'], {});
+    resetData: (state, { payload: { rootName, initialData } }) => {
+        const touchedFields = _get(state, [rootName, 'errors'], {});
         const newStateData = initialData
             ? Object.keys(touchedFields).reduce((acc, key) => {
                 const { path } = getPath(key);
@@ -751,13 +741,13 @@ const FlowerCoreDataReducers = {
                 return acc;
             }, {})
             : {};
-        _set(state, [formName, 'data'], newStateData);
-        _unset(state, [formName, 'touches']);
-        _unset(state, [formName, 'dirty']);
-        _unset(state, [formName, 'isSubmitted']);
+        _set(state, [rootName, 'data'], newStateData);
+        _unset(state, [rootName, 'touches']);
+        _unset(state, [rootName, 'dirty']);
+        _unset(state, [rootName, 'isSubmitted']);
     },
-    initForm: (state, { payload: { formName, initialData } }) => {
-        _set(state, [formName, 'data'], initialData);
+    initData: (state, { payload: { rootName, initialData } }) => {
+        _set(state, [rootName, 'data'], initialData);
     }
 };
 
@@ -766,8 +756,6 @@ const FlowerCoreReducers = { ...FlowerCoreBaseReducers, ...FlowerCoreDataReducer
 const FlowerCoreStateBaseSelectors = {
     selectGlobal: (state) => state && state[exports.REDUCER_NAME.FLOWER_FLOW],
     selectFlower: (name) => (state) => _get(state, [name]),
-    // selectFlowerFormNode: (id) => (state) =>
-    //   _get(state, [REDUCER_NAME.FLOWER_DATA, id]),
     selectFlowerHistory: (flower) => _get(flower, ['history'], []),
     makeSelectNodesIds: (flower) => _get(flower, ['nodes']),
     makeSelectStartNodeId: (flower) => _get(flower, ['startId']),
@@ -796,24 +784,24 @@ const FlowerCoreStateBaseSelectors = {
 
 const FlowerCoreStateDataSelectors = {
     selectGlobalReducerByName: (name) => (state) => state[name] ?? state[exports.REDUCER_NAME.FLOWER_DATA][name],
-    selectGlobalForm: (state) => {
+    selectGlobalData: (state) => {
         return state && state[exports.REDUCER_NAME.FLOWER_DATA];
     },
     // 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],
-    makeSelectNodeErrors: createFormData,
-    makeSelectFieldError: (name, id, validate) => (data, form) => {
-        const customErrors = Object.entries((form && form.customErrors) || {})
+    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)
@@ -821,7 +809,7 @@ const FlowerCoreStateDataSelectors = {
             if (!rule.rules)
                 return true;
             const transformSelf = CoreUtils.mapKeysDeepLodash(rule.rules, (v, key) => key === '$self' ? id : key);
-            const [hasError] = rulesMatcher(transformSelf, data, false, {
+            const [hasError] = rulesMatcher(transformSelf, globalData, false, {
                 prefix: name
             });
             return hasError;
@@ -829,8 +817,8 @@ const FlowerCoreStateDataSelectors = {
         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;
@@ -856,6 +844,7 @@ const FlowerCoreStateSelectors = {
 };
 
 exports.CoreUtils = CoreUtils;
+exports.DataUtils = DataUtils;
 exports.Emitter = Emitter;
 exports.FlowUtils = FlowUtils;
 exports.FlowerCoreBaseReducers = FlowerCoreBaseReducers;
@@ -865,9 +854,8 @@ exports.FlowerCoreStateBaseSelectors = FlowerCoreStateBaseSelectors;
 exports.FlowerCoreStateDataSelectors = FlowerCoreStateDataSelectors;
 exports.FlowerCoreStateSelectors = FlowerCoreStateSelectors;
 exports.FlowerStateUtils = FlowerStateUtils;
-exports.FormUtils = FormUtils;
-exports.createFormData = createFormData;
 exports.devtoolState = devtoolState;
 exports.flattenRules = flattenRules;
+exports.generateData = generateData;
 exports.rulesMatcher = rulesMatcher;
 exports.rulesMatcherUtils = rulesMatcherUtils;

package/dist/index.esm.js

@@ -30,7 +30,7 @@ const devtoolState = {};
 const FlowerStateUtils = {
     getAllData: (state) => state &&
         Object.entries(state ?? {}).reduce((acc, [k, v]) => ({ ...acc, [k]: v?.data ?? v }), {}),
-    selectFlowerFormNode: (name) => (state) => _get(state, name),
+    selectFlowerDataNode: (name) => (state) => _get(state, name),
     makeSelectCurrentNextRules: (name) => (state) => {
         const nextRules = _get(state, [name, 'nextRules']);
         const currentNodeId = FlowerStateUtils.makeSelectCurrentNodeId(name)(state);
@@ -42,20 +42,20 @@ const FlowerStateUtils = {
         return _get(subState, ['current']) || startId;
     },
     makeSelectNodeErrors: (name) => (state) => {
-        const form = FlowerStateUtils.selectFlowerFormNode(name)(state);
-        return createFormData(form);
+        const data = FlowerStateUtils.selectFlowerDataNode(name)(state);
+        return generateData(data);
     }
 };
-const createFormData = (form) => {
-    const validationErrors = form && form.errors;
+const generateData = (data) => {
+    const validationErrors = data && data.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,
+        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
     };
 };
@@ -265,19 +265,19 @@ 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];
 };
 
@@ -404,7 +404,7 @@ const FlowUtils = {
     })
 };
 
-const FormUtils = {
+const DataUtils = {
     cleanPath: (name, char = '^') => _trimStart(name, char),
     getPath: (idValue) => {
         if (!idValue) {
@@ -418,9 +418,9 @@ const FormUtils = {
             };
         }
         if (idValue.indexOf('^') === 0) {
-            const [formName, ...rest] = FormUtils.cleanPath(idValue).split('.');
+            const [rootName, ...rest] = DataUtils.cleanPath(idValue).split('.');
             return {
-                formName,
+                rootName,
                 path: rest
             };
         }
@@ -435,7 +435,7 @@ const FormUtils = {
  */
 const CoreUtils = {
     ...FlowUtils,
-    ...FormUtils
+    ...DataUtils
 };
 
 const { generateNodes, hasNode, makeObjectRules, generateRulesName, findValidRule } = CoreUtils;
@@ -672,75 +672,65 @@ const FlowerCoreBaseReducers = {
 };
 
 const { getPath } = CoreUtils;
-/**
- * formName => FlowerForm
- * initialData => FlowerForm
- * fieldName => FlowerField
- * fieldValue => FlowerField
- * errors => FlowerField
- * customErrors => FlowerField
- * fieldTouched => FlowerField
- * fieldDirty => FlowerField
- * fieldHasFocus => FlowerField
- */
 const FlowerCoreDataReducers = {
-    setFormTouched: (state, { payload }) => {
-        if (!_get(state, typeof payload === 'string' ? payload : payload.formName)) {
+    setFormSubmitted: (state, { payload }) => {
+        const rootPath = typeof payload === 'string' ? payload : payload.rootName;
+        if (!_get(state, [rootPath])) {
             return state;
         }
-        _set(state, typeof payload === 'string' ? payload : payload.formName, true);
+        _set(state, [rootPath, 'isSubmitted'], true);
         return state;
     },
-    formAddCustomErrors: (state, { payload }) => {
-        _set(state, [payload.formName, 'customErrors', payload.id], payload.errors);
+    addCustomDataErrors: (state, { payload }) => {
+        _set(state, [payload.rootName, 'customErrors', payload.id], payload.errors);
     },
-    formAddErrors: (state, { payload }) => {
-        _set(state, [payload.formName, 'errors', payload.id], payload.errors);
+    addDataErrors: (state, { payload }) => {
+        _set(state, [payload.rootName, 'errors', payload.id], payload.errors);
     },
-    formRemoveErrors: (state, { payload }) => {
-        _unset(state, [payload.formName, 'errors', payload.id]);
-        _unset(state, [payload.formName, 'customErrors', payload.id]);
-        _unset(state, [payload.formName, 'isValidating']);
+    removeDataErrors: (state, { payload }) => {
+        _unset(state, [payload.rootName, 'errors', payload.id]);
+        _unset(state, [payload.rootName, 'customErrors', payload.id]);
+        _unset(state, [payload.rootName, 'isValidating']);
     },
-    formFieldTouch: (state, { payload }) => {
-        _set(state, [payload.formName, 'touches', payload.id], payload.touched);
+    fieldTouch: (state, { payload }) => {
+        _set(state, [payload.rootName, 'touches', payload.id], payload.touched);
     },
-    formFieldDirty: (state, { payload }) => {
-        _set(state, [payload.formName, 'dirty', payload.id], payload.dirty);
+    fieldDirty: (state, { payload }) => {
+        _set(state, [payload.rootName, 'dirty', payload.id], payload.dirty);
     },
-    formFieldFocus: (state, { payload }) => {
+    fieldFocus: (state, { payload }) => {
         if (!payload.focused) {
-            _unset(state, [payload.formName, 'hasFocus']);
+            _unset(state, [payload.rootName, 'hasFocus']);
             return;
         }
-        _set(state, [payload.formName, 'hasFocus'], payload.id);
+        _set(state, [payload.rootName, 'hasFocus'], payload.id);
     },
     addData: (state, { payload }) => {
-        const prevData = _get(state, [payload.formName, 'data'], {});
-        _set(state, [payload.formName, 'data'], { ...prevData, ...payload.value });
+        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.formName, 'data', ...newpath], payload.value);
+            _set(state, [payload.rootName, 'data', ...newpath], payload.value);
             if (payload && payload.dirty) {
-                _set(state, [payload.formName, 'dirty', payload.id], 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.formName, 'data'], payload.value);
+        _set(state, [payload.rootName, 'data'], payload.value);
     },
     unsetData: (state, { payload }) => {
-        _unset(state, [payload.formName, 'data', ...payload.id]);
+        _unset(state, [payload.rootName, 'data', ...payload.id]);
     },
-    setFormIsValidating: (state, { payload }) => {
-        _set(state, [payload.formName, 'isValidating'], payload.isValidating);
+    setIsDataValidating: (state, { payload }) => {
+        _set(state, [payload.rootName, 'isValidating'], payload.isValidating);
     },
-    resetForm: (state, { payload: { formName, initialData } }) => {
-        const touchedFields = _get(state, [formName, 'errors'], {});
+    resetData: (state, { payload: { rootName, initialData } }) => {
+        const touchedFields = _get(state, [rootName, 'errors'], {});
         const newStateData = initialData
             ? Object.keys(touchedFields).reduce((acc, key) => {
                 const { path } = getPath(key);
@@ -749,13 +739,13 @@ const FlowerCoreDataReducers = {
                 return acc;
             }, {})
             : {};
-        _set(state, [formName, 'data'], newStateData);
-        _unset(state, [formName, 'touches']);
-        _unset(state, [formName, 'dirty']);
-        _unset(state, [formName, 'isSubmitted']);
+        _set(state, [rootName, 'data'], newStateData);
+        _unset(state, [rootName, 'touches']);
+        _unset(state, [rootName, 'dirty']);
+        _unset(state, [rootName, 'isSubmitted']);
     },
-    initForm: (state, { payload: { formName, initialData } }) => {
-        _set(state, [formName, 'data'], initialData);
+    initData: (state, { payload: { rootName, initialData } }) => {
+        _set(state, [rootName, 'data'], initialData);
     }
 };
 
@@ -764,8 +754,6 @@ const FlowerCoreReducers = { ...FlowerCoreBaseReducers, ...FlowerCoreDataReducer
 const FlowerCoreStateBaseSelectors = {
     selectGlobal: (state) => state && state[REDUCER_NAME.FLOWER_FLOW],
     selectFlower: (name) => (state) => _get(state, [name]),
-    // selectFlowerFormNode: (id) => (state) =>
-    //   _get(state, [REDUCER_NAME.FLOWER_DATA, id]),
     selectFlowerHistory: (flower) => _get(flower, ['history'], []),
     makeSelectNodesIds: (flower) => _get(flower, ['nodes']),
     makeSelectStartNodeId: (flower) => _get(flower, ['startId']),
@@ -794,24 +782,24 @@ const FlowerCoreStateBaseSelectors = {
 
 const FlowerCoreStateDataSelectors = {
     selectGlobalReducerByName: (name) => (state) => state[name] ?? state[REDUCER_NAME.FLOWER_DATA][name],
-    selectGlobalForm: (state) => {
+    selectGlobalData: (state) => {
         return state && state[REDUCER_NAME.FLOWER_DATA];
     },
     // 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],
-    makeSelectNodeErrors: createFormData,
-    makeSelectFieldError: (name, id, validate) => (data, form) => {
-        const customErrors = Object.entries((form && form.customErrors) || {})
+    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)
@@ -819,7 +807,7 @@ const FlowerCoreStateDataSelectors = {
             if (!rule.rules)
                 return true;
             const transformSelf = CoreUtils.mapKeysDeepLodash(rule.rules, (v, key) => key === '$self' ? id : key);
-            const [hasError] = rulesMatcher(transformSelf, data, false, {
+            const [hasError] = rulesMatcher(transformSelf, globalData, false, {
                 prefix: name
             });
             return hasError;
@@ -827,8 +815,8 @@ const FlowerCoreStateDataSelectors = {
         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;
@@ -853,4 +841,4 @@ const FlowerCoreStateSelectors = {
     ...FlowerCoreStateDataSelectors
 };
 
-export { CoreUtils, Emitter, FlowUtils, FlowerCoreBaseReducers, FlowerCoreDataReducers, FlowerCoreReducers, FlowerCoreStateBaseSelectors, FlowerCoreStateDataSelectors, FlowerCoreStateSelectors, FlowerStateUtils, FormUtils, REDUCER_NAME, createFormData, devtoolState, flattenRules, rulesMatcher, rulesMatcherUtils };
+export { CoreUtils, DataUtils, Emitter, FlowUtils, FlowerCoreBaseReducers, FlowerCoreDataReducers, FlowerCoreReducers, FlowerCoreStateBaseSelectors, FlowerCoreStateDataSelectors, FlowerCoreStateSelectors, FlowerStateUtils, REDUCER_NAME, devtoolState, flattenRules, generateData, rulesMatcher, rulesMatcherUtils };

package/dist/src/interfaces/CoreInterface.d.ts

@@ -76,7 +76,7 @@ export type RulesObject<T> = RulesValuesType<T> | {
 export type CleanPath = (name: string, char?: string) => string;
 export type GetPath = (idValue?: string) => {
     path: string | string[];
-    formName?: string;
+    rootName?: string;
 };
 export type AllEqual = (...args: Array<number | string | boolean>[]) => boolean;
 export type FindValidRule<T = Rules<RulesObject<any>>> = (nextRules: {
@@ -201,7 +201,7 @@ export interface FlowUtilitiesFunctions {
      */
     findValidRule: FindValidRule;
 }
-export interface FormUtilitiesFunctions {
+export interface DataUtilitiesFunctions {
     /**
      * Removes specified characters from the beginning of a string (default char -> '^').
      * @param name
@@ -218,6 +218,6 @@ export interface FormUtilitiesFunctions {
      */
     getPath: GetPath;
 }
-export interface CoreUtilitiesFunctions extends FormUtilitiesFunctions, FlowUtilitiesFunctions {
+export interface CoreUtilitiesFunctions extends DataUtilitiesFunctions, FlowUtilitiesFunctions {
 }
 export {};

package/dist/src/interfaces/ReducerInterface.d.ts

@@ -5,13 +5,6 @@ export type ActionWithPayload<T> = {
     payload: T;
 };
 type ReducerFunctionSign<T extends object, R> = (state: Record<string, Flower<T>>, action: ActionWithPayload<R>) => Record<string, Flower<T>> | void;
-type FormReducerFunctionSign<T extends object, R = object> = (state: Record<string, T>, action: ActionWithPayload<{
-    formName: string;
-} & R>) => Record<string, T> | void;
-export type ActionsTypes = 'historyAdd' | 'historyPrevToNode' | 'setFormTouched' | 'forceAddHistory' | 'historyPop' | 'restoreHistory' | 'replaceNode' | 'initializeFromNode' | 'forceResetHistory' | 'destroy' | 'initNodes' | 'setCurrentNode' | 'formAddErrors' | 'formRemoveErrors' | 'addData' | 'addDataByPath' | 'replaceData' | 'unsetData' | 'setFormIsValidating' | 'resetForm' | 'formFieldTouch' | 'formFieldFocus' | 'node' | 'prevToNode' | 'next' | 'prev' | 'reset';
-/**
- * These functions are Redux reducers used in a Flux architecture for managing state transitions and updates in a Flower application.
- */
 export type CoreReducersFunctions<T extends Record<string, any> = Record<string, Flower<Record<string, any>>>> = {
     /**
      * @param state
@@ -242,7 +235,10 @@ export type CoreReducersFunctions<T extends Record<string, any> = Record<string,
      */
     >;
 };
-export type FormReducersFunctions<T extends Record<string, any> = Record<string, Record<string, any>>> = {
+type DataReducerFunctionSign<T extends object, R = object> = (state: Record<string, T>, action: ActionWithPayload<{
+    rootName: string;
+} & R>) => Record<string, T> | void;
+export type DataReducersFunctions<T extends Record<string, any> = Record<string, Record<string, any>>> = {
     /**
      * @param state
      * @param action
@@ -251,7 +247,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    setFormTouched: FormReducerFunctionSign<T>;
+    setFormSubmitted: DataReducerFunctionSign<T>;
     /**
      * @param state
      * @param action
@@ -260,7 +256,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    formAddCustomErrors: FormReducerFunctionSign<T, {
+    addCustomDataErrors: DataReducerFunctionSign<T, {
         id: string;
         errors: string[];
     }>;
@@ -272,7 +268,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    formAddErrors: FormReducerFunctionSign<T, {
+    addDataErrors: DataReducerFunctionSign<T, {
         id: string;
         errors: {
             [x: string]: string[];
@@ -286,7 +282,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    formFieldDirty: FormReducerFunctionSign<T, {
+    fieldDirty: DataReducerFunctionSign<T, {
         id: string;
         dirty?: boolean;
     }>;
@@ -298,7 +294,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    formFieldTouch: FormReducerFunctionSign<T, {
+    fieldTouch: DataReducerFunctionSign<T, {
         id: string;
         touched?: boolean;
     }>;
@@ -310,7 +306,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    formFieldFocus: FormReducerFunctionSign<T, {
+    fieldFocus: DataReducerFunctionSign<T, {
         id: string;
         focused?: boolean;
     }>;
@@ -322,7 +318,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    formRemoveErrors: FormReducerFunctionSign<T, {
+    removeDataErrors: DataReducerFunctionSign<T, {
         id: string;
     }>;
     /**
@@ -333,7 +329,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    addData: FormReducerFunctionSign<T, {
+    addData: DataReducerFunctionSign<T, {
         value: T;
     }>;
     /**
@@ -344,7 +340,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    addDataByPath: FormReducerFunctionSign<T, {
+    addDataByPath: DataReducerFunctionSign<T, {
         id: string;
         value: T | string;
         dirty?: boolean;
@@ -357,7 +353,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    replaceData: FormReducerFunctionSign<T, {
+    replaceData: DataReducerFunctionSign<T, {
         value: T;
     }>;
     /**
@@ -368,7 +364,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    unsetData: FormReducerFunctionSign<T, {
+    unsetData: DataReducerFunctionSign<T, {
         id: string[] | string;
     }>;
     /**
@@ -379,7 +375,7 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    setFormIsValidating: FormReducerFunctionSign<T, {
+    setIsDataValidating: DataReducerFunctionSign<T, {
         isValidating?: boolean;
     }>;
     /**
@@ -390,8 +386,8 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    resetForm: FormReducerFunctionSign<T, {
-        formName: string;
+    resetData: DataReducerFunctionSign<T, {
+        rootName: string;
         initialData?: Record<string, any>;
     }>;
     /**
@@ -402,8 +398,8 @@ export type FormReducersFunctions<T extends Record<string, any> = Record<string,
      *
      * @returns state
      */
-    initForm: FormReducerFunctionSign<T, {
-        formName: string;
+    initData: DataReducerFunctionSign<T, {
+        rootName: string;
         initialData: Record<string, any>;
     }>;
 };

package/dist/src/interfaces/SelectorsInterface.d.ts

@@ -1,6 +1,6 @@
 import { REDUCER_NAME } from '../constants';
 import { RulesObject } from './CoreInterface';
-import { Flower, Form, INode } from './Store';
+import { Flower, Data, INode } from './Store';
 export interface IFlowerSelectors {
     /**
      * @param state
@@ -57,7 +57,7 @@ export interface IFlowerSelectors {
         [x: string]: Partial<INode>;
     }, current: Flower<T>['current']): boolean;
 }
-export interface IFormSelectors {
+export interface IDataSelectors {
     /**
      * @param state
      * @returns
@@ -67,18 +67,18 @@ export interface IFormSelectors {
      * @param state
      * @returns
      */
-    selectGlobalForm<T extends Record<string, any>>(state: {
+    selectGlobalData<T extends Record<string, any>>(state: {
         [REDUCER_NAME.FLOWER_DATA]: {
-            [x: string]: Form<T>;
+            [x: string]: Data<T>;
         };
     }): {
-        [x: string]: Form<T>;
+        [x: string]: Data<T>;
     };
     /**
-     * @param form
+     * @param data
      * @returns
      */
-    makeSelectNodeErrors<T extends Record<string, any>>(form: Form<T> | undefined): {
+    makeSelectNodeErrors<T extends Record<string, any>>(data: Data<T> | undefined): {
         isSubmitted: boolean;
         isDirty: boolean;
         hasFocus: string | undefined;
@@ -88,30 +88,30 @@ export interface IFormSelectors {
         isValidating?: boolean;
     };
     /**
-     * @param form
+     * @param data
      * @returns
      */
-    makeSelectNodeFormFieldTouched<T extends Record<string, any>>(id: string): (form: Form<T> | undefined) => boolean | undefined;
+    makeSelectNodeDataFieldTouched<T extends Record<string, any>>(id: string): (data: Data<T> | undefined) => boolean | undefined;
     /**
-     * @param form
+     * @param data
      * @returns
      */
-    makeSelectNodeFormFieldFocused<T extends Record<string, any>>(id: string): (form: Form<T> | undefined) => string | undefined;
+    makeSelectNodeDataFieldFocused<T extends Record<string, any>>(id: string): (data: Data<T> | undefined) => string | undefined;
     /**
-     * @param form
+     * @param data
      * @returns
      */
-    makeSelectNodeFormFieldDirty<T extends Record<string, any>>(id: string): (form: Form<T> | undefined) => boolean | undefined;
+    makeSelectNodeDataFieldDirty<T extends Record<string, any>>(id: string): (data: Data<T> | undefined) => boolean | undefined;
     /**
      * @param id
      * @returns
      */
     getDataFromState<T extends Record<string, any>>(id: string | string[]): (data: T) => Partial<T>;
     /**
-     * @param form
+     * @param data
      * @returns
      */
-    makeSelectNodeFormSubmitted<T extends Record<string, any>>(form: Form<T>): boolean | undefined;
+    makeSelectNodeDataSubmitted<T extends Record<string, any>>(data: Data<T>): boolean | undefined;
     /**
      * @param name
      * @param id
@@ -121,7 +121,7 @@ export interface IFormSelectors {
     makeSelectFieldError<T extends Record<string, any>>(name: string, id: string, validate: {
         rules?: RulesObject<any>;
         message?: string;
-    }[] | null): (data: T | undefined, form: Form<T>) => Array<string>;
+    }[] | null): (globalData: T | undefined, data: Data<T>) => Array<string>;
     /**
      * @param id
      * @param rules
@@ -130,5 +130,5 @@ export interface IFormSelectors {
      * @param value
      * @returns
      */
-    selectorRulesDisabled<T extends Record<string, any>>(id: string, rules: any, keys: string[] | null, flowName: string, value: any): (data: T | undefined, form: Form<T>) => boolean;
+    selectorRulesDisabled<T extends Record<string, any>>(id: string, rules: any, keys: string[] | null, flowName: string, value: any): (globalData: T | undefined, data: Data<T>) => boolean;
 }

package/dist/src/interfaces/Store.d.ts

@@ -17,7 +17,7 @@ export interface INode {
     retain?: boolean;
     disabled?: boolean;
 }
-export type Form<T extends Record<string, unknown>> = {
+export type Data<T extends Record<string, unknown>> = {
     isSubmitted?: boolean;
     isDirty?: boolean;
     hasFocus?: string;

package/dist/src/interfaces/UtilsInterface.d.ts

@@ -14,7 +14,7 @@ export interface CoreStateUtils {
      * Selects the form node with a specific ID from a given flow.
      * It returns a selector function that accepts the state as an argument and retrieves the form node
      */
-    selectFlowerFormNode<T extends object>(name: string): (state: T) => Record<string, any>;
+    selectFlowerDataNode<T extends object>(name: string): (state: T) => Record<string, any>;
     /**
      *
      * @param name

package/dist/src/rules-matcher/RulesMatcher.d.ts

@@ -1,2 +1,2 @@
 import { FunctionRule } from '../interfaces';
-export declare const rulesMatcher: (rules?: Record<string, any> | Record<string, any>[] | FunctionRule, formValue?: Record<string, any>, apply?: boolean, options?: Record<string, any>) => boolean[];
+export declare const rulesMatcher: (rules?: Record<string, any> | Record<string, any>[] | FunctionRule, dataValue?: Record<string, any>, apply?: boolean, options?: Record<string, any>) => boolean[];

package/dist/src/state-manager/state-functions/FlowerCoreMergedReducers.d.ts

@@ -1,2 +1,2 @@
-import { CoreReducersFunctions, FormReducersFunctions } from '../../interfaces';
-export declare const FlowerCoreReducers: FormReducersFunctions & CoreReducersFunctions;
+import { CoreReducersFunctions, DataReducersFunctions } from '../../interfaces';
+export declare const FlowerCoreReducers: DataReducersFunctions & CoreReducersFunctions;

package/dist/src/state-manager/state-functions/FlowerDataStateFunctions.d.ts

@@ -1,13 +1,2 @@
-import { FormReducersFunctions } from '../../interfaces/ReducerInterface';
-/**
- * formName => FlowerForm
- * initialData => FlowerForm
- * fieldName => FlowerField
- * fieldValue => FlowerField
- * errors => FlowerField
- * customErrors => FlowerField
- * fieldTouched => FlowerField
- * fieldDirty => FlowerField
- * fieldHasFocus => FlowerField
- */
-export declare const FlowerCoreDataReducers: FormReducersFunctions;
+import { DataReducersFunctions } from '../../interfaces/ReducerInterface';
+export declare const FlowerCoreDataReducers: DataReducersFunctions;

package/dist/src/state-manager/state-functions/index.d.ts

@@ -1,4 +1,4 @@
-export type { CoreReducersFunctions, FormReducersFunctions } from '../../interfaces';
+export type { CoreReducersFunctions, DataReducersFunctions } from '../../interfaces';
 export { FlowerCoreBaseReducers } from './FlowerCoreStateFunctions';
 export { FlowerCoreDataReducers } from './FlowerDataStateFunctions';
 export { FlowerCoreReducers } from './FlowerCoreMergedReducers';

package/dist/src/state-manager/state-selectors/FlowerDataStateSelectors.d.ts

@@ -0,0 +1,2 @@
+import { IDataSelectors } from '../../interfaces';
+export declare const FlowerCoreStateDataSelectors: IDataSelectors;

package/dist/src/state-manager/state-selectors/FlowerSelectorsMerged.d.ts

@@ -1,2 +1,2 @@
-import { IFlowerSelectors, IFormSelectors } from '../../interfaces';
-export declare const FlowerCoreStateSelectors: IFlowerSelectors & IFormSelectors;
+import { IFlowerSelectors, IDataSelectors } from '../../interfaces';
+export declare const FlowerCoreStateSelectors: IFlowerSelectors & IDataSelectors;

package/dist/src/state-manager/state-selectors/index.d.ts

@@ -1,4 +1,4 @@
-export type { IFlowerSelectors, IFormSelectors } from '../../interfaces';
+export type { IFlowerSelectors, IDataSelectors } from '../../interfaces';
 export { FlowerCoreStateBaseSelectors } from './FlowerCoreStateSelectors';
-export { FlowerCoreStateDataSelectors } from './FlowerFormStateSelectors';
+export { FlowerCoreStateDataSelectors } from './FlowerDataStateSelectors';
 export { FlowerCoreStateSelectors } from './FlowerSelectorsMerged';

package/dist/src/utils/FlowerCoreStateUtils.d.ts

@@ -1,6 +1,6 @@
 import { CoreStateUtils } from '../interfaces/UtilsInterface';
 export declare const FlowerStateUtils: CoreStateUtils;
-export declare const createFormData: (form: Record<string, any>) => {
+export declare const generateData: (data: Record<string, any>) => {
     isSubmitted: any;
     isDirty: boolean;
     hasFocus: any;

package/dist/src/utils/FlowerDataCoreUtils.d.ts

@@ -0,0 +1,2 @@
+import { DataUtilitiesFunctions } from '../interfaces';
+export declare const DataUtils: DataUtilitiesFunctions;

package/dist/src/utils/index.d.ts

@@ -1,4 +1,4 @@
 export * from './FlowerCoreStateUtils';
 export * from './FlowerCoreUtils';
 export * from './FlowerFlowUtils';
-export * from './FlowerFormCoreUtils';
+export * from './FlowerDataCoreUtils';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flower-core",
-  "version": "4.0.1-beta.0",
+  "version": "4.0.1-beta.1",
   "description": "Core functions for flowerJS",
   "repository": {
     "type": "git",

package/dist/src/state-manager/state-selectors/FlowerFormStateSelectors.d.ts

@@ -1,2 +0,0 @@
-import { IFormSelectors } from '../../interfaces';
-export declare const FlowerCoreStateDataSelectors: IFormSelectors;

package/dist/src/utils/FlowerFormCoreUtils.d.ts

@@ -1,2 +0,0 @@
-import { FormUtilitiesFunctions } from '../interfaces';
-export declare const FormUtils: FormUtilitiesFunctions;