create-nextblock 0.16.4 → 0.17.1

package/templates/nextblock-template/app/lib/site-settings.ts

@@ -1,105 +1,105 @@
-import 'server-only';
-import { unstable_cache } from 'next/cache';
-import { createClient as createSupabaseJsClient } from '@supabase/supabase-js';
-import type { Database } from '@nextblock-cms/db';
-import {
-  resolveSupabaseAnonKey,
-  resolveSupabaseServiceKey,
-  resolveSupabaseUrl,
-} from '../../lib/setup/env-status';
-import {
-  DEFAULT_SITE_TITLE,
-  DEFAULT_SITE_DESCRIPTION,
-  DEFAULT_SITE_KEYWORDS,
-} from './seo';
-
-export const SITE_SETTINGS_CACHE_TAG = 'public-site-settings';
-const SITE_SETTINGS_REVALIDATE_SECONDS = 60;
-
-export interface SiteSettings {
-  siteTitle: string;
-  siteDescription: string;
-  siteKeywords: string;
-}
-
-/**
- * Service-role (or anon) Supabase client used for cached, request-agnostic
- * reads of public layout/SEO data. Shared by the root layout and the public
- * route `generateMetadata` functions.
- */
-export function createStaticSupabaseClient() {
-  // Fall back to a dummy host when unconfigured (fresh clone, pre-/setup) so the
-  // root layout can still render rather than crashing the whole app on boot. Callers
-  // (getSiteSettings + the getCached* helpers) already swallow failures and use
-  // fallbacks, and loadLayoutData short-circuits before reaching here when there is
-  // no Supabase env at all.
-  const supabaseUrl = resolveSupabaseUrl() || 'https://dummy.supabase.co';
-  const supabaseKey =
-    resolveSupabaseServiceKey() || resolveSupabaseAnonKey() || 'dummy-anon-key';
-
-  return createSupabaseJsClient<Database>(supabaseUrl, supabaseKey, {
-    auth: {
-      persistSession: false,
-      autoRefreshToken: false,
-      detectSessionInUrl: false,
-    },
-  });
-}
-
-/**
- * Cached read of the site-wide SEO identity (title / description / keywords)
- * from the `site_settings` key-value store. This is the single source of truth
- * used for both `<title>`/OpenGraph metadata and the header brand.
- */
-export const getSiteSettings = unstable_cache(
-  async (): Promise<SiteSettings> => {
-    const fallback: SiteSettings = {
-      siteTitle: DEFAULT_SITE_TITLE,
-      siteDescription: DEFAULT_SITE_DESCRIPTION,
-      siteKeywords: DEFAULT_SITE_KEYWORDS,
-    };
-
-    // Unconfigured instance (pre-/setup): the static client would point at the dummy
-    // host, so the fetch fails with a noisy DNS error before falling back. Skip it and
-    // return SEO defaults directly. (generateMetadata calls this even on /setup.)
-    if (!process.env.NEXT_PUBLIC_SUPABASE_URL) {
-      return fallback;
-    }
-
-    try {
-      const supabase = createStaticSupabaseClient();
-      const { data, error } = await supabase
-        .from('site_settings')
-        .select('key, value')
-        .in('key', ['site_title', 'site_description', 'site_keywords']);
-
-      if (error || !data) {
-        // PGRST205 = table not found: the schema isn't migrated yet (e.g. mid-setup,
-        // right after the connection is saved but before `npm run db:migrate`). That's an
-        // expected transient state — don't shout about it. Real errors still log.
-        if (error && error.code !== 'PGRST205') {
-          console.error('Error fetching cached site settings:', error);
-        }
-        return fallback;
-      }
-
-      const settings: Record<string, string> = {};
-      data.forEach((item) => {
-        if (typeof item.value === 'string') {
-          settings[item.key] = item.value;
-        }
-      });
-
-      return {
-        siteTitle: settings.site_title?.trim() || fallback.siteTitle,
-        siteDescription: settings.site_description?.trim() || fallback.siteDescription,
-        siteKeywords: settings.site_keywords?.trim() || fallback.siteKeywords,
-      };
-    } catch (caught) {
-      console.error('Unexpected error fetching site settings:', caught);
-      return fallback;
-    }
-  },
-  ['public-site-settings'],
-  { revalidate: SITE_SETTINGS_REVALIDATE_SECONDS, tags: [SITE_SETTINGS_CACHE_TAG] }
-);
+import 'server-only';
+import { unstable_cache } from 'next/cache';
+import { createClient as createSupabaseJsClient } from '@supabase/supabase-js';
+import type { Database } from '@nextblock-cms/db';
+import {
+  resolveSupabaseAnonKey,
+  resolveSupabaseServiceKey,
+  resolveSupabaseUrl,
+} from '../../lib/setup/env-status';
+import {
+  DEFAULT_SITE_TITLE,
+  DEFAULT_SITE_DESCRIPTION,
+  DEFAULT_SITE_KEYWORDS,
+} from './seo';
+
+export const SITE_SETTINGS_CACHE_TAG = 'public-site-settings';
+const SITE_SETTINGS_REVALIDATE_SECONDS = 60;
+
+export interface SiteSettings {
+  siteTitle: string;
+  siteDescription: string;
+  siteKeywords: string;
+}
+
+/**
+ * Service-role (or anon) Supabase client used for cached, request-agnostic
+ * reads of public layout/SEO data. Shared by the root layout and the public
+ * route `generateMetadata` functions.
+ */
+export function createStaticSupabaseClient() {
+  // Fall back to a dummy host when unconfigured (fresh clone, pre-/setup) so the
+  // root layout can still render rather than crashing the whole app on boot. Callers
+  // (getSiteSettings + the getCached* helpers) already swallow failures and use
+  // fallbacks, and loadLayoutData short-circuits before reaching here when there is
+  // no Supabase env at all.
+  const supabaseUrl = resolveSupabaseUrl() || 'https://dummy.supabase.co';
+  const supabaseKey =
+    resolveSupabaseServiceKey() || resolveSupabaseAnonKey() || 'dummy-anon-key';
+
+  return createSupabaseJsClient<Database>(supabaseUrl, supabaseKey, {
+    auth: {
+      persistSession: false,
+      autoRefreshToken: false,
+      detectSessionInUrl: false,
+    },
+  });
+}
+
+/**
+ * Cached read of the site-wide SEO identity (title / description / keywords)
+ * from the `site_settings` key-value store. This is the single source of truth
+ * used for both `<title>`/OpenGraph metadata and the header brand.
+ */
+export const getSiteSettings = unstable_cache(
+  async (): Promise<SiteSettings> => {
+    const fallback: SiteSettings = {
+      siteTitle: DEFAULT_SITE_TITLE,
+      siteDescription: DEFAULT_SITE_DESCRIPTION,
+      siteKeywords: DEFAULT_SITE_KEYWORDS,
+    };
+
+    // Unconfigured instance (pre-/setup): the static client would point at the dummy
+    // host, so the fetch fails with a noisy DNS error before falling back. Skip it and
+    // return SEO defaults directly. (generateMetadata calls this even on /setup.)
+    if (!process.env.NEXT_PUBLIC_SUPABASE_URL) {
+      return fallback;
+    }
+
+    try {
+      const supabase = createStaticSupabaseClient();
+      const { data, error } = await supabase
+        .from('site_settings')
+        .select('key, value')
+        .in('key', ['site_title', 'site_description', 'site_keywords']);
+
+      if (error || !data) {
+        // PGRST205 = table not found: the schema isn't migrated yet (e.g. mid-setup,
+        // right after the connection is saved but before `npm run db:migrate`). That's an
+        // expected transient state — don't shout about it. Real errors still log.
+        if (error && error.code !== 'PGRST205') {
+          console.error('Error fetching cached site settings:', error);
+        }
+        return fallback;
+      }
+
+      const settings: Record<string, string> = {};
+      data.forEach((item) => {
+        if (typeof item.value === 'string') {
+          settings[item.key] = item.value;
+        }
+      });
+
+      return {
+        siteTitle: settings.site_title?.trim() || fallback.siteTitle,
+        siteDescription: settings.site_description?.trim() || fallback.siteDescription,
+        siteKeywords: settings.site_keywords?.trim() || fallback.siteKeywords,
+      };
+    } catch (caught) {
+      console.error('Unexpected error fetching site settings:', caught);
+      return fallback;
+    }
+  },
+  ['public-site-settings'],
+  { revalidate: SITE_SETTINGS_REVALIDATE_SECONDS, tags: [SITE_SETTINGS_CACHE_TAG] }
+);

