@almadar/ui 4.23.0 → 4.25.0

package/dist/runtime/index.js

@@ -37837,7 +37837,8 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
     if (!child || typeof child !== "object") return null;
     const childId = `${parentId}-${index}`;
     const childPath = parentPath === "root" ? `root.children.${index}` : `${parentPath}.children.${index}`;
-    const { type: _childType, props: nestedProps, _id: _childNodeId, children: _childChildren, ...flatProps } = child;
+    const childAsRecord = child;
+    const { type: _childType, props: nestedProps, _id: _childNodeId, children: _childChildren, ...flatProps } = childAsRecord;
     const resolvedProps = nestedProps !== void 0 ? nestedProps : flatProps;
     if (_childChildren !== void 0 && nestedProps === void 0) {
       resolvedProps.children = _childChildren;
@@ -37865,7 +37866,46 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
   });
 }
 function isPatternConfig(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value) && "type" in value && typeof value.type === "string";
+  if (value === null || value === void 0) return false;
+  if (typeof value !== "object") return false;
+  if (Array.isArray(value)) return false;
+  if (React113__default.isValidElement(value)) return false;
+  if (value instanceof Date) return false;
+  if (typeof value === "function") return false;
+  const record = value;
+  return "type" in record && typeof record.type === "string";
+}
+function isPlainConfigObject(value) {
+  if (React113__default.isValidElement(value)) return false;
+  if (value instanceof Date) return false;
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null;
+}
+function substituteTraitRefsDeep(value, pathKey) {
+  if (typeof value === "string") {
+    const match = TRAIT_BINDING_RE.exec(value);
+    if (match) {
+      const traitName = match[1];
+      return /* @__PURE__ */ jsx(TraitFrame, { traitName }, `${pathKey}:${traitName}`);
+    }
+    return value;
+  }
+  if (typeof value === "number" || typeof value === "boolean" || value === null || value === void 0 || typeof value === "function") {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map(
+      (item, i) => substituteTraitRefsDeep(item, `${pathKey}[${i}]`)
+    );
+  }
+  if (typeof value === "object" && isPlainConfigObject(value)) {
+    const out = {};
+    for (const [k, v] of Object.entries(value)) {
+      out[k] = substituteTraitRefsDeep(v, `${pathKey}.${k}`);
+    }
+    return out;
+  }
+  return value;
 }
 function renderPatternProps(props, onDismiss) {
   const rendered = {};
@@ -37873,17 +37913,19 @@ function renderPatternProps(props, onDismiss) {
     if (key === "children") {
       rendered[key] = value;
     } else if (isPatternConfig(value)) {
+      const nestedProps = {};
+      for (const [k, v] of Object.entries(value)) {
+        if (k !== "type") nestedProps[k] = v;
+      }
       const childContent = {
         id: `prop-${key}`,
         pattern: value.type,
-        props: Object.fromEntries(
-          Object.entries(value).filter(([k]) => k !== "type")
-        ),
+        props: nestedProps,
         priority: 0
       };
       rendered[key] = /* @__PURE__ */ jsx(SlotContentRenderer, { content: childContent, onDismiss });
     } else {
-      rendered[key] = value;
+      rendered[key] = substituteTraitRefsDeep(value, `prop:${key}`);
     }
   }
   return rendered;
@@ -38226,7 +38268,7 @@ function resolveLambdaBindings(body, argName, arg) {
     let cur = arg;
     for (const seg of path.split(".")) {
       if (cur === null || cur === void 0) return void 0;
-      if (typeof cur !== "object") return void 0;
+      if (typeof cur !== "object" || Array.isArray(cur)) return void 0;
       cur = cur[seg];
     }
     return cur;
@@ -38242,7 +38284,7 @@ function resolveLambdaBindings(body, argName, arg) {
   if (Array.isArray(body)) {
     return body.map((b) => resolveLambdaBindings(b, argName, arg));
   }
-  if (body !== null && typeof body === "object") {
+  if (body !== null && typeof body === "object" && !React113__default.isValidElement(body) && !(body instanceof Date) && typeof body !== "function") {
     const out = {};
     for (const [k, v] of Object.entries(body)) {
       out[k] = resolveLambdaBindings(v, argName, arg);
@@ -38261,7 +38303,7 @@ function getSlotContentRenderer2() {
 function makeLambdaFn(argName, lambdaBody, callerKey) {
   return (item, index) => {
     const resolvedBody = resolveLambdaBindings(lambdaBody, argName, item);
-    if (resolvedBody === null || typeof resolvedBody !== "object" || Array.isArray(resolvedBody)) {
+    if (resolvedBody === null || typeof resolvedBody !== "object" || Array.isArray(resolvedBody) || typeof resolvedBody === "function" || React113__default.isValidElement(resolvedBody) || resolvedBody instanceof Date) {
       return null;
     }
     const record = resolvedBody;
@@ -38269,12 +38311,14 @@ function makeLambdaFn(argName, lambdaBody, callerKey) {
       return null;
     }
     const SlotContentRenderer2 = getSlotContentRenderer2();
+    const childProps = {};
+    for (const [k, v] of Object.entries(record)) {
+      if (k !== "type") childProps[k] = v;
+    }
     const childContent = {
       id: `lambda-${callerKey}-${index}`,
       pattern: record.type,
-      props: Object.fromEntries(
-        Object.entries(record).filter(([k]) => k !== "type")
-      ),
+      props: childProps,
       priority: 0
     };
     return React113__default.createElement(SlotContentRenderer2, { content: childContent });
@@ -38287,15 +38331,16 @@ function convertNode(node, callerKey) {
       const [, argName, body] = node;
       return makeLambdaFn(argName, body, callerKey);
     }
+    const arr = node;
     let anyChanged = false;
-    const mapped = node.map((item, i) => {
+    const mapped = arr.map((item, i) => {
       const next = convertNode(item, `${callerKey}[${i}]`);
       if (next !== item) anyChanged = true;
       return next;
     });
     return anyChanged ? mapped : node;
   }
-  if (typeof node === "object") {
+  if (typeof node === "object" && !React113__default.isValidElement(node) && !(node instanceof Date)) {
     return convertObjectProps(node);
   }
   return node;
@@ -39486,6 +39531,7 @@ function prepareSchemaForPreview(input) {
 // runtime/OrbPreview.tsx
 init_logger();
 var xOrbitalLog2 = createLogger("almadar:runtime:cross-orbital");
+var navLog = createLogger("almadar:runtime:navigation");
 function normalizeChild(child) {
   if (typeof child === "string") return child;
   if (child === null || typeof child !== "object" || Array.isArray(child)) {
@@ -39561,6 +39607,19 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
   }, [bridge.connected, bridge.sendEvent, orbitalNames, uiSlots, onNavigate, embeddedTraits]);
   const opts = orbitalNames ? { onEventProcessed, navigate: onNavigate, traitConfigsByName, orbitalsByTrait, embeddedTraits } : { navigate: onNavigate, persistence, traitConfigsByName, orbitalsByTrait, embeddedTraits };
   const { sendEvent } = useTraitStateMachine(traits2, uiSlots, opts);
+  const prevTraitNamesRef = useRef("");
+  useEffect(() => {
+    const traitNames = traits2.map((b) => b.trait?.name ?? "").filter(Boolean).sort().join(",");
+    if (prevTraitNamesRef.current && prevTraitNamesRef.current !== traitNames) {
+      navLog.info("page:trait-set-changed", {
+        from: prevTraitNamesRef.current,
+        to: traitNames,
+        action: "clearAll-slots"
+      });
+      uiSlots.clearAll();
+    }
+    prevTraitNamesRef.current = traitNames;
+  }, [traits2, uiSlots]);
   const initSentRef = useRef(false);
   useEffect(() => {
     if (!orbitalNames?.length) {
@@ -39575,6 +39634,10 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
     }, 5e3);
     return () => clearTimeout(fallback);
   }, [traits2, orbitalNames, sendEvent, onLocalFallback]);
+  const orbitalsKey = (orbitalNames ?? []).slice().sort().join(",");
+  useEffect(() => {
+    initSentRef.current = false;
+  }, [orbitalsKey]);
   useEffect(() => {
     if (!bridge.connected || !orbitalNames?.length || initSentRef.current) return;
     initSentRef.current = true;
@@ -39815,8 +39878,19 @@ function OrbPreview({
   }, [initialPageName, currentPage]);
   const handleNavigate = useCallback((path) => {
     const match = pages.find(({ page }) => page.path === path);
+    navLog.info("handleNavigate", {
+      path,
+      matched: match?.page.name ?? null,
+      availablePaths: pages.map((p2) => p2.page.path)
+    });
     if (match) {
       setCurrentPage(match.page.name);
+      if (typeof window !== "undefined") {
+        const url = new URL(window.location.href);
+        url.searchParams.set("page", path);
+        window.history.pushState({}, "", url.toString());
+        window.dispatchEvent(new PopStateEvent("popstate"));
+      }
     }
   }, [pages]);
   if (!parseResult.ok) {
@@ -39828,18 +39902,30 @@ function OrbPreview({
   const containerRef = useRef(null);
   useEffect(() => {
     const el = containerRef.current;
-    if (!el || pages.length <= 1) return;
+    if (!el) return;
+    if (pages.length <= 1) {
+      navLog.info("interceptor:skipped", { reason: "single-page schema", pageCount: pages.length });
+      return;
+    }
     const handler = (e) => {
       const anchor = e.target.closest("a");
       if (!anchor) return;
       const href = anchor.getAttribute("href") ?? anchor.getAttribute("to") ?? "";
-      if (!href || href.startsWith("http") || href.startsWith("mailto:") || href.startsWith("#")) return;
+      navLog.info("click:intercepted", {
+        href,
+        anchorText: anchor.textContent?.trim().slice(0, 40)
+      });
+      if (!href || href.startsWith("http") || href.startsWith("mailto:") || href.startsWith("#")) {
+        navLog.info("click:skipped", { href, reason: "external/empty/hash" });
+        return;
+      }
       e.preventDefault();
       e.stopPropagation();
       e.stopImmediatePropagation();
       handleNavigate(href);
     };
     el.addEventListener("click", handler, true);
+    navLog.info("interceptor:installed", { pageCount: pages.length, paths: pages.map((p2) => p2.page.path) });
     return () => el.removeEventListener("click", handler, true);
   }, [pages, handleNavigate]);
   return /* @__PURE__ */ jsxs(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "4.23.0",
+  "version": "4.25.0",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "main": "./dist/components/index.js",
@@ -118,7 +118,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@almadar/core": "^7.10.0",
+    "@almadar/core": ">=7.12.0",
     "@almadar/evaluator": ">=2.9.2",
     "@almadar/patterns": "^2.20.2",
     "@almadar/runtime": "^6.0.0",