create-vexcms 0.0.20 → 0.1.0-alpha.2

package/templates/marketing-site/src/lib/metadata.ts

@@ -1,99 +1,78 @@
 import type { Metadata } from "next"
 
-import { buildSiteMetadata } from "@vexcms/core"
 import { fetchQuery } from "convex/nextjs"
 
 import { api } from "@convex/_generated/api"
 import { anyApi } from "convex/server"
 
+const TITLE_SUFFIX = " | Vex CMS"
+
+/**
+ * Resolves an `upload()` field's stored media id to a public URL via the
+ * Convex file storage adapter. Returns `undefined` when the media document
+ * no longer exists or the deployment is unreachable.
+ */
+async function resolveMediaUrl(mediaId: string): Promise<string | undefined> {
+  try {
+    const result = (await fetchQuery(anyApi.vex.media.getUrl, {
+      adapter: "convex",
+      mediaId,
+    })) as { url?: string; error?: string }
+    return result.url
+  } catch {
+    return undefined
+  }
+}
+
 /**
  * Generate Next.js Metadata for a page.
- * Fetches site settings and optionally a page document,
- * merges with buildSiteMetadata, and returns Next.js Metadata format.
+ *
+ * Fetches site settings and, when a slug is given, the matching page
+ * document, then merges them — page-level `metaTitle`/`metaDescription`/
+ * `ogImage` win over the site's defaults from `siteSettings`.
  *
  * @param props.slug - Optional page slug to fetch per-page SEO overrides
  */
-export async function generatePageMetadata(props: {
-  slug?: string
-}): Promise<Metadata> {
+export async function generatePageMetadata(props: { slug?: string }): Promise<Metadata> {
   try {
-    // Fetch site settings
-    const settings = (await fetchQuery(api.siteSettings.get)) as Record<
-      string,
-      unknown
-    > | null
-
+    const settings = (await fetchQuery(api.siteSettings.get)) as Record<string, unknown> | null
     if (!settings) {
       return { title: "Untitled" }
     }
 
-    // Resolve the ogImage URL from site settings (upload ID → URL)
-    let siteOgImageUrl: string | undefined
-    const ogImageId = settings.ogImage as string | undefined
-    if (ogImageId) {
-      try {
-        const mediaDoc = (await fetchQuery(
-          anyApi.vex.collections.getDocument,
-          {
-            collectionSlug: "media",
-            documentId: ogImageId,
-          }
-        )) as Record<string, unknown> | null
-        siteOgImageUrl = (mediaDoc?.url as string) || undefined
-      } catch {
-        // Media document not found — skip ogImage
-      }
-    }
-
-    // Fetch page data for per-page overrides
-    let pageData: Record<string, unknown> | null = null
+    let pageData: Record<string, unknown> | undefined
     if (props.slug) {
-      pageData = await fetchQuery(api.pages.getBySlug, {
-        slug: props.slug,
-        _vexDrafts: false,
-      })
+      const pages = (await fetchQuery(api.pages.getBySlug, { slug: props.slug })) as
+        | Record<string, unknown>[]
+        | undefined
+      pageData = pages?.[0]
     }
 
-    // Build framework-agnostic metadata
-    const meta = buildSiteMetadata({
-      site: {
-        name: settings.name as string | undefined,
-        metaTitle: settings.metaTitle as string | undefined,
-        metaDescription: settings.metaDescription as string | undefined,
-        description: settings.description as string | undefined,
-        ogImage: siteOgImageUrl,
-        twitterHandle: settings.twitterHandle as string | undefined,
-      },
-      page: pageData
-        ? {
-            title: pageData.title as string | undefined,
-            metaTitle: pageData.metaTitle as string | undefined,
-            metaDescription: pageData.metaDescription as string | undefined,
-            ogImage: pageData.ogImage as string | undefined,
-          }
-        : undefined,
-      titleSuffix: " | Vex CMS",
-    })
+    const pageTitle = (pageData?.metaTitle as string | undefined) ?? (pageData?.title as string | undefined)
+    const siteName = settings.name as string | undefined
+    const title = (pageTitle ?? (settings.metaTitle as string | undefined) ?? siteName ?? "Untitled") + TITLE_SUFFIX
+    const description =
+      (pageData?.metaDescription as string | undefined) ??
+      (settings.metaDescription as string | undefined) ??
+      (settings.description as string | undefined)
 
-    // Map to Next.js Metadata
-    const metadata: Metadata = {
-      title: meta.title,
-      description: meta.description,
-    }
+    // `upload()` fields always store an array of media ids — the first entry
+    // is the selection. Page-level ogImage wins over the site default.
+    const pageOgImageId = (pageData?.ogImage as string[] | undefined)?.[0]
+    const siteOgImageId = (settings.ogImage as string[] | undefined)?.[0]
+    const ogImageId = pageOgImageId ?? siteOgImageId
+    const ogImageUrl = ogImageId ? await resolveMediaUrl(ogImageId) : undefined
+
+    const twitterHandle = settings.twitterHandle as string | undefined
+
+    const metadata: Metadata = { title, description }
 
-    if (meta.ogImage) {
-      metadata.openGraph = {
-        title: meta.title,
-        description: meta.description,
-        images: [{ url: meta.ogImage }],
-      }
+    if (ogImageUrl) {
+      metadata.openGraph = { title, description, images: [{ url: ogImageUrl }] }
     }
 
-    if (meta.twitterHandle) {
-      metadata.twitter = {
-        card: "summary_large_image",
-        site: meta.twitterHandle,
-      }
+    if (twitterHandle) {
+      metadata.twitter = { card: "summary_large_image", site: twitterHandle }
     }
 
     return metadata

package/templates/marketing-site/src/vex.config.ts

@@ -0,0 +1,35 @@
+import { betterAuthAdapter } from "@vexcms/better-auth"
+import { defineConfig } from "@vexcms/core"
+import { convexFileStorage } from "@vexcms/file-storage-convex"
+
+import { authOptions } from "@convex/auth/options"
+
+import { access } from "~/auth/access"
+import { footers, headers, images, pages, themes, users } from "~/vexcms/collections"
+import { siteSettings } from "~/vexcms/globals"
+
+/**
+ * VexCMS configuration for the marketing site.
+ *
+ * Replaces `templates/base-nextjs`'s bare config wholesale (overlay copy is
+ * file-level, not a merge): carries base's `users`/`images` forward unchanged
+ * and adds the four marketing collections plus `siteSettings`. `vex dev`/
+ * `vex generate` consume this to produce the Convex schema and TypeScript
+ * types.
+ */
+const vexConfig = defineConfig({
+  access,
+  admin: {
+    sidebar: {
+      side: "right",
+    },
+  },
+  authAdapter: betterAuthAdapter({ config: authOptions }),
+  storage: {
+    adapters: [convexFileStorage({ mediaCollections: [images] })],
+  },
+  collections: [users, pages, headers, footers, themes],
+  globals: [siteSettings],
+})
+
+export default vexConfig