@almadar/ui 5.124.0 → 5.126.0

package/dist/{offline-executor-aRuNznZx.d.cts → offline-executor-Qz4b6GpF.d.cts}

@@ -40,6 +40,24 @@ declare function extractRouteParams(pattern: string, path: string): Record<strin
  * Check if a path matches a pattern.
  */
 declare function pathMatches(pattern: string, path: string): boolean;
+/**
+ * Order two route patterns most-specific-first: at the first segment where they
+ * disagree in kind, a static segment outranks a `:param`. Patterns that agree in
+ * kind everywhere tie, leaving declaration order to decide.
+ *
+ * Without this, `/listings/:id` declared before `/listings/moderation` swallows
+ * its static sibling, because every `:param` matches any segment.
+ */
+declare function comparePathSpecificity(a: string, b: string): number;
+/**
+ * Match a concrete path against route-bearing candidates, most-specific first.
+ * The single resolver every route lookup goes through — the candidate array is
+ * never reordered in place, so callers keep their declaration-order semantics.
+ */
+declare function matchPathAmong<T>(candidates: readonly T[], path: string, pathOf: (candidate: T) => string | undefined): {
+    candidate: T;
+    params: Record<string, string>;
+} | null;
 /**
  * Find a page in the schema by matching its path pattern against a concrete path.
  * Returns the page and extracted route params.
@@ -517,4 +535,4 @@ interface UseOfflineExecutorResult {
  */
 declare function useOfflineExecutor(options: UseOfflineExecutorOptions): UseOfflineExecutorResult;
 
-export { type ClientEffect as C, type DataContext as D, type EventResponse as E, type MappedPattern as M, type NavigationContextValue as N, OfflineExecutor as O, type PendingSyncEffect as P, type SlotDefinition as S, type UseOfflineExecutorResult as U, type UseOfflineExecutorOptions as a, NavigationProvider as b, type NavigationProviderProps as c, type NavigationState as d, extractRouteParams as e, findPageByName as f, findPageByPath as g, getAllPages as h, getDefaultPage as i, useInitPayload as j, useNavigateTo as k, useNavigation as l, matchPath as m, useNavigationId as n, useNavigationState as o, pathMatches as p, type ClientEffectExecutorConfig as q, type NotifyOptions as r, type DataResolution as s, type OfflineExecutorConfig as t, useActivePage as u, type OfflineExecutorState as v, type SlotType as w, createOfflineExecutor as x, useOfflineExecutor as y };
+export { useOfflineExecutor as A, type ClientEffect as C, type DataContext as D, type EventResponse as E, type MappedPattern as M, type NavigationContextValue as N, OfflineExecutor as O, type PendingSyncEffect as P, type SlotDefinition as S, type UseOfflineExecutorResult as U, type UseOfflineExecutorOptions as a, NavigationProvider as b, type NavigationProviderProps as c, type NavigationState as d, comparePathSpecificity as e, extractRouteParams as f, findPageByName as g, findPageByPath as h, getAllPages as i, getDefaultPage as j, matchPathAmong as k, useInitPayload as l, matchPath as m, useNavigateTo as n, useNavigation as o, pathMatches as p, useNavigationId as q, useNavigationState as r, type ClientEffectExecutorConfig as s, type NotifyOptions as t, useActivePage as u, type DataResolution as v, type OfflineExecutorConfig as w, type OfflineExecutorState as x, type SlotType as y, createOfflineExecutor as z };

package/dist/{offline-executor-aRuNznZx.d.ts → offline-executor-Qz4b6GpF.d.ts}

@@ -40,6 +40,24 @@ declare function extractRouteParams(pattern: string, path: string): Record<strin
  * Check if a path matches a pattern.
  */
 declare function pathMatches(pattern: string, path: string): boolean;
