@blac/react 0.0.43 → 0.0.45

package/index.cjs.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("blac"),a=require("react"),d=(o,t)=>{let s=t(o.state);return{subscribe:u=>{const c=o.addSubscriber(n=>{try{const e=t(n)??[];let i=!0;for(let l=0;l<e.length;l++)if(e[l]!==s[l]){i=!1;break}i||(s=e,u())}catch(e){console.error({e,bloc:o,dependencyArray:t,lastDependencyCheck:s})}});return()=>{c()}},getSnapshot:()=>o.state,getServerSnapshot:()=>o.state}};class b{static useBloc(t,s){const u=a.useId();let c=g=>[g],n,e;typeof s=="object"&&(c=s.dependencySelector??c,n=s.id,e=s.props??e),t.isolated&&(n=u);const r=h.Blac.getInstance().getBloc(t,{id:n,props:e,reconnect:!1});if(!r)throw new Error(`useBloc: could not resolve: ${t.name||t}`);const{subscribe:S,getSnapshot:f,getServerSnapshot:p}=a.useMemo(()=>d(r,c),[r.createdAt]),B=a.useSyncExternalStore(S,f,p);return a.useEffect(()=>{(r.isolated&&e||e&&!r.props)&&(r.props=e)},[e]),[B,r]}}const y=b.useBloc;exports.externalBlocStore=d;exports.useBloc=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("blac"),S=require("react"),y=(c,t)=>{let r=t(c.state);return{subscribe:d=>{const u=c.addSubscriber(n=>{try{const e=t(n)??[];let o=!0;for(let l=0;l<e.length;l++)if(e[l]!==r[l]){o=!1;break}o||(r=e,d())}catch(e){console.error({e,bloc:c,dependencyArray:t,lastDependencyCheck:r})}});return()=>{u()}},getSnapshot:()=>c.state,getServerSnapshot:()=>c.state}};class I{static useBloc(t,r){const d=S.useId(),u=[];let n=s=>{if(typeof s!="object")return[s];const a=[];for(const g in s)u.includes(g)&&a.push(s[g]);return a},e,o;typeof r=="object"&&(n=r.dependencySelector??n,e=r.id,o=r.props??o),t.isolated&&(e=d);const i=h.Blac.getInstance().getBloc(t,{id:e,props:o,reconnect:!1});if(!i)throw new Error(`useBloc: could not resolve: ${t.name||t}`);const{subscribe:p,getSnapshot:b,getServerSnapshot:v}=S.useMemo(()=>y(i,n),[i.createdAt]),f=S.useSyncExternalStore(p,b,v);let B=f;try{typeof f=="object"&&(B=new Proxy(f,{get(s,a){return u.push(a),Reflect.get(s,a)}}))}catch(s){h.Blac.instance.log("useBloc Error",s)}return[B,i]}}const j=I.useBloc;exports.externalBlocStore=y;exports.useBloc=j;
 //# 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 { BlocBase, BlocGeneric, InferStateFromGeneric } from 'blac';\n\nexport interface ExternalStore<\n  B extends BlocGeneric<any, any>,\n  S extends InferStateFromGeneric<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 InferStateFromGeneric<B>,\n>(\n  bloc: B,\n  dependencyArray: (state: S) => unknown[],\n): ExternalStore<B, S> => {\n  let lastDependencyCheck = dependencyArray(bloc.state);\n\n  return {\n    subscribe: (listener: () => void) => {\n      const unSub = bloc.addSubscriber((data) => {\n        try {\n          const newDependencyCheck = dependencyArray(data) ?? [];\n\n          let allEqual = true;\n          for (let i = 0; i < newDependencyCheck.length; i++) {\n            if (newDependencyCheck[i] !== lastDependencyCheck[i]) {\n              allEqual = false;\n              break;\n            }\n          }\n\n          if (!allEqual) {\n            lastDependencyCheck = newDependencyCheck;\n            listener();\n          }\n        } catch (e) {\n          console.error({\n            e,\n            bloc,\n            dependencyArray,\n            lastDependencyCheck,\n          });\n        }\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  BlocInstanceId,\n  BlocProps,\n  CubitPropsType,\n  InferStateFromGeneric,\n  ValueType,\n} from 'blac';\nimport { useEffect, useId, useMemo, useSyncExternalStore } from 'react';\nimport externalBlocStore from './externalBlocStore';\n\n// export type BlocHookData<B extends BlocBase<S>, S> = [\n//   value: ValueType<B>,\n//   instance: B,\n// ];\n\ntype HookTypes<\n  B extends BlocConstructor<BlocGeneric<S, A>>,\n  S = any,\n  A = any,\n> = [InferStateFromGeneric<InstanceType<B>>, InstanceType<B>];\n\n// type BlocHookData<B extends BlocBase<S>, S> = [S, InstanceType<B>]; // B is the bloc class, S is the state of the bloc\n// type UseBlocClassResult<B, S> = BlocHookData<B, S>;\n\nexport type BlocHookDependencyArrayFn<B extends BlocGeneric<any, any>> = (\n  state: InferStateFromGeneric<B>,\n) => unknown[];\n\nexport interface BlocHookOptions<B extends BlocGeneric<any, any>> {\n  id?: string;\n  dependencySelector?: BlocHookDependencyArrayFn<B>;\n  props?: CubitPropsType<B>;\n}\n\nexport class UseBlocClass {\n  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(\n  //   bloc: B,\n  // ): BlocHookData<InstanceType<B>, S> {\n  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(\n  //   bloc: B,\n  //   depsSelector: BlocHookDependencyArrayFn<InstanceType<B>, S>,\n  // ): BlocHookData<InstanceType<B>, S>;\n  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(\n  //   bloc: B,\n  //   instanceId: string,\n  // ): BlocHookData<InstanceType<B>, S>;\n  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(\n  //   bloc: B,\n  //   options?:\n  //     | BlocHookOptions<InstanceType<B>, S>\n  //     | BlocHookDependencyArrayFn<InstanceType<B>, S>\n  //     | BlocInstanceId,\n  // ): BlocHookData<InstanceType<B>, S> {\n\n  // constructor, no options\n  static useBloc<\n    B extends BlocConstructor<BlocGeneric<S, A>>,\n    S = any,\n    A = any,\n  >(bloc: B, options?: BlocHookOptions<InstanceType<B>>): HookTypes<B> {\n    const rid = useId();\n    // default options\n    let dependencyArray: BlocHookDependencyArrayFn<InstanceType<B>> = (\n      state: InferStateFromGeneric<B>,\n    ) => [state];\n    let blocId: BlocInstanceId | undefined;\n    let props: BlocProps | undefined;\n\n    // parse options\n\n    // if options is a function, its a dependencySelector\n    // if (typeof options === 'function') {\n    //   dependencyArray = options;\n    // }\n    //\n    // if options is a string its an ID\n    // if (typeof options === 'string') {\n    //   blocId = options;\n    // }\n\n    if (typeof options === 'object') {\n      dependencyArray = options.dependencySelector ?? dependencyArray;\n      blocId = options.id;\n      props = options.props ?? props;\n    }\n\n    const base = bloc as unknown as BlocBase<S>;\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,\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    const { subscribe, getSnapshot, getServerSnapshot } = useMemo(\n      () => externalBlocStore(resolvedBloc, dependencyArray),\n      [resolvedBloc.createdAt],\n    );\n\n    const state = useSyncExternalStore<InferStateFromGeneric<S>>(\n      subscribe,\n      getSnapshot,\n      getServerSnapshot,\n    );\n\n    useEffect(() => {\n      if ((resolvedBloc.isolated && props) || (props && !resolvedBloc.props)) {\n        resolvedBloc.props = props;\n      }\n    }, [props]);\n\n    return [state, resolvedBloc];\n  }\n}\n\nconst useBloc = UseBlocClass.useBloc;\n\nexport default useBloc;\n"],"names":["externalBlocStore","bloc","dependencyArray","lastDependencyCheck","listener","unSub","data","newDependencyCheck","allEqual","i","UseBlocClass","options","rid","useId","state","blocId","props","resolvedBloc","Blac","subscribe","getSnapshot","getServerSnapshot","useMemo","useSyncExternalStore","useEffect","useBloc"],"mappings":"2HAWMA,EAAoB,CAIxBC,EACAC,IACwB,CACpB,IAAAC,EAAsBD,EAAgBD,EAAK,KAAK,EAE7C,MAAA,CACL,UAAYG,GAAyB,CACnC,MAAMC,EAAQJ,EAAK,cAAeK,GAAS,CACrC,GAAA,CACF,MAAMC,EAAqBL,EAAgBI,CAAI,GAAK,CAAA,EAEpD,IAAIE,EAAW,GACf,QAASC,EAAI,EAAGA,EAAIF,EAAmB,OAAQE,IAC7C,GAAIF,EAAmBE,CAAC,IAAMN,EAAoBM,CAAC,EAAG,CACzCD,EAAA,GACX,KACF,CAGGA,IACmBL,EAAAI,EACbH,WAEJ,EAAG,CACV,QAAQ,MAAM,CACZ,EACA,KAAAH,EACA,gBAAAC,EACA,oBAAAC,CAAA,CACD,CACH,CAAA,CACD,EAED,MAAO,IAAM,CACLE,GAAA,CAEV,EACA,YAAa,IAASJ,EAAK,MAC3B,kBAAmB,IAASA,EAAK,KAAA,CAErC,ECjBO,MAAMS,CAAa,CAqBxB,OAAO,QAILT,EAASU,EAA0D,CACnE,MAAMC,EAAMC,EAAAA,QAEZ,IAAIX,EACFY,GACG,CAACA,CAAK,EACPC,EACAC,EAcA,OAAOL,GAAY,WACrBT,EAAkBS,EAAQ,oBAAsBT,EAChDa,EAASJ,EAAQ,GACjBK,EAAQL,EAAQ,OAASK,GAGdf,EACW,WAEbc,EAAAH,GAGX,MAAMK,EAAeC,EAAA,KAAK,YAAY,EAAE,QAAQjB,EAAM,CACpD,GAAIc,EACJ,MAAAC,EACA,UAAW,EAAA,CACZ,EAED,GAAI,CAACC,EACH,MAAM,IAAI,MAAM,+BAA+BhB,EAAK,MAAQA,CAAI,EAAE,EAGpE,KAAM,CAAE,UAAAkB,EAAW,YAAAC,EAAa,kBAAAC,CAAsB,EAAAC,EAAA,QACpD,IAAMtB,EAAkBiB,EAAcf,CAAe,EACrD,CAACe,EAAa,SAAS,CAAA,EAGnBH,EAAQS,EAAA,qBACZJ,EACAC,EACAC,CAAA,EAGFG,OAAAA,EAAAA,UAAU,IAAM,EACTP,EAAa,UAAYD,GAAWA,GAAS,CAACC,EAAa,SAC9DA,EAAa,MAAQD,EACvB,EACC,CAACA,CAAK,CAAC,EAEH,CAACF,EAAOG,CAAY,CAC7B,CACF,CAEA,MAAMQ,EAAUf,EAAa"}
