@blac/react 2.0.0-rc-10 → 2.0.0-rn-12

package/README.md

@@ -123,6 +123,27 @@ The dependency tracking system uses JavaScript Proxies to monitor property acces
 3. **Intelligent Comparison**: The system separately tracks state dependencies and instance dependencies to handle edge cases where properties are dynamically added/removed
 4. **Optimized Updates**: Components only re-render when tracked dependencies actually change their values
 
+#### Configuring Proxy Tracking
+
+By default, BlaC uses proxy-based dependency tracking for optimal performance. You can disable this globally if needed:
+
+```tsx
+import { Blac } from '@blac/core';
+
+// Disable automatic dependency tracking globally
+Blac.setConfig({ proxyDependencyTracking: false });
+
+// Now components will re-render on ANY state change
+// unless you provide manual dependencies
+```
+
+When proxy tracking is disabled:
+- Components re-render on any state change (similar to traditional state management)
+- Manual dependencies via the `selector` option still work as expected
+- Useful for debugging or when proxy behavior causes issues
+
+For more configuration options, see the [@blac/core documentation](https://www.npmjs.com/package/@blac/core).
+
 ### Custom Dependency Selector
 
 For more control over when your component re-renders, you can provide a custom dependency selector. The selector function receives the current state, previous state, and bloc instance, and should return an array of values to track:

package/dist/index.cjs.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("@blac/core"),e=require("react");function I(c,t){const d=e.useRef(0);d.current++;const l=e.useRef({}),r=e.useMemo(()=>new S.BlacAdapter({componentRef:l,blocConstructor:c},t),[]);r.resetConsumerTracking();const s=e.useRef(0);e.useEffect(()=>{s.current++,r.options=t},[t]);const R=e.useRef(0);e.useEffect(()=>(R.current++,r.mount(),()=>{r.unmount()}),[r.blocInstance]);const m=e.useRef(0),n=e.useMemo(()=>(m.current++,o=>{const y=r.createSubscription({onChange:()=>{o()}});return()=>{y()}}),[r.blocInstance]),u=e.useRef(0),a=e.useRef(0),f=e.useSyncExternalStore(n,()=>(u.current++,r.blocInstance.state),()=>{const o=r.blocInstance;return a.current++,o.state}),b=e.useRef(0),i=e.useMemo(()=>(b.current++,r.getProxyState(f)),[f]),g=e.useRef(0),B=e.useMemo(()=>(g.current++,r.getProxyBlocInstance()),[r.blocInstance]);return e.useEffect(()=>{r.updateLastNotified(l.current)}),[i,B]}function x(c,t={}){const d=e.useRef(`external-${S.generateUUID()}`),l=e.useRef(new Set),r=e.useRef(new Set),s=e.useRef(null),R=e.useMemo(()=>{const n=S.Blac.getInstance();if(c.constructor.isolated||c.isolated){const a=new c(t==null?void 0:t.props),f=(t==null?void 0:t.id)||`${c.name}_${S.generateUUID()}`;return a._updateId(f),n.activateBloc(a),a}return n.getBloc(c,{id:t==null?void 0:t.id,props:t==null?void 0:t.props})},[c,t==null?void 0:t.id]),m=e.useMemo(()=>({getSnapshot:()=>{const n=s.current;return n?n.state:void 0},subscribe:n=>{const u=s.current;if(!u)return()=>{};const a=(b,i)=>{try{l.current.clear(),r.current.clear(),t.selector&&u&&t.selector(b,i,u),n.length>0?n(b):n()}catch(g){console.error("Listener error in useExternalBlocStore:",g)}};return u._observer.subscribe({id:d.current,fn:a})},getServerSnapshot:()=>{const n=s.current;return n?n.state:void 0}}),[]);return s.current=R,{externalStore:m,instance:s,usedKeys:l,usedClassPropKeys:r,rid:d.current}}exports.useBloc=I;exports.useExternalBlocStore=x;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("@blac/core"),r=require("react");function I(n,e){const b=r.useRef(0);b.current++;const l=r.useRef({}),c=r.useMemo(()=>new S.BlacAdapter({componentRef:l,blocConstructor:n},{id:e==null?void 0:e.id,dependencies:e==null?void 0:e.dependencies,props:e==null?void 0:e.props,onMount:e==null?void 0:e.onMount,onUnmount:e==null?void 0:e.onUnmount}),[]);c.resetConsumerTracking();const t=r.useRef(0);r.useEffect(()=>{t.current++,c.options={id:e==null?void 0:e.id,dependencies:e==null?void 0:e.dependencies,props:e==null?void 0:e.props,onMount:e==null?void 0:e.onMount,onUnmount:e==null?void 0:e.onUnmount},(e==null?void 0:e.props)!==void 0&&c.updateProps(e.props)},[e==null?void 0:e.props,e==null?void 0:e.id,e==null?void 0:e.dependencies,e==null?void 0:e.onMount,e==null?void 0:e.onUnmount]);const R=r.useRef(0);r.useEffect(()=>(R.current++,c.mount(),()=>{c.unmount()}),[c.blocInstance]);const B=r.useRef(0),u=r.useMemo(()=>(B.current++,d=>{const y=c.createSubscription({onChange:()=>{d()}});return()=>{y()}}),[c.blocInstance]),a=r.useRef(0),s=r.useRef(0),f=r.useSyncExternalStore(u,()=>(a.current++,c.blocInstance.state),()=>{const d=c.blocInstance;return s.current++,d.state}),m=r.useRef(0),M=r.useMemo(()=>(m.current++,c.getProxyState(f)),[f]),g=r.useRef(0),x=r.useMemo(()=>(g.current++,c.getProxyBlocInstance()),[c.blocInstance]);return r.useEffect(()=>{c.updateLastNotified(l.current)}),[M,x]}function U(n,e={}){const b=r.useRef(`external-${S.generateUUID()}`),l=r.useRef(new Set),c=r.useRef(new Set),t=r.useRef(null),R=r.useMemo(()=>{const u=S.Blac.getInstance();if(n.constructor.isolated||n.isolated){const s=new n(e==null?void 0:e.props),f=(e==null?void 0:e.id)||`${n.name}_${S.generateUUID()}`;return s._updateId(f),u.activateBloc(s),s}return u.getBloc(n,{id:e==null?void 0:e.id,props:e==null?void 0:e.props})},[n,e==null?void 0:e.id]),B=r.useMemo(()=>({getSnapshot:()=>{const u=t.current;return u?u.state:void 0},subscribe:u=>{const a=t.current;if(!a)return()=>{};const s=(m,M)=>{try{l.current.clear(),c.current.clear(),e.selector&&a&&e.selector(m,M,a),u.length>0?u(m):u()}catch(g){console.error("Listener error in useExternalBlocStore:",g)}};return a._observer.subscribe({id:b.current,fn:s})},getServerSnapshot:()=>{const u=t.current;return u?u.state:void 0}}),[]);return t.current=R,{externalStore:B,instance:t,usedKeys:l,usedClassPropKeys:c,rid:b.current}}exports.useBloc=I;exports.useBlocNext=I;exports.useExternalBlocStore=U;
 //# sourceMappingURL=index.cjs.js.map

package/dist/index.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs.js","sources":["../src/useBloc.ts","../src/useExternalBlocStore.ts"],"sourcesContent":["import {\n  AdapterOptions,\n  BlacAdapter,\n  BlocBase,\n  BlocConstructor,\n  BlocState,\n} from '@blac/core';\nimport { useEffect, useMemo, useRef, useSyncExternalStore } from 'react';\n\n/**\n * Type definition for the return type of the useBloc hook\n */\ntype HookTypes<B extends BlocConstructor<BlocBase<any>>> = [\n  BlocState<InstanceType<B>>,\n  InstanceType<B>,\n];\n\n/**\n * React hook for integrating with Blac state management\n */\nfunction useBloc<B extends BlocConstructor<BlocBase<any>>>(\n  blocConstructor: B,\n  options?: AdapterOptions<InstanceType<B>>,\n): HookTypes<B> {\n  // Create a unique identifier for this hook instance\n  const renderCount = useRef(0);\n  renderCount.current++;\n\n  const componentRef = useRef<object>({});\n\n  // Track adapter creation\n  const adapter = useMemo(() => {\n    const newAdapter = new BlacAdapter<B>(\n      {\n        componentRef: componentRef,\n        blocConstructor,\n      },\n      options,\n    );\n    return newAdapter;\n  }, []);\n\n  // Reset tracking at the start of each render to ensure we only track\n  // properties accessed during the current render\n  adapter.resetConsumerTracking();\n\n  // Track options changes\n  const optionsChangeCount = useRef(0);\n  useEffect(() => {\n    optionsChangeCount.current++;\n    adapter.options = options;\n  }, [options]);\n\n  // Register as consumer and handle lifecycle\n  const mountEffectCount = useRef(0);\n  useEffect(() => {\n    mountEffectCount.current++;\n    adapter.mount();\n\n    return () => {\n      adapter.unmount();\n    };\n  }, [adapter.blocInstance]);\n\n  // Subscribe to state changes using useSyncExternalStore\n  const subscribeMemoCount = useRef(0);\n  const subscribe = useMemo(() => {\n    subscribeMemoCount.current++;\n    let subscriptionCount = 0;\n\n    return (onStoreChange: () => void) => {\n      subscriptionCount++;\n      const unsubscribe = adapter.createSubscription({\n        onChange: () => {\n          onStoreChange();\n        },\n      });\n\n      return () => {\n        unsubscribe();\n      };\n    };\n  }, [adapter.blocInstance]);\n\n  const snapshotCount = useRef(0);\n  const serverSnapshotCount = useRef(0);\n\n  const rawState: BlocState<InstanceType<B>> = useSyncExternalStore(\n    subscribe,\n    // Get snapshot\n    () => {\n      snapshotCount.current++;\n      const bloc = adapter.blocInstance;\n      const state = bloc.state;\n      return state;\n    },\n    // Get server snapshot (same as client for now)\n    () => {\n      const bloc = adapter.blocInstance;\n      serverSnapshotCount.current++;\n      const state = bloc.state;\n      return state;\n    },\n  );\n\n  // Create proxies for fine-grained tracking (if enabled)\n  const stateMemoCount = useRef(0);\n  const finalState = useMemo(() => {\n    stateMemoCount.current++;\n    const proxyState = adapter.getProxyState(rawState);\n    return proxyState;\n  }, [rawState]);\n\n  const blocMemoCount = useRef(0);\n  const finalBloc = useMemo(() => {\n    blocMemoCount.current++;\n    const proxyBloc = adapter.getProxyBlocInstance();\n    return proxyBloc;\n  }, [adapter.blocInstance]);\n\n  // Mark consumer as rendered after each render\n  useEffect(() => {\n    adapter.updateLastNotified(componentRef.current);\n  });\n\n  // Log final hook return\n  return [finalState, finalBloc];\n}\n\nexport default useBloc;\n","import {\n  Blac,\n  BlocBase,\n  BlocConstructor,\n  BlocState,\n  InferPropsFromGeneric,\n  generateUUID,\n} from '@blac/core';\nimport { useCallback, useMemo, useRef } from 'react';\n\ninterface ExternalStoreOptions<B extends BlocBase<any>> {\n  id?: string;\n  props?: InferPropsFromGeneric<B>;\n  selector?: (\n    currentState: BlocState<B>,\n    previousState: BlocState<B>,\n    instance: B,\n  ) => any[];\n}\n\ninterface ExternalStore<T> {\n  getSnapshot: () => T | undefined;\n  subscribe: (listener: () => void) => () => void;\n  getServerSnapshot?: () => T | undefined;\n}\n\ninterface ExternalBlocStoreResult<B extends BlocBase<any>> {\n  externalStore: ExternalStore<BlocState<B>>;\n  instance: { current: B | null };\n  usedKeys: { current: Set<string> };\n  usedClassPropKeys: { current: Set<string> };\n  rid: string;\n}\n\n/**\n * Hook for using an external bloc store\n * Provides low-level access to bloc instances for use with React's useSyncExternalStore\n */\nexport default function useExternalBlocStore<\n  B extends BlocConstructor<BlocBase<any>>,\n>(\n  blocConstructor: B,\n  options: ExternalStoreOptions<InstanceType<B>> = {},\n): ExternalBlocStoreResult<InstanceType<B>> {\n  const ridRef = useRef<string>(`external-${generateUUID()}`);\n  const usedKeysRef = useRef<Set<string>>(new Set());\n  const usedClassPropKeysRef = useRef<Set<string>>(new Set());\n  const instanceRef = useRef<InstanceType<B> | null>(null);\n\n  // Get or create bloc instance\n  const bloc = useMemo(() => {\n    const blac = Blac.getInstance();\n    const base = blocConstructor as unknown as BlocBase<any>;\n\n    // For isolated blocs, always create a new instance\n    if (\n      (base.constructor as any).isolated ||\n      (blocConstructor as any).isolated\n    ) {\n      const newBloc = new blocConstructor(options?.props) as InstanceType<B>;\n      const uniqueId =\n        options?.id || `${blocConstructor.name}_${generateUUID()}`;\n      newBloc._updateId(uniqueId);\n      blac.activateBloc(newBloc);\n      return newBloc;\n    }\n\n    // For shared blocs, use the existing getBloc logic\n    return blac.getBloc(blocConstructor, {\n      id: options?.id,\n      props: options?.props,\n    });\n  }, [blocConstructor, options?.id]);\n\n  // Create external store interface\n  const externalStore = useMemo<ExternalStore<BlocState<InstanceType<B>>>>(\n    () => ({\n      getSnapshot: () => {\n        const currentInstance = instanceRef.current;\n        return currentInstance ? currentInstance.state : undefined;\n      },\n      subscribe: (listener: () => void) => {\n        const currentInstance = instanceRef.current;\n        if (!currentInstance) {\n          // Return no-op unsubscribe if no instance\n          return () => {};\n        }\n\n        // Wrap listener to handle errors gracefully\n        const safeListener = (\n          newState: BlocState<InstanceType<B>>,\n          oldState: BlocState<InstanceType<B>>,\n        ) => {\n          try {\n            // Reset tracking keys on each listener call\n            usedKeysRef.current.clear();\n            usedClassPropKeysRef.current.clear();\n\n            // Call selector if provided\n            if (options.selector && currentInstance) {\n              options.selector(newState, oldState, currentInstance);\n            }\n\n            // Call listener with state if it expects it\n            if (listener.length > 0) {\n              (listener as any)(newState);\n            } else {\n              listener();\n            }\n          } catch (error) {\n            console.error('Listener error in useExternalBlocStore:', error);\n            // Don't rethrow to prevent breaking other listeners\n          }\n        };\n\n        const unsubscribe = currentInstance._observer.subscribe({\n          id: ridRef.current,\n          fn: safeListener,\n        });\n        return unsubscribe;\n      },\n      getServerSnapshot: () => {\n        const currentInstance = instanceRef.current;\n        return currentInstance ? currentInstance.state : undefined;\n      },\n    }),\n    [],\n  );\n\n  // Update instance ref\n  instanceRef.current = bloc;\n\n  return {\n    externalStore,\n    instance: instanceRef,\n    usedKeys: usedKeysRef,\n    usedClassPropKeys: usedClassPropKeysRef,\n    rid: ridRef.current,\n  };\n}\n"],"names":["useBloc","blocConstructor","options","renderCount","useRef","componentRef","adapter","useMemo","BlacAdapter","optionsChangeCount","useEffect","mountEffectCount","subscribeMemoCount","subscribe","onStoreChange","unsubscribe","snapshotCount","serverSnapshotCount","rawState","useSyncExternalStore","bloc","stateMemoCount","finalState","blocMemoCount","finalBloc","useExternalBlocStore","ridRef","generateUUID","usedKeysRef","usedClassPropKeysRef","instanceRef","blac","Blac","newBloc","uniqueId","externalStore","currentInstance","listener","safeListener","newState","oldState","error"],"mappings":"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"}
+{"version":3,"file":"index.cjs.js","sources":["../src/useBloc.ts","../src/useExternalBlocStore.ts"],"sourcesContent":["import {\n  AdapterOptions,\n  BlacAdapter,\n  BlocBase,\n  BlocConstructor,\n  BlocState,\n} from '@blac/core';\nimport { useEffect, useMemo, useRef, useSyncExternalStore } from 'react';\n\n/**\n * Type definition for the return type of the useBloc hook\n */\ntype HookTypes<B extends BlocConstructor<BlocBase<any>>> = [\n  BlocState<InstanceType<B>>,\n  InstanceType<B>,\n];\n\n/**\n * React hook for integrating with Blac state management\n */\nfunction useBloc<B extends BlocConstructor<BlocBase<any>>>(\n  blocConstructor: B,\n  options?: {\n    props?: ConstructorParameters<B>[0];\n    id?: string;\n    dependencies?: (bloc: InstanceType<B>) => unknown[];\n    onMount?: (bloc: InstanceType<B>) => void;\n    onUnmount?: (bloc: InstanceType<B>) => void;\n  },\n): HookTypes<B> {\n  // Create a unique identifier for this hook instance\n  const renderCount = useRef(0);\n  renderCount.current++;\n\n  const componentRef = useRef<object>({});\n\n  // Track adapter creation\n  const adapter = useMemo(() => {\n    const newAdapter = new BlacAdapter<B>(\n      {\n        componentRef: componentRef,\n        blocConstructor,\n      },\n      {\n        id: options?.id,\n        dependencies: options?.dependencies,\n        props: options?.props,\n        onMount: options?.onMount,\n        onUnmount: options?.onUnmount,\n      },\n    );\n    return newAdapter;\n  }, []);\n\n  // Reset tracking at the start of each render to ensure we only track\n  // properties accessed during the current render\n  adapter.resetConsumerTracking();\n\n  // Track options changes and update props\n  const optionsChangeCount = useRef(0);\n  useEffect(() => {\n    optionsChangeCount.current++;\n    adapter.options = {\n      id: options?.id,\n      dependencies: options?.dependencies,\n      props: options?.props,\n      onMount: options?.onMount,\n      onUnmount: options?.onUnmount,\n    };\n\n    if (options?.props !== undefined) {\n      adapter.updateProps(options.props);\n    }\n  }, [options?.props, options?.id, options?.dependencies, options?.onMount, options?.onUnmount]);\n\n  // Register as consumer and handle lifecycle\n  const mountEffectCount = useRef(0);\n  useEffect(() => {\n    mountEffectCount.current++;\n    adapter.mount();\n\n    return () => {\n      adapter.unmount();\n    };\n  }, [adapter.blocInstance]);\n\n  // Subscribe to state changes using useSyncExternalStore\n  const subscribeMemoCount = useRef(0);\n  const subscribe = useMemo(() => {\n    subscribeMemoCount.current++;\n    let subscriptionCount = 0;\n\n    return (onStoreChange: () => void) => {\n      subscriptionCount++;\n      const unsubscribe = adapter.createSubscription({\n        onChange: () => {\n          onStoreChange();\n        },\n      });\n\n      return () => {\n        unsubscribe();\n      };\n    };\n  }, [adapter.blocInstance]);\n\n  const snapshotCount = useRef(0);\n  const serverSnapshotCount = useRef(0);\n\n  const rawState: BlocState<InstanceType<B>> = useSyncExternalStore(\n    subscribe,\n    // Get snapshot\n    () => {\n      snapshotCount.current++;\n      const bloc = adapter.blocInstance;\n      const state = bloc.state;\n      return state;\n    },\n    // Get server snapshot (same as client for now)\n    () => {\n      const bloc = adapter.blocInstance;\n      serverSnapshotCount.current++;\n      const state = bloc.state;\n      return state;\n    },\n  );\n\n  // Create proxies for fine-grained tracking (if enabled)\n  const stateMemoCount = useRef(0);\n  const finalState = useMemo(() => {\n    stateMemoCount.current++;\n    const proxyState = adapter.getProxyState(rawState);\n    return proxyState;\n  }, [rawState]);\n\n  const blocMemoCount = useRef(0);\n  const finalBloc = useMemo(() => {\n    blocMemoCount.current++;\n    const proxyBloc = adapter.getProxyBlocInstance();\n    return proxyBloc;\n  }, [adapter.blocInstance]);\n\n  // Mark consumer as rendered after each render\n  useEffect(() => {\n    adapter.updateLastNotified(componentRef.current);\n  });\n\n  // Log final hook return\n  return [finalState, finalBloc];\n}\n\nexport default useBloc;\n","import {\n  Blac,\n  BlocBase,\n  BlocConstructor,\n  BlocState,\n  InferPropsFromGeneric,\n  generateUUID,\n} from '@blac/core';\nimport { useCallback, useMemo, useRef } from 'react';\n\ninterface ExternalStoreOptions<B extends BlocBase<any>> {\n  id?: string;\n  props?: InferPropsFromGeneric<B>;\n  selector?: (\n    currentState: BlocState<B>,\n    previousState: BlocState<B>,\n    instance: B,\n  ) => any[];\n}\n\ninterface ExternalStore<T> {\n  getSnapshot: () => T | undefined;\n  subscribe: (listener: () => void) => () => void;\n  getServerSnapshot?: () => T | undefined;\n}\n\ninterface ExternalBlocStoreResult<B extends BlocBase<any>> {\n  externalStore: ExternalStore<BlocState<B>>;\n  instance: { current: B | null };\n  usedKeys: { current: Set<string> };\n  usedClassPropKeys: { current: Set<string> };\n  rid: string;\n}\n\n/**\n * Hook for using an external bloc store\n * Provides low-level access to bloc instances for use with React's useSyncExternalStore\n */\nexport default function useExternalBlocStore<\n  B extends BlocConstructor<BlocBase<any>>,\n>(\n  blocConstructor: B,\n  options: ExternalStoreOptions<InstanceType<B>> = {},\n): ExternalBlocStoreResult<InstanceType<B>> {\n  const ridRef = useRef<string>(`external-${generateUUID()}`);\n  const usedKeysRef = useRef<Set<string>>(new Set());\n  const usedClassPropKeysRef = useRef<Set<string>>(new Set());\n  const instanceRef = useRef<InstanceType<B> | null>(null);\n\n  // Get or create bloc instance\n  const bloc = useMemo(() => {\n    const blac = Blac.getInstance();\n    const base = blocConstructor as unknown as BlocBase<any>;\n\n    // For isolated blocs, always create a new instance\n    if (\n      (base.constructor as any).isolated ||\n      (blocConstructor as any).isolated\n    ) {\n      const newBloc = new blocConstructor(options?.props) as InstanceType<B>;\n      const uniqueId =\n        options?.id || `${blocConstructor.name}_${generateUUID()}`;\n      newBloc._updateId(uniqueId);\n      blac.activateBloc(newBloc);\n      return newBloc;\n    }\n\n    // For shared blocs, use the existing getBloc logic\n    return blac.getBloc(blocConstructor, {\n      id: options?.id,\n      props: options?.props,\n    });\n  }, [blocConstructor, options?.id]);\n\n  // Create external store interface\n  const externalStore = useMemo<ExternalStore<BlocState<InstanceType<B>>>>(\n    () => ({\n      getSnapshot: () => {\n        const currentInstance = instanceRef.current;\n        return currentInstance ? currentInstance.state : undefined;\n      },\n      subscribe: (listener: () => void) => {\n        const currentInstance = instanceRef.current;\n        if (!currentInstance) {\n          // Return no-op unsubscribe if no instance\n          return () => {};\n        }\n\n        // Wrap listener to handle errors gracefully\n        const safeListener = (\n          newState: BlocState<InstanceType<B>>,\n          oldState: BlocState<InstanceType<B>>,\n        ) => {\n          try {\n            // Reset tracking keys on each listener call\n            usedKeysRef.current.clear();\n            usedClassPropKeysRef.current.clear();\n\n            // Call selector if provided\n            if (options.selector && currentInstance) {\n              options.selector(newState, oldState, currentInstance);\n            }\n\n            // Call listener with state if it expects it\n            if (listener.length > 0) {\n              (listener as any)(newState);\n            } else {\n              listener();\n            }\n          } catch (error) {\n            console.error('Listener error in useExternalBlocStore:', error);\n            // Don't rethrow to prevent breaking other listeners\n          }\n        };\n\n        const unsubscribe = currentInstance._observer.subscribe({\n          id: ridRef.current,\n          fn: safeListener,\n        });\n        return unsubscribe;\n      },\n      getServerSnapshot: () => {\n        const currentInstance = instanceRef.current;\n        return currentInstance ? currentInstance.state : undefined;\n      },\n    }),\n    [],\n  );\n\n  // Update instance ref\n  instanceRef.current = bloc;\n\n  return {\n    externalStore,\n    instance: instanceRef,\n    usedKeys: usedKeysRef,\n    usedClassPropKeys: usedClassPropKeysRef,\n    rid: ridRef.current,\n  };\n}\n"],"names":["useBloc","blocConstructor","options","renderCount","useRef","componentRef","adapter","useMemo","BlacAdapter","optionsChangeCount","useEffect","mountEffectCount","subscribeMemoCount","subscribe","onStoreChange","unsubscribe","snapshotCount","serverSnapshotCount","rawState","useSyncExternalStore","bloc","stateMemoCount","finalState","blocMemoCount","finalBloc","useExternalBlocStore","ridRef","generateUUID","usedKeysRef","usedClassPropKeysRef","instanceRef","blac","Blac","newBloc","uniqueId","externalStore","currentInstance","listener","safeListener","newState","oldState","error"],"mappings":"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"}

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import { AdapterOptions } from '@blac/core';
 import { BlocBase } from '@blac/core';
 import { BlocConstructor } from '@blac/core';
 import { BlocState } from '@blac/core';
@@ -41,7 +40,15 @@ InstanceType<B>
 /**
  * React hook for integrating with Blac state management
  */
-export declare function useBloc<B extends BlocConstructor<BlocBase<any>>>(blocConstructor: B, options?: AdapterOptions<InstanceType<B>>): HookTypes<B>;
+declare function useBloc<B extends BlocConstructor<BlocBase<any>>>(blocConstructor: B, options?: {
+    props?: ConstructorParameters<B>[0];
+    id?: string;
+    dependencies?: (bloc: InstanceType<B>) => unknown[];
+    onMount?: (bloc: InstanceType<B>) => void;
+    onUnmount?: (bloc: InstanceType<B>) => void;
+}): HookTypes<B>;
+export { useBloc }
+export { useBloc as useBlocNext }
 
 /**
  * Hook for using an external bloc store

package/dist/index.es.js

@@ -1,98 +1,111 @@
-import { BlacAdapter as C, generateUUID as g, Blac as w } from "@blac/core";
-import { useRef as n, useMemo as l, useEffect as B, useSyncExternalStore as v } from "react";
-function K(c, e) {
-  const f = n(0);
-  f.current++;
-  const d = n({}), t = l(() => new C(
+import { BlacAdapter as v, generateUUID as h, Blac as w } from "@blac/core";
+import { useRef as u, useMemo as b, useEffect as M, useSyncExternalStore as U } from "react";
+function P(n, e) {
+  const m = u(0);
+  m.current++;
+  const f = u({}), r = b(() => new v(
     {
-      componentRef: d,
-      blocConstructor: c
+      componentRef: f,
+      blocConstructor: n
     },
-    e
+    {
+      id: e == null ? void 0 : e.id,
+      dependencies: e == null ? void 0 : e.dependencies,
+      props: e == null ? void 0 : e.props,
+      onMount: e == null ? void 0 : e.onMount,
+      onUnmount: e == null ? void 0 : e.onUnmount
+    }
   ), []);
-  t.resetConsumerTracking();
-  const s = n(0);
-  B(() => {
-    s.current++, t.options = e;
-  }, [e]);
-  const m = n(0);
-  B(() => (m.current++, t.mount(), () => {
-    t.unmount();
-  }), [t.blocInstance]);
-  const I = n(0), r = l(() => (I.current++, (o) => {
-    const y = t.createSubscription({
+  r.resetConsumerTracking();
+  const t = u(0);
+  M(() => {
+    t.current++, r.options = {
+      id: e == null ? void 0 : e.id,
+      dependencies: e == null ? void 0 : e.dependencies,
+      props: e == null ? void 0 : e.props,
+      onMount: e == null ? void 0 : e.onMount,
+      onUnmount: e == null ? void 0 : e.onUnmount
+    }, (e == null ? void 0 : e.props) !== void 0 && r.updateProps(e.props);
+  }, [e == null ? void 0 : e.props, e == null ? void 0 : e.id, e == null ? void 0 : e.dependencies, e == null ? void 0 : e.onMount, e == null ? void 0 : e.onUnmount]);
+  const x = u(0);
+  M(() => (x.current++, r.mount(), () => {
+    r.unmount();
+  }), [r.blocInstance]);
+  const B = u(0), c = b(() => (B.current++, (l) => {
+    const g = r.createSubscription({
       onChange: () => {
-        o();
+        l();
       }
     });
     return () => {
-      y();
+      g();
     };
-  }), [t.blocInstance]), u = n(0), a = n(0), b = v(
-    r,
+  }), [r.blocInstance]), a = u(0), d = u(0), s = U(
+    c,
     // Get snapshot
-    () => (u.current++, t.blocInstance.state),
+    () => (a.current++, r.blocInstance.state),
     // Get server snapshot (same as client for now)
     () => {
-      const o = t.blocInstance;
-      return a.current++, o.state;
+      const l = r.blocInstance;
+      return d.current++, l.state;
     }
-  ), S = n(0), i = l(() => (S.current++, t.getProxyState(b)), [b]), x = n(0), h = l(() => (x.current++, t.getProxyBlocInstance()), [t.blocInstance]);
-  return B(() => {
-    t.updateLastNotified(d.current);
-  }), [i, h];
+  ), S = u(0), I = b(() => (S.current++, r.getProxyState(s)), [s]), y = u(0), C = b(() => (y.current++, r.getProxyBlocInstance()), [r.blocInstance]);
+  return M(() => {
+    r.updateLastNotified(f.current);
+  }), [I, C];
 }
-function M(c, e = {}) {
-  const f = n(`external-${g()}`), d = n(/* @__PURE__ */ new Set()), t = n(/* @__PURE__ */ new Set()), s = n(null), m = l(() => {
-    const r = w.getInstance();
-    if (c.constructor.isolated || c.isolated) {
-      const a = new c(e == null ? void 0 : e.props), b = (e == null ? void 0 : e.id) || `${c.name}_${g()}`;
-      return a._updateId(b), r.activateBloc(a), a;
+function K(n, e = {}) {
+  const m = u(`external-${h()}`), f = u(/* @__PURE__ */ new Set()), r = u(/* @__PURE__ */ new Set()), t = u(null), x = b(() => {
+    const c = w.getInstance();
+    if (n.constructor.isolated || n.isolated) {
+      const d = new n(e == null ? void 0 : e.props), s = (e == null ? void 0 : e.id) || `${n.name}_${h()}`;
+      return d._updateId(s), c.activateBloc(d), d;
     }
-    return r.getBloc(c, {
+    return c.getBloc(n, {
       id: e == null ? void 0 : e.id,
       props: e == null ? void 0 : e.props
     });
-  }, [c, e == null ? void 0 : e.id]), I = l(
+  }, [n, e == null ? void 0 : e.id]), B = b(
     () => ({
       getSnapshot: () => {
-        const r = s.current;
-        return r ? r.state : void 0;
+        const c = t.current;
+        return c ? c.state : void 0;
       },
-      subscribe: (r) => {
-        const u = s.current;
-        if (!u)
+      subscribe: (c) => {
+        const a = t.current;
+        if (!a)
           return () => {
           };
-        const a = (S, i) => {
+        const d = (S, I) => {
           try {
-            d.current.clear(), t.current.clear(), e.selector && u && e.selector(S, i, u), r.length > 0 ? r(S) : r();
-          } catch (x) {
-            console.error("Listener error in useExternalBlocStore:", x);
+            f.current.clear(), r.current.clear(), e.selector && a && e.selector(S, I, a), c.length > 0 ? c(S) : c();
+          } catch (y) {
+            console.error("Listener error in useExternalBlocStore:", y);
           }
         };
-        return u._observer.subscribe({
-          id: f.current,
-          fn: a
+        return a._observer.subscribe({
+          id: m.current,
+          fn: d
         });
       },
       getServerSnapshot: () => {
-        const r = s.current;
-        return r ? r.state : void 0;
+        const c = t.current;
+        return c ? c.state : void 0;
       }
     }),
     []
   );
-  return s.current = m, {
-    externalStore: I,
-    instance: s,
-    usedKeys: d,
-    usedClassPropKeys: t,
-    rid: f.current
+  return t.current = x, {
+    externalStore: B,
+    instance: t,
+    usedKeys: f,
+    usedClassPropKeys: r,
+    rid: m.current
   };
 }
 export {
-  K as useBloc,
-  M as useExternalBlocStore
+  P as useBloc,
+  P as useBlocNext,
+  K as useExternalBlocStore
 };
 //# sourceMappingURL=index.es.js.map

package/dist/index.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.es.js","sources":["../src/useBloc.ts","../src/useExternalBlocStore.ts"],"sourcesContent":["import {\n  AdapterOptions,\n  BlacAdapter,\n  BlocBase,\n  BlocConstructor,\n  BlocState,\n} from '@blac/core';\nimport { useEffect, useMemo, useRef, useSyncExternalStore } from 'react';\n\n/**\n * Type definition for the return type of the useBloc hook\n */\ntype HookTypes<B extends BlocConstructor<BlocBase<any>>> = [\n  BlocState<InstanceType<B>>,\n  InstanceType<B>,\n];\n\n/**\n * React hook for integrating with Blac state management\n */\nfunction useBloc<B extends BlocConstructor<BlocBase<any>>>(\n  blocConstructor: B,\n  options?: AdapterOptions<InstanceType<B>>,\n): HookTypes<B> {\n  // Create a unique identifier for this hook instance\n  const renderCount = useRef(0);\n  renderCount.current++;\n\n  const componentRef = useRef<object>({});\n\n  // Track adapter creation\n  const adapter = useMemo(() => {\n    const newAdapter = new BlacAdapter<B>(\n      {\n        componentRef: componentRef,\n        blocConstructor,\n      },\n      options,\n    );\n    return newAdapter;\n  }, []);\n\n  // Reset tracking at the start of each render to ensure we only track\n  // properties accessed during the current render\n  adapter.resetConsumerTracking();\n\n  // Track options changes\n  const optionsChangeCount = useRef(0);\n  useEffect(() => {\n    optionsChangeCount.current++;\n    adapter.options = options;\n  }, [options]);\n\n  // Register as consumer and handle lifecycle\n  const mountEffectCount = useRef(0);\n  useEffect(() => {\n    mountEffectCount.current++;\n    adapter.mount();\n\n    return () => {\n      adapter.unmount();\n    };\n  }, [adapter.blocInstance]);\n\n  // Subscribe to state changes using useSyncExternalStore\n  const subscribeMemoCount = useRef(0);\n  const subscribe = useMemo(() => {\n    subscribeMemoCount.current++;\n    let subscriptionCount = 0;\n\n    return (onStoreChange: () => void) => {\n      subscriptionCount++;\n      const unsubscribe = adapter.createSubscription({\n        onChange: () => {\n          onStoreChange();\n        },\n      });\n\n      return () => {\n        unsubscribe();\n      };\n    };\n  }, [adapter.blocInstance]);\n\n  const snapshotCount = useRef(0);\n  const serverSnapshotCount = useRef(0);\n\n  const rawState: BlocState<InstanceType<B>> = useSyncExternalStore(\n    subscribe,\n    // Get snapshot\n    () => {\n      snapshotCount.current++;\n      const bloc = adapter.blocInstance;\n      const state = bloc.state;\n      return state;\n    },\n    // Get server snapshot (same as client for now)\n    () => {\n      const bloc = adapter.blocInstance;\n      serverSnapshotCount.current++;\n      const state = bloc.state;\n      return state;\n    },\n  );\n\n  // Create proxies for fine-grained tracking (if enabled)\n  const stateMemoCount = useRef(0);\n  const finalState = useMemo(() => {\n    stateMemoCount.current++;\n    const proxyState = adapter.getProxyState(rawState);\n    return proxyState;\n  }, [rawState]);\n\n  const blocMemoCount = useRef(0);\n  const finalBloc = useMemo(() => {\n    blocMemoCount.current++;\n    const proxyBloc = adapter.getProxyBlocInstance();\n    return proxyBloc;\n  }, [adapter.blocInstance]);\n\n  // Mark consumer as rendered after each render\n  useEffect(() => {\n    adapter.updateLastNotified(componentRef.current);\n  });\n\n  // Log final hook return\n  return [finalState, finalBloc];\n}\n\nexport default useBloc;\n","import {\n  Blac,\n  BlocBase,\n  BlocConstructor,\n  BlocState,\n  InferPropsFromGeneric,\n  generateUUID,\n} from '@blac/core';\nimport { useCallback, useMemo, useRef } from 'react';\n\ninterface ExternalStoreOptions<B extends BlocBase<any>> {\n  id?: string;\n  props?: InferPropsFromGeneric<B>;\n  selector?: (\n    currentState: BlocState<B>,\n    previousState: BlocState<B>,\n    instance: B,\n  ) => any[];\n}\n\ninterface ExternalStore<T> {\n  getSnapshot: () => T | undefined;\n  subscribe: (listener: () => void) => () => void;\n  getServerSnapshot?: () => T | undefined;\n}\n\ninterface ExternalBlocStoreResult<B extends BlocBase<any>> {\n  externalStore: ExternalStore<BlocState<B>>;\n  instance: { current: B | null };\n  usedKeys: { current: Set<string> };\n  usedClassPropKeys: { current: Set<string> };\n  rid: string;\n}\n\n/**\n * Hook for using an external bloc store\n * Provides low-level access to bloc instances for use with React's useSyncExternalStore\n */\nexport default function useExternalBlocStore<\n  B extends BlocConstructor<BlocBase<any>>,\n>(\n  blocConstructor: B,\n  options: ExternalStoreOptions<InstanceType<B>> = {},\n): ExternalBlocStoreResult<InstanceType<B>> {\n  const ridRef = useRef<string>(`external-${generateUUID()}`);\n  const usedKeysRef = useRef<Set<string>>(new Set());\n  const usedClassPropKeysRef = useRef<Set<string>>(new Set());\n  const instanceRef = useRef<InstanceType<B> | null>(null);\n\n  // Get or create bloc instance\n  const bloc = useMemo(() => {\n    const blac = Blac.getInstance();\n    const base = blocConstructor as unknown as BlocBase<any>;\n\n    // For isolated blocs, always create a new instance\n    if (\n      (base.constructor as any).isolated ||\n      (blocConstructor as any).isolated\n    ) {\n      const newBloc = new blocConstructor(options?.props) as InstanceType<B>;\n      const uniqueId =\n        options?.id || `${blocConstructor.name}_${generateUUID()}`;\n      newBloc._updateId(uniqueId);\n      blac.activateBloc(newBloc);\n      return newBloc;\n    }\n\n    // For shared blocs, use the existing getBloc logic\n    return blac.getBloc(blocConstructor, {\n      id: options?.id,\n      props: options?.props,\n    });\n  }, [blocConstructor, options?.id]);\n\n  // Create external store interface\n  const externalStore = useMemo<ExternalStore<BlocState<InstanceType<B>>>>(\n    () => ({\n      getSnapshot: () => {\n        const currentInstance = instanceRef.current;\n        return currentInstance ? currentInstance.state : undefined;\n      },\n      subscribe: (listener: () => void) => {\n        const currentInstance = instanceRef.current;\n        if (!currentInstance) {\n          // Return no-op unsubscribe if no instance\n          return () => {};\n        }\n\n        // Wrap listener to handle errors gracefully\n        const safeListener = (\n          newState: BlocState<InstanceType<B>>,\n          oldState: BlocState<InstanceType<B>>,\n        ) => {\n          try {\n            // Reset tracking keys on each listener call\n            usedKeysRef.current.clear();\n            usedClassPropKeysRef.current.clear();\n\n            // Call selector if provided\n            if (options.selector && currentInstance) {\n              options.selector(newState, oldState, currentInstance);\n            }\n\n            // Call listener with state if it expects it\n            if (listener.length > 0) {\n              (listener as any)(newState);\n            } else {\n              listener();\n            }\n          } catch (error) {\n            console.error('Listener error in useExternalBlocStore:', error);\n            // Don't rethrow to prevent breaking other listeners\n          }\n        };\n\n        const unsubscribe = currentInstance._observer.subscribe({\n          id: ridRef.current,\n          fn: safeListener,\n        });\n        return unsubscribe;\n      },\n      getServerSnapshot: () => {\n        const currentInstance = instanceRef.current;\n        return currentInstance ? currentInstance.state : undefined;\n      },\n    }),\n    [],\n  );\n\n  // Update instance ref\n  instanceRef.current = bloc;\n\n  return {\n    externalStore,\n    instance: instanceRef,\n    usedKeys: usedKeysRef,\n    usedClassPropKeys: usedClassPropKeysRef,\n    rid: ridRef.current,\n  };\n}\n"],"names":["useBloc","blocConstructor","options","renderCount","useRef","componentRef","adapter","useMemo","BlacAdapter","optionsChangeCount","useEffect","mountEffectCount","subscribeMemoCount","subscribe","onStoreChange","unsubscribe","snapshotCount","serverSnapshotCount","rawState","useSyncExternalStore","bloc","stateMemoCount","finalState","blocMemoCount","finalBloc","useExternalBlocStore","ridRef","generateUUID","usedKeysRef","usedClassPropKeysRef","instanceRef","blac","Blac","newBloc","uniqueId","externalStore","currentInstance","listener","safeListener","newState","oldState","error"],"mappings":"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"}
+{"version":3,"file":"index.es.js","sources":["../src/useBloc.ts","../src/useExternalBlocStore.ts"],"sourcesContent":["import {\n  AdapterOptions,\n  BlacAdapter,\n  BlocBase,\n  BlocConstructor,\n  BlocState,\n} from '@blac/core';\nimport { useEffect, useMemo, useRef, useSyncExternalStore } from 'react';\n\n/**\n * Type definition for the return type of the useBloc hook\n */\ntype HookTypes<B extends BlocConstructor<BlocBase<any>>> = [\n  BlocState<InstanceType<B>>,\n  InstanceType<B>,\n];\n\n/**\n * React hook for integrating with Blac state management\n */\nfunction useBloc<B extends BlocConstructor<BlocBase<any>>>(\n  blocConstructor: B,\n  options?: {\n    props?: ConstructorParameters<B>[0];\n    id?: string;\n    dependencies?: (bloc: InstanceType<B>) => unknown[];\n    onMount?: (bloc: InstanceType<B>) => void;\n    onUnmount?: (bloc: InstanceType<B>) => void;\n  },\n): HookTypes<B> {\n  // Create a unique identifier for this hook instance\n  const renderCount = useRef(0);\n  renderCount.current++;\n\n  const componentRef = useRef<object>({});\n\n  // Track adapter creation\n  const adapter = useMemo(() => {\n    const newAdapter = new BlacAdapter<B>(\n      {\n        componentRef: componentRef,\n        blocConstructor,\n      },\n      {\n        id: options?.id,\n        dependencies: options?.dependencies,\n        props: options?.props,\n        onMount: options?.onMount,\n        onUnmount: options?.onUnmount,\n      },\n    );\n    return newAdapter;\n  }, []);\n\n  // Reset tracking at the start of each render to ensure we only track\n  // properties accessed during the current render\n  adapter.resetConsumerTracking();\n\n  // Track options changes and update props\n  const optionsChangeCount = useRef(0);\n  useEffect(() => {\n    optionsChangeCount.current++;\n    adapter.options = {\n      id: options?.id,\n      dependencies: options?.dependencies,\n      props: options?.props,\n      onMount: options?.onMount,\n      onUnmount: options?.onUnmount,\n    };\n\n    if (options?.props !== undefined) {\n      adapter.updateProps(options.props);\n    }\n  }, [options?.props, options?.id, options?.dependencies, options?.onMount, options?.onUnmount]);\n\n  // Register as consumer and handle lifecycle\n  const mountEffectCount = useRef(0);\n  useEffect(() => {\n    mountEffectCount.current++;\n    adapter.mount();\n\n    return () => {\n      adapter.unmount();\n    };\n  }, [adapter.blocInstance]);\n\n  // Subscribe to state changes using useSyncExternalStore\n  const subscribeMemoCount = useRef(0);\n  const subscribe = useMemo(() => {\n    subscribeMemoCount.current++;\n    let subscriptionCount = 0;\n\n    return (onStoreChange: () => void) => {\n      subscriptionCount++;\n      const unsubscribe = adapter.createSubscription({\n        onChange: () => {\n          onStoreChange();\n        },\n      });\n\n      return () => {\n        unsubscribe();\n      };\n    };\n  }, [adapter.blocInstance]);\n\n  const snapshotCount = useRef(0);\n  const serverSnapshotCount = useRef(0);\n\n  const rawState: BlocState<InstanceType<B>> = useSyncExternalStore(\n    subscribe,\n    // Get snapshot\n    () => {\n      snapshotCount.current++;\n      const bloc = adapter.blocInstance;\n      const state = bloc.state;\n      return state;\n    },\n    // Get server snapshot (same as client for now)\n    () => {\n      const bloc = adapter.blocInstance;\n      serverSnapshotCount.current++;\n      const state = bloc.state;\n      return state;\n    },\n  );\n\n  // Create proxies for fine-grained tracking (if enabled)\n  const stateMemoCount = useRef(0);\n  const finalState = useMemo(() => {\n    stateMemoCount.current++;\n    const proxyState = adapter.getProxyState(rawState);\n    return proxyState;\n  }, [rawState]);\n\n  const blocMemoCount = useRef(0);\n  const finalBloc = useMemo(() => {\n    blocMemoCount.current++;\n    const proxyBloc = adapter.getProxyBlocInstance();\n    return proxyBloc;\n  }, [adapter.blocInstance]);\n\n  // Mark consumer as rendered after each render\n  useEffect(() => {\n    adapter.updateLastNotified(componentRef.current);\n  });\n\n  // Log final hook return\n  return [finalState, finalBloc];\n}\n\nexport default useBloc;\n","import {\n  Blac,\n  BlocBase,\n  BlocConstructor,\n  BlocState,\n  InferPropsFromGeneric,\n  generateUUID,\n} from '@blac/core';\nimport { useCallback, useMemo, useRef } from 'react';\n\ninterface ExternalStoreOptions<B extends BlocBase<any>> {\n  id?: string;\n  props?: InferPropsFromGeneric<B>;\n  selector?: (\n    currentState: BlocState<B>,\n    previousState: BlocState<B>,\n    instance: B,\n  ) => any[];\n}\n\ninterface ExternalStore<T> {\n  getSnapshot: () => T | undefined;\n  subscribe: (listener: () => void) => () => void;\n  getServerSnapshot?: () => T | undefined;\n}\n\ninterface ExternalBlocStoreResult<B extends BlocBase<any>> {\n  externalStore: ExternalStore<BlocState<B>>;\n  instance: { current: B | null };\n  usedKeys: { current: Set<string> };\n  usedClassPropKeys: { current: Set<string> };\n  rid: string;\n}\n\n/**\n * Hook for using an external bloc store\n * Provides low-level access to bloc instances for use with React's useSyncExternalStore\n */\nexport default function useExternalBlocStore<\n  B extends BlocConstructor<BlocBase<any>>,\n>(\n  blocConstructor: B,\n  options: ExternalStoreOptions<InstanceType<B>> = {},\n): ExternalBlocStoreResult<InstanceType<B>> {\n  const ridRef = useRef<string>(`external-${generateUUID()}`);\n  const usedKeysRef = useRef<Set<string>>(new Set());\n  const usedClassPropKeysRef = useRef<Set<string>>(new Set());\n  const instanceRef = useRef<InstanceType<B> | null>(null);\n\n  // Get or create bloc instance\n  const bloc = useMemo(() => {\n    const blac = Blac.getInstance();\n    const base = blocConstructor as unknown as BlocBase<any>;\n\n    // For isolated blocs, always create a new instance\n    if (\n      (base.constructor as any).isolated ||\n      (blocConstructor as any).isolated\n    ) {\n      const newBloc = new blocConstructor(options?.props) as InstanceType<B>;\n      const uniqueId =\n        options?.id || `${blocConstructor.name}_${generateUUID()}`;\n      newBloc._updateId(uniqueId);\n      blac.activateBloc(newBloc);\n      return newBloc;\n    }\n\n    // For shared blocs, use the existing getBloc logic\n    return blac.getBloc(blocConstructor, {\n      id: options?.id,\n      props: options?.props,\n    });\n  }, [blocConstructor, options?.id]);\n\n  // Create external store interface\n  const externalStore = useMemo<ExternalStore<BlocState<InstanceType<B>>>>(\n    () => ({\n      getSnapshot: () => {\n        const currentInstance = instanceRef.current;\n        return currentInstance ? currentInstance.state : undefined;\n      },\n      subscribe: (listener: () => void) => {\n        const currentInstance = instanceRef.current;\n        if (!currentInstance) {\n          // Return no-op unsubscribe if no instance\n          return () => {};\n        }\n\n        // Wrap listener to handle errors gracefully\n        const safeListener = (\n          newState: BlocState<InstanceType<B>>,\n          oldState: BlocState<InstanceType<B>>,\n        ) => {\n          try {\n            // Reset tracking keys on each listener call\n            usedKeysRef.current.clear();\n            usedClassPropKeysRef.current.clear();\n\n            // Call selector if provided\n            if (options.selector && currentInstance) {\n              options.selector(newState, oldState, currentInstance);\n            }\n\n            // Call listener with state if it expects it\n            if (listener.length > 0) {\n              (listener as any)(newState);\n            } else {\n              listener();\n            }\n          } catch (error) {\n            console.error('Listener error in useExternalBlocStore:', error);\n            // Don't rethrow to prevent breaking other listeners\n          }\n        };\n\n        const unsubscribe = currentInstance._observer.subscribe({\n          id: ridRef.current,\n          fn: safeListener,\n        });\n        return unsubscribe;\n      },\n      getServerSnapshot: () => {\n        const currentInstance = instanceRef.current;\n        return currentInstance ? currentInstance.state : undefined;\n      },\n    }),\n    [],\n  );\n\n  // Update instance ref\n  instanceRef.current = bloc;\n\n  return {\n    externalStore,\n    instance: instanceRef,\n    usedKeys: usedKeysRef,\n    usedClassPropKeys: usedClassPropKeysRef,\n    rid: ridRef.current,\n  };\n}\n"],"names":["useBloc","blocConstructor","options","renderCount","useRef","componentRef","adapter","useMemo","BlacAdapter","optionsChangeCount","useEffect","mountEffectCount","subscribeMemoCount","subscribe","onStoreChange","unsubscribe","snapshotCount","serverSnapshotCount","rawState","useSyncExternalStore","bloc","stateMemoCount","finalState","blocMemoCount","finalBloc","useExternalBlocStore","ridRef","generateUUID","usedKeysRef","usedClassPropKeysRef","instanceRef","blac","Blac","newBloc","uniqueId","externalStore","currentInstance","listener","safeListener","newState","oldState","error"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blac/react",
-  "version": "2.0.0-rc-10",
+  "version": "2.0.0-rn-12",
   "license": "MIT",
   "author": "Brendan Mullins <jsnanigans@gmail.com>",
   "main": "dist/index.cjs.js",
@@ -30,7 +30,7 @@
     "@types/react-dom": "^18.0.0 || ^19.0.0",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0",
-    "@blac/core": "2.0.0-rc-10"
+    "@blac/core": "2.0.0-rn-12"
   },
   "peerDependenciesMeta": {
     "@types/react": {

package/src/__tests__/useBloc.props.test.tsx

@@ -0,0 +1,413 @@
+import { Blac, Bloc, Cubit, PropsUpdated } from '@blac/core';
+import { act, renderHook, waitFor } from '@testing-library/react';
+import React from 'react';
+import { describe, expect, it, vi, beforeEach } from 'vitest';
+import useBloc from '../useBloc';
+
+// Test components
+interface SearchProps {
+  query: string;
+  limit?: number;
+}
+
+interface SearchState {
+  results: string[];
+  loading: boolean;
+}
+
+class SearchBloc extends Bloc<SearchState, PropsUpdated<SearchProps>> {
+  constructor(private config: { apiEndpoint: string }) {
+    super({ results: [], loading: false });
+
+    this.on(PropsUpdated<SearchProps>, (event, emit) => {
+      emit({ results: [`Search: ${event.props.query}`], loading: false });
+    });
+  }
+}
+
+interface CounterProps {
+  step: number;
+}
+
+interface CounterState {
+  count: number;
+  stepSize: number;
+}
+
+class CounterCubit extends Cubit<CounterState, CounterProps> {
+  constructor() {
+    super({ count: 0, stepSize: 1 });
+  }
+
+  protected onPropsChanged(oldProps: CounterProps | undefined, newProps: CounterProps): void {
+    if (oldProps?.step !== newProps.step) {
+      this.emit({ ...this.state, stepSize: newProps.step });
+    }
+  }
+
+  increment = () => {
+    const step = this.props?.step ?? 1;
+    this.emit({ ...this.state, count: this.state.count + step, stepSize: step });
+  };
+}
+
+describe('useBloc props integration', () => {
+  beforeEach(() => {
+    Blac.resetInstance();
+  });
+
+  describe('Basic props functionality', () => {
+    it('should pass props to Bloc via adapter', async () => {
+      const { result } = renderHook(
+        ({ query }) => useBloc(
+          SearchBloc,
+          { props: { apiEndpoint: '/api/search', query } }
+        ),
+        { initialProps: { query: 'initial' } }
+      );
+
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      const [state] = result.current;
+      expect(state.results).toEqual(['Search: initial']);
+    });
+
+    it('should update props when they change', async () => {
+      const { result, rerender } = renderHook(
+        ({ query }) => useBloc(
+          SearchBloc,
+          { props: { apiEndpoint: '/api/search', query } }
+        ),
+        { initialProps: { query: 'initial' } }
+      );
+
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      expect(result.current[0].results).toEqual(['Search: initial']);
+
+      rerender({ query: 'updated' });
+
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      expect(result.current[0].results).toEqual(['Search: updated']);
+    });
+
+    it('should work with Cubit props', async () => {
+      const { result } = renderHook(
+        ({ step }) => {
+          const [state, cubit] = useBloc(
+            CounterCubit,
+            { props: { step } }
+          );
+          // Access count to ensure it's tracked
+          void state.count;
+          return [state, cubit];
+        },
+        { initialProps: { step: 1 } }
+      );
+
+      // Wait for props to be set
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      const [state, cubit] = result.current;
+      expect(state.stepSize).toBe(1);
+
+      act(() => {
+        cubit.increment();
+      });
+
+      // Wait for React to re-render with new state
+      await waitFor(() => {
+        expect(result.current[0].count).toBe(1);
+      });
+    });
+
+    it('should update Cubit props reactively', async () => {
+      const { result, rerender } = renderHook(
+        ({ step }) => {
+          const [state, cubit] = useBloc(
+            CounterCubit,
+            { props: { step } }
+          );
+          // Access count to ensure it's tracked
+          void state.count;
+          return [state, cubit];
+        },
+        { initialProps: { step: 1 } }
+      );
+
+      // Wait for initial props to be set
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      expect(result.current[0].stepSize).toBe(1);
+
+      rerender({ step: 5 });
+
+      // Wait for props update
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      expect(result.current[0].stepSize).toBe(5);
+
+      act(() => {
+        result.current[1].increment();
+      });
+
+      // Wait for React to re-render with new state
+      await waitFor(() => {
+        expect(result.current[0].count).toBe(5);
+      });
+    });
+  });
+
+  describe('Props ownership', () => {
+    it('should enforce single owner for props', async () => {
+      const warnSpy = vi.spyOn(Blac, 'warn').mockImplementation(() => {});
+
+      // First hook owns props
+      const { result: result1 } = renderHook(() =>
+        useBloc(
+          SearchBloc,
+          { props: { apiEndpoint: '/api/search', query: 'owner' } }
+        )
+      );
+
+      // Second hook cannot override props
+      const { result: result2 } = renderHook(() =>
+        useBloc(
+          SearchBloc,
+          { props: { apiEndpoint: '/api/search', query: 'hijacker' } }
+        )
+      );
+
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      expect(warnSpy).toHaveBeenCalledWith(
+        expect.stringContaining('non-owner adapter')
+      );
+
+      // Both should see the owner's state
+      expect(result1.current[0].results).toEqual(['Search: owner']);
+      expect(result2.current[0].results).toEqual(['Search: owner']);
+
+      warnSpy.mockRestore();
+    });
+
+    it('should allow read-only consumers without props', async () => {
+      // Owner with props
+      const { result: ownerResult } = renderHook(() =>
+        useBloc(
+          SearchBloc,
+          { props: { apiEndpoint: '/api/search', query: 'test' } }
+        )
+      );
+
+      // Read-only consumer without props
+      const { result: readerResult } = renderHook(() =>
+        useBloc(SearchBloc, { props: { apiEndpoint: '/api/search' } })
+      );
+
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      // Both see the same state (but different object references due to proxy)
+      expect(ownerResult.current[0]).toEqual(readerResult.current[0]);
+      expect(readerResult.current[0].results).toEqual(['Search: test']);
+    });
+
+    it('should transfer ownership when owner unmounts', async () => {
+      const { result: result1, unmount: unmount1 } = renderHook(() =>
+        useBloc(
+          SearchBloc,
+          { props: { apiEndpoint: '/api/search', query: 'first' } }
+        )
+      );
+
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      expect(result1.current[0].results).toEqual(['Search: first']);
+
+      // Unmount first owner
+      unmount1();
+
+      // New owner can take over
+      const { result: result2 } = renderHook(() =>
+        useBloc(
+          SearchBloc,
+          { props: { apiEndpoint: '/api/search', query: 'second' } }
+        )
+      );
+
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      expect(result2.current[0].results).toEqual(['Search: second']);
+    });
+  });
+
+  describe('Props with other options', () => {
+    it('should work with key option', async () => {
+      const { result } = renderHook(() =>
+        useBloc(
+          SearchBloc,
+          {
+            id: 'custom-search',
+            props: { apiEndpoint: '/api/search', query: 'test' }
+          }
+        )
+      );
+
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      expect(result.current[0].results).toEqual(['Search: test']);
+      expect(result.current[1]._id).toBe('custom-search');
+    });
+
+    it('should work with lifecycle hooks', async () => {
+      const onMount = vi.fn();
+      const onUnmount = vi.fn();
+
+      const { result, unmount } = renderHook(() =>
+        useBloc(
+          SearchBloc,
+          {
+            props: { apiEndpoint: '/api/search', query: 'test' },
+            onMount,
+            onUnmount
+          }
+        )
+      );
+
+      expect(onMount).toHaveBeenCalledWith(result.current[1]);
+
+      unmount();
+
+      expect(onUnmount).toHaveBeenCalledWith(result.current[1]);
+    });
+
+    it('should work with manual dependencies', () => {
+      const { result, rerender } = renderHook(
+        ({ step }) => useBloc(
+          CounterCubit,
+          {
+            props: { step },
+            dependencies: (cubit) => [cubit.state.count]
+          }
+        ),
+        { initialProps: { step: 1 } }
+      );
+
+      const [, cubit] = result.current;
+
+      // Increment should trigger re-render (count is a dependency)
+      act(() => {
+        cubit.increment();
+      });
+
+      expect(result.current[0].count).toBe(1);
+
+      // Changing props should also work
+      rerender({ step: 2 });
+      expect(result.current[0].stepSize).toBe(2);
+    });
+  });
+
+  describe('Edge cases', () => {
+    it('should handle undefined props', async () => {
+      const { result } = renderHook(() => {
+        const [state, cubit] = useBloc(
+          CounterCubit,
+          { props: undefined }
+        );
+        // Access count to ensure it's tracked
+        void state.count;
+        return [state, cubit];
+      });
+
+      // Wait for any effects
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      const [state, cubit] = result.current;
+      expect(state.stepSize).toBe(1);
+
+      act(() => {
+        cubit.increment();
+      });
+
+      // Wait for React to re-render with new state
+      await waitFor(() => {
+        expect(result.current[0].count).toBe(1); // Uses default step
+      });
+    });
+
+    it('should not re-render for unchanged props', () => {
+      let renderCount = 0;
+
+      const { rerender } = renderHook(
+        ({ query }) => {
+          renderCount++;
+          return useBloc(
+            SearchBloc,
+            { props: { apiEndpoint: '/api/search', query } }
+          );
+        },
+        { initialProps: { query: 'test' } }
+      );
+
+      const initialRenderCount = renderCount;
+
+      // Rerender with same props
+      rerender({ query: 'test' });
+
+      // Should not cause additional renders beyond React's normal behavior
+      expect(renderCount).toBe(initialRenderCount + 1);
+    });
+
+    it('should handle rapid props updates', async () => {
+      const { result, rerender } = renderHook(
+        ({ query }) => useBloc(
+          SearchBloc,
+          { props: { apiEndpoint: '/api/search', query } }
+        ),
+        { initialProps: { query: 'initial' } }
+      );
+
+      // Wait for initial render
+      await act(async () => {
+        await new Promise(resolve => setTimeout(resolve, 0));
+      });
+
+      // Rapid updates
+      await act(async () => {
+        rerender({ query: 'update1' });
+        rerender({ query: 'update2' });
+        rerender({ query: 'update3' });
+        await new Promise(resolve => setTimeout(resolve, 50));
+      });
+
+      // Should have the latest value
+      expect(result.current[0].results).toEqual(['Search: update3']);
+    });
+  });
+});

package/src/__tests__/useBloc.proxyConfig.test.tsx

@@ -0,0 +1,228 @@
+import { Blac, Cubit } from '@blac/core';
+import { renderHook, act } from '@testing-library/react';
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import useBloc from '../useBloc';
+
+interface TestState {
+  count: number;
+  nested: {
+    value: string;
+  };
+}
+
+class TestCubit extends Cubit<TestState> {
+  constructor() {
+    super({ count: 0, nested: { value: 'initial' } });
+  }
+
+  increment = () => {
+    this.emit({ ...this.state, count: this.state.count + 1 });
+  };
+
+  updateNested = () => {
+    this.emit({ ...this.state, nested: { value: 'updated' } });
+  };
+}
+
+describe('useBloc with proxy tracking config', () => {
+  const originalConfig = { ...Blac.config };
+
+  beforeEach(() => {
+    Blac.resetInstance();
+  });
+
+  afterEach(() => {
+    Blac.setConfig(originalConfig);
+    Blac.resetInstance();
+  });
+
+  describe('when proxyDependencyTracking is enabled (default)', () => {
+    beforeEach(() => {
+      Blac.setConfig({ proxyDependencyTracking: true });
+    });
+
+    it('should only re-render when accessed properties change', () => {
+      const { result } = renderHook(() => useBloc(TestCubit));
+      const renderSpy = vi.fn();
+
+      // Access only count in render
+      renderHook(() => {
+        const [state] = useBloc(TestCubit);
+        renderSpy(state.count);
+        return state.count;
+      });
+
+      expect(renderSpy).toHaveBeenCalledTimes(1);
+      expect(renderSpy).toHaveBeenCalledWith(0);
+
+      // Update nested value (not accessed)
+      act(() => {
+        result.current[1].updateNested();
+      });
+
+      // Should not re-render since nested.value wasn't accessed
+      expect(renderSpy).toHaveBeenCalledTimes(1);
+
+      // Update count (accessed property)
+      act(() => {
+        result.current[1].increment();
+      });
+
+      // Should re-render since count was accessed
+      expect(renderSpy).toHaveBeenCalledTimes(2);
+      expect(renderSpy).toHaveBeenLastCalledWith(1);
+    });
+  });
+
+  describe('when proxyDependencyTracking is disabled', () => {
+    beforeEach(() => {
+      Blac.setConfig({ proxyDependencyTracking: false });
+    });
+
+    it('should re-render on any state change', () => {
+      const { result } = renderHook(() => useBloc(TestCubit));
+      const renderSpy = vi.fn();
+
+      // Access only count in render
+      renderHook(() => {
+        const [state] = useBloc(TestCubit);
+        renderSpy(state.count);
+        return state.count;
+      });
+
+      expect(renderSpy).toHaveBeenCalledTimes(1);
+      expect(renderSpy).toHaveBeenCalledWith(0);
+
+      // Update nested value (not accessed)
+      act(() => {
+        result.current[1].updateNested();
+      });
+
+      // Should re-render even though nested.value wasn't accessed
+      expect(renderSpy).toHaveBeenCalledTimes(2);
+      expect(renderSpy).toHaveBeenLastCalledWith(0); // count didn't change
+
+      // Update count
+      act(() => {
+        result.current[1].increment();
+      });
+
+      // Should re-render
+      expect(renderSpy).toHaveBeenCalledTimes(3);
+      expect(renderSpy).toHaveBeenLastCalledWith(1);
+    });
+
+    it('should still respect manual dependencies when provided', () => {
+      const renderSpy = vi.fn();
+
+      const { result } = renderHook(() => 
+        useBloc(TestCubit, {
+          dependencies: (bloc) => [bloc.state.count]
+        })
+      );
+
+      // Create another hook that tracks renders
+      renderHook(() => {
+        const [state] = useBloc(TestCubit, {
+          dependencies: (bloc) => [bloc.state.count]
+        });
+        renderSpy(state);
+        return state;
+      });
+
+      expect(renderSpy).toHaveBeenCalledTimes(1);
+
+      // Update nested value
+      act(() => {
+        result.current[1].updateNested();
+      });
+
+      // Should not re-render since dependencies only include count
+      expect(renderSpy).toHaveBeenCalledTimes(1);
+
+      // Update count
+      act(() => {
+        result.current[1].increment();
+      });
+
+      // Should re-render since count is in dependencies
+      expect(renderSpy).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  describe('runtime config changes', () => {
+    it('should respect config changes for new hooks', () => {
+      // Start with proxy tracking enabled
+      Blac.setConfig({ proxyDependencyTracking: true });
+
+      // Create a new cubit instance for this test to avoid interference
+      class TestCubit2 extends Cubit<TestState> {
+        constructor() {
+          super({ count: 0, nested: { value: 'initial' } });
+        }
+
+        increment = () => {
+          this.emit({ ...this.state, count: this.state.count + 1 });
+        };
+
+        updateNested = () => {
+          this.emit({ ...this.state, nested: { value: 'updated' } });
+        };
+      }
+
+      const renderSpy1 = vi.fn();
+
+      const { result: result1 } = renderHook(() => {
+        const [state, bloc] = useBloc(TestCubit2);
+        renderSpy1(state.count);
+        return [state, bloc] as const;
+      });
+
+      expect(renderSpy1).toHaveBeenCalledTimes(1);
+
+      // Update nested value
+      act(() => {
+        result1.current[1].updateNested();
+      });
+
+      // Should not re-render since nested.value wasn't accessed (proxy tracking enabled)
+      expect(renderSpy1).toHaveBeenCalledTimes(1);
+
+      // Change config for future hooks
+      Blac.setConfig({ proxyDependencyTracking: false });
+
+      // Create new cubit class to ensure fresh instance
+      class TestCubit3 extends Cubit<TestState> {
+        constructor() {
+          super({ count: 0, nested: { value: 'initial' } });
+        }
+
+        increment = () => {
+          this.emit({ ...this.state, count: this.state.count + 1 });
+        };
+
+        updateNested = () => {
+          this.emit({ ...this.state, nested: { value: 'updated' } });
+        };
+      }
+
+      // Create new hook after config change
+      const renderSpy2 = vi.fn();
+      const { result: result2 } = renderHook(() => {
+        const [state, bloc] = useBloc(TestCubit3);
+        renderSpy2(state.count);
+        return [state, bloc] as const;
+      });
+
+      expect(renderSpy2).toHaveBeenCalledTimes(1);
+
+      // Update nested value on the new cubit
+      act(() => {
+        result2.current[1].updateNested();
+      });
+
+      // Should re-render even though nested.value wasn't accessed (proxy tracking disabled)
+      expect(renderSpy2).toHaveBeenCalledTimes(2);
+    });
+  });
+});

package/src/index.ts

@@ -1,2 +1,3 @@
 export { default as useBloc } from './useBloc';
+export { default as useBlocNext } from './useBloc';
 export { default as useExternalBlocStore } from './useExternalBlocStore';

package/src/useBloc.ts

@@ -20,7 +20,13 @@ type HookTypes<B extends BlocConstructor<BlocBase<any>>> = [
  */
 function useBloc<B extends BlocConstructor<BlocBase<any>>>(
   blocConstructor: B,
-  options?: AdapterOptions<InstanceType<B>>,
+  options?: {
+    props?: ConstructorParameters<B>[0];
+    id?: string;
+    dependencies?: (bloc: InstanceType<B>) => unknown[];
+    onMount?: (bloc: InstanceType<B>) => void;
+    onUnmount?: (bloc: InstanceType<B>) => void;
+  },
 ): HookTypes<B> {
   // Create a unique identifier for this hook instance
   const renderCount = useRef(0);
@@ -35,7 +41,13 @@ function useBloc<B extends BlocConstructor<BlocBase<any>>>(
         componentRef: componentRef,
         blocConstructor,
       },
-      options,
+      {
+        id: options?.id,
+        dependencies: options?.dependencies,
+        props: options?.props,
+        onMount: options?.onMount,
+        onUnmount: options?.onUnmount,
+      },
     );
     return newAdapter;
   }, []);
@@ -44,12 +56,22 @@ function useBloc<B extends BlocConstructor<BlocBase<any>>>(
   // properties accessed during the current render
   adapter.resetConsumerTracking();
 
-  // Track options changes
+  // Track options changes and update props
   const optionsChangeCount = useRef(0);
   useEffect(() => {
     optionsChangeCount.current++;
-    adapter.options = options;
-  }, [options]);
+    adapter.options = {
+      id: options?.id,
+      dependencies: options?.dependencies,
+      props: options?.props,
+      onMount: options?.onMount,
+      onUnmount: options?.onUnmount,
+    };
+
+    if (options?.props !== undefined) {
+      adapter.updateProps(options.props);
+    }
+  }, [options?.props, options?.id, options?.dependencies, options?.onMount, options?.onUnmount]);
 
   // Register as consumer and handle lifecycle
   const mountEffectCount = useRef(0);