@yakocloud/state-vocab 4.0.3 → 4.2.0

package/README.md

@@ -366,14 +366,28 @@ export const storage = setupStorage({
 })
 ```
 
-**2. Create server and client storage handles:**
+**2. Create a client context, then create server and client storage handles:**
+
+Each storage tree needs its own React context so that multiple independent providers can coexist on the same page without their state bleeding into each other.
+
+```ts
+// storage.context.client.ts  ("use client")
+"use client"
+
+import { createContext } from 'react'
+
+export const StorageClientContext = createContext({})
+```
 
 ```ts
 // storage.server.ts
 import { storage } from '@/storage'
 import { serverify } from '@yakocloud/state-vocab/server'
+import { StorageClientContext } from '@/storage.context.client'
 
-export const serverStorage = serverify(storage)
+export const serverStorage = serverify(storage, {
+  clientContext: StorageClientContext,
+})
 ```
 
 ```ts
@@ -382,8 +396,11 @@ export const serverStorage = serverify(storage)
 
 import { storage } from '@/storage'
 import { clientify } from '@yakocloud/state-vocab/client'
+import { StorageClientContext } from '@/storage.context.client'
 
-export const clientStorage = clientify(storage)
+export const clientStorage = clientify(storage, {
+  clientContext: StorageClientContext,
+})
 ```
 
 **3. Seed initial state in the server component and read it in Server and Client children:**
@@ -395,6 +412,10 @@ import { serverStorage } from '@/storage.server'
 const { StateVocabProvider } = serverStorage
 
 export default async function Page() {
+  // Call start() before rendering the provider — registers the store for this
+  // request so child components can await getState() concurrently
+  serverStorage.start()
+
   // Fetch data from DB / API
   const user = await db.getUser()
 
@@ -416,8 +437,8 @@ export default async function Page() {
 import { serverStorage } from '@/storage.server'
 
 export default async function UserInfo() {
-  const name = serverStorage.user.name.getState()
-  const role = serverStorage.user.role.getState()
+  const name = await serverStorage.user.name.getState()
+  const role = await serverStorage.user.role.getState()
 
   return <p>{name} — {role}</p>
 }
@@ -437,9 +458,43 @@ export default function UserInfoClient() {
 }
 ```
 
+#### Multiple independent storage trees
+
+Because each `serverify`/`clientify` pair is bound to its own context, you can have multiple independent providers active at the same time — for example, a layout-level store and a page-level store — without them interfering with each other:
+
+```ts
+// layout.context.client.ts ("use client")
+export const LayoutClientContext = createContext({})
+
+// page.context.client.ts ("use client")
+export const PageClientContext = createContext({})
+
+// layout.storage.server.ts
+export const layoutServerStorage = serverify(layoutStorage, { 
+  clientContext: LayoutClientContext 
+})
+
+// layout.storage.client.ts ("use client")
+export const layoutClientStorage = clientify(layoutStorage, { 
+  clientContext: LayoutClientContext 
+})
+
+// page.storage.server.ts
+export const pageServerStorage = serverify(pageStorage, { 
+  clientContext: PageClientContext 
+})
+
+// page.storage.client.ts ("use client")
+export const pageClientStorage = clientify(pageStorage, { 
+  clientContext: PageClientContext 
+})
+```
+
+Each `StateVocabProvider` wraps its own subtree; a component that calls `pageClientStorage.user.name.useState()` reads only from the nearest `pageServerStorage.StateVocabProvider`, not from the layout provider.
+
 #### `serverify(storage)`
 
-Converts a storage tree into its server-side counterpart. Each leaf gains a `.getState()` method that reads the value seeded into the nearest `StateVocabProvider`. Each namespace node (including the root) gains a `.seed()` method that returns the input wrapped under its full ancestor path. This method is optional for using. The result also exposes `StateVocabProvider` — a server-aware provider that accepts a plain object `value` prop to pre-seed the store.
+Converts a storage tree into its server-side counterpart. Each leaf gains an async `.getState()` method that resolves once the nearest `StateVocabProvider` renders and provides its value. Each namespace node (including the root) gains a `.seed()` method that returns the input wrapped under its full ancestor path. The result also exposes `StateVocabProvider` and `start()` — call `start()` at the top of the component that renders `StateVocabProvider` so concurrent server children can await the value without timing out.
 
 **`.seed()` syntax:**
 
@@ -457,7 +512,7 @@ serverStorage.person.address.seed({ city: 'NY' })
 // → { person: { address: { city: 'NY' } } }
 ```
 
-**`node.getState()`** reads the value for that leaf from the surrounding `StateVocabProvider`. Throws if called outside one.
+**`node.getState()`** asynchronously reads the value for that leaf once the surrounding `StateVocabProvider` has rendered. Returns `Promise<V>` — always `await` it. Throws (rejects) if called outside a provider scope or if `serverTimeout` expires.
 
 #### `clientify(storage)`
 
@@ -694,33 +749,56 @@ import { StateVocabClientProvider } from '@yakocloud/state-vocab/client'
 </StateVocabClientProvider>
 ```
 
-### `serverify<T>(storage: T)`
+### `serverify<T>(storage: T, options)`
 
 Converts a storage tree to its server-side counterpart. Available from `@yakocloud/state-vocab/server`.
 
-Each leaf gains `.getState()` — reads the value from the nearest `StateVocabProvider`. Each namespace node gains `.seed()`, which returns the input wrapped under its full ancestor path. The result also includes `StateVocabProvider` — use it instead of importing from `@yakocloud/state-vocab/server`.
+| Option | Type | Description |
+|---|---|---|
+| `clientContext` | `Context<object>` | **Required.** A React context created with `createContext({})` in a `"use client"` file. Must match the `clientContext` passed to `clientify` for the same storage tree. |
+| `serverTimeout` | `number \| undefined` | Timeout in ms for each `getState()` call. Defaults to `1000`. If the `StateVocabProvider` has not rendered within this window, `getState()` rejects with a descriptive error. |
+
+The result exposes:
+
+- **`start()`** — call once at the top of the component that renders `StateVocabProvider`, before any `await` expressions. It registers a pending promise in the per-request store (`React.cache()` scope), which lets concurrent server components `await getState()` without hanging. Must be called within a React render context.
+- **`StateVocabProvider`** — synchronous server component that accepts a `value` prop and resolves the pending promise registered by `start()`.
+- **`node.getState()`** — async; reads the value for that leaf once the nearest `StateVocabProvider` has rendered. Throws if called outside a provider scope or if the timeout expires.
+- **`node.seed(input)`** — wraps `input` under the node's ancestor path, returning a plain object ready to pass as the `value` prop.
 
 ```ts
 import { serverify } from '@yakocloud/state-vocab/server'
-const serverStorage = serverify(storage)
+import { MyClientContext } from '@/storage.context.client'
 
-const { StateVocabProvider } = serverStorage        // server-aware provider
+const serverStorage = serverify(storage, {
+  clientContext: MyClientContext,
+  serverTimeout: 2000, // optional, default 1000
+})
 
-serverStorage.user.name.getState()                  // reads "user.name" from context
-serverStorage.user.seed({ name: 'Alice' })          // → { user: { name: 'Alice' } }
-serverStorage.person.address.seed({ city: 'NY' })   // → { person: { address: { city: 'NY' } } }
-serverStorage.seed({ user: { name: 'Alice' } })     // → { user: { name: 'Alice' } } (identity)
+const { StateVocabProvider } = serverStorage
+
+// In a Server Component:
+serverStorage.start()                                  // register before rendering
+await serverStorage.user.name.getState()               // reads "user.name" (async)
+serverStorage.user.seed({ name: 'Alice' })             // → { user: { name: 'Alice' } }
+serverStorage.person.address.seed({ city: 'NY' })      // → { person: { address: { city: 'NY' } } }
+serverStorage.seed({ user: { name: 'Alice' } })        // → { user: { name: 'Alice' } } (identity)
 ```
 
