@ecopages/core 0.2.0-alpha.9 → 0.2.1-beta.0

package/src/adapters/node/server-adapter.js

@@ -1,38 +1,57 @@
 import { createServer } from "node:http";
+import path from "node:path";
+import { fileSystem } from "@ecopages/file-system";
+import { getAppBrowserBuildPlugins, setupAppRuntimePlugins } from "../../build/build-adapter.js";
+import { installAppRuntimeBuildExecutor } from "../../build/runtime-build-executor.js";
+import { RESOLVED_ASSETS_DIR } from "../../config/constants.js";
 import { appLogger } from "../../global/app-logger.js";
 import { NodeClientBridge } from "./node-client-bridge.js";
 import { NodeHmrManager } from "./node-hmr-manager.js";
+import { ProjectWatcher } from "../../watchers/project-watcher.js";
 import { StaticSiteGenerator } from "../../static-site-generator/static-site-generator.js";
 import { SharedServerAdapter } from "../shared/server-adapter.js";
 import { ServerStaticBuilder } from "../shared/server-static-builder.js";
+import { DEFAULT_ECOPAGES_HOSTNAME, DEFAULT_ECOPAGES_PORT } from "../../config/constants.js";
 import {
-  bindSharedRuntimeHmrManager,
-  initializeSharedRuntimePlugins,
-  installSharedRuntimeBuildExecutor,
-  prepareSharedRuntimePublicDir,
-  startSharedProjectWatching
-} from "../shared/runtime-bootstrap.js";
-import { NodeStaticContentServer } from "./static-content-server.js";
-class ClientAbortError extends Error {
-  constructor() {
-    super("Client closed the request");
-    this.name = "ClientAbortError";
-  }
-}
+  injectHmrRuntimeIntoHtmlResponse,
+  isHtmlResponse,
+  shouldInjectHmrHtmlResponse
+} from "../shared/hmr-html-response.js";
+import { resolveServeRuntimeOrigin } from "../shared/runtime-app-bootstrap.js";
+import { NodeClientAbortError, NodeHttpRequestBridge } from "./http-request-bridge.js";
+import { NodeStaticPreviewHost } from "./static-preview-host.js";
+import { DefaultNodeServerDevRuntimeFactory } from "./server-adapter-dependencies.js";
 class NodeServerAdapter extends SharedServerAdapter {
   serverInstance = null;
   initialized = false;
   apiHandlers;
   staticRoutes;
   errorHandler;
-  previewServer = null;
   bridge = null;
   hmrManager = null;
+  previewHost;
+  requestBridge;
+  devRuntimeFactory;
+  shouldInjectHmrScript() {
+    return shouldInjectHmrHtmlResponse(this.options?.watch === true, this.hmrManager ?? void 0);
+  }
+  isHtmlResponse(response) {
+    return isHtmlResponse(response);
+  }
+  async maybeInjectHmrScript(response) {
+    if (this.shouldInjectHmrScript() && this.isHtmlResponse(response)) {
+      return injectHmrRuntimeIntoHtmlResponse(response);
+    }
+    return response;
+  }
   constructor(options) {
     super(options);
     this.apiHandlers = options.apiHandlers || [];
     this.staticRoutes = options.staticRoutes || [];
     this.errorHandler = options.errorHandler;
+    this.previewHost = options.previewHost;
+    this.requestBridge = options.requestBridge;
+    this.devRuntimeFactory = options.devRuntimeFactory;
   }
   /**
    * Prepares the adapter for use.
@@ -48,11 +67,9 @@ class NodeServerAdapter extends SharedServerAdapter {
    *    processors during their `setup()` calls.
    */
   async initialize() {
-    installSharedRuntimeBuildExecutor(this.appConfig, {
-      development: this.options?.watch === true
-    });
-    prepareSharedRuntimePublicDir(this.appConfig);
-    await initializeSharedRuntimePlugins({
+    installAppRuntimeBuildExecutor(this.appConfig);
+    this.prepareRuntimePublicDir();
+    await setupAppRuntimePlugins({
       appConfig: this.appConfig,
       runtimeOrigin: this.runtimeOrigin,
       hmrManager: this.hmrManager ?? void 0
@@ -70,6 +87,13 @@ class NodeServerAdapter extends SharedServerAdapter {
     });
     this.initialized = true;
   }
+  prepareRuntimePublicDir() {
+    const srcPublicDir = path.join(this.appConfig.rootDir, this.appConfig.srcDir, this.appConfig.publicDir);
+    if (fileSystem.exists(srcPublicDir)) {
+      fileSystem.copyDir(srcPublicDir, path.join(this.appConfig.rootDir, this.appConfig.distDir));
+    }
+    fileSystem.ensureDir(path.join(this.appConfig.absolutePaths.distDir, RESOLVED_ASSETS_DIR));
+  }
   getServerOptions() {
     return {
       ...this.serveOptions
@@ -80,9 +104,10 @@ class NodeServerAdapter extends SharedServerAdapter {
       await this.initialize();
     }
     const buildServer = await this.startBuildRuntimeServer();
+    const buildRuntimeOrigin = this.getListeningServerOrigin(buildServer);
     try {
       await this.staticBuilder.build(
-        { preview: false },
+        { preview: false, baseUrl: buildRuntimeOrigin },
         {
           router: this.router,
           routeRendererFactory: this.routeRendererFactory,
@@ -95,117 +120,27 @@ class NodeServerAdapter extends SharedServerAdapter {
     if (!options?.preview) {
       return;
     }
-    if (this.previewServer) {
-      await this.previewServer.stop();
-    }
-    this.previewServer = new NodeStaticContentServer({
+    await this.previewHost.start({
       appConfig: this.appConfig,
-      options: {
-        hostname: this.serveOptions.hostname,
-        port: Number(this.serveOptions.port || 3e3)
-      }
+      hostname: String(this.serveOptions.hostname || DEFAULT_ECOPAGES_HOSTNAME),
+      port: Number(this.serveOptions.port || DEFAULT_ECOPAGES_PORT)
     });
-    await this.previewServer.start();
-    const previewHostname = this.serveOptions.hostname || "localhost";
-    const previewPort = this.serveOptions.port || 3e3;
+    const previewHostname = this.serveOptions.hostname || DEFAULT_ECOPAGES_HOSTNAME;
+    const previewPort = this.serveOptions.port || DEFAULT_ECOPAGES_PORT;
     appLogger.info(`Preview running at http://${previewHostname}:${previewPort}`);
   }
-  /**
-   * Converts a Node.js `IncomingMessage` into a Web API `Request`.
-   *
-   * Multi-value headers (e.g. `set-cookie`) are appended individually so no
-   * value is silently dropped.
-   *
-   * For methods that carry a body (`POST`, `PUT`, `PATCH`, …), the raw
-   * `IncomingMessage` stream is wrapped in a `ReadableStream` rather than
-   * cast directly to `BodyInit`. See the inline doc block inside the `if`
-   * branch for the rationale (client-abort handling).
-   *
-   * `duplex: 'half'` is required by the `fetch` spec when a streaming body is
-   * provided — without it Node.js 18+ throws a `TypeError`.
-   */
-  createWebRequest(req) {
-    const url = new URL(req.url ?? "/", this.runtimeOrigin);
-    const headers = new Headers();
-    for (const [key, value] of Object.entries(req.headers)) {
-      if (Array.isArray(value)) {
-        for (const item of value) {
-          headers.append(key, item);
-        }
-        continue;
-      }
-      if (value !== void 0) {
-        headers.set(key, value);
-      }
-    }
-    const method = (req.method ?? "GET").toUpperCase();
-    const requestInit = {
-      method,
-      headers
-    };
-    if (method !== "GET" && method !== "HEAD") {
-      const body = new ReadableStream({
-        start(controller) {
-          req.on("data", (chunk) => controller.enqueue(chunk));
-          req.once("end", () => controller.close());
-          req.once("aborted", () => {
-            controller.error(new ClientAbortError());
-          });
-          req.once("error", (err) => {
-            const isClientAbort = err.code === "ECONNRESET";
-            controller.error(isClientAbort ? new ClientAbortError() : err);
-          });
-        },
-        cancel() {
-          req.destroy();
-        }
-      });
-      requestInit.body = body;
-      requestInit.duplex = "half";
-    }
-    return new Request(url, requestInit);
-  }
-  /**
-   * Writes a Web `Response` back to a Node.js `ServerResponse`.
-   *
-   * The entire body is buffered via `arrayBuffer()` before writing. This is
-   * intentional for the current use-case (SSR pages and API routes), where
-   * responses are typically small and fully materialised. Streaming responses
-   * are not yet supported.
-   */
-  async sendNodeResponse(res, response) {
-    res.statusCode = response.status;
-    response.headers.forEach((value, key) => {
-      res.setHeader(key, value);
-    });
-    if (!response.body) {
-      res.end();
-      return;
-    }
-    const body = Buffer.from(await response.arrayBuffer());
-    res.end(body);
-  }
-  /**
-   * Starts an ephemeral HTTP server used *only* during a static site generation
-   * run.
-   *
-   * Static generation works by having the `StaticSiteGenerator` issue real HTTP
-   * requests to a live server for each route, capturing the rendered HTML. This
-   * approach reuses the normal request pipeline (middleware, caching, API
-   * handlers) without any special-casing for the build path.
-   *
-   * The server is torn down immediately after generation completes via
-   * `stopBuildRuntimeServer`, so it never overlaps with the actual dev/prod server.
-   */
   async startBuildRuntimeServer() {
-    const hostname = String(this.serveOptions.hostname || "localhost");
-    const port = Number(this.serveOptions.port || 3e3);
+    const hostname = String(this.serveOptions.hostname || DEFAULT_ECOPAGES_HOSTNAME);
+    const port = 0;
     const server = createServer(async (req, res) => {
       try {
-        const webRequest = this.createWebRequest(req);
+        const webRequest = this.requestBridge.createWebRequest(req, this.runtimeOrigin);
         const response = await this.handleRequest(webRequest);
-        await this.sendNodeResponse(res, response);
+        await this.requestBridge.sendNodeResponse(res, response);
       } catch (error) {
+        if (error instanceof NodeClientAbortError) {
+          return;
+        }
         appLogger.error("Node static build runtime request failed", error);
         res.statusCode = 500;
         res.end("Internal Server Error");
@@ -219,9 +154,17 @@ class NodeServerAdapter extends SharedServerAdapter {
       });
     });
     this.serverInstance = server;
-    appLogger.info(`Server running at http://${hostname}:${port}`);
+    appLogger.info(`Server running at ${this.getListeningServerOrigin(server)}`);
     return server;
   }
+  getListeningServerOrigin(server) {
+    const address = server.address();
+    const hostname = String(this.serveOptions.hostname || DEFAULT_ECOPAGES_HOSTNAME);
+    if (!address || typeof address === "string") {
+      throw new Error("Build runtime server did not expose a numeric listening port");
+    }
+    return `http://${hostname}:${address.port}`;
+  }
   /**
    * Gracefully shuts down the ephemeral build runtime server.
    *
@@ -269,19 +212,20 @@ class NodeServerAdapter extends SharedServerAdapter {
    * underlying socket closes early — into a 499 response so it does not
    * incorrectly surface as a 500 in application logs.
    */
-  async handleRequest(_request) {
+  async handleRequest(request) {
     if (!this.initialized) {
       throw new Error("Node server adapter is not initialized. Call createAdapter() first.");
     }
     try {
-      return await this.handleSharedRequest(_request, {
+      const response = await this.handleSharedRequest(request, {
         apiHandlers: this.apiHandlers,
         errorHandler: this.errorHandler,
         serverInstance: this.serverInstance,
         hmrManager: this.hmrManager
       });
+      return await this.maybeInjectHmrScript(response);
     } catch (error) {
-      if (error instanceof ClientAbortError) {
+      if (error instanceof NodeClientAbortError) {
         return new Response(null, { status: 499 });
       }
       throw error;
@@ -295,7 +239,7 @@ class NodeServerAdapter extends SharedServerAdapter {
    *   `upgrade` event (no separate port needed).
    * - `NodeClientBridge` tracks active WebSocket connections and handles
    *   broadcast + heartbeat cleanup.
-   * - `NodeHmrManager` watches the filesystem and triggers incremental esbuild
+   * - `NodeHmrManager` watches the filesystem and triggers incremental
    *   rebuilds, notifying connected clients via the bridge.
    * - Shared watcher bootstrapping listens for route-level file changes and
    *   refreshes the router and response handlers when pages are added or removed.
@@ -303,16 +247,16 @@ class NodeServerAdapter extends SharedServerAdapter {
    * WebSocket upgrade requests that do not target `/_hmr` are rejected with an
    * immediate socket destroy to prevent unhandled upgrade leaks.
    */
-  async completeInitialization(_server) {
-    this.serverInstance = _server;
+  async completeInitialization(server) {
+    this.serverInstance = server;
     if (this.options?.watch) {
-      const { WebSocketServer } = await import("ws");
-      const wss = new WebSocketServer({ noServer: true });
-      this.bridge = new NodeClientBridge();
-      this.hmrManager = new NodeHmrManager({ appConfig: this.appConfig, bridge: this.bridge });
+      const devRuntime = this.devRuntimeFactory.create({ appConfig: this.appConfig });
+      const wss = devRuntime.websocketServer;
+      this.bridge = devRuntime.bridge;
+      this.hmrManager = devRuntime.hmrManager;
       this.hmrManager.setEnabled(true);
       await this.hmrManager.buildRuntime();
-      _server.on("upgrade", (req, socket, head) => {
+      server.on("upgrade", (req, socket, head) => {
         const url = new URL(req.url ?? "/", this.runtimeOrigin);
         if (url.pathname === "/_hmr") {
           wss.handleUpgrade(req, socket, head, (ws) => {
@@ -324,10 +268,14 @@ class NodeServerAdapter extends SharedServerAdapter {
           socket.destroy();
         }
       });
-      bindSharedRuntimeHmrManager(this.appConfig, this.hmrManager);
+      const browserBuildPlugins = getAppBrowserBuildPlugins(this.appConfig);
+      this.hmrManager.setPlugins(browserBuildPlugins);
+      for (const integration of this.appConfig.integrations) {
+        integration.setHmrManager(this.hmrManager);
+      }
       this.configureSharedResponseHandlers(this.staticRoutes, this.hmrManager);
-      await startSharedProjectWatching({
-        appConfig: this.appConfig,
+      const watcher = new ProjectWatcher({
+        config: this.appConfig,
         refreshRouterRoutesCallback: this.createSharedWatchRefreshCallback({
           staticRoutes: this.staticRoutes,
           hmrManager: this.hmrManager
@@ -335,6 +283,7 @@ class NodeServerAdapter extends SharedServerAdapter {
         hmrManager: this.hmrManager,
         bridge: this.bridge
       });
+      await watcher.createWatcherSubscription();
     }
     appLogger.debug("Node server adapter initialization completed", {
       apiHandlers: this.apiHandlers.length,
@@ -345,10 +294,16 @@ class NodeServerAdapter extends SharedServerAdapter {
   }
 }
 async function createNodeServerAdapter(params) {
-  const runtimeOrigin = params.runtimeOrigin ?? `http://${params.serveOptions.hostname || "localhost"}:${params.serveOptions.port || 3e3}`;
+  const runtimeOrigin = params.runtimeOrigin ?? resolveServeRuntimeOrigin(params.serveOptions);
+  const previewHost = params.previewHost ?? new NodeStaticPreviewHost();
+  const requestBridge = params.requestBridge ?? new NodeHttpRequestBridge();
+  const devRuntimeFactory = params.devRuntimeFactory ?? new DefaultNodeServerDevRuntimeFactory();
   const adapter = new NodeServerAdapter({
     ...params,
-    runtimeOrigin
+    runtimeOrigin,
+    previewHost,
+    requestBridge,
+    devRuntimeFactory
   });
   return adapter.createAdapter();
 }

package/src/adapters/node/static-content-server.d.ts

@@ -1,5 +1,5 @@
 import { type Server as NodeHttpServer } from 'node:http';
-import type { EcoPagesAppConfig } from '../../internal-types.js';
+import type { EcoPagesAppConfig } from '../../types/internal-types.js';
 type NodeStaticContentServerOptions = {
     hostname?: string;
     port?: number;

package/src/adapters/node/static-content-server.js

@@ -1,6 +1,6 @@
 import { createServer } from "node:http";
 import { extname, join, normalize, sep } from "node:path";
-import { DEFAULT_ECOPAGES_HOSTNAME, DEFAULT_ECOPAGES_PORT, STATUS_MESSAGE } from "../../constants.js";
+import { DEFAULT_ECOPAGES_HOSTNAME, DEFAULT_ECOPAGES_PORT, STATUS_MESSAGE } from "../../config/constants.js";
 import { fileSystem } from "@ecopages/file-system";
 import { ServerUtils } from "../../utils/server-utils.module.js";
 class NodeStaticContentServer {

package/src/adapters/node/static-preview-host.d.ts

@@ -0,0 +1,55 @@
+import type { AddressInfo } from 'node:net';
+import type { EcoPagesAppConfig } from '../../types/internal-types.js';
+import type { StaticPreviewHost, StaticPreviewHostStartOptions } from '../shared/static-preview-host.js';
+type NodeStaticPreviewServer = {
+    start(): Promise<{
+        address(): AddressInfo | string | null;
+    }>;
+    stop(force?: boolean): Promise<void>;
+};
+type NodeStaticPreviewServerFactory = new (args: {
+    appConfig: EcoPagesAppConfig;
+    options?: {
+        hostname?: string;
+        port?: number;
+    };
+}) => NodeStaticPreviewServer;
+/**
+ * Node preview-host wrapper that manages the lifecycle of the static preview
+ * server used after a build.
+ *
+ * @remarks
+ * The host separates preview-server construction from lifecycle control so the
+ * Node server adapter can restart preview serving safely across repeated build
+ * and preview flows.
+ */
+export declare class NodeStaticPreviewHost implements StaticPreviewHost {
+    private readonly previewServerFactory;
+    private previewServer;
+    private stopPromise;
+    /**
+     * Creates the preview host with an injectable preview-server constructor.
+     */
+    constructor(previewServerFactory?: NodeStaticPreviewServerFactory);
+    /**
+     * Starts the Node preview host after fully draining any previous preview server
+     * shutdown that may still be in flight.
+     *
+     * @remarks
+     * The host only publishes a new preview server after `start()` succeeds. That
+     * keeps failed startup attempts from replacing the last known-good server with a
+     * half-initialized instance.
+     */
+    start(options: StaticPreviewHostStartOptions): Promise<number | null>;
+    /**
+     * Stops the active preview server and coalesces overlapping stop requests onto
+     * the same shutdown promise.
+     *
+     * @remarks
+     * The host keeps the server reference until shutdown succeeds. If shutdown
+     * fails, callers can still retry `stop()` or inspect the same live instance
+     * instead of losing the handle during a rejected async stop.
+     */
+    stop(force?: boolean): Promise<void>;
+}
+export {};

package/src/adapters/node/static-preview-host.js

@@ -0,0 +1,68 @@
+import { NodeStaticContentServer } from "./static-content-server.js";
+class NodeStaticPreviewHost {
+  /**
+   * Creates the preview host with an injectable preview-server constructor.
+   */
+  constructor(previewServerFactory = NodeStaticContentServer) {
+    this.previewServerFactory = previewServerFactory;
+  }
+  previewServerFactory;
+  previewServer = null;
+  stopPromise = null;
+  /**
+   * Starts the Node preview host after fully draining any previous preview server
+   * shutdown that may still be in flight.
+   *
+   * @remarks
+   * The host only publishes a new preview server after `start()` succeeds. That
+   * keeps failed startup attempts from replacing the last known-good server with a
+   * half-initialized instance.
+   */
+  async start(options) {
+    await this.stop();
+    const previewServer = new this.previewServerFactory({
+      appConfig: options.appConfig,
+      options: {
+        hostname: options.hostname,
+        port: options.port
+      }
+    });
+    const server = await previewServer.start();
+    this.previewServer = previewServer;
+    const address = server.address();
+    if (address && typeof address === "object") {
+      return address.port;
+    }
+    return options.port;
+  }
+  /**
+   * Stops the active preview server and coalesces overlapping stop requests onto
+   * the same shutdown promise.
+   *
+   * @remarks
+   * The host keeps the server reference until shutdown succeeds. If shutdown
+   * fails, callers can still retry `stop()` or inspect the same live instance
+   * instead of losing the handle during a rejected async stop.
+   */
+  async stop(force = true) {
+    if (this.stopPromise) {
+      await this.stopPromise;
+      return;
+    }
+    if (!this.previewServer) {
+      return;
+    }
+    const activePreviewServer = this.previewServer;
+    this.stopPromise = activePreviewServer.stop(force).then(() => {
+      if (this.previewServer === activePreviewServer) {
+        this.previewServer = null;
+      }
+    }).finally(() => {
+      this.stopPromise = null;
+    });
+    await this.stopPromise;
+  }
+}
+export {
+  NodeStaticPreviewHost
+};

package/src/adapters/shared/application-adapter.d.ts

@@ -1,4 +1,4 @@
-import type { ApiHandler, ApiHandlerContext, Middleware, RouteGroupBuilder, RouteOptions } from '../../public-types.js';
+import type { ApiHandler, ApiHandlerContext, Middleware, RouteGroupBuilder, RouteOptions } from '../../types/public-types.js';
 import { AbstractApplicationAdapter, type ApplicationAdapterOptions, type RouteGroupDefinition, type RouteHandler } from '../abstract/application-adapter.js';
 export declare abstract class SharedApplicationAdapter<TOptions extends ApplicationAdapterOptions = ApplicationAdapterOptions, TServer = any, TRequest extends Request = Request> extends AbstractApplicationAdapter<TOptions, TServer, TRequest> {
     protected register<P extends string, TContext extends ApiHandlerContext<TRequest, TServer> = ApiHandlerContext<TRequest, TServer>>(path: P, method: ApiHandler['method'], handler: RouteHandler<TRequest, TServer, TContext>, options?: RouteOptions<TRequest, TServer, TContext>): this;

package/src/adapters/shared/define-api-handler.d.ts

@@ -1,4 +1,4 @@
-import type { ApiHandler, ApiHandlerContext, Middleware, RouteSchema, TypedGroupHandlerContext } from '../../public-types.js';
+import type { ApiHandler, ApiHandlerContext, Middleware, RouteSchema, TypedGroupHandlerContext } from '../../types/public-types.js';
 type UniversalContext = ApiHandlerContext<Request, unknown>;
 type SchemaHandlerContext<TSchema extends RouteSchema | undefined, TContext extends UniversalContext> = TSchema extends RouteSchema ? TypedGroupHandlerContext<TSchema, TContext> : TContext;
 export declare function defineApiHandler<TPath extends string, TSchema extends RouteSchema | undefined = undefined, TContext extends UniversalContext = UniversalContext>(handler: Omit<ApiHandler<TPath, Request, unknown>, 'handler' | 'middleware' | 'schema'> & {

package/src/adapters/shared/explicit-static-render-preparation.d.ts

@@ -0,0 +1,25 @@
+import type { EcoPagesAppConfig } from '../../types/internal-types.js';
+import type { EcoFunctionComponent, EcoPageComponent } from '../../types/public-types.js';
+import type { ExplicitViewRenderer, ExplicitViewRendererResolver } from '../../route-renderer/route-renderer.js';
+type ExplicitStaticRenderPreparationResult = {
+    renderer: ExplicitViewRenderer;
+    props: Record<string, unknown>;
+    view: EcoFunctionComponent<Record<string, unknown>, any>;
+};
+/**
+ * Resolves the renderer and static props needed to render one explicit static
+ * view at runtime or during static generation.
+ */
+export declare function prepareExplicitStaticRender(input: {
+    routePath: string;
+    view: EcoPageComponent<any>;
+    params: Record<string, string | string[]>;
+    appConfig: EcoPagesAppConfig;
+    runtimeOrigin: string;
+    routeRendererFactory: ExplicitViewRendererResolver;
+    errors: {
+        missingIntegration(routePath: string): string;
+        noRendererForIntegration(integrationName: string): string;
+    };
+}): Promise<ExplicitStaticRenderPreparationResult>;
+export {};

package/src/adapters/shared/explicit-static-render-preparation.js

@@ -0,0 +1,26 @@
+function getViewIntegrationName(view) {
+  return view.config?.integration ?? view.config?.__eco?.integration;
+}
+async function prepareExplicitStaticRender(input) {
+  const integrationName = getViewIntegrationName(input.view);
+  if (!integrationName) {
+    throw new Error(input.errors.missingIntegration(input.routePath));
+  }
+  const renderer = input.routeRendererFactory.getExplicitViewRenderer(integrationName);
+  if (!renderer) {
+    throw new Error(input.errors.noRendererForIntegration(integrationName));
+  }
+  const props = input.view.staticProps ? (await input.view.staticProps({
+    pathname: { params: input.params },
+    appConfig: input.appConfig,
+    runtimeOrigin: input.runtimeOrigin
+  })).props : {};
+  return {
+    renderer,
+    props,
+    view: input.view
+  };
+}
+export {
+  prepareExplicitStaticRender
+};

package/src/adapters/shared/explicit-static-route-matcher.d.ts

@@ -1,19 +1,22 @@
-import type { EcoPagesAppConfig } from '../../internal-types.js';
-import type { StaticRoute } from '../../public-types.js';
-import type { RouteRendererFactory } from '../../route-renderer/route-renderer.js';
+import type { EcoPagesAppConfig } from '../../types/internal-types.js';
+import type { StaticRoute } from '../../types/public-types.js';
+import type { ExplicitViewRendererResolver } from '../../route-renderer/route-renderer.js';
 export declare const EXPLICIT_STATIC_ROUTE_MATCHER_ERRORS: {
     readonly missingIntegration: (routePath: string) => string;
     readonly noRendererForIntegration: (integrationName: string) => string;
 };
 export interface ExplicitStaticRouteMatcherOptions {
     appConfig: EcoPagesAppConfig;
-    routeRendererFactory: RouteRendererFactory;
+    routeRendererFactory: ExplicitViewRendererResolver;
     staticRoutes: StaticRoute[];
 }
 export interface ExplicitRouteMatch {
     route: StaticRoute;
     params: Record<string, string>;
 }
+/**
+ * Matches and renders explicit static routes declared through `app.static()`.
+ */
 export declare class ExplicitStaticRouteMatcher {
     private readonly appConfig;
     private readonly routeRendererFactory;

package/src/adapters/shared/explicit-static-route-matcher.js

@@ -1,11 +1,9 @@
 import { appLogger } from "../../global/app-logger.js";
+import { prepareExplicitStaticRender } from "./explicit-static-render-preparation.js";
 const EXPLICIT_STATIC_ROUTE_MATCHER_ERRORS = {
   missingIntegration: (routePath) => `View at ${routePath} is missing __eco.integration. Ensure it's defined with eco.page() and exported as default.`,
   noRendererForIntegration: (integrationName) => `No renderer found for integration: ${integrationName}`
 };
-function getViewIntegrationName(view) {
-  return view.config?.integration ?? view.config?.__eco?.integration;
-}
 class ExplicitStaticRouteMatcher {
   appConfig;
   routeRendererFactory;
@@ -74,20 +72,20 @@ class ExplicitStaticRouteMatcher {
     try {
       const mod = await route.loader();
       const view = mod.default;
-      const integrationName = getViewIntegrationName(view);
-      if (!integrationName) {
-        throw new Error(EXPLICIT_STATIC_ROUTE_MATCHER_ERRORS.missingIntegration(route.path));
-      }
-      const renderer = this.routeRendererFactory.getRendererByIntegration(integrationName);
-      if (!renderer) {
-        throw new Error(EXPLICIT_STATIC_ROUTE_MATCHER_ERRORS.noRendererForIntegration(integrationName));
-      }
-      const props = view.staticProps ? (await view.staticProps({
-        pathname: { params },
+      const {
+        renderer,
+        props,
+        view: renderableView
+      } = await prepareExplicitStaticRender({
+        routePath: route.path,
+        view,
+        params,
         appConfig: this.appConfig,
-        runtimeOrigin: this.appConfig.baseUrl
-      })).props : {};
-      return renderer.renderToResponse(view, props, {});
+        runtimeOrigin: this.appConfig.baseUrl,
+        routeRendererFactory: this.routeRendererFactory,
+        errors: EXPLICIT_STATIC_ROUTE_MATCHER_ERRORS
+      });
+      return renderer.renderToResponse(renderableView, props, {});
     } catch (error) {
       appLogger.error(
         `Error rendering explicit static route ${route.path}:`,