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

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');
@@ -20,106 +19,6 @@ 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
-};
-
 const Emitter = new tinyEmitter.TinyEmitter();
 
 const EMPTY_STRING_REGEXP = /^\s*$/;
@@ -851,6 +750,164 @@ const FlowerCoreReducers = {
   }
 };
 
+function isBuffer (obj) {
+  return obj &&
+    obj.constructor &&
+    (typeof obj.constructor.isBuffer === 'function') &&
+    obj.constructor.isBuffer(obj)
+}
+
+function keyIdentity (key) {
+  return key
+}
+
+function flatten (target, opts) {
+  opts = opts || {};
+
+  const delimiter = opts.delimiter || '.';
+  const maxDepth = opts.maxDepth;
+  const transformKey = opts.transformKey || keyIdentity;
+  const output = {};
+
+  function step (object, prev, currentDepth) {
+    currentDepth = currentDepth || 1;
+    Object.keys(object).forEach(function (key) {
+      const value = object[key];
+      const isarray = opts.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 &&
+        (!opts.maxDepth || currentDepth < maxDepth)) {
+        return step(value, newKey, currentDepth + 1)
+      }
+
+      output[newKey] = value;
+    });
+  }
+
+  step(target);
+
+  return output
+}
+
+function unflatten (target, opts) {
+  opts = opts || {};
+
+  const delimiter = opts.delimiter || '.';
+  const overwrite = opts.overwrite || false;
+  const transformKey = opts.transformKey || keyIdentity;
+  const result = {};
+
+  const isbuffer = isBuffer(target);
+  if (isbuffer || Object.prototype.toString.call(target) !== '[object Object]') {
+    return target
+  }
+
+  // safely ensure that the key is
+  // an integer.
+  function getkey (key) {
+    const parsedKey = Number(key);
+
+    return (
+      isNaN(parsedKey) ||
+      key.indexOf('.') !== -1 ||
+      opts.object
+    )
+      ? key
+      : parsedKey
+  }
+
+  function addKeys (keyPrefix, recipient, target) {
+    return Object.keys(target).reduce(function (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
+    } else if (isArray) {
+      return !val.length
+    } else if (isObject) {
+      return !Object.keys(val).length
+    }
+  }
+
+  target = Object.keys(target).reduce(function (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
+    } else {
+      return addKeys(
+        key,
+        result,
+        flatten(target[key], opts)
+      )
+    }
+  }, {});
+
+  Object.keys(target).forEach(function (key) {
+    const split = key.split(delimiter).map(transformKey);
+    let key1 = getkey(split.shift());
+    let key2 = getkey(split[0]);
+    let recipient = result;
+
+    while (key2 !== undefined) {
+      if (key1 === '__proto__') {
+        return
+      }
+
+      const type = Object.prototype.toString.call(recipient[key1]);
+      const isobject = (
+        type === '[object Object]' ||
+        type === '[object Array]'
+      );
+
+      // do not write over falsey, non-undefined values if overwrite is false
+      if (!overwrite && !isobject && typeof recipient[key1] !== 'undefined') {
+        return
+      }
+
+      if ((overwrite && !isobject) || (!overwrite && recipient[key1] == null)) {
+        recipient[key1] = (
+          typeof key2 === 'number' &&
+          !opts.object
+            ? []
+            : {}
+        );
+      }
+
+      recipient = recipient[key1];
+      if (split.length > 0) {
+        key1 = getkey(split.shift());
+        key2 = getkey(split[0]);
+      }
+    }
+
+    // unflatten again for 'messy objects'
+    recipient[key1] = unflatten(target[key], opts);
+  });
+
+  return result
+}
+
 const FlowerCoreStateSelectors = {
   selectGlobal: state => state && state.flower,
   selectFlower: name => state => _get(state, [name]),
@@ -917,7 +974,7 @@ const FlowerCoreStateSelectors = {
       });
     }, {});
     const [disabled] = MatchRules.rulesMatcher(rules, {
-      ...flat.unflatten(res)
+      ...unflatten(res)
     }, false, {
       prefix: flowName
     });
