@yakocloud/state-vocab 4.1.0 → 4.2.0

package/README.md

@@ -412,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()
 
@@ -433,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>
 }
@@ -490,7 +494,7 @@ Each `StateVocabProvider` wraps its own subtree; a component that calls `pageCli
 
 #### `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:**
 
@@ -508,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)`
 
@@ -752,21 +756,32 @@ Converts a storage tree to its server-side counterpart. Available from `@yakoclo
 | 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:
 
-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`.
+- **`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'
 import { MyClientContext } from '@/storage.context.client'
 
-const serverStorage = serverify(storage, { clientContext: MyClientContext })
+const serverStorage = serverify(storage, {
+  clientContext: MyClientContext,
+  serverTimeout: 2000, // optional, default 1000
+})
 
-const { StateVocabProvider } = serverStorage        // server-aware provider
+const { StateVocabProvider } = serverStorage
 
-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)
+// 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, options?)`

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-0CTNJ4ZE.js"),V=require("./provider-client-CAHe8VnM.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"),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,9 +1,9 @@
 "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-xV3x3fTc.mjs";
-import { V as C, u as _ } from "./provider-client-D0BmMWcY.mjs";
-import { S as ne } from "./provider-client-D0BmMWcY.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),

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-D0BmMWcY.mjs → provider-client-BhPeK8Kz.mjs}

@@ -1,13 +1,14 @@
 "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-xV3x3fTc.mjs";
