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

package/dist/kernel/routes/pages/root.js

@@ -21,7 +21,8 @@ var isDev = process.env.NODE_ENV !== "production", isDebugEnabled = process.env.
 // src/lib/runtime/metadata/canonical-url.ts
 function canonicalUrl(manifest, path, group) {
   let origin = (group && manifest.groups[group]?.origin) ?? manifest.site.origin;
-  if (!origin) return path;
+  if (!origin)
+    return /^[a-z][a-z\d+.-]*:/i.test(path) ? path : new URL(path, "https://publish.invalid").pathname;
   try {
     return new URL(path, `${origin}/`).toString();
   } catch {
@@ -44,7 +45,12 @@ function agentReadableAlternates({
   return {
     ...canonical.startsWith("http") ? { canonical } : {},
     types: {
-      ...markdownPath ? { "text/markdown": normalizePath(markdownPath) } : {},
+      ...markdownPath ? {
+        "text/markdown": new URL(
+          normalizePath(markdownPath),
+          "https://publish.invalid"
+        ).pathname
+      } : {},
       "text/plain": "/llms.txt"
     }
   };
@@ -98,12 +104,21 @@ function createSocialMetadata({
   };
 }
 
+// src/lib/shared/root-content-group.ts
+var ROOT_CONTENT_GROUP_KEY = "__root";
+
 // src/route-page-root.tsx
 import { jsx } from "@publish.os/nextjs/jsx-runtime";
 var rootManifest, rootPage;
 async function CachedRootPage() {
   "use cache";
-  return cacheLife("page"), cacheTag(tags.site()), !rootManifest || !rootPage ? null : (cacheTag(tags.manifest(rootManifest.contentHash)), log.debug("[cache]", "root"), /* @__PURE__ */ jsx(rootPage, { site: rootManifest.site, tree: rootManifest.tree }));
+  if (cacheLife("page"), cacheTag(tags.site()), !rootManifest || !rootPage) return null;
+  cacheTag(tags.manifest(rootManifest.contentHash)), log.debug("[cache]", "root");
+  let RootPage = rootPage, navigation = rootManifest.groups[ROOT_CONTENT_GROUP_KEY]?.navigation ?? {
+    rootGroup: ROOT_CONTENT_GROUP_KEY,
+    items: []
+  };
+  return /* @__PURE__ */ jsx(RootPage, { site: rootManifest.site, navigation });
 }
 function createRootPage({ manifest, RootPage }) {
   return rootManifest = manifest, rootPage = RootPage, async function() {
@@ -125,10 +140,10 @@ function createRootMetadata({
     }),
     ...createSocialMetadata({
       canonicalPath: "/",
-      description,
+      description: manifest.site.metadata?.openGraph?.description ?? description,
       manifest,
       ogManifest,
-      title: manifest.site.name
+      title: manifest.site.metadata?.openGraph?.title ?? manifest.site.name
     })
   };
 }

package/dist/keyboard-shortcuts.d.ts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
+import * as react from 'react';
 import { ReactNode } from 'react';
 
 type Modifier = "mod" | "meta" | "ctrl" | "alt" | "shift";
@@ -26,7 +26,7 @@ type ShortcutRegistryApi = {
 };
 declare function KeyboardShortcutsProvider({ children, }: {
     children: ReactNode;
-}): react_jsx_runtime.JSX.Element;
+}): react.JSX.Element;
 declare function useShortcut(combo: string | readonly string[], handler: ShortcutHandler, options?: ShortcutOptions): void;
 declare function useShortcutRegistry(): ShortcutRegistryApi;
 declare function formatShortcut(source: string): string[];

package/dist/manifest-types-CcVPH_jh.d.ts

@@ -0,0 +1,83 @@
+type OgImageMetadata = string | {
+    src: string;
+    alt?: string;
+};
+type OgMetadata = {
+    title?: string;
+    description?: string;
+    image?: OgImageMetadata;
+};
+type PageStatus = "published" | "draft";
+type PageMetadata = {
+    openGraph?: OgMetadata;
+    robots?: {
+        index?: boolean;
+        follow?: boolean;
+    };
+};
+type PageFrontmatter<TCustom extends Record<string, unknown> = Record<string, unknown>> = TCustom & {
+    title: string;
+    description: string;
+    slug: string;
+    status: PageStatus;
+    metadata: PageMetadata;
+};
+type PageData<TCustom extends Record<string, unknown> = Record<string, unknown>> = {
+    fileID: string;
+    group: string;
+    path: string;
+    frontmatter: PageFrontmatter<TCustom>;
+    body: string;
+};
+type NavigationPageNode = {
+    id: string;
+    type: "page";
+    label: string;
+    href: string;
+    page: Omit<PageData, "body">;
+    children?: NavigationNode[];
+};
+type NavigationGroupNode = {
+    id: string;
+    type: "group";
+    label: string;
+    groupKey: string;
+    route: string;
+    presentation: "page" | "folder";
+    href?: string;
+    children: NavigationNode[];
+};
+type NavigationContainerNode = {
+    id: string;
+    type: "section" | "folder";
+    label: string;
+    children: NavigationNode[];
+};
+type NavigationLinkNode = {
+    id: string;
+    type: "link";
+    label: string;
+    href: string;
+};
+type NavigationViewNode = {
+    id: string;
+    type: "view";
+    label?: string;
+    viewId?: string;
+    items: NavigationNode[];
+};
+type NavigationSwitchViewNode = {
+    id: string;
+    type: "switch-view";
+    label: string;
+    target: string | {
+        view: string;
+    };
+};
+type NavigationNode = NavigationPageNode | NavigationGroupNode | NavigationContainerNode | NavigationLinkNode | NavigationViewNode | NavigationSwitchViewNode;
+type ResolvedNavigation = {
+    rootGroup: string;
+    items: NavigationNode[];
+};
+
+export type { ResolvedNavigation as R };

package/dist/resolvers/manifest-resolver.d.ts

@@ -1,11 +1,11 @@
-import React from 'react';
+import react__default from 'react';
 import { IndexPageProps, PageProps, ManifestLike, LayoutProps } from '../types.js';
 
 type ResolvedLeaf = PageProps;
 type ResolvedGroup = Omit<IndexPageProps, "children">;
 declare function resolveLeaf(manifest: ManifestLike, group: string, slug: string | string[]): ResolvedLeaf | null;
 declare function resolveGroup(manifest: ManifestLike, group: string): ResolvedGroup | null;
-declare function resolveGroupLayout(manifest: ManifestLike, group: string, children: React.ReactNode): LayoutProps | null;
+declare function resolveGroupLayout(manifest: ManifestLike, group: string, children: react__default.ReactNode): LayoutProps | null;
 declare function listStaticParams(manifest: ManifestLike, group: string): Array<{
     slug: string[];
 }>;

package/dist/resolvers/manifest-resolver.js

@@ -1,7 +1,8 @@
 // src/lib/runtime/metadata/canonical-url.ts
 function canonicalUrl(manifest, path, group) {
   let origin = (group && manifest.groups[group]?.origin) ?? manifest.site.origin;
-  if (!origin) return path;
+  if (!origin)
+    return /^[a-z][a-z\d+.-]*:/i.test(path) ? path : new URL(path, "https://publish.invalid").pathname;
   try {
     return new URL(path, `${origin}/`).toString();
   } catch {
@@ -10,18 +11,33 @@ function canonicalUrl(manifest, path, group) {
 }
 function navigationUrl(manifest, path, group) {
   let origin = manifest.groups[group]?.origin ?? manifest.site.origin;
-  return !origin || origin === manifest.site.origin ? path : canonicalUrl(manifest, path, group);
+  return !origin || origin === manifest.site.origin ? new URL(path, "https://publish.invalid").pathname : canonicalUrl(manifest, path, group);
 }
 
 // src/manifest-resolver.ts
-function findNodeInTree(nodes, id) {
+function findPageNode(nodes, id) {
   for (let node of nodes) {
-    if (node.type === "page") {
-      if (node.fileID === id) return node;
-    } else if (node.id === id)
-      return node;
-    if (node.type === "section" || node.type === "folder") {
-      let found = findNodeInTree(node.children, id);
+    if (node.type === "page" && node.page.fileID === id) return node;
+    if ("children" in node && node.children) {
+      let found = findPageNode(node.children, id);
+      if (found) return found;
+    }
+    if (node.type === "view") {
+      let found = findPageNode(node.items, id);
+      if (found) return found;
+    }
+  }
+  return null;
+}
+function findGroupNode(nodes, groupKey) {
+  for (let node of nodes) {
+    if (node.type === "group" && node.groupKey === groupKey) return node;
+    if ("children" in node && node.children) {
+      let found = findGroupNode(node.children, groupKey);
+      if (found) return found;
+    }
+    if (node.type === "view") {
+      let found = findGroupNode(node.items, groupKey);
       if (found) return found;
     }
   }
@@ -29,43 +45,53 @@ function findNodeInTree(nodes, id) {
 }
 function pageNode(manifest, page) {
   return {
+    id: `page:${page.group}:${page.fileID}`,
     type: "page",
-    fileID: page.fileID,
-    title: page.title,
-    path: page.path,
+    label: page.frontmatter.title,
     href: navigationUrl(manifest, page.path, page.group),
-    group: page.group,
-    description: page.description,
-    status: page.status,
-    publishedAt: page.publishedAt,
-    updatedAt: page.updatedAt,
-    authors: page.authors,
-    tags: page.tags,
-    meta: page.meta
+    page: {
+      fileID: page.fileID,
+      group: page.group,
+      path: page.path,
+      frontmatter: page.frontmatter
+    }
   };
 }
 function groupNode(manifest, group) {
-  return {
-    type: "section",
-    id: group.key,
-    title: group.title,
-    path: group.path,
+  let inNavigation = findGroupNode(group.navigation.items, group.key);
+  return inNavigation || {
+    type: "group",
+    id: `group:${group.key}`,
+    label: group.title,
+    groupKey: group.key,
+    route: group.path,
+    presentation: "page",
     href: navigationUrl(manifest, group.path, group.key),
-    group: group.key,
-    children: group.tree
+    children: group.navigation.items
   };
 }
 function resolveLeaf(manifest, group, slug) {
-  let slugPath = Array.isArray(slug) ? slug.join("/") : slug, page = manifest.pages.find((p) => p.group === group && p.slug === slugPath) ?? null;
-  if (!page) return null;
-  let groupData = manifest.groups[group];
-  return groupData ? {
+  let segments;
+  try {
+    segments = (Array.isArray(slug) ? slug : slug.split("/")).map(
+      (segment) => decodeURIComponent(segment).normalize("NFC")
+    );
+  } catch {
+    return null;
+  }
+  if (segments.some((segment) => /[/\\\0]/u.test(segment))) return null;
+  let slugPath = segments.join("/"), groupData = manifest.groups[group];
+  if (!groupData) return null;
+  let pagePath = `${groupData.path === "/" ? "" : groupData.path.replace(/\/$/, "")}/${slugPath}`, page = manifest.pages.find(
+    (p) => p.group === group && p.path.normalize("NFC") === pagePath
+  ) ?? null;
+  return page ? {
     site: {
       ...manifest.site,
       origin: groupData.origin ?? manifest.site.origin
     },
-    tree: groupData.tree,
-    node: findNodeInTree(groupData.tree, page.fileID) ?? pageNode(manifest, page),
+    navigation: groupData.navigation,
+    node: findPageNode(groupData.navigation.items, page.fileID) ?? pageNode(manifest, page),
     page,
     currentPath: page.path,
     group
@@ -78,7 +104,7 @@ function resolveGroup(manifest, group) {
       ...manifest.site,
       origin: groupData.origin ?? manifest.site.origin
     },
-    tree: groupData.tree,
+    navigation: groupData.navigation,
     node: groupNode(manifest, groupData),
     currentPath: groupData.path,
     group
@@ -90,7 +116,11 @@ function resolveGroupLayout(manifest, group, children) {
 }
 function listStaticParams(manifest, group) {
   let groupData = manifest.groups[group];
-  return groupData ? groupData.pages.map((page) => ({ slug: page.slug.split("/") })) : [];
+  if (!groupData) return [];
+  let basePath = groupData.path === "/" ? "" : groupData.path.replace(/\/$/, "");
+  return groupData.pages.map((page) => ({
+    slug: page.path.slice(basePath.length).replace(/^\//, "").split("/")
+  }));
 }
 export {
   listStaticParams,

package/dist/search.d.ts

@@ -1,11 +1,9 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
+import * as react from 'react';
 import { RefObject, ReactNode } from 'react';
 
 type SearchInput = {
     filters?: {
-        author?: string;
         group?: string;
-        tag?: string;
     };
     limit?: number;
     offset?: number;
@@ -22,17 +20,12 @@ type SearchResult = {
     excerpt: string;
     id: string;
     meta: {
-        author?: string;
         description?: string;
         group?: string;
-        image?: string;
         nodeId?: string;
         path?: string;
-        publishedAt?: string;
         section?: string;
-        tags?: string;
         title?: string;
-        updatedAt?: string;
     };
     plainExcerpt: string;
     score?: number;
@@ -91,6 +84,6 @@ type SearchProviderProps = {
     open?: boolean;
     shortcut?: string | false;
 };
-declare function SearchProvider({ children, defaultOpen, limit, onOpenChange, open: controlledOpen, shortcut, }: SearchProviderProps): react_jsx_runtime.JSX.Element;
+declare function SearchProvider({ children, defaultOpen, limit, onOpenChange, open: controlledOpen, shortcut, }: SearchProviderProps): react.JSX.Element;
 
 export { type SearchBlockActions, type SearchBlockContextValue, type SearchBlockMeta, type SearchBlockState, type SearchInput, type SearchOutput, SearchProvider, type SearchProviderProps, type SearchResult, type SearchStatus, type SearchSubResult, search, useSearch, useSearchBlock };

package/dist/search.js

@@ -95,13 +95,8 @@ async function withPagefindIndex(revision, run) {
   }
 }
 function pagefindFilters(filters) {
-  if (!filters) return;
-  let entries = Object.entries({
-    author: filters.author,
-    group: filters.group,
-    tag: filters.tag
-  }).filter((entry) => !!entry[1]);
-  return entries.length > 0 ? Object.fromEntries(entries) : void 0;
+  if (filters)
+    return filters.group ? { group: filters.group } : void 0;
 }
 function titleForResult(data) {
   return data.meta?.title ?? data.sub_results?.find((subResult) => subResult.title)?.title ?? data.url;

package/dist/sidebar-types-CMrMM0Nj.d.ts

@@ -0,0 +1,105 @@
+import { Ref, ReactNode, MouseEvent } from 'react';
+
+type OgImageMetadata = string | {
+    src: string;
+    alt?: string;
+};
+type OgMetadata = {
+    title?: string;
+    description?: string;
+    image?: OgImageMetadata;
+};
+type PageStatus = "published" | "draft";
+type PageMetadata = {
+    openGraph?: OgMetadata;
+    robots?: {
+        index?: boolean;
+        follow?: boolean;
+    };
+};
+type PageFrontmatter<TCustom extends Record<string, unknown> = Record<string, unknown>> = TCustom & {
+    title: string;
+    description: string;
+    slug: string;
+    status: PageStatus;
+    metadata: PageMetadata;
+};
+type PageData<TCustom extends Record<string, unknown> = Record<string, unknown>> = {
+    fileID: string;
+    group: string;
+    path: string;
+    frontmatter: PageFrontmatter<TCustom>;
+    body: string;
+};
+type NavigationPageNode = {
+    id: string;
+    type: "page";
+    label: string;
+    href: string;
+    page: Omit<PageData, "body">;
+    children?: NavigationNode[];
+};
+type NavigationGroupNode = {
+    id: string;
+    type: "group";
+    label: string;
+    groupKey: string;
+    route: string;
+    presentation: "page" | "folder";
+    href?: string;
+    children: NavigationNode[];
+};
+type NavigationContainerNode = {
+    id: string;
+    type: "section" | "folder";
+    label: string;
+    children: NavigationNode[];
+};
+type NavigationLinkNode = {
+    id: string;
+    type: "link";
+    label: string;
+    href: string;
+};
+type NavigationViewNode = {
+    id: string;
+    type: "view";
+    label?: string;
+    viewId?: string;
+    items: NavigationNode[];
+};
+type NavigationSwitchViewNode = {
+    id: string;
+    type: "switch-view";
+    label: string;
+    target: string | {
+        view: string;
+    };
+};
+type NavigationNode = NavigationPageNode | NavigationGroupNode | NavigationContainerNode | NavigationLinkNode | NavigationViewNode | NavigationSwitchViewNode;
+type ResolvedNavigation = {
+    rootGroup: string;
+    items: NavigationNode[];
+};
+
+type SidebarNavigationNode = NavigationNode;
+type SidebarActiveState = "path-active" | "child-path-active";
+type SidebarDepth = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;
+type SidebarNodePrimitiveProps = {
+    activeState?: SidebarActiveState;
+    activeItemRef?: Ref<HTMLDivElement>;
+    children?: ReactNode;
+    contentId?: string;
+    depth: SidebarDepth;
+    expanded?: boolean;
+    href?: string;
+    isExpandable?: boolean;
+    node: SidebarNavigationNode;
+    onLinkClick?: (event: MouseEvent<HTMLAnchorElement>) => void;
+    onSwitchView?: () => void;
+    onToggle?: () => void;
+    parentExpanded: boolean;
+    title: string;
+};
+
+export type { ResolvedNavigation as R, SidebarNodePrimitiveProps as S, SidebarActiveState as a, SidebarDepth as b, SidebarNavigationNode as c };

package/dist/theme-scope.d.ts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
+import * as react from 'react';
 import { ReactNode } from 'react';
 
 type ThemeScopeProps = Readonly<{
@@ -9,7 +9,7 @@ type ThemeScopeProviderProps = Readonly<{
     children: ReactNode;
     group?: string;
 }>;
-declare function ThemeScopeProvider({ children, group, }: ThemeScopeProviderProps): react_jsx_runtime.JSX.Element;
+declare function ThemeScopeProvider({ children, group, }: ThemeScopeProviderProps): react.JSX.Element;
 declare function useThemeScope(): ThemeScopeProps;
 
 export { type ThemeScopeProps, ThemeScopeProvider, type ThemeScopeProviderProps, useThemeScope };

package/dist/types-BbqmOzLC.d.ts

@@ -0,0 +1,168 @@
+type OgImageMetadata$1 = string | {
+    src: string;
+    alt?: string;
+};
+type OgMetadata$1 = {
+    title?: string;
+    description?: string;
+    image?: OgImageMetadata$1;
+};
+type PageStatus$1 = "published" | "draft";
+type PageMetadata$1 = {
+    openGraph?: OgMetadata$1;
+    robots?: {
+        index?: boolean;
+        follow?: boolean;
+    };
+};
+type PageFrontmatter$1<TCustom extends Record<string, unknown> = Record<string, unknown>> = TCustom & {
+    title: string;
+    description: string;
+    slug: string;
+    status: PageStatus$1;
+    metadata: PageMetadata$1;
+};
+type PageData$1<TCustom extends Record<string, unknown> = Record<string, unknown>> = {
+    fileID: string;
+    group: string;
+    path: string;
+    frontmatter: PageFrontmatter$1<TCustom>;
+    body: string;
+};
+type NavigationPageNode = {
+    id: string;
+    type: "page";
+    label: string;
+    href: string;
+    page: Omit<PageData$1, "body">;
+    children?: NavigationNode[];
+};
+type NavigationGroupNode = {
+    id: string;
+    type: "group";
+    label: string;
+    groupKey: string;
+    route: string;
+    presentation: "page" | "folder";
+    href?: string;
+    children: NavigationNode[];
+};
+type NavigationContainerNode = {
+    id: string;
+    type: "section" | "folder";
+    label: string;
+    children: NavigationNode[];
+};
+type NavigationLinkNode = {
+    id: string;
+    type: "link";
+    label: string;
+    href: string;
+};
+type NavigationViewNode = {
+    id: string;
+    type: "view";
+    label?: string;
+    viewId?: string;
+    items: NavigationNode[];
+};
+type NavigationSwitchViewNode = {
+    id: string;
+    type: "switch-view";
+    label: string;
+    target: string | {
+        view: string;
+    };
+};
+type NavigationNode = NavigationPageNode | NavigationGroupNode | NavigationContainerNode | NavigationLinkNode | NavigationViewNode | NavigationSwitchViewNode;
+type ResolvedNavigation = {
+    rootGroup: string;
+    items: NavigationNode[];
+};
+
+type SiteData = {
+    name: string;
+    description?: string;
+    origin?: string;
+    metadata?: IndexMetadata;
+};
+type OgImageMetadata = string | {
+    src: string;
+    alt?: string;
+};
+type OgMetadata = {
+    title?: string;
+    description?: string;
+    image?: OgImageMetadata;
+};
+type IndexMetadata = {
+    openGraph?: OgMetadata & {
+        scope?: "page" | "subtree";
+    };
+};
+type PageStatus = "published" | "draft";
+type PageMetadata = {
+    openGraph?: OgMetadata;
+    robots?: {
+        index?: boolean;
+        follow?: boolean;
+    };
+};
+type PageFrontmatter<TCustom extends Record<string, unknown> = Record<string, unknown>> = TCustom & {
+    title: string;
+    description: string;
+    slug: string;
+    status: PageStatus;
+    metadata: PageMetadata;
+};
+type PageData<TCustom extends Record<string, unknown> = Record<string, unknown>> = {
+    fileID: string;
+    group: string;
+    path: string;
+    frontmatter: PageFrontmatter<TCustom>;
+    body: string;
+};
+type RouteRecord = {
+    fileID: string;
+    slug: string;
+    path: string;
+    group: string;
+};
+type ResolvedAttribution = {
+    enabled: false;
+} | {
+    enabled: true;
+    variant: "publish-dev";
+    label?: string;
+    hrefLabel?: string;
+    href: string;
+};
+type GroupManifest = {
+    key: string;
+    title: string;
+    path: string;
+    origin?: string;
+    ancestry?: string[];
+    metadata?: IndexMetadata;
+    meta?: Record<string, unknown>;
+    navigation: ResolvedNavigation;
+    pages: PageData[];
+};
+type ManifestLike = {
+    site: SiteData;
+    groups: Record<string, GroupManifest>;
+    routes: RouteRecord[];
+    pages: PageData[];
+    attribution?: Record<string, ResolvedAttribution>;
+    contentHash: string;
+};
+type LayoutProps = {
+    children: React.ReactNode;
+    site: SiteData;
+    navigation: ResolvedNavigation;
+    node: NavigationNode;
+    currentPath: string;
+    group: string;
+};
+
+export type { LayoutProps as L, ManifestLike as M };

package/dist/types-TjH1ek0X.d.ts

@@ -0,0 +1,22 @@
+type SiteData = {
+    name: string;
+    description?: string;
+    origin?: string;
+    metadata?: IndexMetadata;
+};
+type OgImageMetadata = string | {
+    src: string;
+    alt?: string;
+};
+type OgMetadata = {
+    title?: string;
+    description?: string;
+    image?: OgImageMetadata;
+};
+type IndexMetadata = {
+    openGraph?: OgMetadata & {
+        scope?: "page" | "subtree";
+    };
+};
+
+export type { SiteData as S };