@blac/react 0.0.54 → 0.0.56

package/externalBlocStore.d.ts

@@ -5,5 +5,5 @@ export interface ExternalStore<B extends BlocGeneric<any, any>, S extends BlocSt
     getSnapshot: () => S;
     getServerSnapshot?: () => S;
 }
-declare const externalBlocStore: <B extends BlocGeneric<any, any>, S extends BlocState<B>>(bloc: B, dependencyArray: BlocHookDependencyArrayFn<InstanceType<any>>) => ExternalStore<B, S>;
+declare const externalBlocStore: <B extends BlocGeneric<any, any>, S extends BlocState<B>>(bloc: B, dependencyArray: BlocHookDependencyArrayFn<InstanceType<any>>, rid: string) => ExternalStore<B, S>;
 export default externalBlocStore;

package/index.cjs.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const B=require("blac"),r=require("react"),g=(t,s)=>({subscribe:i=>{const c=t.addSubscriber({fn:()=>{try{i(t.state)}catch(o){console.error({e:o,bloc:t,dependencyArray:s})}},dependencyArray:s});return()=>{c()}},getSnapshot:()=>t.state,getServerSnapshot:()=>t.state}),R=t=>[t];class j{static useBloc(s,i){let{dependencySelector:c,id:o,props:h}=i??{};const b=r.useId(),u=r.useRef(new Set),a=r.useRef(new Set),p=new Set,f=r.useRef(!1);s.isolated&&(o=b);const l=B.Blac.getInstance().getBloc(s,{id:o,props:h,reconnect:!1});if(!l)throw new Error(`useBloc: could not resolve: ${s.name||s}`);const I=(e,n)=>{if(c)return c(e,n);if(typeof e!="object")return R(e);const S=[];for(const y of u.current)y in e&&S.push(e[y]);return S},{subscribe:m,getSnapshot:v,getServerSnapshot:x}=r.useMemo(()=>g(l,I),[l.createdAt]),d=r.useSyncExternalStore(m,v,x),E=r.useMemo(()=>{try{if(typeof d=="object")return new Proxy(d,{get(e,n){return u.current.add(n),a.current.add(n),f.current=!0,Reflect.get(e,n)}})}catch(e){B.Blac.instance.log("useBloc Error",e)}return d},[d,u,a]);return r.useLayoutEffect(()=>(u.current=new Set(a.current),()=>{setTimeout(()=>{f.current&&(a.current.clear(),f.current=!1)})}),[p]),[E,l]}}const w=j.useBloc;exports.externalBlocStore=g;exports.useBloc=w;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=require("blac"),r=require("react"),h=(t,s,d)=>({subscribe:c=>{const o=t._observer.subscribe({fn:()=>{try{c(Object.freeze(t.state))}catch(f){console.error({e:f,bloc:t,dependencyArray:s})}},dependencyArray:s,id:d});return()=>{o()}},getSnapshot:()=>Object.freeze(t.state),getServerSnapshot:()=>Object.freeze(t.state)}),E=t=>[t];class O{static useBloc(s,d){let{dependencySelector:c,id:o,props:f}=d??{};const y=r.useId(),u=r.useRef(new Set),a=r.useRef(new Set),p=new Set,S=r.useRef(!1);s.isolated&&(o=y);const l=g.Blac.getInstance().getBloc(s,{id:o,props:f,reconnect:!1});if(!l)throw new Error(`useBloc: could not resolve: ${s.name||s}`);const j=(e,n)=>{if(c)return c(e,n);if(typeof e!="object")return E(e);const B=[];for(const b of u.current)b in e&&B.push(e[b]);return B},{subscribe:v,getSnapshot:I,getServerSnapshot:m}=r.useMemo(()=>h(l,j,y),[l._createdAt]),i=r.useSyncExternalStore(v,I,m),x=r.useMemo(()=>{try{if(typeof i=="object")return new Proxy(i,{get(e,n){return u.current.add(n),a.current.add(n),S.current=!0,Reflect.get(e,n)}})}catch(e){g.Blac.instance.log("useBloc Error",e)}return i},[i,u,a]);return r.useLayoutEffect(()=>(u.current=new Set(a.current),()=>{setTimeout(()=>{S.current&&(a.current.clear(),S.current=!1)})}),[p]),[x,l]}}const R=O.useBloc;exports.externalBlocStore=h;exports.useBloc=R;
 //# sourceMappingURL=index.cjs.js.map

