@webkrafters/react-observable-context 4.5.5 → 4.6.1

package/README.md

@@ -683,6 +683,10 @@ store.setState({
 <h1 id="changes">What's Changed?</h1>
 
 <table>
+	<thead><tr><th>v4.6.0</th></tr></thead>
+	<tbody>
+		<tr><td><b>1.</b></td><td><a href="#store-resetstate"><code>store.resetState</code></a> can now update reset current state even when initial state does not exist. Formerly, a resetState call on a non-existent initial state had no effect.</td></tr>
+	</tbody>
 	<thead><tr><th>v4.5.0</th></tr></thead>
 	<tbody>
 		<tr><td><b>1.</b></td><td><a href="#setstate-tags">Tags</a> to update non-existent state slices are now recognized. <b>Previously,</b> they had resulted in no-ops. <b>From now on,</b> they will result in new default slices matching the result of the given tag operation.</td></tr>

package/dist/main/hooks/use-store/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.deps = exports["default"] = void 0;
 var _react = require("react");
 var _lodash = _interopRequireDefault(require("lodash.isboolean"));
+var _lodash2 = _interopRequireDefault(require("lodash.isempty"));
 var _uuid = require("uuid");
 var _constants = require("../../../constants");
 var _utils = require("../../../utils");
@@ -13,8 +14,8 @@ var _storage2 = _interopRequireDefault(require("../../../model/storage"));
 var _usePrehooksRef = _interopRequireDefault(require("../use-prehooks-ref"));
 var _useStateManager2 = _interopRequireDefault(require("../use-state-manager"));
 var _setState2 = _interopRequireDefault(require("../../set-state"));
-var _ = require("../..");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": 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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
@@ -77,10 +78,62 @@ var useStore = function useStore(prehooks, value, storage) {
   var resetState = (0, _react.useCallback)(function () {
     var propertyPaths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var original = _storage.clone(_storage.getItem(storageKey.current));
-    var resetData = !propertyPaths.length ? {} : propertyPaths.includes(_constants.FULL_STATE_SELECTOR) ? _defineProperty({}, _.REPLACE_TAG, original) : (0, _utils.mapPathsToObject)(original, propertyPaths, function (_ref2) {
-      var value = _ref2.value;
-      return _defineProperty({}, _.REPLACE_TAG, value);
-    });
+    var resetData;
+    if (!propertyPaths.length) {
+      resetData = {};
+    } else if (propertyPaths.includes(_constants.FULL_STATE_SELECTOR)) {
+      resetData = (0, _lodash2["default"])(original) ? _constants.CLEAR_TAG : _defineProperty({}, _constants.REPLACE_TAG, original);
+    } else {
+      var visitedPathMap = {};
+      resetData = (0, _utils.mapPathsToObject)(original, propertyPaths, function (_ref2) {
+        var trail = _ref2.trail,
+          value = _ref2.value;
+        visitedPathMap[trail] = null;
+        return _defineProperty({}, _constants.REPLACE_TAG, value);
+      });
+      if (Object.keys(visitedPathMap).length < propertyPaths.length) {
+        var _iterator = _createForOfIteratorHelper(propertyPaths),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var path = _step.value;
+            path = (0, _utils.stringToDotPath)(path);
+            if (path in visitedPathMap) {
+              continue;
+            }
+            var trail = path.split('.');
+            var keyTuple = trail.slice(-1);
+            trail = trail.slice(0, -1);
+            var node = resetData;
+            var _iterator2 = _createForOfIteratorHelper(trail),
+              _step2;
+            try {
+              for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                var t = _step2.value;
+                if ((0, _lodash2["default"])(node[t])) {
+                  node[t] = {};
+                }
+                node = node[t];
+              }
+            } catch (err) {
+              _iterator2.e(err);
+            } finally {
+              _iterator2.f();
+            }
+            if (_constants.DELETE_TAG in node) {
+              var _node$DELETE_TAG;
+              (_node$DELETE_TAG = node[_constants.DELETE_TAG]).push.apply(_node$DELETE_TAG, _toConsumableArray(keyTuple));
+            } else {
+              node[_constants.DELETE_TAG] = keyTuple;
+            }
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      }
+    }
     runPrehook(prehooksRef.current, 'resetState', [resetData, {
       current: (0, _utils.clonedeep)(state),
       original: original

package/dist/main/set-state/index.js

@@ -11,6 +11,14 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
@@ -118,7 +126,14 @@ function resolveTags(state, changes, stateKey, stats) {
       changes[stateKey][k] = _defineProperty({}, changes[stateKey][k], null);
     }
     if (k in _tagFunctions["default"]) {
-      _tagFunctions["default"][k](state, stateKey, stats, changes);
+      var s = state;
+      if (Array.isArray(state)) {
+        s = _toConsumableArray(state);
+      } else if ((0, _lodash2["default"])(state)) {
+        s = _objectSpread({}, state);
+      }
+      _tagFunctions["default"][k](s, stateKey, stats, changes);
+      state[stateKey] = s[stateKey];
       resolvedTags.push(k);
     }
   }

package/dist/main/set-state/tag-functions/index.js

@@ -317,7 +317,8 @@ function applyReplaceCommand(tag, state, changes, stateKey, stats) {
   if ((0, _lodash2["default"])(state[stateKey], replacement)) {
     return finishTagRequest(changes, stateKey, tag);
   }
-  if (Array.isArray(replacement) && Array.isArray(state[stateKey])) {
+  if (Array.isArray(replacement) && Array.isArray(state[stateKey]) && state[stateKey].length !== replacement.length) {
+    state[stateKey] = _toConsumableArray(state[stateKey]);
     state[stateKey].length = replacement.length;
   }
   for (var k in state[stateKey]) {

package/dist/utils/index.d.ts

@@ -6,4 +6,5 @@ export function mapPathsToObject<T extends {
 }>(source: T, propertyPaths: Array<string>, transform?: Tranform): { [K in keyof T]?: any; };
 export function clonedeep<T, R>(value: T): R;
 export const getProperty: any;
+export const stringToDotPath: (path: string) => string;
 export type Tranform = (property: any) => T;

package/dist/utils/index.js

@@ -7,6 +7,7 @@ exports.getProperty = exports.clonedeep = void 0;
 exports.isDataContainer = isDataContainer;
 exports.makeReadonly = makeReadonly;
 exports.mapPathsToObject = mapPathsToObject;
+exports.stringToDotPath = void 0;
 var _lodash = _interopRequireDefault(require("lodash.clonedeepwith"));
 var _lodash2 = _interopRequireDefault(require("lodash.isplainobject"));
 var _clonedeepEligibilityCheck = _interopRequireDefault(require("./clonedeep-eligibility-check"));
@@ -116,6 +117,14 @@ var defaultFormatValue = function defaultFormatValue(_ref) {
   var value = _ref.value;
   return value;
 };
+var stringToDotPath = function () {
+  var BRACKET_OPEN = /\.?\[/g;
+  var BRACKET_CLOSE = /^\.|\]/g;
+  return function (path) {
+    return path.replace(BRACKET_OPEN, '.').replace(BRACKET_CLOSE, '');
+  };
+}();
+exports.stringToDotPath = stringToDotPath;
 function mapPathsToObject(source, propertyPaths) {
   var transform = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultFormatValue;
   var paths = [];
@@ -124,7 +133,7 @@ function mapPathsToObject(source, propertyPaths) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var path = _step2.value;
-      paths.push(path.replace(/\.?\[/g, '.').replace(/^\.|\]/g, ''));
+      paths.push(stringToDotPath(path));
     }
   } catch (err) {
     _iterator2.e(err);

package/package.json

@@ -133,5 +133,5 @@
     "test:watch": "eslint --fix && jest --updateSnapshot --watchAll"
   },
   "types": "dist/main/index.d.ts",
-  "version": "4.5.5"
+  "version": "4.6.1"
 }