@chhsiao1981/use-thunk 10.1.1 → 10.2.0

package/README.md

@@ -184,7 +184,6 @@ For example, the example [in the redux link](https://redux.js.org/recipes/struct
 ```ts
 classStatePost = {
   myClass: 'post',
-  doMe: (DispatchedAction<Post>),
   nodes: {
     [uuid-post1] : {
       id: uuid-post1,
@@ -202,7 +201,9 @@ classStatePost = {
         comments: [uuid-comment3, uuid-comment4, uuid-comment5]
       }
     }
-  }
+  },
+  defaultID,
+  defaultState,
 }
 ```
 
@@ -211,7 +212,6 @@ and:
 ```ts
 classStateComment = {
   myClass: 'comment',
-  doMe: (DispatchedAction<Comment>),
   nodes: {
     [uuid-comment1] : {
       id: uuid-comment1,
@@ -249,6 +249,8 @@ classStateComment = {
       }
     }
   }
+  defaultID,
+  defaultState,
 }
 ```
 
@@ -256,7 +258,6 @@ and:
 ```ts
 classStateUser = {
   myClass: 'user',
-  doMe: (DispatchedAction<User>),
   nodes: {
     [uuid-user1] : {
       id: uuid-user1,
@@ -280,6 +281,8 @@ classStateUser = {
       }
     }
   }
+  defaultID,
+  defaultState,
 }
 ```
 
@@ -311,18 +314,21 @@ generate uuid for react-object.
 
 ### State
 
-##### `getState(state: ClassState, myID?: string): State`
+##### `getState(state: ClassState, myID?: string): State | null`
 
-Get the state of `myID`. Get the state of `defaultID` if `myID` is not present.
+Get the state of `myID`. Get the state of `defaultID` if `myID` is not present. Return `null` if not available.
 
-##### `getDefaultID(state: ClassState): string`
+##### `getStateOrDefault(state: ClassState, myID?: string): State`
 
-get the default id.
+Get the state of `myID`. Get the state of `defaultID` if `myID` is not present. Return `defaultState` if not available.
+
+##### `getStateByThunk(theUseThunk: UseThunk, myID?: string): [State, DispatchedActionMap, theID]`
 
-##### `getRootID(state: ClassState): string`
+Get the state of `myID` by `UseThunk`. Get the state of `defaultID` if `myID` is not present. Return `defaultState` if not available.
 
-(to be deprecated in 10.2.0.)
-alias of `getDefaultID` for compatibility.
+##### `getDefaultID(state: ClassState): string`
+
+get the default id.
 
 ### NodeState
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chhsiao1981/use-thunk",
-  "version": "10.1.1",
+  "version": "10.2.0",
   "type": "module",
   "description": "A framework easily using useThunk to manage the data-state.",
   "homepage": "https://github.com/chhsiao1981/use-thunk",
@@ -58,6 +58,6 @@
   },
   "dependencies": {
     "react": ">=18.3.1",
-    "uuid": "^13.0.0"
+    "uuid": "^14.0.0"
   }
 }

package/src/ThunkContext.tsx

@@ -1,10 +1,9 @@
 import { type JSX, useMemo, useState } from 'react'