-### `clientify<T>(storage: T)`
+### `clientify<T>(storage: T, options?)`
 
 Converts a storage tree to its client-side counterpart. Available from `@yakocloud/state-vocab/client`.
 
+| Option | Type | Description |
+|---|---|---|
+| `clientContext` | `Context<object> \| undefined` | The React context created with `createContext({})` for this storage tree. Must match the `clientContext` passed to `serverify`. Required when using RSC; omit for SPA-only setups. |
+
 Each leaf gains `.useState()` and `.useInitialState()`. The tree structure mirrors the original.
 
 ```ts
 import { clientify } from '@yakocloud/state-vocab/client'
-const clientStorage = clientify(storage)
+import { MyClientContext } from '@/storage.context.client'
+
+const clientStorage = clientify(storage, { clientContext: MyClientContext })
 
 // In a "use client" component:
 const [name] = clientStorage.user.name.useState()

package/dist/client.cjs.js

@@ -1 +1 @@
-"use client";"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("react"),v=require("./constants-CbsduCZ7.js"),a=require("./utils-0CTNJ4ZE.js"),V=require("./provider-client-B4XQ24JB.js");function D(t,e,n=[]){return u.useMemo(()=>a.debounce(t,e),n)}const g=t=>{const{vocabStore:e,storage:n,statePath:o,value:i,deserialize:S,serialize:l}=t,f=n.getItem(o);f===null?a.isValueDefined(i)&&n.setItem(o,l(i)):e.set(o,S(f))},z=typeof window>"u",O=z?u.useEffect:u.useLayoutEffect,m=new V.VocabStore,A="Make sure your component is wrapped in StateVocabProvider (RSC) or disable ssr option in setupStorage for SPA (RCC only)";function I(t){t??={};const e=z?void 0:a.valueOrFactory(t.storage),n=a.valueOrFactory(t.defaultValue),o=t.bidirectional,i=this[v.STATE_PATH],S=this[v.STATE_VERBOSE],l=this[v.STATE_VERBOSE_PATH],f=this[v.STATE_SSR];let s=V.useStateVocabClientContext({verbose:S});if(!(s instanceof V.VocabStore)){if(f)throw new Error(A);s=m}const d=t.serialize??JSON.stringify,c=t.deserialize??JSON.parse,E=D(t.onSet??(()=>{}),t.delayedSet,[]),y=u.useRef(void 0),C=u.useRef(!1);if(!C.current){C.current=!0;let r=s.get(i);a.isValueDefined(r)||(r=n,a.isValueDefined(r)&&s.set(i,r)),!f&&e&&g({vocabStore:s,storage:e,statePath:i,value:r,serialize:d,deserialize:c})}const h=u.useSyncExternalStore(s.subscribe.bind(s),s.getClientSnapshot.bind(s),s.getServerSnapshot.bind(s));if(S)if(l){const r=a.get(h,l);r&&a.logStyled(r)}else a.logStyled(h);const T=a.get(h,i,n);y.current=T,O(()=>{!f||!e||g({vocabStore:s,storage:e,statePath:i,value:T,serialize:d,deserialize:c})},[]);const w=u.useEffectEvent(r=>{if(r.key!==i)return;const b=r.newValue,R=(b===null?null:c(b))??n;a.isValueDefined(R)&&(s.set(i,R),E(R,y.current))});u.useEffect(()=>{if(o)return window.addEventListener("storage",w),()=>window.removeEventListener("storage",w)},[o]);const p=u.useCallback(r=>{const b=a.isTransformer(r)?r(y.current):r;s.set(i,b),E(b,y.current),e&&e.setItem(i,d(b))},[s,i,E,e,d]),_=u.useCallback(()=>{const r=n;if(!a.isValueDefined(r)){e?.removeItem(i);return}s.set(i,r),E(r,y.current),e&&e.setItem(i,d(r))},[n,s,i,E,e,d]);return[T,p,_]}function k(t){t??={};const e=z?void 0:a.valueOrFactory(t.storage),n=a.valueOrFactory(t.defaultValue),o=this[v.STATE_PATH],i=this[v.STATE_VERBOSE],S=this[v.STATE_SSR];let l=V.useStateVocabClientContext({verbose:i});if(!(l instanceof V.VocabStore)){if(S)throw new Error(A);l=m}const f=t.serialize??JSON.stringify,s=t.deserialize??JSON.parse,d=u.useRef(!1);let c;d.current||(d.current=!0,c=l.get(o),a.isValueDefined(c)||(c=n,a.isValueDefined(c)&&l.set(o,c)),!S&&e&&g({vocabStore:l,storage:e,statePath:o,value:c,serialize:f,deserialize:s})),O(()=>{!S||!e||g({vocabStore:l,storage:e,statePath:o,value:c,serialize:f,deserialize:s})},[])}function q(t){return typeof t=="object"&&t!==null&&"clientSlot"in t}function P(t){const e={};for(const n in t){const o=t[n];q(o)?(e[n]=o.clientSlot({useState(...i){return I.apply(this,i)},useInitialState(...i){k.apply(this,i)}}),delete e[n].serverSlot,delete e[n].clientSlot):o!==null&&typeof o=="object"?e[n]=P(o):e[n]=o}return e}exports.StateVocabClientProvider=V.StateVocabClientProvider;exports.clientify=P;
+"use client";"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("react"),v=require("./constants-CbsduCZ7.js"),a=require("./utils-CuApuc3e.js"),V=require("./provider-client-DRdFy5dG.js");function D(t,n,s=[]){return f.useMemo(()=>a.debounce(t,n),s)}const y=t=>{const{vocabStore:n,storage:s,statePath:o,value:e,deserialize:l,serialize:c}=t,d=s.getItem(o);d===null?a.isValueDefined(e)&&s.setItem(o,c(e)):n.set(o,l(d))},R=typeof window>"u",m=R?f.useEffect:f.useLayoutEffect,A=new V.VocabStore,P="Make sure your component is wrapped in StateVocabProvider (RSC) or disable ssr option in setupStorage for SPA (RCC only)";function I(t){const n=R?void 0:a.valueOrFactory(t.storage),s=a.valueOrFactory(t.defaultValue),o=t.bidirectional,e=this[v.STATE_PATH],l=this[v.STATE_VERBOSE],c=this[v.STATE_VERBOSE_PATH],d=this[v.STATE_SSR];let i=V.useStateVocabClientContext({clientContext:t.clientContext,verbose:l});if(!(i instanceof V.VocabStore)){if(d)throw new Error(P);i=A}const S=t.serialize??JSON.stringify,u=t.deserialize??JSON.parse,E=D(t.onSet??(()=>{}),t.delayedSet,[]),g=f.useRef(void 0),z=f.useRef(!1);if(!z.current){z.current=!0;let r=i.get(e);a.isValueDefined(r)||(r=s,a.isValueDefined(r)&&i.set(e,r)),!d&&n&&y({vocabStore:i,storage:n,statePath:e,value:r,serialize:S,deserialize:u})}const C=f.useSyncExternalStore(i.subscribe.bind(i),i.getClientSnapshot.bind(i),i.getServerSnapshot.bind(i));if(l)if(c){const r=a.get(C,c);r&&a.logStyled(r)}else a.logStyled(C);const h=a.get(C,e,s);g.current=h,m(()=>{!d||!n||y({vocabStore:i,storage:n,statePath:e,value:h,serialize:S,deserialize:u})},[]);const w=f.useEffectEvent(r=>{if(r.key!==e)return;const b=r.newValue,T=(b===null?null:u(b))??s;a.isValueDefined(T)&&(i.set(e,T),E(T,g.current))});f.useEffect(()=>{if(o)return window.addEventListener("storage",w),()=>window.removeEventListener("storage",w)},[o]);const x=f.useCallback(r=>{const b=a.isTransformer(r)?r(g.current):r;i.set(e,b),E(b,g.current),n&&n.setItem(e,S(b))},[i,e,E,n,S]),_=f.useCallback(()=>{const r=s;if(!a.isValueDefined(r)){n?.removeItem(e);return}i.set(e,r),E(r,g.current),n&&n.setItem(e,S(r))},[s,i,e,E,n,S]);return[h,x,_]}function p(t){const n=R?void 0:a.valueOrFactory(t.storage),s=a.valueOrFactory(t.defaultValue),o=this[v.STATE_PATH],e=this[v.STATE_VERBOSE],l=this[v.STATE_SSR];let c=V.useStateVocabClientContext({clientContext:t.clientContext,verbose:e});if(!(c instanceof V.VocabStore)){if(l)throw new Error(P);c=A}const d=t.serialize??JSON.stringify,i=t.deserialize??JSON.parse,S=f.useRef(!1);let u;S.current||(S.current=!0,u=c.get(o),a.isValueDefined(u)||(u=s,a.isValueDefined(u)&&c.set(o,u)),!l&&n&&y({vocabStore:c,storage:n,statePath:o,value:u,serialize:d,deserialize:i})),m(()=>{!l||!n||y({vocabStore:c,storage:n,statePath:o,value:u,serialize:d,deserialize:i})},[])}function k(t){return typeof t=="object"&&t!==null&&"clientSlot"in t}function O(t,n={}){const s={};for(const o in t){const e=t[o];k(e)?(s[o]=e.clientSlot({useState(l){return I.apply(this,[{clientContext:n.clientContext,...l}])},useInitialState(l){p.apply(this,[{clientContext:n.clientContext,...l}])}}),delete s[o].serverSlot,delete s[o].clientSlot):e!==null&&typeof e=="object"?s[o]=O(e,n):s[o]=e}return s}exports.StateVocabClientProvider=V.StateVocabClientProvider;exports.clientify=O;

package/dist/client.es.js

@@ -1,37 +1,39 @@
 "use client";
-import { useMemo as x, useRef as y, useSyncExternalStore as B, useEffectEvent as D, useEffect as A, useCallback as T, useLayoutEffect as H } from "react";
-import { S as I, a as O, b as _, c as F } from "./constants-BB1YAX6c.mjs";
-import { a as d, d as G, v as g, g as C, l as P, i as q } from "./utils-xV3x3fTc.mjs";
-import { V as z, u as k } from "./provider-client-C2Aw0Lmi.mjs";
-import { S as ie } from "./provider-client-C2Aw0Lmi.mjs";
-function K(t, e, n = []) {
-  return x(
-    () => G(t, e),
+import { useMemo as j, useRef as y, useSyncExternalStore as B, useEffectEvent as D, useEffect as P, useCallback as p, useLayoutEffect as H } from "react";
+import { S as A, a as I, b as O, c as F } from "./constants-BB1YAX6c.mjs";
+import { a as d, d as G, v as g, g as T, l as x, i as q } from "./utils-xNWifFE9.mjs";
+import { V as C, u as _ } from "./provider-client-BhPeK8Kz.mjs";
+import { S as ne } from "./provider-client-BhPeK8Kz.mjs";
+function K(t, s, i = []) {
+  return j(
+    () => G(t, s),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    n
+    i
   );
 }
 const E = (t) => {
   const {
-    vocabStore: e,
-    storage: n,
+    vocabStore: s,
+    storage: i,
     statePath: o,
-    value: s,
-    deserialize: f,
-    serialize: a
-  } = t, c = n.getItem(o);
-  c === null ? d(s) && n.setItem(o, a(s)) : e.set(o, f(c));
-}, p = typeof window > "u", J = p ? A : H, L = new z(), N = "Make sure your component is wrapped in StateVocabProvider (RSC) or disable ssr option in setupStorage for SPA (RCC only)";
+    value: e,
+    deserialize: a,
+    serialize: l
+  } = t, u = i.getItem(o);
+  u === null ? d(e) && i.setItem(o, l(e)) : s.set(o, a(u));
+}, z = typeof window > "u", k = z ? P : H, J = new C(), L = "Make sure your component is wrapped in StateVocabProvider (RSC) or disable ssr option in setupStorage for SPA (RCC only)";
 function Q(t) {
-  t ??= {};
-  const e = p ? void 0 : g(t.storage), n = g(t.defaultValue), o = t.bidirectional, s = this[I], f = this[O], a = this[F], c = this[_];
-  let r = k({ verbose: f });
-  if (!(r instanceof z)) {
-    if (c)
-      throw new Error(N);
-    r = L;
+  const s = z ? void 0 : g(t.storage), i = g(t.defaultValue), o = t.bidirectional, e = this[A], a = this[I], l = this[F], u = this[O];
+  let r = _({
+    clientContext: t.clientContext,
+    verbose: a
+  });
+  if (!(r instanceof C)) {
+    if (u)
+      throw new Error(L);
+    r = J;
   }
-  const u = t.serialize ?? JSON.stringify, l = t.deserialize ?? JSON.parse, v = K(
+  const f = t.serialize ?? JSON.stringify, c = t.deserialize ?? JSON.parse, v = K(
     t.onSet ?? (() => {
     }),
     t.delayedSet,
@@ -39,14 +41,14 @@ function Q(t) {
   ), b = y(void 0), w = y(!1);
   if (!w.current) {
     w.current = !0;
-    let i = r.get(s);
-    d(i) || (i = n, d(i) && r.set(s, i)), !c && e && E({
+    let n = r.get(e);
+    d(n) || (n = i, d(n) && r.set(e, n)), !u && s && E({
       vocabStore: r,
-      storage: e,
-      statePath: s,
-      value: i,
-      serialize: u,
-      deserialize: l
+      storage: s,
+      statePath: e,
+      value: n,
+      serialize: f,
+      deserialize: c
     });
   }
   const h = B(
@@ -54,75 +56,77 @@ function Q(t) {
     r.getClientSnapshot.bind(r),
     r.getServerSnapshot.bind(r)
   );
-  if (f)
-    if (a) {
-      const i = C(h, a);
-      i && P(i);
+  if (a)
+    if (l) {
+      const n = T(h, l);
+      n && x(n);
     } else
-      P(h);
-  const m = C(h, s, n);
-  b.current = m, J(() => {
-    !c || !e || E({
+      x(h);
+  const m = T(h, e, i);
+  b.current = m, k(() => {
+    !u || !s || E({
       vocabStore: r,
-      storage: e,
-      statePath: s,
+      storage: s,
+      statePath: e,
       value: m,
-      serialize: u,
-      deserialize: l
+      serialize: f,
+      deserialize: c
     });
   }, []);
-  const R = D((i) => {
-    if (i.key !== s)
+  const R = D((n) => {
+    if (n.key !== e)
       return;
-    const S = i.newValue, V = (S === null ? null : l(S)) ?? n;
-    d(V) && (r.set(s, V), v(V, b.current));
+    const S = n.newValue, V = (S === null ? null : c(S)) ?? i;
+    d(V) && (r.set(e, V), v(V, b.current));
   });
-  A(() => {
+  P(() => {
     if (o)
       return window.addEventListener("storage", R), () => window.removeEventListener("storage", R);
   }, [o]);
-  const M = T((i) => {
-    const S = q(i) ? i(b.current) : i;
-    r.set(s, S), v(S, b.current), e && e.setItem(s, u(S));
-  }, [r, s, v, e, u]), j = T(() => {
-    const i = n;
-    if (!d(i)) {
-      e?.removeItem(s);
+  const N = p((n) => {
+    const S = q(n) ? n(b.current) : n;
+    r.set(e, S), v(S, b.current), s && s.setItem(e, f(S));
+  }, [r, e, v, s, f]), M = p(() => {
+    const n = i;
+    if (!d(n)) {
+      s?.removeItem(e);
       return;
     }
-    r.set(s, i), v(i, b.current), e && e.setItem(s, u(i));
-  }, [n, r, s, v, e, u]);
+    r.set(e, n), v(n, b.current), s && s.setItem(e, f(n));
+  }, [i, r, e, v, s, f]);
   return [
     m,
-    M,
-    j
+    N,
+    M
   ];
 }
 function U(t) {
-  t ??= {};
-  const e = p ? void 0 : g(t.storage), n = g(t.defaultValue), o = this[I], s = this[O], f = this[_];
-  let a = k({ verbose: s });
-  if (!(a instanceof z)) {
-    if (f)
-      throw new Error(N);
-    a = L;
+  const s = z ? void 0 : g(t.storage), i = g(t.defaultValue), o = this[A], e = this[I], a = this[O];
+  let l = _({
+    clientContext: t.clientContext,
+    verbose: e
+  });
+  if (!(l instanceof C)) {
+    if (a)
+      throw new Error(L);
+    l = J;
   }
-  const c = t.serialize ?? JSON.stringify, r = t.deserialize ?? JSON.parse, u = y(!1);
-  let l;
-  u.current || (u.current = !0, l = a.get(o), d(l) || (l = n, d(l) && a.set(o, l)), !f && e && E({
-    vocabStore: a,
-    storage: e,
+  const u = t.serialize ?? JSON.stringify, r = t.deserialize ?? JSON.parse, f = y(!1);
+  let c;
+  f.current || (f.current = !0, c = l.get(o), d(c) || (c = i, d(c) && l.set(o, c)), !a && s && E({
+    vocabStore: l,
+    storage: s,
     statePath: o,
-    value: l,
-    serialize: c,
+    value: c,
+    serialize: u,
     deserialize: r
-  })), J(() => {
-    !f || !e || E({
-      vocabStore: a,
-      storage: e,
+  })), k(() => {
+    !a || !s || E({
+      vocabStore: l,
+      storage: s,
       statePath: o,
-      value: l,
-      serialize: c,
+      value: c,
+      serialize: u,
       deserialize: r
     });
   }, []);
@@ -130,22 +134,28 @@ function U(t) {
 function W(t) {
   return typeof t == "object" && t !== null && "clientSlot" in t;
 }
-function X(t) {
-  const e = {};
-  for (const n in t) {
-    const o = t[n];
-    W(o) ? (e[n] = o.clientSlot({
-      useState(...s) {
-        return Q.apply(this, s);
+function X(t, s = {}) {
+  const i = {};
+  for (const o in t) {
+    const e = t[o];
+    W(e) ? (i[o] = e.clientSlot({
+      useState(a) {
+        return Q.apply(this, [{
+          clientContext: s.clientContext,
+          ...a
+        }]);
       },
-      useInitialState(...s) {
-        U.apply(this, s);
+      useInitialState(a) {
+        U.apply(this, [{
+          clientContext: s.clientContext,
+          ...a
+        }]);
       }
-    }), delete e[n].serverSlot, delete e[n].clientSlot) : o !== null && typeof o == "object" ? e[n] = X(o) : e[n] = o;
+    }), delete i[o].serverSlot, delete i[o].clientSlot) : e !== null && typeof e == "object" ? i[o] = X(e, s) : i[o] = e;
   }
-  return e;
+  return i;
 }
 export {
-  ie as StateVocabClientProvider,
+  ne as StateVocabClientProvider,
   X as clientify
 };

package/dist/index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./constants-CbsduCZ7.js"),h=require("./utils-0CTNJ4ZE.js");function z(t={}){return{[r.STATE_DEFINITION]:!0,[r.STATE_PATH]:"",[r.STATE_VERBOSE]:!1,[r.STATE_VERBOSE_PATH]:"",[r.STATE_SSR]:!1,serverSlot(a){return Object.assign(this,{getState(...e){return a.getState.apply(this,e)}})},clientSlot(a){return Object.assign(this,{useState(e){return e??={},a.useState.apply(this,[{defaultValue:h.valueOrFactory(e.defaultValue)??h.valueOrFactory(t.defaultValue),bidirectional:e.bidirectional??t.bidirectional,storage:e.storage??t.storage,serialize:t.serialize??JSON.stringify,deserialize:t.deserialize??JSON.parse,delayedSet:e.delayedSet,onSet(...f){e.onSet&&e.onSet(...f)}}])},useInitialState(e){a.useInitialState.apply(this,[{defaultValue:e.defaultValue,storage:t.storage,serialize:t.serialize,deserialize:t.deserialize}])}})},toString(){return this[r.STATE_PATH]}}}function y(t,a){const{path:e="",verbose:f,verbosePath:A,ssr:b,cache:c}=a;let s=c.proxy.get(t);s||(s=new Map,c.proxy.set(t,s));const o=s.get(e);if(o)return o;const d=new Proxy(t,{get(P,T){const l=P[T],S=e?`${e}.${String(T)}`:String(T);if(l&&typeof l=="object"&&r.STATE_DEFINITION in l){const i=l;let n=c.leaf.get(i);n||(n=new Map,c.leaf.set(i,n));const g=n.get(S);if(g)return g;const _=Reflect.ownKeys(i).filter(u=>typeof i[u]=="function"),v=Object.fromEntries(_.map(u=>[u,(...V)=>i[u].call({...i,[r.STATE_PATH]:S,[r.STATE_VERBOSE]:f,[r.STATE_VERBOSE_PATH]:A,[r.STATE_SSR]:b},...V)])),E={...i,...v};return n.set(S,E),E}return l&&typeof l=="object"?y(l,{...a,path:S}):l}});return s.set(e,d),d}function I(t,a){return y(t,{...a,ssr:a?.ssr??!0,verbosePath:a?.verbosePath??"",cache:{proxy:new WeakMap,leaf:new WeakMap}})}exports.defineState=z;exports.setupStorage=I;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./constants-CbsduCZ7.js"),h=require("./utils-CuApuc3e.js");function z(t={}){return{[r.STATE_DEFINITION]:!0,[r.STATE_PATH]:"",[r.STATE_VERBOSE]:!1,[r.STATE_VERBOSE_PATH]:"",[r.STATE_SSR]:!1,serverSlot(a){return Object.assign(this,{getState(...e){return a.getState.apply(this,e)}})},clientSlot(a){return Object.assign(this,{useState(e){return e??={},a.useState.apply(this,[{defaultValue:h.valueOrFactory(e.defaultValue)??h.valueOrFactory(t.defaultValue),bidirectional:e.bidirectional??t.bidirectional,storage:e.storage??t.storage,serialize:t.serialize??JSON.stringify,deserialize:t.deserialize??JSON.parse,delayedSet:e.delayedSet,onSet(...f){e.onSet&&e.onSet(...f)}}])},useInitialState(e){a.useInitialState.apply(this,[{defaultValue:e.defaultValue,storage:t.storage,serialize:t.serialize,deserialize:t.deserialize}])}})},toString(){return this[r.STATE_PATH]}}}function y(t,a){const{path:e="",verbose:f,verbosePath:A,ssr:b,cache:c}=a;let s=c.proxy.get(t);s||(s=new Map,c.proxy.set(t,s));const o=s.get(e);if(o)return o;const d=new Proxy(t,{get(P,T){const l=P[T],S=e?`${e}.${String(T)}`:String(T);if(l&&typeof l=="object"&&r.STATE_DEFINITION in l){const i=l;let n=c.leaf.get(i);n||(n=new Map,c.leaf.set(i,n));const g=n.get(S);if(g)return g;const _=Reflect.ownKeys(i).filter(u=>typeof i[u]=="function"),v=Object.fromEntries(_.map(u=>[u,(...V)=>i[u].call({...i,[r.STATE_PATH]:S,[r.STATE_VERBOSE]:f,[r.STATE_VERBOSE_PATH]:A,[r.STATE_SSR]:b},...V)])),E={...i,...v};return n.set(S,E),E}return l&&typeof l=="object"?y(l,{...a,path:S}):l}});return s.set(e,d),d}function I(t,a){return y(t,{...a,ssr:a?.ssr??!0,verbosePath:a?.verbosePath??"",cache:{proxy:new WeakMap,leaf:new WeakMap}})}exports.defineState=z;exports.setupStorage=I;

package/dist/index.es.js

@@ -1,5 +1,5 @@
 import { S as d, b as T, c as E, a as P, d as v } from "./constants-BB1YAX6c.mjs";
-import { v as b } from "./utils-xV3x3fTc.mjs";
+import { v as b } from "./utils-xNWifFE9.mjs";
 function M(t = {}) {
   return {
     [v]: !0,

package/dist/provider-client-BhPeK8Kz.mjs

@@ -0,0 +1,42 @@
+"use client";
+import { jsx as u } from "react/jsx-runtime";
+import { createContext as l, useContext as h, useState as S } from "react";
+import { g as i, i as C, s as b } from "./utils-xNWifFE9.mjs";
+const c = l({});
+function m(e) {
+  const t = h(e.clientContext ?? c);
+  return e.verbose && console.log(`[Store uid]: ${t.uid}`), t;
+}
+class d {
+  uid;
+  #t;
+  #e;
+  constructor(t) {
+    this.uid = Math.random().toString(36).slice(2), this.#t = t ?? {}, this.#e = /* @__PURE__ */ new Set();
+  }
+  subscribe(t) {
+    return this.#e.add(t), () => this.#e.delete(t);
+  }
+  getClientSnapshot() {
+    return this.#t;
+  }
+  getServerSnapshot() {
+    return this.#t;
+  }
+  get(t) {
+    return i(this.#t, t);
+  }
+  set(t, o) {
+    const n = i(this.#t, t), s = C(o) ? o(n) : o, r = { ...this.#t };
+    b(r, t, s), this.#t = r, this.#e.forEach((a) => a());
+  }
+}
+function v(e) {
+  const { clientContext: t, value: o, children: n } = e, [s] = S(() => new d(o));
+  return /* @__PURE__ */ u((t ?? c).Provider, { value: s, children: n });
+}
+export {
+  v as S,
+  d as V,
+  m as u
+};

package/dist/provider-client-DRdFy5dG.js

@@ -0,0 +1 @@
+"use client";"use strict";const h=require("react/jsx-runtime"),c=require("react"),r=require("./utils-CuApuc3e.js"),a=c.createContext({});function S(e){const t=c.useContext(e.clientContext??a);return e.verbose&&console.log(`[Store uid]: ${t.uid}`),t}class u{uid;#t;#e;constructor(t){this.uid=Math.random().toString(36).slice(2),this.#t=t??{},this.#e=new Set}subscribe(t){return this.#e.add(t),()=>this.#e.delete(t)}getClientSnapshot(){return this.#t}getServerSnapshot(){return this.#t}get(t){return r.get(this.#t,t)}set(t,n){const s=r.get(this.#t,t),i=r.isTransformer(n)?n(s):n,o={...this.#t};r.set(o,t,i),this.#t=o,this.#e.forEach(l=>l())}}function b(e){const{clientContext:t,value:n,children:s}=e,[i]=c.useState(()=>new u(n)),o=t??a;return h.jsx(o.Provider,{value:i,children:s})}exports.StateVocabClientProvider=b;exports.VocabStore=u;exports.useStateVocabClientContext=S;

package/dist/server.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("react/jsx-runtime"),S=require("./constants-CbsduCZ7.js"),d=require("react"),v=require("node:async_hooks"),f=require("./provider-client-B4XQ24JB.js"),b=require("./utils-0CTNJ4ZE.js");function y(e){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const r in e)if(r!=="default"){const n=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,n.get?n:{enumerable:!0,get:()=>e[r]})}}return t.default=e,Object.freeze(t)}const p=y(v),a=e=>{if(d.useState)throw new Error(`${e} only intended for Server Components`)};let s=null;try{a("StateVocabServerContext"),s=new p.AsyncLocalStorage}catch{s=null}const g=({value:e})=>(s?.enterWith({value:e}),null),P=({children:e})=>e,j=async e=>{a("StateVocabServerContext.Provider");const{value:t,children:r}=e;return o.jsxs(o.Fragment,{children:[o.jsx(g,{value:t}),r]})},h=()=>(a("getStateVocab"),s?.getStore()?.value),x={Provider:s?j:P},V=({value:e,children:t})=>o.jsx(x.Provider,{value:e,children:t});function m(e){const{children:t,value:r={}}=e;return o.jsx(V,{value:r,children:o.jsx(f.StateVocabClientProvider,{value:r,children:t})})}const O="Make sure your component is wrapped in StateVocabProvider";function C(){const e=this[S.STATE_PATH],t=h();if(!t)throw new Error(O);return b.get(t,e)}function E(e){return typeof e=="object"&&e!==null&&"serverSlot"in e}function l(e,t){const r={};for(const n in e){const c=e[n];if(E(c))r[n]=c.serverSlot({getState(...i){return C.apply(this,i)}}),delete r[n].serverSlot,delete r[n].clientSlot;else if(c!==null&&typeof c=="object"){const i=u=>t({[n]:u});r[n]=l(c,i)}else r[n]=c}return r.seed=n=>t(n),r}function k(e){return{...l(e,t=>t),StateVocabProvider({children:t,value:r}){return o.jsx(m,{value:r,children:t})}}}exports.serverify=k;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("react/jsx-runtime"),S=require("./constants-CbsduCZ7.js"),l=require("react"),m=require("./provider-client-DRdFy5dG.js"),a=require("./utils-CuApuc3e.js"),d=e=>{if(l.useState)throw new Error(`${e} only intended for Server Components`)},c=l.cache(()=>new Map),f=async e=>(d("getStateVocab"),await c().get(e)),u="Make sure your component is wrapped in StateVocabProvider";async function w(e){const t=this[S.STATE_PATH],r=await a.withTimeout(f(e.serverContextKey),e.timeout,`Failed access to "${t}". Reason: Operation timed out after ${e.timeout}ms. ${u}.`);if(!r)throw new Error(u);return a.get(r,t)}function b(e){return typeof e=="object"&&e!==null&&"serverSlot"in e}function v(e,t){const r={};for(const o in e){const n=e[o];if(b(n))r[o]=n.serverSlot({getState(){return w.apply(this,[{serverContextKey:t.serverContextKey,timeout:t.serverTimeout}])}}),delete r[o].serverSlot,delete r[o].clientSlot;else if(n!==null&&typeof n=="object"){const i=s=>t.wrap({[o]:s});r[o]=v(n,{serverContextKey:t.serverContextKey,serverTimeout:t.serverTimeout,wrap:i})}else r[o]=n}return r.seed=o=>t.wrap(o),r}function x(e,t){const r=Object.keys(e).slice(0,3).join("-"),o=Symbol(r),n=Promise.withResolvers();return{...v(e,{serverContextKey:o,serverTimeout:t.serverTimeout??1e3,wrap:i=>i}),start(){const{size:i}=c(),s=Symbol("test");if(c().set(s,n.promise),c().size===i)throw new Error("Start execution only within a React render context (per-request)");c().delete(s),c().set(o,n.promise)},StateVocabProvider({children:i,value:s}){return s??={},n.resolve(s),y.jsx(m.StateVocabClientProvider,{clientContext:t.clientContext,value:s,children:i})}}}exports.serverify=x;

package/dist/server.es.js

@@ -1,70 +1,76 @@
-import { jsxs as u, Fragment as v, jsx as c } from "react/jsx-runtime";
-import { S as d } from "./constants-BB1YAX6c.mjs";
-import f from "react";
-import * as p from "node:async_hooks";
-import { S as m } from "./provider-client-C2Aw0Lmi.mjs";
-import { g as b } from "./utils-xV3x3fTc.mjs";
-const i = (e) => {
-  if (f.useState)
+import { jsx as u } from "react/jsx-runtime";
+import { S as m } from "./constants-BB1YAX6c.mjs";
+import S, { cache as v } from "react";
+import { S as y } from "./provider-client-BhPeK8Kz.mjs";
+import { w as f, g as w } from "./utils-xNWifFE9.mjs";
+const p = (e) => {
+  if (S.useState)
     throw new Error(`${e} only intended for Server Components`);
-};
-let s = null;
-try {
-  i("StateVocabServerContext"), s = new p.AsyncLocalStorage();
-} catch {
-  s = null;
-}
-const h = ({ value: e }) => (s?.enterWith({ value: e }), null), y = ({ children: e }) => e, P = async (e) => {
-  i("StateVocabServerContext.Provider");
-  const { value: t, children: r } = e;
-  return /* @__PURE__ */ u(v, { children: [
-    /* @__PURE__ */ c(h, { value: t }),
-    r
-  ] });
-}, g = () => (i("getStateVocab"), s?.getStore()?.value), V = {
-  Provider: s ? P : y
-}, E = ({ value: e, children: t }) => /* @__PURE__ */ c(V.Provider, { value: e, children: t });
-function x(e) {
-  const { children: t, value: r = {} } = e;
-  return /* @__PURE__ */ c(E, { value: r, children: /* @__PURE__ */ c(m, { value: r, children: t }) });
+}, c = v(() => /* @__PURE__ */ new Map()), d = async (e) => (p("getStateVocab"), await c().get(e)), a = "Make sure your component is wrapped in StateVocabProvider";
+async function x(e) {
+  const t = this[m], r = await f(
+    d(e.serverContextKey),
+    e.timeout,
+    `Failed access to "${t}". Reason: Operation timed out after ${e.timeout}ms. ${a}.`
+  );
+  if (!r)
+    throw new Error(a);
+  return w(r, t);
 }
-const C = "Make sure your component is wrapped in StateVocabProvider";
-function w() {
-  const e = this[d], t = g();
-  if (!t)
-    throw new Error(C);
-  return b(t, e);
-}
-function R(e) {
+function b(e) {
   return typeof e == "object" && e !== null && "serverSlot" in e;
 }
 function l(e, t) {
   const r = {};
   for (const o in e) {
     const n = e[o];
-    if (R(n))
+    if (b(n))
       r[o] = n.serverSlot({
-        // Slot definition
-        getState(...a) {
-          return w.apply(this, a);
+        getState() {
+          return x.apply(this, [{
+            serverContextKey: t.serverContextKey,
+            timeout: t.serverTimeout
+          }]);
         }
       }), delete r[o].serverSlot, delete r[o].clientSlot;
     else if (n !== null && typeof n == "object") {
-      const a = (S) => t({ [o]: S });
-      r[o] = l(n, a);
+      const i = (s) => t.wrap({ [o]: s });
+      r[o] = l(n, {
+        serverContextKey: t.serverContextKey,
+        serverTimeout: t.serverTimeout,
+        wrap: i
+      });
     } else
       r[o] = n;
   }
-  return r.seed = (o) => t(o), r;
+  return r.seed = (o) => t.wrap(o), r;
 }
-function M(e) {
+function E(e, t) {
+  const r = Object.keys(e).slice(0, 3).join("-"), o = Symbol(r), n = Promise.withResolvers();
   return {
-    ...l(e, (t) => t),
-    StateVocabProvider({ children: t, value: r }) {
-      return /* @__PURE__ */ c(x, { value: r, children: t });
+    ...l(e, {
+      serverContextKey: o,
+      serverTimeout: t.serverTimeout ?? 1e3,
+      wrap: (i) => i
+    }),
+    start() {
+      const { size: i } = c(), s = /* @__PURE__ */ Symbol("test");
+      if (c().set(s, n.promise), c().size === i)
+        throw new Error("Start execution only within a React render context (per-request)");
+      c().delete(s), c().set(o, n.promise);
+    },
+    StateVocabProvider({ children: i, value: s }) {
+      return s ??= {}, n.resolve(s), /* @__PURE__ */ u(
+        y,
+        {
+          clientContext: t.clientContext,
+          value: s,
+          children: i
+        }
+      );
     }
   };
 }
 export {
-  M as serverify
+  E as serverify
 };

package/dist/types/context.client.d.ts

@@ -1,8 +1,10 @@
+import { type Context } from "react";
 import VocabStore from "./store";
-export declare const StateVocabClientContext: import("react").Context<VocabStore>;
+export declare const DefaultStateVocabClientContext: Context<VocabStore>;
 /**
  * @see method from from https://zustand.docs.pmnd.rs/learn/guides/nextjs
  */
 export declare function useStateVocabClientContext(options: {
+    clientContext: Context<VocabStore> | undefined;
     verbose: boolean;
 }): VocabStore;

package/dist/types/context.server.d.ts

@@ -1,10 +1,3 @@
-import type { PropsWithChildren, ReactNode } from "react";
 import type { Vocab } from "./state.types";
-export declare const getStateVocab: () => Vocab | undefined;
-export declare const StateVocabServerContext: {
-    Provider: (({ children }: PropsWithChildren<{
-        value?: Vocab;
-    }>) => ReactNode) | ((props: PropsWithChildren<{
-        value: Vocab;
-    }>) => Promise<import("react/jsx-runtime").JSX.Element>);
-};
+export declare const getRequestStore: () => Map<symbol, Promise<Vocab>>;
+export declare const getStateVocab: (serverContextKey: symbol) => Promise<Vocab | undefined>;

package/dist/types/provider.client.d.ts

@@ -1,5 +1,7 @@
-import { type PropsWithChildren } from "react";
+import { type Context, type PropsWithChildren } from "react";
+import VocabStore from "./store";
 import type { Vocab } from "./state.types";
 export declare function StateVocabClientProvider(props: PropsWithChildren<{
+    clientContext?: Context<VocabStore>;
     value?: Vocab;
 }>): import("react/jsx-runtime").JSX.Element;

package/dist/types/setup.client.d.ts

@@ -1,6 +1,10 @@
+import { type Context } from "react";
 import type { ValueOrTransformer, VocabThis } from "./state.types";
+import VocabStore from "./store";
 import type { UseInitialStateOptions, UseStateOptions } from "./setup.types";
-declare function useState<V>(this: VocabThis, options?: UseStateOptions<V>): readonly [V, (nextValue: ValueOrTransformer<V>) => void, () => void];
+declare function useState<V>(this: VocabThis, options: UseStateOptions<V> & {
+    clientContext: Context<VocabStore> | undefined;
+}): readonly [V, (nextValue: ValueOrTransformer<V>) => void, () => void];
 type Placeholder<V> = {
     useState(options?: UseStateOptions<V>): ReturnType<typeof useState<V>>;
     useInitialState(options?: UseInitialStateOptions<V>): void;
@@ -11,5 +15,7 @@ type Slot<V> = {
 type Clientified<R> = R extends Slot<infer TValue> ? Placeholder<TValue> : R extends object ? {
     [K in keyof R]: Clientified<R[K]>;
 } : R;
-export declare function clientify<R extends object>(tree: R): Clientified<R>;
+export declare function clientify<R extends object>(tree: R, clientifyOptions?: {
+    clientContext?: Context<object>;
+}): Clientified<R>;
 export {};

package/dist/types/setup.server.d.ts

@@ -1,26 +1,36 @@
-import type { PropsWithChildren, ReactNode } from "react";
-import type { Vocab } from "./state.types";
+import type { Context, PropsWithChildren, ReactNode } from "react";
+import type { Vocab, VocabThis } from "./state.types";
 type Placeholder<V> = {
-    getState(): V;
-};
-type Slot<V> = {
-    serverSlot(input: Placeholder<V>): Placeholder<V>;
+    getState(): Promise<V>;
 };
+type SlotValue<T> = T extends {
+    serverSlot(input: {
+        getState(this: VocabThis): infer V;
+    }): unknown;
+} ? V : never;
 type ServerifiedValue<R> = {
-    [K in keyof R]?: R[K] extends Slot<infer V> ? V : R[K] extends object ? ServerifiedValue<R[K]> : R[K];
+    [K in keyof R]?: [
+        SlotValue<R[K]>
+    ] extends [never] ? R[K] extends object ? ServerifiedValue<R[K]> : R[K] : SlotValue<R[K]>;
 };
-type Serverified<R> = R extends Slot<infer TValue> ? Placeholder<TValue> : R extends object ? {
+type Serverified<R> = [
+    SlotValue<R>
+] extends [never] ? R extends object ? {
     seed(input: ServerifiedValue<R>): Vocab;
 } & {
     [K in keyof R]: Serverified<R[K]>;
-} : R;
+} : R : Placeholder<SlotValue<R>>;
 type ServerifyResult<R extends object> = {
+    start(): void;
     seed(input: ServerifiedValue<R>): Vocab;
     StateVocabProvider(props: PropsWithChildren<{
         value?: ServerifiedValue<R>;
-    }>): Promise<ReactNode>;
+    }>): ReactNode;
 } & {
     [K in keyof R]: Serverified<R[K]>;
 };
-export declare function serverify<R extends object>(tree: R): ServerifyResult<R>;
+export declare function serverify<R extends object>(tree: R, serverifyOptions: {
+    clientContext: Context<object>;
+    serverTimeout?: number;
+}): ServerifyResult<R>;
 export {};

package/dist/types/state.d.ts

@@ -51,7 +51,5 @@ export declare function defineState<V>(superOptions?: {
         }): void;
     };
     /** Returns the fully qualified state name (dot-separated path). */
-    toString(this: {
-        [STATE_PATH]: string;
-    }): string;
+    toString(this: VocabThis): string;
 };

package/dist/types/utils.d.ts

@@ -7,3 +7,4 @@ export declare function logStyled(obj: unknown): void;
 export declare const isTransformer: <V>(v: ValueOrTransformer<V>) => v is Transformer<V>;
 export declare const isValueDefined: <V>(v: V | undefined) => v is V;
 export declare const valueOrFactory: <V>(input: ValueOrFactory<V>) => V;
+export declare function withTimeout<T>(promise: Promise<T>, ms: number, message: string): Promise<T>;

package/dist/utils-CuApuc3e.js

@@ -0,0 +1,3 @@
+"use strict";function f(e,r,o){if(!r)return e;const n=r.split(".");let t=e;for(const c of n)if(t!==null&&typeof t=="object"&&c in t)t=t[c];else return o;return t===void 0?o:t}function y(e,r,o){const n=r.replace(/\[(\d+)\]/g,".$1").split(".");let t=e;for(let c=0;c<n.length-1;c++){const s=n[c],i=n[c+1];(t[s]===void 0||t[s]===null)&&(t[s]=/^\d+$/.test(i)?[]:{}),t=t[s]}return t[n[n.length-1]]=o,e}function a(e,r=0){let o;return function(...n){o!==void 0&&clearTimeout(o),o=setTimeout(()=>{o=void 0,e.apply(this,n)},r)}}function d(e){const r=JSON.stringify(e,null,2).split(`
+`),o=[],n=[];for(const t of r){const c=t.match(/^(\s*)"([^"]+)"(\s*:\s*)(.+)$/);if(c){const[,s,i,l,u]=c;o.push(`${s}%c"${i}"%c${l}%c${u}`),n.push("color: #9cdcfe; font-weight: bold","color: #cccccc","color: #ce9178")}else o.push(`%c${t}`),n.push("color: #cccccc")}console.log(o.join(`
+`),...n,e)}const m=e=>typeof e=="function",p=e=>typeof e=="function",h=e=>typeof e<"u",g=e=>p(e)?e():e;async function T(e,r,o){let n;try{return await Promise.race([e,new Promise((t,c)=>{n=setTimeout(()=>{c(new Error(o))},r)})])}finally{clearTimeout(n)}}exports.debounce=a;exports.get=f;exports.isTransformer=m;exports.isValueDefined=h;exports.logStyled=d;exports.set=y;exports.valueOrFactory=g;exports.withTimeout=T;

package/dist/utils-xNWifFE9.mjs

@@ -0,0 +1,73 @@
+function a(t, s, o) {
+  if (!s)
+    return t;
+  const n = s.split(".");
+  let e = t;
+  for (const c of n)
+    if (e !== null && typeof e == "object" && c in e)
+      e = e[c];
+    else
+      return o;
+  return e === void 0 ? o : e;
+}
+function y(t, s, o) {
+  const n = s.replace(/\[(\d+)\]/g, ".$1").split(".");
+  let e = t;
+  for (let c = 0; c < n.length - 1; c++) {
+    const r = n[c], i = n[c + 1];
+    (e[r] === void 0 || e[r] === null) && (e[r] = /^\d+$/.test(i) ? [] : {}), e = e[r];
+  }
+  return e[n[n.length - 1]] = o, t;
+}
+function d(t, s = 0) {
+  let o;
+  return function(...n) {
+    o !== void 0 && clearTimeout(o), o = setTimeout(() => {
+      o = void 0, t.apply(this, n);
+    }, s);
+  };
+}
+function p(t) {
+  const s = JSON.stringify(t, null, 2).split(`
+`), o = [], n = [];
+  for (const e of s) {
+    const c = e.match(/^(\s*)"([^"]+)"(\s*:\s*)(.+)$/);
+    if (c) {
+      const [, r, i, l, u] = c;
+      o.push(`${r}%c"${i}"%c${l}%c${u}`), n.push(
+        "color: #9cdcfe; font-weight: bold",
+        "color: #cccccc",
+        "color: #ce9178"
+      );
+    } else
+      o.push(`%c${e}`), n.push("color: #cccccc");
+  }
+  console.log(o.join(`
+`), ...n, t);
+}
+const m = (t) => typeof t == "function", f = (t) => typeof t == "function", h = (t) => typeof t < "u", g = (t) => f(t) ? t() : t;
+async function $(t, s, o) {
+  let n;
+  try {
+    return await Promise.race([
+      t,
+      new Promise((e, c) => {
+        n = setTimeout(() => {
+          c(new Error(o));
+        }, s);
+      })
+    ]);
+  } finally {
+    clearTimeout(n);
+  }
+}
+export {
+  h as a,
+  d,
+  a as g,
+  m as i,
+  p as l,
+  y as s,
+  g as v,
+  $ as w
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yakocloud/state-vocab",
-  "version": "4.0.3",
+  "version": "4.2.0",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
   "types": "dist/types/index.d.ts",

package/dist/provider-client-B4XQ24JB.js

@@ -1 +0,0 @@
-"use client";"use strict";const h=require("react/jsx-runtime"),r=require("react"),s=require("./utils-0CTNJ4ZE.js"),c=r.createContext({});function S(o){const t=r.useContext(c);return o.verbose&&console.log(`[Store uid]: ${t.uid}`),t}class u{#t;#e;constructor(t){this.uid=Math.random().toString(36).slice(2),this.#t=t??{},this.#e=new Set}subscribe(t){return this.#e.add(t),()=>this.#e.delete(t)}getClientSnapshot(){return this.#t}getServerSnapshot(){return this.#t}get(t){return s.get(this.#t,t)}set(t,e){const n=s.get(this.#t,t),a=s.isTransformer(e)?e(n):e,i={...this.#t};s.set(i,t,a),this.#t=i,this.#e.forEach(l=>l())}}function b(o){const{children:t,value:e}=o,[n]=r.useState(()=>new u(e));return h.jsx(c.Provider,{value:n,children:t})}exports.StateVocabClientProvider=b;exports.VocabStore=u;exports.useStateVocabClientContext=S;

package/dist/provider-client-C2Aw0Lmi.mjs

@@ -1,41 +0,0 @@
-"use client";
-import { jsx as u } from "react/jsx-runtime";
-import { createContext as h, useContext as l, useState as S } from "react";
-import { g as n, i as d, s as b } from "./utils-xV3x3fTc.mjs";
-const i = h({});
-function V(s) {
-  const t = l(i);
-  return s.verbose && console.log(`[Store uid]: ${t.uid}`), t;
-}
-class f {
-  #t;
-  #e;
-  constructor(t) {
-    this.uid = Math.random().toString(36).slice(2), this.#t = t ?? {}, this.#e = /* @__PURE__ */ new Set();
-  }
-  subscribe(t) {
-    return this.#e.add(t), () => this.#e.delete(t);
-  }
-  getClientSnapshot() {
-    return this.#t;
-  }
-  getServerSnapshot() {
-    return this.#t;
-  }
-  get(t) {
-    return n(this.#t, t);
-  }
-  set(t, e) {
-    const o = n(this.#t, t), c = d(e) ? e(o) : e, r = { ...this.#t };
-    b(r, t, c), this.#t = r, this.#e.forEach((a) => a());
-  }
-}
-function g(s) {
-  const { children: t, value: e } = s, [o] = S(() => new f(e));
-  return /* @__PURE__ */ u(i.Provider, { value: o, children: t });
-}
-export {
-  g as S,
-  f as V,
-  V as u
-};

package/dist/types/provider.d.ts

@@ -1,5 +0,0 @@
-import type { PropsWithChildren } from "react";
-import type { Vocab } from "./state.types";
-export declare function StateVocabProvider(props: PropsWithChildren<{
-    value?: Vocab;
-}>): import("react/jsx-runtime").JSX.Element;

package/dist/types/provider.server.d.ts

@@ -1,5 +0,0 @@
-import type { Vocab } from "./state.types";
-import type { PropsWithChildren } from "react";
-export declare const StateVocabServerProvider: React.FC<PropsWithChildren<{
-    value: Vocab;
-}>>;

package/dist/utils-0CTNJ4ZE.js

@@ -1,3 +0,0 @@
-"use strict";function f(e,s,n){if(!s)return e;const o=s.split(".");let t=e;for(const c of o)if(t!==null&&typeof t=="object"&&c in t)t=t[c];else return n;return t===void 0?n:t}function y(e,s,n){const o=s.replace(/\[(\d+)\]/g,".$1").split(".");let t=e;for(let c=0;c<o.length-1;c++){const r=o[c],i=o[c+1];(t[r]===void 0||t[r]===null)&&(t[r]=/^\d+$/.test(i)?[]:{}),t=t[r]}return t[o[o.length-1]]=n,e}function d(e,s=0){let n;return function(...o){n!==void 0&&clearTimeout(n),n=setTimeout(()=>{n=void 0,e.apply(this,o)},s)}}function a(e){const s=JSON.stringify(e,null,2).split(`
-`),n=[],o=[];for(const t of s){const c=t.match(/^(\s*)"([^"]+)"(\s*:\s*)(.+)$/);if(c){const[,r,i,l,u]=c;n.push(`${r}%c"${i}"%c${l}%c${u}`),o.push("color: #9cdcfe; font-weight: bold","color: #cccccc","color: #ce9178")}else n.push(`%c${t}`),o.push("color: #cccccc")}console.log(n.join(`
-`),...o,e)}const p=e=>typeof e=="function",g=e=>typeof e=="function",h=e=>typeof e<"u",$=e=>g(e)?e():e;exports.debounce=d;exports.get=f;exports.isTransformer=p;exports.isValueDefined=h;exports.logStyled=a;exports.set=y;exports.valueOrFactory=$;

package/dist/utils-xV3x3fTc.mjs

@@ -1,57 +0,0 @@
-function a(t, s, n) {
-  if (!s)
-    return t;
-  const o = s.split(".");
-  let e = t;
-  for (const c of o)
-    if (e !== null && typeof e == "object" && c in e)
-      e = e[c];
-    else
-      return n;
-  return e === void 0 ? n : e;
-}
-function y(t, s, n) {
-  const o = s.replace(/\[(\d+)\]/g, ".$1").split(".");
-  let e = t;
-  for (let c = 0; c < o.length - 1; c++) {
-    const r = o[c], i = o[c + 1];
-    (e[r] === void 0 || e[r] === null) && (e[r] = /^\d+$/.test(i) ? [] : {}), e = e[r];
-  }
-  return e[o[o.length - 1]] = n, t;
-}
-function d(t, s = 0) {
-  let n;
-  return function(...o) {
-    n !== void 0 && clearTimeout(n), n = setTimeout(() => {
-      n = void 0, t.apply(this, o);
-    }, s);
-  };
-}
-function p(t) {
-  const s = JSON.stringify(t, null, 2).split(`
-`), n = [], o = [];
-  for (const e of s) {
-    const c = e.match(/^(\s*)"([^"]+)"(\s*:\s*)(.+)$/);
-    if (c) {
-      const [, r, i, l, u] = c;
-      n.push(`${r}%c"${i}"%c${l}%c${u}`), o.push(
-        "color: #9cdcfe; font-weight: bold",
-        "color: #cccccc",
-        "color: #ce9178"
-      );
-    } else
-      n.push(`%c${e}`), o.push("color: #cccccc");
-  }
-  console.log(n.join(`
-`), ...o, t);
-}
-const g = (t) => typeof t == "function", f = (t) => typeof t == "function", h = (t) => typeof t < "u", $ = (t) => f(t) ? t() : t;
-export {
-  h as a,
-  d,
-  a as g,
-  g as i,
-  p as l,
-  y as s,
-  $ as v
-};