@nextsparkjs/core 0.1.0-beta.3 → 0.1.0-beta.5

package/scripts/build/registry/post-build/page-generator.mjs

@@ -16,8 +16,8 @@ import { cleanupOrphanedTemplates } from './route-cleanup.mjs'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
-// Default rootDir for backwards compatibility (will be overridden by config)
-let rootDir = join(__dirname, '../../../../../..')
+// Default rootDir - use cwd() for NPM compatibility (will be overridden by config.projectRoot if provided)
+let rootDir = process.cwd()
 
 /**
  * Convert string to PascalCase
@@ -203,33 +203,66 @@ function addTemplateResolverToLayout(content, layoutPath) {
 }
 
 /**
- * Duplicate a layout file to (templates) directory with template resolver integration
+ * Duplicate a layout file to (templates) directory
+ * Uses BUILD-TIME resolution: checks if template override exists and generates direct import
+ * NO runtime resolver needed - all decisions made at build time
+ *
+ * @param {string} sourcePath - Path to original layout in app/
+ * @param {string} targetPath - Path to write in app/(templates)/
+ * @param {string} layoutPath - Relative layout path (e.g., 'app/dashboard/layout.tsx')
+ * @param {Array} templates - All discovered templates (for build-time override check)
  */
-async function duplicateLayoutWithTemplateResolver(sourcePath, targetPath, layoutPath) {
+async function duplicateLayoutDirect(sourcePath, targetPath, layoutPath, templates) {
   // Create target directory if it doesn't exist
   const targetDir = dirname(targetPath)
   await mkdir(targetDir, { recursive: true })
 
-  try {
-    // Read the original layout file
-    const originalContent = await readFile(sourcePath, 'utf8')
-
-    // Check if it already uses template resolver
-    if (originalContent.includes('getTemplateOrDefault')) {
-      // Already has template resolver, just copy
-      await writeFile(targetPath, originalContent, 'utf8')
-      return
-    }
+  // BUILD-TIME CHECK: Does a template override exist for this layout?
+  const layoutOverride = templates.find(t =>
+    t.appPath === layoutPath && t.templateType === 'layout'
+  )
+
+  if (layoutOverride) {
+    // Template override exists - generate direct import to it
+    const templatePathWithoutExtension = layoutOverride.templatePath.replace(/\.(tsx|ts)$/, '')
+    const componentName = `Layout${toPascalCase(layoutPath.replace(/[^\w]/g, '_'))}`
+
+    const content = `/**
+ * Layout with template override - directly imports from theme
+ * Template: ${layoutPath}
+ * Override: ${layoutOverride.templatePath}
+ * Generated by: scripts/build-registry.mjs (build-time resolution)
+ */
+import TemplateLayout from '${templatePathWithoutExtension}'
 
-    // Parse the content to add template resolver
-    const modifiedContent = addTemplateResolverToLayout(originalContent, layoutPath)
-    await writeFile(targetPath, modifiedContent, 'utf8')
+export default TemplateLayout
+`
+    await writeFile(targetPath, content, 'utf8')
+    verbose(`Generated layout with template override: ${layoutPath}`)
+    return
+  }
 
+  // No override - copy original layout as-is (simple pass-through)
+  try {
+    const originalContent = await readFile(sourcePath, 'utf8')
+    await writeFile(targetPath, originalContent, 'utf8')
+    verbose(`Copied original layout: ${layoutPath}`)
   } catch (error) {
-    // If parsing fails, generate a basic layout wrapper
-    const componentName = `DuplicatedLayout${toPascalCase(layoutPath.replace(/[^\w]/g, '_'))}`
-    const basicLayoutContent = await generateLayoutPageContent(layoutPath, componentName, null)
-    await writeFile(targetPath, basicLayoutContent, 'utf8')
+    // If reading fails, generate a basic pass-through wrapper
+    const componentName = `PassThroughLayout${toPascalCase(layoutPath.replace(/[^\w]/g, '_'))}`
+    const basicContent = `/**
+ * Basic layout wrapper - maintains Next.js structure
+ * Generated by: scripts/build-registry.mjs
+ */
+interface ${componentName}Props {
+  children: React.ReactNode
+}
+
+export default function ${componentName}({ children }: ${componentName}Props) {
+  return <>{children}</>
+}
+`
+    await writeFile(targetPath, basicContent, 'utf8')
     verbose(`Generated basic layout wrapper for ${layoutPath}`)
   }
 }
@@ -237,8 +270,13 @@ async function duplicateLayoutWithTemplateResolver(sourcePath, targetPath, layou
 /**
  * Generate required parent layouts for a template page
  * Duplicates layouts from app/ to app/(templates)/ to preserve Next.js hierarchy
+ * Uses BUILD-TIME resolution to check for template overrides
+ *
+ * @param {string} appPath - App path (e.g., 'app/dashboard/(main)/posts/page.tsx')
+ * @param {string} templatesDir - Output directory for (templates)
+ * @param {Array} templates - All discovered templates (for build-time override check)
  */
-async function generateRequiredLayouts(appPath, templatesDir) {
+async function generateRequiredLayouts(appPath, templatesDir, templates) {
   let layoutsGenerated = 0
 
   // Extract the directory path from app path (remove filename)
@@ -257,9 +295,9 @@ async function generateRequiredLayouts(appPath, templatesDir) {
 
     // Check if core layout exists and template layout doesn't
     if (existsSync(coreLayoutPath) && !existsSync(templateLayoutPath)) {
-      await duplicateLayoutWithTemplateResolver(coreLayoutPath, templateLayoutPath, layoutPath)
+      // Pass templates for build-time override resolution
+      await duplicateLayoutDirect(coreLayoutPath, templateLayoutPath, layoutPath, templates)
       layoutsGenerated++
-      verbose(`Duplicated layout: ${layoutPath} → (templates)/${currentPath}/layout.tsx`)
     }
   }
 
@@ -310,7 +348,9 @@ export async function generateMissingPages(templates, config = null) {
   const templatesDir = join(rootDir, 'app', '(templates)')
 
   // First, clean up orphaned files before generating new ones
-  await cleanupOrphanedTemplates(templates)
+  // Note: This is also called in registry.mjs before generateMissingPages,
+  // but we keep it here for standalone usage of this function
+  await cleanupOrphanedTemplates(templates, config)
 
   if (templates.length === 0) {
     return
@@ -355,7 +395,8 @@ export async function generateMissingPages(templates, config = null) {
   }
 
   for (const dirPath of uniqueDirectories) {
-    const layoutsGenerated = await generateRequiredLayouts(`${dirPath}/page.tsx`, templatesDir)
+    // Pass templates for build-time override resolution
+    const layoutsGenerated = await generateRequiredLayouts(`${dirPath}/page.tsx`, templatesDir, templates)
     layoutsDuplicated += layoutsGenerated
   }
 

package/scripts/build/registry/post-build/route-cleanup.mjs

@@ -15,13 +15,13 @@ import { log, verbose } from '../../../utils/index.mjs'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
-// Path from packages/core/scripts/build/registry/post-build/ to project root (6 levels up)
-const rootDir = join(__dirname, '../../../../../..')
 
 /**
  * Clean up old generated route files
+ * @param {object} CONFIG - Configuration object from getConfig()
  */
-export async function cleanupOldRouteFiles() {
+export async function cleanupOldRouteFiles(CONFIG) {
+  const rootDir = CONFIG?.projectRoot || process.cwd()
   const appApiDir = join(rootDir, 'app', 'api', 'v1', 'plugin')
 
   try {
@@ -56,8 +56,11 @@ export async function cleanupOldRouteFiles() {
 /**
  * Clean up orphaned template files that no longer have corresponding templates
  * Removes files from app/(templates)/ when their source templates are deleted
+ * @param {object[]} activeTemplates - List of active templates from discovery
+ * @param {object} CONFIG - Configuration object from getConfig()
  */
-export async function cleanupOrphanedTemplates(activeTemplates) {
+export async function cleanupOrphanedTemplates(activeTemplates, CONFIG) {
+  const rootDir = CONFIG?.projectRoot || process.cwd()
   const templatesDir = join(rootDir, 'app', '(templates)')
   if (!existsSync(templatesDir)) {
     return
@@ -136,8 +139,11 @@ export async function cleanupOrphanedTemplates(activeTemplates) {
 /**
  * Map template file path to generated app template path
  * contents/themes/content-buddy/templates/(public)/pricing/page.tsx → app/(templates)/(public)/pricing/page.tsx
+ * @param {string} templateFilePath - Full path to the template file
+ * @param {object} CONFIG - Configuration object from getConfig()
  */
-export function mapTemplateToAppPath(templateFilePath) {
+export function mapTemplateToAppPath(templateFilePath, CONFIG) {
+  const rootDir = CONFIG?.projectRoot || process.cwd()
   // Extract the part after /templates/
   const templatesMatch = templateFilePath.match(/\/themes\/[^\/]+\/templates\/(.+)$/)
   if (!templatesMatch) {
@@ -150,9 +156,12 @@ export function mapTemplateToAppPath(templateFilePath) {
 
 /**
  * Clean up generated template files when original templates are deleted
+ * @param {string} templateFilePath - Full path to the template file
+ * @param {object} CONFIG - Configuration object from getConfig()
  */
-export async function cleanupDeletedTemplate(templateFilePath) {
-  const appTemplatePath = mapTemplateToAppPath(templateFilePath)
+export async function cleanupDeletedTemplate(templateFilePath, CONFIG) {
+  const rootDir = CONFIG?.projectRoot || process.cwd()
+  const appTemplatePath = mapTemplateToAppPath(templateFilePath, CONFIG)
   if (!appTemplatePath || !existsSync(appTemplatePath)) {
     return
   }

package/scripts/build/registry/post-build/test-fixtures.mjs

@@ -103,7 +103,7 @@ export async function generateTestEntitiesJson(entities, themes) {
   }
 
   // Check if tests directory exists
-  const fixturesDir = join(CONFIG.contentsDir, 'themes', activeTheme, 'tests', 'cypress', 'fixtures')
+  const fixturesDir = join(CONFIG.themesDir, activeTheme, 'tests', 'cypress', 'fixtures')
   if (!existsSync(fixturesDir)) {
     verbose(`Test fixtures directory not found for theme "${activeTheme}", skipping`)
     return
@@ -136,10 +136,10 @@ export async function generateTestEntitiesJson(entities, themes) {
         configFilePath = join(entityDir, `${singularName}.config.ts`)
       }
     } else if (entity.themeContext) {
-      entityDir = join(CONFIG.contentsDir, 'themes', entity.themeContext.themeName, 'entities', entity.relativePath)
+      entityDir = join(CONFIG.themesDir, entity.themeContext.themeName, 'entities', entity.relativePath)
       configFilePath = join(entityDir, `${entity.name}.config.ts`)
     } else if (entity.pluginContext) {
-      entityDir = join(CONFIG.contentsDir, 'plugins', entity.pluginContext.pluginName, 'entities', entity.relativePath)
+      entityDir = join(CONFIG.pluginsDir, entity.pluginContext.pluginName, 'entities', entity.relativePath)
       configFilePath = join(entityDir, `${entity.name}.config.ts`)
     }
 
@@ -195,7 +195,7 @@ export async function generateTestBlocksJson(blocks) {
   }
 
   // Check if tests directory exists
-  const fixturesDir = join(CONFIG.contentsDir, 'themes', activeTheme, 'tests', 'cypress', 'fixtures')
+  const fixturesDir = join(CONFIG.themesDir, activeTheme, 'tests', 'cypress', 'fixtures')
   if (!existsSync(fixturesDir)) {
     verbose(`Test fixtures directory not found for theme "${activeTheme}", skipping blocks.json`)
     return

package/scripts/build/registry/watch.mjs

@@ -22,9 +22,9 @@ export async function watchContents(buildRegistries) {
   log('Starting watch mode...', 'info')
 
   const watchPaths = [
-    join(CONFIG.contentsDir, 'plugins'),
+    CONFIG.pluginsDir,
     join(CONFIG.contentsDir, 'entities'),
-    join(CONFIG.contentsDir, 'themes'),
+    CONFIG.themesDir,
     join(CONFIG.contentsDir, 'config')
   ]
 
@@ -101,7 +101,7 @@ export async function watchContents(buildRegistries) {
           // File was deleted (was tracked but no longer exists)
           if (wasTracked && !currentlyExists) {
             log(`Template deleted: ${filename}`, 'info')
-            await cleanupDeletedTemplate(fullTemplatePath)
+            await cleanupDeletedTemplate(fullTemplatePath, CONFIG)
             templateFileTracker.delete(filename)
           }
           // File was added (exists but wasn't tracked)

package/scripts/build/registry.mjs

@@ -68,7 +68,8 @@ import {
   displayTreeStructure,
   generateTestEntitiesJson,
   generateTestBlocksJson,
-  cleanupOldRouteFiles
+  cleanupOldRouteFiles,
+  cleanupOrphanedTemplates
 } from './registry/post-build/index.mjs'
 import { watchContents } from './registry/watch.mjs'
 
@@ -198,7 +199,10 @@ export async function buildRegistries(projectRoot = null) {
     displayTreeStructure(plugins, entities, themes)
 
     // Clean up old generated route files first
-    await cleanupOldRouteFiles()
+    await cleanupOldRouteFiles(CONFIG)
+
+    // Clean up orphaned template files from previous theme builds
+    await cleanupOrphanedTemplates(templates, CONFIG)
 
     // Hoist plugin dependencies to root workspace for proper resolution
     // Generate all registry files (use aggregated entities for entity registry + blocks)
@@ -217,7 +221,8 @@ export async function buildRegistries(projectRoot = null) {
       const featureResult = await generateFeatureRegistryFull(
         CONFIG.activeTheme,
         CONFIG.contentsDir,
-        CONFIG.outputDir
+        CONFIG.outputDir,
+        CONFIG
       )
 
       // Write testing-registry.ts

package/templates/app/(public)/[...slug]/page.tsx

@@ -15,12 +15,12 @@
 
 import { notFound } from 'next/navigation'
 import { query } from '@nextsparkjs/core/lib/db'
-import { PageRenderer } from '@/app/components/page-renderer'
+import { PageRenderer } from '@nextsparkjs/core/components/public/pageBuilder'
 import {
   matchPathToEntity,
   getEntityBasePath,
 } from '@nextsparkjs/core/lib/entities/schema-generator'
-import { ENTITY_REGISTRY } from '@nextsparkjs/core/lib/entities/queries'
+import { getEntityRegistry } from '@nextsparkjs/core/lib/entities/queries'
 import { TemplateService } from '@nextsparkjs/core/lib/services/template.service'
 import { resolvePublicEntityFromUrl } from '@nextsparkjs/core/lib/api/entity/public-resolver'
 import { PublicEntityGrid } from '@nextsparkjs/core/components/public/entities/PublicEntityGrid'
@@ -28,11 +28,12 @@ import type { EntityConfig } from '@nextsparkjs/core/lib/entities/types'
 import type { Metadata } from 'next'
 
 /**
- * Convert ENTITY_REGISTRY to format expected by matchPathToEntity
+ * Convert entity registry to format expected by matchPathToEntity
  */
 function getEntityConfigs(): Record<string, EntityConfig> {
+  const registry = getEntityRegistry()
   const configs: Record<string, EntityConfig> = {}
-  for (const [key, entry] of Object.entries(ENTITY_REGISTRY)) {
+  for (const [key, entry] of Object.entries(registry)) {
     configs[key] = entry.config as EntityConfig
   }
   return configs

package/templates/app/accept-invite/[token]/page.tsx

@@ -68,9 +68,9 @@ export default function AcceptInvitePage() {
         }
 
         // Check email match
-        if (user.email.toLowerCase() !== data.data.email.toLowerCase()) {
+        if (!user.email || user.email.toLowerCase() !== data.data.email.toLowerCase()) {
           setStatus('email_mismatch')
-          setErrorMessage(`This invitation was sent to ${data.data.email}, but you are logged in as ${user.email}`)
+          setErrorMessage(`This invitation was sent to ${data.data.email}, but you are logged in as ${user.email || 'unknown'}`)
           return
         }
 

package/templates/app/api/devtools/config/entities/route.ts

@@ -1,6 +1,12 @@
-import { auth } from "@nextsparkjs/core/lib/auth";
+import { getTypedSession } from "@nextsparkjs/core/lib/auth";
 import { NextResponse } from "next/server";
-import { ENTITY_REGISTRY } from "@nextsparkjs/registries/entity-registry";
+import { getEntityRegistry } from "@nextsparkjs/core/lib/entities/queries";
+import type { EntityConfig, ChildEntityDefinition } from "@nextsparkjs/core/lib/entities/types";
+
+// Type guard to check if entity is a full EntityConfig
+function isEntityConfig(entity: EntityConfig | ChildEntityDefinition): entity is EntityConfig {
+  return 'slug' in entity
+}
 
 /**
  * Entity information structure
@@ -39,7 +45,7 @@ interface EntityInfo {
 export async function GET(request: Request) {
   try {
     // Verify developer role
-    const session = await auth.api.getSession({ headers: request.headers });
+    const session = await getTypedSession(request.headers);
 
     if (!session?.user || session.user.role !== "developer") {
       return NextResponse.json(
@@ -53,9 +59,11 @@ export async function GET(request: Request) {
 
     // Build entity info array
     const entities: EntityInfo[] = [];
+    const registry = getEntityRegistry();
 
-    for (const [, entry] of Object.entries(ENTITY_REGISTRY)) {
+    for (const [, entry] of Object.entries(registry)) {
       const config = entry.config;
+      if (!isEntityConfig(config)) continue;
 
       entities.push({
         slug: config.slug,

package/templates/app/api/devtools/config/theme/route.ts

@@ -1,4 +1,4 @@
-import { auth } from "@nextsparkjs/core/lib/auth";
+import { getTypedSession } from "@nextsparkjs/core/lib/auth";
 import { NextResponse } from "next/server";
 import { ThemeService } from "@nextsparkjs/core/lib/services/theme.service";
 
@@ -11,7 +11,7 @@ import { ThemeService } from "@nextsparkjs/core/lib/services/theme.service";
 export async function GET(request: Request) {
   try {
     // Verify developer role
-    const session = await auth.api.getSession({ headers: request.headers });
+    const session = await getTypedSession(request.headers);
 
     if (!session?.user || session.user.role !== "developer") {
       return NextResponse.json(

package/templates/app/api/devtools/tests/[...path]/route.ts

@@ -1,4 +1,4 @@
-import { auth } from "@nextsparkjs/core/lib/auth";
+import { getTypedSession } from "@nextsparkjs/core/lib/auth";
 import { NextResponse } from "next/server";
 import { readFile, stat } from "fs/promises";
 import { join } from "path";
@@ -18,7 +18,7 @@ export async function GET(
 ) {
   try {
     // Verify developer role
-    const session = await auth.api.getSession({ headers: request.headers });
+    const session = await getTypedSession(request.headers);
 
     if (!session?.user || session.user.role !== "developer") {
       return NextResponse.json(

package/templates/app/api/devtools/tests/route.ts

@@ -1,4 +1,4 @@
-import { auth } from "@nextsparkjs/core/lib/auth";
+import { getTypedSession } from "@nextsparkjs/core/lib/auth";
 import { NextResponse } from "next/server";
 import { readdir, stat } from "fs/promises";
 import { join } from "path";
@@ -61,7 +61,7 @@ async function buildFileTree(dirPath: string, basePath: string): Promise<FileTre
 export async function GET(request: Request) {
   try {
     // Verify developer role
-    const session = await auth.api.getSession({ headers: request.headers });
+    const session = await getTypedSession(request.headers);
 
     if (!session?.user || session.user.role !== "developer") {
       return NextResponse.json(

package/templates/app/api/superadmin/subscriptions/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { auth } from '@nextsparkjs/core/lib/auth';
+import { getTypedSession } from '@nextsparkjs/core/lib/auth';
 import { queryWithRLS } from '@nextsparkjs/core/lib/db';
 
 interface SubscriptionResult {
@@ -54,9 +54,7 @@ interface PlanDistribution {
 export async function GET(request: NextRequest) {
   try {
     // Get the current session using Better Auth
-    const session = await auth.api.getSession({
-      headers: request.headers
-    });
+    const session = await getTypedSession(request.headers);
 
     // Check if user is authenticated
     if (!session?.user) {

package/templates/app/api/superadmin/teams/[teamId]/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { auth } from '@nextsparkjs/core/lib/auth';
+import { getTypedSession } from '@nextsparkjs/core/lib/auth';
 import { queryWithRLS } from '@nextsparkjs/core/lib/db';
 
 interface TeamResult {
@@ -70,9 +70,7 @@ export async function GET(
     const { teamId } = await params;
 
     // Get the current session using Better Auth
-    const session = await auth.api.getSession({
-      headers: request.headers
-    });
+    const session = await getTypedSession(request.headers);
 
     // Check if user is authenticated
     if (!session?.user) {

package/templates/app/api/superadmin/teams/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { auth } from '@nextsparkjs/core/lib/auth';
+import { getTypedSession } from '@nextsparkjs/core/lib/auth';
 import { queryWithRLS } from '@nextsparkjs/core/lib/db';
 import { SYSTEM_ADMIN_TEAM_ID } from '@nextsparkjs/core/lib/api/auth/dual-auth';
 
@@ -34,9 +34,7 @@ interface TeamWithStats {
 export async function GET(request: NextRequest) {
   try {
     // Get the current session using Better Auth
-    const session = await auth.api.getSession({
-      headers: request.headers
-    });
+    const session = await getTypedSession(request.headers);
 
     // Check if user is authenticated
     if (!session?.user) {

package/templates/app/api/superadmin/users/[userId]/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { auth } from '@nextsparkjs/core/lib/auth';
+import { getTypedSession } from '@nextsparkjs/core/lib/auth';
 import { queryWithRLS } from '@nextsparkjs/core/lib/db';
 
 interface UserResult {
@@ -49,9 +49,7 @@ interface RouteParams {
 export async function GET(request: NextRequest, { params }: RouteParams) {
   try {
     // Get the current session using Better Auth
-    const session = await auth.api.getSession({
-      headers: request.headers
-    });
+    const session = await getTypedSession(request.headers);
 
     // Check if user is authenticated
     if (!session?.user) {
@@ -236,9 +234,7 @@ interface UserActionBody {
 export async function PATCH(request: NextRequest, { params }: RouteParams) {
   try {
     // Get the current session using Better Auth
-    const session = await auth.api.getSession({
-      headers: request.headers
-    });
+    const session = await getTypedSession(request.headers);
 
     // Check if user is authenticated
     if (!session?.user) {
@@ -410,9 +406,7 @@ export async function PATCH(request: NextRequest, { params }: RouteParams) {
 export async function DELETE(request: NextRequest, { params }: RouteParams) {
   try {
     // Get the current session using Better Auth
-    const session = await auth.api.getSession({
-      headers: request.headers
-    });
+    const session = await getTypedSession(request.headers);
 
     // Check if user is authenticated
     if (!session?.user) {

package/templates/app/api/superadmin/users/route.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { auth } from '@nextsparkjs/core/lib/auth';
+import { getTypedSession } from '@nextsparkjs/core/lib/auth';
 import { queryWithRLS } from '@nextsparkjs/core/lib/db';
 import type { User } from '@nextsparkjs/core/types/user.types';
 
@@ -26,9 +26,7 @@ import type { User } from '@nextsparkjs/core/types/user.types';
 export async function GET(request: NextRequest) {
   try {
     // Get the current session using Better Auth
-    const session = await auth.api.getSession({
-      headers: request.headers
-    });
+    const session = await getTypedSession(request.headers);
 
     // Check if user is authenticated
     if (!session?.user) {

package/templates/app/api/user/plan-flags/route.ts

@@ -6,7 +6,7 @@
  */
 
 import { NextRequest, NextResponse } from 'next/server'
-import { auth } from '@nextsparkjs/core/lib/auth'
+import { getTypedSession } from '@nextsparkjs/core/lib/auth'
 import { getUserPlanAndFlags, updateUserPlan, updateUserFlags } from '@nextsparkjs/core/lib/user-data'
 import { z } from 'zod'
 import type { UserRole } from '@nextsparkjs/core/types/user.types'
@@ -29,9 +29,7 @@ const planFlagsUpdateSchema = z.object({
 export async function GET(request: NextRequest) {
   try {
     // Get session
-    const session = await auth.api.getSession({
-      headers: request.headers,
-    })
+    const session = await getTypedSession(request.headers)
 
     if (!session) {
       return NextResponse.json(
@@ -93,9 +91,7 @@ export async function GET(request: NextRequest) {
 export async function PATCH(request: NextRequest) {
   try {
     // Get session
-    const session = await auth.api.getSession({
-      headers: request.headers,
-    })
+    const session = await getTypedSession(request.headers)
 
     if (!session) {
       return NextResponse.json(
@@ -189,9 +185,7 @@ export async function PATCH(request: NextRequest) {
 export async function POST(request: NextRequest) {
   try {
     // Get session
-    const session = await auth.api.getSession({
-      headers: request.headers,
-    })
+    const session = await getTypedSession(request.headers)
 
     if (!session) {
       return NextResponse.json(

package/templates/app/api/v1/[entity]/[id]/child/[childType]/[childId]/route.ts

@@ -7,7 +7,7 @@
 import { NextRequest, NextResponse } from 'next/server'
 import { queryWithRLS } from '@nextsparkjs/core/lib/db'
 import { resolveEntityFromUrl } from '@nextsparkjs/core/lib/api/entity/resolver'
-import { getChildEntities, getEntity, type EntityName } from '@nextsparkjs/core/lib/entities/queries'
+import { getChildEntities, getEntity } from '@nextsparkjs/core/lib/entities/queries'
 
 interface RouteParams {
   entity: string
@@ -35,7 +35,7 @@ export async function PUT(
     }
 
     // Get child entities for this parent entity from registry
-    const childEntities = getChildEntities(resolution.entityName as EntityName)
+    const childEntities = getChildEntities(resolution.entityName)
     const childEntity = childEntities.find(child => child.name === childType)
 
     if (!childEntity) {
@@ -46,7 +46,7 @@ export async function PUT(
     }
 
     // Get child entity configuration from registry
-    const childConfig = getEntity(childType as EntityName)
+    const childConfig = getEntity(childType)
     if (!childConfig) {
       return NextResponse.json(
         { error: `Child entity configuration "${childType}" not found` },
@@ -158,7 +158,7 @@ export async function DELETE(
     }
 
     // Get child entities for this parent entity from registry
-    const childEntities = getChildEntities(resolution.entityName as EntityName)
+    const childEntities = getChildEntities(resolution.entityName)
     const childEntity = childEntities.find(child => child.name === childType)
 
     if (!childEntity) {