@emkodev/emroute 1.6.6-beta.1 → 1.6.6-beta.2

package/dist/src/route/route.trie.js

@@ -0,0 +1,206 @@
+/**
+ * Route Trie
+ *
+ * Segment-based trie implementing RouteResolver for O(depth) route matching.
+ *
+ * Each URL segment maps to a trie node. Nodes are tried in order:
+ * static → dynamic (:param) → wildcard (:rest*). Backtracking handles
+ * cases where a dynamic path leads to a dead end but a wildcard at an
+ * ancestor would match.
+ *
+ * Static segment matching is case-sensitive, per RFC 3986.
+ *
+ * Accepts a RouteNode tree (the JSON-serializable manifest from Runtime)
+ * and converts it to an internal trie with Map-based static children for
+ * O(1) segment lookup.
+ */
+function createNode() {
+    return { static: new Map() };
+}
+/** Try decodeURIComponent, return the original segment on malformed input. */
+function safeDecode(segment) {
+    try {
+        return decodeURIComponent(segment);
+    }
+    catch {
+        return segment;
+    }
+}
+/**
+ * Split a normalized pathname into segments.
+ * Assumes leading slash, no trailing slash. Must NOT be called with '/'.
+ */
+function splitSegments(pathname) {
+    return pathname.substring(1).split('/');
+}
+/**
+ * Convert a RouteNode tree into a TrieNode tree.
+ * Recursively walks the RouteNode, converting Record children to Map
+ * and reconstructing URL patterns at each node.
+ */
+function convertNode(source, pattern) {
+    const node = createNode();
+    // Terminal route (has files or redirect)
+    if (source.files || source.redirect) {
+        node.route = source;
+        node.pattern = pattern;
+    }
+    // Error boundary
+    if (source.errorBoundary) {
+        node.errorBoundary = source.errorBoundary;
+    }
+    // Static children
+    if (source.children) {
+        for (const [segment, child] of Object.entries(source.children)) {
+            const childPattern = pattern === '/' ? `/${segment}` : `${pattern}/${segment}`;
+            node.static.set(segment, convertNode(child, childPattern));
+        }
+    }
+    // Dynamic child
+    if (source.dynamic) {
+        const { param, child } = source.dynamic;
+        const childPattern = pattern === '/' ? `/:${param}` : `${pattern}/:${param}`;
+        node.dynamic = { param, node: convertNode(child, childPattern) };
+    }
+    // Wildcard child
+    if (source.wildcard) {
+        const { param, child } = source.wildcard;
+        const childPattern = pattern === '/' ? `/:${param}*` : `${pattern}/:${param}*`;
+        node.wildcard = { param, node: convertNode(child, childPattern) };
+    }
+    return node;
+}
+/**
+ * Trie-based route resolver.
+ *
+ * Implements RouteResolver with O(depth) matching by walking the trie.
+ * Constructed from a RouteNode tree (produced by Runtime.scanRoutes).
+ */
+export class RouteTrie {
+    root;
+    constructor(tree) {
+        this.root = convertNode(tree, '/');
+    }
+    match(pathname) {
+        // Normalize: strip trailing slash (except bare '/')
+        if (pathname.length > 1 && pathname.endsWith('/')) {
+            pathname = pathname.slice(0, -1);
+        }
+        if (!pathname.startsWith('/')) {
+            pathname = '/' + pathname;
+        }
+        if (pathname === '/') {
+            if (this.root.route) {
+                return { node: this.root.route, pattern: '/', params: {} };
+            }
+            return undefined;
+        }
+        const segments = splitSegments(pathname);
+        return this.walk(this.root, segments, 0, {});
+    }
+    findErrorBoundary(pathname) {
+        if (pathname.length > 1 && pathname.endsWith('/')) {
+            pathname = pathname.slice(0, -1);
+        }
+        if (!pathname.startsWith('/')) {
+            pathname = '/' + pathname;
+        }
+        if (pathname === '/')
+            return this.root.errorBoundary;
+        const segments = splitSegments(pathname);
+        return this.walkForBoundary(this.root, segments, 0, this.root.errorBoundary);
+    }
+    findRoute(pattern) {
+        if (pattern === '/') {
+            return this.root.route;
+        }
+        const segments = splitSegments(pattern);
+        let node = this.root;
+        for (const segment of segments) {
+            let child;
+            if (segment.startsWith(':') && segment.endsWith('*')) {
+                child = node.wildcard?.node;
+            }
+            else if (segment.startsWith(':')) {
+                child = node.dynamic?.node;
+            }
+            else {
+                child = node.static.get(segment);
+            }
+            if (!child)
+                return undefined;
+            node = child;
+        }
+        return node.route;
+    }
+    // ── Private matching ──────────────────────────────────────────────────
+    walk(node, segments, index, params) {
+        if (index === segments.length) {
+            if (node.route) {
+                return { node: node.route, pattern: node.pattern, params: { ...params } };
+            }
+            if (node.wildcard?.node.route) {
+                return {
+                    node: node.wildcard.node.route,
+                    pattern: node.wildcard.node.pattern,
+                    params: { ...params, [node.wildcard.param]: '' },
+                };
+            }
+            return undefined;
+        }
+        const segment = segments[index];
+        // 1. Try static child
+        const staticChild = node.static.get(segment);
+        if (staticChild) {
+            const result = this.walk(staticChild, segments, index + 1, params);
+            if (result)
+                return result;
+        }
+        // 2. Try dynamic child (single segment)
+        if (node.dynamic) {
+            const { param, node: dynamicNode } = node.dynamic;
+            params[param] = safeDecode(segment);
+            const result = this.walk(dynamicNode, segments, index + 1, params);
+            if (result)
+                return result;
+            delete params[param];
+        }
+        // 3. Try wildcard (consumes all remaining segments)
+        if (node.wildcard?.node.route) {
+            const { param, node: wildcardNode } = node.wildcard;
+            let rest = safeDecode(segments[index]);
+            for (let i = index + 1; i < segments.length; i++) {
+                rest += '/' + safeDecode(segments[i]);
+            }
+            return {
+                node: wildcardNode.route,
+                pattern: wildcardNode.pattern,
+                params: { ...params, [param]: rest },
+            };
+        }
+        return undefined;
+    }
+    /**
+     * Walk for error boundary. Follows the same priority as match
+     * (static → dynamic → wildcard) without backtracking across branches.
+     * Returns the deepest error boundary module path found along the path.
+     */
+    walkForBoundary(node, segments, index, deepest) {
+        if (index === segments.length) {
+            return node.errorBoundary ?? deepest;
+        }
+        const segment = segments[index];
+        const staticChild = node.static.get(segment);
+        if (staticChild) {
+            return this.walkForBoundary(staticChild, segments, index + 1, staticChild.errorBoundary ?? deepest);
+        }
+        if (node.dynamic) {
+            return this.walkForBoundary(node.dynamic.node, segments, index + 1, node.dynamic.node.errorBoundary ?? deepest);
+        }
+        if (node.wildcard) {
+            return node.wildcard.node.errorBoundary ?? deepest;
+        }
+        return deepest;
+    }
+}
+//# sourceMappingURL=route.trie.js.map