package/index.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs.js","sources":["../src/externalBlocStore.ts","../src/useBloc.tsx"],"sourcesContent":["import { BlocGeneric, BlocHookDependencyArrayFn, BlocState } from 'blac';\n\nexport interface ExternalStore<\n  B extends BlocGeneric<any, any>,\n  S extends BlocState<B>,\n> {\n  subscribe: (onStoreChange: () => void) => () => void;\n  getSnapshot: () => S;\n  getServerSnapshot?: () => S;\n}\n\nconst externalBlocStore = <\n  B extends BlocGeneric<any, any>,\n  S extends BlocState<B>,\n>(\n  bloc: B,\n  dependencyArray: BlocHookDependencyArrayFn<InstanceType<any>>,\n): ExternalStore<B, S> => {\n  return {\n    subscribe: (listener: (state: S) => void) => {\n      const unSub = bloc.addSubscriber({\n        fn: () => {\n          try {\n            listener(bloc.state);\n          } catch (e) {\n            console.error({\n              e,\n              bloc,\n              dependencyArray,\n            });\n          }\n        },\n        dependencyArray,\n      });\n\n      return () => {\n        unSub();\n      };\n    },\n    getSnapshot: (): S => bloc.state,\n    getServerSnapshot: (): S => bloc.state,\n  };\n};\n\nexport default externalBlocStore;\n","import {\n  Blac,\n  BlocBase,\n  BlocConstructor,\n  BlocGeneric,\n  BlocHookDependencyArrayFn,\n  BlocState,\n  InferPropsFromGeneric,\n} from 'blac';\nimport {\n  useId,\n  useLayoutEffect,\n  useMemo,\n  useRef,\n  useSyncExternalStore,\n} from 'react';\nimport externalBlocStore from './externalBlocStore';\n\ntype HookTypes<B extends BlocConstructor<BlocGeneric>> = [\n  BlocState<InstanceType<B>>,\n  InstanceType<B>,\n];\n\nexport interface BlocHookOptions<B extends BlocGeneric<any, any>> {\n  id?: string;\n  dependencySelector?: BlocHookDependencyArrayFn<B>;\n  props?: InferPropsFromGeneric<B>;\n}\n\nconst defaultDependencySelector: BlocHookDependencyArrayFn<any> = (s) => [s];\n\nexport class UseBlocClass {\n  static useBloc<\n    B extends BlocConstructor<BlocGeneric>,\n    O extends BlocHookOptions<InstanceType<B>>,\n  >(bloc: B, options?: O): HookTypes<B> {\n    let { dependencySelector, id: blocId, props } = options ?? {};\n    const rid = useId();\n    const usedKeys = useRef<Set<string>>(new Set());\n    const instanceKeys = useRef<Set<string>>(new Set());\n    const renderInstance = new Set();\n    const shouldClear = useRef(false);\n\n    const base = bloc as unknown as BlocBase<B, O['props']>;\n    const isIsolated = base.isolated;\n    if (isIsolated) {\n      blocId = rid;\n    }\n\n    const resolvedBloc = Blac.getInstance().getBloc(bloc, {\n      id: blocId,\n      props: props as any,\n      reconnect: false,\n    }) as InstanceType<B>;\n\n    if (!resolvedBloc) {\n      throw new Error(`useBloc: could not resolve: ${bloc.name || bloc}`);\n    }\n\n    // default options\n    const dependencyArray: BlocHookDependencyArrayFn<InstanceType<B>> = (\n      newState,\n      oldState,\n    ) => {\n      if (dependencySelector) {\n        return dependencySelector(newState, oldState);\n      }\n      if (typeof newState !== 'object') {\n        return defaultDependencySelector(newState, oldState);\n      }\n\n      const used: string[] = [];\n      for (const key of usedKeys.current) {\n        if (key in newState) {\n          used.push(newState[key as keyof typeof newState]);\n        }\n      }\n\n      return used;\n    };\n\n    const { subscribe, getSnapshot, getServerSnapshot } = useMemo(\n      () => externalBlocStore(resolvedBloc, dependencyArray),\n      [resolvedBloc.createdAt],\n    );\n\n    const state = useSyncExternalStore<BlocState<InstanceType<B>>>(\n      subscribe,\n      getSnapshot,\n      getServerSnapshot,\n    );\n\n    const returnState: BlocState<InstanceType<B>> = useMemo(() => {\n      try {\n        if (typeof state === 'object') {\n          return new Proxy(state as any, {\n            get(target, prop) {\n              usedKeys.current.add(prop as string);\n              instanceKeys.current.add(prop as string);\n              shouldClear.current = true;\n              return Reflect.get(target, prop);\n            },\n          });\n        }\n      } catch (error) {\n        Blac.instance.log('useBloc Error', error);\n      }\n      return state;\n    }, [state, usedKeys, instanceKeys]);\n\n    useLayoutEffect(() => {\n      usedKeys.current = new Set(instanceKeys.current);\n\n      return () => {\n        setTimeout(() => {\n          if (shouldClear.current) {\n            instanceKeys.current.clear();\n            shouldClear.current = false;\n          }\n        });\n      };\n    }, [renderInstance]);\n\n    return [returnState, resolvedBloc];\n  }\n}\n\nconst useBloc = UseBlocClass.useBloc;\n\nexport default useBloc;\n"],"names":["externalBlocStore","bloc","dependencyArray","listener","unSub","e","defaultDependencySelector","s","UseBlocClass","options","dependencySelector","blocId","props","rid","useId","usedKeys","useRef","instanceKeys","renderInstance","shouldClear","resolvedBloc","Blac","newState","oldState","used","key","subscribe","getSnapshot","getServerSnapshot","useMemo","state","useSyncExternalStore","returnState","target","prop","error","useLayoutEffect","useBloc"],"mappings":"2HAWMA,EAAoB,CAIxBC,EACAC,KAEO,CACL,UAAYC,GAAiC,CACrC,MAAAC,EAAQH,EAAK,cAAc,CAC/B,GAAI,IAAM,CACJ,GAAA,CACFE,EAASF,EAAK,KAAK,QACZI,EAAG,CACV,QAAQ,MAAM,CACZ,EAAAA,EACA,KAAAJ,EACA,gBAAAC,CAAA,CACD,CACH,CACF,EACA,gBAAAA,CAAA,CACD,EAED,MAAO,IAAM,CACLE,GAAA,CAEV,EACA,YAAa,IAASH,EAAK,MAC3B,kBAAmB,IAASA,EAAK,KAAA,GCX/BK,EAA6DC,GAAM,CAACA,CAAC,EAEpE,MAAMC,CAAa,CACxB,OAAO,QAGLP,EAASQ,EAA2B,CACpC,GAAI,CAAE,mBAAAC,EAAoB,GAAIC,EAAQ,MAAAC,CAAM,EAAIH,GAAW,GAC3D,MAAMI,EAAMC,EAAAA,QACNC,EAAWC,EAAAA,OAAwB,IAAA,GAAK,EACxCC,EAAeD,EAAAA,OAAwB,IAAA,GAAK,EAC5CE,MAAqB,IACrBC,EAAcH,SAAO,EAAK,EAEnBf,EACW,WAEbU,EAAAE,GAGX,MAAMO,EAAeC,EAAA,KAAK,YAAY,EAAE,QAAQpB,EAAM,CACpD,GAAIU,EACJ,MAAAC,EACA,UAAW,EAAA,CACZ,EAED,GAAI,CAACQ,EACH,MAAM,IAAI,MAAM,+BAA+BnB,EAAK,MAAQA,CAAI,EAAE,EAI9D,MAAAC,EAA8D,CAClEoB,EACAC,IACG,CACH,GAAIb,EACK,OAAAA,EAAmBY,EAAUC,CAAQ,EAE1C,GAAA,OAAOD,GAAa,SACf,OAAAhB,EAA0BgB,CAAkB,EAGrD,MAAME,EAAiB,CAAA,EACZ,UAAAC,KAAOV,EAAS,QACrBU,KAAOH,GACJE,EAAA,KAAKF,EAASG,CAA4B,CAAC,EAI7C,OAAAD,CAAA,EAGH,CAAE,UAAAE,EAAW,YAAAC,EAAa,kBAAAC,CAAsB,EAAAC,EAAA,QACpD,IAAM7B,EAAkBoB,EAAclB,CAAe,EACrD,CAACkB,EAAa,SAAS,CAAA,EAGnBU,EAAQC,EAAA,qBACZL,EACAC,EACAC,CAAA,EAGII,EAA0CH,EAAAA,QAAQ,IAAM,CACxD,GAAA,CACE,GAAA,OAAOC,GAAU,SACZ,OAAA,IAAI,MAAMA,EAAc,CAC7B,IAAIG,EAAQC,EAAM,CACP,OAAAnB,EAAA,QAAQ,IAAImB,CAAc,EACtBjB,EAAA,QAAQ,IAAIiB,CAAc,EACvCf,EAAY,QAAU,GACf,QAAQ,IAAIc,EAAQC,CAAI,CACjC,CAAA,CACD,QAEIC,EAAO,CACTd,EAAAA,KAAA,SAAS,IAAI,gBAAiBc,CAAK,CAC1C,CACO,OAAAL,CACN,EAAA,CAACA,EAAOf,EAAUE,CAAY,CAAC,EAElCmB,OAAAA,EAAAA,gBAAgB,KACdrB,EAAS,QAAU,IAAI,IAAIE,EAAa,OAAO,EAExC,IAAM,CACX,WAAW,IAAM,CACXE,EAAY,UACdF,EAAa,QAAQ,QACrBE,EAAY,QAAU,GACxB,CACD,CAAA,GAEF,CAACD,CAAc,CAAC,EAEZ,CAACc,EAAaZ,CAAY,CACnC,CACF,CAEA,MAAMiB,EAAU7B,EAAa"}
+{"version":3,"file":"index.cjs.js","sources":["../src/externalBlocStore.ts","../src/useBloc.tsx"],"sourcesContent":["import { BlocGeneric, BlocHookDependencyArrayFn, BlocState } from 'blac';\n\nexport interface ExternalStore<\n  B extends BlocGeneric<any, any>,\n  S extends BlocState<B>,\n> {\n  subscribe: (onStoreChange: () => void) => () => void;\n  getSnapshot: () => S;\n  getServerSnapshot?: () => S;\n}\n\nconst externalBlocStore = <\n  B extends BlocGeneric<any, any>,\n  S extends BlocState<B>,\n>(\n  bloc: B,\n  dependencyArray: BlocHookDependencyArrayFn<InstanceType<any>>,\n  rid: string,\n): ExternalStore<B, S> => {\n  return {\n    subscribe: (listener: (state: S) => void) => {\n      const unSub = bloc._observer.subscribe({\n        fn: () => {\n          try {\n            listener(Object.freeze(bloc.state));\n          } catch (e) {\n            console.error({\n              e,\n              bloc,\n              dependencyArray,\n            });\n          }\n        },\n        dependencyArray,\n        id: rid,\n      });\n\n      return () => {\n        unSub();\n      };\n    },\n    getSnapshot: (): S => Object.freeze(bloc.state),\n    getServerSnapshot: (): S => Object.freeze(bloc.state),\n  };\n};\n\nexport default externalBlocStore;\n","import {\n  Blac,\n  BlocBase,\n  BlocBaseAbstract,\n  BlocConstructor,\n  BlocGeneric,\n  BlocHookDependencyArrayFn,\n  BlocState,\n  InferPropsFromGeneric,\n} from 'blac';\nimport {\n  useEffect,\n  useId,\n  useLayoutEffect,\n  useMemo,\n  useRef,\n  useSyncExternalStore,\n} from 'react';\nimport externalBlocStore from './externalBlocStore';\n\ntype HookTypes<B extends BlocConstructor<BlocGeneric>> = [\n  BlocState<InstanceType<B>>,\n  InstanceType<B>,\n];\n\nexport interface BlocHookOptions<B extends BlocGeneric<any, any>> {\n  id?: string;\n  dependencySelector?: BlocHookDependencyArrayFn<B>;\n  props?: InferPropsFromGeneric<B>;\n}\n\nconst defaultDependencySelector: BlocHookDependencyArrayFn<any> = (s) => [s];\n\nexport class UseBlocClass {\n  static useBloc<\n    B extends BlocConstructor<BlocGeneric>,\n    O extends BlocHookOptions<InstanceType<B>>,\n  >(bloc: B, options?: O): HookTypes<B> {\n    let { dependencySelector, id: blocId, props } = options ?? {};\n    const rid = useId();\n    const usedKeys = useRef<Set<string>>(new Set());\n    const instanceKeys = useRef<Set<string>>(new Set());\n    const renderInstance = new Set();\n    const shouldClear = useRef(false);\n\n    const base = bloc as unknown as BlocBaseAbstract;\n    const isIsolated = base.isolated;\n    if (isIsolated) {\n      blocId = rid;\n    }\n\n    const resolvedBloc = Blac.getInstance().getBloc(bloc, {\n      id: blocId,\n      props: props as any,\n      reconnect: false,\n    }) as InstanceType<B>;\n\n    if (!resolvedBloc) {\n      throw new Error(`useBloc: could not resolve: ${bloc.name || bloc}`);\n    }\n\n    // default options\n    const dependencyArray: BlocHookDependencyArrayFn<InstanceType<B>> = (\n      newState,\n      oldState,\n    ) => {\n      if (dependencySelector) {\n        return dependencySelector(newState, oldState);\n      }\n      if (typeof newState !== 'object') {\n        return defaultDependencySelector(newState, oldState);\n      }\n\n      const used: string[] = [];\n      for (const key of usedKeys.current) {\n        if (key in newState) {\n          used.push(newState[key as keyof typeof newState]);\n        }\n      }\n\n      return used;\n    };\n\n    const { subscribe, getSnapshot, getServerSnapshot } = useMemo(\n      () => externalBlocStore(resolvedBloc, dependencyArray, rid),\n      [resolvedBloc._createdAt],\n    );\n\n    const state = useSyncExternalStore<BlocState<InstanceType<B>>>(\n      subscribe,\n      getSnapshot,\n      getServerSnapshot,\n    );\n\n    const returnState: BlocState<InstanceType<B>> = useMemo(() => {\n      try {\n        if (typeof state === 'object') {\n          return new Proxy(state as any, {\n            get(target, prop) {\n              usedKeys.current.add(prop as string);\n              instanceKeys.current.add(prop as string);\n              shouldClear.current = true;\n              return Reflect.get(target, prop);\n            },\n          });\n        }\n      } catch (error) {\n        Blac.instance.log('useBloc Error', error);\n      }\n      return state;\n    }, [state, usedKeys, instanceKeys]);\n\n    useLayoutEffect(() => {\n      usedKeys.current = new Set(instanceKeys.current);\n\n      return () => {\n        setTimeout(() => {\n          if (shouldClear.current) {\n            instanceKeys.current.clear();\n            shouldClear.current = false;\n          }\n        });\n      };\n    }, [renderInstance]);\n\n    return [returnState, resolvedBloc];\n  }\n}\n\nconst useBloc = UseBlocClass.useBloc;\n\nexport default useBloc;\n"],"names":["externalBlocStore","bloc","dependencyArray","rid","listener","unSub","e","defaultDependencySelector","s","UseBlocClass","options","dependencySelector","blocId","props","useId","usedKeys","useRef","instanceKeys","renderInstance","shouldClear","resolvedBloc","Blac","newState","oldState","used","key","subscribe","getSnapshot","getServerSnapshot","useMemo","state","useSyncExternalStore","returnState","target","prop","error","useLayoutEffect","useBloc"],"mappings":"2HAWMA,EAAoB,CAIxBC,EACAC,EACAC,KAEO,CACL,UAAYC,GAAiC,CACrC,MAAAC,EAAQJ,EAAK,UAAU,UAAU,CACrC,GAAI,IAAM,CACJ,GAAA,CACFG,EAAS,OAAO,OAAOH,EAAK,KAAK,CAAC,QAC3BK,EAAG,CACV,QAAQ,MAAM,CACZ,EAAAA,EACA,KAAAL,EACA,gBAAAC,CAAA,CACD,CACH,CACF,EACA,gBAAAA,EACA,GAAIC,CAAA,CACL,EAED,MAAO,IAAM,CACLE,GAAA,CAEV,EACA,YAAa,IAAS,OAAO,OAAOJ,EAAK,KAAK,EAC9C,kBAAmB,IAAS,OAAO,OAAOA,EAAK,KAAK,CAAA,GCXlDM,EAA6DC,GAAM,CAACA,CAAC,EAEpE,MAAMC,CAAa,CACxB,OAAO,QAGLR,EAASS,EAA2B,CACpC,GAAI,CAAE,mBAAAC,EAAoB,GAAIC,EAAQ,MAAAC,CAAM,EAAIH,GAAW,GAC3D,MAAMP,EAAMW,EAAAA,QACNC,EAAWC,EAAAA,OAAwB,IAAA,GAAK,EACxCC,EAAeD,EAAAA,OAAwB,IAAA,GAAK,EAC5CE,MAAqB,IACrBC,EAAcH,SAAO,EAAK,EAEnBf,EACW,WAEbW,EAAAT,GAGX,MAAMiB,EAAeC,EAAA,KAAK,YAAY,EAAE,QAAQpB,EAAM,CACpD,GAAIW,EACJ,MAAAC,EACA,UAAW,EAAA,CACZ,EAED,GAAI,CAACO,EACH,MAAM,IAAI,MAAM,+BAA+BnB,EAAK,MAAQA,CAAI,EAAE,EAI9D,MAAAC,EAA8D,CAClEoB,EACAC,IACG,CACH,GAAIZ,EACK,OAAAA,EAAmBW,EAAUC,CAAQ,EAE1C,GAAA,OAAOD,GAAa,SACf,OAAAf,EAA0Be,CAAkB,EAGrD,MAAME,EAAiB,CAAA,EACZ,UAAAC,KAAOV,EAAS,QACrBU,KAAOH,GACJE,EAAA,KAAKF,EAASG,CAA4B,CAAC,EAI7C,OAAAD,CAAA,EAGH,CAAE,UAAAE,EAAW,YAAAC,EAAa,kBAAAC,CAAsB,EAAAC,EAAA,QACpD,IAAM7B,EAAkBoB,EAAclB,EAAiBC,CAAG,EAC1D,CAACiB,EAAa,UAAU,CAAA,EAGpBU,EAAQC,EAAA,qBACZL,EACAC,EACAC,CAAA,EAGII,EAA0CH,EAAAA,QAAQ,IAAM,CACxD,GAAA,CACE,GAAA,OAAOC,GAAU,SACZ,OAAA,IAAI,MAAMA,EAAc,CAC7B,IAAIG,EAAQC,EAAM,CACP,OAAAnB,EAAA,QAAQ,IAAImB,CAAc,EACtBjB,EAAA,QAAQ,IAAIiB,CAAc,EACvCf,EAAY,QAAU,GACf,QAAQ,IAAIc,EAAQC,CAAI,CACjC,CAAA,CACD,QAEIC,EAAO,CACTd,EAAAA,KAAA,SAAS,IAAI,gBAAiBc,CAAK,CAC1C,CACO,OAAAL,CACN,EAAA,CAACA,EAAOf,EAAUE,CAAY,CAAC,EAElCmB,OAAAA,EAAAA,gBAAgB,KACdrB,EAAS,QAAU,IAAI,IAAIE,EAAa,OAAO,EAExC,IAAM,CACX,WAAW,IAAM,CACXE,EAAY,UACdF,EAAa,QAAQ,QACrBE,EAAY,QAAU,GACxB,CACD,CAAA,GAEF,CAACD,CAAc,CAAC,EAEZ,CAACc,EAAaZ,CAAY,CACnC,CACF,CAEA,MAAMiB,EAAU5B,EAAa"}

package/index.es.js

@@ -1,79 +1,80 @@
-import { Blac as p } from "blac";
-import { useId as w, useRef as f, useMemo as B, useSyncExternalStore as j, useLayoutEffect as C } from "react";
-const K = (t, r) => ({
-  subscribe: (d) => {
-    const n = t.addSubscriber({
+import { Blac as b } from "blac";
+import { useId as E, useRef as S, useMemo as g, useSyncExternalStore as w, useLayoutEffect as z } from "react";
+const O = (t, r, f) => ({
+  subscribe: (n) => {
+    const c = t._observer.subscribe({
       fn: () => {
         try {
-          d(t.state);
-        } catch (o) {
+          n(Object.freeze(t.state));
+        } catch (d) {
           console.error({
-            e: o,
+            e: d,
             bloc: t,
             dependencyArray: r
           });
         }
       },
-      dependencyArray: r
+      dependencyArray: r,
+      id: f
     });
     return () => {
-      n();
+      c();
     };
   },
-  getSnapshot: () => t.state,
-  getServerSnapshot: () => t.state
-}), R = (t) => [t];
-class k {
-  static useBloc(r, d) {
-    let { dependencySelector: n, id: o, props: g } = d ?? {};
-    const h = w(), c = f(/* @__PURE__ */ new Set()), u = f(/* @__PURE__ */ new Set()), m = /* @__PURE__ */ new Set(), i = f(!1);
-    r.isolated && (o = h);
-    const a = p.getInstance().getBloc(r, {
-      id: o,
-      props: g,
+  getSnapshot: () => Object.freeze(t.state),
+  getServerSnapshot: () => Object.freeze(t.state)
+}), C = (t) => [t];
+class K {
+  static useBloc(r, f) {
+    let { dependencySelector: n, id: c, props: d } = f ?? {};
+    const y = E(), o = S(/* @__PURE__ */ new Set()), u = S(/* @__PURE__ */ new Set()), h = /* @__PURE__ */ new Set(), i = S(!1);
+    r.isolated && (c = y);
+    const a = b.getInstance().getBloc(r, {
+      id: c,
+      props: d,
       reconnect: !1
     });
     if (!a)
       throw new Error(`useBloc: could not resolve: ${r.name || r}`);
-    const I = (e, s) => {
+    const m = (e, s) => {
       if (n)
         return n(e, s);
       if (typeof e != "object")
-        return R(e);
-      const S = [];
-      for (const y of c.current)
-        y in e && S.push(e[y]);
-      return S;
-    }, { subscribe: b, getSnapshot: v, getServerSnapshot: x } = B(
-      () => K(a, I),
-      [a.createdAt]
-    ), l = j(
-      b,
-      v,
-      x
-    ), E = B(() => {
+        return C(e);
+      const p = [];
+      for (const B of o.current)
+        B in e && p.push(e[B]);
+      return p;
+    }, { subscribe: I, getSnapshot: j, getServerSnapshot: v } = g(
+      () => O(a, m, y),
+      [a._createdAt]
+    ), l = w(
+      I,
+      j,
+      v
+    ), x = g(() => {
       try {
         if (typeof l == "object")
           return new Proxy(l, {
             get(e, s) {
-              return c.current.add(s), u.current.add(s), i.current = !0, Reflect.get(e, s);
+              return o.current.add(s), u.current.add(s), i.current = !0, Reflect.get(e, s);
             }
           });
       } catch (e) {
-        p.instance.log("useBloc Error", e);
+        b.instance.log("useBloc Error", e);
       }
       return l;
-    }, [l, c, u]);
-    return C(() => (c.current = new Set(u.current), () => {
+    }, [l, o, u]);
+    return z(() => (o.current = new Set(u.current), () => {
       setTimeout(() => {
         i.current && (u.current.clear(), i.current = !1);
       });
-    }), [m]), [E, a];
+    }), [h]), [x, a];
   }
 }
-const P = k.useBloc;
+const D = K.useBloc;
 export {
-  K as externalBlocStore,
-  P as useBloc
+  O as externalBlocStore,
+  D as useBloc
 };
 //# sourceMappingURL=index.es.js.map

package/index.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.es.js","sources":["../src/externalBlocStore.ts","../src/useBloc.tsx"],"sourcesContent":["import { BlocGeneric, BlocHookDependencyArrayFn, BlocState } from 'blac';\n\nexport interface ExternalStore<\n  B extends BlocGeneric<any, any>,\n  S extends BlocState<B>,\n> {\n  subscribe: (onStoreChange: () => void) => () => void;\n  getSnapshot: () => S;\n  getServerSnapshot?: () => S;\n}\n\nconst externalBlocStore = <\n  B extends BlocGeneric<any, any>,\n  S extends BlocState<B>,\n>(\n  bloc: B,\n  dependencyArray: BlocHookDependencyArrayFn<InstanceType<any>>,\n): ExternalStore<B, S> => {\n  return {\n    subscribe: (listener: (state: S) => void) => {\n      const unSub = bloc.addSubscriber({\n        fn: () => {\n          try {\n            listener(bloc.state);\n          } catch (e) {\n            console.error({\n              e,\n              bloc,\n              dependencyArray,\n            });\n          }\n        },\n        dependencyArray,\n      });\n\n      return () => {\n        unSub();\n      };\n    },\n    getSnapshot: (): S => bloc.state,\n    getServerSnapshot: (): S => bloc.state,\n  };\n};\n\nexport default externalBlocStore;\n","import {\n  Blac,\n  BlocBase,\n  BlocConstructor,\n  BlocGeneric,\n  BlocHookDependencyArrayFn,\n  BlocState,\n  InferPropsFromGeneric,\n} from 'blac';\nimport {\n  useId,\n  useLayoutEffect,\n  useMemo,\n  useRef,\n  useSyncExternalStore,\n} from 'react';\nimport externalBlocStore from './externalBlocStore';\n\ntype HookTypes<B extends BlocConstructor<BlocGeneric>> = [\n  BlocState<InstanceType<B>>,\n  InstanceType<B>,\n];\n\nexport interface BlocHookOptions<B extends BlocGeneric<any, any>> {\n  id?: string;\n  dependencySelector?: BlocHookDependencyArrayFn<B>;\n  props?: InferPropsFromGeneric<B>;\n}\n\nconst defaultDependencySelector: BlocHookDependencyArrayFn<any> = (s) => [s];\n\nexport class UseBlocClass {\n  static useBloc<\n    B extends BlocConstructor<BlocGeneric>,\n    O extends BlocHookOptions<InstanceType<B>>,\n  >(bloc: B, options?: O): HookTypes<B> {\n    let { dependencySelector, id: blocId, props } = options ?? {};\n    const rid = useId();\n    const usedKeys = useRef<Set<string>>(new Set());\n    const instanceKeys = useRef<Set<string>>(new Set());\n    const renderInstance = new Set();\n    const shouldClear = useRef(false);\n\n    const base = bloc as unknown as BlocBase<B, O['props']>;\n    const isIsolated = base.isolated;\n    if (isIsolated) {\n      blocId = rid;\n    }\n\n    const resolvedBloc = Blac.getInstance().getBloc(bloc, {\n      id: blocId,\n      props: props as any,\n      reconnect: false,\n    }) as InstanceType<B>;\n\n    if (!resolvedBloc) {\n      throw new Error(`useBloc: could not resolve: ${bloc.name || bloc}`);\n    }\n\n    // default options\n    const dependencyArray: BlocHookDependencyArrayFn<InstanceType<B>> = (\n      newState,\n      oldState,\n    ) => {\n      if (dependencySelector) {\n        return dependencySelector(newState, oldState);\n      }\n      if (typeof newState !== 'object') {\n        return defaultDependencySelector(newState, oldState);\n      }\n\n      const used: string[] = [];\n      for (const key of usedKeys.current) {\n        if (key in newState) {\n          used.push(newState[key as keyof typeof newState]);\n        }\n      }\n\n      return used;\n    };\n\n    const { subscribe, getSnapshot, getServerSnapshot } = useMemo(\n      () => externalBlocStore(resolvedBloc, dependencyArray),\n      [resolvedBloc.createdAt],\n    );\n\n    const state = useSyncExternalStore<BlocState<InstanceType<B>>>(\n      subscribe,\n      getSnapshot,\n      getServerSnapshot,\n    );\n\n    const returnState: BlocState<InstanceType<B>> = useMemo(() => {\n      try {\n        if (typeof state === 'object') {\n          return new Proxy(state as any, {\n            get(target, prop) {\n              usedKeys.current.add(prop as string);\n              instanceKeys.current.add(prop as string);\n              shouldClear.current = true;\n              return Reflect.get(target, prop);\n            },\n          });\n        }\n      } catch (error) {\n        Blac.instance.log('useBloc Error', error);\n      }\n      return state;\n    }, [state, usedKeys, instanceKeys]);\n\n    useLayoutEffect(() => {\n      usedKeys.current = new Set(instanceKeys.current);\n\n      return () => {\n        setTimeout(() => {\n          if (shouldClear.current) {\n            instanceKeys.current.clear();\n            shouldClear.current = false;\n          }\n        });\n      };\n    }, [renderInstance]);\n\n    return [returnState, resolvedBloc];\n  }\n}\n\nconst useBloc = UseBlocClass.useBloc;\n\nexport default useBloc;\n"],"names":["externalBlocStore","bloc","dependencyArray","listener","unSub","e","defaultDependencySelector","s","UseBlocClass","options","dependencySelector","blocId","props","rid","useId","usedKeys","useRef","instanceKeys","renderInstance","shouldClear","resolvedBloc","Blac","newState","oldState","used","key","subscribe","getSnapshot","getServerSnapshot","useMemo","state","useSyncExternalStore","returnState","target","prop","error","useLayoutEffect","useBloc"],"mappings":";;AAWM,MAAAA,IAAoB,CAIxBC,GACAC,OAEO;AAAA,EACL,WAAW,CAACC,MAAiC;AACrC,UAAAC,IAAQH,EAAK,cAAc;AAAA,MAC/B,IAAI,MAAM;AACJ,YAAA;AACF,UAAAE,EAASF,EAAK,KAAK;AAAA,iBACZI,GAAG;AACV,kBAAQ,MAAM;AAAA,YACZ,GAAAA;AAAA,YACA,MAAAJ;AAAA,YACA,iBAAAC;AAAA,UAAA,CACD;AAAA,QACH;AAAA,MACF;AAAA,MACA,iBAAAA;AAAA,IAAA,CACD;AAED,WAAO,MAAM;AACL,MAAAE;IAAA;AAAA,EAEV;AAAA,EACA,aAAa,MAASH,EAAK;AAAA,EAC3B,mBAAmB,MAASA,EAAK;AAAA,ICX/BK,IAA4D,CAACC,MAAM,CAACA,CAAC;AAEpE,MAAMC,EAAa;AAAA,EACxB,OAAO,QAGLP,GAASQ,GAA2B;AACpC,QAAI,EAAE,oBAAAC,GAAoB,IAAIC,GAAQ,OAAAC,EAAM,IAAIH,KAAW;AAC3D,UAAMI,IAAMC,KACNC,IAAWC,EAAwB,oBAAA,IAAK,CAAA,GACxCC,IAAeD,EAAwB,oBAAA,IAAK,CAAA,GAC5CE,wBAAqB,OACrBC,IAAcH,EAAO,EAAK;AAIhC,IAFaf,EACW,aAEbU,IAAAE;AAGX,UAAMO,IAAeC,EAAK,YAAY,EAAE,QAAQpB,GAAM;AAAA,MACpD,IAAIU;AAAA,MACJ,OAAAC;AAAA,MACA,WAAW;AAAA,IAAA,CACZ;AAED,QAAI,CAACQ;AACH,YAAM,IAAI,MAAM,+BAA+BnB,EAAK,QAAQA,CAAI,EAAE;AAI9D,UAAAC,IAA8D,CAClEoB,GACAC,MACG;AACH,UAAIb;AACK,eAAAA,EAAmBY,GAAUC,CAAQ;AAE1C,UAAA,OAAOD,KAAa;AACf,eAAAhB,EAA0BgB,CAAkB;AAGrD,YAAME,IAAiB,CAAA;AACZ,iBAAAC,KAAOV,EAAS;AACzB,QAAIU,KAAOH,KACJE,EAAA,KAAKF,EAASG,CAA4B,CAAC;AAI7C,aAAAD;AAAA,IAAA,GAGH,EAAE,WAAAE,GAAW,aAAAC,GAAa,mBAAAC,EAAsB,IAAAC;AAAA,MACpD,MAAM7B,EAAkBoB,GAAclB,CAAe;AAAA,MACrD,CAACkB,EAAa,SAAS;AAAA,IAAA,GAGnBU,IAAQC;AAAA,MACZL;AAAA,MACAC;AAAA,MACAC;AAAA,IAAA,GAGII,IAA0CH,EAAQ,MAAM;AACxD,UAAA;AACE,YAAA,OAAOC,KAAU;AACZ,iBAAA,IAAI,MAAMA,GAAc;AAAA,YAC7B,IAAIG,GAAQC,GAAM;AACP,qBAAAnB,EAAA,QAAQ,IAAImB,CAAc,GACtBjB,EAAA,QAAQ,IAAIiB,CAAc,GACvCf,EAAY,UAAU,IACf,QAAQ,IAAIc,GAAQC,CAAI;AAAA,YACjC;AAAA,UAAA,CACD;AAAA,eAEIC,GAAO;AACT,QAAAd,EAAA,SAAS,IAAI,iBAAiBc,CAAK;AAAA,MAC1C;AACO,aAAAL;AAAA,IACN,GAAA,CAACA,GAAOf,GAAUE,CAAY,CAAC;AAElC,WAAAmB,EAAgB,OACdrB,EAAS,UAAU,IAAI,IAAIE,EAAa,OAAO,GAExC,MAAM;AACX,iBAAW,MAAM;AACf,QAAIE,EAAY,YACdF,EAAa,QAAQ,SACrBE,EAAY,UAAU;AAAA,MACxB,CACD;AAAA,IAAA,IAEF,CAACD,CAAc,CAAC,GAEZ,CAACc,GAAaZ,CAAY;AAAA,EACnC;AACF;AAEA,MAAMiB,IAAU7B,EAAa;"}
+{"version":3,"file":"index.es.js","sources":["../src/externalBlocStore.ts","../src/useBloc.tsx"],"sourcesContent":["import { BlocGeneric, BlocHookDependencyArrayFn, BlocState } from 'blac';\n\nexport interface ExternalStore<\n  B extends BlocGeneric<any, any>,\n  S extends BlocState<B>,\n> {\n  subscribe: (onStoreChange: () => void) => () => void;\n  getSnapshot: () => S;\n  getServerSnapshot?: () => S;\n}\n\nconst externalBlocStore = <\n  B extends BlocGeneric<any, any>,\n  S extends BlocState<B>,\n>(\n  bloc: B,\n  dependencyArray: BlocHookDependencyArrayFn<InstanceType<any>>,\n  rid: string,\n): ExternalStore<B, S> => {\n  return {\n    subscribe: (listener: (state: S) => void) => {\n      const unSub = bloc._observer.subscribe({\n        fn: () => {\n          try {\n            listener(Object.freeze(bloc.state));\n          } catch (e) {\n            console.error({\n              e,\n              bloc,\n              dependencyArray,\n            });\n          }\n        },\n        dependencyArray,\n        id: rid,\n      });\n\n      return () => {\n        unSub();\n      };\n    },\n    getSnapshot: (): S => Object.freeze(bloc.state),\n    getServerSnapshot: (): S => Object.freeze(bloc.state),\n  };\n};\n\nexport default externalBlocStore;\n","import {\n  Blac,\n  BlocBase,\n  BlocBaseAbstract,\n  BlocConstructor,\n  BlocGeneric,\n  BlocHookDependencyArrayFn,\n  BlocState,\n  InferPropsFromGeneric,\n} from 'blac';\nimport {\n  useEffect,\n  useId,\n  useLayoutEffect,\n  useMemo,\n  useRef,\n  useSyncExternalStore,\n} from 'react';\nimport externalBlocStore from './externalBlocStore';\n\ntype HookTypes<B extends BlocConstructor<BlocGeneric>> = [\n  BlocState<InstanceType<B>>,\n  InstanceType<B>,\n];\n\nexport interface BlocHookOptions<B extends BlocGeneric<any, any>> {\n  id?: string;\n  dependencySelector?: BlocHookDependencyArrayFn<B>;\n  props?: InferPropsFromGeneric<B>;\n}\n\nconst defaultDependencySelector: BlocHookDependencyArrayFn<any> = (s) => [s];\n\nexport class UseBlocClass {\n  static useBloc<\n    B extends BlocConstructor<BlocGeneric>,\n    O extends BlocHookOptions<InstanceType<B>>,\n  >(bloc: B, options?: O): HookTypes<B> {\n    let { dependencySelector, id: blocId, props } = options ?? {};\n    const rid = useId();\n    const usedKeys = useRef<Set<string>>(new Set());\n    const instanceKeys = useRef<Set<string>>(new Set());\n    const renderInstance = new Set();\n    const shouldClear = useRef(false);\n\n    const base = bloc as unknown as BlocBaseAbstract;\n    const isIsolated = base.isolated;\n    if (isIsolated) {\n      blocId = rid;\n    }\n\n    const resolvedBloc = Blac.getInstance().getBloc(bloc, {\n      id: blocId,\n      props: props as any,\n      reconnect: false,\n    }) as InstanceType<B>;\n\n    if (!resolvedBloc) {\n      throw new Error(`useBloc: could not resolve: ${bloc.name || bloc}`);\n    }\n\n    // default options\n    const dependencyArray: BlocHookDependencyArrayFn<InstanceType<B>> = (\n      newState,\n      oldState,\n    ) => {\n      if (dependencySelector) {\n        return dependencySelector(newState, oldState);\n      }\n      if (typeof newState !== 'object') {\n        return defaultDependencySelector(newState, oldState);\n      }\n\n      const used: string[] = [];\n      for (const key of usedKeys.current) {\n        if (key in newState) {\n          used.push(newState[key as keyof typeof newState]);\n        }\n      }\n\n      return used;\n    };\n\n    const { subscribe, getSnapshot, getServerSnapshot } = useMemo(\n      () => externalBlocStore(resolvedBloc, dependencyArray, rid),\n      [resolvedBloc._createdAt],\n    );\n\n    const state = useSyncExternalStore<BlocState<InstanceType<B>>>(\n      subscribe,\n      getSnapshot,\n      getServerSnapshot,\n    );\n\n    const returnState: BlocState<InstanceType<B>> = useMemo(() => {\n      try {\n        if (typeof state === 'object') {\n          return new Proxy(state as any, {\n            get(target, prop) {\n              usedKeys.current.add(prop as string);\n              instanceKeys.current.add(prop as string);\n              shouldClear.current = true;\n              return Reflect.get(target, prop);\n            },\n          });\n        }\n      } catch (error) {\n        Blac.instance.log('useBloc Error', error);\n      }\n      return state;\n    }, [state, usedKeys, instanceKeys]);\n\n    useLayoutEffect(() => {\n      usedKeys.current = new Set(instanceKeys.current);\n\n      return () => {\n        setTimeout(() => {\n          if (shouldClear.current) {\n            instanceKeys.current.clear();\n            shouldClear.current = false;\n          }\n        });\n      };\n    }, [renderInstance]);\n\n    return [returnState, resolvedBloc];\n  }\n}\n\nconst useBloc = UseBlocClass.useBloc;\n\nexport default useBloc;\n"],"names":["externalBlocStore","bloc","dependencyArray","rid","listener","unSub","e","defaultDependencySelector","s","UseBlocClass","options","dependencySelector","blocId","props","useId","usedKeys","useRef","instanceKeys","renderInstance","shouldClear","resolvedBloc","Blac","newState","oldState","used","key","subscribe","getSnapshot","getServerSnapshot","useMemo","state","useSyncExternalStore","returnState","target","prop","error","useLayoutEffect","useBloc"],"mappings":";;AAWA,MAAMA,IAAoB,CAIxBC,GACAC,GACAC,OAEO;AAAA,EACL,WAAW,CAACC,MAAiC;AACrC,UAAAC,IAAQJ,EAAK,UAAU,UAAU;AAAA,MACrC,IAAI,MAAM;AACJ,YAAA;AACF,UAAAG,EAAS,OAAO,OAAOH,EAAK,KAAK,CAAC;AAAA,iBAC3BK,GAAG;AACV,kBAAQ,MAAM;AAAA,YACZ,GAAAA;AAAA,YACA,MAAAL;AAAA,YACA,iBAAAC;AAAA,UAAA,CACD;AAAA,QACH;AAAA,MACF;AAAA,MACA,iBAAAA;AAAA,MACA,IAAIC;AAAA,IAAA,CACL;AAED,WAAO,MAAM;AACL,MAAAE;IAAA;AAAA,EAEV;AAAA,EACA,aAAa,MAAS,OAAO,OAAOJ,EAAK,KAAK;AAAA,EAC9C,mBAAmB,MAAS,OAAO,OAAOA,EAAK,KAAK;AAAA,ICXlDM,IAA4D,CAACC,MAAM,CAACA,CAAC;AAEpE,MAAMC,EAAa;AAAA,EACxB,OAAO,QAGLR,GAASS,GAA2B;AACpC,QAAI,EAAE,oBAAAC,GAAoB,IAAIC,GAAQ,OAAAC,EAAM,IAAIH,KAAW;AAC3D,UAAMP,IAAMW,KACNC,IAAWC,EAAwB,oBAAA,IAAK,CAAA,GACxCC,IAAeD,EAAwB,oBAAA,IAAK,CAAA,GAC5CE,wBAAqB,OACrBC,IAAcH,EAAO,EAAK;AAIhC,IAFaf,EACW,aAEbW,IAAAT;AAGX,UAAMiB,IAAeC,EAAK,YAAY,EAAE,QAAQpB,GAAM;AAAA,MACpD,IAAIW;AAAA,MACJ,OAAAC;AAAA,MACA,WAAW;AAAA,IAAA,CACZ;AAED,QAAI,CAACO;AACH,YAAM,IAAI,MAAM,+BAA+BnB,EAAK,QAAQA,CAAI,EAAE;AAI9D,UAAAC,IAA8D,CAClEoB,GACAC,MACG;AACH,UAAIZ;AACK,eAAAA,EAAmBW,GAAUC,CAAQ;AAE1C,UAAA,OAAOD,KAAa;AACf,eAAAf,EAA0Be,CAAkB;AAGrD,YAAME,IAAiB,CAAA;AACZ,iBAAAC,KAAOV,EAAS;AACzB,QAAIU,KAAOH,KACJE,EAAA,KAAKF,EAASG,CAA4B,CAAC;AAI7C,aAAAD;AAAA,IAAA,GAGH,EAAE,WAAAE,GAAW,aAAAC,GAAa,mBAAAC,EAAsB,IAAAC;AAAA,MACpD,MAAM7B,EAAkBoB,GAAclB,GAAiBC,CAAG;AAAA,MAC1D,CAACiB,EAAa,UAAU;AAAA,IAAA,GAGpBU,IAAQC;AAAA,MACZL;AAAA,MACAC;AAAA,MACAC;AAAA,IAAA,GAGII,IAA0CH,EAAQ,MAAM;AACxD,UAAA;AACE,YAAA,OAAOC,KAAU;AACZ,iBAAA,IAAI,MAAMA,GAAc;AAAA,YAC7B,IAAIG,GAAQC,GAAM;AACP,qBAAAnB,EAAA,QAAQ,IAAImB,CAAc,GACtBjB,EAAA,QAAQ,IAAIiB,CAAc,GACvCf,EAAY,UAAU,IACf,QAAQ,IAAIc,GAAQC,CAAI;AAAA,YACjC;AAAA,UAAA,CACD;AAAA,eAEIC,GAAO;AACT,QAAAd,EAAA,SAAS,IAAI,iBAAiBc,CAAK;AAAA,MAC1C;AACO,aAAAL;AAAA,IACN,GAAA,CAACA,GAAOf,GAAUE,CAAY,CAAC;AAElC,WAAAmB,EAAgB,OACdrB,EAAS,UAAU,IAAI,IAAIE,EAAa,OAAO,GAExC,MAAM;AACX,iBAAW,MAAM;AACf,QAAIE,EAAY,YACdF,EAAa,QAAQ,SACrBE,EAAY,UAAU;AAAA,MACxB,CACD;AAAA,IAAA,IAEF,CAACD,CAAc,CAAC,GAEZ,CAACc,GAAaZ,CAAY;AAAA,EACnC;AACF;AAEA,MAAMiB,IAAU5B,EAAa;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blac/react",
-  "version": "0.0.54",
+  "version": "0.0.56",
   "license": "MIT",
   "main": "index.cjs.js",
   "module": "index.es.js",
@@ -27,8 +27,8 @@
     "pub": "npm run build && npm publish"
   },
   "dependencies": {
-    "react": "^18",
-    "blac": "*"
+    "blac": "*",
+    "react": "^18.3.1"
   },
   "devDependencies": {
     "@testing-library/dom": "^10.1.0",
@@ -43,6 +43,7 @@
     "eslint": "^9.5.0",
     "jsdom": "^24.1.0",
     "prettier": "^3.3.2",
+    "react-dom": "^18.3.1",
     "typescript": "^5.4.5",
     "vite-plugin-dts": "^3.9.1",
     "vitest": "^1.6.0"