create-nextblock 0.12.8 → 0.12.11

package/templates/nextblock-template/app/actions/postActions.ts

@@ -1,147 +1,147 @@
-'use server';
-
-import { cache } from 'react';
-import { createClient } from '@nextblock-cms/db/server';
-import { revalidatePath } from 'next/cache';
-import type { Database } from '@nextblock-cms/db';
-import type { PostWithMediaDimensions } from '../../components/blocks/types';
-import { resolveMediaUrl } from '../../lib/media/resolveMediaUrl';
-import { estimateReadTimeMinutesFromBlocks } from '../../lib/posts/readTime';
-
-type PostRow = Database['public']['Tables']['posts']['Row'];
-type BlockRow = Database['public']['Tables']['blocks']['Row'];
-type FeatureMediaSelection = {
-  object_key: string;
-  width?: number | null;
-  height?: number | null;
-  blur_data_url?: string | null;
-};
-
-type PostQueryRow = PostRow & {
-  feature_media_object?: FeatureMediaSelection | FeatureMediaSelection[] | null;
-};
-
-type PostWithFeatureMedia = PostRow & {
-  feature_media_object?: FeatureMediaSelection | null;
-};
-
-function normalizeFeatureMediaObject(
-  mediaObject: PostQueryRow['feature_media_object']
-): FeatureMediaSelection | null {
-  if (Array.isArray(mediaObject)) {
-    return mediaObject[0] ?? null;
-  }
-
-  return mediaObject ?? null;
-}
-
-async function getEstimatedReadTimeMap(
-  supabase: ReturnType<typeof createClient>,
-  postIds: number[]
-) {
-  if (postIds.length === 0) {
-    return new Map<number, number>();
-  }
-
-  const { data: textBlocks, error } = await supabase
-    .from('blocks')
-    .select('post_id, block_type, content')
-    .in('post_id', postIds)
-    .eq('block_type', 'text')
-    .order('order', { ascending: true });
-
-  if (error) {
-    console.error('Error fetching post text blocks for read-time estimation:', error);
-    return new Map(postIds.map((postId) => [postId, 1]));
-  }
-
-  const blocksByPostId = new Map<number, Array<Pick<BlockRow, 'block_type' | 'content'>>>();
-  postIds.forEach((postId) => blocksByPostId.set(postId, []));
-
-  (textBlocks || []).forEach((block) => {
-    if (typeof block.post_id !== 'number') {
-      return;
-    }
-
-    const blocks = blocksByPostId.get(block.post_id) || [];
-    blocks.push(block as Pick<BlockRow, 'block_type' | 'content'>);
-    blocksByPostId.set(block.post_id, blocks);
-  });
-
-  return new Map(
-    postIds.map((postId) => [
-      postId,
-      estimateReadTimeMinutesFromBlocks(blocksByPostId.get(postId)),
-    ])
-  );
-}
-
-function normalizePostsForCards(
-  posts: PostWithFeatureMedia[],
-  estimatedReadTimeMap: Map<number, number>
-) {
-  return posts.map((post) => {
-    const mediaObject = post.feature_media_object || null;
-
-    return {
-      ...post,
-      feature_image_url: resolveMediaUrl(mediaObject?.object_key),
-      feature_image_width: mediaObject?.width || null,
-      feature_image_height: mediaObject?.height || null,
-      blur_data_url: mediaObject?.blur_data_url || null,
-      estimated_read_time_minutes: estimatedReadTimeMap.get(post.id) || 1,
-    } satisfies PostWithMediaDimensions;
-  });
-}
-
-async function fetchPublishedPostsPage(languageId: number, page: number, limit: number) {
-  const supabase = createClient();
-  const offset = (page - 1) * limit;
-
-  const { data: posts, error, count } = await supabase
-    .from('posts')
-    .select(
-      'id, title, slug, label, excerpt, subtitle, published_at, language_id, status, created_at, updated_at, translation_group_id, feature_image_id, version, author_id, meta_title, meta_description, feature_media_object:media!feature_image_id(object_key, width, height, blur_data_url)',
-      { count: 'exact' }
-    )
-    .eq('status', 'published')
-    .eq('language_id', languageId)
-    .order('published_at', { ascending: false })
-    .range(offset, offset + limit - 1);
-
-  if (error) {
-    console.error('Error fetching published posts:', error);
-    return { posts: [], totalCount: 0, error: error.message };
-  }
-
-  const normalizedPosts: PostWithFeatureMedia[] = ((posts as PostQueryRow[] | null) ?? []).map(
-    (post) => ({
-      ...post,
-      feature_media_object: normalizeFeatureMediaObject(post.feature_media_object),
-    })
-  );
-  const postIds = normalizedPosts.map((post) => post.id);
-  const estimatedReadTimeMap = await getEstimatedReadTimeMap(supabase, postIds);
-
-  return {
-    posts: normalizePostsForCards(normalizedPosts, estimatedReadTimeMap),
-    totalCount: count || 0,
-    error: undefined,
-  };
-}
-
-export async function fetchPaginatedPublishedPosts(languageId: number, page: number, limit: number): Promise<{ posts: PostWithMediaDimensions[], totalCount: number, error?: string }> {
-  return fetchPublishedPostsPage(languageId, page, limit);
-}
-
-export const fetchInitialPublishedPosts = cache(async (languageId: number, limit: number): Promise<{ posts: PostWithMediaDimensions[], totalCount: number, error?: string | null }> => {
-  const result = await fetchPublishedPostsPage(languageId, 1, limit);
-  return {
-    posts: result.posts,
-    totalCount: result.totalCount,
-    error: result.error ?? null,
-  };
-});
+'use server';
+
+import { cache } from 'react';
+import { createClient } from '@nextblock-cms/db/server';
+import { revalidatePath } from 'next/cache';
+import type { Database } from '@nextblock-cms/db';
+import type { PostWithMediaDimensions } from '../../components/blocks/types';
+import { resolveMediaUrl } from '../../lib/media/resolveMediaUrl';
+import { estimateReadTimeMinutesFromBlocks } from '../../lib/posts/readTime';
+
+type PostRow = Database['public']['Tables']['posts']['Row'];
+type BlockRow = Database['public']['Tables']['blocks']['Row'];
+type FeatureMediaSelection = {
+  object_key: string;
+  width?: number | null;
+  height?: number | null;
+  blur_data_url?: string | null;
+};
+
+type PostQueryRow = PostRow & {
+  feature_media_object?: FeatureMediaSelection | FeatureMediaSelection[] | null;
+};
+
+type PostWithFeatureMedia = PostRow & {
+  feature_media_object?: FeatureMediaSelection | null;
+};
+
+function normalizeFeatureMediaObject(
+  mediaObject: PostQueryRow['feature_media_object']
+): FeatureMediaSelection | null {
+  if (Array.isArray(mediaObject)) {
+    return mediaObject[0] ?? null;
+  }
+
+  return mediaObject ?? null;
+}
+
+async function getEstimatedReadTimeMap(
+  supabase: ReturnType<typeof createClient>,
+  postIds: number[]
+) {
+  if (postIds.length === 0) {
+    return new Map<number, number>();
+  }
+
+  const { data: textBlocks, error } = await supabase
+    .from('blocks')
+    .select('post_id, block_type, content')
+    .in('post_id', postIds)
+    .eq('block_type', 'text')
+    .order('order', { ascending: true });
+
+  if (error) {
+    console.error('Error fetching post text blocks for read-time estimation:', error);
+    return new Map(postIds.map((postId) => [postId, 1]));
+  }
+
+  const blocksByPostId = new Map<number, Array<Pick<BlockRow, 'block_type' | 'content'>>>();
+  postIds.forEach((postId) => blocksByPostId.set(postId, []));
+
+  (textBlocks || []).forEach((block) => {
+    if (typeof block.post_id !== 'number') {
+      return;
+    }
+
+    const blocks = blocksByPostId.get(block.post_id) || [];
+    blocks.push(block as Pick<BlockRow, 'block_type' | 'content'>);
+    blocksByPostId.set(block.post_id, blocks);
+  });
+
+  return new Map(
+    postIds.map((postId) => [
+      postId,
+      estimateReadTimeMinutesFromBlocks(blocksByPostId.get(postId)),
+    ])
+  );
+}
+
+function normalizePostsForCards(
+  posts: PostWithFeatureMedia[],
+  estimatedReadTimeMap: Map<number, number>
+) {
+  return posts.map((post) => {
+    const mediaObject = post.feature_media_object || null;
+
+    return {
+      ...post,
+      feature_image_url: resolveMediaUrl(mediaObject?.object_key),
+      feature_image_width: mediaObject?.width || null,
+      feature_image_height: mediaObject?.height || null,
+      blur_data_url: mediaObject?.blur_data_url || null,
+      estimated_read_time_minutes: estimatedReadTimeMap.get(post.id) || 1,
+    } satisfies PostWithMediaDimensions;
+  });
+}
+
+async function fetchPublishedPostsPage(languageId: number, page: number, limit: number) {
+  const supabase = createClient();
+  const offset = (page - 1) * limit;
+
+  const { data: posts, error, count } = await supabase
+    .from('posts')
+    .select(
+      'id, title, slug, label, excerpt, subtitle, published_at, language_id, status, created_at, updated_at, translation_group_id, feature_image_id, version, author_id, meta_title, meta_description, feature_media_object:media!feature_image_id(object_key, width, height, blur_data_url)',
+      { count: 'exact' }
+    )
+    .eq('status', 'published')
+    .eq('language_id', languageId)
+    .order('published_at', { ascending: false })
+    .range(offset, offset + limit - 1);
+
+  if (error) {
+    console.error('Error fetching published posts:', error);
+    return { posts: [], totalCount: 0, error: error.message };
+  }
+
+  const normalizedPosts: PostWithFeatureMedia[] = ((posts as PostQueryRow[] | null) ?? []).map(
+    (post) => ({
+      ...post,
+      feature_media_object: normalizeFeatureMediaObject(post.feature_media_object),
+    })
+  );
+  const postIds = normalizedPosts.map((post) => post.id);
+  const estimatedReadTimeMap = await getEstimatedReadTimeMap(supabase, postIds);
+
+  return {
+    posts: normalizePostsForCards(normalizedPosts, estimatedReadTimeMap),
+    totalCount: count || 0,
+    error: undefined,
+  };
+}
+
+export async function fetchPaginatedPublishedPosts(languageId: number, page: number, limit: number): Promise<{ posts: PostWithMediaDimensions[], totalCount: number, error?: string }> {
+  return fetchPublishedPostsPage(languageId, page, limit);
+}
+
+export const fetchInitialPublishedPosts = cache(async (languageId: number, limit: number): Promise<{ posts: PostWithMediaDimensions[], totalCount: number, error?: string | null }> => {
+  const result = await fetchPublishedPostsPage(languageId, 1, limit);
+  return {
+    posts: result.posts,
+    totalCount: result.totalCount,
+    error: result.error ?? null,
+  };
+});
 export async function revalidateAndLog(path: string): Promise<{ success: boolean; error?: string }> {
   try {
     // Step 1: Revalidate the path
@@ -168,11 +168,11 @@ export async function revalidateAndLog(path: string): Promise<{ success: boolean
       throw new Error(`Failed to log revalidation: ${response.status} ${response.statusText} - ${errorBody.error}`);
     }
 
-    return { success: true };
+    return { success: true };
 
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
     console.error(`Error in revalidateAndLog for path "${path}":`, errorMessage);
     return { success: false, error: errorMessage };
   }
-}
+}

