@fictjs/runtime 0.0.12 → 0.0.13

package/src/signal.ts

@@ -2,6 +2,11 @@ import { beginFlushGuard, beforeEffectRunGuard, endFlushGuard } from './cycle-gu
 import { getDevtoolsHook } from './devtools'
 import { registerRootCleanup } from './lifecycle'
 
+const isDev =
+  typeof __DEV__ !== 'undefined'
+    ? __DEV__
+    : typeof process === 'undefined' || process.env?.NODE_ENV !== 'production'
+
 // ============================================================================
 // Type Definitions
 // ============================================================================
@@ -1177,21 +1182,28 @@ export function endBatch(): void {
  */
 export function batch<T>(fn: () => T): T {
   ++batchDepth
-  let _error: unknown
-  let hasError = false
+  let result!: T
+  let error: unknown
   try {
-    return fn()
+    result = fn()
   } catch (e) {
-    _error = e
-    hasError = true
-    throw e
+    error = e
   } finally {
     --batchDepth
-    // Only flush if no error occurred to avoid interfering with error propagation
-    if (!hasError && batchDepth === 0) {
-      flush()
+    if (batchDepth === 0) {
+      try {
+        flush()
+      } catch (flushErr) {
+        if (error === undefined) {
+          error = flushErr
+        }
+      }
     }
   }
+  if (error !== undefined) {
+    throw error
+  }
+  return result
 }
 /**
  * Get the current active subscriber
@@ -1335,43 +1347,51 @@ export default {
 }
 export const $state = signal as <T>(value: T) => T
 
-let devtoolsSignalId = 0
-let devtoolsEffectId = 0
-
 interface DevtoolsIdentifiable {
   __id?: number
 }
 
-function registerSignalDevtools(value: unknown, node: SignalNode): number | undefined {
-  const hook = getDevtoolsHook()
-  if (!hook) return undefined
-  const id = ++devtoolsSignalId
-  hook.registerSignal(id, value)
-  ;(node as SignalNode & DevtoolsIdentifiable).__id = id
-  return id
-}
+let registerSignalDevtools: (value: unknown, node: SignalNode) => number | undefined = () =>
+  undefined
+let updateSignalDevtools: (node: SignalNode, value: unknown) => void = () => {}
+let registerEffectDevtools: (node: EffectNode) => number | undefined = () => undefined
+let effectRunDevtools: (node: EffectNode) => void = () => {}
+
+if (isDev) {
+  let devtoolsSignalId = 0
+  let devtoolsEffectId = 0
+
+  registerSignalDevtools = (value, node) => {
+    const hook = getDevtoolsHook()
+    if (!hook) return undefined
+    const id = ++devtoolsSignalId
+    hook.registerSignal(id, value)
+    ;(node as SignalNode & DevtoolsIdentifiable).__id = id
+    return id
+  }
 
-function updateSignalDevtools(node: SignalNode, value: unknown): void {
-  const hook = getDevtoolsHook()
-  if (!hook) return
-  const id = (node as SignalNode & DevtoolsIdentifiable).__id
-  if (id) hook.updateSignal(id, value)
-}
+  updateSignalDevtools = (node, value) => {
+    const hook = getDevtoolsHook()
+    if (!hook) return
+    const id = (node as SignalNode & DevtoolsIdentifiable).__id
+    if (id) hook.updateSignal(id, value)
+  }
 
-function registerEffectDevtools(node: EffectNode): number | undefined {
-  const hook = getDevtoolsHook()
-  if (!hook) return undefined
-  const id = ++devtoolsEffectId
-  hook.registerEffect(id)
-  ;(node as EffectNode & DevtoolsIdentifiable).__id = id
-  return id
-}
+  registerEffectDevtools = node => {
+    const hook = getDevtoolsHook()
+    if (!hook) return undefined
+    const id = ++devtoolsEffectId
+    hook.registerEffect(id)
+    ;(node as EffectNode & DevtoolsIdentifiable).__id = id
+    return id
+  }
 
-function effectRunDevtools(node: EffectNode): void {
-  const hook = getDevtoolsHook()
-  if (!hook) return
-  const id = (node as EffectNode & DevtoolsIdentifiable).__id
-  if (id) hook.effectRun(id)
+  effectRunDevtools = node => {
+    const hook = getDevtoolsHook()
+    if (!hook) return
+    const id = (node as EffectNode & DevtoolsIdentifiable).__id
+    if (id) hook.effectRun(id)
+  }
 }
 
 // ============================================================================