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

package/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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> = {

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

@@ -1,5 +1,5 @@
 import { SkeletonPasswordPage } 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/password/loading'
 
 function PasswordLoading() {
   return <SkeletonPasswordPage />

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

@@ -21,7 +21,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@next
 import { Checkbox } from "@nextsparkjs/core/components/ui/checkbox";
 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/password/page'
 
 function UpdatePasswordPage() {
   const { changePassword, user } = useAuth();

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

@@ -1,5 +1,5 @@
 import { SkeletonPlansPage } 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/plans/loading'
 
 function PlansLoading() {
   return <SkeletonPlansPage />

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

@@ -2,7 +2,7 @@
 
 import { useCallback, useState } from 'react'
 import { useTranslations } from 'next-intl'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/settings/plans/page'
 import { PricingTable } from '@nextsparkjs/core/components/billing'
 import { fetchWithTeam } from '@nextsparkjs/core/lib/api/entities'
 import { toast } from 'sonner'

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

@@ -1,5 +1,5 @@
 import { SkeletonProfileForm } 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/profile/loading'
 
 function ProfileLoading() {
   return <SkeletonProfileForm />

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

@@ -63,7 +63,7 @@ import { profileSchema, ProfileFormData } from '@nextsparkjs/core/lib/validation
 import { countries, timezones } from '@nextsparkjs/core/lib/countries-timezones'
 import { sel } from '@nextsparkjs/core/selectors'
 import { useLocale, useTranslations } from 'next-intl'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/settings/profile/page'
 import { withBasePath } from '@nextsparkjs/core/lib/base-path'
 
 // Language options

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

@@ -1,5 +1,5 @@
 import { SkeletonSecurityPage } 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/security/loading'
 
 function SecurityLoading() {
   return <SkeletonSecurityPage />

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

@@ -35,7 +35,7 @@ import {
 import { useTranslations } from 'next-intl'
 import { useUserWithMetaSettings } from '@nextsparkjs/core/hooks/useUserSettings'
 import { SecurityPageSkeleton } from '@nextsparkjs/core/components/settings/SettingsPageSkeleton'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/settings/security/page'
 
 function SecurityPage() {
   const t = useTranslations('settings')

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

@@ -1,5 +1,5 @@
 import { SkeletonTeamsPage } 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/teams/loading'
 
 function TeamsLoading() {
   return <SkeletonTeamsPage />

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

@@ -16,7 +16,7 @@ import { CreateTeamDialog } from '@nextsparkjs/core/components/teams/CreateTeamD
 import { InlineEditableField } from '@nextsparkjs/core/components/teams/InlineEditableField'
 import { sel } from '@nextsparkjs/core/selectors'
 import { TeamRole } from '@nextsparkjs/core/lib/teams/types'
-import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-registry.client'
+import { getTemplateOrDefaultClient } from '@nextsparkjs/registries/template-scopes/client/dashboard/settings/teams/page'
 
 // Role icons map - core roles only, custom roles use fallback
 const roleIconsMap: Record<string, typeof Crown | null> = {

package/dist/templates/app/dashboard/settings/teams/permissions/page.tsx

@@ -4,7 +4,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from '@nextsparkjs/core/comp
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@nextsparkjs/core/components/ui/card'
 // Use PermissionService which reads from the build-time generated registry
 import { PermissionService } from '@nextsparkjs/core/lib/services/permission.service'
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/dashboard/settings/teams/permissions/page'
 
 /**
  * Team Permissions Page

package/dist/templates/app/devtools/api/[[...endpoint]]/page.tsx

@@ -1,5 +1,5 @@
 import { ApiRoutesService } from "@nextsparkjs/core/lib/services/api-routes.service"
-import { ApiExplorer } from "@nextsparkjs/core/components/devtools"
+import { ApiExplorer } from "@nextsparkjs/core/components/devtools/api-explorer"
 
 interface Props {
   params: Promise<{ endpoint?: string[] }>

package/dist/templates/app/devtools/config/page.tsx

@@ -1,5 +1,5 @@
 import { Suspense } from "react";
-import { ConfigViewer } from "@nextsparkjs/core/components/devtools";
+import { ConfigViewer } from "@nextsparkjs/core/components/devtools/ConfigViewer";
 import { Settings } from "lucide-react";
 import { getTranslations } from "next-intl/server";
 

package/dist/templates/app/devtools/layout.tsx

@@ -1,8 +1,9 @@
 import { DeveloperGuard } from "@nextsparkjs/core/components/app/guards/DeveloperGuard";
 import { DashboardProviders } from "@nextsparkjs/core/providers/DashboardProviders";
-import { DevtoolsSidebar, DevtoolsMobileHeader } from "@nextsparkjs/core/components/devtools";
+import { DevtoolsSidebar } from "@nextsparkjs/core/components/devtools/DevtoolsSidebar";
+import { DevtoolsMobileHeader } from "@nextsparkjs/core/components/devtools/DevtoolsMobileHeader";
 import { Metadata } from "next";
-import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/registries/template-scopes/server/devtools/layout'
 import { getPluginNavItems } from '@nextsparkjs/registries/plugin-registry'
 
 const defaultMetadata: Metadata = {

package/dist/templates/app/devtools/tests/[[...path]]/page.tsx

@@ -1,5 +1,5 @@
 import { Suspense } from "react";
-import { TestCasesViewer } from "@nextsparkjs/core/components/devtools";
+import { TestCasesViewer } from "@nextsparkjs/core/components/devtools/TestCasesViewer";
 import { FileText } from "lucide-react";
 import { getTranslations } from "next-intl/server";
 

package/dist/templates/app/layout.ppr.tsx

@@ -31,7 +31,7 @@ import { SessionCookieRefresher } from "@nextsparkjs/core/components/auth/Sessio
 import { ThemeProvider as NextThemeProvider } from "@nextsparkjs/core/providers/theme-provider"
 import { ThemeProvider as CustomThemeProvider } from "@nextsparkjs/core/lib/theme/ThemeProvider"
 import { Toaster } from "@nextsparkjs/core/components/ui/sonner"
-import { getMetadataOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getMetadataOrDefault } from '@nextsparkjs/registries/template-scopes/server/layout'
 import { DEFAULT_LOCALE, DEFAULT_THEME_MODE, STATIC_MESSAGES } from '@nextsparkjs/registries/translation-registry'
 
 const geistSans = Geist({

package/dist/templates/app/layout.tsx

@@ -20,7 +20,7 @@ import { getUserLocale } from '@nextsparkjs/core/lib/locale'
 import { TranslationContextManager } from "@nextsparkjs/core/providers/TranslationContextManager"
 import { SessionCookieRefresher } from "@nextsparkjs/core/components/auth/SessionCookieRefresher"
 import { PluginService } from '@nextsparkjs/core/lib/services'
-import { getMetadataOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getMetadataOrDefault } from '@nextsparkjs/registries/template-scopes/server/layout'
 import { getThemeSettings } from '@nextsparkjs/core/lib/theme/get-default-theme-mode'
 
 const geistSans = Geist({

package/dist/templates/app/public/page.tsx

@@ -1,4 +1,4 @@
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/public/page'
 
 // Default public page component  
 function DefaultPublicPage() {

package/dist/templates/app/superadmin/layout.tsx

@@ -6,7 +6,7 @@ import { DashboardProviders } from "@nextsparkjs/core/providers/DashboardProvide
 import { SuperadminSidebar } from "@nextsparkjs/core/components/superadmin/layouts/SuperadminSidebar";
 import { Loader2 } from 'lucide-react'
 import { Metadata } from "next";
-import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault, getMetadataOrDefault } from '@nextsparkjs/registries/template-scopes/server/superadmin/layout'
 import { getPluginNavItems } from '@nextsparkjs/registries/plugin-registry'
 
 const defaultMetadata: Metadata = {

package/dist/templates/app/superadmin/page.tsx

@@ -2,7 +2,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@next
 import { Button } from "@nextsparkjs/core/components/ui/button";
 import { Users, BarChart3, Settings, Shield } from "lucide-react";
 import Link from "next/link";
-import { getTemplateOrDefault } from '@nextsparkjs/core/lib/template-resolver'
+import { getTemplateOrDefault } from '@nextsparkjs/registries/template-scopes/server/superadmin/page'
 import { sel } from "@nextsparkjs/core/selectors"
 
 /**

package/dist/templates/app/superadmin/subscriptions/page.tsx

@@ -44,7 +44,7 @@ import {
 } from "lucide-react";
 import Link from "next/link";
 import { withBasePath, withBasePathIfInApp } from "@nextsparkjs/core/lib/base-path";
-import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-registry.client";
+import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-scopes/client/superadmin/subscriptions/page";
 import {
   SearchInput,
   PaginationControls,

package/dist/templates/app/superadmin/team-roles/page.tsx

@@ -28,7 +28,7 @@ import { PERMISSIONS_METADATA } from "@nextsparkjs/registries/permissions-regist
 import { getFullBillingMatrix } from "@nextsparkjs/core/lib/billing/queries";
 import { RolesPermissionsMatrix } from "@nextsparkjs/core/components/superadmin/tables/RolesPermissionsMatrix";
 import { PlanFeaturesMatrix } from "@nextsparkjs/core/components/superadmin/tables/PlanFeaturesMatrix";
-import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-registry.client";
+import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-scopes/client/superadmin/team-roles/page";
 
 /**
  * Team Roles & Permissions Page

package/dist/templates/app/superadmin/teams/[teamId]/page.tsx

@@ -42,7 +42,7 @@ import {
   TrendingUp,
 } from "lucide-react";
 import Link from "next/link";
-import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-registry.client";
+import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-scopes/client/superadmin/teams/[teamId]/page";
 import { withBasePath, withBasePathIfInApp } from "@nextsparkjs/core/lib/base-path"
 
 interface TeamOwner {

package/dist/templates/app/superadmin/teams/page.tsx

@@ -21,7 +21,7 @@ import {
 } from "lucide-react";
 import Link from "next/link";
 import { TeamsTable } from "@nextsparkjs/core/components/superadmin/tables/TeamsTable";
-import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-registry.client";
+import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-scopes/client/superadmin/teams/page";
 import {
   SearchInput,
   PaginationControls,

package/dist/templates/app/superadmin/users/[userId]/page.tsx

@@ -38,7 +38,7 @@ import {
   Database,
 } from "lucide-react";
 import Link from "next/link";
-import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-registry.client";
+import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-scopes/client/superadmin/users/[userId]/page";
 import { withBasePath } from "@nextsparkjs/core/lib/base-path"
 
 interface TeamMembership {

package/dist/templates/app/superadmin/users/page.tsx

@@ -31,7 +31,7 @@ import { UsersTable } from "@nextsparkjs/core/components/users/tables/UsersTable
 import { SuperAdminsTable } from "@nextsparkjs/core/components/users/tables/SuperAdminsTable";
 import { useSession } from "@nextsparkjs/core/lib/auth-client";
 import type { User } from "@nextsparkjs/core/types/user.types";
-import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-registry.client";
+import { getTemplateOrDefaultClient } from "@nextsparkjs/registries/template-scopes/client/superadmin/users/page";
 import {
   SearchInput,
   PaginationControls,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextsparkjs/core",
-  "version": "0.1.0-beta.190",
+  "version": "0.1.0-beta.191",
   "description": "NextSpark - The complete SaaS framework for Next.js",
   "license": "MIT",
   "author": "NextSpark <hello@nextspark.dev>",
@@ -239,10 +239,18 @@
       "types": "./dist/components/devtools/index.d.ts",
       "import": "./dist/components/devtools/index.js"
     },
+    "./components/devtools/*": {
+      "types": "./dist/components/devtools/*.d.ts",
+      "import": "./dist/components/devtools/*.js"
+    },
     "./components/devtools/api-tester": {
       "types": "./dist/components/devtools/api-tester/index.d.ts",
       "import": "./dist/components/devtools/api-tester/index.js"
     },
+    "./components/devtools/api-explorer": {
+      "types": "./dist/components/devtools/api-explorer/index.d.ts",
+      "import": "./dist/components/devtools/api-explorer/index.js"
+    },
     "./components/devtools/bdd": {
       "types": "./dist/components/devtools/bdd/index.d.ts",
       "import": "./dist/components/devtools/bdd/index.js"
@@ -490,13 +498,13 @@
     "typescript": "^5 || ^6",
     "uuid": "^13.0.0",
     "zod": "^4.3.6",
-    "@nextsparkjs/testing": "0.1.0-beta.190"
+    "@nextsparkjs/testing": "0.1.0-beta.191"
   },
   "scripts": {
     "postinstall": "node scripts/postinstall.mjs || true",
     "build": "tsup && pnpm build:dts",
     "build:js": "tsup",
-    "build:dts": "tsc -p tsconfig.dts.json || echo '⚠️  DTS generation completed with some type errors (partial coverage)'",
+    "build:dts": "tsc -p tsconfig.dts.json",
     "dev": "tsup --watch",
     "test": "jest",
     "test:watch": "jest --watch",