+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) {

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 s=require("react/jsx-runtime"),S=require("./constants-CbsduCZ7.js"),c=require("react"),d=require("./provider-client-CAHe8VnM.js"),y=require("./utils-0CTNJ4ZE.js"),i=e=>{if(c.useState)throw new Error(`${e} only intended for Server Components`)},a=c.cache(()=>new Map),x=({children:e})=>e,C=async e=>{i("StateVocabServerContext.Provider");const{serverContextKey:n,value:t,children:r}=e;return a().set(n,t),r},f=e=>(i("getStateVocab"),a().get(e)),b={Provider:c.useState?x:C},p=e=>{const{serverContextKey:n,value:t,children:r}=e;return s.jsx(b.Provider,{serverContextKey:n,value:t,children:r})};function P(e){const{children:n,serverContextKey:t,clientContext:r,value:o={}}=e;return s.jsx(p,{serverContextKey:t,value:o,children:s.jsx(d.StateVocabClientProvider,{clientContext:r,value:o,children:n})})}const h="Make sure your component is wrapped in StateVocabProvider";function w(e){const n=this[S.STATE_PATH],t=f(e.serverContextKey);if(!t)throw new Error(h);return y.get(t,n)}function g(e){return typeof e=="object"&&e!==null&&"serverSlot"in e}function l(e,n){const t={};for(const r in e){const o=e[r];if(g(o))t[r]=o.serverSlot({getState(){return w.apply(this,[{serverContextKey:n.serverContextKey}])}}),delete t[r].serverSlot,delete t[r].clientSlot;else if(o!==null&&typeof o=="object"){const u=v=>n.wrap({[r]:v});t[r]=l(o,{serverContextKey:n.serverContextKey,wrap:u})}else t[r]=o}return t.seed=r=>n.wrap(r),t}function K(e,n){const t=Symbol();return{...l(e,{serverContextKey:t,wrap:r=>r}),StateVocabProvider({children:r,value:o}){return s.jsx(P,{clientContext:n.clientContext,serverContextKey:t,value:o,children:r})}}}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,104 +1,76 @@
-import { jsx as c } from "react/jsx-runtime";
-import { S as u } from "./constants-BB1YAX6c.mjs";
-import s, { cache as d } from "react";
-import { S as f } from "./provider-client-D0BmMWcY.mjs";
-import { g as y } from "./utils-xV3x3fTc.mjs";
-const a = (e) => {
-  if (s.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`);
-}, i = d(() => /* @__PURE__ */ new Map()), p = ({ children: e }) => e, C = async (e) => {
-  a("StateVocabServerContext.Provider");
-  const { serverContextKey: o, value: t, children: r } = e;
-  return i().set(o, t), r;
-}, x = (e) => (a("getStateVocab"), i().get(e)), b = {
-  Provider: s.useState ? p : C
-}, m = (e) => {
-  const { serverContextKey: o, value: t, children: r } = e;
-  return /* @__PURE__ */ c(
-    b.Provider,
-    {
-      serverContextKey: o,
-      value: t,
-      children: r
-    }
-  );
-};
-function h(e) {
-  const {
-    children: o,
-    serverContextKey: t,
-    clientContext: r,
-    value: n = {}
-  } = e;
-  return /* @__PURE__ */ c(
-    m,
-    {
-      serverContextKey: t,
-      value: n,
-      children: /* @__PURE__ */ c(
-        f,
-        {
-          clientContext: r,
-          value: n,
-          children: o
-        }
-      )
-    }
+}, 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 P = "Make sure your component is wrapped in StateVocabProvider";
-function w(e) {
-  const o = this[u], t = x(e.serverContextKey);
-  if (!t)
-    throw new Error(P);
-  return y(t, o);
-}
-function K(e) {
+function b(e) {
   return typeof e == "object" && e !== null && "serverSlot" in e;
 }
-function v(e, o) {
-  const t = {};
-  for (const r in e) {
-    const n = e[r];
-    if (K(n))
-      t[r] = n.serverSlot({
+function l(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: o.serverContextKey
+          return x.apply(this, [{
+            serverContextKey: t.serverContextKey,
+            timeout: t.serverTimeout
           }]);
         }
-      }), delete t[r].serverSlot, delete t[r].clientSlot;
+      }), delete r[o].serverSlot, delete r[o].clientSlot;
     else if (n !== null && typeof n == "object") {
-      const l = (S) => o.wrap({ [r]: S });
-      t[r] = v(n, {
-        serverContextKey: o.serverContextKey,
-        wrap: l
+      const i = (s) => t.wrap({ [o]: s });
+      r[o] = l(n, {
+        serverContextKey: t.serverContextKey,
+        serverTimeout: t.serverTimeout,
+        wrap: i
       });
     } else
-      t[r] = n;
+      r[o] = n;
   }
-  return t.seed = (r) => o.wrap(r), t;
+  return r.seed = (o) => t.wrap(o), r;
 }
-function k(e, o) {
-  const t = /* @__PURE__ */ Symbol();
+function E(e, t) {
+  const r = Object.keys(e).slice(0, 3).join("-"), o = Symbol(r), n = Promise.withResolvers();
   return {
-    ...v(e, {
-      serverContextKey: t,
-      wrap: (r) => r
+    ...l(e, {
+      serverContextKey: o,
+      serverTimeout: t.serverTimeout ?? 1e3,
+      wrap: (i) => i
     }),
-    StateVocabProvider({ children: r, value: n }) {
-      return /* @__PURE__ */ c(
-        h,
+    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: o.clientContext,
-          serverContextKey: t,
-          value: n,
-          children: r
+          clientContext: t.clientContext,
+          value: s,
+          children: i
         }
       );
     }
   };
 }
 export {
-  k as serverify
+  E as serverify
 };

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

@@ -1,12 +1,3 @@
-import React from "react";
-import type { PropsWithChildren, ReactNode } from "react";
 import type { Vocab } from "./state.types";
-export declare const getStateVocab: (serverContextKey: symbol) => Vocab | undefined;
-export declare const StateVocabServerContext: {
-    Provider: (({ children }: PropsWithChildren<{
-        value?: Vocab;
-    }>) => ReactNode) | ((props: PropsWithChildren<{
-        serverContextKey: symbol;
-        value: Vocab;
-    }>) => Promise<React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | (string | number | bigint | boolean | React.ReactPortal | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined)>);
-};
+export declare const getRequestStore: () => Map<symbol, Promise<Vocab>>;
+export declare const getStateVocab: (serverContextKey: symbol) => Promise<Vocab | undefined>;

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

@@ -1,28 +1,36 @@
 import type { Context, PropsWithChildren, ReactNode } from "react";
-import type { Vocab } from "./state.types";
+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, serverifyOptions: {
     clientContext: Context<object>;
+    serverTimeout?: number;
 }): ServerifyResult<R>;
 export {};

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.1.0",
+  "version": "4.2.0",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
   "types": "dist/types/index.d.ts",

package/dist/provider-client-CAHe8VnM.js

@@ -1 +0,0 @@
-"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{#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/types/provider.d.ts

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

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

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

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
-};