Merge pull request #459 from InfiniteXyy/master

fix(hooks): useAyanami type define

Author: Miloas

Diff for: src/hooks/use-ayanami-instance.ts

@@ -4,7 +4,7 @@ import get from 'lodash/get'
 import { ActionMethodOfAyanami, Ayanami, combineWithIkari } from '../core'
 import { useSubscribeAyanamiState } from './use-subscribe-ayanami-state'
 
-export interface UseAyanamiInstanceConfig<S, U> {
+export interface UseAyanamiInstanceConfig<S = unknown, U = unknown> {
   destroyWhenUnmount?: boolean
   selector?: (state: S) => U
 }

Diff for: src/hooks/use-ayanami.ts

@@ -23,20 +23,24 @@ interface Config<S, U> extends Partial<ScopeConfig> {
   selector?: (state: S) => U
 }
 
-export function useAyanami<M extends Ayanami<S>, S, U = M extends Ayanami<infer SS> ? SS : S>(
+export function useAyanami<M extends Ayanami<any>, U = M extends Ayanami<infer S> ? S : never>(
   A: ConstructorOf<M>,
-  config?: M extends Ayanami<infer SS> ? Config<SS, U> : Config<S, U>,
-): M extends Ayanami<infer SS> ? Result<M, SS, U> : Result<M, S, U> {
+  config?: M extends Ayanami<infer S> ? Config<S, U> : never,
+): M extends Ayanami<infer S>
+  ? NonNullable<typeof config> extends Config<S, infer SS>
+    ? Result<M, S, SS>
+    : Result<M, S, S>
+  : never {
   const scope = get(config, 'scope')
   const selector = get(config, 'selector')
   const req = isSSREnabled() ? React.useContext(SSRContext) : null
   const reqScope = req ? createScopeWithRequest(req, scope) : scope
   const ayanami = React.useMemo(() => getInstanceWithScope(A, reqScope), [reqScope])
   ayanami.scopeName = scope || DEFAULT_SCOPE_NAME
 
-  const useAyanamiInstanceConfig = React.useMemo((): UseAyanamiInstanceConfig<S, U> => {
+  const useAyanamiInstanceConfig = React.useMemo<UseAyanamiInstanceConfig>(() => {
     return { destroyWhenUnmount: scope === TransientScope, selector }
   }, [reqScope])
 
-  return useAyanamiInstance<M, S, U>(ayanami, useAyanamiInstanceConfig) as any
+  return useAyanamiInstance(ayanami, useAyanamiInstanceConfig) as any
 }

Diff for: test/specs/hooks.spec.tsx

@@ -111,9 +111,9 @@ describe('Hooks spec:', () => {
       })
 
       const OuterComponent = () => {
-        const [state, actions] = useAyanami(Count, { scope: TransientScope })
+        const [{ count }, actions] = useAyanami(Count, { scope: TransientScope })
         const addOne = useCallback(() => actions.add(1), [])
-        outerRenderSpy(state.count)
+        outerRenderSpy(count)
         return (
           <div>
             <button onClick={addOne}>add one</button>