package/templates/nextblock-template/app/lib/ucp/protocol.ts

@@ -1,190 +1,190 @@
-export const UCP_VERSION = '2026-04-08';
-export const UCP_REST_BASE_PATH = '/ucp/v1';
-export const UCP_SHOPPING_SERVICE = 'dev.ucp.shopping';
-export const UCP_CAPABILITIES = {
-  catalogSearch: 'dev.ucp.shopping.catalog.search',
-  catalogLookup: 'dev.ucp.shopping.catalog.lookup',
-  cart: 'dev.ucp.shopping.cart',
-  checkout: 'dev.ucp.shopping.checkout',
-} as const;
-
-const UCP_SPEC_ROOT = `https://ucp.dev/${UCP_VERSION}`;
-const DEFAULT_PAGE_LIMIT = 10;
-const MAX_PAGE_LIMIT = 50;
-
-type JsonRecord = Record<string, unknown>;
-type UcpCapabilityName = (typeof UCP_CAPABILITIES)[keyof typeof UCP_CAPABILITIES];
-
-function asRecord(value: unknown): JsonRecord {
-  return value && typeof value === 'object' && !Array.isArray(value)
-    ? (value as JsonRecord)
-    : {};
-}
-
-function asString(value: unknown) {
-  return typeof value === 'string' && value.trim() ? value.trim() : null;
-}
-
-function toInteger(value: unknown, fallback: number) {
-  const parsed =
-    typeof value === 'string'
-      ? Number.parseInt(value, 10)
-      : typeof value === 'number'
-        ? value
-        : Number.NaN;
-
-  return Number.isFinite(parsed) ? Math.round(parsed) : fallback;
-}
-
-function encodeCursor(offset: number) {
-  return Buffer.from(JSON.stringify({ offset }), 'utf8').toString('base64url');
-}
-
-function decodeCursor(cursor: unknown) {
-  const value = asString(cursor);
-  if (!value) {
-    return null;
-  }
-
-  try {
-    const parsed = JSON.parse(Buffer.from(value, 'base64url').toString('utf8'));
-    const offset = toInteger(asRecord(parsed).offset, -1);
-    return offset >= 0 ? offset : null;
-  } catch {
-    return null;
-  }
-}
-
-export function normalizeUcpPagination(body: unknown) {
-  const record = asRecord(body);
-  const pagination = asRecord(record.pagination);
-  const requestedLimit = toInteger(
-    pagination.limit ?? pagination.page_size ?? record.limit,
-    DEFAULT_PAGE_LIMIT
-  );
-  const limit = Math.min(Math.max(requestedLimit, 1), MAX_PAGE_LIMIT);
-  const cursorOffset = decodeCursor(
-    pagination.cursor ?? pagination.after ?? record.cursor ?? record.page_token
-  );
-  const offset = cursorOffset ?? Math.max(toInteger(pagination.offset ?? record.offset, 0), 0);
-
-  return { limit, offset };
-}
-
-export function buildPaginationResponse(params: {
-  limit: number;
-  offset: number;
-  count: number;
-  totalCount?: number | null;
-}) {
-  const nextOffset = params.offset + params.count;
-  const hasNextPage =
-    typeof params.totalCount === 'number'
-      ? nextOffset < params.totalCount
-      : params.count === params.limit;
-
-  return {
-    cursor: hasNextPage ? encodeCursor(nextOffset) : null,
-    has_next_page: hasNextPage,
-    total_count: params.totalCount ?? undefined,
-    limit: params.limit,
-  };
-}
-
-export function buildUcpMetadata(
-  capabilityNames: UcpCapabilityName[] = [
-    UCP_CAPABILITIES.catalogSearch,
-    UCP_CAPABILITIES.catalogLookup,
-    UCP_CAPABILITIES.cart,
-  ],
-  status: 'success' | 'error' = 'success'
-): JsonRecord {
-  return {
-    version: UCP_VERSION,
-    status,
-    capabilities: capabilityNames.reduce<Record<string, Array<{ version: string }>>>(
-      (accumulator, capabilityName) => {
-        accumulator[capabilityName] = [{ version: UCP_VERSION }];
-        return accumulator;
-      },
-      {}
-    ),
-  };
-}
-
-export function buildUcpProfile(baseUrl: string) {
-  const normalizedBaseUrl = baseUrl.replace(/\/+$/, '');
-  const endpoint = `${normalizedBaseUrl}${UCP_REST_BASE_PATH}`;
-
-  return {
-    ucp: {
-      version: UCP_VERSION,
-      supported_versions: {
-        [UCP_VERSION]: `${normalizedBaseUrl}/.well-known/ucp`,
-      },
-      services: {
-        [UCP_SHOPPING_SERVICE]: [
-          {
-            version: UCP_VERSION,
-            spec: `${UCP_SPEC_ROOT}/specification/overview`,
-            transport: 'rest',
-            schema: `${UCP_SPEC_ROOT}/services/shopping/rest.openapi.json`,
-            endpoint,
-          },
-        ],
-      },
-      capabilities: {
-        [UCP_CAPABILITIES.catalogSearch]: [
-          {
-            version: UCP_VERSION,
-            spec: `${UCP_SPEC_ROOT}/specification/catalog/search`,
-            schema: `${UCP_SPEC_ROOT}/schemas/shopping/catalog_search.json`,
-          },
-        ],
-        [UCP_CAPABILITIES.catalogLookup]: [
-          {
-            version: UCP_VERSION,
-            spec: `${UCP_SPEC_ROOT}/specification/catalog/lookup`,
-            schema: `${UCP_SPEC_ROOT}/schemas/shopping/catalog_lookup.json`,
-          },
-        ],
-        [UCP_CAPABILITIES.cart]: [
-          {
-            version: UCP_VERSION,
-            spec: `${UCP_SPEC_ROOT}/specification/cart`,
-            schema: `${UCP_SPEC_ROOT}/schemas/shopping/cart.json`,
-          },
-        ],
-      },
-    },
-    business: {
-      name: 'NextBlock',
-      url: normalizedBaseUrl,
-    },
-  };
-}
-
-export function buildUcpBusinessError(params: {
-  capability: UcpCapabilityName;
-  code: string;
-  content: string;
-  severity?: 'recoverable' | 'unrecoverable';
-  continueUrl?: string;
-}) {
-  return {
-    ucp: buildUcpMetadata([params.capability], 'error'),
-    messages: [
-      {
-        type: 'error',
-        code: params.code,
-        content: params.content,
-        severity: params.severity ?? 'unrecoverable',
-      },
-    ],
-    continue_url: params.continueUrl,
-  };
-}
-
-export function buildProtocolError(code: string, content: string) {
-  return { code, content };
-}
+export const UCP_VERSION = '2026-04-08';
+export const UCP_REST_BASE_PATH = '/ucp/v1';
+export const UCP_SHOPPING_SERVICE = 'dev.ucp.shopping';
+export const UCP_CAPABILITIES = {
+  catalogSearch: 'dev.ucp.shopping.catalog.search',
+  catalogLookup: 'dev.ucp.shopping.catalog.lookup',
+  cart: 'dev.ucp.shopping.cart',
+  checkout: 'dev.ucp.shopping.checkout',
+} as const;
+
+const UCP_SPEC_ROOT = `https://ucp.dev/${UCP_VERSION}`;
+const DEFAULT_PAGE_LIMIT = 10;
+const MAX_PAGE_LIMIT = 50;
+
+type JsonRecord = Record<string, unknown>;
+type UcpCapabilityName = (typeof UCP_CAPABILITIES)[keyof typeof UCP_CAPABILITIES];
+
+function asRecord(value: unknown): JsonRecord {
+  return value && typeof value === 'object' && !Array.isArray(value)
+    ? (value as JsonRecord)
+    : {};
+}
+
+function asString(value: unknown) {
+  return typeof value === 'string' && value.trim() ? value.trim() : null;
+}
+
+function toInteger(value: unknown, fallback: number) {
+  const parsed =
+    typeof value === 'string'
+      ? Number.parseInt(value, 10)
+      : typeof value === 'number'
+        ? value
+        : Number.NaN;
+
+  return Number.isFinite(parsed) ? Math.round(parsed) : fallback;
+}
+
+function encodeCursor(offset: number) {
+  return Buffer.from(JSON.stringify({ offset }), 'utf8').toString('base64url');
+}
+
+function decodeCursor(cursor: unknown) {
+  const value = asString(cursor);
+  if (!value) {
+    return null;
+  }
+
+  try {
+    const parsed = JSON.parse(Buffer.from(value, 'base64url').toString('utf8'));
+    const offset = toInteger(asRecord(parsed).offset, -1);
+    return offset >= 0 ? offset : null;
+  } catch {
+    return null;
+  }
+}
+
+export function normalizeUcpPagination(body: unknown) {
+  const record = asRecord(body);
+  const pagination = asRecord(record.pagination);
+  const requestedLimit = toInteger(
+    pagination.limit ?? pagination.page_size ?? record.limit,
+    DEFAULT_PAGE_LIMIT
+  );
+  const limit = Math.min(Math.max(requestedLimit, 1), MAX_PAGE_LIMIT);
+  const cursorOffset = decodeCursor(
+    pagination.cursor ?? pagination.after ?? record.cursor ?? record.page_token
+  );
+  const offset = cursorOffset ?? Math.max(toInteger(pagination.offset ?? record.offset, 0), 0);
+
+  return { limit, offset };
+}
+
+export function buildPaginationResponse(params: {
+  limit: number;
+  offset: number;
+  count: number;
+  totalCount?: number | null;
+}) {
+  const nextOffset = params.offset + params.count;
+  const hasNextPage =
+    typeof params.totalCount === 'number'
+      ? nextOffset < params.totalCount
+      : params.count === params.limit;
+
+  return {
+    cursor: hasNextPage ? encodeCursor(nextOffset) : null,
+    has_next_page: hasNextPage,
+    total_count: params.totalCount ?? undefined,
+    limit: params.limit,
+  };
+}
+
+export function buildUcpMetadata(
+  capabilityNames: UcpCapabilityName[] = [
+    UCP_CAPABILITIES.catalogSearch,
+    UCP_CAPABILITIES.catalogLookup,
+    UCP_CAPABILITIES.cart,
+  ],
+  status: 'success' | 'error' = 'success'
+): JsonRecord {
+  return {
+    version: UCP_VERSION,
+    status,
+    capabilities: capabilityNames.reduce<Record<string, Array<{ version: string }>>>(
+      (accumulator, capabilityName) => {
+        accumulator[capabilityName] = [{ version: UCP_VERSION }];
+        return accumulator;
+      },
+      {}
+    ),
+  };
+}
+
+export function buildUcpProfile(baseUrl: string) {
+  const normalizedBaseUrl = baseUrl.replace(/\/+$/, '');
+  const endpoint = `${normalizedBaseUrl}${UCP_REST_BASE_PATH}`;
+
+  return {
+    ucp: {
+      version: UCP_VERSION,
+      supported_versions: {
+        [UCP_VERSION]: `${normalizedBaseUrl}/.well-known/ucp`,
+      },
+      services: {
+        [UCP_SHOPPING_SERVICE]: [
+          {
+            version: UCP_VERSION,
+            spec: `${UCP_SPEC_ROOT}/specification/overview`,
+            transport: 'rest',
+            schema: `${UCP_SPEC_ROOT}/services/shopping/rest.openapi.json`,
+            endpoint,
+          },
+        ],
+      },
+      capabilities: {
+        [UCP_CAPABILITIES.catalogSearch]: [
+          {
+            version: UCP_VERSION,
+            spec: `${UCP_SPEC_ROOT}/specification/catalog/search`,
+            schema: `${UCP_SPEC_ROOT}/schemas/shopping/catalog_search.json`,
+          },
+        ],
+        [UCP_CAPABILITIES.catalogLookup]: [
+          {
+            version: UCP_VERSION,
+            spec: `${UCP_SPEC_ROOT}/specification/catalog/lookup`,
+            schema: `${UCP_SPEC_ROOT}/schemas/shopping/catalog_lookup.json`,
+          },
+        ],
+        [UCP_CAPABILITIES.cart]: [
+          {
+            version: UCP_VERSION,
+            spec: `${UCP_SPEC_ROOT}/specification/cart`,
+            schema: `${UCP_SPEC_ROOT}/schemas/shopping/cart.json`,
+          },
+        ],
+      },
+    },
+    business: {
+      name: 'NextBlock',
+      url: normalizedBaseUrl,
+    },
+  };
+}
+
+export function buildUcpBusinessError(params: {
+  capability: UcpCapabilityName;
+  code: string;
+  content: string;
+  severity?: 'recoverable' | 'unrecoverable';
+  continueUrl?: string;
+}) {
+  return {
+    ucp: buildUcpMetadata([params.capability], 'error'),
+    messages: [
+      {
+        type: 'error',
+        code: params.code,
+        content: params.content,
+        severity: params.severity ?? 'unrecoverable',
+      },
+    ],
+    continue_url: params.continueUrl,
+  };
+}
+
+export function buildProtocolError(code: string, content: string) {
+  return { code, content };
+}