+{"version":3,"file":"index.cjs.js","sources":["../src/externalBlocStore.ts","../src/useBloc.tsx"],"sourcesContent":["import { BlocBase, BlocGeneric, InferStateFromGeneric } from 'blac';\n\nexport interface ExternalStore<\n  B extends BlocGeneric<any, any>,\n  S extends InferStateFromGeneric<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 InferStateFromGeneric<B>,\n>(\n  bloc: B,\n  dependencyArray: (state: S) => unknown[],\n): ExternalStore<B, S> => {\n  let lastDependencyCheck = dependencyArray(bloc.state);\n\n  return {\n    subscribe: (listener: () => void) => {\n      const unSub = bloc.addSubscriber((data) => {\n        try {\n          const newDependencyCheck = dependencyArray(data) ?? [];\n\n          let allEqual = true;\n          for (let i = 0; i < newDependencyCheck.length; i++) {\n            if (newDependencyCheck[i] !== lastDependencyCheck[i]) {\n              allEqual = false;\n              break;\n            }\n          }\n\n          if (!allEqual) {\n            lastDependencyCheck = newDependencyCheck;\n            listener();\n          }\n        } catch (e) {\n          console.error({\n            e,\n            bloc,\n            dependencyArray,\n            lastDependencyCheck,\n          });\n        }\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  BlocInstanceId,\n  InferPropsFromGeneric,\n  InferStateFromGeneric,\n} from 'blac';\nimport { useEffect, useId, useMemo, useSyncExternalStore } from 'react';\nimport externalBlocStore from './externalBlocStore';\n\n// export type BlocHookData<B extends BlocBase<S>, S> = [\n//   value: ValueType<B>,\n//   instance: B,\n// ];\n\ntype HookTypes<B extends BlocConstructor<BlocGeneric>> = [\n  InferStateFromGeneric<InstanceType<B>>,\n  InstanceType<B>,\n];\n\n// type BlocHookData<B extends BlocBase<S>, S> = [S, InstanceType<B>]; // B is the bloc class, S is the state of the bloc\n// type UseBlocClassResult<B, S> = BlocHookData<B, S>;\n\nexport type BlocHookDependencyArrayFn<B extends BlocGeneric<any, any>> = (\n  state: InferStateFromGeneric<B>,\n) => unknown[];\n\nexport interface BlocHookOptions<B extends BlocGeneric<any, any>> {\n  id?: string;\n  dependencySelector?: BlocHookDependencyArrayFn<B>;\n  props?: InferPropsFromGeneric<B>;\n}\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    const rid = useId();\n    const usedKeys: string[] = [];\n    // default options\n    let dependencyArray: BlocHookDependencyArrayFn<InstanceType<B>> = (\n      state,\n    ) => {\n      if (typeof state !== 'object') {\n        return [state] as unknown[];\n      }\n\n      const used: unknown[] = [];\n      for (const key in state) {\n        if (usedKeys.includes(key)) {\n          used.push(state[key]);\n        }\n      }\n      return used;\n    };\n    let blocId: BlocInstanceId | undefined;\n    let props: ConstructorParameters<BlocConstructor<B>> | undefined;\n\n    if (typeof options === 'object') {\n      dependencyArray = options.dependencySelector ?? dependencyArray;\n      blocId = options.id;\n      props = options.props ?? props;\n    }\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,\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    const { subscribe, getSnapshot, getServerSnapshot } = useMemo(\n      () => externalBlocStore(resolvedBloc, dependencyArray),\n      [resolvedBloc.createdAt],\n    );\n\n    const state = useSyncExternalStore<InferStateFromGeneric<S>>(\n      subscribe,\n      getSnapshot,\n      getServerSnapshot,\n    );\n\n    let returnState = state;\n    try {\n      if (typeof state === 'object') {\n        returnState = new Proxy(state, {\n          get(target, prop) {\n            usedKeys.push(prop as string);\n            return Reflect.get(target, prop);\n          },\n        });\n      }\n    } catch (error) {\n      Blac.instance.log('useBloc Error', error);\n    }\n\n    return [returnState, resolvedBloc];\n  }\n}\n\nconst useBloc = UseBlocClass.useBloc;\n\nexport default useBloc;\n"],"names":["externalBlocStore","bloc","dependencyArray","lastDependencyCheck","listener","unSub","data","newDependencyCheck","allEqual","i","UseBlocClass","options","rid","useId","usedKeys","state","used","key","blocId","props","resolvedBloc","Blac","subscribe","getSnapshot","getServerSnapshot","useMemo","useSyncExternalStore","returnState","target","prop","error","useBloc"],"mappings":"2HAWMA,EAAoB,CAIxBC,EACAC,IACwB,CACpB,IAAAC,EAAsBD,EAAgBD,EAAK,KAAK,EAE7C,MAAA,CACL,UAAYG,GAAyB,CACnC,MAAMC,EAAQJ,EAAK,cAAeK,GAAS,CACrC,GAAA,CACF,MAAMC,EAAqBL,EAAgBI,CAAI,GAAK,CAAA,EAEpD,IAAIE,EAAW,GACf,QAASC,EAAI,EAAGA,EAAIF,EAAmB,OAAQE,IAC7C,GAAIF,EAAmBE,CAAC,IAAMN,EAAoBM,CAAC,EAAG,CACzCD,EAAA,GACX,KACF,CAGGA,IACmBL,EAAAI,EACbH,WAEJ,EAAG,CACV,QAAQ,MAAM,CACZ,EACA,KAAAH,EACA,gBAAAC,EACA,oBAAAC,CAAA,CACD,CACH,CAAA,CACD,EAED,MAAO,IAAM,CACLE,GAAA,CAEV,EACA,YAAa,IAASJ,EAAK,MAC3B,kBAAmB,IAASA,EAAK,KAAA,CAErC,ECpBO,MAAMS,CAAa,CACxB,OAAO,QAGLT,EAASU,EAA2B,CACpC,MAAMC,EAAMC,EAAAA,QACNC,EAAqB,CAAA,EAEvB,IAAAZ,EACFa,GACG,CACC,GAAA,OAAOA,GAAU,SACnB,MAAO,CAACA,CAAK,EAGf,MAAMC,EAAkB,CAAA,EACxB,UAAWC,KAAOF,EACZD,EAAS,SAASG,CAAG,GAClBD,EAAA,KAAKD,EAAME,CAAG,CAAC,EAGjB,OAAAD,CAAA,EAELE,EACAC,EAEA,OAAOR,GAAY,WACrBT,EAAkBS,EAAQ,oBAAsBT,EAChDgB,EAASP,EAAQ,GACjBQ,EAAQR,EAAQ,OAASQ,GAGdlB,EACW,WAEbiB,EAAAN,GAGX,MAAMQ,EAAeC,EAAA,KAAK,YAAY,EAAE,QAAQpB,EAAM,CACpD,GAAIiB,EACJ,MAAAC,EACA,UAAW,EAAA,CACZ,EAED,GAAI,CAACC,EACH,MAAM,IAAI,MAAM,+BAA+BnB,EAAK,MAAQA,CAAI,EAAE,EAGpE,KAAM,CAAE,UAAAqB,EAAW,YAAAC,EAAa,kBAAAC,CAAsB,EAAAC,EAAA,QACpD,IAAMzB,EAAkBoB,EAAclB,CAAe,EACrD,CAACkB,EAAa,SAAS,CAAA,EAGnBL,EAAQW,EAAA,qBACZJ,EACAC,EACAC,CAAA,EAGF,IAAIG,EAAcZ,EACd,GAAA,CACE,OAAOA,GAAU,WACLY,EAAA,IAAI,MAAMZ,EAAO,CAC7B,IAAIa,EAAQC,EAAM,CAChB,OAAAf,EAAS,KAAKe,CAAc,EACrB,QAAQ,IAAID,EAAQC,CAAI,CACjC,CAAA,CACD,SAEIC,EAAO,CACTT,EAAAA,KAAA,SAAS,IAAI,gBAAiBS,CAAK,CAC1C,CAEO,MAAA,CAACH,EAAaP,CAAY,CACnC,CACF,CAEA,MAAMW,EAAUrB,EAAa"}

