@emberkit/core 0.3.8 → 0.4.1

package/dist/index.d.ts

@@ -17,7 +17,7 @@ export { Head } from './meta/index.js';
 export type { HeadProps } from './meta/index.js';
 export { generateMeta, generateBreadcrumbs, generateArticleSchema, generateProductSchema, } from './meta/index.js';
 export type { MetaData, OpenGraphData, TwitterCardData } from './meta/index.js';
-export type { FC, RouteComponent, RouteChildren } from './runtime/types.js';
+export type { FC, RouteComponent, RouteChildren, RouteParams } from './runtime/types.js';
 export type { Logger, LoggerOptions, LogLevel, RequestLog, ResponseLog } from './logger/types.js';
 export declare function defineConfig(config: Record<string, unknown>): Record<string, unknown>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,UAAU,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,KAAK,EACL,OAAO,EACP,MAAM,EACN,QAAQ,EACR,MAAM,GACP,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnF,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC1E,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,cAAc,EACd,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEhF,YAAY,EAAE,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE5E,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAElG,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAErF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,UAAU,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,KAAK,EACL,OAAO,EACP,MAAM,EACN,QAAQ,EACR,MAAM,GACP,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnF,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC1E,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,cAAc,EACd,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEhF,YAAY,EAAE,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEzF,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAElG,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAErF"}

package/dist/vite-plugin/index.js

