@yakocloud/state-vocab 4.2.0 → 4.3.1

package/README.md

@@ -117,7 +117,7 @@ npm install @yakocloud/state-vocab react react-dom
 
 ## Quick Start
 
-Define your storage tree once (`setupStorage`/`defineState`), call `clientify` to attach React hooks. If you use react server components (RSC) wrap your app with `StateVocabProvider` at the root and call `serverify` to attach RSC-methods. Use state anywhere in the tree
+Define your storage tree once (`setupStorage`/`defineState`), call `clientify` to attach React hooks. If you use React Server Components (RSC), wrap the relevant subtree with `StateVocabProvider` and call `serverify` to attach server-side `.getState()` methods. Use state anywhere in the tree.
 
 Library SSR-requirements:
 - `Per-request store`: A Next.js server can handle multiple requests simultaneously. This means that the store should be created per request and should not be shared across requests.
@@ -366,28 +366,14 @@ export const storage = setupStorage({
 })
 ```
 
-**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({})
-```
+**2. Create server and client storage handles:**
 
 ```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, {
-  clientContext: StorageClientContext,
-})
+export const serverStorage = serverify(storage)
 ```
 
 ```ts
@@ -396,11 +382,8 @@ 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, {
-  clientContext: StorageClientContext,
-})
+export const clientStorage = clientify(storage)
 ```
 
 **3. Seed initial state in the server component and read it in Server and Client children:**
@@ -412,10 +395,6 @@ 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()
 
@@ -437,8 +416,8 @@ export default async function Page() {
 import { serverStorage } from '@/storage.server'
 
 export default async function UserInfo() {
-  const name = await serverStorage.user.name.getState()
-  const role = await serverStorage.user.role.getState()
+  const name = serverStorage.user.name.getState()
+  const role = serverStorage.user.role.getState()
 
   return <p>{name} — {role}</p>
 }
@@ -460,41 +439,67 @@ 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:
+Because each `serverify`/`clientify` pair is bound to its own React 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. Pass a `clientContext` to link the server and client sides of each tree:
 
 ```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 
-})
+import { createContext } from 'react'
+export const LayoutClientContext = createContext({})
+export const layoutServerStorage = serverify(layoutStorage, { clientContext: LayoutClientContext })
 
 // layout.storage.client.ts ("use client")
-export const layoutClientStorage = clientify(layoutStorage, { 
-  clientContext: LayoutClientContext 
-})
+"use client"
+export const layoutClientStorage = clientify(layoutStorage, { clientContext: LayoutClientContext })
 
 // page.storage.server.ts
-export const pageServerStorage = serverify(pageStorage, { 
-  clientContext: PageClientContext 
-})
+import { createContext } from 'react'
+export const PageClientContext = createContext({})
+export const pageServerStorage = serverify(pageStorage, { clientContext: PageClientContext })
 
 // page.storage.client.ts ("use client")
-export const pageClientStorage = clientify(pageStorage, { 
-  clientContext: PageClientContext 
-})
+"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.
 
+#### Next.js App Router: layout and page are isolated contexts
+
+In Next.js App Router, **layouts do not re-render during client-side navigation between pages**. Layout and page run as independent React render passes — the layout renders once on entry and stays mounted; the page renders fresh on every navigation.
+
+Because `React.cache()` (which backs the per-request server store) is scoped to a single render pass, layout and page never share the same cache scope:
+
+- A page server component **cannot** call `layoutServerStorage.someField.getState()` — the layout's `StateVocabProvider` ran in a separate pass, so its vocab is not in the page's cache scope.
+- A layout server component **cannot** call `pageServerStorage.someField.getState()` for the same reason.
+- **Each storage tree must be both seeded and consumed within the same route segment.**
+
+```tsx
+// ✅ Correct — layout seeds and reads from its own storage
+// app/(dashboard)/layout.tsx
+const LayoutProvider = layoutServerStorage.StateVocabProvider
+export default async function Layout({ children }) {
+  return (
+    <LayoutProvider value={{ session: { id: 123 } }}>
+      <LayoutHeader />  {/* ← can call layoutServerStorage.session.getState() */}
+      {children}
+    </LayoutProvider>
+  )
+}
+
+// ❌ Wrong — page cannot reach layout's storage
+// app/(dashboard)/page.tsx
+export default async function Page() {
+  const session = layoutServerStorage.session.getState() // throws — not in layout's render pass
+}
+```
+
+If a page needs data that the layout already fetches (e.g., the current user session), fetch it independently in the page, pass it via URL params, or use a separate mechanism — do not attempt to share it through other state-vocab server storage across route segments.
+
+This constraint is **server-only**. On the client, there is no such limitation — client components can freely call `.useState()` from any storage (`layoutClientStorage`, `pageClientStorage`, or any other) regardless of which route segment they live in.
+
 #### `serverify(storage)`
 
-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.
+Converts a storage tree into its server-side counterpart. Each leaf gains a synchronous `.getState()` method that reads the value injected by the nearest `StateVocabProvider`. 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`.
 
 **`.seed()` syntax:**
 
@@ -512,7 +517,7 @@ serverStorage.person.address.seed({ city: 'NY' })
 // → { person: { address: { city: 'NY' } } }
 ```
 
-**`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.
+**`node.getState()`** synchronously reads the value for that leaf. Must be called within a React render context (i.e., inside a component that is a descendant of `StateVocabProvider`). Throws if called outside a provider scope or outside a React render context.
 
 #### `clientify(storage)`
 
@@ -749,36 +754,31 @@ import { StateVocabClientProvider } from '@yakocloud/state-vocab/client'
 </StateVocabClientProvider>
 ```
 
-### `serverify<T>(storage: T, options)`
+### `serverify<T>(storage: T, options?)`
 
 Converts a storage tree to its server-side counterpart. Available 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. |
+| `clientContext` | `Context<object> \| undefined` | A React context created with `createContext({})`. Pass the same context to `clientify` when multiple independent storage trees coexist on the same page. Omit for single-tree setups. |
 
 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.
+- **`StateVocabProvider`** — server component that accepts a `value` prop and seeds the per-request store via `React.cache()`.
+- **`node.getState()`** — synchronously reads the value for that leaf. Must be called within a React render context (descendant of `StateVocabProvider`). Throws if called outside a provider scope or outside a render context.
 - **`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'
-import { MyClientContext } from '@/storage.context.client'
 
-const serverStorage = serverify(storage, {
-  clientContext: MyClientContext,
-  serverTimeout: 2000, // optional, default 1000
-})
+const serverStorage = serverify(storage)
+// or, for multiple independent trees:
+const serverStorage = serverify(storage, { clientContext: MyClientContext })
 
 const { StateVocabProvider } = serverStorage
 
 // In a Server Component:
-serverStorage.start()                                  // register before rendering
-await serverStorage.user.name.getState()               // reads "user.name" (async)
+serverStorage.user.name.getState()                     // reads "user.name" (sync)
 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)
