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

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

@@ -1,11 +1,7 @@
 import { stat, readdir, mkdir } from 'node:fs/promises';
-import { createRequire } from 'node:module';
 import { resolve } from 'node:path';
 import {
   CONTENT_TYPES,
-  DEFAULT_ROUTES_DIR,
-  DEFAULT_WIDGETS_DIR,
-  EMROUTE_EXTERNALS,
   type FetchParams,
   type FetchReturn,
   ROUTES_MANIFEST_PATH,
@@ -13,17 +9,11 @@ import {
   type RuntimeConfig,
   WIDGETS_MANIFEST_PATH,
 } from '../../abstract.runtime.ts';
-import { createManifestPlugin } from '../../../server/esbuild-manifest.plugin.ts';
-import { createRuntimeLoaderPlugin } from '../esbuild-runtime-loader.plugin.ts';
-import { generateMainTs } from '../../../server/codegen.util.ts';
 
 export class BunFsRuntime extends Runtime {
   private readonly root: string;
 
   constructor(root: string, config: RuntimeConfig = {}) {
-    if (config.entryPoint && !config.bundlePaths) {
-      config.bundlePaths = { emroute: '/emroute.js', app: '/app.js' };
-    }
     super(config);
     const abs = resolve(root);
     this.root = abs.endsWith('/') ? abs.slice(0, -1) : abs;
@@ -142,103 +132,4 @@ export class BunFsRuntime extends Runtime {
     return import(this.root + path);
   }
 
-  // ── Bundling ─────────────────────────────────────────────────────────
-
-  override async bundle(): Promise<void> {
-    if (this.config.spa === 'none') return;
-    const paths = this.config.bundlePaths;
-    if (!paths) return;
-
-    const esbuild = await BunFsRuntime.esbuild();
-    const builds: Promise<{ outputFiles: { path: string; contents: Uint8Array }[] }>[] = [];
-    const shared = { bundle: true, write: false, format: 'esm' as const, platform: 'browser' as const };
-    const runtimeLoader = createRuntimeLoaderPlugin({ runtime: this, root: this.root });
-
-    // Emroute SPA bundle — resolve from consumer's node_modules (no runtime loader needed)
-    const consumerRequire = createRequire(this.root + '/');
-    const spaEntry = consumerRequire.resolve('@emkodev/emroute/spa');
-    builds.push(esbuild.build({
-      ...shared,
-      entryPoints: [spaEntry],
-      outfile: `${this.root}${paths.emroute}`,
-    }));
-
-    // App bundle — generate main.ts if absent, virtual plugin resolves manifests
-    if (this.config.entryPoint) {
-      if ((await this.query(this.config.entryPoint)).status === 404) {
-        const hasRoutes = (await this.query((this.config.routesDir ?? DEFAULT_ROUTES_DIR) + '/')).status !== 404;
-        const hasWidgets = (await this.query((this.config.widgetsDir ?? DEFAULT_WIDGETS_DIR) + '/')).status !== 404;
-        const code = generateMainTs('root', hasRoutes, hasWidgets, '@emkodev/emroute');
-        await this.command(this.config.entryPoint, { body: code });
-      }
-      const manifestPlugin = createManifestPlugin({
-        runtime: this,
-        resolveDir: this.root,
-      });
-      builds.push(esbuild.build({
-        ...shared,
-        entryPoints: [`${this.root}${this.config.entryPoint}`],
-        outfile: `${this.root}${paths.app}`,
-        external: [...EMROUTE_EXTERNALS],
-        plugins: [manifestPlugin, runtimeLoader],
-      }));
-    }
-
-    // Widgets bundle
-    if (paths.widgets) {
-      const widgetsTsPath = paths.widgets.replace('.js', '.ts');
-      if ((await this.query(widgetsTsPath)).status !== 404) {
-        builds.push(esbuild.build({
-          ...shared,
-          entryPoints: [`${this.root}${widgetsTsPath}`],
-          outfile: `${this.root}${paths.widgets}`,
-          external: [...EMROUTE_EXTERNALS],
-          plugins: [runtimeLoader],
-        }));
-      }
-    }
-
-    const results = await Promise.all(builds);
-
-    // Write all output files through the runtime
-    for (const result of results) {
-      for (const file of result.outputFiles) {
-        const runtimePath = file.path.startsWith(this.root)
-          ? file.path.slice(this.root.length)
-          : '/' + file.path;
-        await this.command(runtimePath, { body: file.contents as unknown as BodyInit });
-      }
-    }
-
-    await this.writeShell(paths);
-
-    await esbuild.stop();
-    BunFsRuntime._esbuild = null;
-  }
-
-  // ── Transpile / esbuild ───────────────────────────────────────────────
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private static _esbuild: any = null;
-
-  private static async esbuild() {
-    if (!BunFsRuntime._esbuild) {
-      // Resolve esbuild from the consumer's node_modules, not the package's
-      const consumerRequire = createRequire(process.cwd() + '/');
-      BunFsRuntime._esbuild = consumerRequire('esbuild');
-    }
-    return BunFsRuntime._esbuild;
-  }
-
-  static override transpile(source: string): Promise<string> {
-    const transpiler = new Bun.Transpiler({ loader: 'ts' });
-    return Promise.resolve(transpiler.transformSync(source));
-  }
-
-  static override async stopBundler(): Promise<void> {
-    if (BunFsRuntime._esbuild) {
-      await BunFsRuntime._esbuild.stop();
-      BunFsRuntime._esbuild = null;
-    }
-  }
 }

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

@@ -1,10 +1,6 @@
-import { createRequire } from 'node:module';
 import { Database } from 'bun:sqlite';
 import {
   CONTENT_TYPES,
-  DEFAULT_ROUTES_DIR,
-  DEFAULT_WIDGETS_DIR,
-  EMROUTE_EXTERNALS,
   type FetchParams,
   type FetchReturn,
   ROUTES_MANIFEST_PATH,
@@ -12,9 +8,6 @@ import {
   type RuntimeConfig,
   WIDGETS_MANIFEST_PATH,
 } from '../../abstract.runtime.ts';
-import { createManifestPlugin } from '../../../server/esbuild-manifest.plugin.ts';
-import { createRuntimeLoaderPlugin, VIRTUAL_ROOT } from '../esbuild-runtime-loader.plugin.ts';
-import { generateMainTs } from '../../../server/codegen.util.ts';
 
 export class BunSqliteRuntime extends Runtime {
   private readonly db: Database;
@@ -24,9 +17,6 @@ export class BunSqliteRuntime extends Runtime {
   private readonly stmtHas: ReturnType<Database['prepare']>;
 
   constructor(path: string = ':memory:', config: RuntimeConfig = {}) {
-    if (config.entryPoint && !config.bundlePaths) {
-      config.bundlePaths = { emroute: '/emroute.js', app: '/app.js' };
-    }
     super(config);
     this.db = new Database(path);
     this.db.run(`
@@ -81,11 +71,7 @@ export class BunSqliteRuntime extends Runtime {
 
   override async loadModule(path: string): Promise<unknown> {
     const source = await this.query(path, { as: 'text' });
-    const code = path.endsWith('.ts')
-      ? await BunSqliteRuntime.transpile(source)
-      : source;
-
-    const blob = new Blob([code], { type: 'text/javascript' });
+    const blob = new Blob([source], { type: 'text/javascript' });
     const url = URL.createObjectURL(blob);
     try {
       return await import(url);
@@ -98,79 +84,6 @@ export class BunSqliteRuntime extends Runtime {
     this.db.close();
   }
 
-  // ── Bundling ─────────────────────────────────────────────────────────
-
-  override async bundle(): Promise<void> {
-    if (this.config.spa === 'none') return;
-    const paths = this.config.bundlePaths;
-    if (!paths) return;
-
-    const esbuild = await BunSqliteRuntime.esbuild();
-    const builds: Promise<{ outputFiles: { path: string; contents: Uint8Array }[] }>[] = [];
-    const shared = { bundle: true, write: false, format: 'esm' as const, platform: 'browser' as const };
-    const runtimeLoader = createRuntimeLoaderPlugin({ runtime: this, root: VIRTUAL_ROOT });
-
-    // Emroute SPA bundle — resolve from consumer's node_modules (no runtime loader needed)
-    const consumerRequire = createRequire(process.cwd() + '/');
-    const spaEntry = consumerRequire.resolve('@emkodev/emroute/spa');
-    builds.push(esbuild.build({
-      ...shared,
-      entryPoints: [spaEntry],
-      outfile: paths.emroute,
-    }));
-
-    // App bundle — generate main.ts if absent, virtual plugin resolves manifests
-    if (this.config.entryPoint) {
-      if ((await this.query(this.config.entryPoint)).status === 404) {
-        const hasRoutes = (await this.query((this.config.routesDir ?? DEFAULT_ROUTES_DIR) + '/')).status !== 404;
-        const hasWidgets = (await this.query((this.config.widgetsDir ?? DEFAULT_WIDGETS_DIR) + '/')).status !== 404;
-        const code = generateMainTs('root', hasRoutes, hasWidgets, '@emkodev/emroute');
-        await this.command(this.config.entryPoint, { body: code });
-      }
-      const manifestPlugin = createManifestPlugin({
-        runtime: this,
-        resolveDir: process.cwd(),
-      });
-      builds.push(esbuild.build({
-        ...shared,
-        entryPoints: [VIRTUAL_ROOT + this.config.entryPoint],
-        outfile: paths.app,
-        external: [...EMROUTE_EXTERNALS],
-        plugins: [manifestPlugin, runtimeLoader],
-      }));
-    }
-
-    // Widgets bundle
-    if (paths.widgets) {
-      const widgetsTsPath = paths.widgets.replace('.js', '.ts');
-      if ((await this.query(widgetsTsPath)).status !== 404) {
-        builds.push(esbuild.build({
-          ...shared,
-          entryPoints: [VIRTUAL_ROOT + widgetsTsPath],
-          outfile: paths.widgets,
-          external: [...EMROUTE_EXTERNALS],
-          plugins: [runtimeLoader],
-        }));
-      }
-    }
-
-    const results = await Promise.all(builds);
-
-    // Write all output files through the runtime
-    for (const result of results) {
-      for (const file of result.outputFiles) {
-        // outfile paths are relative — ensure leading /
-        const runtimePath = file.path.startsWith('/') ? file.path : '/' + file.path;
-        await this.command(runtimePath, { body: file.contents as unknown as BodyInit });
-      }
-    }
-
-    await this.writeShell(paths);
-
-    await esbuild.stop();
-    BunSqliteRuntime._esbuild = null;
-  }
-
   // ── Private ─────────────────────────────────────────────────────────
 
   private async read(path: string): Promise<Response> {
@@ -231,30 +144,6 @@ export class BunSqliteRuntime extends Runtime {
     return this.stmtHas.get(prefix) !== null;
   }
 
-  // ── Transpile / esbuild ───────────────────────────────────────────────
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private static _esbuild: any = null;
-
-  private static async esbuild() {
-    if (!BunSqliteRuntime._esbuild) {
-      BunSqliteRuntime._esbuild = await import('esbuild');
-    }
-    return BunSqliteRuntime._esbuild;
-  }
-
-  static override transpile(source: string): Promise<string> {
-    const transpiler = new Bun.Transpiler({ loader: 'ts' });
-    return Promise.resolve(transpiler.transformSync(source));
-  }
-
-  static override async stopBundler(): Promise<void> {
-    if (BunSqliteRuntime._esbuild) {
-      await BunSqliteRuntime._esbuild.stop();
-      BunSqliteRuntime._esbuild = null;
-    }
-  }
-
   private parsePath(resource: FetchParams[0]): string {
     if (typeof resource === 'string') return decodeURIComponent(resource);
     if (resource instanceof URL) return decodeURIComponent(resource.pathname);

package/runtime/fetch.runtime.ts

@@ -0,0 +1,70 @@
+/**
+ * Fetch Runtime
+ *
+ * Browser-compatible Runtime that delegates all reads to a remote server
+ * via `fetch()`. Used by the thin client in `root` mode — same
+ * `createEmrouteServer` runs in the browser, but the Runtime fetches
+ * files from the real server instead of reading from disk.
+ *
+ * No bundling, no transpiling, no filesystem access.
+ * No directory scanning — the remote server already has manifests.
+ */
+
+import {
+  type FetchParams,
+  type FetchReturn,
+  Runtime,
+  type RuntimeConfig,
+} from './abstract.runtime.ts';
+
+export class FetchRuntime extends Runtime {
+  private readonly origin: string;
+
+  /**
+   * @param origin — Server origin, e.g. `'http://localhost:4100'` or `location.origin`.
+   */
+  constructor(origin: string, config: RuntimeConfig = {}) {
+    super(config);
+    this.origin = origin.endsWith('/') ? origin.slice(0, -1) : origin;
+  }
+
+  handle(
+    resource: FetchParams[0],
+    init?: FetchParams[1],
+  ): FetchReturn {
+    const url = this.toUrl(resource);
+    return fetch(url, init);
+  }
+
+  query(
+    resource: FetchParams[0],
+    options: FetchParams[1] & { as: 'text' },
+  ): Promise<string>;
+  query(
+    resource: FetchParams[0],
+    options?: FetchParams[1],
+  ): FetchReturn;
+  query(
+    resource: FetchParams[0],
+    options?: FetchParams[1] & { as?: 'text' },
+  ): Promise<Response | string> {
+    if (options?.as === 'text') {
+      return fetch(this.toUrl(resource)).then((r) => r.text());
+    }
+    return this.handle(resource, options);
+  }
+
+  override async loadModule(path: string): Promise<unknown> {
+    const url = `${this.origin}${path}`;
+    const response = await fetch(url);
+    const js = await response.text();
+    const blob = new Blob([js], { type: 'application/javascript' });
+    return import(URL.createObjectURL(blob));
+  }
+
+  private toUrl(resource: FetchParams[0]): string {
+    if (typeof resource === 'string') return `${this.origin}${resource}`;
+    if (resource instanceof URL) return `${this.origin}${resource.pathname}${resource.search}`;
+    return `${this.origin}${new URL(resource.url).pathname}`;
+  }
+}

package/runtime/sitemap.generator.ts

@@ -1,7 +1,7 @@
 /**
  * Sitemap Generator — Opt-in Submodule
  *
- * Generates sitemap.xml from a RoutesManifest. Pure function over manifest data,
+ * Generates sitemap.xml from a RouteNode tree. Pure function over tree data,
  * no filesystem access needed.
  *
  * Usage:
@@ -18,7 +18,7 @@
  */
 
 import { escapeHtml } from '../src/util/html.util.ts';
-import type { RoutesManifest } from '../src/type/route.type.ts';
+import type { RouteNode } from '../src/type/route-tree.type.ts';
 
 /** Valid changefreq values per sitemaps.org protocol. */
 export type Changefreq =
@@ -130,32 +130,57 @@ function serializeEntry(entry: SitemapEntry): string {
 }
 
 /**
- * Generate sitemap.xml content from a routes manifest.
+ * Collect page routes from a RouteNode tree as pattern strings.
+ * Skips redirect and error boundary nodes.
+ */
+function collectPatterns(node: RouteNode, prefix: string, out: string[]): void {
+  // This node has page files — it's a page route
+  if (node.files && !node.redirect) {
+    out.push(prefix || '/');
+  }
+
+  if (node.children) {
+    for (const [segment, child] of Object.entries(node.children)) {
+      collectPatterns(child, `${prefix}/${segment}`, out);
+    }
+  }
+
+  if (node.dynamic) {
+    collectPatterns(node.dynamic.child, `${prefix}/:${node.dynamic.param}`, out);
+  }
+
+  if (node.wildcard) {
+    collectPatterns(node.wildcard.child, `${prefix}/*${node.wildcard.param}`, out);
+  }
+}
+
+/**
+ * Generate sitemap.xml content from a route tree.
  *
  * Static routes (no :param) are included directly.
  * Dynamic routes are included only if an enumerator is provided.
  * All URLs point to /html/ prefixed paths for SSR HTML rendering.
  */
 export async function generateSitemap(
-  manifest: RoutesManifest,
+  routeTree: RouteNode,
   options: SitemapOptions,
 ): Promise<string> {
   const entries: SitemapEntry[] = [];
   const bp = options.basePath ?? '';
 
-  // Filter to page routes only (exclude error, redirect)
-  const pages = manifest.routes.filter((r) => r.type === 'page');
+  const patterns: string[] = [];
+  collectPatterns(routeTree, '', patterns);
 
-  for (const route of pages) {
-    const routeOpts = resolveOptions(route.pattern, options);
+  for (const pattern of patterns) {
+    const routeOpts = resolveOptions(pattern, options);
 
-    if (isDynamic(route.pattern)) {
+    if (isDynamic(pattern)) {
       // Dynamic route — use enumerator if provided, skip otherwise
-      const enumerator = options.enumerators?.[route.pattern];
+      const enumerator = options.enumerators?.[pattern];
       if (!enumerator) continue;
 
       const values = await enumerator();
-      const paths = expandDynamic(route.pattern, values);
+      const paths = expandDynamic(pattern, values);
 
       for (const path of paths) {
         entries.push({
@@ -166,7 +191,7 @@ export async function generateSitemap(
     } else {
       // Static route — include directly
       entries.push({
-        loc: buildLoc(options.baseUrl, route.pattern, bp),
+        loc: buildLoc(options.baseUrl, pattern, bp),
         ...routeOpts,
       });
     }

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

@@ -1,11 +1,7 @@
 import { readFile, writeFile, stat, readdir, mkdir } from 'node:fs/promises';
-import { createRequire } from 'node:module';
 import { resolve } from 'node:path';
 import {
   CONTENT_TYPES,
-  DEFAULT_ROUTES_DIR,
-  DEFAULT_WIDGETS_DIR,
-  EMROUTE_EXTERNALS,
   type FetchParams,
   type FetchReturn,
   ROUTES_MANIFEST_PATH,
@@ -13,9 +9,6 @@ import {
   type RuntimeConfig,
   WIDGETS_MANIFEST_PATH,
 } from '../../abstract.runtime.ts';
-import { createManifestPlugin } from '../../../server/esbuild-manifest.plugin.ts';
-import { createRuntimeLoaderPlugin } from '../../bun/esbuild-runtime-loader.plugin.ts';
-import { generateMainTs } from '../../../server/codegen.util.ts';
 
 /**
  * Filesystem runtime using only `node:` APIs and esbuild. Works on Node,
@@ -29,9 +22,6 @@ export class UniversalFsRuntime extends Runtime {
   private readonly root: string;
 
   constructor(root: string, config: RuntimeConfig = {}) {
-    if (config.entryPoint && !config.bundlePaths) {
-      config.bundlePaths = { emroute: '/emroute.js', app: '/app.js' };
-    }
     super(config);
     const abs = resolve(root);
     this.root = abs.endsWith('/') ? abs.slice(0, -1) : abs;
@@ -150,103 +140,4 @@ export class UniversalFsRuntime extends Runtime {
     return import(this.root + path);
   }
 
-  // ── Bundling ─────────────────────────────────────────────────────────
-
-  override async bundle(): Promise<void> {
-    if (this.config.spa === 'none') return;
-    const paths = this.config.bundlePaths;
-    if (!paths) return;
-
-    const esbuild = await UniversalFsRuntime.esbuild();
-    const builds: Promise<{ outputFiles: { path: string; contents: Uint8Array }[] }>[] = [];
-    const shared = { bundle: true, write: false, format: 'esm' as const, platform: 'browser' as const };
-    const runtimeLoader = createRuntimeLoaderPlugin({ runtime: this, root: this.root });
-
-    // Emroute SPA bundle — resolve from consumer's node_modules (no runtime loader needed)
-    const consumerRequire = createRequire(this.root + '/');
-    const spaEntry = consumerRequire.resolve('@emkodev/emroute/spa');
-    builds.push(esbuild.build({
-      ...shared,
-      entryPoints: [spaEntry],
-      outfile: `${this.root}${paths.emroute}`,
-    }));
-
-    // App bundle — generate main.ts if absent, virtual plugin resolves manifests
-    if (this.config.entryPoint) {
-      if ((await this.query(this.config.entryPoint)).status === 404) {
-        const hasRoutes = (await this.query((this.config.routesDir ?? DEFAULT_ROUTES_DIR) + '/')).status !== 404;
-        const hasWidgets = (await this.query((this.config.widgetsDir ?? DEFAULT_WIDGETS_DIR) + '/')).status !== 404;
-        const code = generateMainTs('root', hasRoutes, hasWidgets, '@emkodev/emroute');
-        await this.command(this.config.entryPoint, { body: code });
-      }
-      const manifestPlugin = createManifestPlugin({
-        runtime: this,
-        resolveDir: this.root,
-      });
-      builds.push(esbuild.build({
-        ...shared,
-        entryPoints: [`${this.root}${this.config.entryPoint}`],
-        outfile: `${this.root}${paths.app}`,
-        external: [...EMROUTE_EXTERNALS],
-        plugins: [manifestPlugin, runtimeLoader],
-      }));
-    }
-
-    // Widgets bundle
-    if (paths.widgets) {
-      const widgetsTsPath = paths.widgets.replace('.js', '.ts');
-      if ((await this.query(widgetsTsPath)).status !== 404) {
-        builds.push(esbuild.build({
-          ...shared,
-          entryPoints: [`${this.root}${widgetsTsPath}`],
-          outfile: `${this.root}${paths.widgets}`,
-          external: [...EMROUTE_EXTERNALS],
-          plugins: [runtimeLoader],
-        }));
-      }
-    }
-
-    const results = await Promise.all(builds);
-
-    // Write all output files through the runtime
-    for (const result of results) {
-      for (const file of result.outputFiles) {
-        const runtimePath = file.path.startsWith(this.root)
-          ? file.path.slice(this.root.length)
-          : '/' + file.path;
-        await this.command(runtimePath, { body: file.contents as unknown as BodyInit });
-      }
-    }
-
-    await this.writeShell(paths);
-
-    await esbuild.stop();
-    UniversalFsRuntime._esbuild = null;
-  }
-
-  // ── Transpile / esbuild ───────────────────────────────────────────────
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private static _esbuild: any = null;
-
-  private static async esbuild() {
-    if (!UniversalFsRuntime._esbuild) {
-      const consumerRequire = createRequire(process.cwd() + '/');
-      UniversalFsRuntime._esbuild = consumerRequire('esbuild');
-    }
-    return UniversalFsRuntime._esbuild;
-  }
-
-  static override async transpile(source: string): Promise<string> {
-    const esbuild = await UniversalFsRuntime.esbuild();
-    const result = await esbuild.transform(source, { loader: 'ts' });
-    return result.code;
-  }
-
-  static override async stopBundler(): Promise<void> {
-    if (UniversalFsRuntime._esbuild) {
-      await UniversalFsRuntime._esbuild.stop();
-      UniversalFsRuntime._esbuild = null;
-    }
-  }
 }