-import type { ClassState } from './stateTypes'
 import { THUNK_CONTEXT_MAP } from './thunkContextMap'
 
 type Props = {
   classes?: string[]
-  children?: JSX.Element[]
+  children?: JSX.Element | JSX.Element[]
 }
 const ThunkContext = (props: Props): JSX.Element => {
   let { classes, children } = props
@@ -21,8 +20,7 @@ const ThunkContext = (props: Props): JSX.Element => {
   const { context: Context_m, refClassState } = THUNK_CONTEXT_MAP.theMap[theClass]
 
   // biome-ignore lint/correctness/useHookAtTopLevel: the order is fixed.
-  // biome-ignore lint/suspicious/noExplicitAny: This generalized state can be any type.
-  const [classState, setClassState] = useState<ClassState<any>>({ myClass: theClass, nodes: {} })
+  const [classState, setClassState] = useState(refClassState.current)
 
   refClassState.current = classState
   // biome-ignore lint/correctness/useHookAtTopLevel: the order is fixed.

package/src/index.ts

@@ -7,7 +7,7 @@ import registerThunk from './registerThunk'
 import { remove } from './remove'
 import { setData } from './setData'
 import { setDefaultID } from './setDefaultID'
-import { getDefaultID, getNode, getRootID, getState } from './states'
+import { getDefaultID, getNode, getState, getStateByThunk, getStateOrDefault } from './states'
 import type { ClassState, NodeMeta, NodeState, NodeStateMap, State } from './stateTypes'
 import ThunkContext from './ThunkContext'
 import type { ThunkModule, ThunkModuleToFunc } from './thunk'
@@ -37,9 +37,10 @@ export {
   type DispatchFuncMap,
   // type DefaultDispatchFuncMap, // XXX deemphasize default
   getDefaultID,
-  getRootID,
   getNode,
   getState,
+  getStateOrDefault,
+  getStateByThunk,
   init,
   type InitParams,
   setData,

package/src/registerThunk.ts

@@ -4,7 +4,7 @@ import type { ThunkModule, ThunkModuleFunc } from './thunk'
 import { THUNK_CONTEXT_MAP } from './thunkContextMap'
 
 export default <S extends State, R extends ThunkModuleFunc<S>>(theDo: ThunkModule<S, R>) => {
-  const { myClass } = theDo
+  const { myClass, defaultState } = theDo
 
   if (THUNK_CONTEXT_MAP.theMap[myClass]) {
     // already init
@@ -15,6 +15,7 @@ export default <S extends State, R extends ThunkModuleFunc<S>>(theDo: ThunkModul
   const classState: ClassState<S> = {
     myClass,
     nodes: {},
+    defaultState,
   }
   const setClassState: Dispatch<SetStateAction<ClassState<S>>> = () => {}
   const refClassState = { current: classState }

package/src/stateTypes.ts

@@ -21,10 +21,8 @@ export type NodeStateMapByClass<S extends State> = {
 export type ClassState<S extends State> = {
   myClass: string
   defaultID?: string | null
-  // XXX doMe is a hidden variable for ClassState
-  //     used only for parents / children / links.
-  // doMe: DispatchFuncMap
   nodes: NodeStateMap<S>
+  defaultState: S
 }
 
 // Node

package/src/states.ts

@@ -1,14 +1,12 @@
+import type { DispatchFuncMap } from './dispatchFuncMap'
 import type { ClassState, NodeState, State } from './stateTypes'
+import type { ThunkModuleFunc } from './thunk'
+import type { UseThunk } from './useThunk'
 
 export const getDefaultID = <S extends State>(classState: ClassState<S>): string => {
   return classState.defaultID ?? ''
 }
 
-export const getRootID = <S extends State>(classState: ClassState<S>): string => {
-  console.warn('[DEPRECATE] getRootID will be deprecated in 10.2.0.')
-  return getDefaultID(classState)
-}
-
 export const getNode = <S extends State>(
   classState: ClassState<S>,
   myID?: string,
@@ -33,3 +31,17 @@ export const getState = <S extends State>(classState: ClassState<S>, myID?: stri
   }
   return me.state
 }
+
+export const getStateOrDefault = <S extends State>(classState: ClassState<S>, myID?: string): S => {
+  return getState(classState, myID) || classState.defaultState
+}
+
+export const getStateByThunk = <S extends State, R extends ThunkModuleFunc<S>>(
+  theUseThunk: UseThunk<S, R>,
+  myID?: string,
+): [S, DispatchFuncMap<S, R>, string] => {
+  const [classState, theDo] = theUseThunk
+  const theID = myID ? myID : getDefaultID(classState)
+  const state = getStateOrDefault(classState, theID)
+  return [state, theDo, theID]
+}

package/types/ThunkContext.d.ts

@@ -1,7 +1,7 @@
 import { type JSX } from 'react';
 type Props = {
     classes?: string[];
-    children?: JSX.Element[];
+    children?: JSX.Element | JSX.Element[];
 };
 declare const ThunkContext: (props: Props) => JSX.Element;
 export default ThunkContext;

package/types/index.d.ts

@@ -7,9 +7,9 @@ import registerThunk from './registerThunk';
 import { remove } from './remove';
 import { setData } from './setData';
 import { setDefaultID } from './setDefaultID';
-import { getDefaultID, getNode, getRootID, getState } from './states';
+import { getDefaultID, getNode, getState, getStateByThunk, getStateOrDefault } from './states';
 import type { ClassState, NodeMeta, NodeState, NodeStateMap, State } from './stateTypes';
 import ThunkContext from './ThunkContext';
 import type { ThunkModule, ThunkModuleToFunc } from './thunk';
 import useThunk, { type UseThunk } from './useThunk';
-export { registerThunk, useThunk, ThunkContext, type UseThunk, type State, type NodeState, type NodeMeta, type NodeStateMap, type ClassState, type GetClassState, type Thunk, type ThunkModule, type ThunkModuleToFunc, type Dispatch, type DispatchFuncMap, getDefaultID, getRootID, getNode, getState, init, type InitParams, setData, remove, setDefaultID, genUUID, };
+export { registerThunk, useThunk, ThunkContext, type UseThunk, type State, type NodeState, type NodeMeta, type NodeStateMap, type ClassState, type GetClassState, type Thunk, type ThunkModule, type ThunkModuleToFunc, type Dispatch, type DispatchFuncMap, getDefaultID, getNode, getState, getStateOrDefault, getStateByThunk, init, type InitParams, setData, remove, setDefaultID, genUUID, };

package/types/stateTypes.d.ts

@@ -15,6 +15,7 @@ export type ClassState<S extends State> = {
     myClass: string;
     defaultID?: string | null;
     nodes: NodeStateMap<S>;
+    defaultState: S;
 };
 export type NodeMeta = {
     id: string;

package/types/states.d.ts

@@ -1,5 +1,9 @@
+import type { DispatchFuncMap } from './dispatchFuncMap';
 import type { ClassState, NodeState, State } from './stateTypes';
+import type { ThunkModuleFunc } from './thunk';
+import type { UseThunk } from './useThunk';
 export declare const getDefaultID: <S extends State>(classState: ClassState<S>) => string;
-export declare const getRootID: <S extends State>(classState: ClassState<S>) => string;
 export declare const getNode: <S extends State>(classState: ClassState<S>, myID?: string) => NodeState<S> | null;
 export declare const getState: <S extends State>(classState: ClassState<S>, myID?: string) => S | null;
+export declare const getStateOrDefault: <S extends State>(classState: ClassState<S>, myID?: string) => S;
+export declare const getStateByThunk: <S extends State, R extends ThunkModuleFunc<S>>(theUseThunk: UseThunk<S, R>, myID?: string) => [S, DispatchFuncMap<S, R>, string];