package/dist/src/route/route.trie.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"route.trie.js","sourceRoot":"","sources":["../../../src/route/route.trie.ts"],"names":[],"mappings":"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"}

package/dist/src/type/route-tree.type.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Route Tree
+ *
+ * Serializable tree structure that mirrors the filesystem layout.
+ * Replaces the flat array manifest as the canonical route format.
+ *
+ * Each node corresponds to a URL segment. The tree is JSON-serializable
+ * (no Maps, no classes) so it can be written to disk, sent over the wire,
+ * or used directly as the in-memory trie for O(depth) route matching.
+ */
+/** Files associated with a route (companion files discovered alongside the page). */
+export interface RouteFiles {
+    /** TypeScript module (e.g. "routes/about.page.ts") */
+    ts?: string;
+    /** HTML template (e.g. "routes/about.page.html") */
+    html?: string;
+    /** Markdown content (e.g. "routes/about.page.md") */
+    md?: string;
+    /** Scoped stylesheet (e.g. "routes/about.page.css") */
+    css?: string;
+}
+/** A single node in the route tree. */
+export interface RouteNode {
+    /** Route files when this node is a terminal route. */
+    files?: RouteFiles;
+    /** Error boundary module path scoped to this prefix (from .error.ts). */
+    errorBoundary?: string;
+    /** Redirect module path (from .redirect.ts). Mutually exclusive with files. */
+    redirect?: string;
+    /** Static children keyed by URL segment (e.g. "about", "projects"). */
+    children?: Record<string, RouteNode>;
+    /** Single-segment dynamic param (from [param] directories/files). */
+    dynamic?: {
+        param: string;
+        child: RouteNode;
+    };
+    /** Catch-all wildcard (from directory index.page.* files). */
+    wildcard?: {
+        param: string;
+        child: RouteNode;
+    };
+}

