@nextsparkjs/core 0.1.0-beta.2 → 0.1.0-beta.20

package/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/templates/app/api/v1/[entity]/[id]/child/[childType]/[childId]/route.ts

@@ -7,7 +7,12 @@
 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, setEntityRegistry } from '@nextsparkjs/core/lib/entities/queries'
+// Import registry directly - webpack resolves @nextsparkjs/registries alias at compile time
+import { ENTITY_REGISTRY, ENTITY_METADATA } from '@nextsparkjs/registries/entity-registry'
+
+// Initialize registry at module load time (before any handler runs)
+setEntityRegistry(ENTITY_REGISTRY, ENTITY_METADATA)
 
 interface RouteParams {
   entity: string
@@ -35,7 +40,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 +51,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 +163,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) {

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

@@ -7,7 +7,12 @@
 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, setEntityRegistry } from '@nextsparkjs/core/lib/entities/queries'
+// Import registry directly - webpack resolves @nextsparkjs/registries alias at compile time
+import { ENTITY_REGISTRY, ENTITY_METADATA } from '@nextsparkjs/registries/entity-registry'
+
+// Initialize registry at module load time (before any handler runs)
+setEntityRegistry(ENTITY_REGISTRY, ENTITY_METADATA)
 
 
 interface RouteParams {
@@ -34,7 +39,7 @@ export async function GET(
     }
 
     // Check if child entity exists using the new registry system
-    const childEntities = getChildEntities(resolution.entityName as EntityName)
+    const childEntities = getChildEntities(resolution.entityName)
     const childEntity = childEntities.find(child => child.name === childType)
 
     if (!childEntity) {
@@ -45,7 +50,7 @@ export async function GET(
     }
 
     // Get child config from registry
-    const childConfig = getEntity(childType as EntityName)
+    const childConfig = getEntity(childType)
     if (!childConfig) {
       return NextResponse.json(
         { error: `Child entity configuration "${childType}" not found` },
@@ -103,7 +108,7 @@ export async function POST(
     }
 
     // Check if child entity exists using the new registry system
-    const childEntities = getChildEntities(resolution.entityName as EntityName)
+    const childEntities = getChildEntities(resolution.entityName)
     const childEntity = childEntities.find(child => child.name === childType)
     console.log(`[ChildAPI] Found child entities for ${entity}:`, childEntities.map(c => c.name))
     console.log(`[ChildAPI] Looking for childType:`, childType)
@@ -117,7 +122,7 @@ export async function POST(
     }
 
     // Get child config from registry
-    const childConfig = getEntity(childType as EntityName)
+    const childConfig = getEntity(childType)
     console.log(`[ChildAPI] Child config for ${childType}:`, childConfig)
     if (!childConfig) {
       return NextResponse.json(

package/dist/templates/app/api/v1/[entity]/[id]/route.ts

@@ -1,9 +1,9 @@
 /**
  * Generic Entity Detail Route
- * 
+ *
  * Catch-all route that handles GET, PATCH, and DELETE requests for any registered entity.
  * Supports dual authentication (API Keys + Sessions).
- * 
+ *
  * Examples:
  * GET    /api/v1/products/123     -> Get product by ID
  * PATCH  /api/v1/products/123     -> Update product
@@ -13,12 +13,18 @@
  * DELETE /api/v1/orders/456       -> Delete order
  */
 
-import { 
-  handleGenericRead, 
-  handleGenericUpdate, 
-  handleGenericDelete, 
-  handleGenericOptions 
+import {
+  handleGenericRead,
+  handleGenericUpdate,
+  handleGenericDelete,
+  handleGenericOptions
 } from '@nextsparkjs/core/lib/api/entity/generic-handler'
+import { setEntityRegistry } from '@nextsparkjs/core/lib/entities/queries'
+// Import registry directly - webpack resolves @nextsparkjs/registries alias at compile time
+import { ENTITY_REGISTRY, ENTITY_METADATA } from '@nextsparkjs/registries/entity-registry'
+
+// Initialize registry at module load time (before any handler runs)
+setEntityRegistry(ENTITY_REGISTRY, ENTITY_METADATA)
 
 export const GET = handleGenericRead
 export const PATCH = handleGenericUpdate

package/dist/templates/app/api/v1/[entity]/route.ts

@@ -1,9 +1,9 @@
 /**
  * Generic Entity List Route
- * 
+ *
  * Catch-all route that handles GET and POST requests for any registered entity.
  * Supports dual authentication (API Keys + Sessions).
- * 
+ *
  * Examples:
  * GET  /api/v1/products     -> List products
  * POST /api/v1/products     -> Create product
@@ -11,11 +11,17 @@
  * POST /api/v1/orders       -> Create order
  */
 
-import { 
-  handleGenericList, 
-  handleGenericCreate, 
-  handleGenericOptions 
+import {
+  handleGenericList,
+  handleGenericCreate,
+  handleGenericOptions
 } from '@nextsparkjs/core/lib/api/entity/generic-handler'
+import { setEntityRegistry } from '@nextsparkjs/core/lib/entities/queries'
+// Import registry directly - webpack resolves @nextsparkjs/registries alias at compile time
+import { ENTITY_REGISTRY, ENTITY_METADATA } from '@nextsparkjs/registries/entity-registry'
+
+// Initialize registry at module load time (before any handler runs)
+setEntityRegistry(ENTITY_REGISTRY, ENTITY_METADATA)
 
 export const GET = handleGenericList
 export const POST = handleGenericCreate

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

@@ -1,9 +1,14 @@
 import { notFound, redirect } from 'next/navigation'
-import { getEntity, ENTITY_REGISTRY, getChildEntities, type EntityName } from '@nextsparkjs/core/lib/entities/queries'
+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 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'
+
+// Initialize registry at module load time (before any component renders)
+setEntityRegistry(ENTITY_REGISTRY, ENTITY_METADATA)
 
 // Type guard to check if entity is a full EntityConfig
 function isEntityConfig(entity: EntityConfig | ChildEntityDefinition): entity is EntityConfig {
@@ -33,11 +38,12 @@ async function EntityDetailPage({ params }: PageProps) {
   }
 
   // Verificar que la entidad existe en el registro
-  if (!(entitySlug in ENTITY_REGISTRY)) {
+  const registry = getEntityRegistry()
+  if (!(entitySlug in registry)) {
     notFound()
   }
 
-  const entityConfig = getEntity(entitySlug as EntityName)
+  const entityConfig = getEntity(entitySlug)
   if (!entityConfig || !isEntityConfig(entityConfig)) {
     notFound()
   }
@@ -60,7 +66,7 @@ async function EntityDetailPage({ params }: PageProps) {
   }
 
   // Get child entities for this parent entity
-  const childEntities = getChildEntities(entitySlug as EntityName)
+  const childEntities = getChildEntities(entitySlug)
   const childEntityNames = childEntities.map(child => child.name)
 
   return (
@@ -76,13 +82,14 @@ export async function generateMetadata({ params }: PageProps): Promise<Metadata>
   const resolvedParams = await params
   const entitySlug = resolvedParams.entity
 
-  if (!(entitySlug in ENTITY_REGISTRY)) {
+  const registry = getEntityRegistry()
+  if (!(entitySlug in registry)) {
     return {
       title: 'Not Found - Dashboard'
     }
   }
 
-  const entityConfig = getEntity(entitySlug as EntityName)
+  const entityConfig = getEntity(entitySlug)
   if (!entityConfig || !isEntityConfig(entityConfig)) {
     return {
       title: 'Not Found - Dashboard'

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

@@ -1,9 +1,15 @@
 import { notFound } from 'next/navigation'
-import { getEntity, ENTITY_REGISTRY, type EntityName } from '@nextsparkjs/core/lib/entities/queries'
+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 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'
+
+// Initialize registry at module load time (before any component renders)
+// This ensures the registry is available even if this page loads before the layout
+setEntityRegistry(ENTITY_REGISTRY, ENTITY_METADATA)
 
 // Type guard to check if entity is a full EntityConfig
 function isEntityConfig(entity: EntityConfig | ChildEntityDefinition): entity is EntityConfig {
@@ -20,11 +26,12 @@ async function EntityListPage({ params }: PageProps) {
   const entitySlug = resolvedParams.entity
 
   // Verificar que la entidad existe usando el nuevo registry
-  if (!(entitySlug in ENTITY_REGISTRY)) {
+  const registry = getEntityRegistry()
+  if (!(entitySlug in registry)) {
     notFound()
   }
 
-  const entityConfig = getEntity(entitySlug as EntityName)
+  const entityConfig = getEntity(entitySlug)
   if (!entityConfig || !isEntityConfig(entityConfig)) {
     notFound()
   }
@@ -61,13 +68,14 @@ export async function generateMetadata({ params }: PageProps): Promise<Metadata>
   const resolvedParams = await params
   const entitySlug = resolvedParams.entity
 
-  if (!(entitySlug in ENTITY_REGISTRY)) {
+  const registry = getEntityRegistry()
+  if (!(entitySlug in registry)) {
     return {
       title: 'Not Found - Dashboard'
     }
   }
 
-  const entityConfig = getEntity(entitySlug as EntityName)
+  const entityConfig = getEntity(entitySlug)
   if (!entityConfig || !isEntityConfig(entityConfig)) {
     return {
       title: 'Not Found - Dashboard'

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

@@ -1,15 +1,13 @@
 import { DashboardShell } from '@nextsparkjs/core/components/dashboard/layouts/DashboardShell'
-import { getRegisteredEntities } from '@nextsparkjs/core/lib/entities/queries'
 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 { TemplateService } from '@nextsparkjs/core/lib/services/template.service'
 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'
 
-// Debug: Check template override status at module load
-const LAYOUT_PATH = 'app/dashboard/(main)/layout.tsx'
-console.log('[MainLayout] Checking template override for:', LAYOUT_PATH)
-console.log('[MainLayout] hasTemplateOverride:', TemplateService.hasOverride(LAYOUT_PATH))
-console.log('[MainLayout] templateEntry:', TemplateService.getEntry(LAYOUT_PATH)?.template?.themeName)
+// Register entities globally so other parts of the app can access them via getRegisteredEntities()
+setEntityRegistry(ENTITY_REGISTRY, ENTITY_METADATA)
 
 // Type guard to check if entity is a full EntityConfig
 function isEntityConfig(entity: EntityConfig | ChildEntityDefinition): entity is EntityConfig {
@@ -23,11 +21,15 @@ function DefaultMainDashboardLayout({
 }: {
   children: React.ReactNode
 }) {
-  const allEntities = getRegisteredEntities()
+  // Get entities directly from the imported registry
+  const allEntities = Object.values(ENTITY_REGISTRY).map(entry => entry.config)
   // Filter to only include full EntityConfig (not child entities)
   const entities = allEntities.filter(isEntityConfig)
   const serializedEntities: SerializableEntityConfig[] = entities.map(serializeEntityConfig)
 
+  // DEBUG: Log entity data
+  console.log('[MainLayout] Entities count:', entities.length)
+
   return (
     <DashboardShell entities={serializedEntities}>
       {children}

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

@@ -78,7 +78,7 @@ function DefaultDashboardPage() {
         <div className="mb-8" data-cy="dashboard-welcome">
           <h1 className="text-3xl font-bold">{t('title')}</h1>
           <p className="text-muted-foreground mt-1">
-            {t('welcome', { name: user.firstName || user.email })}
+            {t('welcome', { name: user?.firstName || user?.email || '' })}
           </p>
         </div>
 

package/dist/templates/contents/themes/starter/components/.gitkeep

@@ -0,0 +1 @@
+# Add your theme-specific components here

package/dist/templates/contents/themes/starter/components/analytics/index.ts

@@ -0,0 +1,3 @@
+export { StatsCard } from './StatsCard'
+export { TasksChart } from './TasksChart'
+export { RecentActivity } from './RecentActivity'