@publish.os/nextjs 0.0.1-alpha.90 → 0.0.1-alpha.92

package/dist/kernel/components/blocks/nav-breadcrumb.js

@@ -1,16 +1,16 @@
 // src/components/block/navbar/nav-breadcrumb.tsx
-import { CollapsibleBreadcrumbTrail } from "@publish.os/nextjs/kernel/components/ui/breadcrumb-trail";
-import { jsx } from "react/jsx-runtime";
+import { CollapsibleBreadcrumbTrail } from "@components/ui/breadcrumb-trail";
+import { jsx } from "@publish.os/nextjs/jsx-runtime";
 function titleFor(node) {
-  return node.title;
+  return node.label ?? "";
 }
 function pathFor(node) {
-  if (node.type === "page") return node.path;
+  if (node.type === "page") return node.page.path;
+  if (node.type === "group" && node.presentation === "page") return node.route;
   if (node.type === "link") return node.href;
-  if (node.type === "folder" || node.type === "section") return node.path;
 }
 function rankFor(node) {
-  return node.type === "page" || node.type === "section" ? 2 : node.type === "folder" ? 1 : 0;
+  return node.type === "page" || node.type === "group" && node.presentation === "page" ? 2 : node.type === "folder" || node.type === "group" && node.presentation === "folder" ? 1 : 0;
 }
 function findCrumbs(nodes, pathname, parents = []) {
   let matches = [];
@@ -30,8 +30,12 @@ function findCrumbs(nodes, pathname, parents = []) {
       })),
       pathLength: path.length,
       rank: rankFor(node)
-    }), node.type === "section" || node.type === "folder") {
-      let childMatch = findCrumbs(node.children, pathname, nextParents);
+    }), node.type === "section" || node.type === "folder" || node.type === "group" || node.type === "view" || node.type === "page" && node.children) {
+      let childMatch = findCrumbs(
+        node.type === "view" ? node.items : node.type === "page" ? node.children ?? [] : node.children,
+        pathname,
+        nextParents
+      );
       childMatch && matches.push(childMatch);
     }
   }
@@ -39,8 +43,10 @@ function findCrumbs(nodes, pathname, parents = []) {
     (a, b) => b.rank - a.rank || b.pathLength - a.pathLength || b.crumbs.length - a.crumbs.length
   )[0] ?? null;
 }