package/templates/nextblock-template/app/actions/twoFactorEmail.ts

@@ -1,22 +1,22 @@
-// Shared transactional email for 2FA codes. Server-only helper (not a server
-// action); callable from sign-in, the challenge page, and the security panel.
-import { sendEmail } from './email';
-
-export async function sendTwoFactorCodeEmail(
-  to: string,
-  code: string,
-  purpose = 'verify your sign-in',
-): Promise<void> {
-  await sendEmail({
-    to,
-    subject: 'Your verification code',
-    text: `Your verification code is ${code}. It expires in 5 minutes. If you didn't request it, you can ignore this email.`,
-    html: `
-  <div style="font-family:system-ui,-apple-system,Segoe UI,Roboto,sans-serif;max-width:480px;margin:0 auto;padding:24px;">
-    {{brand_header}}
-    <p style="font-size:14px;color:#475569;">Use this code to ${purpose}:</p>
-    <p style="font-size:32px;font-weight:700;letter-spacing:8px;margin:16px 0;color:#0f172a;">${code}</p>
-    <p style="font-size:13px;color:#64748b;">This code expires in 5 minutes. If you didn't request it, you can safely ignore this email.</p>
-  </div>`,
-  });
-}
+// Shared transactional email for 2FA codes. Server-only helper (not a server
+// action); callable from sign-in, the challenge page, and the security panel.
+import { sendEmail } from './email';
+
+export async function sendTwoFactorCodeEmail(
+  to: string,
+  code: string,
+  purpose = 'verify your sign-in',
+): Promise<void> {
+  await sendEmail({
+    to,
+    subject: 'Your verification code',
+    text: `Your verification code is ${code}. It expires in 5 minutes. If you didn't request it, you can ignore this email.`,
+    html: `
+  <div style="font-family:system-ui,-apple-system,Segoe UI,Roboto,sans-serif;max-width:480px;margin:0 auto;padding:24px;">
+    {{brand_header}}
+    <p style="font-size:14px;color:#475569;">Use this code to ${purpose}:</p>
+    <p style="font-size:32px;font-weight:700;letter-spacing:8px;margin:16px 0;color:#0f172a;">${code}</p>
+    <p style="font-size:13px;color:#64748b;">This code expires in 5 minutes. If you didn't request it, you can safely ignore this email.</p>
+  </div>`,
+  });
+}

