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

package/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/tests/jest/__mocks__/@nextsparkjs/registries/template-scopes/client.ts

@@ -0,0 +1,21 @@
+/**
+ * Mock Route-Scoped Client Template Registry for Jest tests
+ *
+ * No theme overrides a page in tests, so every page renders its default.
+ */
+
+import type { ComponentType } from 'react'
+
+export const CLIENT_TEMPLATE_REGISTRY: Record<string, any> = {}
+
+export function hasTemplateOverrideClient(_appPath: string): boolean {
+  return false
+}
+
+export function getClientTemplateComponent(_appPath: string): any | null {
+  return null
+}
+
+export function getTemplateOrDefaultClient<P>(_path: string, defaultComponent: ComponentType<P>): ComponentType<P> {
+  return defaultComponent
+}

package/tests/jest/__mocks__/@nextsparkjs/registries/template-scopes/server.ts

@@ -0,0 +1,23 @@
+/**
+ * Mock Route-Scoped Server Template Registry for Jest tests
+ *
+ * No theme overrides a page in tests, so every page renders its default.
+ */
+
+export const TEMPLATE_REGISTRY: Record<string, any> = {}
+
+export function hasTemplateOverride(_appPath: string): boolean {
+  return false
+}
+
+export function getTemplateComponent(_appPath: string): any | null {
+  return null
+}
+
+export function getTemplateOrDefault<T>(_appPath: string, defaultComponent: T): T {
+  return defaultComponent
+}
+
+export function getMetadataOrDefault<T>(_appPath: string, defaultMetadata: T): T {
+  return defaultMetadata
+}

package/tests/jest/__mocks__/next-intl-server.js

@@ -115,9 +115,9 @@ function format(template, params, locale) {
   )
 }
 
-async function getTranslations(opts) {
-  const locale = opts?.locale || 'en'
-  const namespace = opts?.namespace || ''
+async function getTranslations(namespaceOrOpts) {
+  const locale = typeof namespaceOrOpts === 'string' ? 'en' : namespaceOrOpts?.locale || 'en'
+  const namespace = typeof namespaceOrOpts === 'string' ? namespaceOrOpts : namespaceOrOpts?.namespace || ''
   const ns = loadNamespace(locale, namespace)
 
   return function t(key, params) {