@assistant-ui/store 0.0.6 → 0.1.2

package/dist/utils/tap-client-stack-context.js

@@ -1,4 +1,4 @@
-import { createContext, tapContext, withContextProvider, tapMemo, } from "@assistant-ui/tap";
+import { createResourceContext, tap, withContextProvider, tapMemo, } from "@assistant-ui/tap";
 /**
  * Symbol used to get the client index from a ClientProxy.
  */
@@ -9,12 +9,12 @@ export const SYMBOL_CLIENT_INDEX = Symbol("assistant-ui.store.clientIndex");
 export const getClientIndex = (client) => {
     return client[SYMBOL_CLIENT_INDEX];
 };
-const ClientStackContext = createContext([]);
+const ClientStackContext = createResourceContext([]);
 /**
  * Get the current client stack inside a tap resource.
  */
 export const tapClientStack = () => {
-    return tapContext(ClientStackContext);
+    return tap(ClientStackContext);
 };
 /**
  * Execute a callback with a client pushed onto the stack.

package/dist/utils/tap-client-stack-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"tap-client-stack-context.js","sourceRoot":"","sources":["../../src/utils/tap-client-stack-context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,UAAU,EACV,mBAAmB,EACnB,OAAO,GACR,MAAM,mBAAmB,CAAC;AAG3B;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAE5E;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAqB,EAAU,EAAE;IAC9D,OAAQ,MAAuD,CAC7D,mBAAmB,CACpB,CAAC;AACJ,CAAC,CAAC;AAOF,MAAM,kBAAkB,GAAG,aAAa,CAAc,EAAE,CAAC,CAAC;AAE1D;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,GAAgB,EAAE;IAC9C,OAAO,UAAU,CAAC,kBAAkB,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAqB,EACrB,QAAiB,EACd,EAAE;IACL,MAAM,YAAY,GAAG,cAAc,EAAE,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CACtB,GAAG,EAAE,CAAC,CAAC,GAAG,YAAY,EAAE,MAAM,CAAC,EAC/B,CAAC,YAAY,EAAE,MAAM,CAAC,CACvB,CAAC;IACF,OAAO,mBAAmB,CAAC,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACrE,CAAC,CAAC"}
+{"version":3,"file":"tap-client-stack-context.js","sourceRoot":"","sources":["../../src/utils/tap-client-stack-context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,GAAG,EACH,mBAAmB,EACnB,OAAO,GACR,MAAM,mBAAmB,CAAC;AAG3B;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAE5E;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAqB,EAAU,EAAE;IAC9D,OAAQ,MAAuD,CAC7D,mBAAmB,CACpB,CAAC;AACJ,CAAC,CAAC;AAOF,MAAM,kBAAkB,GAAG,qBAAqB,CAAc,EAAE,CAAC,CAAC;AAElE;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,GAAgB,EAAE;IAC9C,OAAO,GAAG,CAAC,kBAAkB,CAAC,CAAC;AACjC,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAqB,EACrB,QAAiB,EACd,EAAE;IACL,MAAM,YAAY,GAAG,cAAc,EAAE,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CACtB,GAAG,EAAE,CAAC,CAAC,GAAG,YAAY,EAAE,MAAM,CAAC,EAC/B,CAAC,YAAY,EAAE,MAAM,CAAC,CACvB,CAAC;IACF,OAAO,mBAAmB,CAAC,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACrE,CAAC,CAAC"}

package/dist/wrapperResource.d.ts

@@ -0,0 +1,3 @@
+import { type ResourceElement, Resource } from "@assistant-ui/tap";
+export declare const wrapperResource: <R, P>(fn: (props: ResourceElement<P>) => R) => Resource<R, ResourceElement<P>>;
+//# sourceMappingURL=wrapperResource.d.ts.map

package/dist/wrapperResource.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrapperResource.d.ts","sourceRoot":"","sources":["../src/wrapperResource.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EACpB,QAAQ,EAGT,MAAM,mBAAmB,CAAC;AAE3B,eAAO,MAAM,eAAe,GAAI,CAAC,EAAE,CAAC,EAClC,IAAI,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,KACnC,QAAQ,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAOhC,CAAC"}

package/dist/wrapperResource.js

@@ -0,0 +1,11 @@
+import { resource, withKey, } from "@assistant-ui/tap";
+export const wrapperResource = (fn) => {
+    const res = resource(fn);
+    return (props) => {
+        const el = res(props);
+        if (props.key === undefined)
+            return el;
+        return withKey(props.key, el);
+    };
+};
+//# sourceMappingURL=wrapperResource.js.map

package/dist/wrapperResource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrapperResource.js","sourceRoot":"","sources":["../src/wrapperResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,QAAQ,EACR,OAAO,GACR,MAAM,mBAAmB,CAAC;AAE3B,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,EAAoC,EACH,EAAE;IACnC,MAAM,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACzB,OAAO,CAAC,KAAyB,EAAE,EAAE;QACnC,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;QACtB,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS;YAAE,OAAO,EAAE,CAAC;QACvC,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC;AACJ,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/store",
-  "version": "0.0.6",
+  "version": "0.1.2",
   "description": "Tap-based state management for @assistant-ui",
   "keywords": [
     "state-management",
@@ -28,7 +28,8 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/tap": "^0.3.6"
+    "@assistant-ui/tap": "^0.4.2",
+    "use-effect-event": "^2.0.3"
   },
   "peerDependencies": {
     "@types/react": "*",
@@ -41,7 +42,7 @@
   },
   "devDependencies": {
     "@types/react": "^19.2.9",
-    "react": "^19.2.3",
+    "react": "^19.2.4",
     "@assistant-ui/x-buildutils": "0.0.1"
   },
   "publishConfig": {

package/src/AuiIf.tsx

@@ -0,0 +1,17 @@
+"use client";
+
+import type { FC, PropsWithChildren } from "react";
+import { useAuiState } from "./useAuiState";
+import type { AssistantState } from "./types/client";
+
+export namespace AuiIf {
+  export type Props = PropsWithChildren<{ condition: AuiIf.Condition }>;
+  export type Condition = (state: AssistantState) => boolean;
+}
+
+export const AuiIf: FC<AuiIf.Props> = ({ children, condition }) => {
+  const result = useAuiState(condition);
+  return result ? children : null;
+};
+
+AuiIf.displayName = "AuiIf";

package/src/Derived.ts

@@ -16,7 +16,7 @@ import type {
  *
  * @example
  * ```typescript
- * const aui = useAssistantClient({
+ * const aui = useAui({
  *   message: Derived({
  *     source: "thread",
  *     query: { index: 0 },

package/src/index.ts

@@ -1,11 +1,11 @@
 // hooks
-export { useAssistantClient } from "./useAssistantClient";
-export { useAssistantState } from "./useAssistantState";
-export { useAssistantEvent } from "./useAssistantEvent";
+export { useAui } from "./useAui";
+export { useAuiState } from "./useAuiState";
+export { useAuiEvent } from "./useAuiEvent";
 
 // components
-export { AssistantIf } from "./AssistantIf";
-export { AssistantProvider } from "./utils/react-assistant-context";
+export { AuiIf } from "./AuiIf";
+export { AuiProvider } from "./utils/react-assistant-context";
 
 // resources
 export { Derived } from "./Derived";

package/src/tapClientList.ts

@@ -1,23 +1,24 @@
-import { tapState } from "@assistant-ui/tap";
+import { tapConst, tapState, withKey } from "@assistant-ui/tap";
 import type { ContravariantResource } from "@assistant-ui/tap";
 import { tapClientLookup } from "./tapClientLookup";
 import type { ClientMethods, ClientOutputOf } from "./types/client";
 
+type DataHandle<TData> = { data: TData | undefined; hasData: boolean };
+
 const createProps = <TData>(
   key: string,
-  data: TData,
+  data: DataHandle<TData>,
   remove: () => void,
 ): tapClientList.ResourceProps<TData> => {
-  let initialData: { data: TData } | undefined = { data };
   return {
     key,
     getInitialData: () => {
-      if (!initialData) {
-        throw new Error("getInitialData may only be called once");
+      if (!data.hasData) {
+        throw new Error(
+          "getInitialData may only be called during initial render",
+        );
       }
-      const data = initialData.data;
-      initialData = undefined;
-      return data;
+      return data.data!;
     },
     remove,
   };
@@ -34,13 +35,16 @@ export const tapClientList = <TData, TState, TMethods extends ClientMethods>(
 
   type Props = tapClientList.ResourceProps<TData>;
 
+  const initialDataHandles: DataHandle<TData>[] = tapConst(() => [], []);
+
   const [items, setItems] = tapState<Record<string, Props>>(() => {
     const entries: [string, Props][] = [];
     for (const data of initialValues) {
       const key = getKey(data);
+      const handle = { data, hasData: true };
       entries.push([
         key,
-        createProps(key, data, () => {
+        createProps(key, handle, () => {
           setItems((items) => {
             const newItems = { ...items };
             delete newItems[key];
@@ -48,16 +52,22 @@ export const tapClientList = <TData, TState, TMethods extends ClientMethods>(
           });
         }),
       ]);
+      initialDataHandles.push(handle);
     }
     return Object.fromEntries(entries);
   });
 
-  const lookup = tapClientLookup<TState, TMethods, Record<string, Props>>(
-    items,
-    Resource,
-    [Resource],
+  const lookup = tapClientLookup<TState, TMethods>(
+    () =>
+      Object.values(items).map((props) => withKey(props.key, Resource(props))),
+    [items, Resource],
   );
 
+  initialDataHandles.forEach((handle) => {
+    handle.data = undefined;
+    handle.hasData = false;
+  });
+
   const add = (data: TData) => {
     const key = getKey(data);
     setItems((items) => {
@@ -67,9 +77,12 @@ export const tapClientList = <TData, TState, TMethods extends ClientMethods>(
         );
       }
 
+      const handle = { data, hasData: true };
+      initialDataHandles.push(handle);
+
       return {
         ...items,
-        [key]: createProps(key, data, () => {
+        [key]: createProps(key, handle, () => {
           setItems((items) => {
             const newItems = { ...items };
             delete newItems[key];

package/src/tapClientLookup.ts

@@ -1,56 +1,76 @@
-import { ResourceElement, tapMemo, tapResources } from "@assistant-ui/tap";
+import {
+  tapInlineResource,
+  tapMemo,
+  tapResources,
+  type ResourceElement,
+} from "@assistant-ui/tap";
 import type { ClientMethods, ClientOutputOf } from "./types/client";
 import { ClientResource } from "./tapClientResource";
+import { wrapperResource } from "./wrapperResource";
 
-export const tapClientLookup = <
-  TState,
-  TMethods extends ClientMethods,
-  M extends Record<string | number | symbol, any>,
->(
-  map: M,
-  getElement: (
-    t: M[keyof M],
-    key: keyof M,
-  ) => ResourceElement<ClientOutputOf<TState, TMethods>>,
-  getElementDeps: any[],
+const ClientResourceWithKey = wrapperResource(
+  <TState, TMethods extends ClientMethods>(
+    el: ResourceElement<ClientOutputOf<TState, TMethods>>,
+  ) => {
+    if (el.key === undefined) {
+      throw new Error("tapClientResource: Element has no key");
+    }
+    return tapInlineResource(ClientResource(el)) as ClientOutputOf<
+      TState,
+      TMethods
+    > & { key: string | number };
+  },
+);
+
+export function tapClientLookup<TState, TMethods extends ClientMethods>(
+  getElements: () => readonly ResourceElement<
+    ClientOutputOf<TState, TMethods>
+  >[],
+  getElementsDeps: readonly unknown[],
 ): {
   state: TState[];
-  get: (lookup: { index: number } | { key: keyof M }) => TMethods;
-} => {
+  get: (lookup: { index: number } | { key: string }) => TMethods;
+} {
   const resources = tapResources(
-    map,
-    (t, key) => ClientResource(getElement(t, key)),
-    getElementDeps,
+    () => getElements().map((el) => ClientResourceWithKey(el)),
+    // biome-ignore lint/correctness/useExhaustiveDependencies: getElementsDeps is passed through from caller
+    getElementsDeps,
   );
-  const keys = tapMemo(() => Object.keys(map) as (keyof M)[], [map]);
+
+  const keys = tapMemo(() => Object.keys(resources), [resources]);
+
+  // For arrays, track element key -> index mapping
+  const keyToIndex = tapMemo(() => {
+    return resources.reduce(
+      (acc, resource, index) => {
+        acc[resource.key] = index;
+        return acc;
+      },
+      {} as Record<string, number>,
+    );
+  }, [resources]);
 
   const state = tapMemo(() => {
-    const result = new Array(keys.length);
-    for (let i = 0; i < keys.length; i++) {
-      result[i] = resources[keys[i]!].state;
-    }
-    return result;
-  }, [keys, resources]);
+    return resources.map((r) => r.state);
+  }, [resources]);
 
   return {
     state,
-    get: (lookup: { index: number } | { key: keyof M }) => {
+    get: (lookup: { index: number } | { key: string }) => {
       if ("index" in lookup) {
         if (lookup.index < 0 || lookup.index >= keys.length) {
           throw new Error(
             `tapClientLookup: Index ${lookup.index} out of bounds (length: ${keys.length})`,
           );
         }
-        return resources[keys[lookup.index]!]!.methods;
+        return resources[lookup.index]!.methods;
       }
 
-      const value = resources[lookup.key];
-      if (!value) {
-        throw new Error(
-          `tapClientLookup: Key "${String(lookup.key)}" not found`,
-        );
+      const index = keyToIndex[lookup.key];
+      if (index === undefined) {
+        throw new Error(`tapClientLookup: Key "${lookup.key}" not found`);
       }
-      return value.methods;
+      return resources[index]!.methods;
     },
   };
-};
+}

package/src/tapClientResource.ts

@@ -4,7 +4,6 @@ import {
   tapRef,
   type ResourceElement,
   tapResource,
-  resource,
   tapInlineResource,
 } from "@assistant-ui/tap";
 import type { ClientMethods, ClientOutputOf } from "./types/client";
@@ -17,6 +16,7 @@ import {
   BaseProxyHandler,
   handleIntrospectionProp,
 } from "./utils/BaseProxyHandler";
+import { wrapperResource } from "./wrapperResource";
 
 /**
  * Symbol used internally to get state from ClientProxy.
@@ -57,6 +57,8 @@ function getOrCreateProxyFn(prop: string | symbol) {
       const method = this[SYMBOL_GET_OUTPUT].methods[prop];
       if (!method)
         throw new Error(`Method "${String(prop)}" is not implemented.`);
+      if (typeof method !== "function")
+        throw new Error(`"${String(prop)}" is not a function.`);
       return method(...args);
     };
     fieldAccessFns.set(prop, template);
@@ -82,7 +84,9 @@ class ClientProxyHandler
     if (prop === SYMBOL_CLIENT_INDEX) return this.index;
     const introspection = handleIntrospectionProp(prop, "ClientProxy");
     if (introspection !== false) return introspection;
-    return getOrCreateProxyFn(prop);
+    const value = this.outputRef.current.methods[prop];
+    if (typeof value === "function") return getOrCreateProxyFn(prop);
+    return value;
   }
 
   ownKeys(): ArrayLike<string | symbol> {
@@ -114,10 +118,12 @@ class ClientProxyHandler
  * });
  * ```
  */