package/index.es.js

@@ -1,19 +1,19 @@
 import { Blac as h } from "blac";
-import { useId as B, useMemo as g, useSyncExternalStore as m, useEffect as b } from "react";
-const I = (o, t) => {
+import { useId as b, useMemo as m, useSyncExternalStore as I } from "react";
+const k = (o, t) => {
   let s = t(o.state);
   return {
-    subscribe: (l) => {
-      const c = o.addSubscriber((n) => {
+    subscribe: (d) => {
+      const u = o.addSubscriber((n) => {
         try {
           const e = t(n) ?? [];
-          let u = !0;
-          for (let a = 0; a < e.length; a++)
-            if (e[a] !== s[a]) {
-              u = !1;
+          let c = !0;
+          for (let l = 0; l < e.length; l++)
+            if (e[l] !== s[l]) {
+              c = !1;
               break;
             }
-          u || (s = e, l());
+          c || (s = e, d());
         } catch (e) {
           console.error({
             e,
@@ -24,7 +24,7 @@ const I = (o, t) => {
         }
       });
       return () => {
-        c();
+        u();
       };
     },
     getSnapshot: () => o.state,
@@ -32,52 +32,48 @@ const I = (o, t) => {
   };
 };
 class v {
-  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(
-  //   bloc: B,
-  // ): BlocHookData<InstanceType<B>, S> {
-  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(
-  //   bloc: B,
-  //   depsSelector: BlocHookDependencyArrayFn<InstanceType<B>, S>,
-  // ): BlocHookData<InstanceType<B>, S>;
-  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(
-  //   bloc: B,
-  //   instanceId: string,
-  // ): BlocHookData<InstanceType<B>, S>;
-  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(
-  //   bloc: B,
-  //   options?:
-  //     | BlocHookOptions<InstanceType<B>, S>
-  //     | BlocHookDependencyArrayFn<InstanceType<B>, S>
-  //     | BlocInstanceId,
-  // ): BlocHookData<InstanceType<B>, S> {
-  // constructor, no options
   static useBloc(t, s) {
-    const l = B();
-    let c = (S) => [S], n, e;
-    typeof s == "object" && (c = s.dependencySelector ?? c, n = s.id, e = s.props ?? e), t.isolated && (n = l);
-    const r = h.getInstance().getBloc(t, {
-      id: n,
-      props: e,
+    const d = b(), u = [];
+    let n = (r) => {
+      if (typeof r != "object")
+        return [r];
+      const a = [];
+      for (const S in r)
+        u.includes(S) && a.push(r[S]);
+      return a;
+    }, e, c;
+    typeof s == "object" && (n = s.dependencySelector ?? n, e = s.id, c = s.props ?? c), t.isolated && (e = d);
+    const i = h.getInstance().getBloc(t, {
+      id: e,
+      props: c,
       reconnect: !1
     });
-    if (!r)
+    if (!i)
       throw new Error(`useBloc: could not resolve: ${t.name || t}`);
-    const { subscribe: i, getSnapshot: d, getServerSnapshot: p } = g(
-      () => I(r, c),
-      [r.createdAt]
-    ), f = m(
-      i,
-      d,
-      p
+    const { subscribe: g, getSnapshot: y, getServerSnapshot: B } = m(
+      () => k(i, n),
+      [i.createdAt]
+    ), f = I(
+      g,
+      y,
+      B
     );
-    return b(() => {
-      (r.isolated && e || e && !r.props) && (r.props = e);
-    }, [e]), [f, r];
+    let p = f;
+    try {
+      typeof f == "object" && (p = new Proxy(f, {
+        get(r, a) {
+          return u.push(a), Reflect.get(r, a);
+        }
+      }));
+    } catch (r) {
+      h.instance.log("useBloc Error", r);
+    }
+    return [p, i];
   }
 }
-const k = v.useBloc;
+const j = v.useBloc;
 export {
-  I as externalBlocStore,
-  k as useBloc
+  k as externalBlocStore,
+  j 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 { BlocBase, BlocGeneric, InferStateFromGeneric } from 'blac';\n\nexport interface ExternalStore<\n  B extends BlocGeneric<any, any>,\n  S extends InferStateFromGeneric<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 InferStateFromGeneric<B>,\n>(\n  bloc: B,\n  dependencyArray: (state: S) => unknown[],\n): ExternalStore<B, S> => {\n  let lastDependencyCheck = dependencyArray(bloc.state);\n\n  return {\n    subscribe: (listener: () => void) => {\n      const unSub = bloc.addSubscriber((data) => {\n        try {\n          const newDependencyCheck = dependencyArray(data) ?? [];\n\n          let allEqual = true;\n          for (let i = 0; i < newDependencyCheck.length; i++) {\n            if (newDependencyCheck[i] !== lastDependencyCheck[i]) {\n              allEqual = false;\n              break;\n            }\n          }\n\n          if (!allEqual) {\n            lastDependencyCheck = newDependencyCheck;\n            listener();\n          }\n        } catch (e) {\n          console.error({\n            e,\n            bloc,\n            dependencyArray,\n            lastDependencyCheck,\n          });\n        }\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  BlocInstanceId,\n  BlocProps,\n  CubitPropsType,\n  InferStateFromGeneric,\n  ValueType,\n} from 'blac';\nimport { useEffect, useId, useMemo, useSyncExternalStore } from 'react';\nimport externalBlocStore from './externalBlocStore';\n\n// export type BlocHookData<B extends BlocBase<S>, S> = [\n//   value: ValueType<B>,\n//   instance: B,\n// ];\n\ntype HookTypes<\n  B extends BlocConstructor<BlocGeneric<S, A>>,\n  S = any,\n  A = any,\n> = [InferStateFromGeneric<InstanceType<B>>, InstanceType<B>];\n\n// type BlocHookData<B extends BlocBase<S>, S> = [S, InstanceType<B>]; // B is the bloc class, S is the state of the bloc\n// type UseBlocClassResult<B, S> = BlocHookData<B, S>;\n\nexport type BlocHookDependencyArrayFn<B extends BlocGeneric<any, any>> = (\n  state: InferStateFromGeneric<B>,\n) => unknown[];\n\nexport interface BlocHookOptions<B extends BlocGeneric<any, any>> {\n  id?: string;\n  dependencySelector?: BlocHookDependencyArrayFn<B>;\n  props?: CubitPropsType<B>;\n}\n\nexport class UseBlocClass {\n  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(\n  //   bloc: B,\n  // ): BlocHookData<InstanceType<B>, S> {\n  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(\n  //   bloc: B,\n  //   depsSelector: BlocHookDependencyArrayFn<InstanceType<B>, S>,\n  // ): BlocHookData<InstanceType<B>, S>;\n  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(\n  //   bloc: B,\n  //   instanceId: string,\n  // ): BlocHookData<InstanceType<B>, S>;\n  // static useBloc<B extends BlocConstructor<BlocBase<S>>, S>(\n  //   bloc: B,\n  //   options?:\n  //     | BlocHookOptions<InstanceType<B>, S>\n  //     | BlocHookDependencyArrayFn<InstanceType<B>, S>\n  //     | BlocInstanceId,\n  // ): BlocHookData<InstanceType<B>, S> {\n\n  // constructor, no options\n  static useBloc<\n    B extends BlocConstructor<BlocGeneric<S, A>>,\n    S = any,\n    A = any,\n  >(bloc: B, options?: BlocHookOptions<InstanceType<B>>): HookTypes<B> {\n    const rid = useId();\n    // default options\n    let dependencyArray: BlocHookDependencyArrayFn<InstanceType<B>> = (\n      state: InferStateFromGeneric<B>,\n    ) => [state];\n    let blocId: BlocInstanceId | undefined;\n    let props: BlocProps | undefined;\n\n    // parse options\n\n    // if options is a function, its a dependencySelector\n    // if (typeof options === 'function') {\n    //   dependencyArray = options;\n    // }\n    //\n    // if options is a string its an ID\n    // if (typeof options === 'string') {\n    //   blocId = options;\n    // }\n\n    if (typeof options === 'object') {\n      dependencyArray = options.dependencySelector ?? dependencyArray;\n      blocId = options.id;\n      props = options.props ?? props;\n    }\n\n    const base = bloc as unknown as BlocBase<S>;\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,\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    const { subscribe, getSnapshot, getServerSnapshot } = useMemo(\n      () => externalBlocStore(resolvedBloc, dependencyArray),\n      [resolvedBloc.createdAt],\n    );\n\n    const state = useSyncExternalStore<InferStateFromGeneric<S>>(\n      subscribe,\n      getSnapshot,\n      getServerSnapshot,\n    );\n\n    useEffect(() => {\n      if ((resolvedBloc.isolated && props) || (props && !resolvedBloc.props)) {\n        resolvedBloc.props = props;\n      }\n    }, [props]);\n\n    return [state, resolvedBloc];\n  }\n}\n\nconst useBloc = UseBlocClass.useBloc;\n\nexport default useBloc;\n"],"names":["externalBlocStore","bloc","dependencyArray","lastDependencyCheck","listener","unSub","data","newDependencyCheck","allEqual","i","UseBlocClass","options","rid","useId","state","blocId","props","resolvedBloc","Blac","subscribe","getSnapshot","getServerSnapshot","useMemo","useSyncExternalStore","useEffect","useBloc"],"mappings":";;AAWM,MAAAA,IAAoB,CAIxBC,GACAC,MACwB;AACpB,MAAAC,IAAsBD,EAAgBD,EAAK,KAAK;AAE7C,SAAA;AAAA,IACL,WAAW,CAACG,MAAyB;AACnC,YAAMC,IAAQJ,EAAK,cAAc,CAACK,MAAS;AACrC,YAAA;AACF,gBAAMC,IAAqBL,EAAgBI,CAAI,KAAK,CAAA;AAEpD,cAAIE,IAAW;AACf,mBAASC,IAAI,GAAGA,IAAIF,EAAmB,QAAQE;AAC7C,gBAAIF,EAAmBE,CAAC,MAAMN,EAAoBM,CAAC,GAAG;AACzC,cAAAD,IAAA;AACX;AAAA,YACF;AAGF,UAAKA,MACmBL,IAAAI,GACbH;iBAEJ,GAAG;AACV,kBAAQ,MAAM;AAAA,YACZ;AAAA,YACA,MAAAH;AAAA,YACA,iBAAAC;AAAA,YACA,qBAAAC;AAAA,UAAA,CACD;AAAA,QACH;AAAA,MAAA,CACD;AAED,aAAO,MAAM;AACL,QAAAE;MAAA;AAAA,IAEV;AAAA,IACA,aAAa,MAASJ,EAAK;AAAA,IAC3B,mBAAmB,MAASA,EAAK;AAAA,EAAA;AAErC;ACjBO,MAAMS,EAAa;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAqBxB,OAAO,QAILT,GAASU,GAA0D;AACnE,UAAMC,IAAMC;AAEZ,QAAIX,IAA8D,CAChEY,MACG,CAACA,CAAK,GACPC,GACAC;AAcA,IAAA,OAAOL,KAAY,aACrBT,IAAkBS,EAAQ,sBAAsBT,GAChDa,IAASJ,EAAQ,IACjBK,IAAQL,EAAQ,SAASK,IAGdf,EACW,aAEbc,IAAAH;AAGX,UAAMK,IAAeC,EAAK,YAAY,EAAE,QAAQjB,GAAM;AAAA,MACpD,IAAIc;AAAA,MACJ,OAAAC;AAAA,MACA,WAAW;AAAA,IAAA,CACZ;AAED,QAAI,CAACC;AACH,YAAM,IAAI,MAAM,+BAA+BhB,EAAK,QAAQA,CAAI,EAAE;AAGpE,UAAM,EAAE,WAAAkB,GAAW,aAAAC,GAAa,mBAAAC,EAAsB,IAAAC;AAAA,MACpD,MAAMtB,EAAkBiB,GAAcf,CAAe;AAAA,MACrD,CAACe,EAAa,SAAS;AAAA,IAAA,GAGnBH,IAAQS;AAAA,MACZJ;AAAA,MACAC;AAAA,MACAC;AAAA,IAAA;AAGF,WAAAG,EAAU,MAAM;AACd,OAAKP,EAAa,YAAYD,KAAWA,KAAS,CAACC,EAAa,WAC9DA,EAAa,QAAQD;AAAA,IACvB,GACC,CAACA,CAAK,CAAC,GAEH,CAACF,GAAOG,CAAY;AAAA,EAC7B;AACF;AAEA,MAAMQ,IAAUf,EAAa;"}
+{"version":3,"file":"index.es.js","sources":["../src/externalBlocStore.ts","../src/useBloc.tsx"],"sourcesContent":["import { BlocBase, BlocGeneric, InferStateFromGeneric } from 'blac';\n\nexport interface ExternalStore<\n  B extends BlocGeneric<any, any>,\n  S extends InferStateFromGeneric<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 InferStateFromGeneric<B>,\n>(\n  bloc: B,\n  dependencyArray: (state: S) => unknown[],\n): ExternalStore<B, S> => {\n  let lastDependencyCheck = dependencyArray(bloc.state);\n\n  return {\n    subscribe: (listener: () => void) => {\n      const unSub = bloc.addSubscriber((data) => {\n        try {\n          const newDependencyCheck = dependencyArray(data) ?? [];\n\n          let allEqual = true;\n          for (let i = 0; i < newDependencyCheck.length; i++) {\n            if (newDependencyCheck[i] !== lastDependencyCheck[i]) {\n              allEqual = false;\n              break;\n            }\n          }\n\n          if (!allEqual) {\n            lastDependencyCheck = newDependencyCheck;\n            listener();\n          }\n        } catch (e) {\n          console.error({\n            e,\n            bloc,\n            dependencyArray,\n            lastDependencyCheck,\n          });\n        }\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  BlocInstanceId,\n  InferPropsFromGeneric,\n  InferStateFromGeneric,\n} from 'blac';\nimport { useEffect, useId, useMemo, useSyncExternalStore } from 'react';\nimport externalBlocStore from './externalBlocStore';\n\n// export type BlocHookData<B extends BlocBase<S>, S> = [\n//   value: ValueType<B>,\n//   instance: B,\n// ];\n\ntype HookTypes<B extends BlocConstructor<BlocGeneric>> = [\n  InferStateFromGeneric<InstanceType<B>>,\n  InstanceType<B>,\n];\n\n// type BlocHookData<B extends BlocBase<S>, S> = [S, InstanceType<B>]; // B is the bloc class, S is the state of the bloc\n// type UseBlocClassResult<B, S> = BlocHookData<B, S>;\n\nexport type BlocHookDependencyArrayFn<B extends BlocGeneric<any, any>> = (\n  state: InferStateFromGeneric<B>,\n) => unknown[];\n\nexport interface BlocHookOptions<B extends BlocGeneric<any, any>> {\n  id?: string;\n  dependencySelector?: BlocHookDependencyArrayFn<B>;\n  props?: InferPropsFromGeneric<B>;\n}\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    const rid = useId();\n    const usedKeys: string[] = [];\n    // default options\n    let dependencyArray: BlocHookDependencyArrayFn<InstanceType<B>> = (\n      state,\n    ) => {\n      if (typeof state !== 'object') {\n        return [state] as unknown[];\n      }\n\n      const used: unknown[] = [];\n      for (const key in state) {\n        if (usedKeys.includes(key)) {\n          used.push(state[key]);\n        }\n      }\n      return used;\n    };\n    let blocId: BlocInstanceId | undefined;\n    let props: ConstructorParameters<BlocConstructor<B>> | undefined;\n\n    if (typeof options === 'object') {\n      dependencyArray = options.dependencySelector ?? dependencyArray;\n      blocId = options.id;\n      props = options.props ?? props;\n    }\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,\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    const { subscribe, getSnapshot, getServerSnapshot } = useMemo(\n      () => externalBlocStore(resolvedBloc, dependencyArray),\n      [resolvedBloc.createdAt],\n    );\n\n    const state = useSyncExternalStore<InferStateFromGeneric<S>>(\n      subscribe,\n      getSnapshot,\n      getServerSnapshot,\n    );\n\n    let returnState = state;\n    try {\n      if (typeof state === 'object') {\n        returnState = new Proxy(state, {\n          get(target, prop) {\n            usedKeys.push(prop as string);\n            return Reflect.get(target, prop);\n          },\n        });\n      }\n    } catch (error) {\n      Blac.instance.log('useBloc Error', error);\n    }\n\n    return [returnState, resolvedBloc];\n  }\n}\n\nconst useBloc = UseBlocClass.useBloc;\n\nexport default useBloc;\n"],"names":["externalBlocStore","bloc","dependencyArray","lastDependencyCheck","listener","unSub","data","newDependencyCheck","allEqual","i","UseBlocClass","options","rid","useId","usedKeys","state","used","key","blocId","props","resolvedBloc","Blac","subscribe","getSnapshot","getServerSnapshot","useMemo","useSyncExternalStore","returnState","target","prop","error","useBloc"],"mappings":";;AAWM,MAAAA,IAAoB,CAIxBC,GACAC,MACwB;AACpB,MAAAC,IAAsBD,EAAgBD,EAAK,KAAK;AAE7C,SAAA;AAAA,IACL,WAAW,CAACG,MAAyB;AACnC,YAAMC,IAAQJ,EAAK,cAAc,CAACK,MAAS;AACrC,YAAA;AACF,gBAAMC,IAAqBL,EAAgBI,CAAI,KAAK,CAAA;AAEpD,cAAIE,IAAW;AACf,mBAASC,IAAI,GAAGA,IAAIF,EAAmB,QAAQE;AAC7C,gBAAIF,EAAmBE,CAAC,MAAMN,EAAoBM,CAAC,GAAG;AACzC,cAAAD,IAAA;AACX;AAAA,YACF;AAGF,UAAKA,MACmBL,IAAAI,GACbH;iBAEJ,GAAG;AACV,kBAAQ,MAAM;AAAA,YACZ;AAAA,YACA,MAAAH;AAAA,YACA,iBAAAC;AAAA,YACA,qBAAAC;AAAA,UAAA,CACD;AAAA,QACH;AAAA,MAAA,CACD;AAED,aAAO,MAAM;AACL,QAAAE;MAAA;AAAA,IAEV;AAAA,IACA,aAAa,MAASJ,EAAK;AAAA,IAC3B,mBAAmB,MAASA,EAAK;AAAA,EAAA;AAErC;ACpBO,MAAMS,EAAa;AAAA,EACxB,OAAO,QAGLT,GAASU,GAA2B;AACpC,UAAMC,IAAMC,KACNC,IAAqB,CAAA;AAEvB,QAAAZ,IAA8D,CAChEa,MACG;AACC,UAAA,OAAOA,KAAU;AACnB,eAAO,CAACA,CAAK;AAGf,YAAMC,IAAkB,CAAA;AACxB,iBAAWC,KAAOF;AACZ,QAAAD,EAAS,SAASG,CAAG,KAClBD,EAAA,KAAKD,EAAME,CAAG,CAAC;AAGjB,aAAAD;AAAA,IAAA,GAELE,GACAC;AAEA,IAAA,OAAOR,KAAY,aACrBT,IAAkBS,EAAQ,sBAAsBT,GAChDgB,IAASP,EAAQ,IACjBQ,IAAQR,EAAQ,SAASQ,IAGdlB,EACW,aAEbiB,IAAAN;AAGX,UAAMQ,IAAeC,EAAK,YAAY,EAAE,QAAQpB,GAAM;AAAA,MACpD,IAAIiB;AAAA,MACJ,OAAAC;AAAA,MACA,WAAW;AAAA,IAAA,CACZ;AAED,QAAI,CAACC;AACH,YAAM,IAAI,MAAM,+BAA+BnB,EAAK,QAAQA,CAAI,EAAE;AAGpE,UAAM,EAAE,WAAAqB,GAAW,aAAAC,GAAa,mBAAAC,EAAsB,IAAAC;AAAA,MACpD,MAAMzB,EAAkBoB,GAAclB,CAAe;AAAA,MACrD,CAACkB,EAAa,SAAS;AAAA,IAAA,GAGnBL,IAAQW;AAAA,MACZJ;AAAA,MACAC;AAAA,MACAC;AAAA,IAAA;AAGF,QAAIG,IAAcZ;AACd,QAAA;AACE,MAAA,OAAOA,KAAU,aACLY,IAAA,IAAI,MAAMZ,GAAO;AAAA,QAC7B,IAAIa,GAAQC,GAAM;AAChB,iBAAAf,EAAS,KAAKe,CAAc,GACrB,QAAQ,IAAID,GAAQC,CAAI;AAAA,QACjC;AAAA,MAAA,CACD;AAAA,aAEIC,GAAO;AACT,MAAAT,EAAA,SAAS,IAAI,iBAAiBS,CAAK;AAAA,IAC1C;AAEO,WAAA,CAACH,GAAaP,CAAY;AAAA,EACnC;AACF;AAEA,MAAMW,IAAUrB,EAAa;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blac/react",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "license": "MIT",
   "main": "index.cjs.js",
   "module": "index.es.js",

package/src/useBloc.d.ts

@@ -1,13 +1,16 @@
-import { BlocConstructor, BlocGeneric, CubitPropsType, InferStateFromGeneric } from 'blac';
-type HookTypes<B extends BlocConstructor<BlocGeneric<S, A>>, S = any, A = any> = [InferStateFromGeneric<InstanceType<B>>, InstanceType<B>];
+import { BlocConstructor, BlocGeneric, InferPropsFromGeneric, InferStateFromGeneric } from 'blac';
+type HookTypes<B extends BlocConstructor<BlocGeneric>> = [
+    InferStateFromGeneric<InstanceType<B>>,
+    InstanceType<B>
+];
 export type BlocHookDependencyArrayFn<B extends BlocGeneric<any, any>> = (state: InferStateFromGeneric<B>) => unknown[];
 export interface BlocHookOptions<B extends BlocGeneric<any, any>> {
     id?: string;
     dependencySelector?: BlocHookDependencyArrayFn<B>;
-    props?: CubitPropsType<B>;
+    props?: InferPropsFromGeneric<B>;
 }
 export declare class UseBlocClass {
-    static useBloc<B extends BlocConstructor<BlocGeneric<S, A>>, S = any, A = any>(bloc: B, options?: BlocHookOptions<InstanceType<B>>): HookTypes<B>;
+    static useBloc<B extends BlocConstructor<BlocGeneric>, O extends BlocHookOptions<InstanceType<B>>>(bloc: B, options?: O): HookTypes<B>;
 }
 declare const useBloc: typeof UseBlocClass.useBloc;
 export default useBloc;