+/**
+ * Order two route patterns most-specific-first: at the first segment where they
+ * disagree in kind, a static segment outranks a `:param`. Patterns that agree in
+ * kind everywhere tie, leaving declaration order to decide.
+ *
+ * Without this, `/listings/:id` declared before `/listings/moderation` swallows
+ * its static sibling, because every `:param` matches any segment.
+ */
+declare function comparePathSpecificity(a: string, b: string): number;
+/**
+ * Match a concrete path against route-bearing candidates, most-specific first.
+ * The single resolver every route lookup goes through — the candidate array is
+ * never reordered in place, so callers keep their declaration-order semantics.
+ */
+declare function matchPathAmong<T>(candidates: readonly T[], path: string, pathOf: (candidate: T) => string | undefined): {
+    candidate: T;
+    params: Record<string, string>;
+} | null;
 /**
  * Find a page in the schema by matching its path pattern against a concrete path.
  * Returns the page and extracted route params.
@@ -517,4 +535,4 @@ interface UseOfflineExecutorResult {
  */
 declare function useOfflineExecutor(options: UseOfflineExecutorOptions): UseOfflineExecutorResult;
 
-export { type ClientEffect as C, type DataContext as D, type EventResponse as E, type MappedPattern as M, type NavigationContextValue as N, OfflineExecutor as O, type PendingSyncEffect as P, type SlotDefinition as S, type UseOfflineExecutorResult as U, type UseOfflineExecutorOptions as a, NavigationProvider as b, type NavigationProviderProps as c, type NavigationState as d, extractRouteParams as e, findPageByName as f, findPageByPath as g, getAllPages as h, getDefaultPage as i, useInitPayload as j, useNavigateTo as k, useNavigation as l, matchPath as m, useNavigationId as n, useNavigationState as o, pathMatches as p, type ClientEffectExecutorConfig as q, type NotifyOptions as r, type DataResolution as s, type OfflineExecutorConfig as t, useActivePage as u, type OfflineExecutorState as v, type SlotType as w, createOfflineExecutor as x, useOfflineExecutor as y };
+export { useOfflineExecutor as A, type ClientEffect as C, type DataContext as D, type EventResponse as E, type MappedPattern as M, type NavigationContextValue as N, OfflineExecutor as O, type PendingSyncEffect as P, type SlotDefinition as S, type UseOfflineExecutorResult as U, type UseOfflineExecutorOptions as a, NavigationProvider as b, type NavigationProviderProps as c, type NavigationState as d, comparePathSpecificity as e, extractRouteParams as f, findPageByName as g, findPageByPath as h, getAllPages as i, getDefaultPage as j, matchPathAmong as k, useInitPayload as l, matchPath as m, useNavigateTo as n, useNavigation as o, pathMatches as p, useNavigationId as q, useNavigationState as r, type ClientEffectExecutorConfig as s, type NotifyOptions as t, useActivePage as u, type DataResolution as v, type OfflineExecutorConfig as w, type OfflineExecutorState as x, type SlotType as y, createOfflineExecutor as z };

package/dist/providers/index.cjs

@@ -18989,17 +18989,27 @@ function getWeekDays(start) {
   }
   return days;
 }
