@riverbankcms/sdk 0.6.0 → 0.7.0

package/dist/server/metadata.js

@@ -1,70 +1,10 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }require('./chunk-DGUM43GV.js');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-// src/metadata/generatePageMetadata.ts
-function generatePageMetadata(input) {
-  const { page, site, path, siteUrl, overrides, googleSiteVerification } = input;
-  const pageTitle = _nullishCoalesce(_optionalChain([overrides, 'optionalAccess', _ => _.title]), () => ( page.name));
-  const fullTitle = pageTitle === site.title ? pageTitle : `${pageTitle} | ${site.title}`;
-  const description = _nullishCoalesce(_optionalChain([overrides, 'optionalAccess', _2 => _2.description]), () => ( page.purpose));
-  const canonicalUrl = _nullishCoalesce(_optionalChain([overrides, 'optionalAccess', _3 => _3.canonicalUrl]), () => ( `${siteUrl}${path}`));
-  const fullUrl = `${siteUrl}${path}`;
-  const metadata = {
-    title: fullTitle,
-    description: _nullishCoalesce(description, () => ( void 0)),
-    alternates: {
-      canonical: canonicalUrl
-    },
-    openGraph: {
-      title: pageTitle,
-      description: _nullishCoalesce(description, () => ( void 0)),
-      url: fullUrl,
-      siteName: site.title,
-      type: "website",
-      ..._optionalChain([overrides, 'optionalAccess', _4 => _4.ogImage]) ? {
-        images: [
-          {
-            url: overrides.ogImage,
-            alt: pageTitle
-          }
-        ]
-      } : {}
-    },
-    twitter: {
-      card: "summary_large_image",
-      title: pageTitle,
-      description: _nullishCoalesce(description, () => ( void 0)),
-      ..._optionalChain([overrides, 'optionalAccess', _5 => _5.ogImage]) ? {
-        images: [overrides.ogImage]
-      } : {}
-    }
-  };
-  if (_optionalChain([overrides, 'optionalAccess', _6 => _6.robots])) {
-    metadata.robots = {
-      index: _nullishCoalesce(overrides.robots.index, () => ( true)),
-      follow: _nullishCoalesce(overrides.robots.follow, () => ( true))
-    };
-  }
-  if (googleSiteVerification) {
-    metadata.verification = {
-      google: googleSiteVerification
-    };
-  }
-  return metadata;
-}
-function generatePreviewMetadata(input) {
-  return generatePageMetadata({
-    ...input,
-    overrides: {
-      ...input.overrides,
-      robots: {
-        index: false,
-        follow: false
-      }
-    }
-  });
-}
 
+var _chunkBNQV3PXPjs = require('./chunk-BNQV3PXP.js');
+require('./chunk-DGUM43GV.js');
 
 
-exports.generatePageMetadata = generatePageMetadata; exports.generatePreviewMetadata = generatePreviewMetadata;
+
+exports.generatePageMetadata = _chunkBNQV3PXPjs.generatePageMetadata; exports.generatePreviewMetadata = _chunkBNQV3PXPjs.generatePreviewMetadata;
 //# sourceMappingURL=metadata.js.map