@@ -790,7 +790,7 @@ Converts a storage tree to its client-side counterpart. Available from `@yakoclo
 
 | 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. |
+| `clientContext` | `Context<object> \| undefined` | The React context used to isolate this storage tree. Must match the `clientContext` passed to `serverify` for the same tree. Omit for single-tree setups. |
 
 Each leaf gains `.useState()` and `.useInitialState()`. The tree structure mirrors the original.
 

package/dist/client.cjs.js

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

package/dist/client.es.js

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

package/dist/constants-BTyJxzUH.js

@@ -0,0 +1 @@
+"use strict";const T=Symbol("state-def"),S=Symbol("state-path"),E=Symbol("state-verbose"),t=Symbol("state-verbose-path"),s=Symbol("state-ssr"),_=Symbol("state-server-slot"),o=Symbol("state-client-slot");exports.STATE_CLIENT_SLOT=o;exports.STATE_DEFINITION=T;exports.STATE_PATH=S;exports.STATE_SERVER_SLOT=_;exports.STATE_SSR=s;exports.STATE_VERBOSE=E;exports.STATE_VERBOSE_PATH=t;

package/dist/constants-Cf0m6moG.mjs

@@ -0,0 +1,10 @@
+const s = /* @__PURE__ */ Symbol("state-def"), t = /* @__PURE__ */ Symbol("state-path"), S = /* @__PURE__ */ Symbol("state-verbose"), T = /* @__PURE__ */ Symbol("state-verbose-path"), o = /* @__PURE__ */ Symbol("state-ssr"), a = /* @__PURE__ */ Symbol("state-server-slot"), e = /* @__PURE__ */ Symbol("state-client-slot");
+export {
+  e as S,
+  a,
+  t as b,
+  S as c,
+  o as d,
+  T as e,
+  s as f
+};

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

package/dist/index.es.js

@@ -1,18 +1,18 @@
-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-xNWifFE9.mjs";
-function M(t = {}) {
+import { b as d, S as w, a as I, d as E, e as b, c as _, f as A } from "./constants-Cf0m6moG.mjs";
+import { v as y } from "./utils-xV3x3fTc.mjs";
+function L(t = {}) {
   return {
-    [v]: !0,
+    [A]: !0,
     // marks this object as a leaf in the router tree
     [d]: "",
     // placeholder; injected at runtime by injectPaths()
-    [P]: !1,
+    [_]: !1,
     // placeholder
-    [E]: "",
+    [b]: "",
     // placeholder
-    [T]: !1,
+    [E]: !1,
     // placeholder
-    serverSlot(a) {
+    [I](a) {
       return Object.assign(this, {
         // Impl|RSC
         getState(...e) {
@@ -20,12 +20,12 @@ function M(t = {}) {
         }
       });
     },
-    clientSlot(a) {
+    [w](a) {
       return Object.assign(this, {
         // Impl|RCC
         useState(e) {
           return e ??= {}, a.useState.apply(this, [{
-            defaultValue: b(e.defaultValue) ?? b(t.defaultValue),
+            defaultValue: y(e.defaultValue) ?? y(t.defaultValue),
             bidirectional: e.bidirectional ?? t.bidirectional,
             storage: e.storage ?? t.storage,
             serialize: t.serialize ?? JSON.stringify,
@@ -53,58 +53,58 @@ function M(t = {}) {
     }
   };
 }
-function z(t, a) {
+function P(t, a) {
   const {
     path: e = "",
     verbose: S,
-    verbosePath: x,
-    ssr: A,
+    verbosePath: z,
+    ssr: V,
     cache: n
   } = a;
-  let s = n.proxy.get(t);
-  s || (s = /* @__PURE__ */ new Map(), n.proxy.set(t, s));
-  const o = s.get(e);
-  if (o)
-    return o;
-  const h = new Proxy(t, {
-    get(V, u) {
-      const r = V[u], c = e ? `${e}.${String(u)}` : String(u);
-      if (r && typeof r == "object" && v in r) {
-        const l = r;
-        let i = n.leaf.get(l);
-        i || (i = /* @__PURE__ */ new Map(), n.leaf.set(l, i));
-        const g = i.get(c);
-        if (g)
-          return g;
-        const j = Reflect.ownKeys(l).filter(
-          (f) => typeof l[f] == "function"
-        ), m = Object.fromEntries(
-          j.map((f) => [
+  let l = n.proxy.get(t);
+  l || (l = /* @__PURE__ */ new Map(), n.proxy.set(t, l));
+  const h = l.get(e);
+  if (h)
+    return h;
+  const o = new Proxy(t, {
+    get(v, u) {
+      const r = v[u], c = e ? `${e}.${String(u)}` : String(u);
+      if (r && typeof r == "object" && A in r) {
+        const s = r;
+        let i = n.leaf.get(s);
+        i || (i = /* @__PURE__ */ new Map(), n.leaf.set(s, i));
+        const T = i.get(c);
+        if (T)
+          return T;
+        const x = Reflect.ownKeys(s).filter(
+          (f) => typeof s[f] == "function"
+        ), j = Object.fromEntries(
+          x.map((f) => [
             f,
-            (...w) => l[f].call(
+            (...m) => s[f].call(
               {
-                ...l,
+                ...s,
                 [d]: c,
-                [P]: S,
-                [E]: x,
-                [T]: A
+                [_]: S,
+                [b]: z,
+                [E]: V
               },
-              ...w
+              ...m
             )
           ])
-        ), y = { ...l, ...m };
-        return i.set(c, y), y;
+        ), g = { ...s, ...j };
+        return i.set(c, g), g;
       }
-      return r && typeof r == "object" ? z(r, {
+      return r && typeof r == "object" ? P(r, {
         ...a,
         path: c
       }) : r;
     }
   });
-  return s.set(e, h), h;
+  return l.set(e, o), o;
 }
-function N(t, a) {
-  return z(t, {
+function M(t, a) {
+  return P(t, {
     ...a,
     ssr: a?.ssr ?? !0,
     verbosePath: a?.verbosePath ?? "",
@@ -115,6 +115,6 @@ function N(t, a) {
   });
 }
 export {
-  M as defineState,
-  N as setupStorage
+  L as defineState,
+  M as setupStorage
 };

package/dist/{provider-client-DRdFy5dG.js → provider-client-DA53zfcT.js}

@@ -1 +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;
+"use client";"use strict";const h=require("react/jsx-runtime"),c=require("react"),r=require("./utils-0CTNJ4ZE.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/{provider-client-BhPeK8Kz.mjs → provider-client-DLa3_Ms9.mjs}

@@ -1,7 +1,7 @@
 "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";
+import { g as i, i as C, s as b } from "./utils-xV3x3fTc.mjs";
 const c = l({});
 function m(e) {
   const t = h(e.clientContext ?? c);

package/dist/server.cjs.js

@@ -1 +1 @@
-"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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("react/jsx-runtime"),i=require("./constants-BTyJxzUH.js"),l=require("react"),y=require("./provider-client-DA53zfcT.js"),T=require("./utils-0CTNJ4ZE.js"),s=l.cache(()=>new Map),d=e=>s().get(e),f=(e,t)=>s().set(e,t);function b(e=""){const t=Symbol("test"),{size:r}=s();if(s().set(t,{}),s().size===r)throw new Error([e,"Start execution only within a React render context (per-request)."].join(" "));s().delete(t)}function x(e){return typeof e=="object"&&e!==null&&i.STATE_SERVER_SLOT in e}function E(e){const t=this[i.STATE_PATH],r=`Failed access to "${t}".`;b(r);const n=d(e.serverContextKey);if(!n)throw new Error(`${r} Reason: no data. Make sure your component is wrapped in StateVocabProvider.`);return T.get(n,t)}function a(e,t){const r={};for(const n in e){const o=e[n];if(x(o))r[n]=o[i.STATE_SERVER_SLOT]({getState(){return E.apply(this,[{serverContextKey:t.serverContextKey}])}}),delete r[i.STATE_SERVER_SLOT],delete r[i.STATE_CLIENT_SLOT];else if(o!==null&&typeof o=="object"){const c=u=>t.wrap({[n]:u});r[n]=a(o,{serverContextKey:t.serverContextKey,wrap:c})}else r[n]=o}return r.seed=n=>t.wrap(n),r}function p(e,t){t??={};const r=Object.keys(e).slice(0,3).join("-"),n=Symbol(r);return{...a(e,{serverContextKey:n,wrap:o=>o}),StateVocabProvider({children:o,value:c}){return c??={},f(n,c),S.jsx(y.StateVocabClientProvider,{clientContext:t.clientContext,value:c,children:o})}}}exports.serverify=p;

package/dist/server.es.js

@@ -1,76 +1,74 @@
-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`);
-}, 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);
+import { jsx as l } from "react/jsx-runtime";
+import { a, b as f, S as u } from "./constants-Cf0m6moG.mjs";
+import { cache as y } from "react";
+import { S as p } from "./provider-client-DLa3_Ms9.mjs";
+import { g as x } from "./utils-xV3x3fTc.mjs";
+const s = y(() => /* @__PURE__ */ new Map()), b = (e) => s().get(e), d = (e, t) => s().set(e, t);
+function m(e = "") {
+  const t = /* @__PURE__ */ Symbol("test"), { size: r } = s();
+  if (s().set(t, {}), s().size === r)
+    throw new Error([
+      e,
+      "Start execution only within a React render context (per-request)."
+    ].join(" "));
+  s().delete(t);
 }
