@mic-rexjs/usecases-react 2.9.5 → 2.9.6

package/es/hooks/useUseCase/index.test.js

@@ -591,6 +591,23 @@ describe('useUseCase', () => {
             });
             expect(result.current[0].path).toBe('123/' + PATH_1);
         });
+        test('Option functions: use `T` (not `S`) when `S extends T`', () => {
+            const testObjectUseCase = (options = {}) => {
+                const objectReducers = objectUseCase();
+                void options;
+                return { ...objectReducers };
+            };
+            renderHook(() => {
+                useUseCase(defaultFile, testObjectUseCase, {
+                    onUpdate(data) {
+                        void data;
+                        return Promise.reject();
+                    },
+                });
+            });
+            // 这个测试仅仅是为了确保类型不会报错，不验证实际逻辑
+            expect(1).toBe(1);
+        });
         test('when `options` has changed, it should not trigger update', () => {
             const onUpdate = jest.fn();
             const onDeepUpdate = jest.fn();

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

@@ -45,7 +45,11 @@ export interface UseCaseHookContextualOptions<T> {
 export interface UseCaseHookOwnOptions<T, TUseCaseOptions extends object> extends UseCaseHookContextualOptions<T> {
     options?: TUseCaseOptions;
 }
-export type UseCaseHookOptions<T, TUseCaseOptions extends object = object> = TUseCaseOptions & UseCaseHookOwnOptions<T, TUseCaseOptions>;
+export type UnextendFunctionTypes<T> = T extends (...args: infer TArgs) => infer TReturn ? (...args: TArgs) => TReturn : T;
+export type UnextendOptionTypes<T> = {
+    [K in keyof T]: UnextendFunctionTypes<T[K]>;
+};
+export type UseCaseHookOptions<T, TUseCaseOptions extends object = object> = UnextendOptionTypes<TUseCaseOptions> & UseCaseHookOwnOptions<T, TUseCaseOptions>;
 export interface ReducersHook {
     <T extends ReducerMap, TUseCaseOptions extends object = object>(usecase: UseCase<T & SymbolSetTarget<NonEntitySymbolSet>, TUseCaseOptions>, options?: TUseCaseOptions, deps?: unknown[]): T;
 }

package/lib/hooks/useUseCase/index.test.js

@@ -826,6 +826,24 @@ var useDeepCompareUpdate = function useDeepCompareUpdate(callback, deps) {
       });
       (0, _globals.expect)(result.current[0].path).toBe('123/' + PATH_1);
     });
+    (0, _globals.test)('Option functions: use `T` (not `S`) when `S extends T`', function () {
+      var testObjectUseCase = function testObjectUseCase() {
+        var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+        var objectReducers = (0, _usecases.objectUseCase)();
+        void options;
+        return _objectSpread({}, objectReducers);
+      };
+      (0, _react.renderHook)(function () {
+        (0, _.useUseCase)(defaultFile, testObjectUseCase, {
+          onUpdate: function onUpdate(data) {
+            void data;
+            return Promise.reject();
+          }
+        });
+      });
+      // 这个测试仅仅是为了确保类型不会报错，不验证实际逻辑
+      (0, _globals.expect)(1).toBe(1);
+    });
     (0, _globals.test)('when `options` has changed, it should not trigger update', function () {
       var onUpdate = _globals.jest.fn();
       var onDeepUpdate = _globals.jest.fn();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mic-rexjs/usecases-react",
-  "version": "2.9.5",
+  "version": "2.9.6",
   "description": "React-based solution for use usecases of Clean Architecture",
   "private": false,
   "sideEffects": false,