@webkrafters/react-observable-context 6.0.0-rc.2.1 → 6.0.0-rc.3

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import type { Changes as BaseChanges, Connection, Immutable, Value } from '@webk
 import { FULL_STATE_SELECTOR } from './constants';
 export type { BaseType, ClearCommand, KeyType, MoveCommand, PushCommand, ReplaceCommand, SetCommand, SpliceCommand, TagCommand, TagType, UpdateStats, UpdatePayload, UpdatePayloadArray } from '@webkrafters/auto-immutable';
 export type State = Value;
-export type Listener<T extends State = {}> = (changes: Readonly<T>, hasChangedPath: (pathTokens: Array<string>) => boolean) => void;
+export type Listener<T extends State = {}> = (changes: Changes<T>, changedPathsTokens: Readonly<Array<Array<string>>>, netChanges: Readonly<T>, mayHaveChangesAt: (pathTokens: Array<string>) => boolean) => void;
 export type ObservableProvider<T extends State> = ForwardRefExoticComponent<ProviderProps<T> & RefAttributes<StoreRef<T>>>;
 export interface ProviderProps<T extends State> {
     children?: ReactNode;
@@ -79,8 +79,8 @@ export interface StorePlaceholder extends IStoreInternal {
     subscribe: NonReactUsageReport;
 }
 export interface StoreRef<T extends State = State> extends StorePlaceholder {
-    getState: () => T;
-    resetState: (propertyPaths?: string[]) => void;
+    getState: (propertyPaths?: Array<string>) => T;
+    resetState: (propertyPaths?: Array<string>) => void;
     setState: (changes: Changes<T>) => void;
     subscribe: Subscribe;
 }

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

@@ -105,11 +105,13 @@ var useStore = function useStore(prehooks, value, storage) {
     }),
     _ref6 = _slicedToArray(_ref5, 1),
     _storage = _ref6[0];
-  var onChange = (0, react_1.useCallback)(function (changes, changedPathsTokens) {
-    var pSearch = createChangePathSearch(changedPathsTokens);
-    listeners.forEach(function (listener) {
-      return listener(changes, pSearch);
-    });
+  var getChangHandler = (0, react_1.useCallback)(function (changes) {
+    return function (netChanges, changedPathsTokens) {
+      var mayHaveChangesAt = createChangePathSearch(changedPathsTokens);
+      listeners.forEach(function (listener) {
+        return listener(changes, changedPathsTokens, netChanges, mayHaveChangesAt);
+      });
+    };
   }, []);
   var resetState = (0, react_1.useCallback)(function (connection) {
     var propertyPaths = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -174,20 +176,21 @@ var useStore = function useStore(prehooks, value, storage) {
     runPrehook(prehooksRef.current, 'resetState', [resetData, {
       current: connection.get(constants_1.GLOBAL_SELECTOR)[constants_1.GLOBAL_SELECTOR],
       original: original
-    }]) && connection.set(resetData, onChange);
+    }]) && connection.set(resetData, getChangHandler(resetData));
   }, []);
   var setState = (0, react_1.useCallback)(function (connection, changes) {
     if (!runPrehook(prehooksRef.current, 'setState', [changes])) {
       return;
     }
     if (!Array.isArray(changes)) {
-      return connection.set(transformPayload(changes), onChange);
-    }
-    changes = changes.slice();
-    for (var c = changes.length; c--;) {
-      changes[c] = transformPayload(changes[c]);
+      changes = transformPayload(changes);
+    } else {
+      changes = changes.slice();
+      for (var c = changes.length; c--;) {
+        changes[c] = transformPayload(changes[c]);
+      }
     }
-    connection.set(changes, onChange);
+    connection.set(changes, getChangHandler(changes));
   }, []);
   var subscribe = (0, react_1.useCallback)(function (listener) {
     listeners.add(listener);
@@ -224,6 +227,10 @@ var useStore = function useStore(prehooks, value, storage) {
   })[0];
 };
 exports["default"] = useStore;