-function b(e) {
-  return typeof e == "object" && e !== null && "serverSlot" in e;
+function w(e) {
+  return typeof e == "object" && e !== null && a in e;
 }
-function l(e, t) {
+function C(e) {
+  const t = this[f], r = `Failed access to "${t}".`;
+  m(r);
+  const o = b(e.serverContextKey);
+  if (!o)
+    throw new Error(
+      `${r} Reason: no data. Make sure your component is wrapped in StateVocabProvider.`
+    );
+  return x(o, t);
+}
+function i(e, t) {
   const r = {};
   for (const o in e) {
     const n = e[o];
-    if (b(n))
-      r[o] = n.serverSlot({
+    if (w(n))
+      r[o] = n[a]({
         getState() {
-          return x.apply(this, [{
-            serverContextKey: t.serverContextKey,
-            timeout: t.serverTimeout
+          return C.apply(this, [{
+            serverContextKey: t.serverContextKey
           }]);
         }
-      }), delete r[o].serverSlot, delete r[o].clientSlot;
+      }), delete r[a], delete r[u];
     else if (n !== null && typeof n == "object") {
-      const i = (s) => t.wrap({ [o]: s });
-      r[o] = l(n, {
+      const c = (S) => t.wrap({ [o]: S });
+      r[o] = i(n, {
         serverContextKey: t.serverContextKey,
-        serverTimeout: t.serverTimeout,
-        wrap: i
+        wrap: c
       });
     } else
       r[o] = n;
   }
   return r.seed = (o) => t.wrap(o), r;
 }
-function E(e, t) {
-  const r = Object.keys(e).slice(0, 3).join("-"), o = Symbol(r), n = Promise.withResolvers();
+function K(e, t) {
+  t ??= {};
+  const r = Object.keys(e).slice(0, 3).join("-"), o = Symbol(r);
   return {
-    ...l(e, {
+    ...i(e, {
       serverContextKey: o,
-      serverTimeout: t.serverTimeout ?? 1e3,
-      wrap: (i) => i
+      wrap: (n) => n
     }),
-    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,
+    StateVocabProvider({ children: n, value: c }) {
+      return c ??= {}, d(o, c), /* @__PURE__ */ l(
+        p,
         {
           clientContext: t.clientContext,
-          value: s,
-          children: i
+          value: c,
+          children: n
         }
       );
     }
   };
 }
 export {
-  E as serverify
+  K as serverify
 };

package/dist/types/constants.d.ts

@@ -3,3 +3,5 @@ export declare const STATE_PATH: unique symbol;
 export declare const STATE_VERBOSE: unique symbol;
 export declare const STATE_VERBOSE_PATH: unique symbol;
 export declare const STATE_SSR: unique symbol;
+export declare const STATE_SERVER_SLOT: unique symbol;
+export declare const STATE_CLIENT_SLOT: unique symbol;

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

@@ -1,3 +1,4 @@
 import type { Vocab } from "./state.types";
-export declare const getRequestStore: () => Map<symbol, Promise<Vocab>>;
-export declare const getStateVocab: (serverContextKey: symbol) => Promise<Vocab | undefined>;
+export declare const getRequestStore: () => Map<symbol, Vocab>;
+export declare const getStateVocab: (serverContextKey: symbol) => Vocab | undefined;
+export declare const setStateVocab: (serverContextKey: symbol, value: Vocab) => Map<symbol, Vocab>;

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

@@ -1,21 +1,5 @@
 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> & {
-    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;
-};
-type Slot<V> = {
-    clientSlot(input: Placeholder<V>): Placeholder<V>;
-};
-type Clientified<R> = R extends Slot<infer TValue> ? Placeholder<TValue> : R extends object ? {
-    [K in keyof R]: Clientified<R[K]>;
-} : R;
+import type { ClientifyResult } from "./setup.client.types";
 export declare function clientify<R extends object>(tree: R, clientifyOptions?: {
     clientContext?: Context<object>;
-}): Clientified<R>;
-export {};
+}): ClientifyResult<R>;

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

@@ -0,0 +1,30 @@
+import { STATE_CLIENT_SLOT } from "./constants";
+import type { Deserialize, Serialize, ValueOrFactory, ValueOrTransformer } from "./state.types";
+export type UseStateOptions<V> = {
+    defaultValue?: ValueOrFactory<V>;
+    delayedSet?: number;
+    bidirectional?: true;
+    onSet?(nextValue: NoInfer<V>, prevValue: NoInfer<V>): void;
+    storage?: unknown;
+    serialize?: Serialize<V>;
+    deserialize?: Deserialize<V>;
+};
+type UseStateResult<V> = readonly [V, (nextValue: ValueOrTransformer<V>) => void, () => void];
+export type UseInitialStateOptions<V> = {
+    defaultValue?: ValueOrFactory<V>;
+    storage?: unknown;
+    serialize?: Serialize<V>;
+    deserialize?: Deserialize<V>;
+};
+type Placeholder<V> = {
+    useState(options?: UseStateOptions<V>): UseStateResult<V>;
+    useInitialState(options?: UseInitialStateOptions<V>): void;
+};
+export type ClientSlot<V> = {
+    [STATE_CLIENT_SLOT](input: Placeholder<V>): Placeholder<V>;
+};
+type Clientified<R> = R extends ClientSlot<infer V> ? Placeholder<V> : R extends object ? {
+    [K in keyof R]: Clientified<R[K]>;
+} : R;
+export type ClientifyResult<R> = Clientified<R>;
+export {};

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

@@ -1,6 +1,7 @@
+import type { ClientSlot } from "./setup.client.types";
+import type { Deserialize, Serialize } from "./state.types";
 import { type DependencyList } from "react";
 import VocabStore from "./store";
-import type { Deserialize, Serialize } from "./state.types";
 export declare function useDebounce<T extends (...args: never[]) => unknown>(effect: T, wait: number | undefined, deps?: DependencyList): (...args: Parameters<T>) => void;
 export declare const sync: <V>(options: {
     vocabStore: VocabStore;
@@ -10,3 +11,4 @@ export declare const sync: <V>(options: {
     deserialize: Deserialize<V>;
     value: V | undefined;
 }) => void;
+export declare function isClientSlot(value: unknown): value is ClientSlot<unknown>;

package/dist/types/setup.d.ts

@@ -1,14 +1,2 @@
-import { STATE_DEFINITION } from "./constants";
-type Path<T, Prefix extends string = ""> = {
-    [K in keyof T & string]: T[K] extends object ? T[K] extends {
-        [STATE_DEFINITION]: unknown;
-    } ? `${Prefix}${K}` : `${Prefix}${K}` | Path<T[K], `${Prefix}${K}.`> : `${Prefix}${K}`;
-}[keyof T & string];
-type InjectPathsOptions<T extends object> = {
-    path: string;
-    verbose: boolean;
-    verbosePath: Path<T>;
-    ssr: boolean;
-};
+import type { InjectPathsOptions } from "./setup.types";
 export declare function setupStorage<T extends object>(tree: T, options?: Partial<Omit<InjectPathsOptions<T>, "path">>): T;
-export {};

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

@@ -1,36 +1,5 @@
-import type { Context, PropsWithChildren, ReactNode } from "react";
-import type { Vocab, VocabThis } from "./state.types";
-type 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]?: [
-        SlotValue<R[K]>
-    ] extends [never] ? R[K] extends object ? ServerifiedValue<R[K]> : R[K] : SlotValue<R[K]>;
-};
-type Serverified<R> = [
-    SlotValue<R>
-] extends [never] ? R extends object ? {
-    seed(input: ServerifiedValue<R>): Vocab;
-} & {
-    [K in keyof R]: Serverified<R[K]>;
-} : R : Placeholder<SlotValue<R>>;
-type ServerifyResult<R extends object> = {
-    start(): void;
-    seed(input: ServerifiedValue<R>): Vocab;
-    StateVocabProvider(props: PropsWithChildren<{
-        value?: ServerifiedValue<R>;
-    }>): ReactNode;
-} & {
-    [K in keyof R]: Serverified<R[K]>;
-};
-export declare function serverify<R extends object>(tree: R, serverifyOptions: {
-    clientContext: Context<object>;
-    serverTimeout?: number;
+import type { Context } from "react";
+import type { ServerifyResult } from "./setup.server.types";
+export declare function serverify<R extends object>(tree: R, serverifyOptions?: {
+    clientContext?: Context<object>;
 }): ServerifyResult<R>;
-export {};

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

@@ -0,0 +1,26 @@
+import type { PropsWithChildren, ReactNode } from "react";
+import type { Vocab } from "./state.types";
+import { STATE_SERVER_SLOT } from "./constants";
+type Placeholder<V> = {
+    getState(): V;
+};
+export type ServerSlot<V> = {
+    [STATE_SERVER_SLOT](input: Placeholder<V>): Placeholder<V>;
+};
+type ServerifiedValue<R> = {
+    [K in keyof R]?: R[K] extends ServerSlot<infer V> ? V : R[K] extends object ? ServerifiedValue<R[K]> : R[K];
+};
+type Serverified<R> = R extends ServerSlot<infer V> ? Placeholder<V> : R extends object ? {
+    seed(input: ServerifiedValue<R>): Vocab;
+} & {
+    [K in keyof R]: Serverified<R[K]>;
+} : R;
+export type ServerifyResult<R extends object> = {
+    seed(input: ServerifiedValue<R>): Vocab;
+    StateVocabProvider(props: PropsWithChildren<{
+        value?: ServerifiedValue<R>;
+    }>): ReactNode;
+} & {
+    [K in keyof R]: Serverified<R[K]>;
+};
+export {};

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

@@ -0,0 +1,3 @@
+import type { ServerSlot } from "./setup.server.types";
+export declare function healtcheck(prefix?: string): void;
+export declare function isServerSlot(value: unknown): value is ServerSlot<unknown>;

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

@@ -1,16 +1,13 @@
-import type { Deserialize, Serialize, ValueOrFactory } from "./state.types";
-export type UseStateOptions<V> = {
-    defaultValue?: ValueOrFactory<V>;
-    delayedSet?: number;
-    bidirectional?: true;
-    onSet?(nextValue: NoInfer<V>, prevValue: NoInfer<V>): void;
-    storage?: unknown;
-    serialize?: Serialize<V>;
-    deserialize?: Deserialize<V>;
-};
-export type UseInitialStateOptions<V> = {
-    defaultValue?: ValueOrFactory<V>;
-    storage?: unknown;
-    serialize?: Serialize<V>;
-    deserialize?: Deserialize<V>;
+import { STATE_DEFINITION } from "./constants";
+type Path<T, Prefix extends string = ""> = {
+    [K in keyof T & string]: T[K] extends object ? T[K] extends {
+        [STATE_DEFINITION]: unknown;
+    } ? `${Prefix}${K}` : `${Prefix}${K}` | Path<T[K], `${Prefix}${K}.`> : `${Prefix}${K}`;
+}[keyof T & string];
+export type InjectPathsOptions<T extends object> = {
+    path: string;
+    verbose: boolean;
+    verbosePath: Path<T>;
+    ssr: boolean;
 };
+export {};

package/dist/types/state.d.ts

@@ -1,5 +1,5 @@
-import { STATE_DEFINITION, STATE_PATH, STATE_SSR, STATE_VERBOSE, STATE_VERBOSE_PATH } from "./constants";
 import type { Deserialize, Serialize, ValueOrFactory, ValueOrTransformer, VocabThis } from "./state.types";
+import { STATE_CLIENT_SLOT, STATE_DEFINITION, STATE_PATH, STATE_SERVER_SLOT, STATE_SSR, STATE_VERBOSE, STATE_VERBOSE_PATH } from "./constants";
 export declare function defineState<V>(superOptions?: {
     defaultValue?: ValueOrFactory<V>;
     bidirectional?: true;
@@ -12,12 +12,12 @@ export declare function defineState<V>(superOptions?: {
     [STATE_VERBOSE]: boolean;
     [STATE_VERBOSE_PATH]: string;
     [STATE_SSR]: boolean;
-    serverSlot(this: VocabThis, input: {
+    [STATE_SERVER_SLOT](this: VocabThis, input: {
         getState(this: VocabThis): V;
     }): VocabThis & {
         getState(this: VocabThis): V;
     };
-    clientSlot(this: VocabThis, input: {
+    [STATE_CLIENT_SLOT](this: VocabThis, input: {
         useState(this: VocabThis, options?: {
             defaultValue?: ValueOrFactory<V>;
             delayedSet?: number;

package/dist/utils-0CTNJ4ZE.js

@@ -0,0 +1,3 @@
+"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

@@ -0,0 +1,57 @@
+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
+};

package/package.json

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

package/dist/constants-BB1YAX6c.mjs

@@ -1,8 +0,0 @@
-const s = /* @__PURE__ */ Symbol("state-def"), t = /* @__PURE__ */ Symbol("state-path"), S = /* @__PURE__ */ Symbol("state-verbose"), a = /* @__PURE__ */ Symbol("state-verbose-path"), o = /* @__PURE__ */ Symbol("state-ssr");
-export {
-  t as S,
-  S as a,
-  o as b,
-  a as c,
-  s as d
-};

package/dist/constants-CbsduCZ7.js

@@ -1 +0,0 @@
-"use strict";const T=Symbol("state-def"),S=Symbol("state-path"),E=Symbol("state-verbose"),t=Symbol("state-verbose-path"),s=Symbol("state-ssr");exports.STATE_DEFINITION=T;exports.STATE_PATH=S;exports.STATE_SSR=s;exports.STATE_VERBOSE=E;exports.STATE_VERBOSE_PATH=t;

package/dist/utils-CuApuc3e.js

@@ -1,3 +0,0 @@
-"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

@@ -1,73 +0,0 @@
-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
-};