@assistant-ui/react-generative-ui 0.0.15 → 0.0.17

package/src/teams/toAdaptiveCard.ts

@@ -1,19 +1,24 @@
+import {
+  MAX_TRAVERSAL_DEPTH,
+  boundSpec,
+  clampReasonDetail,
+} from "../convert/boundSpec";
+import { copyBounded } from "../convert/copyBounded";
+import { isElement } from "../convert/isElement";
+import { takeRun } from "../convert/takeRun";
 import {
   normalizeSpec,
   type NormalizedUIElement,
   type NormalizedUINode,
 } from "../ir";
-import { boundSpec } from "./boundSpec";
 import {
   CHOICE_OPTION_CAP,
-  MAX_TRAVERSAL_DEPTH,
   PAYLOAD_SOFT_CAP,
   PRIMARY_ACTION_CAP,
   TABLE_COLUMN_CAP,
   TABLE_ROW_CAP,
   buildCard,
   buildSubmitAction,
-  clampReasonDetail,
   utf8ByteLength,
 } from "./constants";
 import type {
@@ -44,9 +49,6 @@ export interface ConversionContext {
 const isRecord = (value: unknown): value is Record<string, unknown> =>
   typeof value === "object" && value !== null && !Array.isArray(value);
 
-const isElement = (node: NormalizedUINode): node is NormalizedUIElement =>
-  isRecord(node);
-
 const asString = (value: unknown): string =>
   typeof value === "string" ? value : "";
 
@@ -125,7 +127,7 @@ function reservedSafeId(
 }
 
 /**
- * The shared bounded-iteration primitive: slices `value` to `cap` entries
+ * The shared bounded-iteration primitive: copies `value` to `cap` entries
  * without ever reading past that many indices, so a hostile array (sparse or
  * proxied with a fabricated `length`) cannot stall the event loop.
  */
@@ -134,7 +136,7 @@ const clampArray = (
   cap: number,
 ): { readonly items: unknown[]; readonly truncated: boolean } => {
   if (!Array.isArray(value)) return { items: [], truncated: false };
-  return { items: value.slice(0, cap), truncated: value.length > cap };
+  return copyBounded(value, cap);
 };
 
 const normalizedList = (
@@ -337,12 +339,13 @@ function convertTable(
     : undefined;
   const dataRows: TeamsTableRow[] = rawRows.map((row) => ({
     type: "TableRow",
-    cells: (Array.isArray(row) ? row.slice(0, TABLE_COLUMN_CAP) : []).map(
-      (cell) => ({
-        type: "TableCell" as const,
-        items: [textBlock(stringifyCell(cell))],
-      }),
-    ),
+    cells: (Array.isArray(row)
+      ? copyBounded(row, TABLE_COLUMN_CAP).items
+      : []
+    ).map((cell) => ({
+      type: "TableCell" as const,
+      items: [textBlock(stringifyCell(cell))],
+    })),
   }));
 
   return {
@@ -729,32 +732,22 @@ export function convertSequence(
       continue;
     }
     if (isElement(current) && current.type === "Fact") {
-      const facts: NormalizedUIElement[] = [];
-      while (index < nodes.length) {
-        const candidate = nodes[index];
-        if (!candidate || !isElement(candidate) || candidate.type !== "Fact") {
-          break;
-        }
-        facts.push(candidate);
-        index += 1;
-      }
+      const { run: facts, next } = takeRun(
+        nodes,
+        index,
+        (candidate) => candidate.type === "Fact",
+      );
+      index = next;
       emit([convertFacts(facts)]);
       continue;
     }
     if (isElement(current) && current.type === "Button") {
-      const buttons: NormalizedUIElement[] = [];
-      while (index < nodes.length) {
-        const candidate = nodes[index];
-        if (
-          !candidate ||
-          !isElement(candidate) ||
-          candidate.type !== "Button"
-        ) {
-          break;
-        }
-        buttons.push(candidate);
-        index += 1;
-      }
+      const { run: buttons, next } = takeRun(
+        nodes,
+        index,
+        (candidate) => candidate.type === "Button",
+      );
+      index = next;
       emit([convertButtons(buttons, context)]);
       continue;
     }

package/src/teams/toTeamsAttachments.ts

@@ -1,14 +1,15 @@
+import { boundSpec, clampReasonDetail } from "../convert/boundSpec";
+import { copyBounded } from "../convert/copyBounded";
+import { isElement } from "../convert/isElement";
 import {
   normalizeSpec,
   type NormalizedUIElement,
   type NormalizedUINode,
 } from "../ir";
-import { boundSpec } from "./boundSpec";
 import {
   CAROUSEL_ATTACHMENT_CAP,
   PAYLOAD_SOFT_CAP,
   buildAttachment,
-  clampReasonDetail,
   utf8ByteLength,
 } from "./constants";
 import {
@@ -23,12 +24,6 @@ import type {
   ToAdaptiveCardOptions,
 } from "./types";
 
-const isRecord = (value: unknown): value is Record<string, unknown> =>
-  typeof value === "object" && value !== null && !Array.isArray(value);
-
-const isElement = (node: NormalizedUINode): node is NormalizedUIElement =>
-  isRecord(node);
-
 const normalizedList = (
   node: NormalizedUINode | undefined,
 ): NormalizedUINode[] => {
@@ -37,14 +32,6 @@ const normalizedList = (
   return node.flatMap((child) => normalizedList(child));
 };
 
-const clampArray = <T>(
-  value: readonly T[],
-  cap: number,
-): { readonly items: T[]; readonly truncated: boolean } => ({
-  items: value.slice(0, cap),
-  truncated: value.length > cap,
-});
-
 /**
  * Recognizes a root that is a single `Carousel` element, returning its `Card`
  * children. A non-card child is routed through {@link discardedChild}, which
@@ -102,7 +89,7 @@ export function toTeamsAttachments(
     const { root } = normalizeSpec(bounded as never);
     const carouselCards = rootCarouselCards(root, context);
     if (carouselCards !== undefined) {
-      const { items, truncated } = clampArray(
+      const { items, truncated } = copyBounded(
         carouselCards,
         CAROUSEL_ATTACHMENT_CAP,
       );

package/src/vocabulary/list.test.tsx

@@ -69,13 +69,17 @@ describe("listVocabulary $action dispatch", () => {
     const trigger = rowOut(registry.dispatch).props.children as ReactElement;
     const onClick = (trigger.props as { onClick: (e: unknown) => void })
       .onClick;
-    onClick({ target: { closest: () => null } });
+    onClick({
+      target: { closest: () => trigger },
+      currentTarget: trigger,
+    });
     expect(handler).toHaveBeenCalledWith({ payload: { type: "open" } });
   });
 
   type KeyDownEvent = {
     key: string;
     target: { closest: (selector: string) => unknown };
+    currentTarget: unknown;
     preventDefault: () => void;
   };
 
@@ -89,14 +93,17 @@ describe("listVocabulary $action dispatch", () => {
     const handler = vi.fn();
     const registry = createActionRegistry({ open: handler });
     const onKeyDown = getOnKeyDown(registry.dispatch);
+    const currentTarget = {};
     onKeyDown({
       key: "Enter",
-      target: { closest: () => null },
+      target: { closest: () => currentTarget },
+      currentTarget,
       preventDefault: vi.fn(),
     });
     onKeyDown({
       key: " ",
-      target: { closest: () => null },
+      target: { closest: () => currentTarget },
+      currentTarget,
       preventDefault: vi.fn(),
     });
     expect(handler).toHaveBeenCalledTimes(2);
@@ -109,6 +116,7 @@ describe("listVocabulary $action dispatch", () => {
     onKeyDown({
       key: "Tab",
       target: { closest: () => null },
+      currentTarget: {},
       preventDefault: vi.fn(),
     });
     expect(handler).not.toHaveBeenCalled();
@@ -124,7 +132,7 @@ describe("listVocabulary $action dispatch", () => {
       closest: (selector: string) =>
         selector.includes("button") ? nestedButton : null,
     };
-    onClick({ target: nestedButton });
+    onClick({ target: nestedButton, currentTarget: {} });
     expect(handler).not.toHaveBeenCalled();
   });
 
@@ -137,7 +145,12 @@ describe("listVocabulary $action dispatch", () => {
         selector.includes("input") ? nestedInput : null,
     };
     const preventDefault = vi.fn();
-    onKeyDown({ key: "Enter", target: nestedInput, preventDefault });
+    onKeyDown({
+      key: "Enter",
+      target: nestedInput,
+      currentTarget: {},
+      preventDefault,
+    });
     expect(handler).not.toHaveBeenCalled();
     expect(preventDefault).not.toHaveBeenCalled();
   });
@@ -152,7 +165,7 @@ describe("listVocabulary $action dispatch", () => {
       closest: (selector: string) =>
         selector.includes('[role="button"]') ? nestedRoleButton : null,
     };
-    onClick({ target: nestedRoleButton });
+    onClick({ target: nestedRoleButton, currentTarget: {} });
     expect(handler).not.toHaveBeenCalled();
   });
 
@@ -165,7 +178,12 @@ describe("listVocabulary $action dispatch", () => {
         selector.includes('[role="button"]') ? nestedRoleButton : null,
     };
     const preventDefault = vi.fn();
-    onKeyDown({ key: "Enter", target: nestedRoleButton, preventDefault });
+    onKeyDown({
+      key: "Enter",
+      target: nestedRoleButton,
+      currentTarget: {},
+      preventDefault,
+    });
     expect(handler).not.toHaveBeenCalled();
   });
 
@@ -173,8 +191,14 @@ describe("listVocabulary $action dispatch", () => {
     const handler = vi.fn();
     const registry = createActionRegistry({ open: handler });
     const onKeyDown = getOnKeyDown(registry.dispatch);
+    const currentTarget = {};
     const preventDefault = vi.fn();
-    onKeyDown({ key: " ", target: { closest: () => null }, preventDefault });
+    onKeyDown({
+      key: " ",
+      target: { closest: () => currentTarget },
+      currentTarget,
+      preventDefault,
+    });
     expect(handler).toHaveBeenCalledWith({ payload: { type: "open" } });
     expect(preventDefault).toHaveBeenCalledTimes(1);
   });
@@ -183,10 +207,12 @@ describe("listVocabulary $action dispatch", () => {
     const handler = vi.fn();
     const registry = createActionRegistry({ open: handler });
     const onKeyDown = getOnKeyDown(registry.dispatch);
+    const currentTarget = {};
     const preventDefault = vi.fn();
     onKeyDown({
       key: "Enter",
-      target: { closest: () => null },
+      target: { closest: () => currentTarget },
+      currentTarget,
       preventDefault,
     });
     expect(handler).toHaveBeenCalledWith({ payload: { type: "open" } });

package/src/vocabulary/list.tsx

@@ -28,13 +28,15 @@ export const listVocabulary = {
             data-aui="listview-item-trigger"
             onClick={(event) => {
               const target = event.target as Element;
-              if (target.closest(INTERACTIVE_DESCENDANT_SELECTOR)) return;
+              const hit = target.closest(INTERACTIVE_DESCENDANT_SELECTOR);
+              if (hit !== null && hit !== event.currentTarget) return;
               fire($action, $dispatch);
             }}
             onKeyDown={(event) => {
               if (event.key !== "Enter" && event.key !== " ") return;
               const target = event.target as Element;
-              if (target.closest(INTERACTIVE_DESCENDANT_SELECTOR)) return;
+              const hit = target.closest(INTERACTIVE_DESCENDANT_SELECTOR);
+              if (hit !== null && hit !== event.currentTarget) return;
               if (event.key === " ") event.preventDefault();
               fire($action, $dispatch);
             }}

package/dist/teams/boundSpec.d.ts

@@ -1,20 +0,0 @@
-import { ClampReason } from "./constants.js";
-//#region src/teams/boundSpec.d.ts
-/**
- * Produces a bounded plain copy of a raw generative-ui spec before it
- * reaches `normalizeSpec`, whose own traversal of the root array or any
- * `children` array walks the full reported length of a hostile proxied
- * array before any per-field cap downstream ever applies. Every array
- * (root, or `children` at any depth) is capped to {@link CHILDREN_CAP}
- * entries via `Array.prototype.slice`, which bounds even a proxy with a
- * fabricated `length`; recursion itself is capped at
- * {@link MAX_TRAVERSAL_DEPTH}. `onClamp` fires once per level that was
- * truncated, receiving the reason for that truncation: `"children"`,
- * `"depth"`, `"budget"`, or `"cycle"`. The walk also spends a total budget of
- * {@link NODE_BUDGET} nodes, so shared references cannot multiply work
- * exponentially, and a node that is its own ancestor is cut to `null`.
- */
-declare function boundSpec(spec: unknown, onClamp: (reason: ClampReason) => void): unknown;
-//#endregion
-export { boundSpec };
-//# sourceMappingURL=boundSpec.d.ts.map

package/dist/teams/boundSpec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"boundSpec.d.ts","names":[],"sources":["../../src/teams/boundSpec.ts"],"mappings":";;;;;;;;;;;;;;;;iBA0FgB,UACd,eACA,UAAU,QAAQ"}

package/dist/teams/boundSpec.js

@@ -1,67 +0,0 @@
-import { NODE_BUDGET } from "./constants.js";
-//#region src/teams/boundSpec.ts
-function boundNode(value, depth, onClamp, state, ancestors) {
-	if (state.remaining <= 0) {
-		if (!state.exhausted) {
-			state.exhausted = true;
-			onClamp("budget");
-		}
-		return null;
-	}
-	state.remaining -= 1;
-	if (depth > 64) {
-		onClamp("depth");
-		return null;
-	}
-	if (Array.isArray(value)) {
-		if (ancestors.has(value)) {
-			onClamp("cycle");
-			return null;
-		}
-		ancestors.add(value);
-		const bounded = Array.prototype.slice.call(value, 0, 200);
-		if (value.length > 200) onClamp("children");
-		const result = bounded.map((item) => boundNode(item, depth + 1, onClamp, state, ancestors));
-		ancestors.delete(value);
-		return result;
-	}
-	if (value !== null && typeof value === "object" && "children" in value) {
-		if (ancestors.has(value)) {
-			onClamp("cycle");
-			return null;
-		}
-		ancestors.add(value);
-		const record = value;
-		const result = {
-			...record,
-			children: boundNode(record["children"], depth + 1, onClamp, state, ancestors)
-		};
-		ancestors.delete(value);
-		return result;
-	}
-	return value;
-}
-/**
-* Produces a bounded plain copy of a raw generative-ui spec before it
-* reaches `normalizeSpec`, whose own traversal of the root array or any
-* `children` array walks the full reported length of a hostile proxied
-* array before any per-field cap downstream ever applies. Every array
-* (root, or `children` at any depth) is capped to {@link CHILDREN_CAP}
-* entries via `Array.prototype.slice`, which bounds even a proxy with a
-* fabricated `length`; recursion itself is capped at
-* {@link MAX_TRAVERSAL_DEPTH}. `onClamp` fires once per level that was
-* truncated, receiving the reason for that truncation: `"children"`,
-* `"depth"`, `"budget"`, or `"cycle"`. The walk also spends a total budget of
-* {@link NODE_BUDGET} nodes, so shared references cannot multiply work
-* exponentially, and a node that is its own ancestor is cut to `null`.
-*/
-function boundSpec(spec, onClamp) {
-	return boundNode(spec, 0, onClamp, {
-		remaining: NODE_BUDGET,
-		exhausted: false
-	}, /* @__PURE__ */ new WeakSet());
-}
-//#endregion
-export { boundSpec };
-
-//# sourceMappingURL=boundSpec.js.map

package/dist/teams/boundSpec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"boundSpec.js","names":[],"sources":["../../src/teams/boundSpec.ts"],"sourcesContent":["import {\n  CHILDREN_CAP,\n  MAX_TRAVERSAL_DEPTH,\n  NODE_BUDGET,\n  type ClampReason,\n} from \"./constants\";\n\ninterface BoundState {\n  remaining: number;\n  exhausted: boolean;\n}\n\nfunction boundNode(\n  value: unknown,\n  depth: number,\n  onClamp: (reason: ClampReason) => void,\n  state: BoundState,\n  ancestors: WeakSet<object>,\n): unknown {\n  if (state.remaining <= 0) {\n    if (!state.exhausted) {\n      state.exhausted = true;\n      onClamp(\"budget\");\n    }\n    return null;\n  }\n  state.remaining -= 1;\n  if (depth > MAX_TRAVERSAL_DEPTH) {\n    onClamp(\"depth\");\n    return null;\n  }\n  if (Array.isArray(value)) {\n    if (ancestors.has(value)) {\n      onClamp(\"cycle\");\n      return null;\n    }\n    ancestors.add(value);\n    const bounded = Array.prototype.slice.call(\n      value,\n      0,\n      CHILDREN_CAP,\n    ) as unknown[];\n    if (value.length > CHILDREN_CAP) onClamp(\"children\");\n    const result = bounded.map((item) =>\n      boundNode(item, depth + 1, onClamp, state, ancestors),\n    );\n    ancestors.delete(value);\n    return result;\n  }\n  if (\n    value !== null &&\n    typeof value === \"object\" &&\n    \"children\" in (value as Record<string, unknown>)\n  ) {\n    if (ancestors.has(value)) {\n      onClamp(\"cycle\");\n      return null;\n    }\n    ancestors.add(value);\n    const record = value as Record<string, unknown>;\n    const result = {\n      ...record,\n      children: boundNode(\n        record[\"children\"],\n        depth + 1,\n        onClamp,\n        state,\n        ancestors,\n      ),\n    };\n    ancestors.delete(value);\n    return result;\n  }\n  return value;\n}\n\n/**\n * Produces a bounded plain copy of a raw generative-ui spec before it\n * reaches `normalizeSpec`, whose own traversal of the root array or any\n * `children` array walks the full reported length of a hostile proxied\n * array before any per-field cap downstream ever applies. Every array\n * (root, or `children` at any depth) is capped to {@link CHILDREN_CAP}\n * entries via `Array.prototype.slice`, which bounds even a proxy with a\n * fabricated `length`; recursion itself is capped at\n * {@link MAX_TRAVERSAL_DEPTH}. `onClamp` fires once per level that was\n * truncated, receiving the reason for that truncation: `\"children\"`,\n * `\"depth\"`, `\"budget\"`, or `\"cycle\"`. The walk also spends a total budget of\n * {@link NODE_BUDGET} nodes, so shared references cannot multiply work\n * exponentially, and a node that is its own ancestor is cut to `null`.\n */\nexport function boundSpec(\n  spec: unknown,\n  onClamp: (reason: ClampReason) => void,\n): unknown {\n  return boundNode(\n    spec,\n    0,\n    onClamp,\n    { remaining: NODE_BUDGET, exhausted: false },\n    new WeakSet(),\n  );\n}\n"],"mappings":";;AAYA,SAAS,UACP,OACA,OACA,SACA,OACA,WACS;CACT,IAAI,MAAM,aAAa,GAAG;EACxB,IAAI,CAAC,MAAM,WAAW;GACpB,MAAM,YAAY;GAClB,QAAQ,QAAQ;EAClB;EACA,OAAO;CACT;CACA,MAAM,aAAa;CACnB,IAAI,QAAA,IAA6B;EAC/B,QAAQ,OAAO;EACf,OAAO;CACT;CACA,IAAI,MAAM,QAAQ,KAAK,GAAG;EACxB,IAAI,UAAU,IAAI,KAAK,GAAG;GACxB,QAAQ,OAAO;GACf,OAAO;EACT;EACA,UAAU,IAAI,KAAK;EACnB,MAAM,UAAU,MAAM,UAAU,MAAM,KACpC,OACA,GAAA,GAEF;EACA,IAAI,MAAM,SAAA,KAAuB,QAAQ,UAAU;EACnD,MAAM,SAAS,QAAQ,KAAK,SAC1B,UAAU,MAAM,QAAQ,GAAG,SAAS,OAAO,SAAS,CACtD;EACA,UAAU,OAAO,KAAK;EACtB,OAAO;CACT;CACA,IACE,UAAU,QACV,OAAO,UAAU,YACjB,cAAe,OACf;EACA,IAAI,UAAU,IAAI,KAAK,GAAG;GACxB,QAAQ,OAAO;GACf,OAAO;EACT;EACA,UAAU,IAAI,KAAK;EACnB,MAAM,SAAS;EACf,MAAM,SAAS;GACb,GAAG;GACH,UAAU,UACR,OAAO,aACP,QAAQ,GACR,SACA,OACA,SACF;EACF;EACA,UAAU,OAAO,KAAK;EACtB,OAAO;CACT;CACA,OAAO;AACT;;;;;;;;;;;;;;;AAgBA,SAAgB,UACd,MACA,SACS;CACT,OAAO,UACL,MACA,GACA,SACA;EAAE,WAAW;EAAa,WAAW;CAAM,mBAC3C,IAAI,QAAQ,CACd;AACF"}

package/src/teams/boundSpec.ts

@@ -1,102 +0,0 @@
-import {
-  CHILDREN_CAP,
-  MAX_TRAVERSAL_DEPTH,
-  NODE_BUDGET,
-  type ClampReason,
-} from "./constants";
-
-interface BoundState {
-  remaining: number;
-  exhausted: boolean;
-}
-
-function boundNode(
-  value: unknown,
-  depth: number,
-  onClamp: (reason: ClampReason) => void,
-  state: BoundState,
-  ancestors: WeakSet<object>,
-): unknown {
-  if (state.remaining <= 0) {
-    if (!state.exhausted) {
-      state.exhausted = true;
-      onClamp("budget");
-    }
-    return null;
-  }
-  state.remaining -= 1;
-  if (depth > MAX_TRAVERSAL_DEPTH) {
-    onClamp("depth");
-    return null;
-  }
-  if (Array.isArray(value)) {
-    if (ancestors.has(value)) {
-      onClamp("cycle");
-      return null;
-    }
-    ancestors.add(value);
-    const bounded = Array.prototype.slice.call(
-      value,
-      0,
-      CHILDREN_CAP,
-    ) as unknown[];
-    if (value.length > CHILDREN_CAP) onClamp("children");
-    const result = bounded.map((item) =>
-      boundNode(item, depth + 1, onClamp, state, ancestors),
-    );
-    ancestors.delete(value);
-    return result;
-  }
-  if (
-    value !== null &&
-    typeof value === "object" &&
-    "children" in (value as Record<string, unknown>)
-  ) {
-    if (ancestors.has(value)) {
-      onClamp("cycle");
-      return null;
-    }
-    ancestors.add(value);
-    const record = value as Record<string, unknown>;
-    const result = {
-      ...record,
-      children: boundNode(
-        record["children"],
-        depth + 1,
-        onClamp,
-        state,
-        ancestors,
-      ),
-    };
-    ancestors.delete(value);
-    return result;
-  }
-  return value;
-}
-
-/**
- * Produces a bounded plain copy of a raw generative-ui spec before it
- * reaches `normalizeSpec`, whose own traversal of the root array or any
- * `children` array walks the full reported length of a hostile proxied
- * array before any per-field cap downstream ever applies. Every array
- * (root, or `children` at any depth) is capped to {@link CHILDREN_CAP}
- * entries via `Array.prototype.slice`, which bounds even a proxy with a
- * fabricated `length`; recursion itself is capped at
- * {@link MAX_TRAVERSAL_DEPTH}. `onClamp` fires once per level that was
- * truncated, receiving the reason for that truncation: `"children"`,
- * `"depth"`, `"budget"`, or `"cycle"`. The walk also spends a total budget of
- * {@link NODE_BUDGET} nodes, so shared references cannot multiply work
- * exponentially, and a node that is its own ancestor is cut to `null`.
- */
-export function boundSpec(
-  spec: unknown,
-  onClamp: (reason: ClampReason) => void,
-): unknown {
-  return boundNode(
-    spec,
-    0,
-    onClamp,
-    { remaining: NODE_BUDGET, exhausted: false },
-    new WeakSet(),
-  );
-}