@webkrafters/react-observable-context 4.1.0-rc.8.1 → 4.1.0

package/dist/types.d.ts

@@ -29,16 +29,6 @@ export type Prehooks<T extends State> = {
     }) => boolean;
     setState?: (newChanges: PartialState<T>) => boolean;
 };
-export type PropertyInfo<T extends any[] | State> = {
-    _value: any;
-    exists: boolean;
-    index: number;
-    isSelf: KeyType;
-    key: KeyType;
-    source: T;
-    trail: Array<KeyType>;
-    value: any;
-};
 export type State = {
     [x: string]: any;
     [x: number]: any;

package/dist/utils/index.d.ts

@@ -5,8 +5,5 @@ 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: 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 KeyType = import("../types").KeyType;
+export const getProperty: typeof get;
+import get from "@webkrafters/get-property";

package/dist/utils/index.js

@@ -10,6 +10,7 @@ exports.mapPathsToObject = mapPathsToObject;
 var _lodash = _interopRequireDefault(require("lodash.clonedeepwith"));
 var _lodash2 = _interopRequireDefault(require("lodash.isplainobject"));
 var _clonedeepEligibilityCheck = _interopRequireDefault(require("./clonedeep-eligibility-check"));
+var _getProperty2 = _interopRequireDefault(require("@webkrafters/get-property"));
 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); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
@@ -33,15 +34,16 @@ function arrangePropertyPaths(propertyPaths) {
             })) {
               return "break|L2";
             }
-          } else {
-            pathTokens.every(function (p, i) {
-              return p === superPathTokens[i];
-            }) && replacedSuperPaths.push(superPath);
+            return "continue";
           }
+          pathTokens.every(function (p, i) {
+            return p === superPathTokens[i];
+          }) && replacedSuperPaths.push(superPath);
         };
         for (var superPath in superPathTokensMap) {
           var _ret = _loop2(superPath);
           if (_ret === "break|L2") break L2;
+          if (_ret === "continue") continue;
         }
         superPathTokensMap[path] = pathTokens;
         for (var _i = 0, _replacedSuperPaths = replacedSuperPaths; _i < _replacedSuperPaths.length; _i++) {
@@ -87,84 +89,7 @@ var clonedeep = function () {
   return clonedeep;
 }();
 exports.clonedeep = clonedeep;
-var getProperty = function () {
-  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 {
-      return key in object;
-    } catch (e) {
-      return false;
-    }
-  };
-  var get = function get(source, path, defaultValue) {
-    var _path2, _value2;
-    switch (toString.call(path).replace(RE_TYPE, '$1')) {
-      case 'String':
-        path = path.replace(RE_END_BRACKET_LAST_CHAR, '').split(RE_DELIMITER);
-        break;
-      case 'Array':
-        break;
-      case 'Undefined':
-        path = [];
-        break;
-      default:
-        path = [path];
-    }
-    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 get;
-}();
+var getProperty = _getProperty2["default"];
 exports.getProperty = getProperty;
 function isDataContainer(v) {
   return (0, _lodash2["default"])(v) || Array.isArray(v);
@@ -189,32 +114,32 @@ function makeReadonly(v) {
 ;
 function mapPathsToObject(source, propertyPaths) {
   var paths = [];
-  var _iterator3 = _createForOfIteratorHelper(propertyPaths),
-    _step3;
+  var _iterator2 = _createForOfIteratorHelper(propertyPaths),
+    _step2;
   try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var path = _step3.value;
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var path = _step2.value;
       paths.push(path.replace(/\.?\[/g, '.').replace(/^\.|\]/g, ''));
     }
   } catch (err) {
-    _iterator3.e(err);
+    _iterator2.e(err);
   } finally {
-    _iterator3.f();
+    _iterator2.f();
   }
   var dest = {};
   var object = dest;
-  var _iterator4 = _createForOfIteratorHelper(arrangePropertyPaths(paths)),
-    _step4;
+  var _iterator3 = _createForOfIteratorHelper(arrangePropertyPaths(paths)),
+    _step3;
   try {
-    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-      var _path3 = _step4.value;
-      var _getProperty = getProperty(source, _path3),
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var _path2 = _step3.value;
+      var _getProperty = getProperty(source, _path2),
         exists = _getProperty.exists,
         value = _getProperty.value;
       if (!exists) {
         continue;
       }
-      for (var tokens = _path3.split('.'), tLen = tokens.length, t = 0; t < tLen; t++) {
+      for (var tokens = _path2.split('.'), tLen = tokens.length, t = 0; t < tLen; t++) {
         var token = tokens[t];
         if (t + 1 === tLen) {
           object[token] = value;
@@ -228,9 +153,9 @@ function mapPathsToObject(source, propertyPaths) {
       }
     }
   } catch (err) {
-    _iterator4.e(err);
+    _iterator3.e(err);
   } finally {
-    _iterator4.f();
+    _iterator3.f();
   }
   return dest;
 }

package/package.json

@@ -7,6 +7,7 @@
     "steveswork <stephen.isienyi@gmail.com> (https://github.com/steveswork)"
   ],
   "dependencies": {
+    "@webkrafters/get-property": "^1.0.1",
     "lodash.clonedeepwith": "^4.5.0",
     "lodash.isboolean": "^3.0.3",
     "lodash.isempty": "^4.4.0",
@@ -132,5 +133,5 @@
     "test:watch": "eslint --fix && jest --updateSnapshot --watchAll"
   },
   "types": "dist/main/index.d.ts",
-  "version": "4.1.0-rc.8.1"
+  "version": "4.1.0"
 }