-function generateDefaultTimeSlots() {
+function generateDefaultTimeSlots(events2) {
+  let first = DEFAULT_FIRST_HOUR;
+  let last = DEFAULT_LAST_HOUR;
+  for (const ev of events2) {
+    const start = new Date(ev.startTime);
+    if (Number.isNaN(start.getTime())) continue;
+    const hour = start.getHours();
+    if (hour < first) first = hour;
+    if (hour > last) last = hour;
+  }
   const slots = [];
-  for (let hour = 9; hour <= 17; hour++) {
-    slots.push(`${hour.toString().padStart(2, "0")}:00`);
+  for (let hour = first; hour <= last; hour++) {
+    slots.push(slotLabel(hour));
   }
   return slots;
 }
 function eventInSlot(event, day, slotTime) {
   const eventStart = new Date(event.startTime);
-  const [slotHour, slotMinute] = slotTime.split(":").map(Number);
-  return eventStart.toDateString() === day.toDateString() && eventStart.getHours() === slotHour && eventStart.getMinutes() === slotMinute;
+  if (Number.isNaN(eventStart.getTime())) return false;
+  const [slotHour] = slotTime.split(":").map(Number);
+  return eventStart.toDateString() === day.toDateString() && eventStart.getHours() === slotHour;
 }
 function CalendarGrid({
   weekStart,
@@ -19028,8 +19038,8 @@ function CalendarGrid({
     [resolvedWeekStart]
   );
   const resolvedTimeSlots = React84.useMemo(
-    () => timeSlots ?? generateDefaultTimeSlots(),
-    [timeSlots]
+    () => timeSlots ?? generateDefaultTimeSlots(evs),
+    [timeSlots, evs]
   );
   const visibleCount = useDayWindow(dayWindow);
   const [dayOffset, setDayOffset] = React84.useState(0);
@@ -19216,7 +19226,7 @@ function CalendarGrid({
     }
   );
 }
-var SHORT_DATE;
+var SHORT_DATE, DEFAULT_FIRST_HOUR, DEFAULT_LAST_HOUR, slotLabel;
 var init_CalendarGrid = __esm({
   "components/core/molecules/CalendarGrid.tsx"() {
     "use client";
@@ -19231,6 +19241,9 @@ var init_CalendarGrid = __esm({
     init_useEventBus();
     init_useSwipeGesture();
     SHORT_DATE = { month: "short", day: "numeric" };
+    DEFAULT_FIRST_HOUR = 9;
+    DEFAULT_LAST_HOUR = 17;
+    slotLabel = (hour) => `${hour.toString().padStart(2, "0")}:00`;
     CalendarGrid.displayName = "CalendarGrid";
   }
 });
@@ -23315,13 +23328,13 @@ function DataGrid({
                         }
                       ),
                       /* @__PURE__ */ jsxRuntime.jsxs(VStack, { gap: "xs", className: "flex-1 min-w-0", children: [
-                        titleValue !== void 0 && titleValue !== null && /* @__PURE__ */ jsxRuntime.jsxs(HStack, { gap: "xs", className: "items-center", children: [
+                        titleValue !== void 0 && titleValue !== null && /* @__PURE__ */ jsxRuntime.jsxs(HStack, { gap: "xs", className: "items-center min-w-0", children: [
                           titleField?.icon && renderIconInput(titleField.icon, { size: "sm", className: "text-primary flex-shrink-0" }),
                           /* @__PURE__ */ jsxRuntime.jsx(
                             Typography,
                             {
                               variant: titleField?.variant === "h3" ? "h3" : "h4",
-                              className: "font-semibold truncate",
+                              className: "font-semibold truncate min-w-0",
                               children: String(titleValue)
                             }
                           )
@@ -23379,7 +23392,7 @@ function DataGrid({
                         )
                       ] }, field.name);
                     }) }) }),
-                    primaryActions.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "px-4 py-3 mt-auto border-t border-border", children: /* @__PURE__ */ jsxRuntime.jsxs(HStack, { gap: "sm", className: "justify-end", children: [
+                    primaryActions.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "px-4 py-3 mt-auto border-t border-border", children: /* @__PURE__ */ jsxRuntime.jsxs(HStack, { gap: "sm", className: "justify-end flex-wrap", children: [
                       (maxInlineActions != null ? primaryActions.slice(0, maxInlineActions) : primaryActions).map((action, idx) => /* @__PURE__ */ jsxRuntime.jsxs(
                         Button,
                         {
@@ -28392,7 +28405,7 @@ function TableView({
             col.key
           );
         }),
-        hasActions && /* @__PURE__ */ jsxRuntime.jsx(Box, { "aria-hidden": true })
+        hasActions && /* @__PURE__ */ jsxRuntime.jsx(Box, { "aria-hidden": true, className: "sticky right-0 bg-[var(--color-surface-subtle)]" })
       ]
     }
   );
@@ -28436,41 +28449,54 @@ function TableView({
             }
             return /* @__PURE__ */ jsxRuntime.jsx(Box, { role: "cell", className: cellBase, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "truncate", children: formatCell(raw, col.format) }) }, col.key);
           }),
-          itemActions && itemActions.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(HStack, { gap: "xs", className: "justify-end flex-shrink-0 opacity-60 group-hover:opacity-100 transition-opacity", children: [
-            (maxInlineActions != null ? itemActions.slice(0, maxInlineActions) : itemActions).map((action, i) => /* @__PURE__ */ jsxRuntime.jsxs(
-              Button,
-              {
-                variant: action.variant ?? "ghost",
-                size: "sm",
-                onClick: handleActionClick(action, row),
-                "data-testid": `action-${action.event}`,
-                "data-row-id": String(row.id),
-                className: cn(action.variant === "danger" && "text-error hover:bg-error/10"),
-                children: [
-                  action.icon && renderIconInput3(action.icon, { size: "xs", className: "mr-1" }),
-                  action.label
-                ]
-              },
-              i
-            )),
-            maxInlineActions != null && itemActions.length > maxInlineActions && /* @__PURE__ */ jsxRuntime.jsx(
-              Menu,
-              {
-                position: "bottom-end",
-                trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, { variant: "ghost", size: "sm", "aria-label": t("common.actions"), "data-testid": "action-overflow", children: /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: "more-horizontal", size: "xs" }) }),
-                items: itemActions.slice(maxInlineActions).map((action) => ({
-                  label: action.label,
-                  icon: action.icon,
-                  event: action.event,
-                  variant: action.variant === "danger" ? "danger" : "default",
-                  onClick: () => eventBus.emit(`UI:${action.event}`, {
-                    id: row.id,
-                    row
-                  })
-                }))
-              }
-            )
-          ] })
+          itemActions && itemActions.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs(
+            HStack,
+            {
+              gap: "xs",
+              className: cn(
+                // Pinned: the fixed column tracks routinely overflow the caller's
+                // scroll container, which used to leave the actions off-screen.
+                // Opaque so scrolled cells pass underneath it.
+                "justify-end flex-shrink-0 sticky right-0 z-[1] transition-colors",
+                lk.striped && index % 2 === 1 ? "bg-[var(--color-surface-subtle)]" : "bg-[var(--color-card)] group-hover:bg-[var(--color-surface-subtle)]"
+              ),
+              children: [
+                (maxInlineActions != null ? itemActions.slice(0, maxInlineActions) : itemActions).map((action, i) => /* @__PURE__ */ jsxRuntime.jsxs(
+                  Button,
+                  {
+                    variant: action.variant ?? "ghost",
+                    size: "sm",
+                    onClick: handleActionClick(action, row),
+                    "data-testid": `action-${action.event}`,
+                    "data-row-id": String(row.id),
+                    className: cn(action.variant === "danger" && "text-error hover:bg-error/10"),
+                    children: [
+                      action.icon && renderIconInput3(action.icon, { size: "xs", className: "mr-1" }),
+                      action.label
+                    ]
+                  },
+                  i
+                )),
+                maxInlineActions != null && itemActions.length > maxInlineActions && /* @__PURE__ */ jsxRuntime.jsx(
+                  Menu,
+                  {
+                    position: "bottom-end",
+                    trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, { variant: "ghost", size: "sm", "aria-label": t("common.actions"), "data-testid": "action-overflow", children: /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: "more-horizontal", size: "xs" }) }),
+                    items: itemActions.slice(maxInlineActions).map((action) => ({
+                      label: action.label,
+                      icon: action.icon,
+                      event: action.event,
+                      variant: action.variant === "danger" ? "danger" : "default",
+                      onClick: () => eventBus.emit(`UI:${action.event}`, {
+                        id: row.id,
+                        row
+                      })
+                    }))
+                  }
+                )
+              ]
+            }
+          )
         ]
       }
     );
