@mic-rexjs/usecases-react 2.3.2 → 2.3.4

package/es/hooks/useUseCase/types.d.ts

@@ -19,26 +19,12 @@ export type CoreCollection<T, TEntityReducers extends EntityReducers<T>> = RootC
 export interface EntityGetter<T> {
     (): T;
 }
-export interface EntityWatchEvent<T, TValue = unknown> {
-    fieldPaths: string[];
-    newEntity: T;
-    newValue: TValue;
-    oldEntity: T;
-    oldValue: TValue;
-}
-export interface EntityWatcher<T, TValue = unknown> {
-    (event: EntityWatchEvent<T, TValue>): void;
-}
 export type PropertyPath<T, K extends keyof T = keyof T & string> = K extends infer TKey ? `${TKey & (string | number)}${'' | DotAccessorFieldPath<T[TKey & keyof T]>}` : never;
 export type DotAccessorFieldPath<T> = T extends unknown[] ? '.length' | `${'' | `.${number}`}${DotAccessorFieldPath<T[number]>}` : T extends object ? `.${PropertyPath<T>}` : '';
 export type FieldPath<T> = T extends unknown[] ? FieldPath<T[number]> | 'length' : T extends object ? PropertyPath<T> : never;
 export type ExtractPropertyType<T, TPath> = TPath extends `${infer TKey}.${infer TSubPath}` ? T extends unknown[] ? ExtractPropertyType<T[number], TKey extends `${number}` ? TSubPath : TPath> : ExtractPropertyType<T[TKey & keyof T], TSubPath> : T extends unknown[] ? TPath extends 'length' ? T[TPath] : TPath extends `${number}` ? T[number] : ExtractPropertyType<T[number], TPath> : T[TPath & keyof T];
 export type ExtractFieldType<T, TPath> = TPath extends `${infer TKey}.${infer TSubProperty}` ? ExtractPropertyType<T[TKey & keyof T], TSubProperty> : T[TPath & keyof T];
-export type EntityWatchMap<T> = {
-    [K in FieldPath<T>]?: EntityWatcher<T, ExtractFieldType<T, K>>;
-};
 export interface UseCaseHookContextualOptions<T> {
-    watch?: EntityWatchMap<T>;
     onChange?(newEntity: T, oldEntity: T): void;
 }
 export interface UseCaseHookOwnOptions<T, TUseCaseOptions extends object> extends UseCaseHookContextualOptions<T> {

package/es/methods/captureCalls/index.d.ts

@@ -0,0 +1,2 @@
+import { CaptureCallFactory } from './types';
+export declare const captureCalls: <T extends object>(obj: T, callback: CaptureCallFactory) => T;

package/es/methods/captureCalls/index.js

@@ -0,0 +1,14 @@
+export const captureCalls = (obj, callback) => {
+    const newObj = {};
+    Object.keys(obj).forEach((key) => {
+        const value = obj[key];
+        if (typeof value === 'function') {
+            newObj[key] = ((...args) => {
+                return callback(key, args);
+            });
+            return;
+        }
+        newObj[key] = value;
+    });
+    return newObj;
+};

package/es/methods/captureCalls/types.d.ts

@@ -0,0 +1,4 @@
+import { RestArguments } from '@mic-rexjs/usecases/es/types';
+export interface CaptureCallFactory {
+    <T>(key: string, args: RestArguments): T;
+}

package/es/methods/captureCalls/types.js

@@ -0,0 +1 @@
+export {};

package/es/methods/initEntityReducers/index.js

@@ -1,6 +1,6 @@
 import { createEntityReducers } from '@mic-rexjs/usecases';
 export const initEntityReducers = (usecase, store, options) => {
-    const { watch, onChange, options: usecaseOptions, ...restUseCaseOptions } = options;
+    const { onChange, options: usecaseOptions, ...restUseCaseOptions } = options;
     return createEntityReducers(store, usecase, {
         ...restUseCaseOptions,
         ...usecaseOptions,

package/lib/components/UseCaseFragment/index.js

@@ -9,10 +9,8 @@ var _react = require("react");
 var _useUseCase = require("../../hooks/useUseCase");
 var UseCaseFragment = exports.UseCaseFragment = function UseCaseFragment(_ref) {
   var usecase = _ref.usecase,
-    watch = _ref.watch,
     onChange = _ref.onChange;
   void (0, _useUseCase.useUseCase)(usecase, {
-    watch: watch,
     onChange: onChange
   });
   return (0, _jsxRuntime.jsx)(_react.Fragment, {});

package/lib/hooks/useEntity/index.js

@@ -12,12 +12,12 @@ var _UseCaseStatuses = require("../../enums/UseCaseStatuses");
 var _getRenderingEntity = require("../../methods/getRenderingEntity");
 var _useContextualItem = require("../useContextualItem");
 var _ahooks = require("ahooks");
-var _triggerWatchers = require("../../methods/triggerWatchers");
 var useEntity = exports.useEntity = function useEntity(statuses, rootEntity, contextStore, options, depsKey) {
   var _useState = (0, _react.useState)(rootEntity),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     entityState = _useState2[0],
     setEntityState = _useState2[1];
+  var optionsRef = (0, _ahooks.useLatest)(options);
   var contextEntity = contextStore ? contextStore.value : null;
   var renderingEntity = (0, _getRenderingEntity.getRenderingEntity)(statuses, entityState, rootEntity, contextEntity);
   var entityEnabled = (statuses & _UseCaseStatuses.UseCaseStatuses.EntityEnabled) === _UseCaseStatuses.UseCaseStatuses.EntityEnabled;
@@ -36,20 +36,6 @@ var useEntity = exports.useEntity = function useEntity(statuses, rootEntity, con
       }
     });
   });
-  var rewatch = (0, _ahooks.useMemoizedFn)(function () {
-    var onChange = options.onChange,
-      watch = options.watch;
-    var onEntityChange = function onEntityChange(newEntity, oldEntity) {
-      if (watch) {
-        (0, _triggerWatchers.triggerWatchers)(watch, newEntity, oldEntity);
-      }
-      onChange === null || onChange === void 0 || onChange(newEntity, oldEntity);
-    };
-    store.watch(onEntityChange);
-    return function () {
-      store.unwatch(onEntityChange);
-    };
-  });
   if (entityRootEnabled) {
     // 执行同步操作
     store.value = renderingEntity;
@@ -58,8 +44,15 @@ var useEntity = exports.useEntity = function useEntity(statuses, rootEntity, con
     if (!entityEnabled) {
       return;
     }
-    return rewatch();
-  }, [entityEnabled, store, depsKey, rewatch]);
+    var onEntityChange = function onEntityChange(newEntity, oldEntity) {
+      var onChange = optionsRef.current.onChange;
+      onChange === null || onChange === void 0 || onChange(newEntity, oldEntity);
+    };
+    store.watch(onEntityChange);
+    return function () {
+      store.unwatch(onEntityChange);
+    };
+  }, [entityEnabled, store, depsKey, optionsRef]);
   return (0, _ahooks.useCreation)(function () {
     return [renderingEntity, store];
   }, [renderingEntity, store]);

