bsmnt 0.4.3 → 0.6.0

package/src/templates/next-experiments/package.json

@@ -3,7 +3,10 @@
   "description": "Basement Next.js starter template",
   "version": "0.1.0",
   "private": true,
-  "packageManager": "bun@1.3.5",
+  "packageManager": "bun@1.3.14",
+  "engines": {
+    "node": ">=24"
+  },
   "scripts": {
     "analyze": "cross-env ANALYZE=true bun run build",
     "analyze:experimental": "next experimental-analyze",
@@ -12,9 +15,12 @@
     "dev:https": "bun ./lib/scripts/dev.ts --https",
     "dev:inspect": "bun ./lib/scripts/dev.ts --inspect",
     "format": "biome format --write .",
+    "knip": "knip",
+    "knip:fix": "knip --fix",
     "lighthouse": "bunx @unlighthouse/cli --site http://localhost:3000",
     "lint": "biome lint --max-diagnostics=200",
     "lint:fix": "biome check --write --unsafe --max-diagnostics=200",
+    "prepare": "lefthook install",
     "start": "next start",
     "typecheck": "tsgo --noEmit",
     "typecheck:compare": "bun run typecheck:tsc && bun run typecheck",
@@ -38,12 +44,14 @@
     "@svgr/webpack": "^8.1.0",
     "@tailwindcss/postcss": "^4",
     "@types/bun": "^1.3.6",
-    "@types/node": "^20.19.30",
+    "@types/node": "^24.13.1",
     "@types/react": "^19.2.9",
     "@types/react-dom": "^19.2.3",
     "@typescript/native-preview": "^7.0.0-dev.20260122.3",
     "babel-plugin-react-compiler": "^1.0.0",
     "cross-env": "^10.1.0",
+    "knip": "^6.16.1",
+    "lefthook": "^1.13.0",
     "postcss-preset-env": "^10.6.1",
     "schema-dts": "^2.0.0",
     "tailwindcss": "^4",

package/src/templates/next-pagebuilder/.env.example

@@ -1,5 +1,23 @@
+# ============================================
+# Basement Next Starter - Environment Variables
+# ============================================
+# This project uses dotenvx (https://dotenvx.com): the committed `.env` holds
+# shared values, with secrets encrypted there. The private keys live in
+# `.env.keys` (gitignored) — restore them with `bun run env:setup`.
+#
+# Add or change a variable in `.env` (not .env.local):
+#   - Secret (API key, token, …):  bun run env:set KEY value   (--preview / --prod)
+#   - Trivial / NEXT_PUBLIC_*:      bun run env:set KEY value --plain
+#   - Bulk-encrypt a file edited by hand:  bun run env:encrypt-all  (--preview / --prod)
+#
+# Edge runtime (middleware, `runtime = "edge"`): dotenvx can't decrypt there.
+# Set any secret those read directly in Vercel's env vars, not here.
+#
+# This file just documents the available variables; real values live in `.env`.
+# ============================================
+
 # Base URL
-NEXT_PUBLIC_BASE_URL=http://localhost:3000
+NEXT_PUBLIC_BASE_URL=
 
 # Draft Mode
 DRAFT_MODE_TOKEN=

package/src/templates/next-pagebuilder/.github/workflows/ci.yml

@@ -0,0 +1,90 @@
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # Node version is read from .nvmrc — the single source of truth.
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+
+      # Bun version is read from package.json's "packageManager" field — the
+      # single source of truth. Do NOT pin a version here, or the two can drift.
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      # Cache Bun's global install cache so dependencies aren't re-downloaded
+      # on every run. Keyed on the lockfile so it busts when deps change.
+      - name: Cache Bun dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.bun/install/cache
+          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-bun-
+
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Type check
+        run: bun run typecheck:compare
+
+      - name: Lint
+        run: bun run lint
+
+      # dotenvx needs the private key to decrypt secrets at build time. It's
+      # pulled from 1Password via an org-wide service-account token + the op-ref
+      # committed in .env. Optional: builds pass without it (only plaintext /
+      # NEXT_PUBLIC_* is read), and a per-repo DOTENV_PRIVATE_KEY secret still
+      # works as a fallback.
+      - name: Install 1Password CLI
+        if: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN != '' }}
+        uses: 1password/install-cli-action@v1
+
+      - name: Build
+        env:
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
+          DOTENV_PRIVATE_KEY: ${{ secrets.DOTENV_PRIVATE_KEY }}
+          # Sanity project ID and dataset are public (they ship in the client
+          # bundle), so they are stored as repository variables. The Sanity read
+          # token is secret — add it under Settings → Secrets and variables →
+          # Actions. All three are empty (and harmless) until Sanity is set up.
+          NEXT_PUBLIC_SANITY_PROJECT_ID: ${{ vars.NEXT_PUBLIC_SANITY_PROJECT_ID }}
+          NEXT_PUBLIC_SANITY_DATASET: ${{ vars.NEXT_PUBLIC_SANITY_DATASET }}
+          SANITY_API_READ_TOKEN: ${{ secrets.SANITY_API_READ_TOKEN }}
+        run: |
+          if [ -n "$OP_SERVICE_ACCOUNT_TOKEN" ]; then
+            ref="$(grep -m1 '^DOTENV_PRIVATE_KEY_OP_REF=' .env | cut -d= -f2-)"
+            if [ -n "$ref" ]; then
+              DOTENV_PRIVATE_KEY="$(op read "$ref")"
+              echo "::add-mask::$DOTENV_PRIVATE_KEY"
+              export DOTENV_PRIVATE_KEY
+            fi
+          fi
+          bun run build
+
+      # Runs your tests if any exist; a fresh project with none passes cleanly.
+      - name: Test
+        run: |
+          if git ls-files '*.test.*' '*.spec.*' '*_test.*' '*_spec.*' | grep -q .; then
+            bun test
+          else
+            echo "No test files found — skipping bun test."
+          fi
+
+      - name: Knip
+        run: bun run knip