@@ -37205,6 +37231,16 @@ function normalizeFieldDefs(fields) {
     return String(f3);
   });
 }
+function buildFieldLabelMap(fields) {
+  const map = {};
+  if (!fields) return map;
+  for (const f3 of fields) {
+    if (typeof f3 === "object" && "key" in f3 && f3.header !== void 0 && f3.header !== "") {
+      map[f3.key] = f3.header;
+    }
+  }
+  return map;
+}
 function buildFieldTypeMap(fields) {
   const map = {};
   if (!fields) return map;
@@ -37256,6 +37292,8 @@ var init_DetailPanel = __esm({
       };
       const effectiveFieldNames = isFieldDefArray(propFields) ? normalizeFieldDefs(propFields) : fieldNames;
       const fieldTypeMap = isFieldDefArray(propFields) ? buildFieldTypeMap(propFields) : {};
+      const fieldLabelMap = isFieldDefArray(propFields) ? buildFieldLabelMap(propFields) : {};
+      const labelFor = (field) => fieldLabelMap[field] ?? formatFieldLabel(field);
       const handleActionClick = React84.useCallback(
         (action, data2) => {
           if (action.navigatesTo) {
@@ -37291,7 +37329,7 @@ var init_DetailPanel = __esm({
             if (typeof field === "string") {
               const value = getNestedValue(normalizedData, field);
               return {
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: formatFieldValue(value, field),
                 icon: getFieldIcon(field)
               };
@@ -37302,7 +37340,10 @@ var init_DetailPanel = __esm({
       }
       if (normalizedData && effectiveFieldNames) {
         const primaryField = effectiveFieldNames[0];
-        if (!title && primaryField && normalizedData[primaryField]) {
+        const titleDerivedFromPrimary = Boolean(
+          !title && primaryField && normalizedData[primaryField]
+        );
+        if (titleDerivedFromPrimary) {
           title = String(normalizedData[primaryField]);
         }
         const statusFields = effectiveFieldNames.filter(
@@ -37321,16 +37362,16 @@ var init_DetailPanel = __esm({
           (f3) => f3.toLowerCase().includes("description") || f3.toLowerCase().includes("note")
         );
         const otherFields = effectiveFieldNames.filter(
-          (f3) => f3 !== primaryField && !statusFields.includes(f3) && !progressFields.includes(f3) && !metricFields.includes(f3) && !dateFields.includes(f3) && !descriptionFields.includes(f3)
+          (f3) => (!titleDerivedFromPrimary || f3 !== primaryField) && !statusFields.includes(f3) && !progressFields.includes(f3) && !metricFields.includes(f3) && !dateFields.includes(f3) && !descriptionFields.includes(f3)
         );
         sections = [];
         if (statusFields.length > 0 || otherFields.length > 0) {
           const overviewFields = [];
-          [...statusFields, ...otherFields.slice(0, 3)].forEach((field) => {
+          [...statusFields, ...otherFields].forEach((field) => {
             const value = getNestedValue(normalizedData, field);
             if (value !== void 0 && value !== null) {
               overviewFields.push({
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: renderRichFieldValue(value, field, fieldTypeMap[field]),
                 icon: getFieldIcon(field)
               });
@@ -37346,7 +37387,7 @@ var init_DetailPanel = __esm({
             const value = getNestedValue(normalizedData, field);
             if (value !== void 0 && value !== null) {
               metricsFields.push({
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: renderRichFieldValue(value, field, fieldTypeMap[field]),
                 icon: getFieldIcon(field)
               });
@@ -37362,7 +37403,7 @@ var init_DetailPanel = __esm({
             const value = getNestedValue(normalizedData, field);
             if (value !== void 0 && value !== null) {
               timelineFields.push({
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: renderRichFieldValue(value, field, fieldTypeMap[field]),
                 icon: getFieldIcon(field)
               });
@@ -37378,7 +37419,7 @@ var init_DetailPanel = __esm({
             const value = getNestedValue(normalizedData, field);
             if (value !== void 0 && value !== null) {
               descFields.push({
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: renderRichFieldValue(value, field, fieldTypeMap[field]),
                 icon: getFieldIcon(field)
               });
@@ -37426,7 +37467,7 @@ var init_DetailPanel = __esm({
             if (typeof field === "string") {
               const value = normalizedData ? getNestedValue(normalizedData, field) : void 0;
               allFields.push({
-                label: formatFieldLabel(field),
+                label: labelFor(field),
                 value: renderRichFieldValue(value, field, fieldTypeMap[field]),
                 icon: getFieldIcon(field)
               });
@@ -43929,6 +43970,13 @@ function MaybeTraitScope({
   if (wrap) {
     return /* @__PURE__ */ jsxRuntime.jsx(providers.TraitScopeProvider, { orbital, trait: sourceTrait, children });
   }
+  if (sourceTrait !== void 0 && schemaCtx !== null) {
+    scopeWrapLog.warn("decline", {
+      sourceTrait,
+      orbitalsByTraitSize: schemaCtx.orbitalsByTrait.size,
+      reason: "sourceTrait not in orbitalsByTrait \u2014 children render unscoped"
+    });
+  }
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children });
 }
 function UISlotComponent({
@@ -44226,7 +44274,7 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
     const childId = `${parentId}-${index}`;
     const childPath = parentPath === "root" ? `root.children.${index}` : `${parentPath}.children.${index}`;
     const childAsRecord = child;
-    const { type: _childType, props: nestedProps, _id: _childNodeId, children: _childChildren, ...flatProps } = childAsRecord;
+    const { type: _childType, props: nestedProps, _id: _childNodeId, _sourceTrait: childSourceTrait, children: _childChildren, ...flatProps } = childAsRecord;
     const resolvedProps = nestedProps !== void 0 ? nestedProps : flatProps;
     if (_childChildren !== void 0 && nestedProps === void 0) {
       resolvedProps.children = _childChildren;
@@ -44241,11 +44289,14 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       // (e.g. form-section inside a stack) can resolve entityDef via
       // the trait's linkedEntity for form-field enrichment. The orbCtx
       // (slot/transition/state/entity) propagates the same way so every
-      // nested node carries a complete contextual-edit address.
-      ...sourceTrait !== void 0 && { sourceTrait },
+      // nested node carries a complete contextual-edit address. A child
+      // carrying its own `_sourceTrait` (multi-source slot stack) owns it
+      // outright — inheriting the synthetic wrapper's sentinel instead
+      // would erase the real owner.
+      ...childSourceTrait !== void 0 ? { sourceTrait: childSourceTrait } : sourceTrait !== void 0 && { sourceTrait },
       ...orbCtx ?? {}
     };
-    return /* @__PURE__ */ jsxRuntime.jsx(
+    const renderedChild = /* @__PURE__ */ jsxRuntime.jsx(
       SlotContentRenderer,
       {
         content: childContent,
@@ -44254,6 +44305,7 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       },
       childId
     );
+    return childSourceTrait !== void 0 ? /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait: childSourceTrait, children: renderedChild }, childId) : renderedChild;
   });
 }
 function toDrawableNodes(children) {
@@ -45536,6 +45588,28 @@ function extractRouteParams2(pattern, path) {
 function pathMatches2(pattern, path) {
   return matchPath2(pattern, path) !== null;
 }
+function comparePathSpecificity2(a, b) {
+  const aParts = a.split("/").filter(Boolean);
+  const bParts = b.split("/").filter(Boolean);
+  const shared = Math.min(aParts.length, bParts.length);
+  for (let i = 0; i < shared; i++) {
+    const aParam = aParts[i].startsWith(":");
+    const bParam = bParts[i].startsWith(":");
+    if (aParam !== bParam) return aParam ? 1 : -1;
+  }
+  return 0;
+}
+function matchPathAmong2(candidates, path, pathOf) {
+  const routed = candidates.filter((candidate) => Boolean(pathOf(candidate)));
+  const ranked = [...routed].sort(
+    (a, b) => comparePathSpecificity2(pathOf(a), pathOf(b))
+  );
+  for (const candidate of ranked) {
+    const params = matchPath2(pathOf(candidate), path);
+    if (params !== null) return { candidate, params };
+  }
+  return null;
+}
 function isInlineOrbital(orbital) {
   return "name" in orbital && typeof orbital.name === "string";
 }
@@ -45544,21 +45618,22 @@ function isInlinePage(page) {
 }
 function findPageByPath2(schema, path) {
   if (!schema.orbitals) return null;
+  const candidates = [];
   for (const orbital of schema.orbitals) {
     if (!isInlineOrbital(orbital)) continue;
     if (!orbital.pages) continue;
     for (const pageRef of orbital.pages) {
       if (!isInlinePage(pageRef)) continue;
-      const page = pageRef;
-      const pagePath = page.path;
-      if (!pagePath) continue;
-      const params = matchPath2(pagePath, path);
-      if (params !== null) {
-        return { page, params, orbitalName: orbital.name };
-      }
+      candidates.push({ page: pageRef, orbitalName: orbital.name });
     }
   }
-  return null;
+  const hit = matchPathAmong2(candidates, path, (entry) => entry.page.path);
+  if (!hit) return null;
+  return {
+    page: hit.candidate.page,
+    params: hit.params,
+    orbitalName: hit.candidate.orbitalName
+  };
 }
 function findPageByName2(schema, pageName) {
   if (!schema.orbitals) return null;
@@ -46181,12 +46256,14 @@ exports.TraitScopeProvider = TraitScopeProvider3;
 exports.UserContext = UserContext;
 exports.UserProvider = UserProvider;
 exports.VerificationProvider = VerificationProvider;
+exports.comparePathSpecificity = comparePathSpecificity2;
 exports.extractRouteParams = extractRouteParams2;
 exports.findPageByName = findPageByName2;
 exports.findPageByPath = findPageByPath2;
 exports.getAllPages = getAllPages2;
 exports.getDefaultPage = getDefaultPage2;
 exports.matchPath = matchPath2;
+exports.matchPathAmong = matchPathAmong2;
 exports.pathMatches = pathMatches2;
 exports.useActivePage = useActivePage2;
 exports.useCurrentPagePath = useCurrentPagePath2;

package/dist/providers/index.d.cts

@@ -3,8 +3,8 @@ import { EntityRow, FieldValue } from '@almadar/core';
 import { U as UIThemeDefinition } from '../UserContext-BKckAUv7.cjs';
 export { A as ANONYMOUS_USER, a as CurrentPagePathContext, b as CurrentPagePathProvider, c as CurrentPagePathProviderProps, d as DesignThemeProvider, O as OrbitalThemeProvider, e as OrbitalThemeProviderProps, h as UserContext, i as UserContextValue, j as UserData, k as UserProvider, l as UserProviderProps, u as useCurrentPagePath, m as useDesignTheme, n as useHasPermission, o as useHasRole, q as useUser, r as useUserForEvaluation } from '../UserContext-BKckAUv7.cjs';
 export { E as EntitySchemaContextValue, a as EntitySchemaProvider, b as EntitySchemaProviderProps, S as SendEventResult, c as ServerBridgeContextValue, d as ServerBridgeProvider, e as ServerBridgeProviderProps, f as ServerBridgeTransport, g as ServerClientEffect, h as ServerResponseMeta, T as TraitContext, i as TraitContextValue, j as TraitInstance, k as TraitProvider, l as TraitProviderProps, u as useEntitySchema, m as useEntitySchemaOptional, n as useServerBridge, o as useTrait, p as useTraitContext } from '../TraitProvider-Ch79cUcb.cjs';
-import { U as UseOfflineExecutorResult, a as UseOfflineExecutorOptions } from '../offline-executor-aRuNznZx.cjs';
-export { N as NavigationContextValue, b as NavigationProvider, c as NavigationProviderProps, d as NavigationState, e as extractRouteParams, f as findPageByName, g as findPageByPath, h as getAllPages, i as getDefaultPage, m as matchPath, p as pathMatches, u as useActivePage, j as useInitPayload, k as useNavigateTo, l as useNavigation, n as useNavigationId, o as useNavigationState } from '../offline-executor-aRuNznZx.cjs';
+import { U as UseOfflineExecutorResult, a as UseOfflineExecutorOptions } from '../offline-executor-Qz4b6GpF.cjs';
+export { N as NavigationContextValue, b as NavigationProvider, c as NavigationProviderProps, d as NavigationState, e as comparePathSpecificity, f as extractRouteParams, g as findPageByName, h as findPageByPath, i as getAllPages, j as getDefaultPage, m as matchPath, k as matchPathAmong, p as pathMatches, u as useActivePage, l as useInitPayload, n as useNavigateTo, o as useNavigation, q as useNavigationId, r as useNavigationState } from '../offline-executor-Qz4b6GpF.cjs';
 import { E as EventBusContextType } from '../event-bus-types-Bl78kokd.cjs';
 export { G as GameAudioContext, a as GameAudioContextValue, b as GameAudioProvider, c as GameAudioProviderProps, u as useGameAudioContext, d as useGameAudioContextOptional } from '../GameAudioProvider-CPGwD49P.cjs';
 import '@almadar/core/patterns';

package/dist/providers/index.d.ts

@@ -3,8 +3,8 @@ import { EntityRow, FieldValue } from '@almadar/core';
 import { U as UIThemeDefinition } from '../UserContext-BKckAUv7.js';
 export { A as ANONYMOUS_USER, a as CurrentPagePathContext, b as CurrentPagePathProvider, c as CurrentPagePathProviderProps, d as DesignThemeProvider, O as OrbitalThemeProvider, e as OrbitalThemeProviderProps, h as UserContext, i as UserContextValue, j as UserData, k as UserProvider, l as UserProviderProps, u as useCurrentPagePath, m as useDesignTheme, n as useHasPermission, o as useHasRole, q as useUser, r as useUserForEvaluation } from '../UserContext-BKckAUv7.js';
 export { E as EntitySchemaContextValue, a as EntitySchemaProvider, b as EntitySchemaProviderProps, S as SendEventResult, c as ServerBridgeContextValue, d as ServerBridgeProvider, e as ServerBridgeProviderProps, f as ServerBridgeTransport, g as ServerClientEffect, h as ServerResponseMeta, T as TraitContext, i as TraitContextValue, j as TraitInstance, k as TraitProvider, l as TraitProviderProps, u as useEntitySchema, m as useEntitySchemaOptional, n as useServerBridge, o as useTrait, p as useTraitContext } from '../TraitProvider-Ch79cUcb.js';
-import { U as UseOfflineExecutorResult, a as UseOfflineExecutorOptions } from '../offline-executor-aRuNznZx.js';
-export { N as NavigationContextValue, b as NavigationProvider, c as NavigationProviderProps, d as NavigationState, e as extractRouteParams, f as findPageByName, g as findPageByPath, h as getAllPages, i as getDefaultPage, m as matchPath, p as pathMatches, u as useActivePage, j as useInitPayload, k as useNavigateTo, l as useNavigation, n as useNavigationId, o as useNavigationState } from '../offline-executor-aRuNznZx.js';
+import { U as UseOfflineExecutorResult, a as UseOfflineExecutorOptions } from '../offline-executor-Qz4b6GpF.js';
+export { N as NavigationContextValue, b as NavigationProvider, c as NavigationProviderProps, d as NavigationState, e as comparePathSpecificity, f as extractRouteParams, g as findPageByName, h as findPageByPath, i as getAllPages, j as getDefaultPage, m as matchPath, k as matchPathAmong, p as pathMatches, u as useActivePage, l as useInitPayload, n as useNavigateTo, o as useNavigation, q as useNavigationId, r as useNavigationState } from '../offline-executor-Qz4b6GpF.js';
 import { E as EventBusContextType } from '../event-bus-types-Bl78kokd.js';
 export { G as GameAudioContext, a as GameAudioContextValue, b as GameAudioProvider, c as GameAudioProviderProps, u as useGameAudioContext, d as useGameAudioContextOptional } from '../GameAudioProvider-CPGwD49P.js';
 import '@almadar/core/patterns';