-export const ClientResource = resource(
+export const ClientResource = wrapperResource(
   <TState, TMethods extends ClientMethods>(
     element: ResourceElement<ClientOutputOf<TState, TMethods>>,
-  ): ClientOutputOf<TState, TMethods> => {
+  ): ClientOutputOf<TState, TMethods> & {
+    key: string | number | undefined;
+  } => {
     const valueRef = tapRef(
       null as unknown as ClientOutputOf<TState, TMethods>,
     );
@@ -129,7 +135,7 @@ export const ClientResource = resource(
           {} as TMethods,
           new ClientProxyHandler(valueRef, index),
         ),
-      [],
+      [index],
     );
 
     const value = tapWithClientStack(methods, () => tapResource(element));
@@ -141,7 +147,7 @@ export const ClientResource = resource(
       valueRef.current = value;
     });
 
-    return { methods, state: value.state };
+    return { methods, state: value.state, key: element.key };
   },
 );
 

package/src/types/client.ts

@@ -9,7 +9,7 @@ import type {
  * Base type for methods that can be called on a client.
  */
 export interface ClientMethods {
-  [key: string | symbol]: (...args: any[]) => any;
+  [key: string | symbol]: ((...args: any[]) => any) | ClientMethods;
 }
 
 type ClientMetaType = { source: ClientNames; query: Record<string, unknown> };
@@ -170,7 +170,7 @@ export type AssistantClientAccessor<K extends ClientNames> =
       | ClientMeta<K>
       | { source: "root"; query: Record<string, never> }
       | { source: null; query: null }
-    );
+    ) & { name: K };
 
 /**
  * The assistant client type with all registered clients.