package/src/templates/next-pagebuilder/.vscode/extensions.json

@@ -10,6 +10,9 @@
     // Sanity CMS (GROQ syntax + validation)
     "sanity-io.vscode-sanity",
 
+    // Env (dotenvx — view decrypted .env values inline)
+    "dotenv.dotenvx-vscode",
+
     // DX Enhancements
     "yoavbls.pretty-ts-errors"
   ]

package/src/templates/next-pagebuilder/README.md

@@ -21,3 +21,68 @@ bun dev
 - `bun build` - Production build
 - `bun lint` - Run linter
 - `bun sanity:typegen` - Generate Sanity types
+- `bun env:set KEY value` - Encrypt one value into `.env` (`--plain`, `--preview`/`--prod`)
+- `bun env:encrypt-all` - Bulk-encrypt every plaintext value in a file (`--preview`/`--prod`)
+- `bun env:setup` - Restore `.env.keys` from 1Password
+- `bun env:view` - Print the decrypted `.env` (`--preview` / `--prod`)
+- `bun env:setup-remote` - Push private keys to GitHub / Vercel (`github`/`vercel`, or pick)
+- `bun env:save` - Save the private key to 1Password (Development vault)
+
+## Environment variables
+
+Secrets are encrypted at rest with [dotenvx](https://dotenvx.com): the committed `.env` holds encrypted values, the private keys live in `.env.keys` (gitignored), and dev/build run through `dotenvx run` so values decrypt automatically.
+
+**First run.** `bun install` restores `.env.keys` from 1Password (via `DOTENV_PRIVATE_KEY_OP_REF` in `.env`), or run `bun run env:setup`. Needs 1Password access + the `op` CLI:
+
+- macOS: `brew install --cask 1password-cli`
+- Windows: `winget install 1password-cli`
+- Linux / other: [1Password CLI docs](https://developer.1password.com/docs/cli/get-started/)
+
+**Add or change a variable** (in `.env`):
+
+- Secret: `bun run env:set KEY value` (`--preview`/`--prod` to target an environment)
+- Public / `NEXT_PUBLIC_*`: `bun run env:set KEY value --plain`
+- Bulk-encrypt a hand-edited file: `bun run env:encrypt-all`
+- Inspect: `bun run env:view` (`--preview`/`--prod`)
+
+**Per environment.** Scripts load `.env.$VERCEL_ENV` over `.env`. After adding a per-env file, push its key with `bun run env:setup-remote vercel` — `instrumentation.ts` uses it to decrypt at runtime.
+
+**Edge runtime.** dotenvx decrypts only in the Node runtime; secrets read in `middleware.ts` or a `runtime = "edge"` route must be set as plain Vercel env vars.
+
+A gitleaks pre-commit hook + CI scan block committed plaintext secrets (install: `brew install gitleaks`).
+
+## Continuous Integration
+
+A GitHub Actions workflow (`.github/workflows/ci.yml`) runs on every pull request to `main` and on pushes to `main`. It runs type checking, linting, the production build, tests, and `knip`.
+
+The workflow takes its runtime versions from your manifests, so there's a single source of truth and nothing to keep in sync by hand:
+
+- **Node** comes from `.nvmrc`.
+- **Bun** comes from the `packageManager` field in `package.json`.
+
+It also caches Bun's install cache between runs, and the test step is a no-op until you add real test files.
+
+The build decrypts the committed `.env` with the dotenvx private key, pulled from 1Password: set an **org-level** `OP_SERVICE_ACCOUNT_TOKEN` (a read-only [service account](https://developer.1password.com/docs/service-accounts/) scoped to the `Development` vault) — one secret for every repo — and CI reads the key via the op-ref committed in `.env`. A per-repo `DOTENV_PRIVATE_KEY` secret (`bun run env:setup-remote github`) works as a fallback; builds pass without either (only plaintext / `NEXT_PUBLIC_*` is read).
+
+### Sanity environment
+
+The build reads Sanity config from GitHub Actions variables/secrets (empty and harmless until you configure Sanity). Once your repo is on GitHub, the quickest way to set them is:
+
+```bash
+bun run ci:secrets
+```
+
+This reads the values from `.env.local` and pushes them to this repo with the GitHub CLI — `NEXT_PUBLIC_SANITY_PROJECT_ID` / `NEXT_PUBLIC_SANITY_DATASET` as **Variables** (they are public) and `SANITY_API_READ_TOKEN` as a **Secret**. Requires the [GitHub CLI](https://cli.github.com), authenticated (`gh auth login`).
+
+To set them by hand instead, go to **Settings → Secrets and variables → Actions** and add the two `NEXT_PUBLIC_*` values under **Variables** and the token under **Secrets**.
+
+### Branch protection
+
+To block merges when CI fails, enable branch protection on `main`:
+
+1. Go to **Settings → Branches → Add branch ruleset** (or **Add rule**).
+2. Target the `main` branch.
+3. Enable **Require status checks to pass before merging** and select the **CI** check.
+4. (Recommended) Enable **Require a pull request before merging**.
+
+Pull requests then cannot be merged until the CI workflow passes.

package/src/templates/next-pagebuilder/app/(content)/[[...slug]]/page.tsx

@@ -10,6 +10,7 @@ import type {
   ALL_PAGE_SLUGS_QUERY_RESULT,
   PAGE_QUERY_RESULT,
 } from "@/lib/integrations/sanity/sanity.types"
+import { checkRedirect } from "@/lib/utils/check-redirect"
 import { generateSanityMetadata } from "@/lib/utils/metadata"
 import { getSlugTag } from "@/lib/utils/slug-tag"
 
@@ -71,7 +72,11 @@ export default async function CatchAllPage({
   const path = toPath(slug)
   const page = await getResolvedPage(path)
 
-  if (!page) notFound()
+  if (!page) {
+    // Fall back to a CMS redirect before 404ing.
+    await checkRedirect(path)
+    notFound()
+  }
 
   return <PageDocument page={page} path={path} searchParams={searchParams} />
 }

package/src/templates/next-pagebuilder/app/(content)/layout.tsx

@@ -1,21 +1,12 @@
 import { JsonLd } from "@/components/layout/json-ld"
 import { Wrapper } from "@/components/layout/wrapper"
 import { SanityVisualEditing } from "@/components/sanity/visual-editing"
-import { getSiteLayoutData } from "@/lib/integrations/sanity/fetchers/layout"
-
-const Layout = async ({ children }: { children: React.ReactNode }) => {
-  const layoutData = await getSiteLayoutData()
 
+const Layout = ({ children }: { children: React.ReactNode }) => {
   return (
     <>
-      <JsonLd navbar={layoutData.navbar} companyData={layoutData.companyData} />
-      <Wrapper
-        navbar={layoutData.navbar}
-        footer={layoutData.footer}
-        companyData={layoutData.companyData}
-      >
-        {children}
-      </Wrapper>
+      <JsonLd />
+      <Wrapper>{children}</Wrapper>
       <SanityVisualEditing />
     </>
   )

package/src/templates/next-pagebuilder/components/layout/footer/index.tsx

@@ -1,21 +1,22 @@
 import { Link } from "@/components/ui/link"
 import { SanityImage } from "@/components/ui/sanity-image"
-import type {
-  CompanyData,
-  FooterData,
+import {
+  type CompanyData,
+  type FooterData,
+  getCompanyData,
+  getFooterData,
 } from "@/lib/integrations/sanity/fetchers/layout"
 
 type FooterLinkGroup = NonNullable<FooterData["links"]>[number]
 type FooterLinkItem = NonNullable<FooterLinkGroup["items"]>[number]
 type SocialLink = NonNullable<CompanyData["socialLinks"]>[number]
 
-export const Footer = ({
-  footer,
-  companyData,
-}: {
-  footer: FooterData | null
-  companyData: CompanyData | null
-}) => {
+export const Footer = async () => {
+  const [footer, companyData] = await Promise.all([
+    getFooterData(),
+    getCompanyData(),
+  ])
+
   const links = footer?.links ?? []
 
   return (

package/src/templates/next-pagebuilder/components/layout/header/index.tsx

@@ -1,6 +1,8 @@
-import type { NavbarData } from "@/lib/integrations/sanity/fetchers/layout"
+import { getNavbarData } from "@/lib/integrations/sanity/fetchers/layout"
 import { HeaderClient } from "./header-client"
 
-export const Header = ({ data }: { data: NavbarData | null }) => {
-  return <HeaderClient data={data} />
+export const Header = async () => {
+  const navbar = await getNavbarData()
+
+  return <HeaderClient data={navbar} />
 }

package/src/templates/next-pagebuilder/components/layout/json-ld/index.tsx

@@ -1,7 +1,7 @@
 import { stegaClean } from "next-sanity"
-import type {
-  CompanyData,
-  NavbarData,
+import {
+  getNavbarData,
+  getStructuredData,
 } from "@/lib/integrations/sanity/fetchers/layout"
 import {
   generateOrganizationJsonLd,
@@ -9,36 +9,48 @@ import {
   JsonLd as JsonLdBase,
 } from "@/lib/utils/json-ld"
 
-const APP_DESCRIPTION =
-  "Basement is the AI-native platform for audit and advisory firms. Automate engagement workflows using AI agents trusted by 50% of top 100 firms."
+const nonEmpty = (value: unknown): string | undefined =>
+  typeof value === "string" && value.trim() !== "" ? value : undefined
+
+export const JsonLd = async () => {
+  const [structuredData, navbar] = await Promise.all([
+    getStructuredData(),
+    getNavbarData(),
+  ])
+
+  // Deep-clean stega artifacts before any value reaches the emitted markup.
+  const data = stegaClean(structuredData)
+
+  const name = nonEmpty(data?.name)
+
+  // Without an organization name there's nothing meaningful to emit. Editors
+  // fill in Layout -> Structured Data to enable site-wide JSON-LD.
+  if (!name) return null
 
-export const JsonLd = ({
-  navbar,
-  companyData,
-}: {
-  navbar: NavbarData | null
-  companyData: CompanyData | null
-}) => {
-  const sameAs = companyData?.socialLinks
-    ?.map((link) => stegaClean(link.url))
-    .filter((url): url is string => Boolean(url))
+  const description = nonEmpty(data?.description)
+  const url = nonEmpty(data?.url)
 
-  const logoUrl = navbar?.logo?.asset?.url
+  // Prefer the structured-data logo, fall back to the navbar logo.
+  const logo = nonEmpty(data?.logo) ?? nonEmpty(navbar?.logo?.asset?.url)
+
+  // Merged and deduped in GROQ (flagged Company Data links + manual profiles).
+  const sameAs = (data?.sameAs ?? [])
+    .map(nonEmpty)
+    .filter((value): value is string => Boolean(value))
 
   return (
     <>
-      <JsonLdBase
-        data={generateWebSiteJsonLd({
-          name: "Basement",
-          description: APP_DESCRIPTION,
-        })}
-      />
+      <JsonLdBase data={generateWebSiteJsonLd({ name, url, description })} />
       <JsonLdBase
         data={generateOrganizationJsonLd({
-          name: "Basement",
-          ...(logoUrl ? { logo: logoUrl } : {}),
-          description: APP_DESCRIPTION,
-          ...(sameAs?.length ? { sameAs } : {}),
+          name,
+          url,
+          logo,
+          description,
+          legalName: nonEmpty(data?.legalName),
+          sameAs: sameAs.length ? sameAs : undefined,
+          contactPoint: data?.contactPoint,
+          address: data?.address,
         })}
       />
     </>

package/src/templates/next-pagebuilder/components/layout/wrapper/index.tsx

@@ -1,13 +1,8 @@
 import Link from "next/link"
 import { Footer } from "@/components/layout/footer"
 import { Header } from "@/components/layout/header"
-import type { SiteLayoutData } from "@/lib/integrations/sanity/fetchers/layout"
 import { cn } from "@/lib/styles/cn"
 
-interface WrapperProps
-  extends React.HTMLAttributes<HTMLDivElement>,
-    SiteLayoutData {}
-
 const SkipToMainContent = () => (
   <Link
     href="#main-content"
@@ -20,14 +15,11 @@ const SkipToMainContent = () => (
 export const Wrapper = ({
   children,
   className,
-  navbar,
-  footer,
-  companyData,
   ...props
-}: WrapperProps) => (
+}: React.HTMLAttributes<HTMLDivElement>) => (
   <>
     <SkipToMainContent />
-    <Header data={navbar} />
+    <Header />
     <main
       id="main-content"
       className={cn("relative flex grow flex-col", className)}
@@ -35,6 +27,6 @@ export const Wrapper = ({
     >
       {children}
     </main>
-    <Footer footer={footer} companyData={companyData} />
+    <Footer />
   </>
 )

package/src/templates/next-pagebuilder/components/page-builder/components/content-collection/index.tsx

@@ -190,7 +190,7 @@ export async function ContentCollection({
     params: {
       category: canonicalCategory,
       offset: fetchOffset,
-      limit: fetchLimit,
+      end: fetchOffset + fetchLimit,
     },
     tags: ["blog-articles"],
   })

package/src/templates/next-pagebuilder/components/page-document/index.tsx

@@ -3,8 +3,10 @@ import type { ContentCollectionSearchParams } from "@/components/page-builder/co
 import { Renderer } from "@/components/page-builder/renderer"
 import type { PAGE_QUERY_RESULT } from "@/lib/integrations/sanity/sanity.types"
 import { urlForImage } from "@/lib/integrations/sanity/utils/image"
+import { buildPageJsonLd } from "@/lib/integrations/sanity/utils/page-json-ld"
 import {
   generateBreadcrumbJsonLd,
+  generateSanityArticleJsonLd,
   generateSanityWebPageJsonLd,
   JsonLd,
 } from "@/lib/utils/json-ld"
@@ -15,6 +17,11 @@ type PageDocumentProps = {
   searchParams: ContentCollectionSearchParams
 }
 
+type PageBuilderBlock = NonNullable<
+  NonNullable<PAGE_QUERY_RESULT>["pageBuilder"]
+>[number]
+type BlogContentBlock = Extract<PageBuilderBlock, { _type: "blogContent" }>
+
 export const getPageSections = (
   page: NonNullable<PAGE_QUERY_RESULT>,
   searchParams: ContentCollectionSearchParams
@@ -79,6 +86,33 @@ export const PageDocument = ({
   const breadcrumbs = buildBreadcrumbs(path, cleanTitle)
   const hasBreadcrumbs = breadcrumbs.length > 1
 
+  // Editor-selected page-level structured data (FAQ, Event, custom, etc.).
+  const pageJsonLd = buildPageJsonLd(page.metadata?.jsonLd)
+
+  // Blog posts (pages with a Blog Content block) emit Article JSON-LD with
+  // fields derived from the post — no Custom block needed. Skipped when the
+  // editor already supplied an Article (via a Custom block) to avoid duplicates.
+  const blogBlock = page.pageBuilder?.find(
+    (block): block is BlogContentBlock => block?._type === "blogContent"
+  )
+  const hasManualArticle = pageJsonLd.some(
+    ({ data }) => (data as { "@type"?: unknown })["@type"] === "Article"
+  )
+  const articleJsonLd =
+    blogBlock && !hasManualArticle
+      ? generateSanityArticleJsonLd({
+          title: cleanTitle,
+          url: pageUrl,
+          description: cleanDescription || undefined,
+          image: blogBlock.thumbnail
+            ? urlForImage(blogBlock.thumbnail).width(1200).height(630).url()
+            : undefined,
+          datePublished: stegaClean(blogBlock.date) || undefined,
+          dateModified: page._updatedAt,
+          authorName: stegaClean(blogBlock.author?.name) || undefined,
+        })
+      : null
+
   return (
     <>
       <JsonLd
@@ -90,9 +124,13 @@ export const PageDocument = ({
           dateModified: page._updatedAt,
         })}
       />
+      {articleJsonLd ? <JsonLd data={articleJsonLd} /> : null}
       {hasBreadcrumbs ? (
         <JsonLd data={generateBreadcrumbJsonLd(breadcrumbs)} />
       ) : null}
+      {pageJsonLd.map(({ key, data }) => (
+        <JsonLd key={key} data={data} />
+      ))}
       <article className="mx-auto flex w-full max-w-6xl flex-1 flex-col gap-14 px-4 py-14 md:px-6 md:py-20">
         <h1>{title}</h1>
         {sections.length ? (

package/src/templates/next-pagebuilder/knip.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "https://unpkg.com/knip@6/schema.json",
+  "entry": [
+    "lib/integrations/sanity/**/*.{ts,tsx}",
+    "lib/scripts/**/*.{ts,tsx}",
+    "lib/utils/**/*.{ts,tsx}",
+    "components/**/*.{ts,tsx}",
+    "app/actions/**/*.{ts,tsx}"
+  ],
+  "ignoreDependencies": [
+    "zod",
+    "react-use",
+    "@portabletext/types",
+    "@portabletext/react",
+    "@portabletext/markdown",
+    "@sanity/vision",
+    "@sanity/visual-editing",
+    "@sanity/ui",
+    "@svgr/webpack",
+    "postcss-functions",
+    "clsx",
+    "rxjs"
+  ],
+  "ignoreBinaries": [
+    "gh"
+  ]
+}

package/src/templates/next-pagebuilder/lefthook.yml

@@ -14,6 +14,11 @@ pre-commit:
       run: bunx tsgo --noEmit --incremental false
       stage_fixed: false
 
+pre-push:
+  commands:
+    knip:
+      run: bun run knip
+
 post-merge:
   commands:
     install-deps:

package/src/templates/next-pagebuilder/lib/integrations/sanity/sanity.types.ts

@@ -9,11 +9,18 @@ type SanityImageField = {
 
 type SanitySlug = { current?: string | null } | null
 
+type JsonLdBlock = {
+  _type: string
+  _key: string
+  [key: string]: unknown
+}
+
 type SanityPageMetadata = {
   metaTitle?: string | null
   metaDescription?: string | null
   og?: { image?: SanityImageField | null } | null
   index?: boolean | null
+  jsonLd?: JsonLdBlock[] | null
   title?: string | null
   description?: string | null
   image?: SanityImageField | null
@@ -89,6 +96,7 @@ type SocialLink = {
   icon?: unknown
   url?: string | null
   label?: string | null
+  includeInStructuredData?: boolean | null
 }
 
 type BlogCategory = {
@@ -194,13 +202,39 @@ export type PAGE_QUERY_RESULT = PageDocument | null
 export type PAGE_SITEMAP_QUERY_RESULT = PageSitemap[]
 export type ALL_BLOG_ARTICLES_QUERY_RESULT = BlogArticle[]
 export type P_REF_PB_COMP_QUERY_RESULT = PageRef[]
-export type COMPANY_DATA_QUERY_RESULT = { socialLinks?: SocialLink[] | null } | null
+export type COMPANY_DATA_QUERY_RESULT = {
+  socialLinks?: SocialLink[] | null
+} | null
+export type STRUCTURED_DATA_QUERY_RESULT = {
+  name?: string | null
+  legalName?: string | null
+  description?: string | null
+  url?: string | null
+  logo?: string | null
+  contactPoint?: {
+    email?: string | null
+    telephone?: string | null
+    contactType?: string | null
+  } | null
+  address?: {
+    streetAddress?: string | null
+    locality?: string | null
+    region?: string | null
+    postalCode?: string | null
+    country?: string | null
+  } | null
+  sameAs?: string[] | null
+} | null
 export type FOOTER_QUERY_RESULT = { links?: FooterLinkGroup[] | null } | null
 export type NAVBAR_QUERY_RESULT = {
   logo?: {
     url?: string | null
     metadata?: { dimensions?: unknown } | null
-    asset?: { _id: string; url: string; metadata?: { dimensions?: unknown } | null } | null
+    asset?: {
+      _id: string
+      url: string
+      metadata?: { dimensions?: unknown } | null
+    } | null
     [key: string]: unknown
   } | null
   navigationItems?: NavItem[] | null