@@ -126,10 +126,10 @@ export function emberkitVitePlugin(userOptions = {}) {
                 }
                 try {
                     const ssrModule = await server.ssrLoadModule(VIRTUAL_SSR_ENTRY);
-                    const html = await ssrModule.render(url, server);
-                    res.statusCode = 200;
+                    const result = await ssrModule.render(url, server);
+                    res.statusCode = result.status || 200;
                     res.setHeader('Content-Type', 'text/html');
-                    res.end(html);
+                    res.end(result.html || result);
                 }
                 catch (error) {
                     server.ssrFixStacktrace(error);
@@ -1131,7 +1131,7 @@ function processParagraphs(html, breaks) {
 }
 function generateSSREntry() {
     return `
-import { routes } from 'virtual:emberkit-routes';
+import { routes, notFoundRoute, errorRoute } from 'virtual:emberkit-routes';
 import { createElement } from '@emberkit/core';
 
 const matchRoute = (routes, pathname) => {
@@ -1170,12 +1170,12 @@ const renderToString = (element) => {
   if (typeof element === 'string') return escapeHtml(element);
   if (typeof element === 'number') return String(element);
   if (Array.isArray(element)) return element.map(renderToString).join('');
-  
+
   if (typeof element !== 'object' || !element.type) return '';
-  
+
   let { type, props } = element;
   props = props || {};
-  
+
   // Resolve function components
   let depth = 0;
   while (typeof type === 'function' && depth < 50) {
@@ -1197,22 +1197,22 @@ const renderToString = (element) => {
       return '';
     }
   }
-  
+
   if (type === 'Fragment' || type === 'React.Fragment') {
     const children = Array.isArray(props.children) ? props.children : [props.children];
     return children.filter(Boolean).map(renderToString).join('');
   }
-  
+
   const SELF_CLOSING = new Set(['area','base','br','col','embed','hr','img','input','link','meta','source','track','wbr']);
-  
+
   const children = Array.isArray(props.children) ? props.children : (props.children ? [props.children] : []);
   let childHtml = children.filter(c => c != null).map(renderToString).join('');
-  
+
   // Handle dangerouslySetInnerHTML
   if (props.dangerouslySetInnerHTML && props.dangerouslySetInnerHTML.__html) {
     childHtml = props.dangerouslySetInnerHTML.__html;
   }
-  
+
   const attrs = Object.entries(props)
     .filter(([k, v]) => k !== 'children' && k !== 'key' && k !== 'dangerouslySetInnerHTML' && v != null && typeof v !== 'function')
     .map(([k, v]) => {
@@ -1229,11 +1229,11 @@ const renderToString = (element) => {
       return ' ' + k + '="' + escapeHtml(String(v)) + '"';
     })
     .join('');
-  
+
   if (SELF_CLOSING.has(type)) {
     return '<' + type + attrs + '/>';
   }
-  
+
   return '<' + type + attrs + '>' + childHtml + '</' + type + '>';
 };
 
@@ -1249,24 +1249,25 @@ const escapeHtml = (str) => {
 
 export async function render(url, server) {
   const pathname = url.split('?')[0];
-  
+
   // Sort routes: static first, then dynamic
   const sortedRoutes = [...routes].sort((a, b) => {
     const aScore = a.path.includes(':') ? 0 : 1;
     const bScore = b.path.includes(':') ? 0 : 1;
     return bScore - aScore;
   });
-  
+
   const match = matchRoute(sortedRoutes, pathname);
-  
+
   let appHtml = '';
   let headContent = '';
-  
+  let status = 200;
+
   if (match) {
     try {
       const mod = await match.route.component();
       const Component = mod.default || mod;
-      
+
       // Get metadata if available
       if (mod.metadata) {
         if (mod.metadata.title) {
@@ -1276,24 +1277,56 @@ export async function render(url, server) {
           headContent += '<meta name="description" content="' + escapeHtml(mod.metadata.description) + '">\\n';
         }
       }
-      
+
       const element = createElement(Component, { params: match.params });
       appHtml = renderToString(element);
     } catch (e) {
       console.error('[SSR] Failed to render route:', pathname, e);
-      appHtml = '<div style="color: red; padding: 20px;">SSR Error: ' + escapeHtml(String(e)) + '</div>';
+      if (errorRoute) {
+        try {
+          status = 500;
+          const mod = await errorRoute();
+          const Component = mod.default || mod;
+          const errorInfo = {
+            status: 500,
+            message: e instanceof Error ? e.message : 'Internal Server Error',
+            error: e,
+          };
+          const element = createElement(Component, { error: errorInfo });
+          appHtml = renderToString(element);
+        } catch (fallbackError) {
+          console.error('[SSR] Failed to render 500 page:', fallbackError);
+          appHtml = '<div style="color: red; padding: 20px;">Internal Server Error</div>';
+        }
+      } else {
+        appHtml = '<div style="color: red; padding: 20px;">SSR Error: ' + escapeHtml(String(e)) + '</div>';
+        status = 500;
+      }
     }
   } else {
-    appHtml = '<div style="padding: 20px;">404 - Page not found</div>';
+    status = 404;
+    if (notFoundRoute) {
+      try {
+        const mod = await notFoundRoute();
+        const Component = mod.default || mod;
+        const element = createElement(Component, { });
+        appHtml = renderToString(element);
+      } catch (e) {
+        console.error('[SSR] Failed to render 404 page:', e);
+        appHtml = '<div style="padding: 20px;">404 - Page not found</div>';
+      }
+    } else {
+      appHtml = '<div style="padding: 20px;">404 - Page not found</div>';
+    }
   }
-  
+
   // Load and transform index.html
   const fs = await import('node:fs');
   const path = await import('node:path');
   const indexPath = path.join(server.config.root, 'index.html');
   let template = fs.readFileSync(indexPath, 'utf-8');
   template = await server.transformIndexHtml(url, template);
-  
+
   // Inject SSR content
   // Look for body with id="app" or div with id="app"
   if (template.includes('<body id="app">')) {
@@ -1303,13 +1336,13 @@ export async function render(url, server) {
   } else if (template.includes('<div id="app"/>')) {
     template = template.replace('<div id="app"/>', '<div id="app">' + appHtml + '</div>');
   }
-  
+
   // Inject head content if any
   if (headContent && template.includes('</head>')) {
     template = template.replace('</head>', headContent + '</head>');
   }
-  
-  return template;
+
+  return { html: template, status };
 }
 `;
 }
@@ -1360,10 +1393,23 @@ function scoreRoutePath(routePath) {
 }
 function generateRoutesCode(files, routeDir) {
     const routeEntries = [];
+    let notFoundRoute = 'null';
+    let errorRoute = 'null';
     for (const file of files) {
         const relativePath = relative(routeDir, file).replace(/\\/g, '/');
         const ext = file.split('.').pop() ?? '';
         const isMarkdown = ext === 'md' || ext === 'mdx';
+        // Check for special error pages
+        if (relativePath === '404.tsx' || relativePath === '404.ts' || relativePath === '404.jsx' || relativePath === '404.js') {
+            const importPath = file.replace(/\\/g, '/');
+            notFoundRoute = `() => import(${JSON.stringify(importPath)})`;
+            continue;
+        }
+        if (relativePath === '500.tsx' || relativePath === '500.ts' || relativePath === '500.jsx' || relativePath === '500.js') {
+            const importPath = file.replace(/\\/g, '/');
+            errorRoute = `() => import(${JSON.stringify(importPath)})`;
+            continue;
+        }
         // Skip special files
         if (relativePath.includes('_layout') ||
             relativePath.includes('_error') ||
@@ -1394,5 +1440,7 @@ function generateRoutesCode(files, routeDir) {
     // Sort static routes before dynamic routes so the emitted array already has
     // the correct priority order (defense-in-depth alongside runtime scoring).
     routeEntries.sort((a, b) => scoreRoutePath(b.path) - scoreRoutePath(a.path));
-    return `export const routes = [\n${routeEntries.map((r) => r.entry).join(',\n')}\n];`;
+    return `export const routes = [\n${routeEntries.map((r) => r.entry).join(',\n')}\n];
+export const notFoundRoute = ${notFoundRoute};
+export const errorRoute = ${errorRoute};`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emberkit/core",
-  "version": "0.3.8",
+  "version": "0.4.1",
   "type": "module",
   "private": false,
   "description": "Lightweight TypeScript-first JSX framework core",