-function groupFallback(tree, pathname) {
-  let groups = tree.map((group) => ({ group, path: pathFor(group) })).filter(
+function groupFallback(nodes, pathname) {
+  let groups = nodes.filter(
+    (node) => node.type === "group"
+  ).map((group) => ({ group, path: group.route })).filter(
     (entry) => typeof entry.path == "string"
   ).sort((a, b) => b.path.length - a.path.length);
   for (let { group, path } of groups)
@@ -54,7 +60,7 @@ function groupFallback(tree, pathname) {
       ];
   return [];
 }
-function buildCrumbs(site, tree, pathname) {
+function buildCrumbs(site, navigation, pathname) {
   let root = {
     title: site.name,
     path: "/",
@@ -62,10 +68,10 @@ function buildCrumbs(site, tree, pathname) {
     current: pathname === "/"
   };
   if (pathname === "/") return [root];
-  let treeMatch = findCrumbs(tree, pathname);
+  let treeMatch = findCrumbs(navigation.items, pathname);
   return treeMatch ? [root, ...treeMatch.crumbs] : [
     root,
-    ...groupFallback(tree, pathname).map((crumb) => ({
+    ...groupFallback(navigation.items, pathname).map((crumb) => ({
       ...crumb,
       current: !1
     }))
@@ -76,9 +82,9 @@ function NavBreadcrumb({
   showRoot = !0,
   size = "sm",
   site,
-  tree
+  navigation
 }) {
-  let crumbs = buildCrumbs(site, tree, currentPath), items = (showRoot ? crumbs : crumbs.slice(1)).map((crumb) => ({
+  let crumbs = buildCrumbs(site, navigation, currentPath), items = (showRoot ? crumbs : crumbs.slice(1)).map((crumb) => ({
     current: crumb.current,
     href: crumb.href,
     title: crumb.title

package/dist/kernel/components/blocks/navbar.d.ts

@@ -1,16 +1,17 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
+import * as react from 'react';
 import { LogoBlockLogo, LogoBlockAsset } from './logo-block.js';
-import { S as SiteData, T as TreeNode } from '../../../types-CUtrppxt.js';
+import { S as SiteData } from '../../../types-TjH1ek0X.js';
+import { R as ResolvedNavigation } from '../../../manifest-types-CcVPH_jh.js';
 
 type NavbarProps = {
     logo?: NavbarLogo;
     site?: SiteData;
     siteTitle?: string;
-    tree: TreeNode[];
+    navigation: ResolvedNavigation;
     showThemeToggle?: boolean;
 };
 type NavbarLogoAsset = LogoBlockAsset;
 type NavbarLogo = LogoBlockLogo;
-declare function Navbar({ logo, showThemeToggle, site, siteTitle, tree, }: NavbarProps): react_jsx_runtime.JSX.Element;
+declare function Navbar({ logo, showThemeToggle, site, siteTitle, navigation, }: NavbarProps): react.JSX.Element;
 
 export { Navbar, type NavbarLogo, type NavbarLogoAsset };

package/dist/kernel/components/blocks/navbar.js

@@ -3,11 +3,11 @@
 // src/components/block/navbar/navbar.tsx
 import {
   LogoBlock
-} from "@publish.os/nextjs/kernel/components/blocks/logo-block";
-import { Search } from "@publish.os/nextjs/kernel/components/blocks/search";
-import { Sidebar } from "@publish.os/nextjs/kernel/components/blocks/sidebar";
-import { ThemeToggle } from "@publish.os/nextjs/kernel/components/blocks/theme-toggle";
-import { Button as Button2 } from "@publish.os/nextjs/kernel/components/ui/button";
+} from "@components/blocks/logo-block";
+import { Search } from "@components/blocks/search";
+import { Sidebar } from "@components/blocks/sidebar";
+import { ThemeToggle } from "@components/blocks/theme-toggle";
+import { Button as Button2 } from "@components/ui/button";
 import {
   Drawer,
   DrawerClose,
@@ -17,9 +17,9 @@ import {
   DrawerTitle,
   DrawerTrigger,
   DrawerViewport
-} from "@publish.os/nextjs/kernel/components/ui/drawer";
-import { Link as Link3 } from "@publish.os/nextjs/kernel/components/ui/link";
-import { ScrollArea as ScrollArea2 } from "@publish.os/nextjs/kernel/components/ui/scroll-area";
+} from "@components/ui/drawer";
+import { Link as Link3 } from "@components/ui/link";
+import { ScrollArea as ScrollArea2 } from "@components/ui/scroll-area";
 import {
   ArrowRightIcon,
   CaretLeftIcon,
@@ -32,8 +32,8 @@ import { usePathname } from "next/navigation";
 import { useEffect, useRef as useRef2, useState as useState2 } from "react";
 
 // src/components/block/navbar/group-navigation.tsx
-import { Button } from "@publish.os/nextjs/kernel/components/ui/button";
-import { Link } from "@publish.os/nextjs/kernel/components/ui/link";
+import { Button } from "@components/ui/button";
+import { Link } from "@components/ui/link";
 import {
   Menu,
   MenuLinkItem,
@@ -41,21 +41,28 @@ import {
   MenuPortal,
   MenuPositioner,
   MenuTrigger
-} from "@publish.os/nextjs/kernel/components/ui/menu";
+} from "@components/ui/menu";
 import { CaretDownIcon } from "@phosphor-icons/react/ssr";
 import NextLink from "next/link";
 import { useLayoutEffect, useRef, useState } from "react";
-import { jsx, jsxs } from "react/jsx-runtime";
+
+// src/components/block/navbar/navigation-groups.ts
+function navigationGroups(nodes) {
+  return nodes.flatMap((node) => node.type === "group" ? [node, ...navigationGroups(node.children)] : node.type === "section" || node.type === "folder" ? navigationGroups(node.children) : node.type === "view" ? navigationGroups(node.items) : node.type === "page" && node.children ? navigationGroups(node.children) : []);
+}
+
+// src/components/block/navbar/group-navigation.tsx
+import { jsx, jsxs } from "@publish.os/nextjs/jsx-runtime";
 function GroupNavigation({
   currentPath,
-  tree
+  navigation
 }) {
-  let groups = tree.filter(
-    (node) => node.type === "section" && typeof node.path == "string" && typeof node.group == "string"
+  let groups = navigationGroups(navigation.items).filter(
+    (group) => group.groupKey !== navigation.rootGroup && group.presentation === "page"
   ), activeGroup = groups.filter(
-    ({ path }) => currentPath === path || currentPath.startsWith(path === "/" ? "/" : `${path}/`)
+    ({ route }) => currentPath === route || currentPath.startsWith(route === "/" ? "/" : `${route}/`)
   ).reduce(
-    (active, group) => !active || group.path.length > active.path.length ? group : active,
+    (active, group) => !active || group.route.length > active.route.length ? group : active,
     void 0
   ), navRef = useRef(null), linksRef = useRef(null), [overflow, setOverflow] = useState(!1), hasGroups = groups.length > 1;
   if (useLayoutEffect(() => {
@@ -67,7 +74,7 @@ function GroupNavigation({
     }, observer = new win.ResizeObserver(measure);
     return observer.observe(nav), observer.observe(links), measure(), () => observer.disconnect();
   }, [hasGroups]), !hasGroups) return null;
-  let isActive = (path) => activeGroup?.path === path;
+  let isActive = (path) => activeGroup?.route === path;
   return /* @__PURE__ */ jsxs("div", { className: "hidden min-w-0 flex-1 items-center gap-4 md:flex", children: [
     /* @__PURE__ */ jsx("span", { "aria-hidden": "true", className: "h-4 w-px shrink-0 bg-stroke-3" }),
     /* @__PURE__ */ jsxs(
@@ -84,19 +91,19 @@ function GroupNavigation({
               className: `flex w-max items-center gap-1 ${overflow ? "pointer-events-none invisible absolute top-0" : ""}`,
               inert: overflow || void 0,
               ref: linksRef,
-              children: groups.map((group) => /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(
+              children: groups.map((group) => /* @__PURE__ */ jsx("li", { children: group.href ? /* @__PURE__ */ jsx(
                 Link,
                 {
-                  active: isActive(group.path),
-                  "aria-current": isActive(group.path) ? "location" : void 0,
-                  className: "data-[state=path-active]:text-foreground-1 pointer-coarse:min-h-11 pointer-coarse:min-w-11",
-                  href: group.href ?? group.path,
+                  active: isActive(group.route),
+                  "aria-current": isActive(group.route) ? "location" : void 0,
+                  className: "pointer-coarse:min-h-11 pointer-coarse:min-w-11",
+                  href: group.href,
                   size: "xs",
                   target: "_self",
                   variant: "button.ghost",
-                  children: group.title
+                  children: group.label
                 }
-              ) }, group.id))
+              ) : /* @__PURE__ */ jsx("span", { className: "px-2 text-xs text-foreground-3", children: group.label }) }, group.id))
             }
           ),
           overflow ? /* @__PURE__ */ jsxs(Menu, { children: [
@@ -119,10 +126,10 @@ function GroupNavigation({
             /* @__PURE__ */ jsx(MenuPortal, { children: /* @__PURE__ */ jsx(MenuPositioner, { align: "start", children: /* @__PURE__ */ jsx(MenuPopup, { className: "max-w-[min(24rem,calc(100vw-2rem))]", children: groups.map((group) => /* @__PURE__ */ jsx(
               MenuLinkItem,
               {
-                "aria-current": isActive(group.path) ? "location" : void 0,
+                "aria-current": isActive(group.route) ? "location" : void 0,
                 className: "whitespace-normal break-words pointer-coarse:min-h-11",
-                render: /* @__PURE__ */ jsx(NextLink, { href: group.href ?? group.path }),
-                children: group.title
+                render: /* @__PURE__ */ jsx(NextLink, { href: group.href ?? group.route }),
+                children: group.label
               },
               group.id
             )) }) }) })
@@ -134,15 +141,15 @@ function GroupNavigation({
 }
 
 // src/components/block/navbar/mobile-navigation-tree.tsx
-import { Link as Link2 } from "@publish.os/nextjs/kernel/components/ui/link";
-import { ScrollArea } from "@publish.os/nextjs/kernel/components/ui/scroll-area";
-import { Fragment, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+import { Link as Link2 } from "@components/ui/link";
+import { ScrollArea } from "@components/ui/scroll-area";
+import { Fragment, jsx as jsx2, jsxs as jsxs2 } from "@publish.os/nextjs/jsx-runtime";
 function MobileNavigationTree({
   currentPath,
   indexCurrentPath,
   indexPath,
   title,
-  tree
+  navigation
 }) {
   return /* @__PURE__ */ jsx2(
     ScrollArea,
@@ -151,7 +158,7 @@ function MobileNavigationTree({
       viewportClassName: "overscroll-contain",
       children: /* @__PURE__ */ jsxs2("nav", { "aria-label": `${title} pages`, className: "px-4 py-5", children: [
         /* @__PURE__ */ jsx2("p", { className: "mb-3 wrap-break-word px-3 text-base leading-6 text-foreground-3", children: title }),
-        tree.length > 0 ? /* @__PURE__ */ jsx2(PageList, { currentPath, tree }) : /* @__PURE__ */ jsx2(
+        navigation.items.length > 0 ? /* @__PURE__ */ jsx2(PageList, { currentPath, navigation }) : indexPath ? /* @__PURE__ */ jsx2(
           PageLink,
           {
             currentPath,
@@ -160,34 +167,44 @@ function MobileNavigationTree({
             sameTab: !0,
             title: "Overview"
           }
-        )
+        ) : null
       ] })
     }
   );
 }
 function PageList({
   currentPath,
-  tree
+  navigation
 }) {
+  let tree = navigation.items;
   return /* @__PURE__ */ jsx2("ul", { className: "space-y-1", children: tree.map((node) => /* @__PURE__ */ jsx2(
     "li",
     {
-      className: node.type === "section" || node.type === "folder" ? "pt-5 first:pt-0" : void 0,
-      children: node.type === "page" || node.type === "link" ? /* @__PURE__ */ jsx2(
+      className: node.type === "section" || node.type === "folder" || node.type === "group" ? "pt-5 first:pt-0" : void 0,
+      children: node.type === "page" || node.type === "link" || node.type === "group" && node.presentation === "page" ? /* @__PURE__ */ jsx2(
         PageLink,
         {
           currentPath,
-          href: node.type === "page" ? node.href ?? node.path : node.href,
-          activePath: node.type === "page" ? node.path : void 0,
-          sameTab: node.type === "page",
-          title: node.title
+          href: node.type === "group" ? node.href ?? node.route : node.href,
+          activePath: node.type === "page" ? node.page.path : node.type === "group" ? node.route : void 0,
+          sameTab: node.type !== "link",
+          title: node.label
         }
-      ) : /* @__PURE__ */ jsxs2(Fragment, { children: [
-        /* @__PURE__ */ jsx2("p", { className: "mb-2 wrap-break-word px-3 text-base leading-6 text-foreground-3", children: node.title }),
-        /* @__PURE__ */ jsx2(PageList, { currentPath, tree: node.children })
+      ) : node.type === "switch-view" ? null : /* @__PURE__ */ jsxs2(Fragment, { children: [
+        /* @__PURE__ */ jsx2("p", { className: "mb-2 wrap-break-word px-3 text-base leading-6 text-foreground-3", children: node.label }),
+        /* @__PURE__ */ jsx2(
+          PageList,
+          {
+            currentPath,
+            navigation: {
+              rootGroup: navigation.rootGroup,
+              items: "items" in node ? node.items : node.children
+            }
+          }
+        )
       ] })
     },
-    node.type === "page" ? node.fileID : node.id
+    node.id
   )) });
 }
 function PageLink({
@@ -212,19 +229,19 @@ function PageLink({
 }
 
 // src/components/block/navbar/navbar.tsx
-import { Fragment as Fragment2, jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx3, jsxs as jsxs3 } from "@publish.os/nextjs/jsx-runtime";
 function Navbar({
   logo,
   showThemeToggle = !0,
   site,
   siteTitle,
-  tree
+  navigation
 }) {
   let pathname = usePathname() || "/", headerSite = site ?? { name: siteTitle ?? "Site" };
   return /* @__PURE__ */ jsx3("header", { className: "sticky top-0 z-nav border-b border-stroke-3 bg-surface-2 [anchor-name:--global-navbar]", children: /* @__PURE__ */ jsxs3(NavbarFrame, { children: [
     /* @__PURE__ */ jsxs3("div", { className: "flex min-w-0 flex-1 items-center gap-4", children: [
       /* @__PURE__ */ jsx3(HomeLink, { logo, siteName: headerSite.name }),
-      /* @__PURE__ */ jsx3(GroupNavigation, { currentPath: pathname, tree })
+      /* @__PURE__ */ jsx3(GroupNavigation, { currentPath: pathname, navigation })
     ] }),
     /* @__PURE__ */ jsxs3("div", { className: "flex shrink-0 items-center gap-1 md:gap-2", children: [
       /* @__PURE__ */ jsxs3(Search.Root, { children: [
@@ -265,7 +282,7 @@ function Navbar({
           logo,
           showThemeToggle,
           siteName: headerSite.name,
-          tree
+          navigation
         },
         pathname
       )
@@ -293,10 +310,10 @@ function MobileNavigation({
   logo,
   showThemeToggle,
   siteName,
-  tree
+  navigation
 }) {
-  let [open, setOpen] = useState2(!1), [selectedGroupId, setSelectedGroupId] = useState2(null), triggerRef = useRef2(null), closeRef = useRef2(null), backRef = useRef2(null), returnGroupIdRef = useRef2(null), groupButtonRefs = useRef2(/* @__PURE__ */ new Map()), groups = tree.filter(
-    (node) => node.type === "section" && typeof node.path == "string" && typeof node.group == "string"
+  let [open, setOpen] = useState2(!1), [selectedGroupId, setSelectedGroupId] = useState2(null), triggerRef = useRef2(null), closeRef = useRef2(null), backRef = useRef2(null), returnGroupIdRef = useRef2(null), groupButtonRefs = useRef2(/* @__PURE__ */ new Map()), groups = navigationGroups(navigation.items).filter(
+    (group) => group.groupKey !== navigation.rootGroup
   ), selectedGroup = groups.find((group) => group.id === selectedGroupId), changeOpen = (nextOpen) => {
     setOpen(nextOpen), nextOpen || (setSelectedGroupId(null), returnGroupIdRef.current = null);
   };
@@ -333,7 +350,7 @@ function MobileNavigation({
         },
         children: [
           /* @__PURE__ */ jsxs3(DrawerTitle, { className: "sr-only", children: [
-            selectedGroup ? selectedGroup.title : siteName,
+            selectedGroup ? selectedGroup.label : siteName,
             " navigation"
           ] }),
           /* @__PURE__ */ jsx3(DrawerDescription, { className: "sr-only", children: "Browse pages and site controls." }),
@@ -373,10 +390,13 @@ function MobileNavigation({
               MobileNavigationTree,
               {
                 currentPath,
-                indexPath: selectedGroup.href ?? selectedGroup.path,
-                indexCurrentPath: selectedGroup.path,
-                title: selectedGroup.title,
-                tree: selectedGroup.children
+                indexPath: selectedGroup.presentation === "page" ? selectedGroup.href : void 0,
+                indexCurrentPath: selectedGroup.route,
+                title: selectedGroup.label,
+                navigation: {
+                  rootGroup: selectedGroup.groupKey,
+                  items: selectedGroup.children
+                }
               }
             )
           ] }) : groups.length > 0 ? /* @__PURE__ */ jsx3(
@@ -397,7 +417,7 @@ function MobileNavigation({
                   rightIcon: /* @__PURE__ */ jsx3(CaretRightIcon, { "aria-hidden": "true" }),
                   size: "lg",
                   variant: "ghost",
-                  children: /* @__PURE__ */ jsx3("span", { className: "min-w-0 wrap-break-word", children: group.title })
+                  children: /* @__PURE__ */ jsx3("span", { className: "min-w-0 wrap-break-word", children: group.label })
                 }
               ) }, group.id)) }) })
             }
@@ -406,7 +426,7 @@ function MobileNavigation({
             {
               className: "w-full min-w-0 max-w-none",
               currentPath,
-              tree
+              navigation
             }
           ) }),
           selectedGroup ? null : /* @__PURE__ */ jsxs3("div", { className: "flex shrink-0 flex-col gap-4 border-t border-stroke-3 px-4 py-4", children: [

package/dist/kernel/components/blocks/navigation-progress.d.ts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
+import * as react from 'react';
 
 declare const navigationProgressConfig: {
     initialProgress: number;
@@ -11,6 +11,6 @@ declare const navigationProgressConfig: {
     settleDelay: number;
     timeout: number;
 };
-declare function NavigationProgressBar(): react_jsx_runtime.JSX.Element;
+declare function NavigationProgressBar(): react.JSX.Element;
 
 export { NavigationProgressBar, navigationProgressConfig };

package/dist/kernel/components/blocks/navigation-progress.js

@@ -5,11 +5,11 @@ import {
   Progress,
   ProgressIndicator,
   ProgressTrack
-} from "@publish.os/nextjs/kernel/components/ui/progress";
+} from "@components/ui/progress";
 import { cn } from "@publish.os/nextjs/utils/cn";
 import { usePathname, useSearchParams } from "next/navigation";
 import { Suspense, useCallback, useEffect, useRef, useState } from "react";
-import { jsx } from "react/jsx-runtime";
+import { jsx } from "@publish.os/nextjs/jsx-runtime";
 var navigationProgressConfig = {
   initialProgress: 0,
   targetProgress: 98,

package/dist/kernel/components/blocks/next-prev.d.ts

@@ -1,11 +1,11 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
-import { T as TreeNode } from '../../../types-CUtrppxt.js';
+import * as react from 'react';
+import { R as ResolvedNavigation } from '../../../manifest-types-CcVPH_jh.js';
 
 type NextPrevProps = {
     className?: string;
     currentPath?: string;
-    tree: TreeNode[];
+    navigation: ResolvedNavigation;
 };
-declare function NextPrev({ className, currentPath, tree }: NextPrevProps): react_jsx_runtime.JSX.Element | null;
+declare function NextPrev({ className, currentPath, navigation, }: NextPrevProps): react.JSX.Element | null;
 
 export { NextPrev, type NextPrevProps };

package/dist/kernel/components/blocks/next-prev.js

@@ -4,12 +4,31 @@ import { cn } from "@publish.os/nextjs/utils/cn";
 import NextLink from "next/link";
 
 // src/components/block/page-navigation/page-nodes.ts
-function pageNodes(nodes) {
-  return nodes.flatMap((node) => node.type === "page" ? [node] : node.type === "section" || node.type === "folder" ? pageNodes(node.children) : []);
+function selectNavigationPages(nodes) {
+  return nodes.flatMap((node) => node.type === "page" ? [
+    {
+      id: node.id,
+      label: node.label,
+      href: node.href,
+      path: node.page.path,
+      page: node.page
+    }
+  ] : node.type === "group" ? [
+    ...node.presentation === "page" ? [
+      {
+        id: node.id,
+        label: node.label,
+        href: node.href ?? node.route,
+        path: node.route,
+        group: node
+      }
+    ] : [],
+    ...selectNavigationPages(node.children)
+  ] : node.type === "section" || node.type === "folder" ? selectNavigationPages(node.children) : node.type === "view" ? selectNavigationPages(node.items) : []);
 }
 
 // src/components/block/page-navigation/next-prev.tsx
-import { jsx, jsxs } from "react/jsx-runtime";
+import { jsx, jsxs } from "@publish.os/nextjs/jsx-runtime";
 function DirectionIcon({ direction }) {
   return /* @__PURE__ */ jsx("span", { className: "shrink-0 text-foreground-3 transition-colors duration-200 group-hover/next-prev:text-foreground-2", children: direction === "previous" ? /* @__PURE__ */ jsx(CaretLeftIcon, { "aria-hidden": "true", size: 14 }) : /* @__PURE__ */ jsx(CaretRightIcon, { "aria-hidden": "true", size: 14 }) });
 }
@@ -25,7 +44,7 @@ function NavigationCard({
         "group/next-prev grid min-h-24 w-full min-w-0 overflow-hidden rounded-card border border-stroke-3 bg-surface-1 p-px text-left text-foreground-1 no-underline shadow-xs transition-[border-color,box-shadow] duration-200 hover:text-foreground-1 hover:no-underline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-focus-stroke **:no-underline!",
         isNext && "md:text-right"
       ),
-      href: page.href ?? page.path,
+      href: page.href,
       children: /* @__PURE__ */ jsxs(
         "span",
         {
@@ -48,15 +67,19 @@ function NavigationCard({
                 ]
               }
             ),
-            /* @__PURE__ */ jsx("span", { className: "line-clamp-2 text-sm font-medium leading-6 text-foreground-1 transition-colors duration-200", children: page.title })
+            /* @__PURE__ */ jsx("span", { className: "line-clamp-2 text-sm font-medium leading-6 text-foreground-1 transition-colors duration-200", children: page.label })
           ]
         }
       )
     }
   );
 }
-function NextPrev({ className, currentPath, tree }) {
-  let pages = pageNodes(tree), index = pages.findIndex((page) => page.path === currentPath), previous = index > 0 ? pages[index - 1] : null, next = index >= 0 ? pages[index + 1] : null, hasBoth = !!(previous && next);
+function NextPrev({
+  className,
+  currentPath,
+  navigation
+}) {
+  let pages = selectNavigationPages(navigation.items), index = pages.findIndex((page) => page.path === currentPath), previous = index > 0 ? pages[index - 1] : null, next = index >= 0 ? pages[index + 1] : null, hasBoth = !!(previous && next);
   return !previous && !next ? null : /* @__PURE__ */ jsx("nav", { "aria-label": "Previous and next pages", className, children: /* @__PURE__ */ jsxs("div", { className: cn("grid gap-4 pt-6", hasBoth && "md:grid-cols-2"), children: [
     previous ? /* @__PURE__ */ jsx(NavigationCard, { direction: "previous", page: previous }) : null,
     next ? /* @__PURE__ */ jsx(NavigationCard, { direction: "next", page: next }) : null

package/dist/kernel/components/blocks/page-list.d.ts

@@ -1,11 +1,11 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
-import { T as TreeNode } from '../../../types-CUtrppxt.js';
+import * as react from 'react';
+import { R as ResolvedNavigation } from '../../../manifest-types-CcVPH_jh.js';
 
 type PageListProps = {
-    tree: TreeNode[];
+    navigation: ResolvedNavigation;
     currentPath?: string;
     className?: string;
 };
-declare function PageList({ tree, currentPath, className }: PageListProps): react_jsx_runtime.JSX.Element | null;
+declare function PageList({ navigation, currentPath, className, }: PageListProps): react.JSX.Element | null;
 
 export { PageList };

package/dist/kernel/components/blocks/page-list.js

@@ -1,15 +1,38 @@
 // src/components/block/page-navigation/page-list.tsx
-import { Link } from "@publish.os/nextjs/kernel/components/ui/link";
+import { Link } from "@components/ui/link";
 
 // src/components/block/page-navigation/page-nodes.ts
-function pageNodes(nodes) {
-  return nodes.flatMap((node) => node.type === "page" ? [node] : node.type === "section" || node.type === "folder" ? pageNodes(node.children) : []);
+function selectNavigationPages(nodes) {
+  return nodes.flatMap((node) => node.type === "page" ? [
+    {
+      id: node.id,
+      label: node.label,
+      href: node.href,
+      path: node.page.path,
+      page: node.page
+    }
+  ] : node.type === "group" ? [
+    ...node.presentation === "page" ? [
+      {
+        id: node.id,
+        label: node.label,
+        href: node.href ?? node.route,
+        path: node.route,
+        group: node
+      }
+    ] : [],
+    ...selectNavigationPages(node.children)
+  ] : node.type === "section" || node.type === "folder" ? selectNavigationPages(node.children) : node.type === "view" ? selectNavigationPages(node.items) : []);
 }
 
 // src/components/block/page-navigation/page-list.tsx
-import { jsx } from "react/jsx-runtime";
-function PageList({ tree, currentPath, className }) {
-  let pages = pageNodes(tree);
+import { jsx } from "@publish.os/nextjs/jsx-runtime";
+function PageList({
+  navigation,
+  currentPath,
+  className
+}) {
+  let pages = selectNavigationPages(navigation.items);
   return pages.length === 0 ? null : /* @__PURE__ */ jsx("nav", { "aria-label": "Pages in this group", className, children: /* @__PURE__ */ jsx("ul", { className: "space-y-2 text-sm", children: pages.map((page) => {
     let active = page.path === currentPath;
     return /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(
@@ -17,12 +40,12 @@ function PageList({ tree, currentPath, className }) {
       {
         active,
         color: active ? "accent" : "default",
-        href: page.href ?? page.path,
+        href: page.href,
         size: "sm",
         target: "_self",
-        children: page.title
+        children: page.label
       }
-    ) }, `${page.group}:${page.fileID}`);
+    ) }, page.id);
   }) }) });
 }
 export {