@@ -970,7 +1027,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';
@@ -18,106 +17,6 @@ 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
-};
-
 const Emitter = new TinyEmitter();
 
 const EMPTY_STRING_REGEXP = /^\s*$/;
@@ -849,6 +748,164 @@ const FlowerCoreReducers = {
   }
 };
 
+function isBuffer (obj) {
+  return obj &&
+    obj.constructor &&
+    (typeof obj.constructor.isBuffer === 'function') &&
+    obj.constructor.isBuffer(obj)
+}
+
+function keyIdentity (key) {
+  return key
+}
+
+function flatten (target, opts) {
+  opts = opts || {};
+
+  const delimiter = opts.delimiter || '.';
+  const maxDepth = opts.maxDepth;
+  const transformKey = opts.transformKey || keyIdentity;
+  const output = {};
+
+  function step (object, prev, currentDepth) {
+    currentDepth = currentDepth || 1;
+    Object.keys(object).forEach(function (key) {
+      const value = object[key];
+      const isarray = opts.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 &&
+        (!opts.maxDepth || currentDepth < maxDepth)) {
+        return step(value, newKey, currentDepth + 1)
+      }
+
+      output[newKey] = value;
+    });
+  }
+
+  step(target);
+
+  return output
+}
+
+function unflatten (target, opts) {
+  opts = opts || {};
+
+  const delimiter = opts.delimiter || '.';
+  const overwrite = opts.overwrite || false;
+  const transformKey = opts.transformKey || keyIdentity;
+  const result = {};
+
+  const isbuffer = isBuffer(target);
+  if (isbuffer || Object.prototype.toString.call(target) !== '[object Object]') {
+    return target
+  }
+
+  // safely ensure that the key is
+  // an integer.
+  function getkey (key) {
+    const parsedKey = Number(key);
+
+    return (
+      isNaN(parsedKey) ||
+      key.indexOf('.') !== -1 ||
+      opts.object
+    )
+      ? key
+      : parsedKey
+  }
+
+  function addKeys (keyPrefix, recipient, target) {
+    return Object.keys(target).reduce(function (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
+    } else if (isArray) {
+      return !val.length
+    } else if (isObject) {
+      return !Object.keys(val).length
+    }
+  }
+
+  target = Object.keys(target).reduce(function (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
+    } else {
+      return addKeys(
+        key,
+        result,
+        flatten(target[key], opts)
+      )
+    }
+  }, {});
+
+  Object.keys(target).forEach(function (key) {
+    const split = key.split(delimiter).map(transformKey);
+    let key1 = getkey(split.shift());
+    let key2 = getkey(split[0]);
+    let recipient = result;
+
+    while (key2 !== undefined) {
+      if (key1 === '__proto__') {
+        return
+      }
+
+      const type = Object.prototype.toString.call(recipient[key1]);
+      const isobject = (
+        type === '[object Object]' ||
+        type === '[object Array]'
+      );
+
+      // do not write over falsey, non-undefined values if overwrite is false
+      if (!overwrite && !isobject && typeof recipient[key1] !== 'undefined') {
+        return
+      }
+
+      if ((overwrite && !isobject) || (!overwrite && recipient[key1] == null)) {
+        recipient[key1] = (
+          typeof key2 === 'number' &&
+          !opts.object
+            ? []
+            : {}
+        );
+      }
+
+      recipient = recipient[key1];
+      if (split.length > 0) {
+        key1 = getkey(split.shift());
+        key2 = getkey(split[0]);
+      }
+    }
+
+    // unflatten again for 'messy objects'
+    recipient[key1] = unflatten(target[key], opts);
+  });
+
+  return result
+}
+
 const FlowerCoreStateSelectors = {
   selectGlobal: state => state && state.flower,
   selectFlower: name => state => _get(state, [name]),
@@ -915,7 +972,7 @@ const FlowerCoreStateSelectors = {
       });
     }, {});
     const [disabled] = MatchRules.rulesMatcher(rules, {
-      ...flat.unflatten(res)
+      ...unflatten(res)
     }, false, {
       prefix: flowName
     });
@@ -966,4 +1023,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/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/package.json

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

package/dist/src/Flat.d.ts

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