@webkrafters/react-observable-context 4.1.0-rc.5 → 4.1.0-rc.7

package/README.md

@@ -30,7 +30,7 @@ Subscribing component decides which context state properties' changes to trigger
 
 **Moniker:** Eagle Eye
 
-**Usage:** Please see <b><a href="#getting-started">Getting Started</a></b> section
+**Usage:** Please see <b><a href="#getting-started">Getting Started</a></b>.
 
 **Demo:** [Play with the app on codesandbox](https://codesandbox.io/s/github/webKrafters/react-observable-context-app)\
 If sandbox fails to load app, please refresh dependencies on its lower left.
@@ -39,7 +39,7 @@ If sandbox fails to load app, please refresh dependencies on its lower left.
 npm i -S @webkrafters/react-observable-context\
 npm install --save @webkrafters/react-observable-context
 
-May also see <b><a href="#changes">What's Changed?</a></b> section below.
+May also see <b><a href="#changes">What's Changed?</a></b>.
 
 <h1 id="toc">Table of Contents</h1>
 
@@ -289,9 +289,9 @@ A special property path [@@STATE](#fullstate-selectorkey) may be used to access
 ## Provider
 The Provider component is a property of the `React-Observable-Context` context object. As a `React.context` based provider, it accepts the customary `children` and `value` props. It also accepts **2** optional props: <a href="#prehooks"><code>prehooks</code></a> and <a href="#storage"><code>storage</code></a>.
 
-External direct access to the context store may be obtained via the `ref` attribute. Please see a [Provider Usage](#provider-usage) sample below. 
+External direct access to the context store may be obtained via the `ref` attribute. Please see a [Provider Usage](#provider-usage) sample. 
 
-Routinely, the `value` prop is initialized with the full initial state. It may only be updated with parts of the state which are changing. Please see a [Provider Usage](#provider-usage) sample below. 
+Routinely, the `value` prop is initialized with the full initial state. It may only be updated with parts of the state which are changing. Please see a [Provider Usage](#provider-usage) sample. 
 
 <h2 id="selector-map">Selector Map</h2>
 A selector map is an object holding key:value pairs.<br />

package/dist/model/accessor-cache/index.js

@@ -106,7 +106,7 @@ var AccessorCache = function () {
         var _classPrivateMethodGe = _classPrivateMethodGet(this, _getOriginAt, _getOriginAt2).call(this, path),
           exists = _classPrivateMethodGe.exists,
           newAtomVal = _classPrivateMethodGe.value;
-        if (path !== _constants.FULL_STATE_SELECTOR && exists && typeof newAtomVal === 'undefined' && !(0, _utils.getProperty)(originChanges, path).exists || (0, _lodash2["default"])(newAtomVal, atoms[path].value)) {
+        if (path !== _constants.FULL_STATE_SELECTOR && exists && typeof newAtomVal === 'undefined' && !(0, _utils.getProperty)(originChanges, path).trail.length || (0, _lodash2["default"])(newAtomVal, atoms[path].value)) {
           continue;
         }
         atoms[path].setValue(newAtomVal);

package/dist/types.d.ts

@@ -33,8 +33,10 @@ export type PropertyInfo<T extends any[] | State> = {
     _value: any;
     exists: boolean;
     index: number;
-    key: string | symbol | number;
+    isSelf: KeyType;
+    key: KeyType;
     source: T;
+    trail: Array<KeyType>;
     value: any;
 };
 export type State = {

package/dist/utils/index.d.ts

@@ -5,7 +5,8 @@ export function mapPathsToObject<T extends {
     [x: string]: any;
 }>(source: T, propertyPaths: Array<string>): { [K in keyof T]?: any; };
 export function clonedeep<T, R>(value: T): R;
-export function getProperty(source: T, path: string | symbol | number | Array<string | symbol | number>, defaultValue: any): PropertyInfo<T>;
-export type GetProperty<T extends any[] | import("../types").State = any[] | import("../types").State, R = any> = (source: T, path: string | symbol | number | Array<string | symbol | number>, defaultValue?: any) => R;
+export function getProperty(source: T, path: KeyType | Array<KeyType>, defaultValue: any): PropertyInfo<T>;
+export type GetProperty<T extends any[] | import("../types").State = any[] | import("../types").State> = (source: T, path?: KeyType | Array<KeyType>, defaultValue?: any) => PropertyInfo<T>;
 export type PropertyInfo<T extends any[] | import("../types").State> = import("../types").PropertyInfo<T>;
-export type State = import("../types").State;
+export type State = import("../types").State;
+export type KeyType = import("../types").KeyType;

package/dist/utils/index.js

@@ -8,8 +8,7 @@ exports.isDataContainer = isDataContainer;
 exports.makeReadonly = makeReadonly;
 exports.mapPathsToObject = mapPathsToObject;
 var _lodash = _interopRequireDefault(require("lodash.clonedeepwith"));
-var _lodash2 = _interopRequireDefault(require("lodash.get"));
-var _lodash3 = _interopRequireDefault(require("lodash.isplainobject"));
+var _lodash2 = _interopRequireDefault(require("lodash.isplainobject"));
 var _clonedeepEligibilityCheck = _interopRequireDefault(require("./clonedeep-eligibility-check"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -89,98 +88,90 @@ var clonedeep = function () {
 }();
 exports.clonedeep = clonedeep;
 var getProperty = function () {
-  var reDelimiter = /[\[\]|\.]+/g;
-  var reEndBracketLastChar = /\]$/;
-  var reType = /.*\s(\w+)\]$/;
-  var fromSource = function fromSource(source, key, defaultValue) {
-    var exists = false;
-    var index = +key;
+  var RE_DELIMITER = /[\[\]|\.]+/g;
+  var RE_END_BRACKET_LAST_CHAR = /\]$/;
+  var RE_TYPE = /.*\s(\w+)\]$/;
+  var toString = Object.prototype.toString;
+  var hasEntry = function hasEntry(key, object) {
     try {
-      if (Array.isArray(source)) {
-        if (Number.isInteger(index)) {
-          if (index < 0) {
-            index = source.length + index;
-          }
-          var _value2 = source[index];
-          return {
-            _value: _value2,
-            exists: index in source,
-            index: index,
-            key: key,
-            source: source,
-            value: _value2 !== null && _value2 !== void 0 ? _value2 : defaultValue
-          };
-        }
-      }
-      var _value = source[key];
-      exists = key in source;
-      return {
-        _value: _value,
-        exists: exists,
-        index: index,
-        key: key,
-        source: source,
-        value: _value !== null && _value !== void 0 ? _value : defaultValue
-      };
+      return key in object;
     } catch (e) {
-      return {
-        _value: defaultValue,
-        exists: exists,
-        index: index,
-        key: key,
-        source: source,
-        value: defaultValue
-      };
+      return false;
     }
   };
-  var getImmediateParent = function getImmediateParent(source, parentPath) {
-    var pLen = parentPath.length;
-    if (!pLen) {
-      return source;
-    }
-    var segmentStart = 0;
-    for (var p = segmentStart; p < pLen; p++) {
-      var key = parentPath[p];
-      var kNum = +key;
-      if (Number.isInteger(kNum) && kNum < 0) {
-        source = (0, _lodash2["default"])(source, parentPath.slice(segmentStart, p));
-        segmentStart = p + 1;
-        source = fromSource(source, key).value;
-        if (segmentStart === pLen || typeof source === 'undefined') {
-          break;
-        }
-      }
-    }
-    if (segmentStart === 0) {
-      return (0, _lodash2["default"])(source, parentPath);
-    }
-    if (segmentStart === pLen || typeof source === 'undefined') {
-      return source;
-    }
-    return (0, _lodash2["default"])(source, parentPath.slice(segmentStart, pLen));
-  };
-  var getInfo = function getInfo(source, path, defaultValue) {
-    switch (Object.prototype.toString.call(path).replace(reType, '$1')) {
+  var get = function get(source, path, defaultValue) {
+    var _path2, _value2;
+    switch (toString.call(path).replace(RE_TYPE, '$1')) {
       case 'String':
-        path = path.replace(reEndBracketLastChar, '').split(reDelimiter);
+        path = path.replace(RE_END_BRACKET_LAST_CHAR, '').split(RE_DELIMITER);
         break;
       case 'Array':
         break;
+      case 'Undefined':
+        path = [];
+        break;
       default:
         path = [path];
     }
-    var key = path.pop();
-    return fromSource(getImmediateParent(source, path), key, defaultValue);
+    var _value = source;
+    var exists = true;
+    var index = NaN;
+    var trail = [];
+    var _iterator2 = _createForOfIteratorHelper(path),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var p = _step2.value;
+        index = NaN;
+        if (Array.isArray(_value)) {
+          var _index = +p;
+          if (Number.isInteger(_index)) {
+            if (_index < 0) {
+              _index = _value.length + _index;
+            }
+            index = _index;
+            if (index in _value) {
+              source = _value;
+              _value = _value[index];
+              trail.push(index);
+              continue;
+            }
+          }
+        }
+        source = _value;
+        if (!hasEntry(p, _value)) {
+          exists = false;
+          _value = undefined;
+          break;
+        }
+        _value = _value[p];
+        trail.push(p);
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    return {
+      _value: _value,
+      exists: exists,
+      index: index,
+      isSelf: !path.length,
+      key: (_path2 = path) === null || _path2 === void 0 ? void 0 : _path2[path.length - 1],
+      source: path.length && path.length - trail.length < 2 ? source : undefined,
+      trail: trail,
+      value: (_value2 = _value) !== null && _value2 !== void 0 ? _value2 : defaultValue
+    };
   };
-  return getInfo;
+  return get;
 }();
 exports.getProperty = getProperty;
 function isDataContainer(v) {
-  return (0, _lodash3["default"])(v) || Array.isArray(v);
+  return (0, _lodash2["default"])(v) || Array.isArray(v);
 }
 function makeReadonly(v) {
   var frozen = true;
-  if ((0, _lodash3["default"])(v)) {
+  if ((0, _lodash2["default"])(v)) {
     for (var k in v) {
       makeReadonly(v[k]);
     }
@@ -198,32 +189,32 @@ function makeReadonly(v) {
 ;
 function mapPathsToObject(source, propertyPaths) {
   var paths = [];
-  var _iterator2 = _createForOfIteratorHelper(propertyPaths),
-    _step2;
+  var _iterator3 = _createForOfIteratorHelper(propertyPaths),
+    _step3;
   try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var path = _step2.value;
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var path = _step3.value;
       paths.push(path.replace(/\.?\[/g, '.').replace(/^\.|\]/g, ''));
     }
   } catch (err) {
-    _iterator2.e(err);
+    _iterator3.e(err);
   } finally {
-    _iterator2.f();
+    _iterator3.f();
   }
   var dest = {};
   var object = dest;
-  var _iterator3 = _createForOfIteratorHelper(arrangePropertyPaths(paths)),
-    _step3;
+  var _iterator4 = _createForOfIteratorHelper(arrangePropertyPaths(paths)),
+    _step4;
   try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var _path2 = _step3.value;
-      var _getProperty = getProperty(source, _path2),
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var _path3 = _step4.value;
+      var _getProperty = getProperty(source, _path3),
         exists = _getProperty.exists,
         value = _getProperty.value;
       if (!exists) {
         continue;
       }
-      for (var tokens = _path2.split('.'), tLen = tokens.length, t = 0; t < tLen; t++) {
+      for (var tokens = _path3.split('.'), tLen = tokens.length, t = 0; t < tLen; t++) {
         var token = tokens[t];
         if (t + 1 === tLen) {
           object[token] = value;
@@ -237,9 +228,9 @@ function mapPathsToObject(source, propertyPaths) {
       }
     }
   } catch (err) {
-    _iterator3.e(err);
+    _iterator4.e(err);
   } finally {
-    _iterator3.f();
+    _iterator4.f();
   }
   return dest;
 }

package/package.json

@@ -8,7 +8,6 @@
   ],
   "dependencies": {
     "lodash.clonedeepwith": "^4.5.0",
-    "lodash.get": "^4.4.2",
     "lodash.isboolean": "^3.0.3",
     "lodash.isempty": "^4.4.0",
     "lodash.isequal": "^4.5.0",
@@ -133,5 +132,5 @@
     "test:watch": "eslint --fix && jest --updateSnapshot --watchAll"
   },
   "types": "dist/main/index.d.ts",
-  "version": "4.1.0-rc.5"
+  "version": "4.1.0-rc.7"
 }