@nextsparkjs/core 0.1.0-beta.190 → 0.1.0-beta.191

package/scripts/build/registry/write-places.mjs

@@ -34,6 +34,10 @@ const PLACES = [
   { path: '.nextspark/registries', kind: 'directory' },
 ]
 
+// Registries are otherwise flat files. Route-scoped template registries are
+// generated beneath this one owned subtree so their paths can mirror app/.
+const TEMPLATE_SCOPES_DIRECTORY = '.nextspark/registries/template-scopes'
+
 /**
  * The directories the registry build removes old plugin route directories
  * under, from the project root, when app/api/v1/plugin is there: a symlink
@@ -86,9 +90,11 @@ function readable(projectRoot, dir) {
  * Report what is in the way under `dir`, from the project root, without going
  * through a symlink: each symlink, anything that is neither a file, a directory
  * nor a symlink, a directory that can't be read, and, with `filesOnly`, a
- * directory right under `dir`.
+ * directory right under `dir` unless it is one of `directoryExceptions`.
+ * An exception is still walked with the same symlink guard; it is not a
+ * blanket exemption for arbitrary registry subtrees.
  */
-function reportEntriesUnder(projectRoot, dir, filesOnly, report) {
+function reportEntriesUnder(projectRoot, dir, filesOnly, report, directoryExceptions = new Set()) {
   let entries
   try {
     entries = readdirSync(join(projectRoot, dir), { withFileTypes: true })
@@ -101,8 +107,10 @@ function reportEntriesUnder(projectRoot, dir, filesOnly, report) {
     if (entry.isSymbolicLink()) {
       report(path, 'is a symlink')
     } else if (entry.isDirectory()) {
-      if (filesOnly) report(path, 'is not a file')
-      else reportEntriesUnder(projectRoot, path, false, report)
+      if (filesOnly && !directoryExceptions.has(path)) report(path, 'is not a file')
+      else reportEntriesUnder(projectRoot, path, false, report, directoryExceptions)
+    } else if (entry.isFile() && directoryExceptions.has(path)) {
+      report(path, 'is not a directory')
     } else if (!entry.isFile()) {
       report(path, 'is neither a file nor a directory')
     }
@@ -206,7 +214,13 @@ export function unsafeWritePlaces(projectRoot, written = [], { activeTheme = pro
     reportEntriesUnder(projectRoot, 'app/(templates)', false, report)
   }
   if (!reported('.nextspark') && !reported('.nextspark/registries')) {
-    reportEntriesUnder(projectRoot, '.nextspark/registries', true, report)
+    reportEntriesUnder(
+      projectRoot,
+      '.nextspark/registries',
+      true,
+      report,
+      new Set([TEMPLATE_SCOPES_DIRECTORY])
+    )
   }
   return unsafe
 }

package/scripts/build/registry.mjs

@@ -21,6 +21,7 @@ import '../utils/console-guard.mjs'
 import { join, dirname, resolve } from 'path'
 import { fileURLToPath } from 'url'
 import { existsSync } from 'fs'
+import { lstat, readdir, readFile } from 'fs/promises'
 import dotenv from 'dotenv'
 
 // Load .env from the correct project root
@@ -67,7 +68,12 @@ import { generatePluginRegistry, generatePluginRegistryClient } from './registry
 import { generateEntityRegistry, generateEntityRegistryClient } from './registry/generators/entity-registry.mjs'
 import { generateEntityTypes } from './registry/generators/entity-types.mjs'
 import { generateThemeRegistry } from './registry/generators/theme-registry.mjs'
-import { generateTemplateRegistry, generateTemplateRegistryClient } from './registry/generators/template-registry.mjs'
+import {
+  generateTemplateRegistry,
+  generateTemplateRegistryClient,
+  generateTemplateScopeRegistries,
+  SCOPE_MARKER
+} from './registry/generators/template-registry.mjs'
 import { generateEmailRegistry } from './registry/generators/email-registry.mjs'
 import { generateBlockRegistry, generateBlockRegistryClient, generateBlockRegistryLazy } from './registry/generators/block-registry.mjs'
 import { generateIconRegistry } from './registry/generators/icon-registry.mjs'
@@ -160,6 +166,52 @@ async function generateRegistryFiles(CONFIG, plugins, entities, themes, template
       log(`${file.name}`, 'success')
     }
 
+    // Each route imports its own tiny registry rather than the global one.
+    // Build a complete replacement before cleanup so a theme change can never
+    // leave an existing route pointing at an old component import.
+    const templateScopes = await generateTemplateScopeRegistries(templates, CONFIG, templateAnalysis)
+    await files.mkdir(templateScopes.directory, { recursive: true })
+    const generated = new Set(templateScopes.files.map(file => file.path))
+
+    async function removeStaleScopedFiles(directory) {
+      let entries
+      try {
+        entries = await readdir(directory, { withFileTypes: true })
+      } catch (error) {
+        if (error?.code === 'ENOENT') return
+        throw error
+      }
+      for (const entry of entries) {
+        const path = join(directory, entry.name)
+        const stat = await lstat(path)
+        if (stat.isSymbolicLink()) continue
+        if (stat.isDirectory()) {
+          await removeStaleScopedFiles(path)
+          continue
+        }
+        if (!stat.isFile() || generated.has(path) || !path.endsWith('.ts')) continue
+        // Only files bearing our explicit marker are owned by this generator.
+        if ((await readFile(path, 'utf8')).includes(SCOPE_MARKER)) await files.rm(path, { force: true })
+      }
+      if (directory !== templateScopes.directory) {
+        try {
+          const remaining = await readdir(directory)
+          if (remaining.length === 0) {
+            await files.rmdir(directory)
+          }
+        } catch {
+          // Ignore if directory disappeared or cannot be removed
+        }
+      }
+    }
+
+    await removeStaleScopedFiles(templateScopes.directory)
+    for (const file of templateScopes.files) {
+      await files.mkdir(dirname(file.path), { recursive: true })
+      await files.writeFile(file.path, file.content, 'utf8')
+    }
+    log(`template-scopes (${templateScopes.files.length / 2})`, 'success')
+
   } catch (error) {
     logFailure('Error writing registry files', error)
     process.exit(1)

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

@@ -9,7 +9,7 @@ import { Loader2, CheckCircle, XCircle, Users, LogIn, UserPlus } from 'lucide-re
 import { toast } from 'sonner'
 import Link from 'next/link'
 import { sel } from '@nextsparkjs/core/selectors'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/(auth)/accept-invite/[token]/page'
 import { withBasePath } from '@nextsparkjs/core/lib/base-path'
 
 type InvitationStatus = 'loading' | 'valid' | 'accepting' | 'accepted' | 'error' | 'expired' | 'not_found' | 'email_mismatch' | 'already_member' | 'requires_auth'

package/templates/app/(auth)/auth-error/page.tsx

@@ -1,7 +1,7 @@
 import type { Metadata } from 'next'
 import { Suspense } from 'react'
 import { AuthErrorPage } from '@nextsparkjs/core/components/auth/pages/AuthErrorPage'
-import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/registries/template-scopes/server/(auth)/auth-error/page'
 
 const defaultMetadata: Metadata = {
   title: 'Authentication Error',

package/templates/app/(auth)/forgot-password/page.tsx

@@ -14,7 +14,7 @@ import { Input } from '@nextsparkjs/core/components/ui/input';
 import { Label } from '@nextsparkjs/core/components/ui/label';
 import { Alert, AlertDescription } from '@nextsparkjs/core/components/ui/alert';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@nextsparkjs/core/components/ui/card';
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/(auth)/forgot-password/page'
 
 
 function ForgotPasswordPage() {

package/templates/app/(auth)/layout.tsx

@@ -1,7 +1,7 @@
 import { Suspense } from 'react'
 import type { Metadata } from 'next'
 import { AuthWrapper } from '@nextsparkjs/core/components/auth/layouts/AuthWrapper'
-import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/registries/template-scopes/server/(auth)/layout'
 
 const defaultMetadata: Metadata = {
   title: {

package/templates/app/(auth)/login/page.tsx

@@ -1,6 +1,6 @@
 import type { Metadata } from 'next'
 import { LoginForm } from '@nextsparkjs/core/components/auth/forms/LoginForm'
-import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/registries/template-scopes/server/(auth)/login/page'
 
 export const dynamic = 'force-dynamic'
 

package/templates/app/(auth)/reset-password/page.tsx

@@ -18,7 +18,7 @@ import { Label } from "@nextsparkjs/core/components/ui/label";
 import { PasswordInput } from "@nextsparkjs/core/components/ui/password-input";
 import { Alert, AlertDescription } from "@nextsparkjs/core/components/ui/alert";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@nextsparkjs/core/components/ui/card";
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/(auth)/reset-password/page'
 import { sel } from '@nextsparkjs/core/selectors'
 
 function ResetPasswordContent() {

package/templates/app/(auth)/signup/page.tsx

@@ -2,7 +2,7 @@ import { Suspense } from 'react'
 import type { Metadata } from 'next'
 import { redirect } from 'next/navigation'
 import { SignupForm } from '@nextsparkjs/core/components/auth/forms/SignupForm'
-import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/registries/template-scopes/server/(auth)/signup/page'
 import { AUTH_CONFIG } from '@nextsparkjs/core/lib/config'
 import { resolveAuthMethods } from '@nextsparkjs/core/lib/auth/auth-methods'
 import { TeamService } from '@nextsparkjs/core/lib/services'

package/templates/app/(auth)/verify-email/page.tsx

@@ -5,7 +5,7 @@ import { useSearchParams, useRouter } from "next/navigation";
 import { Suspense, useEffect, useState } from "react";
 import { Button } from '@nextsparkjs/core/components/ui/button';
 import { Alert, AlertDescription } from '@nextsparkjs/core/components/ui/alert';
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/(auth)/verify-email/page'
 import { sel } from '@nextsparkjs/core/selectors'
 import { withBasePath } from '@nextsparkjs/core/lib/base-path'
 

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

@@ -21,7 +21,7 @@ import {
   getEntityBasePath,
 } from '@nextsparkjs/core/lib/entities/schema-generator'
 import { getEntityRegistry, setEntityRegistry } from '@nextsparkjs/core/lib/entities/queries'
-import { TemplateService } from '@nextsparkjs/core/lib/services/template.service'
+import { hasTemplateOverride, getTemplateComponent } from '@nextsparkjs/registries/template-scopes/server/(public)/[...slug]/page'
 import { resolvePublicEntityFromUrl } from '@nextsparkjs/core/lib/api/entity/public-resolver'
 import { PublicEntityGrid } from '@nextsparkjs/core/components/public/entities/PublicEntityGrid'
 import type { EntityConfig } from '@nextsparkjs/core/lib/entities/types'
@@ -307,8 +307,8 @@ export default async function DynamicPublicPage({
     // === SINGLE ITEM PAGE ===
     // Check for theme template override first
     const templatePath = buildTemplatePath(entity)
-    if (TemplateService.hasOverride(templatePath)) {
-      const Template = TemplateService.getComponent(templatePath)
+    if (hasTemplateOverride(templatePath)) {
+      const Template = getTemplateComponent(templatePath)
       if (Template) {
         // Template handles its own data fetching and rendering
         // Pass params in the format expected by the template

package/templates/app/(public)/layout.tsx

@@ -2,7 +2,7 @@ import { Suspense } from "react"
 import type { Metadata } from "next"
 import { PublicNavbar } from '@nextsparkjs/core/components/app/layouts/PublicNavbar'
 import { PublicFooter } from '@nextsparkjs/core/components/app/layouts/PublicFooter'
-import { getTemplateOrDefault, getMetadataOrDefault } from "@nextsparkjs/core/lib/template-resolver"
+import { getTemplateOrDefault, getMetadataOrDefault } from "@nextsparkjs/registries/template-scopes/server/(public)/layout"
 
 // ✅ MINIMAL GENERIC METADATA (cliente puede override con template)
 const defaultMetadata: Metadata = {

package/templates/app/(public)/page.tsx

@@ -1,5 +1,5 @@
 import { redirect } from 'next/navigation'
-import { getTemplateOrDefault } from "@nextsparkjs/core/lib/template-resolver"
+import { getTemplateOrDefault } from "@nextsparkjs/registries/template-scopes/server/(public)/page"
 
 /**
  * Default Public Home Page (CORE)

package/templates/app/403/page.tsx

@@ -6,7 +6,7 @@ import { useSearchParams } from 'next/navigation'
 import { Suspense } from 'react'
 import { Button } from '@nextsparkjs/core/components/ui/button'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@nextsparkjs/core/components/ui/card'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/403/page'
 
 function ForbiddenContent() {
   const searchParams = useSearchParams()!

package/templates/app/dashboard/(main)/[entity]/[id]/edit/page.tsx

@@ -6,7 +6,7 @@ import { useEffect, useState } from 'react'
 import { clientEntityRegistry, ensureClientInitialized, type ClientEntityConfig } from '@nextsparkjs/registries/entity-registry.client'
 import { EntityFormWrapper } from '@nextsparkjs/core/components/entities/wrappers/EntityFormWrapper'
 import { BuilderEditorView } from '@nextsparkjs/core/components/dashboard/block-editor/builder-editor-view'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/(main)/[entity]/[id]/edit/page'
 import { getEntityData } from '@nextsparkjs/core/lib/api/entities'
 
 function EntityEditPage() {

package/templates/app/dashboard/(main)/[entity]/[id]/page.tsx

@@ -2,7 +2,7 @@ import { notFound, redirect } from 'next/navigation'
 import { getEntity, getEntityRegistry, getChildEntities, setEntityRegistry } from '@nextsparkjs/core/lib/entities/queries'
 import { EntityDetailWrapper } from '@nextsparkjs/core/components/entities/wrappers/EntityDetailWrapper'
 import type { Metadata } from 'next'
-import { TemplateService } from '@nextsparkjs/core/lib/services/template.service'
+import { hasTemplateOverride, getTemplateComponent } from '@nextsparkjs/registries/template-scopes/server/dashboard/(main)/[entity]/[id]/page'
 import type { EntityConfig, ChildEntityDefinition } from '@nextsparkjs/core/lib/entities/types'
 // Import registry directly - webpack resolves @nextsparkjs/registries alias at compile time
 import { ENTITY_REGISTRY, ENTITY_METADATA } from '@nextsparkjs/registries/entity-registry'
@@ -29,8 +29,8 @@ async function EntityDetailPage({ params }: PageProps) {
   // Check if there's a specific template override for this entity
   // e.g., app/dashboard/(main)/boards/[id]/page.tsx for boards
   const specificTemplatePath = `app/dashboard/(main)/${entitySlug}/[id]/page.tsx`
-  if (TemplateService.hasOverride(specificTemplatePath)) {
-    const OverrideComponent = TemplateService.getComponent(specificTemplatePath)
+  if (hasTemplateOverride(specificTemplatePath)) {
+    const OverrideComponent = getTemplateComponent(specificTemplatePath)
     if (OverrideComponent) {
       console.log(`🎨 Entity-specific template override applied for ${specificTemplatePath}`)
       return <OverrideComponent params={params} />
@@ -82,4 +82,4 @@ export const metadata: Metadata = {
   description: 'View entity details'
 }
 
-export default EntityDetailPage
+export default EntityDetailPage

package/templates/app/dashboard/(main)/[entity]/create/page.tsx

@@ -6,7 +6,7 @@ import { useEffect, useState } from 'react'
 import { clientEntityRegistry, ensureClientInitialized, type ClientEntityConfig } from '@nextsparkjs/registries/entity-registry.client'
 import { EntityFormWrapper } from '@nextsparkjs/core/components/entities/wrappers/EntityFormWrapper'
 import { BuilderEditorView } from '@nextsparkjs/core/components/dashboard/block-editor/builder-editor-view'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/(main)/[entity]/create/page'
 
 function EntityCreatePage() {
   const params = useParams()!

package/templates/app/dashboard/(main)/[entity]/loading.tsx

@@ -1,5 +1,5 @@
 import { Skeleton } from '@nextsparkjs/core/components/ui/skeleton'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/(main)/[entity]/loading'
 
 function EntityLoading() {
   return (

package/templates/app/dashboard/(main)/[entity]/page.tsx

@@ -2,7 +2,7 @@ import { notFound } from 'next/navigation'
 import { getEntity, getEntityRegistry, setEntityRegistry } from '@nextsparkjs/core/lib/entities/queries'
 import { EntityListWrapper } from '@nextsparkjs/core/components/entities/wrappers/EntityListWrapper'
 import type { Metadata } from 'next'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/(main)/[entity]/page'
 import type { EntityConfig, ChildEntityDefinition } from '@nextsparkjs/core/lib/entities/types'
 // Import registry directly - webpack resolves @nextsparkjs/registries alias at compile time
 import { ENTITY_REGISTRY, ENTITY_METADATA } from '@nextsparkjs/registries/entity-registry'

package/templates/app/dashboard/(main)/layout.tsx

@@ -14,7 +14,7 @@ import { redirect } from 'next/navigation'
 import { DashboardShell } from '@nextsparkjs/core/components/dashboard/layouts/DashboardShell'
 import { serializeEntityConfig, type SerializableEntityConfig } from '@nextsparkjs/core/lib/entities/serialization'
 import { setEntityRegistry } from '@nextsparkjs/core/lib/entities/queries'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/(main)/layout'
 import type { EntityConfig, ChildEntityDefinition } from '@nextsparkjs/core/lib/entities/types'
 import { checkPermission } from '@nextsparkjs/core/lib/permissions/check'
 import { getDashboardTeamId } from '@nextsparkjs/core/lib/teams/dashboard-team'

package/templates/app/dashboard/(main)/loading.tsx

@@ -1,5 +1,5 @@
 import { SkeletonDashboardHome } from '@nextsparkjs/core/components/ui/skeleton-dashboard'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/(main)/loading'
 
 function DashboardLoading() {
   return <SkeletonDashboardHome />

package/templates/app/dashboard/(main)/media/page.tsx

@@ -48,7 +48,7 @@ import { useDebounce } from '@nextsparkjs/core/hooks/useDebounce'
 import { useToast } from '@nextsparkjs/core/hooks/useToast'
 import { sel } from '@nextsparkjs/core/lib/selectors'
 import { usePermissions } from '@nextsparkjs/core/lib/permissions/hooks'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/(main)/media/page'
 import type { Media, MediaListOptions } from '@nextsparkjs/core/lib/media/types'
 import type { Permission } from '@nextsparkjs/core/lib/permissions/types'
 import { withBasePathIfInApp } from '@nextsparkjs/core/lib/base-path'

package/templates/app/dashboard/(main)/page.tsx

@@ -7,7 +7,7 @@ import { Button } from '@nextsparkjs/core/components/ui/button'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@nextsparkjs/core/components/ui/card'
 import { Badge } from '@nextsparkjs/core/components/ui/badge'
 import { useTranslations } from 'next-intl'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/(main)/page'
 
 import {
   Loader2,

package/templates/app/dashboard/(main)/patterns/[id]/edit/page.tsx

@@ -14,7 +14,7 @@ import { EntityFormWrapper } from '@nextsparkjs/core/components/entities/wrapper
 import { BuilderEditorView } from '@nextsparkjs/core/components/dashboard/block-editor/builder-editor-view'
 import { Alert, AlertDescription } from '@nextsparkjs/core/components/ui/alert'
 import { getEntityData } from '@nextsparkjs/core/lib/api/entities'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/(main)/patterns/[id]/edit/page'
 
 function PatternEditPage() {
   const params = useParams()!

package/templates/app/dashboard/(main)/patterns/[id]/page.tsx

@@ -5,7 +5,7 @@
  */
 
 import { redirect } from 'next/navigation'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/(main)/patterns/[id]/page'
 
 interface PageProps {
   params: Promise<{

package/templates/app/dashboard/(main)/patterns/[id]/reports/page.tsx

@@ -17,7 +17,7 @@ import { Button } from '@nextsparkjs/core/components/ui/button'
 import { Alert, AlertDescription, AlertTitle } from '@nextsparkjs/core/components/ui/alert'
 import { Skeleton } from '@nextsparkjs/core/components/ui/skeleton'
 import { getEntityData } from '@nextsparkjs/core/lib/api/entities'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/(main)/patterns/[id]/reports/page'
 
 interface PatternData {
   id: string

package/templates/app/dashboard/(main)/patterns/create/page.tsx

@@ -12,7 +12,7 @@ import { clientEntityRegistry, ensureClientInitialized, type ClientEntityConfig
 import { EntityFormWrapper } from '@nextsparkjs/core/components/entities/wrappers/EntityFormWrapper'
 import { BuilderEditorView } from '@nextsparkjs/core/components/dashboard/block-editor/builder-editor-view'
 import { Alert, AlertDescription } from '@nextsparkjs/core/components/ui/alert'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/(main)/patterns/create/page'
 
 function PatternsCreatePage() {
   const router = useRouter()

package/templates/app/dashboard/(main)/patterns/page.tsx

@@ -28,7 +28,7 @@ import type { Permission } from '@nextsparkjs/core/lib/permissions/types'
 import type { QuickAction, DropdownAction } from '@nextsparkjs/core/components/entities/entity-table.types'
 import { sel } from '@nextsparkjs/core/lib/test'
 import { toast } from 'sonner'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/(main)/patterns/page'
 
 interface PatternItem {
   id: string

package/templates/app/dashboard/features/analytics/page.tsx

@@ -4,7 +4,7 @@ import { FeatureGate } from '@nextsparkjs/core/components/billing/FeatureGate'
 import { FeaturePlaceholder } from '@nextsparkjs/core/components/billing/FeaturePlaceholder'
 import { BarChart3 } from 'lucide-react'
 import { useTranslations } from 'next-intl'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/features/analytics/page'
 
 function AdvancedAnalyticsPage() {
   const t = useTranslations('features')

package/templates/app/dashboard/features/automation/page.tsx

@@ -4,7 +4,7 @@ import { FeatureGate } from '@nextsparkjs/core/components/billing/FeatureGate'
 import { FeaturePlaceholder } from '@nextsparkjs/core/components/billing/FeaturePlaceholder'
 import { Zap } from 'lucide-react'
 import { useTranslations } from 'next-intl'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/features/automation/page'
 
 function TaskAutomationPage() {
   const t = useTranslations('features')

package/templates/app/dashboard/features/layout.tsx

@@ -1,5 +1,5 @@
 import { type ReactNode } from 'react'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/features/layout'
 
 interface FeaturesLayoutProps {
   children: ReactNode

package/templates/app/dashboard/features/loading.tsx

@@ -1,5 +1,5 @@
 import { SkeletonFeaturePlaceholder } from '@nextsparkjs/core/components/ui/skeleton-features'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/features/loading'
 
 function FeaturesLoading() {
   return <SkeletonFeaturePlaceholder />

package/templates/app/dashboard/features/webhooks/page.tsx

@@ -4,7 +4,7 @@ import { FeatureGate } from '@nextsparkjs/core/components/billing/FeatureGate'
 import { FeaturePlaceholder } from '@nextsparkjs/core/components/billing/FeaturePlaceholder'
 import { Webhook } from 'lucide-react'
 import { useTranslations } from 'next-intl'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/features/webhooks/page'
 
 function WebhooksPage() {
   const t = useTranslations('features')

package/templates/app/dashboard/layout.tsx

@@ -59,7 +59,7 @@ function DashboardLayoutContent({ children }: { children: React.ReactNode }) {
         Children run within authenticated boundary -
         nested layouts CAN be themed but security is guaranteed
       */}
-      <div key="dashboard-children" data-cy="dashboard-container">{children}</div>
+      <div key="dashboard-children" id="dashboard-container" data-cy="dashboard-container" data-testid="dashboard-container">{children}</div>
     </>
   )
 }

package/templates/app/dashboard/permission-denied/page.tsx

@@ -5,7 +5,7 @@
  * This page is displayed when a user attempts to access a resource they don't have permission for.
  */
 import { NoPermission } from '@nextsparkjs/core/components/permissions/NoPermission'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/permission-denied/page'
 
 interface PermissionDeniedPageProps {
   searchParams: Promise<{

package/templates/app/dashboard/settings/api-keys/loading.tsx

@@ -1,5 +1,5 @@
 import { SkeletonApiKeysPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/settings/api-keys/loading'
 
 function ApiKeysLoading() {
   return <SkeletonApiKeysPage />

package/templates/app/dashboard/settings/api-keys/page.tsx

@@ -35,7 +35,7 @@ import {
 import { CreateApiKeyDialog } from '@nextsparkjs/core/components/api/keys/CreateApiKeyDialog';
 import { ApiKeyDisplay } from '@nextsparkjs/core/components/api/keys/ApiKeyDisplay';
 import { toast } from 'sonner';
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/settings/api-keys/page'
 import { sel } from '@nextsparkjs/core/selectors'
 import { withBasePath } from '@nextsparkjs/core/lib/base-path'
 

package/templates/app/dashboard/settings/billing/loading.tsx

@@ -1,5 +1,5 @@
 import { SkeletonBillingPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/settings/billing/loading'
 
 function BillingLoading() {
   return <SkeletonBillingPage />

package/templates/app/dashboard/settings/billing/page.tsx

@@ -16,7 +16,7 @@ import {
 } from 'lucide-react'
 import { sel } from '@nextsparkjs/core/selectors'
 import { useTranslations } from 'next-intl'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/settings/billing/page'
 import { useInvoices } from '@nextsparkjs/core/hooks/useInvoices'
 import { useSubscription } from '@nextsparkjs/core/hooks/useSubscription'
 import { InvoicesTable } from '@nextsparkjs/core/components/billing'

package/templates/app/dashboard/settings/invoices/[invoiceNumber]/page.tsx

@@ -7,7 +7,7 @@ import { Button } from '@nextsparkjs/core/components/ui/button'
 import { Separator } from '@nextsparkjs/core/components/ui/separator'
 import { ArrowLeft, Printer, Loader2 } from 'lucide-react'
 import { useTranslations } from 'next-intl'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/settings/invoices/[invoiceNumber]/page'
 import { useInvoice } from '@nextsparkjs/core/hooks/useInvoice'
 import { useTeam } from '@nextsparkjs/core/hooks/useTeam'
 import { InvoiceStatusBadge } from '@nextsparkjs/core/components/billing/InvoiceStatusBadge'

package/templates/app/dashboard/settings/invoices/loading.tsx

@@ -1,5 +1,5 @@
 import { SkeletonInvoicesPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/settings/invoices/loading'
 
 function InvoicesLoading() {
   return <SkeletonInvoicesPage />

package/templates/app/dashboard/settings/invoices/page.tsx

@@ -5,7 +5,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@next
 import { Button } from '@nextsparkjs/core/components/ui/button'
 import { Calendar } from 'lucide-react'
 import { useTranslations } from 'next-intl'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/settings/invoices/page'
 import { useInvoices } from '@nextsparkjs/core/hooks/useInvoices'
 import { InvoicesTable } from '@nextsparkjs/core/components/billing'
 

package/templates/app/dashboard/settings/layout.tsx

@@ -11,7 +11,7 @@ import { ArrowLeft } from 'lucide-react'
 import { useState, useCallback, useEffect } from 'react'
 import { sel } from '@nextsparkjs/core/selectors'
 import { useTranslations } from 'next-intl'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/settings/layout'
 import { isSettingsPageEnabled } from '@nextsparkjs/core/lib/config/config-sync'
 
 /**

package/templates/app/dashboard/settings/loading.tsx

@@ -1,5 +1,5 @@
 import { SkeletonSettingsOverview } from '@nextsparkjs/core/components/ui/skeleton-settings'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/settings/loading'
 
 function SettingsLoading() {
   return <SkeletonSettingsOverview />

package/templates/app/dashboard/settings/notifications/loading.tsx

@@ -1,5 +1,5 @@
 import { SkeletonNotificationsPage } from '@nextsparkjs/core/components/ui/skeleton-settings'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/settings/notifications/loading'
 
 function NotificationsLoading() {
   return <SkeletonNotificationsPage />

package/templates/app/dashboard/settings/notifications/page.tsx

@@ -20,7 +20,7 @@ import { sel } from '@nextsparkjs/core/selectors'
 import { useTranslations } from 'next-intl'
 import { useUserWithMetaSettings } from '@nextsparkjs/core/hooks/useUserSettings'
 import { NotificationsPageSkeleton } from '@nextsparkjs/core/components/settings/SettingsPageSkeleton'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/settings/notifications/page'
 
 function NotificationsPage() {
   const t = useTranslations('settings')

package/templates/app/dashboard/settings/page.tsx

@@ -14,7 +14,7 @@ import {
   Key,
   type LucideIcon
 } from 'lucide-react'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/settings/page'
 
 // Icon mapping for settings pages
 const SETTINGS_ICONS: Record<string, LucideIcon> = {