Reduce some bytes from the createCallable return structure

desko27 · Aug 19, 2024 · 94d1a54 · 94d1a54
1 parent b576ccf
commit 94d1a54
Showing 1 changed file with 36 additions and 38 deletions.
diff --git a/lib/createCallable/index.tsx b/lib/createCallable/index.tsx
@@ -1,6 +1,5 @@
 import { useState, useEffect } from 'react'
 import type {
-  CallFunction,
   UserComponent as UserComponentType,
   PrivateStackState,
   PrivateStackStateSetter,
@@ -13,45 +12,44 @@ export function createCallable<Props = void, Response = void, RootProps = {}>(
   let $setStack: PrivateStackStateSetter<Props, Response> | null = null
   let $nextKey = 0
 
-  const call: CallFunction<Props, Response> = (props) => {
-    if ($setStack === null) throw new Error('No <Root> found!')
+  return {
+    call: (props) => {
+      if ($setStack === null) throw new Error('No <Root> found!')
 
-    const key = String($nextKey++)
-    const promise = Promise.withResolvers<Response>()
+      const key = String($nextKey++)
+      const promise = Promise.withResolvers<Response>()
 
-    const end = (response: Response) => {
-      if ($setStack === null) return
-      promise.resolve(response)
-      $setStack((prev) => prev.filter((c) => c.key !== key))
-    }
-
-    const nextCall = { key, props, end }
-    $setStack((prev) => [...prev, nextCall])
-
-    return promise.promise
-  }
-
-  function Root(rootProps: RootProps) {
-    const [stack, setStack] = useState<PrivateStackState<Props, Response>>([])
-
-    useEffect(() => {
-      if ($setStack !== null)
-        throw new Error('Multiple instances of <Root> found!')
-      $setStack = setStack
-      return () => {
-        $setStack = null
-        $nextKey = 0
+      const end = (response: Response) => {
+        if ($setStack === null) return
+        promise.resolve(response)
+        $setStack((prev) => prev.filter((c) => c.key !== key))
       }
-    }, [])
-
-    return stack.map(({ props, ...call }) => (
-      <UserComponent
-        {...props}
-        key={call.key}
-        call={{ ...call, root: rootProps }}
-      />
-    ))
-  }
 
-  return { Root, call }
+      const nextCall = { key, props, end }
+      $setStack((prev) => [...prev, nextCall])
+
+      return promise.promise
+    },
+    Root: (rootProps: RootProps) => {
+      const [stack, setStack] = useState<PrivateStackState<Props, Response>>([])
+
+      useEffect(() => {
+        if ($setStack !== null)
+          throw new Error('Multiple instances of <Root> found!')
+        $setStack = setStack
+        return () => {
+          $setStack = null
+          $nextKey = 0
+        }
+      }, [])
+
+      return stack.map(({ props, ...call }) => (
+        <UserComponent
+          {...props}
+          key={call.key}
+          call={{ ...call, root: rootProps }}
+        />
+      ))
+    },
+  }
 }