@almadar/ui 5.157.0 → 5.158.0

package/dist/runtime/index.js

@@ -810,11 +810,32 @@ function isPlainObject(value) {
   if (typeof value === "function") return false;
   return true;
 }
+function subtreeHasMarker(value) {
+  const cached = markerPresenceCache.get(value);
+  if (cached !== void 0) return cached;
+  let found = false;
+  const children = Array.isArray(value) ? value : Object.values(value);
+  for (const child of children) {
+    if (isRenderBindingMarker(child)) {
+      found = true;
+      break;
+    }
+    if (Array.isArray(child) || isPlainObject(child)) {
+      if (subtreeHasMarker(child)) {
+        found = true;
+        break;
+      }
+    }
+  }
+  markerPresenceCache.set(value, found);
+  return found;
+}
 function walkValue(value, scopeTrait, entity, config, state) {
   if (isRenderBindingMarker(value)) {
     return { resolved: resolveMarkerExpression(value.expression, entity, config, state), changed: true };
   }
   if (Array.isArray(value)) {
+    if (!subtreeHasMarker(value)) return { resolved: value, changed: false };
     const out = [];
     let changed = false;
     for (const item of value) {
@@ -832,6 +853,7 @@ function walkValue(value, scopeTrait, entity, config, state) {
     return changed ? { resolved: out, changed: true } : { resolved: value, changed: false };
   }
   if (isPlainObject(value)) {
+    if (!subtreeHasMarker(value)) return { resolved: value, changed: false };
     const sourceTrait = value._sourceTrait;
     if (typeof sourceTrait === "string" && sourceTrait !== scopeTrait) {
       return { resolved: value, changed: false };
@@ -857,9 +879,11 @@ function resolveRenderBindingMarkers(props, scopeTrait, entity, config, state) {
   }
   return changed ? out : props;
 }
+var markerPresenceCache;
 var init_resolve_render_bindings = __esm({
   "lib/resolve-render-bindings.ts"() {
     "use client";
+    markerPresenceCache = /* @__PURE__ */ new WeakMap();
   }
 });
 function cn(...inputs) {
@@ -26921,7 +26945,7 @@ function fileIcon(name) {
       return "file";
   }
 }
-var TreeNodeItem, FileTree;
+var TreeNodeItem, FlatTreeNodeItem, FileTree;
 var init_FileTree = __esm({
   "components/core/molecules/FileTree.tsx"() {
     "use client";
@@ -27006,14 +27030,101 @@ var init_FileTree = __esm({
         )) })
       ] });
     };
+    FlatTreeNodeItem = ({
+      item,
+      depth,
+      indent,
+      childrenByParent,
+      onNodeSelect,
+      defaultExpanded = false
+    }) => {
+      const [expanded, setExpanded] = useState(defaultExpanded || depth < 1);
+      const children = childrenByParent.get(item.id);
+      const hasChildren = !!children && children.length > 0;
+      const handleClick = useCallback(() => {
+        if (hasChildren) setExpanded((prev) => !prev);
+        onNodeSelect?.(item.id);
+      }, [hasChildren, item.id, onNodeSelect]);
+      return /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsxs(
+          Box,
+          {
+            className: "flex items-center gap-1.5 py-0.5 px-2 cursor-pointer rounded-sm transition-colors hover:bg-muted",
+            style: { paddingLeft: depth * indent + 8 },
+            onClick: handleClick,
+            role: "treeitem",
+            "aria-expanded": hasChildren ? expanded : void 0,
+            children: [
+              hasChildren ? /* @__PURE__ */ jsx(
+                Icon,
+                {
+                  name: expanded ? "chevron-down" : "chevron-right",
+                  size: "xs",
+                  className: "text-[var(--color-muted-foreground)] flex-shrink-0"
+                }
+              ) : /* @__PURE__ */ jsx(Box, { style: { width: 12, flexShrink: 0 } }),
+              /* @__PURE__ */ jsx(
+                Icon,
+                {
+                  name: item.icon ?? (hasChildren ? expanded ? "folder-open" : "folder" : "file"),
+                  size: "xs",
+                  className: hasChildren ? "text-[var(--color-warning)]" : "text-[var(--color-muted-foreground)]"
+                }
+              ),
+              /* @__PURE__ */ jsx(Typography, { variant: "caption", className: "truncate font-mono text-xs", children: item.label })
+            ]
+          }
+        ),
+        hasChildren && expanded && /* @__PURE__ */ jsx(Box, { role: "group", children: children.map((child) => /* @__PURE__ */ jsx(
+          FlatTreeNodeItem,
+          {
+            item: child,
+            depth: depth + 1,
+            indent,
+            childrenByParent,
+            onNodeSelect
+          },
+          child.id
+        )) })
+      ] });
+    };
     FileTree = ({
       tree,
+      items,
       selectedPath,
       onFileSelect,
+      onNodeSelect,
       className,
       indent = 16
     }) => {
-      if (tree.length === 0) return null;
+      if (items) {
+        if (items.length === 0) return null;
+        const ids = new Set(items.map((node) => node.id));
+        const childrenByParent = /* @__PURE__ */ new Map();
+        const roots = [];
+        for (const item of items) {
+          if (item.parentId && ids.has(item.parentId)) {
+            const siblings = childrenByParent.get(item.parentId);
+            if (siblings) siblings.push(item);
+            else childrenByParent.set(item.parentId, [item]);
+          } else {
+            roots.push(item);
+          }
+        }
+        return /* @__PURE__ */ jsx(Box, { className: `py-1 overflow-y-auto ${className ?? ""}`, role: "tree", children: roots.map((item) => /* @__PURE__ */ jsx(
+          FlatTreeNodeItem,
+          {
+            item,
+            depth: 0,
+            indent,
+            childrenByParent,
+            onNodeSelect,
+            defaultExpanded: true
+          },
+          item.id
+        )) });
+      }
+      if (!tree || tree.length === 0) return null;
       return /* @__PURE__ */ jsx(Box, { className: `py-1 overflow-y-auto ${className ?? ""}`, role: "tree", children: tree.map((node) => /* @__PURE__ */ jsx(
         TreeNodeItem,
         {
@@ -28344,7 +28455,7 @@ var init_debug = __esm({
     createLogger("almadar:ui:debug:game-state");
   }
 });
-var isRelationsDebugEnabled, RelationSelect;
+var isRelationsDebugEnabled, MANY_CARDINALITIES, RelationSelect;
 var init_RelationSelect = __esm({
   "components/core/molecules/RelationSelect.tsx"() {
     "use client";
@@ -28358,6 +28469,11 @@ var init_RelationSelect = __esm({
     init_Typography();
     init_debug();
     isRelationsDebugEnabled = () => isDebugEnabled();
+    MANY_CARDINALITIES = [
+      "many",
+      "one-to-many",
+      "many-to-many"
+    ];
     RelationSelect = ({
       value,
       onChange,
@@ -30022,17 +30138,21 @@ var init_MathCanvas = __esm({
       error
     }) => {
       const eventBus = useEventBus();
+      const keyMapKey = keyMap ? JSON.stringify(keyMap) : null;
+      const keyUpMapKey = keyUpMap ? JSON.stringify(keyUpMap) : null;
+      const stableKeyMap = useMemo(() => keyMap, [keyMapKey]);
+      const stableKeyUpMap = useMemo(() => keyUpMap, [keyUpMapKey]);
       useEffect(() => {
-        if (!keyMap && !keyUpMap) return;
+        if (!stableKeyMap && !stableKeyUpMap) return;
         const onDown = (e) => {
-          const ev = keyMap?.[e.code];
+          const ev = stableKeyMap?.[e.code];
           if (ev) {
             eventBus.emit(`UI:${ev}`, {});
             e.preventDefault();
           }
         };
         const onUp = (e) => {
-          const ev = keyUpMap?.[e.code];
+          const ev = stableKeyUpMap?.[e.code];
           if (ev) eventBus.emit(`UI:${ev}`, {});
         };
         window.addEventListener("keydown", onDown);
@@ -30041,7 +30161,7 @@ var init_MathCanvas = __esm({
           window.removeEventListener("keydown", onDown);
           window.removeEventListener("keyup", onUp);
         };
-      }, [keyMap, keyUpMap, eventBus]);
+      }, [stableKeyMap, stableKeyUpMap, eventBus]);
       const derivedShapes = useMemo(() => {
         const out = [];
         const margin = 24;
@@ -42340,6 +42460,9 @@ function determineInputType(field) {
   if (field.type === "relation" || field.relation) {
     return "relation";
   }
+  if (field.type === "array") {
+    return "array";
+  }
   if (field.type === "enum" || field.values || getEnumOptions(field).length > 0) {
     return "select";
   }
@@ -42415,6 +42538,7 @@ var init_Form = __esm({
     init_Typography();
     init_Icon();
     init_RelationSelect();
+    init_TagInput();
     init_UploadDropZone();
     init_Alert();
     init_useEventBus();
@@ -42494,7 +42618,7 @@ var init_Form = __esm({
             values: "values" in f3 ? f3.values : void 0,
             min: f3.min,
             max: f3.max,
-            relation: "relation" in f3 ? { entity: f3.relation.entity } : void 0
+            relation: "relation" in f3 ? { entity: f3.relation.entity, cardinality: f3.relation.cardinality } : void 0
           })
         );
       }, [entity, fields]);
@@ -42729,7 +42853,7 @@ var init_Form = __esm({
                 values: "values" in entityField ? entityField.values : void 0,
                 min: entityField.min,
                 max: entityField.max,
-                relation: "relation" in entityField ? { entity: entityField.relation.entity } : void 0
+                relation: "relation" in entityField ? { entity: entityField.relation.entity, cardinality: entityField.relation.cardinality } : void 0
               };
             }
             return { name: field, type: "string" };
@@ -42841,6 +42965,22 @@ var init_Form = __esm({
           case "relation": {
             const relationOptions = relationsData[fieldName] || [];
             const relationLoading = relationsLoading[fieldName] || false;
+            if (field.relation?.cardinality !== void 0 && MANY_CARDINALITIES.includes(field.relation.cardinality)) {
+              const selectedValues = Array.isArray(currentValue) ? currentValue.map((v) => String(v)) : [];
+              return /* @__PURE__ */ jsx(
+                Select,
+                {
+                  ...commonProps,
+                  multiple: true,
+                  searchable: true,
+                  clearable: true,
+                  options: [...relationOptions],
+                  value: selectedValues,
+                  onValueChange: (value) => handleChange(fieldName, Array.isArray(value) ? value : [value]),
+                  placeholder: field.placeholder || `Select ${label}...`
+                }
+              );
+            }
             return /* @__PURE__ */ jsx(
               RelationSelect,
               {
@@ -42855,6 +42995,18 @@ var init_Form = __esm({
               }
             );
           }
+          case "array": {
+            const arrayValue = Array.isArray(currentValue) ? currentValue.map((v) => String(v)) : currentValue != null && currentValue !== "" ? [String(currentValue)] : [];
+            return /* @__PURE__ */ jsx(
+              TagInput,
+              {
+                placeholder: field.placeholder,
+                disabled: isLoading,
+                value: arrayValue,
+                onChange: (next) => handleChange(fieldName, [...next])
+              }
+            );
+          }
           case "number":
             return /* @__PURE__ */ jsx(
               Input,
@@ -48423,7 +48575,10 @@ function enrichFormFields(fields, entityDef) {
           enriched.values = entityField.enumValues;
         }
         if (entityField.relation) {
-          enriched.relation = entityField.relation.entity;
+          enriched.relation = {
+            entity: entityField.relation.entity,
+            cardinality: entityField.relation.cardinality
+          };
         }
         return enriched;
       }
@@ -48451,7 +48606,10 @@ function enrichFormFields(fields, entityDef) {
         }
       }
       if (!obj.relation && entityField.relation) {
-        enriched.relation = entityField.relation.entity;
+        enriched.relation = {
+          entity: entityField.relation.entity,
+          cardinality: entityField.relation.cardinality
+        };
       }
       return enriched;
     }
@@ -48466,7 +48624,12 @@ function enrichDetailFields(fields, entityDef) {
     const meta = { type: entityField.type };
     const values = entityField.values ?? entityField.enumValues;
     if (values && values.length > 0) meta.values = values;
-    if (entityField.relation) meta.relation = entityField.relation.entity;
+    if (entityField.relation) {
+      meta.relation = {
+        entity: entityField.relation.entity,
+        cardinality: entityField.relation.cardinality
+      };
+    }
     return meta;
   };
   return fields.map((field) => {
@@ -49020,6 +49183,32 @@ function isPlainConfigObject(value) {
   const proto = Object.getPrototypeOf(value);
   return proto === Object.prototype || proto === null;
 }
+function subtreeHasTraitRef(value) {
+  const cached = traitRefPresenceCache.get(value);
+  if (cached !== void 0) return cached;
+  let found = false;
+  const children = Array.isArray(value) ? value : Object.values(value);
+  for (const child of children) {
+    if (typeof child === "string" && TRAIT_BINDING_RE.test(child)) {
+      found = true;
+      break;
+    }
+    if (isRenderBindingMarker(child)) continue;
+    if (Array.isArray(child)) {
+      if (subtreeHasTraitRef(child)) {
+        found = true;
+        break;
+      }
+    } else if (child !== null && typeof child === "object" && isPlainConfigObject(child)) {
+      if (subtreeHasTraitRef(child)) {
+        found = true;
+        break;
+      }
+    }
+  }
+  traitRefPresenceCache.set(value, found);
+  return found;
+}
 function substituteTraitRefsDeep(value, pathKey) {
   if (isRenderBindingMarker(value)) return value;
   if (typeof value === "string") {
@@ -49034,11 +49223,13 @@ function substituteTraitRefsDeep(value, pathKey) {
     return value;
   }
   if (Array.isArray(value)) {
+    if (!subtreeHasTraitRef(value)) return value;
     return value.map(
       (item, i) => substituteTraitRefsDeep(item, `${pathKey}[${i}]`)
     );
   }
   if (typeof value === "object" && isPlainConfigObject(value)) {
+    if (!subtreeHasTraitRef(value)) return value;
     const out = {};
     for (const [k, v] of Object.entries(value)) {
       out[k] = substituteTraitRefsDeep(v, `${pathKey}.${k}`);
@@ -49327,7 +49518,7 @@ function UISlotRenderer({
   }
   return wrapped;
 }
-var scopeWrapLog, TRAIT_BINDING_RE, SuspenseConfigContext, SlotContainedContext, SLOT_SKELETON_MAP, SELF_OVERLAY_PATTERNS, CONTENT_NODE_SLOTS, PATTERNS_WITH_CHILDREN;
+var scopeWrapLog, TRAIT_BINDING_RE, SuspenseConfigContext, SlotContainedContext, SLOT_SKELETON_MAP, SELF_OVERLAY_PATTERNS, CONTENT_NODE_SLOTS, PATTERNS_WITH_CHILDREN, traitRefPresenceCache;
 var init_UISlotRenderer = __esm({
   "components/core/organisms/UISlotRenderer.tsx"() {
     "use client";
@@ -49401,6 +49592,7 @@ var init_UISlotRenderer = __esm({
       "alert",
       "dialog"
     ]);
+    traitRefPresenceCache = /* @__PURE__ */ new WeakMap();
     UISlotRenderer.displayName = "UISlotRenderer";
   }
 });
@@ -49528,6 +49720,20 @@ function createClientEffectHandlers(options) {
     })
   };
 }
+
+// lib/event-queue-coalesce.ts
+function enqueueEvent(queue, entry) {
+  if (entry.tick !== void 0) {
+    const pending = queue.find(
+      (e) => e.tick !== void 0 && e.eventKey === entry.eventKey && e.targetTrait === entry.targetTrait
+    );
+    if (pending !== void 0) {
+      pending.payload = entry.payload;
+      return;
+    }
+  }
+  queue.push(entry);
+}
 var lambdaLog = createLogger("almadar:ui:fn-form-lambda");
 function isOperatorCall(value) {
   const first = value[0];
@@ -50273,12 +50479,13 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       entityId
     };
     const emittedDuringExec = [];
+    const tickName = flushEvent.startsWith("tick:") ? flushEvent.slice(5) : void 0;
     const baseEmit = handlers.emit;
     const trackingHandlers = {
       ...handlers,
       emit: (event, eventPayload, source) => {
         emittedDuringExec.push(event);
-        baseEmit(event, eventPayload, source);
+        baseEmit(event, eventPayload, tickName !== void 0 ? { ...source, tick: tickName } : source);
       }
     };
     if (traitName === "Hero") {
@@ -50437,7 +50644,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     }
     return () => scheduler.stopAll();
   }, [traitBindings, runTickEffects, sharedGroups, sharedEntityStore, emitFromSharedWriter]);
-  const processEventQueued = useCallback(async (eventKey, payload, targetTrait) => {
+  const processEventQueued = useCallback(async (eventKey, payload, targetTrait, tick, sourceTrait) => {
     const normalizedEvent = normalizeEventKey(eventKey);
     const bindings = traitBindingsRef.current;
     const currentManager = managerRef.current;
@@ -50626,7 +50833,11 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         if (orbital) dispatchedOrbitals.add(orbital);
       }
       const relayPayload = targetTrait !== void 0 ? { ...payload ?? {}, _targetTrait: targetTrait } : payload;
-      await onEventProcessed(normalizedEvent, relayPayload, dispatchedOrbitals);
+      if (tick !== void 0) {
+        void onEventProcessed(normalizedEvent, relayPayload, dispatchedOrbitals, tick, sourceTrait);
+      } else {
+        await onEventProcessed(normalizedEvent, relayPayload, dispatchedOrbitals);
+      }
     }
   }, [entities, eventBus, sharedEntityStore]);
   const drainEventQueue = useCallback(async () => {
@@ -50635,14 +50846,14 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     try {
       while (eventQueueRef.current.length > 0) {
         const entry = eventQueueRef.current.shift();
-        await processEventQueued(entry.eventKey, entry.payload, entry.targetTrait);
+        await processEventQueued(entry.eventKey, entry.payload, entry.targetTrait, entry.tick, entry.sourceTrait);
       }
     } finally {
       processingRef.current = false;
     }
   }, [processEventQueued]);
-  const enqueueAndDrain = useCallback((eventKey, payload, targetTrait) => {
-    eventQueueRef.current.push({ eventKey, payload, targetTrait });
+  const enqueueAndDrain = useCallback((eventKey, payload, targetTrait, tick, sourceTrait) => {
+    enqueueEvent(eventQueueRef.current, { eventKey, payload, targetTrait, tick, sourceTrait });
     void drainEventQueue();
   }, [drainEventQueue]);
   useCallback((eventKey, payload) => {
@@ -50695,7 +50906,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
             crossTraitLog.debug("self:fire-server-cascade", { traitName, busKey: selfBusKey, eventKey });
           }
           crossTraitLog.debug("self:fire", { traitName, busKey: selfBusKey, eventKey });
-          enqueueAndDrain(eventKey, event.payload, traitName);
+          enqueueAndDrain(eventKey, event.payload, traitName, event.source?.tick, event.source?.trait);
         });
         unsubscribes.push(() => {
           crossTraitLog.debug("self:unsubscribe", { traitName, busKey: selfBusKey, eventKey });
@@ -50713,7 +50924,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         const bareKey = `UI:${eventKey}`;
         const unsub = eventBus.on(bareKey, (event) => {
           crossTraitLog.debug("bare-cascade:fire", { bareKey, eventKey });
-          enqueueAndDrain(eventKey, event.payload);
+          enqueueAndDrain(eventKey, event.payload, void 0, event.source?.tick, event.source?.trait);
         });
         unsubscribes.push(() => {
           crossTraitLog.debug("bare-cascade:unsubscribe", { bareKey, eventKey });
@@ -50747,7 +50958,9 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           enqueueAndDrain(
             listen.triggers,
             applyListenPayloadMapping(listen.payloadMapping, event.payload, evaluateListenPayloadExpr),
-            binding.trait.name
+            binding.trait.name,
+            event.source?.tick,
+            event.source?.trait
           );
         });
         unsubscribes.push(() => {
@@ -51042,7 +51255,7 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
     [serverActiveTraits]
   );
   const uiSlots = useUISlots();
-  const onEventProcessed = useCallback(async (event, payload, dispatchedOrbitals) => {
+  const onEventProcessed = useCallback(async (event, payload, dispatchedOrbitals, tick, sourceTrait) => {
     if (!bridge.connected || !orbitalNames?.length) return;
     const targets = dispatchedOrbitals && dispatchedOrbitals.size > 0 ? orbitalNames.filter((n) => dispatchedOrbitals.has(n)) : orbitalNames;
     xOrbitalLog.debug("TraitInitializer:fanout", () => ({
@@ -51052,6 +51265,10 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
       dispatchedOrbitalsSize: dispatchedOrbitals?.size ?? 0
     }));
     for (const name of targets) {
+      if (tick !== void 0) {
+        void bridge.sendEvent(name, event, withActiveTraits(payload), tick, sourceTrait);
+        continue;
+      }
       const { effects, meta } = await bridge.sendEvent(name, event, withActiveTraits(payload));
       recordServerResponse(name, event, meta);
       applyServerEffects(effects, uiSlots, onNavigate, embeddedTraits, activeTraitNames, onNavigateBack);
@@ -51527,11 +51744,13 @@ function BrowserPlayground({
     unregister: async () => {
       runtime.unregisterAll();
     },
-    sendEvent: async (orbitalName, event, payload) => {
+    sendEvent: async (orbitalName, event, payload, _clientId, tick, sourceTrait) => {
       await registrationReady;
       return runtime.processOrbitalEvent(orbitalName, {
         event,
-        payload
+        payload,
+        tick,
+        sourceTrait
         // @almadar/runtime OrbitalEventResponse.clientEffects uses a wider ClientEffectTuple than
         // ServerBridge's local definition — cast at this boundary (upstream fix queued).
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "5.157.0",
+  "version": "5.158.0",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "sideEffects": [
@@ -118,11 +118,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@almadar/core": "^10.67.0",
+    "@almadar/core": "^10.68.0",
     "@almadar/evaluator": "^2.41.0",
     "@almadar/logger": "^1.11.0",
-    "@almadar/runtime": "^6.58.0",
-    "@almadar/std": "^16.183.0",
+    "@almadar/runtime": "^6.59.0",
+    "@almadar/std": "^16.184.0",
     "@almadar/syntax": "^1.15.0",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",