package/dist/server/metadata.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/will/Projects/Business/cms/builder/packages/sdk/dist/server/metadata.js","../../src/metadata/generatePageMetadata.ts"],"names":[],"mappings":"AAAA,gtBAA4B;AAC5B;AACA;AC8GO,SAAS,oBAAA,CAAqB,KAAA,EAAoC;AACvE,EAAA,MAAM,EAAE,IAAA,EAAM,IAAA,EAAM,IAAA,EAAM,OAAA,EAAS,SAAA,EAAW,uBAAuB,EAAA,EAAI,KAAA;AAGzE,EAAA,MAAM,UAAA,mCAAY,SAAA,2BAAW,OAAA,UAAS,IAAA,CAAK,MAAA;AAC3C,EAAA,MAAM,UAAA,EAAY,UAAA,IAAc,IAAA,CAAK,MAAA,EAAQ,UAAA,EAAY,CAAA,EAAA;AAGN,EAAA;AAGO,EAAA;AACzB,EAAA;AAGN,EAAA;AAClB,IAAA;AACqB,IAAA;AAChB,IAAA;AACC,MAAA;AACb,IAAA;AACW,IAAA;AACF,MAAA;AACqB,MAAA;AACvB,MAAA;AACU,MAAA;AACT,MAAA;AAEF,MAAA;AACU,QAAA;AACN,UAAA;AACiB,YAAA;AACV,YAAA;AACP,UAAA;AACF,QAAA;AAED,MAAA;AACP,IAAA;AACS,IAAA;AACD,MAAA;AACC,MAAA;AACqB,MAAA;AAExB,MAAA;AAC4B,QAAA;AAE3B,MAAA;AACP,IAAA;AACF,EAAA;AAGuB,EAAA;AACH,IAAA;AACiB,MAAA;AACE,MAAA;AACrC,IAAA;AACF,EAAA;AAG4B,EAAA;AACF,IAAA;AACd,MAAA;AACV,IAAA;AACF,EAAA;AAEO,EAAA;AACT;AAuB4E;AAC9C,EAAA;AACvB,IAAA;AACQ,IAAA;AACA,MAAA;AACD,MAAA;AACC,QAAA;AACC,QAAA;AACV,MAAA;AACF,IAAA;AACD,EAAA;AACH;ADnJ4D;AACA;AACA;AACA","file":"/Users/will/Projects/Business/cms/builder/packages/sdk/dist/server/metadata.js","sourcesContent":[null,"/**\n * Metadata generation helper for Next.js pages\n *\n * Generates SEO-optimized metadata from Builder page data for use in\n * Next.js generateMetadata() functions.\n */\n\nimport type { LoadPageResult } from '../rendering/helpers/loadPage';\nimport type { SiteResponse } from '../client/types';\n\n/**\n * Next.js Metadata type\n * Simplified version to avoid requiring Next.js as a dependency\n */\nexport type Metadata = {\n  title?: string;\n  description?: string;\n  alternates?: {\n    canonical?: string;\n  };\n  openGraph?: {\n    title?: string;\n    description?: string;\n    url?: string;\n    siteName?: string;\n    type?: string;\n    images?: Array<{\n      url: string;\n      alt?: string;\n    }>;\n  };\n  twitter?: {\n    card?: string;\n    title?: string;\n    description?: string;\n    images?: string[];\n  };\n  robots?: {\n    index?: boolean;\n    follow?: boolean;\n  };\n  verification?: {\n    google?: string;\n  };\n};\n\nexport type PageMetadataInput = {\n  /**\n   * Page data from loadPage() or custom page object\n   */\n  page: LoadPageResult['page'] | {\n    name: string;\n    purpose?: string;\n  };\n\n  /**\n   * Site data from client.getSite()\n   */\n  site: SiteResponse['site'];\n\n  /**\n   * Current URL path (e.g., '/about', '/blog/post-1')\n   */\n  path: string;\n\n  /**\n   * Full site URL for canonical and OG URLs\n   * Example: 'https://example.com'\n   */\n  siteUrl: string;\n\n  /**\n   * Optional custom metadata overrides\n   */\n  overrides?: {\n    title?: string;\n    description?: string;\n    ogImage?: string;\n    canonicalUrl?: string;\n    robots?: {\n      index?: boolean;\n      follow?: boolean;\n    };\n  };\n\n  /**\n   * Optional Google site verification token\n   */\n  googleSiteVerification?: string;\n};\n\n/**\n * Generate Next.js Metadata object from Builder page data\n *\n * @example\n * ```tsx\n * import { generatePageMetadata } from '@riverbankcms/sdk/metadata';\n * import { loadPage } from '@riverbankcms/sdk';\n *\n * export async function generateMetadata({ params }) {\n *   const pageData = await loadPage({ client, siteId, path: params.slug });\n *   const siteData = await client.getSite({ id: siteId });\n *\n *   return generatePageMetadata({\n *     page: pageData.page,\n *     site: siteData.site,\n *     path: params.slug,\n *     siteUrl: 'https://example.com',\n *   });\n * }\n * ```\n */\nexport function generatePageMetadata(input: PageMetadataInput): Metadata {\n  const { page, site, path, siteUrl, overrides, googleSiteVerification } = input;\n\n  // Build page title\n  const pageTitle = overrides?.title ?? page.name;\n  const fullTitle = pageTitle === site.title ? pageTitle : `${pageTitle} | ${site.title}`;\n\n  // Use page purpose as description fallback\n  const description = overrides?.description ?? page.purpose;\n\n  // Build full URLs\n  const canonicalUrl = overrides?.canonicalUrl ?? `${siteUrl}${path}`;\n  const fullUrl = `${siteUrl}${path}`;\n\n  // Build metadata object\n  const metadata: Metadata = {\n    title: fullTitle,\n    description: description ?? undefined,\n    alternates: {\n      canonical: canonicalUrl,\n    },\n    openGraph: {\n      title: pageTitle,\n      description: description ?? undefined,\n      url: fullUrl,\n      siteName: site.title,\n      type: 'website',\n      ...(overrides?.ogImage\n        ? {\n            images: [\n              {\n                url: overrides.ogImage,\n                alt: pageTitle,\n              },\n            ],\n          }\n        : {}),\n    },\n    twitter: {\n      card: 'summary_large_image',\n      title: pageTitle,\n      description: description ?? undefined,\n      ...(overrides?.ogImage\n        ? {\n            images: [overrides.ogImage],\n          }\n        : {}),\n    },\n  };\n\n  // Add robots meta if specified\n  if (overrides?.robots) {\n    metadata.robots = {\n      index: overrides.robots.index ?? true,\n      follow: overrides.robots.follow ?? true,\n    };\n  }\n\n  // Add Google site verification if provided\n  if (googleSiteVerification) {\n    metadata.verification = {\n      google: googleSiteVerification,\n    };\n  }\n\n  return metadata;\n}\n\n/**\n * Generate metadata for preview/staging environments\n *\n * This helper adds noindex/nofollow robots tags to prevent search engines\n * from indexing preview or staging URLs.\n *\n * @example\n * ```tsx\n * export async function generateMetadata({ params }) {\n *   const pageData = await loadPage({ client, siteId, path: params.slug });\n *   const isPreview = process.env.VERCEL_ENV !== 'production';\n *\n *   return generatePreviewMetadata({\n *     page: pageData.page,\n *     site: siteData.site,\n *     path: params.slug,\n *     siteUrl: 'https://example.com',\n *   });\n * }\n * ```\n */\nexport function generatePreviewMetadata(input: PageMetadataInput): Metadata {\n  return generatePageMetadata({\n    ...input,\n    overrides: {\n      ...input.overrides,\n      robots: {\n        index: false,\n        follow: false,\n      },\n    },\n  });\n}\n"]}
+{"version":3,"sources":["/Users/will/Projects/Business/cms/builder/packages/sdk/dist/server/metadata.js"],"names":[],"mappings":"AAAA;AACE;AACA;AACF,sDAA4B;AAC5B,+BAA4B;AAC5B;AACE;AACA;AACF,iJAAC","file":"/Users/will/Projects/Business/cms/builder/packages/sdk/dist/server/metadata.js"}

package/dist/server/metadata.mjs

@@ -1,68 +1,8 @@
+import {
+  generatePageMetadata,
+  generatePreviewMetadata
+} from "./chunk-SWYWZT3L.mjs";
 import "./chunk-BJTO5JO5.mjs";
-
-// src/metadata/generatePageMetadata.ts
-function generatePageMetadata(input) {
-  const { page, site, path, siteUrl, overrides, googleSiteVerification } = input;
-  const pageTitle = overrides?.title ?? page.name;
-  const fullTitle = pageTitle === site.title ? pageTitle : `${pageTitle} | ${site.title}`;
-  const description = overrides?.description ?? page.purpose;
-  const canonicalUrl = overrides?.canonicalUrl ?? `${siteUrl}${path}`;
-  const fullUrl = `${siteUrl}${path}`;
-  const metadata = {
-    title: fullTitle,
-    description: description ?? void 0,
-    alternates: {
-      canonical: canonicalUrl
-    },
-    openGraph: {
-      title: pageTitle,
-      description: description ?? void 0,
-      url: fullUrl,
-      siteName: site.title,
-      type: "website",
-      ...overrides?.ogImage ? {
-        images: [
-          {
-            url: overrides.ogImage,
-            alt: pageTitle
-          }
-        ]
-      } : {}
-    },
-    twitter: {
-      card: "summary_large_image",
-      title: pageTitle,
-      description: description ?? void 0,
-      ...overrides?.ogImage ? {
-        images: [overrides.ogImage]
-      } : {}
-    }
-  };
-  if (overrides?.robots) {
-    metadata.robots = {
-      index: overrides.robots.index ?? true,
-      follow: overrides.robots.follow ?? true
-    };
-  }
-  if (googleSiteVerification) {
-    metadata.verification = {
-      google: googleSiteVerification
-    };
-  }
-  return metadata;
-}
-function generatePreviewMetadata(input) {
-  return generatePageMetadata({
-    ...input,
-    overrides: {
-      ...input.overrides,
-      robots: {
-        index: false,
-        follow: false
-      }
-    }
-  });
-}
 export {
   generatePageMetadata,
   generatePreviewMetadata

package/dist/server/metadata.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/metadata/generatePageMetadata.ts"],"sourcesContent":["/**\n * Metadata generation helper for Next.js pages\n *\n * Generates SEO-optimized metadata from Builder page data for use in\n * Next.js generateMetadata() functions.\n */\n\nimport type { LoadPageResult } from '../rendering/helpers/loadPage';\nimport type { SiteResponse } from '../client/types';\n\n/**\n * Next.js Metadata type\n * Simplified version to avoid requiring Next.js as a dependency\n */\nexport type Metadata = {\n  title?: string;\n  description?: string;\n  alternates?: {\n    canonical?: string;\n  };\n  openGraph?: {\n    title?: string;\n    description?: string;\n    url?: string;\n    siteName?: string;\n    type?: string;\n    images?: Array<{\n      url: string;\n      alt?: string;\n    }>;\n  };\n  twitter?: {\n    card?: string;\n    title?: string;\n    description?: string;\n    images?: string[];\n  };\n  robots?: {\n    index?: boolean;\n    follow?: boolean;\n  };\n  verification?: {\n    google?: string;\n  };\n};\n\nexport type PageMetadataInput = {\n  /**\n   * Page data from loadPage() or custom page object\n   */\n  page: LoadPageResult['page'] | {\n    name: string;\n    purpose?: string;\n  };\n\n  /**\n   * Site data from client.getSite()\n   */\n  site: SiteResponse['site'];\n\n  /**\n   * Current URL path (e.g., '/about', '/blog/post-1')\n   */\n  path: string;\n\n  /**\n   * Full site URL for canonical and OG URLs\n   * Example: 'https://example.com'\n   */\n  siteUrl: string;\n\n  /**\n   * Optional custom metadata overrides\n   */\n  overrides?: {\n    title?: string;\n    description?: string;\n    ogImage?: string;\n    canonicalUrl?: string;\n    robots?: {\n      index?: boolean;\n      follow?: boolean;\n    };\n  };\n\n  /**\n   * Optional Google site verification token\n   */\n  googleSiteVerification?: string;\n};\n\n/**\n * Generate Next.js Metadata object from Builder page data\n *\n * @example\n * ```tsx\n * import { generatePageMetadata } from '@riverbankcms/sdk/metadata';\n * import { loadPage } from '@riverbankcms/sdk';\n *\n * export async function generateMetadata({ params }) {\n *   const pageData = await loadPage({ client, siteId, path: params.slug });\n *   const siteData = await client.getSite({ id: siteId });\n *\n *   return generatePageMetadata({\n *     page: pageData.page,\n *     site: siteData.site,\n *     path: params.slug,\n *     siteUrl: 'https://example.com',\n *   });\n * }\n * ```\n */\nexport function generatePageMetadata(input: PageMetadataInput): Metadata {\n  const { page, site, path, siteUrl, overrides, googleSiteVerification } = input;\n\n  // Build page title\n  const pageTitle = overrides?.title ?? page.name;\n  const fullTitle = pageTitle === site.title ? pageTitle : `${pageTitle} | ${site.title}`;\n\n  // Use page purpose as description fallback\n  const description = overrides?.description ?? page.purpose;\n\n  // Build full URLs\n  const canonicalUrl = overrides?.canonicalUrl ?? `${siteUrl}${path}`;\n  const fullUrl = `${siteUrl}${path}`;\n\n  // Build metadata object\n  const metadata: Metadata = {\n    title: fullTitle,\n    description: description ?? undefined,\n    alternates: {\n      canonical: canonicalUrl,\n    },\n    openGraph: {\n      title: pageTitle,\n      description: description ?? undefined,\n      url: fullUrl,\n      siteName: site.title,\n      type: 'website',\n      ...(overrides?.ogImage\n        ? {\n            images: [\n              {\n                url: overrides.ogImage,\n                alt: pageTitle,\n              },\n            ],\n          }\n        : {}),\n    },\n    twitter: {\n      card: 'summary_large_image',\n      title: pageTitle,\n      description: description ?? undefined,\n      ...(overrides?.ogImage\n        ? {\n            images: [overrides.ogImage],\n          }\n        : {}),\n    },\n  };\n\n  // Add robots meta if specified\n  if (overrides?.robots) {\n    metadata.robots = {\n      index: overrides.robots.index ?? true,\n      follow: overrides.robots.follow ?? true,\n    };\n  }\n\n  // Add Google site verification if provided\n  if (googleSiteVerification) {\n    metadata.verification = {\n      google: googleSiteVerification,\n    };\n  }\n\n  return metadata;\n}\n\n/**\n * Generate metadata for preview/staging environments\n *\n * This helper adds noindex/nofollow robots tags to prevent search engines\n * from indexing preview or staging URLs.\n *\n * @example\n * ```tsx\n * export async function generateMetadata({ params }) {\n *   const pageData = await loadPage({ client, siteId, path: params.slug });\n *   const isPreview = process.env.VERCEL_ENV !== 'production';\n *\n *   return generatePreviewMetadata({\n *     page: pageData.page,\n *     site: siteData.site,\n *     path: params.slug,\n *     siteUrl: 'https://example.com',\n *   });\n * }\n * ```\n */\nexport function generatePreviewMetadata(input: PageMetadataInput): Metadata {\n  return generatePageMetadata({\n    ...input,\n    overrides: {\n      ...input.overrides,\n      robots: {\n        index: false,\n        follow: false,\n      },\n    },\n  });\n}\n"],"mappings":";;;AAgHO,SAAS,qBAAqB,OAAoC;AACvE,QAAM,EAAE,MAAM,MAAM,MAAM,SAAS,WAAW,uBAAuB,IAAI;AAGzE,QAAM,YAAY,WAAW,SAAS,KAAK;AAC3C,QAAM,YAAY,cAAc,KAAK,QAAQ,YAAY,GAAG,SAAS,MAAM,KAAK,KAAK;AAGrF,QAAM,cAAc,WAAW,eAAe,KAAK;AAGnD,QAAM,eAAe,WAAW,gBAAgB,GAAG,OAAO,GAAG,IAAI;AACjE,QAAM,UAAU,GAAG,OAAO,GAAG,IAAI;AAGjC,QAAM,WAAqB;AAAA,IACzB,OAAO;AAAA,IACP,aAAa,eAAe;AAAA,IAC5B,YAAY;AAAA,MACV,WAAW;AAAA,IACb;AAAA,IACA,WAAW;AAAA,MACT,OAAO;AAAA,MACP,aAAa,eAAe;AAAA,MAC5B,KAAK;AAAA,MACL,UAAU,KAAK;AAAA,MACf,MAAM;AAAA,MACN,GAAI,WAAW,UACX;AAAA,QACE,QAAQ;AAAA,UACN;AAAA,YACE,KAAK,UAAU;AAAA,YACf,KAAK;AAAA,UACP;AAAA,QACF;AAAA,MACF,IACA,CAAC;AAAA,IACP;AAAA,IACA,SAAS;AAAA,MACP,MAAM;AAAA,MACN,OAAO;AAAA,MACP,aAAa,eAAe;AAAA,MAC5B,GAAI,WAAW,UACX;AAAA,QACE,QAAQ,CAAC,UAAU,OAAO;AAAA,MAC5B,IACA,CAAC;AAAA,IACP;AAAA,EACF;AAGA,MAAI,WAAW,QAAQ;AACrB,aAAS,SAAS;AAAA,MAChB,OAAO,UAAU,OAAO,SAAS;AAAA,MACjC,QAAQ,UAAU,OAAO,UAAU;AAAA,IACrC;AAAA,EACF;AAGA,MAAI,wBAAwB;AAC1B,aAAS,eAAe;AAAA,MACtB,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,SAAO;AACT;AAuBO,SAAS,wBAAwB,OAAoC;AAC1E,SAAO,qBAAqB;AAAA,IAC1B,GAAG;AAAA,IACH,WAAW;AAAA,MACT,GAAG,MAAM;AAAA,MACT,QAAQ;AAAA,QACN,OAAO;AAAA,QACP,QAAQ;AAAA,MACV;AAAA,IACF;AAAA,EACF,CAAC;AACH;","names":[]}
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/dist/server/navigation.d.mts

@@ -12,26 +12,28 @@ import '@riverbankcms/db';
  * Navigation helper utilities for SDK sites.
  *
  * Provides helpers to transform CMS navigation data into render-ready structures.
- * Supports both simple NavItem arrays and full MenuViewModels for block rendering.
+ * All navigation functions return nested structures supporting dropdowns.
  *
- * @example Simple usage
+ * @example Getting nav items
  * ```ts
- * import { getPrimaryNavItems } from '@riverbankcms/sdk/navigation';
+ * import { getPrimaryNavItems, isNavLink, isNavDropdown } from '@riverbankcms/sdk/navigation';
  *
  * const headerNav = getPrimaryNavItems(siteData.navigation);
- * // [{ href: '/', label: 'Home', isExternal: false }, ...]
+ * headerNav.forEach(item => {
+ *   if (isNavLink(item)) {
+ *     console.log(item.href);
+ *   } else {
+ *     console.log(`${item.label} has ${item.children.length} children`);
+ *   }
+ * });
  * ```
  *
- * @example Block rendering usage
+ * @example Building menu and logo
  * ```ts
- * import { buildMenuViewModel, buildLogoViewModel } from '@riverbankcms/sdk/navigation';
- *
- * const menu = buildMenuViewModel(siteData.navigation);
- * const logo = buildLogoViewModel(siteData.layout.logo, siteData.site.title);
+ * import { buildMenu, buildLogo } from '@riverbankcms/sdk/navigation';
  *
- * renderBlock(siteHeaderManifest, layout.header, {
- *   viewModelOverrides: { menu, content: { logo } },
- * });
+ * const menu = buildMenu(siteData.navigation, siteData.routes);
+ * const logo = buildLogo(siteData.layout.logo, siteData.site.title);
  * ```
  *
  * @packageDocumentation
@@ -110,17 +112,6 @@ type LogoViewModel = {
     storagePath?: string;
     storageBucket?: string;
 } | null;
-/**
- * A simplified navigation item structure for component rendering.
- */
-type NavItem = {
-    /** The URL to navigate to */
-    href: string;
-    /** Display text for the navigation link */
-    label: string;
-    /** Whether link should open in new tab (external links) */
-    isExternal: boolean;
-};
 /**
  * A navigation link item with a direct URL.
  * Use `kind` discriminator for type-safe narrowing.
@@ -160,12 +151,12 @@ type NavDropdown = {
     children: NavLink[];
 };
 /**
- * Unified navigation item supporting both links and dropdowns.
+ * Navigation item - either a link or a dropdown container.
  * Use `kind` property for type-safe discrimination.
  *
  * @example
  * ```ts
- * const items = getNestedPrimaryNavItems(navigation);
+ * const items = getPrimaryNavItems(navigation);
  * items.forEach(item => {
  *   if (item.kind === 'link') {
  *     console.log(item.href);
@@ -175,72 +166,63 @@ type NavDropdown = {
  * });
  * ```
  */
-type NestedNavItem = NavLink | NavDropdown;
+type NavItem = NavLink | NavDropdown;
 /**
  * Type guard to check if a navigation item is a link.
  */
-declare function isNavLink(item: NestedNavItem): item is NavLink;
+declare function isNavLink(item: NavItem): item is NavLink;
 /**
  * Type guard to check if a navigation item is a dropdown.
  */
-declare function isNavDropdown(item: NestedNavItem): item is NavDropdown;
-/**
- * Simple nav link with pre-resolved href for block rendering.
- */
-type SimpleNavLink = {
-    id: string;
-    label: string;
-    href: string;
-    isExternal: boolean;
-};
+declare function isNavDropdown(item: NavItem): item is NavDropdown;
 /**
- * Simple menu view model with pre-resolved hrefs.
- * Use this instead of MenuViewModel for cleaner data flow.
- */
-type SimpleMenuViewModel = {
-    items: SimpleNavLink[];
-    ctaItem: SimpleNavLink | null;
-};
-/**
- * Simple nested nav link with pre-resolved href.
- */
-type SimpleNestedNavLink = {
-    kind: 'link';
-    id: string;
-    label: string;
-    href: string;
-    isExternal: boolean;
-};
-/**
- * Simple nested dropdown with pre-resolved children.
- */
-type SimpleNestedNavDropdown = {
-    kind: 'dropdown';
-    id: string;
-    label: string;
-    children: SimpleNestedNavLink[];
-};
-/**
- * Unified simple nested navigation item.
- */
-type SimpleNestedNavItem = SimpleNestedNavLink | SimpleNestedNavDropdown;
-/**
- * Simple menu view model with nested navigation support.
+ * Navigation menu with items and optional CTA.
+ * Built from CMS navigation data with pre-resolved hrefs.
+ *
+ * @example
+ * ```ts
+ * const menu = buildMenu(siteData.navigation, siteData.routes);
+ * menu.items.forEach(item => {
+ *   if (item.kind === 'link') {
+ *     console.log(item.href);
+ *   } else {
+ *     console.log(item.children);
+ *   }
+ * });
+ * ```
  */
-type SimpleNestedMenuViewModel = {
-    items: SimpleNestedNavItem[];
-    ctaItem: SimpleNestedNavLink | null;
+type Menu = {
+    items: NavItem[];
+    ctaItem: NavLink | null;
 };
 /**
- * Simple logo data for block rendering.
+ * Logo data for site rendering.
+ *
+ * @example
+ * ```ts
+ * const logo = buildLogo(siteData.layout.logo, siteData.site.title);
+ * if (logo) {
+ *   <img src={logo.src} alt={logo.alt} />
+ * }
+ * ```
  */
-type SimpleLogo = {
+type Logo = {
     type: 'image';
     src: string;
     alt: string;
     width?: number;
     height?: number;
 } | null;
+/** @deprecated Use `NavLink` instead */
+type SimpleNavLink = NavLink;
+/** @deprecated Use `NavDropdown` instead */
+type SimpleNavDropdown = NavDropdown;
+/** @deprecated Use `NavItem` instead */
+type SimpleNavItem = NavItem;
+/** @deprecated Use `Menu` instead */
+type SimpleMenuViewModel = Menu;
+/** @deprecated Use `Logo` instead */
+type SimpleLogo = Logo;
 /**
  * Get the primary navigation menu object.
  * Returns menu marked as isPrimary, or first menu if none marked.
@@ -248,7 +230,7 @@ type SimpleLogo = {
  * @example
  * ```ts
  * const menu = getPrimaryNavigation(siteData.navigation);
- * console.log(menu?.title); // "Main Navigation"
+ * console.log(menu?.name); // "main"
  * ```
  */
 declare function getPrimaryNavigation(navigation: NavigationMenuWithItems[]): NavigationMenuWithItems | null;
@@ -263,19 +245,22 @@ declare function getPrimaryNavigation(navigation: NavigationMenuWithItems[]): Na
 declare function getNavigationBySlug(navigation: NavigationMenuWithItems[], slug: string): NavigationMenuWithItems | null;
 /**
  * Get nav items from the primary menu (marked isPrimary, or first menu).
- * Returns empty array if no navigation configured.
+ * Returns nested structure supporting both links and dropdowns.
  *
  * @example
  * ```ts
  * const headerNav = getPrimaryNavItems(siteData.navigation);
- * // [{ href: '/', label: 'Home', isExternal: false }, ...]
+ * headerNav.forEach(item => {
+ *   if (item.kind === 'dropdown') {
+ *     console.log(`${item.label} has ${item.children.length} children`);
+ *   }
+ * });
  * ```
  */
 declare function getPrimaryNavItems(navigation: NavigationMenuWithItems[]): NavItem[];
 /**
  * Get nav items from a specific menu by slug.
- * Useful for footer nav, secondary nav, etc.
- * Returns empty array if menu not found.
+ * Returns nested structure supporting both links and dropdowns.
  *
  * @example
  * ```ts
@@ -284,47 +269,19 @@ declare function getPrimaryNavItems(navigation: NavigationMenuWithItems[]): NavI
  */
 declare function getNavItemsBySlug(navigation: NavigationMenuWithItems[], slug: string): NavItem[];
 /**
- * Transform a menu into simple NavItem array.
- */
-declare function transformToNavItems(menu: NavigationMenuWithItems | null): NavItem[];
-/**
- * Transform a menu into nested NestedNavItem array.
- * Builds tree structure from flat items, supporting dropdowns with children.
+ * Transform a menu into NavItem array.
+ * Builds nested structure from flat items, supporting dropdowns with children.
  *
  * @example
  * ```ts
- * const nav = transformToNestedNavItems(menu);
+ * const nav = transformToNavItems(menu);
  * // [
  * //   { kind: 'link', href: '/', label: 'Home', ... },
  * //   { kind: 'dropdown', label: 'Services', children: [...] },
  * // ]
  * ```
  */
-declare function transformToNestedNavItems(menu: NavigationMenuWithItems | null): NestedNavItem[];
-/**
- * Get nested nav items from the primary menu.
- * Supports dropdowns with children for complex navigation structures.
- *
- * @example
- * ```ts
- * const nav = getNestedPrimaryNavItems(siteData.navigation);
- * nav.forEach(item => {
- *   if (item.kind === 'dropdown') {
- *     console.log(`${item.label} has ${item.children.length} children`);
- *   }
- * });
- * ```
- */
-declare function getNestedPrimaryNavItems(navigation: NavigationMenuWithItems[]): NestedNavItem[];
-/**
- * Get nested nav items from a specific menu by slug.
- *
- * @example
- * ```ts
- * const footerNav = getNestedNavItemsBySlug(siteData.navigation, 'footer');
- * ```
- */
-declare function getNestedNavItemsBySlug(navigation: NavigationMenuWithItems[], slug: string): NestedNavItem[];
+declare function transformToNavItems(menu: NavigationMenuWithItems | null): NavItem[];
 /**
  * Build a MenuViewModel from navigation data for block rendering.
  * Extracts CTA item separately and preserves full link data.
@@ -356,26 +313,15 @@ declare function buildMenuViewModel(navigation: NavigationMenuWithItems[]): Menu
  */
 declare function buildLogoViewModel(logo: LogoSource, fallbackTitle: string | null | undefined): LogoViewModel;
 /**
- * Build a SimpleMenuViewModel from navigation data with pre-resolved hrefs.
- * Use this instead of buildMenuViewModel for cleaner data flow.
+ * Build a Menu from navigation data with pre-resolved hrefs.
+ * Supports dropdown containers with nested children.
  *
  * @param navigation - Navigation menus from site data
  * @param routes - Route map for resolving internal links
  *
  * @example
  * ```ts
- * const menu = buildSimpleMenu(siteData.navigation, siteData.routes);
- * // { items: [{ id, label, href: '/', isExternal: false }], cta: null }
- * ```
- */
-declare function buildSimpleMenu(navigation: NavigationMenuWithItems[], routes: RouteMap): SimpleMenuViewModel;
-/**
- * Build a SimpleNestedMenuViewModel with pre-resolved hrefs.
- * Supports dropdown containers with nested children.
- *
- * @example
- * ```ts
- * const menu = buildSimpleNestedMenu(siteData.navigation, siteData.routes);
+ * const menu = buildMenu(siteData.navigation, siteData.routes);
  * menu.items.forEach(item => {
  *   if (item.kind === 'dropdown') {
  *     console.log(item.children);
@@ -383,34 +329,23 @@ declare function buildSimpleMenu(navigation: NavigationMenuWithItems[], routes:
  * });
  * ```
  */
-declare function buildSimpleNestedMenu(navigation: NavigationMenuWithItems[], routes: RouteMap): SimpleNestedMenuViewModel;
+declare function buildMenu(navigation: NavigationMenuWithItems[], routes: RouteMap): Menu;
+/** @deprecated Use `buildMenu` instead */
+declare const buildSimpleMenu: typeof buildMenu;
 /**
- * Build a SimpleLogo from site layout data.
+ * Build a Logo from site layout data.
  *
  * @param logo - Logo data from site layout
  * @param fallbackAlt - Fallback alt text (usually site title)
  *
  * @example
  * ```ts
- * const logo = buildSimpleLogo(siteData.layout.logo, siteData.site.title);
+ * const logo = buildLogo(siteData.layout.logo, siteData.site.title);
  * // { src: 'https://...', alt: 'Site Name', width: 200, height: 50 }
  * ```
  */
-declare function buildSimpleLogo(logo: {
-    url?: string | null;
-    alt?: string | null;
-    width?: number | null;
-    height?: number | null;
-} | null, fallbackAlt: string | null | undefined): SimpleLogo;
-/**
- * @deprecated Use `transformToNavItems` instead.
- * This alias is maintained for backwards compatibility only.
- */
-declare const transformNavItems: typeof transformToNavItems;
-/**
- * @deprecated Use `getPrimaryNavigation` instead.
- * This alias is maintained for backwards compatibility only.
- */
-declare const selectPrimaryMenu: typeof getPrimaryNavigation;
+declare function buildLogo(logo: Partial<LogoSource> | null, fallbackAlt: string | null | undefined): Logo;
+/** @deprecated Use `buildLogo` instead */
+declare const buildSimpleLogo: typeof buildLogo;
 
-export { type CustomLinkValue, type ExternalLinkValue, type InternalLinkValue, type LinkValue, type LogoSource, type LogoViewModel, type MenuCtaViewModel, type MenuLinkViewModel, type MenuViewModel, type NavDropdown, type NavItem, type NavLink, NavigationMenuWithItems, type NestedNavItem, type SimpleLogo, type SimpleMenuViewModel, type SimpleNavLink, type SimpleNestedMenuViewModel, type SimpleNestedNavDropdown, type SimpleNestedNavItem, type SimpleNestedNavLink, buildLogoViewModel, buildMenuViewModel, buildSimpleLogo, buildSimpleMenu, buildSimpleNestedMenu, getNavItemsBySlug, getNavigationBySlug, getNestedNavItemsBySlug, getNestedPrimaryNavItems, getPrimaryNavItems, getPrimaryNavigation, isNavDropdown, isNavLink, selectPrimaryMenu, transformNavItems, transformToNavItems, transformToNestedNavItems };
+export { type CustomLinkValue, type ExternalLinkValue, type InternalLinkValue, type LinkValue, type Logo, type LogoSource, type LogoViewModel, type Menu, type MenuCtaViewModel, type MenuLinkViewModel, type MenuViewModel, type NavDropdown, type NavItem, type NavLink, NavigationMenuWithItems, type SimpleLogo, type SimpleMenuViewModel, type SimpleNavDropdown, type SimpleNavItem, type SimpleNavLink, buildLogo, buildLogoViewModel, buildMenu, buildMenuViewModel, buildSimpleLogo, buildSimpleMenu, getNavItemsBySlug, getNavigationBySlug, getPrimaryNavItems, getPrimaryNavigation, isNavDropdown, isNavLink, transformToNavItems };