package/templates/nextblock-template/app/api/ai/cortex/build-widget/route.ts

@@ -1,153 +1,153 @@
-import { NextResponse } from 'next/server';
-import { revalidatePath, revalidateTag } from 'next/cache';
-
-import { createClient, verifyPackageOnline } from '@nextblock-cms/db/server';
-
-import { generateCortexWidgetDefinition } from '@nextblock-cms/cortex';
-import {
-  cortexWidgetBuildRequestSchema,
-} from '@nextblock-cms/cortex';
-import {
-  CortexWidgetRegistryInsertError,
-  insertCortexWidgetDefinition,
-} from '@nextblock-cms/cortex';
-import {
-  CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG,
-  getCustomBlockDefinitionCacheTag,
-} from '../../../../../lib/custom-block-definitions';
-import {
-  safeParseCortexAiModelSelection,
-  summarizeCortexAiRoutingError,
-} from '@nextblock-cms/cortex';
-
-export const dynamic = 'force-dynamic';
-
-const DYNAMIC_LAYOUT_ENGINE_CACHE_TAG = 'dynamic-layout-engine';
-
-type SupabaseServerClient = ReturnType<typeof createClient>;
-
-async function requireCmsWriterAccess(supabase: SupabaseServerClient) {
-  const {
-    data: { user },
-    error: userError,
-  } = await supabase.auth.getUser();
-
-  if (userError || !user) {
-    return null;
-  }
-
-  const { data: profile, error: profileError } = await supabase
-    .from('profiles')
-    .select('role')
-    .eq('id', user.id)
-    .single();
-
-  if (profileError || !profile || !['ADMIN', 'WRITER'].includes(profile.role)) {
-    return null;
-  }
-
-  return { userId: user.id };
-}
-
-function jsonError(message: string, status: number) {
-  return NextResponse.json({ error: message }, { status });
-}
-
-function getDynamicLayoutDefinitionCacheTag(idOrSlug: string) {
-  return `${DYNAMIC_LAYOUT_ENGINE_CACHE_TAG}:definition:${idOrSlug}`;
-}
-
-function revalidateCortexWidgetDefinition(definition: { id: string; slug: string }) {
-  revalidateTag(CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG, 'max');
-  revalidateTag(getCustomBlockDefinitionCacheTag(definition.id), 'max');
-  revalidateTag(getCustomBlockDefinitionCacheTag(definition.slug), 'max');
-  revalidateTag(DYNAMIC_LAYOUT_ENGINE_CACHE_TAG, 'max');
-  revalidateTag(getDynamicLayoutDefinitionCacheTag(definition.id), 'max');
-  revalidateTag(getDynamicLayoutDefinitionCacheTag(definition.slug), 'max');
-  revalidatePath('/cms/blocks');
-  revalidatePath('/cms/custom-blocks');
-}
-
-export async function POST(request: Request) {
-  try {
-    const supabase = createClient();
-    const access = await requireCmsWriterAccess(supabase);
-
-    if (!access) {
-      return jsonError('You do not have permission to build Cortex widgets.', 403);
-    }
-
-    const isCortexAiActive = await verifyPackageOnline('cortex-ai');
-
-    if (!isCortexAiActive) {
-      return jsonError('NextBlock Cortex AI is not active for this workspace.', 403);
-    }
-
-    const body = await request.json().catch(() => null);
-    const parsedRequest = cortexWidgetBuildRequestSchema.safeParse(body);
-
-    if (!parsedRequest.success) {
-      return jsonError('Invalid Cortex widget build request.', 400);
-    }
-
-    const sandboxKey =
-      process.env.NEXT_PUBLIC_IS_SANDBOX === 'true'
-        ? request.headers.get('x-sandbox-openrouter-key')
-        : null;
-    const sandboxModelRaw =
-      process.env.NEXT_PUBLIC_IS_SANDBOX === 'true'
-        ? request.headers.get('x-sandbox-openrouter-model')
-        : null;
-
-    let modelSelection = null;
-    if (sandboxModelRaw) {
-      try {
-        modelSelection = safeParseCortexAiModelSelection(JSON.parse(sandboxModelRaw));
-      } catch {
-        // Ignore malformed sandbox model headers.
-      }
-    }
-
-    const generation = await generateCortexWidgetDefinition({
-      ...parsedRequest.data,
-      apiKey: sandboxKey || undefined,
-      modelSelection: sandboxKey && modelSelection ? modelSelection : undefined,
-    });
-    const definition = await insertCortexWidgetDefinition(supabase, generation.definition);
-
-    revalidateCortexWidgetDefinition(definition);
-
-    return NextResponse.json(
-      {
-        attempts: generation.attempts,
-        credentialSource: generation.credentialSource,
-        definition,
-        modelId: generation.modelId,
-        success: true,
-      },
-      {
-        headers: {
-          'x-cortex-ai-credential-source': generation.credentialSource,
-          'x-cortex-ai-model': generation.modelId,
-        },
-      }
-    );
-  } catch (error) {
-    if (error instanceof CortexWidgetRegistryInsertError) {
-      return jsonError(error.message, error.status);
-    }
-
-    if (error && typeof error === 'object' && 'attempts' in error) {
-      console.error(
-        '[Cortex AI] Failed to build widget after model attempts:',
-        JSON.stringify((error as { attempts: unknown }).attempts, null, 2)
-      );
-    }
-
-    console.error('[Cortex AI] Failed to build widget:', error);
-    return jsonError(
-      summarizeCortexAiRoutingError(error, 'Failed to build Cortex widget.'),
-      500
-    );
-  }
-}
+import { NextResponse } from 'next/server';
+import { revalidatePath, revalidateTag } from 'next/cache';
+
+import { createClient, verifyPackageOnline } from '@nextblock-cms/db/server';
+
+import { generateCortexWidgetDefinition } from '@nextblock-cms/cortex';
+import {
+  cortexWidgetBuildRequestSchema,
+} from '@nextblock-cms/cortex';
+import {
+  CortexWidgetRegistryInsertError,
+  insertCortexWidgetDefinition,
+} from '@nextblock-cms/cortex';
+import {
+  CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG,
+  getCustomBlockDefinitionCacheTag,
+} from '../../../../../lib/custom-block-definitions';
+import {
+  safeParseCortexAiModelSelection,
+  summarizeCortexAiRoutingError,
+} from '@nextblock-cms/cortex';
+
+export const dynamic = 'force-dynamic';
+
+const DYNAMIC_LAYOUT_ENGINE_CACHE_TAG = 'dynamic-layout-engine';
+
+type SupabaseServerClient = ReturnType<typeof createClient>;
+
+async function requireCmsWriterAccess(supabase: SupabaseServerClient) {
+  const {
+    data: { user },
+    error: userError,
+  } = await supabase.auth.getUser();
+
+  if (userError || !user) {
+    return null;
+  }
+
+  const { data: profile, error: profileError } = await supabase
+    .from('profiles')
+    .select('role')
+    .eq('id', user.id)
+    .single();
+
+  if (profileError || !profile || !['ADMIN', 'WRITER'].includes(profile.role)) {
+    return null;
+  }
+
+  return { userId: user.id };
+}
+
+function jsonError(message: string, status: number) {
+  return NextResponse.json({ error: message }, { status });
+}
+
+function getDynamicLayoutDefinitionCacheTag(idOrSlug: string) {
+  return `${DYNAMIC_LAYOUT_ENGINE_CACHE_TAG}:definition:${idOrSlug}`;
+}
+
+function revalidateCortexWidgetDefinition(definition: { id: string; slug: string }) {
+  revalidateTag(CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG, 'max');
+  revalidateTag(getCustomBlockDefinitionCacheTag(definition.id), 'max');
+  revalidateTag(getCustomBlockDefinitionCacheTag(definition.slug), 'max');
+  revalidateTag(DYNAMIC_LAYOUT_ENGINE_CACHE_TAG, 'max');
+  revalidateTag(getDynamicLayoutDefinitionCacheTag(definition.id), 'max');
+  revalidateTag(getDynamicLayoutDefinitionCacheTag(definition.slug), 'max');
+  revalidatePath('/cms/blocks');
+  revalidatePath('/cms/custom-blocks');
+}
+
+export async function POST(request: Request) {
+  try {
+    const supabase = createClient();
+    const access = await requireCmsWriterAccess(supabase);
+
+    if (!access) {
+      return jsonError('You do not have permission to build Cortex widgets.', 403);
+    }
+
+    const isCortexAiActive = await verifyPackageOnline('cortex-ai');
+
+    if (!isCortexAiActive) {
+      return jsonError('NextBlock Cortex AI is not active for this workspace.', 403);
+    }
+
+    const body = await request.json().catch(() => null);
+    const parsedRequest = cortexWidgetBuildRequestSchema.safeParse(body);
+
+    if (!parsedRequest.success) {
+      return jsonError('Invalid Cortex widget build request.', 400);
+    }
+
+    const sandboxKey =
+      process.env.NEXT_PUBLIC_IS_SANDBOX === 'true'
+        ? request.headers.get('x-sandbox-openrouter-key')
+        : null;
+    const sandboxModelRaw =
+      process.env.NEXT_PUBLIC_IS_SANDBOX === 'true'
+        ? request.headers.get('x-sandbox-openrouter-model')
+        : null;
+
+    let modelSelection = null;
+    if (sandboxModelRaw) {
+      try {
+        modelSelection = safeParseCortexAiModelSelection(JSON.parse(sandboxModelRaw));
+      } catch {
+        // Ignore malformed sandbox model headers.
+      }
+    }
+
+    const generation = await generateCortexWidgetDefinition({
+      ...parsedRequest.data,
+      apiKey: sandboxKey || undefined,
+      modelSelection: sandboxKey && modelSelection ? modelSelection : undefined,
+    });
+    const definition = await insertCortexWidgetDefinition(supabase, generation.definition);
+
+    revalidateCortexWidgetDefinition(definition);
+
+    return NextResponse.json(
+      {
+        attempts: generation.attempts,
+        credentialSource: generation.credentialSource,
+        definition,
+        modelId: generation.modelId,
+        success: true,
+      },
+      {
+        headers: {
+          'x-cortex-ai-credential-source': generation.credentialSource,
+          'x-cortex-ai-model': generation.modelId,
+        },
+      }
+    );
+  } catch (error) {
+    if (error instanceof CortexWidgetRegistryInsertError) {
+      return jsonError(error.message, error.status);
+    }
+
+    if (error && typeof error === 'object' && 'attempts' in error) {
+      console.error(
+        '[Cortex AI] Failed to build widget after model attempts:',
+        JSON.stringify((error as { attempts: unknown }).attempts, null, 2)
+      );
+    }
+
+    console.error('[Cortex AI] Failed to build widget:', error);
+    return jsonError(
+      summarizeCortexAiRoutingError(error, 'Failed to build Cortex widget.'),
+      500
+    );
+  }
+}