package/dist/src/type/route-tree.type.js

@@ -0,0 +1,12 @@
+/**
+ * Route Tree
+ *
+ * Serializable tree structure that mirrors the filesystem layout.
+ * Replaces the flat array manifest as the canonical route format.
+ *
+ * Each node corresponds to a URL segment. The tree is JSON-serializable
+ * (no Maps, no classes) so it can be written to disk, sent over the wire,
+ * or used directly as the in-memory trie for O(depth) route matching.
+ */
+export {};
+//# sourceMappingURL=route-tree.type.js.map

package/dist/src/type/route-tree.type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-tree.type.js","sourceRoot":"","sources":["../../../src/type/route-tree.type.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emkodev/emroute",
-  "version": "1.6.6-beta.1",
+  "version": "1.6.6-beta.2",
   "description": "File-based (but storage-agnostic) router with triple rendering (SPA, SSR HTML, SSR Markdown). Zero dependencies.",
   "license": "BSD-3-Clause",
   "author": "emko.dev",

package/runtime/abstract.runtime.ts

@@ -1,15 +1,5 @@
-import {
-  filePathToPattern,
-  getPageFileType,
-  getRouteType,
-  sortRoutesBySpecificity,
-} from '../src/route/route.matcher.ts';
-import type {
-  ErrorBoundary,
-  RouteConfig,
-  RouteFiles,
-  RoutesManifest,
-} from '../src/type/route.type.ts';
+import type { RouteNode, RouteFiles } from '../src/type/route-tree.type.ts';
+import { resolveTargetNode } from '../src/route/route-tree.util.ts';
 import type { WidgetManifestEntry } from '../src/type/widget.type.ts';
 
 export const CONTENT_TYPES: Map<string, string> = new Map<string, string>([
@@ -198,17 +188,9 @@ export abstract class Runtime {
       return new Response('Not Found', { status: 404 });
     }
 
-    const { warnings, ...manifest } = await this.scanRoutes(routesDir);
-    for (const w of warnings) console.warn(w);
+    const tree = await this.scanRoutes(routesDir);
 
-    const json = {
-      routes: manifest.routes,
-      errorBoundaries: manifest.errorBoundaries,
-      statusPages: [...manifest.statusPages.entries()],
-      errorHandler: manifest.errorHandler,
-    };
-
-    this.routesManifestCache = Response.json(json);
+    this.routesManifestCache = Response.json(tree);
     return this.routesManifestCache.clone();
   }
 
@@ -248,16 +230,12 @@ export abstract class Runtime {
     }
   }
 
