remove hardcoded value option

swimmadude66 · Jul 13, 2024 · fd3e99d · fd3e99d
1 parent d8994b7
commit fd3e99d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 26 deletions.
diff --git a/packages/manager/package.json b/packages/manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tectonica/manager",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
   "exports": {

diff --git a/packages/manager/src/react.tsx b/packages/manager/src/react.tsx
@@ -8,7 +8,6 @@ import {
   GetKeyFunc,
   GetKeyType,
   GetValueFunc,
-  GetValueType,
   GlobalKey,
   InferManagerEvents,
   ManagerConstructorHook,
@@ -99,8 +98,8 @@ export function createValueListenerHook<
   managerClass: ManagerClass,
   eventName: EventName,
   getKey: GetKeyType<InstanceType<typeof managerClass>, InferManagerEvents<InstanceType<typeof managerClass>>, EventName, ArgsType>,
-  getValue: GetValueType<InstanceType<typeof managerClass>, InferManagerEvents<InstanceType<typeof managerClass>>, EventName, ReturnType>,
-  getServerValue: GetValueType<InstanceType<typeof managerClass>, InferManagerEvents<InstanceType<typeof managerClass>>, EventName, ReturnType> = getValue
+  getValue: GetValueFunc<InstanceType<typeof managerClass>, InferManagerEvents<InstanceType<typeof managerClass>>, EventName, ReturnType>,
+  getServerValue: GetValueFunc<InstanceType<typeof managerClass>, InferManagerEvents<InstanceType<typeof managerClass>>, EventName, ReturnType> = getValue
 ): (...args: ArgsType[]) => ReturnType {
   const keyGetter = (typeof getKey === 'function' ? getKey : (_mgr, ..._args) => getKey) as GetKeyFunc<
     InstanceType<typeof managerClass>,
@@ -109,20 +108,6 @@ export function createValueListenerHook<
     ArgsType
   >
 
-  const valueGetter = (typeof getValue === 'function' ? getValue : (..._args: any[]) => getValue) as GetValueFunc<
-    InstanceType<typeof managerClass>,
-    InferManagerEvents<InstanceType<typeof managerClass>>,
-    EventName,
-    ReturnType
-  >
-
-  const serverValueGetter = (typeof getServerValue === 'function' ? getServerValue : (..._args: any[]) => getServerValue) as GetValueFunc<
-    InstanceType<typeof managerClass>,
-    InferManagerEvents<InstanceType<typeof managerClass>>,
-    EventName,
-    ReturnType
-  >
-
   const ManagerContext = getManagerContext(managerClass)
 
   return (...args: ArgsType[]): ReturnType => {
@@ -144,11 +129,11 @@ export function createValueListenerHook<
     )
 
     const getSnapshot = useCallback(() => {
-      return valueGetter({ manager, eventName, key, data: undefined })
+      return getValue({ manager, eventName, key, data: undefined })
     }, [manager, key])
 
     const getServerSnapshot = useCallback(() => {
-      return serverValueGetter({ manager, eventName, key, data: undefined })
+      return getServerValue({ manager, eventName, key, data: undefined })
     }, [manager, key])
 
     const value = useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot)
@@ -200,8 +185,8 @@ export function createGlobalValueListenerHook<
 >(
   managerClass: ManagerClass,
   eventName: EventName,
-  getValue: GetValueType<InstanceType<typeof managerClass>, InferManagerEvents<InstanceType<typeof managerClass>>, EventName, ReturnType>,
-  getServerValue?: GetValueType<InstanceType<typeof managerClass>, InferManagerEvents<InstanceType<typeof managerClass>>, EventName, ReturnType>
+  getValue: GetValueFunc<InstanceType<typeof managerClass>, InferManagerEvents<InstanceType<typeof managerClass>>, EventName, ReturnType>,
+  getServerValue?: GetValueFunc<InstanceType<typeof managerClass>, InferManagerEvents<InstanceType<typeof managerClass>>, EventName, ReturnType>
 ): () => ReturnType {
   return createValueListenerHook<ManagerClass, EventName, never, ReturnType>(managerClass, eventName, GlobalKey, getValue, getServerValue)
 }

diff --git a/packages/manager/src/types.ts b/packages/manager/src/types.ts
@@ -58,10 +58,6 @@ export type GetValueFunc<Manager extends AbstractManager<E>, E extends EventsDef
   data: ListenerData<Manager, E, EventName>
 ) => ValueType
 
-export type GetValueType<Manager extends AbstractManager<E>, E extends EventsDef, EventName extends ManagerEventTypeName<E>, ValueType> =
-  | GetValueFunc<Manager, E, EventName, ValueType>
-  | ValueType
-
 export type EventHandler<E extends EventsDef, EventName extends ManagerEventTypeName<E>> = (data: ManagerEventTypeData<E, EventName>) => void
 
 export type EffectListener<Manager extends AbstractManager<E>, E extends EventsDef, EventName extends ManagerEventTypeName<E>> = (data: ListenerData<Manager, E, EventName>) => void