@flowerforce/flower-core 3.0.1-beta.6 → 3.1.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 3.1.0 (2024-06-06)
+
+
+### 🚀 Features
+
+- add restart action in core ([800da33](https://github.com/flowerforce/flower/commit/800da33))
+
+- add devtool to demo - remove duplicated export type ([88117d6](https://github.com/flowerforce/flower/commit/88117d6))
+
+- allow custom functions when defining rules and navigation between nodes ([b35f5da](https://github.com/flowerforce/flower/commit/b35f5da))
+
+
+### 🩹 Fixes
+
+- fix circular dependency on rules matchers ([0bcb02f](https://github.com/flowerforce/flower/commit/0bcb02f))
+
+- align packages ([210a284](https://github.com/flowerforce/flower/commit/210a284))
+
 ## 3.0.0 (2024-05-20)
 
 This was a version bump only for flower-core to align it with other projects, there were no code changes.

package/dist/index.cjs.js

@@ -1,10 +1,9 @@
 'use strict';
 
-var _get = require('lodash/get');
-var isBuffer = require('lodash/isBuffer');
 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');
@@ -19,106 +18,7 @@ var mapKeys = require('lodash/mapKeys');
 var mapValues = require('lodash/mapValues');
 var _trimStart = require('lodash/trimStart');
 var _intersection = require('lodash/intersection');
-
-const keyIdentity = key => key;
-const flatten = (target, opts) => {
-  const options = opts ?? {};
-  const safe = _get(options, 'safe', false);
-  const maxDepth = _get(options, 'maxDepth', 0);
-  const delimiter = _get(options, 'delimiter', '.');
-  const transformKey = _get(options, 'transformKey', keyIdentity);
-  const output = {};
-  const step = (object, prev, currentDepth) => {
-    const depth = currentDepth || 1;
-    Object.keys(object).forEach(key => {
-      const value = object[key];
-      const isarray = safe && Array.isArray(value);
-      const type = Object.prototype.toString.call(value);
-      const isbuffer = isBuffer(value);
-      const isobject = type === '[object Object]' || type === '[object Array]';
-      const newKey = prev ? prev + delimiter + transformKey(key) : transformKey(key);
-      if (!isarray && !isbuffer && isobject && Object.keys(value).length && (!maxDepth || depth < maxDepth)) {
-        return step(value, newKey, depth + 1);
-      }
-      output[newKey] = value;
-    });
-  };
-  step(target);
-  return output;
-};
-const unflatten = (target, opts) => {
-  const options = opts ?? {};
-  const object = _get(options, 'object', false);
-  const overwrite = _get(options, 'overwrite', false);
-  const delimiter = _get(options, 'delimiter', '.');
-  const transformKey = _get(options, 'transformKey', keyIdentity);
-  const result = {};
-  const isbuffer = isBuffer(target);
-  if (isbuffer || Object.prototype.toString.call(target) !== '[object Object]') {
-    return target;
-  }
-  const getkey = key => {
-    const parsedKey = Number(key);
-    return isNaN(parsedKey) || key?.indexOf('.') !== -1 || object ? key : parsedKey;
-  };
-  function addKeys(keyPrefix, recipient, target) {
-    return Object.keys(target).reduce((result, key) => {
-      result[keyPrefix + delimiter + key] = target[key];
-      return result;
-    }, recipient);
-  }
-  function isEmpty(val) {
-    const type = Object.prototype.toString.call(val);
-    const isArray = type === '[object Array]';
-    const isObject = type === '[object Object]';
-    if (!val) {
-      return true;
-    }
-    if (isArray) {
-      return !val.length;
-    }
-    if (isObject) {
-      return !Object.keys(val).length;
-    }
-  }
-  target = Object.keys(target).reduce((result, key) => {
-    const type = Object.prototype.toString.call(target[key]);
-    const isObject = type === '[object Object]' || type === '[object Array]';
-    if (!isObject || isEmpty(target[key])) {
-      result[key] = target[key];
-      return result;
-    }
-    return addKeys(key, result, flatten(target[key], opts));
-  }, {});
-  Object.keys(target).forEach(key => {
-    const split = key.split(delimiter).map(transformKey);
-    let key1 = getkey(split.shift());
-    let key2 = getkey(split[0]);
-    let recipient = result;
-    while (key2 !== undefined) {
-      const recipient_key_1 = key1 && _get(recipient, key1);
-      const type = Object.prototype.toString.call(recipient_key_1);
-      const isobject = type === '[object Object]' || type === '[object Array]';
-      if (!overwrite && !isobject && typeof recipient_key_1 !== 'undefined') {
-        return;
-      }
-      if (overwrite && !isobject || !overwrite && recipient_key_1 == null) {
-        recipient[key1] = typeof key2 === 'number' && !object ? [] : {};
-      }
-      recipient = key1 && _get(recipient, key1);
-      if (split.length > 0) {
-        key1 = getkey(split.shift());
-        key2 = getkey(split[0]);
-      }
-    }
-    recipient[key1] = unflatten(target[key], opts);
-  });
-  return result;
-};
-const flat = {
-  flatten,
-  unflatten
-};
+var flat = require('flat');
 
 const Emitter = new tinyEmitter.TinyEmitter();
 
@@ -291,6 +191,7 @@ const rulesMatcherUtils = {
   },
   getKeys: (rules, options) => {
     if (!rules) return null;
+    if (typeof rules == 'function') return [];
     if (!rulesMatcherUtils.forceArray(rules).every(r => rulesMatcherUtils.isObject(r))) return null;
     const keys = {};
     const conditions = Array.isArray(rules) ? {
@@ -320,6 +221,9 @@ const operators = {
 
 const rulesMatcher = (rules, formValue = {}, apply = true, options) => {
   if (!rules) return [apply];
+  if (typeof rules === 'function') {
+    return [rules(formValue) === apply];
+  }
   const conditions = Array.isArray(rules) ? {
     $and: rules
   } : rules;
@@ -448,6 +352,9 @@ const CoreUtils = {
     if (typeof rule.rules === 'string') {
       return false;
     }
+    if (typeof rule.rules === 'function') {
+      return rule.rules(value);
+    }
     if (rule.rules === null) {
       return true;
     }
@@ -909,6 +816,9 @@ const FlowerCoreStateSelectors = {
       $self: _get(newState, [flowName, ...id.split('.')])
     } : {});
     if (!rules) return false;
+    if (typeof rules === 'function') {
+      return !rules(state);
+    }
     if (!keys) return false;
     const res = keys.reduce((acc, inc) => {
       const k = inc;
@@ -970,7 +880,6 @@ exports.RulesOperators = void 0;
 
 exports.CoreUtils = CoreUtils;
 exports.Emitter = Emitter;
-exports.Flat = flat;
 exports.FlowerCoreReducers = FlowerCoreReducers;
 exports.FlowerStateUtils = FlowerStateUtils;
 exports.MatchRules = MatchRules;

package/dist/index.esm.js

@@ -1,8 +1,7 @@
-import _get from 'lodash/get';
-import isBuffer from 'lodash/isBuffer';
 import { TinyEmitter } from 'tiny-emitter';
 import _set from 'lodash/set';
 import _unset from 'lodash/unset';
+import _get from 'lodash/get';
 import _last from 'lodash/last';
 import _slice from 'lodash/slice';
 import _cloneDeep from 'lodash/cloneDeep';
@@ -17,106 +16,7 @@ import mapKeys from 'lodash/mapKeys';
 import mapValues from 'lodash/mapValues';
 import _trimStart from 'lodash/trimStart';
 import _intersection from 'lodash/intersection';
-
-const keyIdentity = key => key;
-const flatten = (target, opts) => {
-  const options = opts ?? {};
-  const safe = _get(options, 'safe', false);
-  const maxDepth = _get(options, 'maxDepth', 0);
-  const delimiter = _get(options, 'delimiter', '.');
-  const transformKey = _get(options, 'transformKey', keyIdentity);
-  const output = {};
-  const step = (object, prev, currentDepth) => {
-    const depth = currentDepth || 1;
-    Object.keys(object).forEach(key => {
-      const value = object[key];
-      const isarray = safe && Array.isArray(value);
-      const type = Object.prototype.toString.call(value);
-      const isbuffer = isBuffer(value);
-      const isobject = type === '[object Object]' || type === '[object Array]';
-      const newKey = prev ? prev + delimiter + transformKey(key) : transformKey(key);
-      if (!isarray && !isbuffer && isobject && Object.keys(value).length && (!maxDepth || depth < maxDepth)) {
-        return step(value, newKey, depth + 1);
-      }
-      output[newKey] = value;
-    });
-  };
-  step(target);
-  return output;
-};
-const unflatten = (target, opts) => {
-  const options = opts ?? {};
-  const object = _get(options, 'object', false);
-  const overwrite = _get(options, 'overwrite', false);
-  const delimiter = _get(options, 'delimiter', '.');
-  const transformKey = _get(options, 'transformKey', keyIdentity);
-  const result = {};
-  const isbuffer = isBuffer(target);
-  if (isbuffer || Object.prototype.toString.call(target) !== '[object Object]') {
-    return target;
-  }
-  const getkey = key => {
-    const parsedKey = Number(key);
-    return isNaN(parsedKey) || key?.indexOf('.') !== -1 || object ? key : parsedKey;
-  };
-  function addKeys(keyPrefix, recipient, target) {
-    return Object.keys(target).reduce((result, key) => {
-      result[keyPrefix + delimiter + key] = target[key];
-      return result;
-    }, recipient);
-  }
-  function isEmpty(val) {
-    const type = Object.prototype.toString.call(val);
-    const isArray = type === '[object Array]';
-    const isObject = type === '[object Object]';
-    if (!val) {
-      return true;
-    }
-    if (isArray) {
-      return !val.length;
-    }
-    if (isObject) {
-      return !Object.keys(val).length;
-    }
-  }
-  target = Object.keys(target).reduce((result, key) => {
-    const type = Object.prototype.toString.call(target[key]);
-    const isObject = type === '[object Object]' || type === '[object Array]';
-    if (!isObject || isEmpty(target[key])) {
-      result[key] = target[key];
-      return result;
-    }
-    return addKeys(key, result, flatten(target[key], opts));
-  }, {});
-  Object.keys(target).forEach(key => {
-    const split = key.split(delimiter).map(transformKey);
-    let key1 = getkey(split.shift());
-    let key2 = getkey(split[0]);
-    let recipient = result;
-    while (key2 !== undefined) {
-      const recipient_key_1 = key1 && _get(recipient, key1);
-      const type = Object.prototype.toString.call(recipient_key_1);
-      const isobject = type === '[object Object]' || type === '[object Array]';
-      if (!overwrite && !isobject && typeof recipient_key_1 !== 'undefined') {
-        return;
-      }
-      if (overwrite && !isobject || !overwrite && recipient_key_1 == null) {
-        recipient[key1] = typeof key2 === 'number' && !object ? [] : {};
-      }
-      recipient = key1 && _get(recipient, key1);
-      if (split.length > 0) {
-        key1 = getkey(split.shift());
-        key2 = getkey(split[0]);
-      }
-    }
-    recipient[key1] = unflatten(target[key], opts);
-  });
-  return result;
-};
-const flat = {
-  flatten,
-  unflatten
-};
+import { unflatten } from 'flat';
 
 const Emitter = new TinyEmitter();
 
@@ -289,6 +189,7 @@ const rulesMatcherUtils = {
   },
   getKeys: (rules, options) => {
     if (!rules) return null;
+    if (typeof rules == 'function') return [];
     if (!rulesMatcherUtils.forceArray(rules).every(r => rulesMatcherUtils.isObject(r))) return null;
     const keys = {};
     const conditions = Array.isArray(rules) ? {
@@ -318,6 +219,9 @@ const operators = {
 
 const rulesMatcher = (rules, formValue = {}, apply = true, options) => {
   if (!rules) return [apply];
+  if (typeof rules === 'function') {
+    return [rules(formValue) === apply];
+  }
   const conditions = Array.isArray(rules) ? {
     $and: rules
   } : rules;
@@ -446,6 +350,9 @@ const CoreUtils = {
     if (typeof rule.rules === 'string') {
       return false;
     }
+    if (typeof rule.rules === 'function') {
+      return rule.rules(value);
+    }
     if (rule.rules === null) {
       return true;
     }
@@ -907,6 +814,9 @@ const FlowerCoreStateSelectors = {
       $self: _get(newState, [flowName, ...id.split('.')])
     } : {});
     if (!rules) return false;
+    if (typeof rules === 'function') {
+      return !rules(state);
+    }
     if (!keys) return false;
     const res = keys.reduce((acc, inc) => {
       const k = inc;
@@ -915,7 +825,7 @@ const FlowerCoreStateSelectors = {
       });
     }, {});
     const [disabled] = MatchRules.rulesMatcher(rules, {
-      ...flat.unflatten(res)
+      ...unflatten(res)
     }, false, {
       prefix: flowName
     });
@@ -966,4 +876,4 @@ var RulesOperators;
   RulesOperators["$regex"] = "$regex";
 })(RulesOperators || (RulesOperators = {}));
 
-export { CoreUtils, Emitter, flat as Flat, FlowerCoreReducers, FlowerStateUtils, MatchRules, RulesModes, RulesOperators, FlowerCoreStateSelectors as Selectors };
+export { CoreUtils, Emitter, FlowerCoreReducers, FlowerStateUtils, MatchRules, RulesModes, RulesOperators, FlowerCoreStateSelectors as Selectors };

package/dist/src/RulesMatcher.d.ts

@@ -1,4 +1,5 @@
+import { FunctionRule } from './interfaces';
 export declare const MatchRules: {
-    rulesMatcher: (rules?: Record<string, any> | Record<string, any>[], formValue?: Record<string, any>, apply?: boolean, options?: Record<string, any>) => boolean[];
+    rulesMatcher: (rules?: Record<string, any> | Record<string, any>[] | FunctionRule, formValue?: Record<string, any>, apply?: boolean, options?: Record<string, any>) => boolean[];
     utils: import("./rules-matcher/interface").RulesMatcherUtils;
 };

package/dist/src/index.d.ts

@@ -1,4 +1,3 @@
-export { flat as Flat } from './Flat';
 export { Emitter } from './Emitter';
 export { FlowerCoreReducers } from './FlowerCoreStateFunctions';
 export { FlowerStateUtils } from './FlowerCoreStateUtils';

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

@@ -67,6 +67,7 @@ type RulesWithName = {
         rules: RulesObject<any>;
     };
 };
+export type FunctionRule = (data: Record<string, any>) => boolean;
 export type RulesObject<T> = RulesValuesType<T> | {
     [K in keyof typeof RulesModes]: Array<RulesOperatorsInArray<RulesValuesType<T>>> | Array<RulesObject<RulesValuesType<T>>>;
 } | Array<Exclude<RulesOperatorsInArray<RulesValuesType<T>>, undefined>>;
@@ -78,7 +79,7 @@ export type GetPath = (idValue?: string) => {
 export type AllEqual = (...args: Array<number | string | boolean>[]) => boolean;
 export type FindValidRule<T = Rules<RulesObject<any>>> = (nextRules: {
     rules: {
-        rules: T;
+        rules: T | FunctionRule;
     };
 }, value: Record<string, any>, prefix?: {
     prefix: string;

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

@@ -1,5 +1,5 @@
 import { RulesObject } from './CoreInterface';
-import { Flower, Form, Node } from './Store';
+import { Flower, Form, INode } from './Store';
 export interface ISelectors {
     selectGlobal<T extends Record<string, any>>(state: {
         flower: {
@@ -18,7 +18,7 @@ export interface ISelectors {
     makeSelectCurrentNodeId<T extends Record<string, any>>(flower: Flower<T>, startNodeId: Flower<T>['startId']): string;
     makeSelectPrevNodeRetain<T extends Record<string, any>>(nodes: Flower<T>['nodes'], history: Flower<T>['history'], current: Flower<T>['current']): boolean | string | undefined;
     makeSelectCurrentNodeDisabled<T extends Record<string, any>>(nodes: {
-        [x: string]: Partial<Node>;
+        [x: string]: Partial<INode>;
     }, current: Flower<T>['current']): boolean;
     makeSelectNodeErrors<T extends Record<string, any>>(form: Form<T> | undefined): {
         touched: boolean;

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

@@ -27,7 +27,7 @@ export interface Flower<T extends Record<string, any>> {
     current: string;
     history: string[];
     nodes: {
-        [x: string]: Node;
+        [x: string]: INode;
     };
     nextRules: {
         [x: string]: RulesByNodeId<T>[];
@@ -37,7 +37,7 @@ export interface Flower<T extends Record<string, any>> {
         [x: string]: Form<T>;
     };
 }
-export interface Node {
+export interface INode {
     nodeId: string;
     nodeType: string;
     retain?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flower-core",
-  "version": "3.0.1-beta.6",
+  "version": "3.1.0",
   "description": "Core functions for flowerJS",
   "repository": {
     "type": "git",
@@ -25,12 +25,14 @@
     "lodash": ">=4"
   },
   "devDependencies": {
+    "@types/flat": "^5.0.5",
     "@types/lodash": "^4.17.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.2",
     "typescript": "^5.4.5"
   },
   "dependencies": {
+    "flat": "5.0.2",
     "tiny-emitter": "^2.1.0"
   },
   "exports": {

package/dist/src/Flat.d.ts

@@ -1,5 +0,0 @@
-import { Flatten, Unflatten } from './interfaces/FlatInterface';
-export declare const flat: {
-    flatten: Flatten;
-    unflatten: Unflatten;
-};