+/**
+ * @param {string[][]} changedPathsTokens - list containing tokenized changed object paths.
+ * @returns {Function} - function verifying that a random tokenized object path falls within the changed paths domain.
+ */
 function createChangePathSearch(_ref0) {
   var length = _ref0.length,
     pathTokenGroups = _objectWithoutProperties(_ref0, _excluded);

package/dist/main/index.js

@@ -87,6 +87,7 @@ var react_1 = __importStar(require("react"));
 var lodash_isequal_1 = __importDefault(require("lodash.isequal"));
 var lodash_isplainobject_1 = __importDefault(require("lodash.isplainobject"));
 var lodash_omit_1 = __importDefault(require("lodash.omit"));
+var lodash_set_1 = __importDefault(require("lodash.set"));
 var path_dotize_1 = __importDefault(require("@webkrafters/path-dotize"));
 var constants = __importStar(require("../constants"));
 var use_render_key_provider_1 = __importDefault(require("./hooks/use-render-key-provider"));
@@ -227,9 +228,9 @@ function useContext(context, selectorMap) {
     _react_1$default$useS4 = _slicedToArray(_react_1$default$useS3, 2),
     data = _react_1$default$useS4[0],
     setData = _react_1$default$useS4[1];
-  var dataSourceListener = function dataSourceListener(changes, hasChangedPath) {
+  var dataSourceListener = function dataSourceListener(changes, changePathsTokens, netChanges, mayHaveChangesAt) {
     for (var _Len = _renderKeys.length, _ = 0; _ < _Len; _++) {
-      if (_renderKeys[_] !== constants.FULL_STATE_SELECTOR && !hasChangedPath((0, path_dotize_1["default"])(_renderKeys[_]).split('.'))) {
+      if (_renderKeys[_] !== constants.FULL_STATE_SELECTOR && !mayHaveChangesAt((0, path_dotize_1["default"])(_renderKeys[_]).split('.'))) {
         continue;
       }
       return updateData();
@@ -382,12 +383,22 @@ function makeObservable(Provider) {
       }),
       _ref7 = _slicedToArray(_ref6, 1),
       connection = _ref7[0];
+    var getState = (0, react_1.useCallback)(function () {
+      var propertyPaths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      if (!propertyPaths.length || propertyPaths.indexOf(constants.FULL_STATE_SELECTOR) !== -1) {
+        return connection.get(constants.GLOBAL_SELECTOR)[constants.GLOBAL_SELECTOR];
+      }
+      var data = connection.get.apply(connection, _toConsumableArray(propertyPaths));
+      var state = {};
+      for (var d in data) {
+        (0, lodash_set_1["default"])(state, d, data[d]);
+      }
+      return state;
+    }, []);
     (0, react_1.useImperativeHandle)(storeRef, function () {
       var _storeRef$current;
       return _objectSpread(_objectSpread({}, (_storeRef$current = storeRef === null || storeRef === void 0 ? void 0 : storeRef.current) !== null && _storeRef$current !== void 0 ? _storeRef$current : {}), {}, {
-        getState: function getState() {
-          return connection.get(constants.GLOBAL_SELECTOR)[constants.GLOBAL_SELECTOR];
-        },
+        getState: getState,
         resetState: function resetState(propertyPaths) {
           return store.resetState(connection, propertyPaths);
         },

package/package.json

@@ -45,6 +45,7 @@
     "lodash.isequal": "^4.5.0",
     "lodash.isplainobject": "^4.0.6",
     "lodash.omit": "^4.5.0",
+    "lodash.set": "^4.3.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-performance-testing": "^2.0.0",
@@ -54,8 +55,8 @@
     "typescript": "^5.4.5"
   },
   "files": [
-    "dist",
-    "logo.png"
+    "logo.png",
+    "dist"
   ],
   "homepage": "https://eagleeye.js.org",
   "keywords": [
@@ -89,6 +90,7 @@
     "lodash.isequal": ">= 0.1.0",
     "lodash.isplainobject": ">= 0.8.0",
     "lodash.omit": ">= 0.1.0",
+    "lodash.set": ">= 0.1.0",
     "react": ">= 16.8.0 <19"
   },
   "publishConfig": {
@@ -100,14 +102,13 @@
   },
   "scripts": {
     "build": "eslint --fix && rm -rf dist && tsc && babel dist -d dist",
-    "postbuild": "node ./post-build",
     "test": "eslint --fix && jest --coverage --updateSnapshot",
     "test:clean": "jest --clearCache",
     "test:core": "jest --updateSnapshot",
     "test:watch": "eslint --fix && jest --updateSnapshot --watchAll"
   },
   "types": "dist/index.d.ts",
-  "version": "6.0.0-rc.2.1",
+  "version": "6.0.0-rc.3",
   "dependencies": {
     "@webkrafters/auto-immutable": "^2.0.0-rc.10"
   }