package/lib/hooks/useUseCase/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useUseCase = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _ahooks = require("ahooks");
 var _react = require("react");
@@ -21,6 +22,7 @@ var _useEntity3 = require("../useEntity");
 var _useContextualItem = require("../useContextualItem");
 var _cacheCalls = require("../../methods/cacheCalls");
 var _useCompareDeps = require("../useCompareDeps");
+var _captureCalls = require("../../methods/captureCalls");
 var useUseCase = exports.useUseCase = function useUseCase() {
   var isRenderingRef = (0, _useIsRenderingRef.useIsRenderingRef)();
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -41,6 +43,7 @@ var useUseCase = exports.useUseCase = function useUseCase() {
   var contextValue = (0, _react.useContext)(context);
   var entityContextValue = contextValue;
   var statuses = (0, _useUseCaseStatuses.useUseCaseStatuses)(argumentTypes, mode, contextValue);
+  var optionsRef = (0, _ahooks.useLatest)(options);
   var depsKey = (0, _useCompareDeps.useCompareDeps)(deps);
   var _ref = contextValue || {},
     _ref$reducers = _ref.reducers,
@@ -53,10 +56,14 @@ var useUseCase = exports.useUseCase = function useUseCase() {
     entity = _useEntity2[0],
     store = _useEntity2[1];
   var reducers = (0, _useContextualItem.useContextualItem)(contextReducers, statuses, function () {
+    var opts = (0, _captureCalls.captureCalls)(options, function (key, callArgs) {
+      var _optionsRef$current$k, _optionsRef$current;
+      return (_optionsRef$current$k = (_optionsRef$current = optionsRef.current)[key]) === null || _optionsRef$current$k === void 0 ? void 0 : _optionsRef$current$k.call.apply(_optionsRef$current$k, [_optionsRef$current].concat((0, _toConsumableArray2["default"])(callArgs)));
+    });
     if ((statuses & _UseCaseStatuses.UseCaseStatuses.EntityEnabled) !== _UseCaseStatuses.UseCaseStatuses.EntityEnabled) {
-      return usecase(options);
+      return usecase(opts);
     }
-    var hookOptions = options;
+    var hookOptions = opts;
     return (0, _initEntityReducers.initEntityReducers)(entityUseCase, store, hookOptions);
   }, depsKey);
   var Provider = (0, _useProvider.useProvider)(statuses, context, store, reducers);