-  protected async scanRoutes(routesDir: string): Promise<RoutesManifest & { warnings: string[] }> {
-    const pageFiles: Array<{
-      path: string;
-      pattern: string;
-      fileType: 'ts' | 'html' | 'md' | 'css';
-    }> = [];
-    const redirects: RouteConfig[] = [];
-    const errorBoundaries: ErrorBoundary[] = [];
-    const statusPages = new Map<number, RouteConfig>();
-    let errorHandler: RouteConfig | undefined;
+  /**
+   * Scan a routes directory and build a RouteNode tree.
+   * The filesystem structure maps directly to the tree — no intermediate array.
+   */
+  protected async scanRoutes(routesDir: string): Promise<RouteNode> {
+    const root: RouteNode = {};
 
     const allFiles: string[] = [];
     for await (const file of this.walkDirectory(routesDir)) {
@@ -266,130 +244,52 @@ export abstract class Runtime {
 
     for (const filePath of allFiles) {
       const relativePath = filePath.replace(`${routesDir}/`, '');
-      const filename = relativePath.split('/').pop() ?? '';
-
-      if (filename === 'index.error.ts' && relativePath === 'index.error.ts') {
-        errorHandler = {
-          pattern: '/',
-          type: 'error',
-          modulePath: filePath,
-        };
-        continue;
-      }
-
-      const cssFileType = getPageFileType(filename);
-      if (cssFileType === 'css') {
-        const pattern = filePathToPattern(relativePath);
-        pageFiles.push({ path: filePath, pattern, fileType: 'css' });
-        continue;
-      }
-
-      const routeType = getRouteType(filename);
-      if (!routeType) continue;
-
-      const statusMatch = filename.match(/^(\d{3})\.page\.(ts|html|md)$/);
-      if (statusMatch) {
-        const statusCode = parseInt(statusMatch[1], 10);
-        const fileType = getPageFileType(filename);
-        if (fileType) {
-          const existing = statusPages.get(statusCode);
-          if (existing) {
-            existing.files ??= {};
-            existing.files[fileType] = filePath;
-            existing.modulePath = existing.files.ts ?? existing.files.html ?? existing.files.md ??
-              '';
-          } else {
-            const files: RouteFiles = { [fileType]: filePath };
-            statusPages.set(statusCode, {
-              pattern: `/${statusCode}`,
-              type: 'page',
-              modulePath: filePath,
-              statusCode,
-              files,
-            });
-          }
+      const parts = relativePath.split('/');
+      const filename = parts[parts.length - 1];
+      const dirSegments = parts.slice(0, -1);
+
+      // Parse filename: name.kind.ext (e.g. "about.page.ts", "[id].page.html", "index.error.ts")
+      const match = filename.match(/^(.+?)\.(page|error|redirect)\.(ts|html|md|css)$/);
+      if (!match) continue;
+
+      const [, name, kind, ext] = match;
+
+      // Walk directory segments to reach the parent node
+      let node = root;
+      for (const dir of dirSegments) {
+        if (dir.startsWith('[') && dir.endsWith(']')) {
+          const param = dir.slice(1, -1);
+          node.dynamic ??= { param, child: {} };
+          node = node.dynamic.child;
+        } else {
+          node.children ??= {};
+          node.children[dir] ??= {};
+          node = node.children[dir];
         }
-        continue;
       }
 
-      const pattern = filePathToPattern(relativePath);
-
-      if (routeType === 'error') {
-        const boundaryPattern = pattern.replace(/\/[^/]+$/, '') || '/';
-        errorBoundaries.push({ pattern: boundaryPattern, modulePath: filePath });
+      // Place the file on the correct node
+      if (kind === 'error') {
+        // Error boundary scopes to the directory it's in.
+        // Root index.error.ts → root.errorBoundary (global handler).
+        // projects/projects.error.ts → projects node errorBoundary.
+        node.errorBoundary = filePath;
         continue;
       }
 
-      if (routeType === 'redirect') {
-        redirects.push({ pattern, type: 'redirect', modulePath: filePath });
-        continue;
-      }
+      // For page and redirect files, the name determines the final node
+      const target = resolveTargetNode(node, name, dirSegments.length === 0);
 
-      const fileType = getPageFileType(filename);
-      if (fileType) {
-        pageFiles.push({ path: filePath, pattern, fileType });
-      }
-    }
-
-    // Group files by pattern
-    const groups = new Map<string, { pattern: string; files: RouteFiles; parent?: string }>();
-    for (const { path, pattern, fileType } of pageFiles) {
-      let group = groups.get(pattern);
-      if (!group) {
-        group = { pattern, files: {} };
-        const segments = pattern.split('/').filter(Boolean);
-        if (segments.length > 1) {
-          group.parent = '/' + segments.slice(0, -1).join('/');
-        }
-        groups.set(pattern, group);
-      }
-      const existing = group.files[fileType];
-      if (existing?.includes('/index.page.') && !path.includes('/index.page.')) {
-        continue;
-      }
-      group.files[fileType] = path;
-    }
-
-    // Detect collisions
-    const warnings: string[] = [];
-    for (const [pattern, group] of groups) {
-      const filePaths = Object.values(group.files).filter(Boolean);
-      const hasIndex = filePaths.some((p) => p?.includes('/index.page.'));
-      const hasFlat = filePaths.some((p) => p && !p.includes('/index.page.'));
-      if (hasIndex && hasFlat) {
-        warnings.push(
-          `Warning: Mixed file structure for ${pattern}:\n` +
-            filePaths.map((p) => `     ${p}`).join('\n') +
-            `\n     Both folder/index and flat files detected`,
-        );
+      if (kind === 'redirect') {
+        target.redirect = filePath;
+      } else {
+        // kind === 'page'
+        target.files ??= {};
+        target.files[ext as keyof RouteFiles] = filePath;
       }
     }
 
-    // Convert groups to RouteConfig array
-    const routes: RouteConfig[] = [];
-    for (const [_, group] of groups) {
-      const modulePath = group.files.ts ?? group.files.html ?? group.files.md ?? '';
-      if (!modulePath) continue;
-      const route: RouteConfig = {
-        pattern: group.pattern,
-        type: 'page',
-        modulePath,
-        files: group.files,
-      };
-      if (group.parent) route.parent = group.parent;
-      routes.push(route);
-    }
-
-    routes.push(...redirects);
-    const sortedRoutes = sortRoutesBySpecificity(routes);
-
-    return {
-      routes: sortedRoutes,
-      errorBoundaries,
-      statusPages,
-      errorHandler,
-      warnings,
-    };
+    return root;
   }
 
   protected async scanWidgets(

package/runtime/bun/fs/bun-fs.runtime.ts

@@ -173,7 +173,6 @@ export class BunFsRuntime extends Runtime {
       }
       const manifestPlugin = createManifestPlugin({
         runtime: this,
-        basePath: '/html',
         resolveDir: this.root,
       });
       builds.push(esbuild.build({

package/runtime/bun/sqlite/bun-sqlite.runtime.ts

@@ -129,7 +129,6 @@ export class BunSqliteRuntime extends Runtime {
       }
       const manifestPlugin = createManifestPlugin({
         runtime: this,
-        basePath: '/html',
         resolveDir: process.cwd(),
       });
       builds.push(esbuild.build({

package/runtime/universal/fs/universal-fs.runtime.ts

@@ -181,7 +181,6 @@ export class UniversalFsRuntime extends Runtime {
       }
       const manifestPlugin = createManifestPlugin({
         runtime: this,
-        basePath: '/html',
         resolveDir: this.root,
       });
       builds.push(esbuild.build({

package/server/codegen.util.ts

@@ -12,7 +12,7 @@ import type { SpaMode } from '../src/type/widget.type.ts';
 /**
  * Generate a main.ts entry point for SPA bootstrapping.
  *
- * Imports route and widget manifests from virtual `emroute:` specifiers
+ * Imports route tree and widget manifests from virtual `emroute:` specifiers
  * that the esbuild manifest plugin resolves at bundle time.
  */
 export function generateMainTs(
@@ -28,7 +28,7 @@ export function generateMainTs(
   const spaImport = `${importPath}/spa`;
 
   if (hasRoutes) {
-    imports.push(`import { routesManifest } from 'emroute:routes';`);
+    imports.push(`import { routeTree, moduleLoaders } from 'emroute:routes';`);
   }
 
   if (hasWidgets) {
@@ -54,10 +54,14 @@ export function generateMainTs(
   }
 
   if ((spa === 'root' || spa === 'only') && hasRoutes) {
+    imports.push(`import { RouteTrie } from '${importPath}';`);
     imports.push(`import { createSpaHtmlRouter } from '${spaImport}';`);
+
+    body.push('const resolver = new RouteTrie(routeTree);');
+
     const bpOpt = basePath ? `basePath: { html: '${basePath.html}', md: '${basePath.md}' }` : '';
-    const opts = bpOpt ? `{ ${bpOpt} }` : '';
-    body.push(`await createSpaHtmlRouter(routesManifest${opts ? `, ${opts}` : ''});`);
+    const optsInner = [bpOpt, 'moduleLoaders'].filter(Boolean).join(', ');
+    body.push(`await createSpaHtmlRouter(resolver, { ${optsInner} });`);
   }
 
   return `/** Auto-generated entry point — do not edit. */\n${imports.join('\n')}\n\n${