@ecopages/core 0.2.0-alpha.9 → 0.2.0-beta.1

package/src/static-site-generator/static-site-generator.js

@@ -1,9 +1,8 @@
 import path from "node:path";
-import { DEFAULT_ECOPAGES_WORK_DIR } from "../constants.js";
 import { appLogger } from "../global/app-logger.js";
 import { fileSystem } from "@ecopages/file-system";
 import { PathUtils } from "../utils/path-utils.module.js";
-import { getAppServerModuleTranspiler } from "../services/module-loading/app-server-module-transpiler.service.js";
+import { prepareExplicitStaticRender } from "../adapters/shared/explicit-static-render-preparation.js";
 const STATIC_SITE_GENERATOR_ERRORS = {
   ROUTE_RENDERER_FACTORY_REQUIRED: "RouteRendererFactory is required for render strategy",
   unsupportedBodyType: (bodyType) => `Unsupported body type for static generation: ${bodyType}`,
@@ -13,20 +12,11 @@ const STATIC_SITE_GENERATOR_ERRORS = {
 };
 class StaticSiteGenerator {
   appConfig;
-  serverModuleTranspiler;
   /**
    * Creates the static-site generator for one app config.
    */
   constructor({ appConfig }) {
     this.appConfig = appConfig;
-    this.serverModuleTranspiler = getAppServerModuleTranspiler(appConfig);
-  }
-  /**
-   * Returns the transpiler output directory used for static page-module probes.
-   */
-  getStaticPageModuleOutdir() {
-    const workDir = this.appConfig.absolutePaths?.workDir ?? path.join(this.appConfig.rootDir, this.appConfig.workDir ?? DEFAULT_ECOPAGES_WORK_DIR);
-    return path.join(workDir, ".server-static-page-modules");
   }
   getExportDir() {
     return this.appConfig.absolutePaths?.distDir ?? path.join(this.appConfig.rootDir, this.appConfig.distDir);
@@ -44,13 +34,9 @@ class StaticSiteGenerator {
    * Determines whether one filesystem-discovered page should be excluded from
    * static generation.
    */
-  async shouldSkipStaticPageFile(filePath) {
-    const module = await this.serverModuleTranspiler.importModule({
-      filePath,
-      outdir: this.getStaticPageModuleOutdir(),
-      externalPackages: false,
-      transpileErrorMessage: (details) => `Error transpiling static page module: ${details}`,
-      noOutputMessage: (targetFilePath) => `No transpiled output generated for static page module: ${targetFilePath}`
+  async shouldSkipStaticPageFile(filePath, routeRendererFactory) {
+    const module = await routeRendererFactory.getPageRenderer(filePath).loadPageModule(filePath, {
+      cacheScope: "static-page-probe"
     });
     if (module.default?.cache !== "dynamic") {
       return false;
@@ -108,25 +94,50 @@ class StaticSiteGenerator {
     }
     return Array.from(directories);
   }
-  /**
-   * Extracts dynamic parameters from the actual path based on the template path.
-   *
-   * @param templatePath - The template path (e.g., "/blog/[slug]")
-   * @param actualPath - The actual path (e.g., "/blog/my-post")
-   * @returns A record of extracted parameters (e.g., { slug: "my-post" })
-   */
-  extractParams(templatePath, actualPath) {
-    const templateSegments = templateSegmentsFromPath(templatePath);
-    const actualSegments = templateSegmentsFromPath(actualPath);
-    const params = {};
-    for (let i = 0; i < templateSegments.length; i++) {
-      const segment = templateSegments[i];
-      if (segment.startsWith("[") && segment.endsWith("]")) {
-        const paramName = segment.slice(1, -1).replace("...", "");
-        params[paramName] = actualSegments[i];
+  writeStaticOutput(routePath, contents, directories = []) {
+    const outputPath = this.getOutputPath(routePath, directories);
+    fileSystem.ensureDir(path.dirname(outputPath));
+    fileSystem.write(outputPath, contents);
+    return outputPath;
+  }
+  getStaticBuildStrategy(filePath) {
+    const ext = PathUtils.getEcoTemplateExtension(filePath);
+    const integration = this.appConfig.integrations.find((plugin) => plugin.extensions.includes(ext));
+    return integration?.staticBuildStep || "render";
+  }
+  async createFilesystemStaticContents(route, baseUrl, routeRendererFactory) {
+    const {
+      templateRoute: { filePath },
+      params
+    } = route;
+    if (this.getStaticBuildStrategy(filePath) === "fetch") {
+      const fetchUrl = this.resolveStaticFetchUrl(route.requestUrl, baseUrl);
+      const response = await fetch(fetchUrl);
+      if (!response.ok) {
+        appLogger.error(`Failed to fetch ${fetchUrl}. Status: ${response.status}`);
+        return null;
       }
+      return response.text();
+    }
+    if (!routeRendererFactory) {
+      throw new Error(STATIC_SITE_GENERATOR_ERRORS.ROUTE_RENDERER_FACTORY_REQUIRED);
     }
-    return params;
+    if (await this.shouldSkipStaticPageFile(filePath, routeRendererFactory)) {
+      return null;
+    }
+    const renderer = routeRendererFactory.getPageRenderer(filePath);
+    const result = await renderer.execute({
+      file: filePath,
+      params
+    });
+    const body = result.body;
+    if (typeof body === "string" || Buffer.isBuffer(body)) {
+      return body;
+    }
+    if (body instanceof ReadableStream) {
+      return new Response(body).text();
+    }
+    throw new Error(STATIC_SITE_GENERATOR_ERRORS.unsupportedBodyType(typeof body));
   }
   /**
    * Generates static output for all filesystem-discovered routes.
@@ -137,81 +148,38 @@ class StaticSiteGenerator {
    * go through the normal route renderer directly.
    */
   async generateStaticPages(router, baseUrl, routeRendererFactory) {
-    const routes = Object.keys(router.routes).filter((route) => !route.includes("["));
-    appLogger.debug("Static Pages", routes);
-    const directories = this.getDirectories(routes);
-    for (const directory of directories) {
-      fileSystem.ensureDir(path.join(this.getExportDir(), directory));
-    }
+    const routes = await router.listStaticGenerationRoutes({ runtimeOrigin: baseUrl });
+    appLogger.debug(
+      "Static Pages",
+      routes.map((route) => route.requestUrl)
+    );
+    const directories = this.getDirectories(routes.map((route) => route.requestUrl));
     for (const route of routes) {
       try {
-        const { filePath, pathname: routePathname } = router.routes[route];
-        if (await this.shouldSkipStaticPageFile(filePath)) {
+        const contents = await this.createFilesystemStaticContents(route, baseUrl, routeRendererFactory);
+        if (contents === null) {
           continue;
         }
-        const ext = PathUtils.getEcoTemplateExtension(filePath);
-        const integration = this.appConfig.integrations.find((plugin) => plugin.extensions.includes(ext));
-        const strategy = integration?.staticBuildStep || "render";
-        let contents;
-        if (strategy === "fetch") {
-          const fetchUrl = route.startsWith("http") ? route : `${baseUrl}${route}`;
-          const response = await fetch(fetchUrl);
-          if (!response.ok) {
-            appLogger.error(`Failed to fetch ${fetchUrl}. Status: ${response.status}`);
-            continue;
-          }
-          contents = await response.text();
-        } else {
-          if (!routeRendererFactory) {
-            throw new Error(STATIC_SITE_GENERATOR_ERRORS.ROUTE_RENDERER_FACTORY_REQUIRED);
-          }
-          let pathname2 = routePathname;
-          const pathnameSegments2 = pathname2.split("/").filter(Boolean);
-          if (pathname2 === "/") {
-            pathname2 = "/index.html";
-          } else if (pathnameSegments2.join("/").includes("[")) {
-            pathname2 = `${route.replace(router.origin, "")}.html`;
-          } else if (pathnameSegments2.length >= 1 && directories.includes(`/${pathnameSegments2.join("/")}`)) {
-            pathname2 = `${pathname2.endsWith("/") ? pathname2 : `${pathname2}/`}index.html`;
-          } else {
-            pathname2 += ".html";
-          }
-          const renderer = routeRendererFactory.createRenderer(filePath);
-          const params = this.extractParams(routePathname, pathname2.replace(".html", ""));
-          const result = await renderer.createRoute({
-            file: filePath,
-            params
-          });
-          const body = result.body;
-          if (typeof body === "string" || Buffer.isBuffer(body)) {
-            contents = body;
-          } else if (body instanceof ReadableStream) {
-            contents = await new Response(body).text();
-          } else {
-            throw new Error(STATIC_SITE_GENERATOR_ERRORS.unsupportedBodyType(typeof body));
-          }
-        }
-        let pathname = routePathname;
-        const pathnameSegments = pathname.split("/").filter(Boolean);
-        if (pathname === "/") {
-          pathname = "/index.html";
-        } else if (pathnameSegments.join("/").includes("[")) {
-          pathname = `${route.replace(router.origin, "")}.html`;
-        } else if (pathnameSegments.length >= 1 && directories.includes(`/${pathnameSegments.join("/")}`)) {
-          pathname = `${pathname.endsWith("/") ? pathname : `${pathname}/`}index.html`;
-        } else {
-          pathname += ".html";
-        }
-        const outputPath = path.join(this.getExportDir(), pathname);
-        fileSystem.write(outputPath, contents);
+        this.writeStaticOutput(route.pathname, contents, directories);
       } catch (error) {
         appLogger.error(
-          `Error generating static page for ${route}:`,
+          `Error generating static page for ${route.requestUrl}:`,
           error instanceof Error ? error : String(error)
         );
       }
     }
   }
+  resolveStaticFetchUrl(route, baseUrl) {
+    if (!route.startsWith("http://") && !route.startsWith("https://")) {
+      return `${baseUrl}${route}`;
+    }
+    const targetUrl = new URL(route);
+    const buildUrl = new URL(baseUrl);
+    buildUrl.pathname = targetUrl.pathname;
+    buildUrl.search = targetUrl.search;
+    buildUrl.hash = targetUrl.hash;
+    return buildUrl.href;
+  }
   /**
    * Executes the full static-generation workflow for one app run.
    */
@@ -243,12 +211,7 @@ class StaticSiteGenerator {
         if (this.shouldSkipStaticView(route.path, view)) {
           continue;
         }
-        const isDynamic = route.path.includes(":") || route.path.includes("[");
-        if (isDynamic) {
-          await this.generateDynamicStaticRoute(route.path, view, routeRendererFactory);
-        } else {
-          await this.generateSingleStaticRoute(route.path, view, routeRendererFactory);
-        }
+        await this.generateExplicitStaticRoute(route.path, view, routeRendererFactory);
       } catch (error) {
         appLogger.error(
           `Error generating explicit static page for ${route.path}:`,
@@ -257,63 +220,64 @@ class StaticSiteGenerator {
       }
     }
   }
-  /**
-   * Generate a single static page for a non-dynamic route.
-   */
-  async generateSingleStaticRoute(routePath, view, routeRendererFactory) {
-    const integrationName = view.config?.__eco?.integration;
-    if (!integrationName) {
-      throw new Error(STATIC_SITE_GENERATOR_ERRORS.missingIntegration(routePath));
-    }
-    const renderer = routeRendererFactory.getRendererByIntegration(integrationName);
-    if (!renderer) {
-      throw new Error(STATIC_SITE_GENERATOR_ERRORS.noRendererForIntegration(integrationName));
+  async generateExplicitStaticRoute(routePath, view, routeRendererFactory) {
+    const { renderer, routeEntries } = await this.planExplicitStaticRoute(routePath, view, routeRendererFactory);
+    for (const { pathname, params } of routeEntries) {
+      const contents = await this.createExplicitStaticContents(
+        routePath,
+        view,
+        params,
+        routeRendererFactory,
+        renderer
+      );
+      const outputPath = this.writeStaticOutput(pathname, contents);
+      appLogger.debug(`Generated static page: ${pathname} -> ${outputPath}`);
     }
-    const props = view.staticProps ? (await view.staticProps({
-      pathname: { params: {} },
+  }
+  async planExplicitStaticRoute(routePath, view, routeRendererFactory) {
+    const { renderer } = await prepareExplicitStaticRender({
+      routePath,
+      view,
+      params: {},
       appConfig: this.appConfig,
-      runtimeOrigin: this.appConfig.baseUrl
-    })).props : {};
-    const response = await renderer.renderToResponse(view, props, {});
-    const contents = await response.text();
-    const outputPath = this.getOutputPath(routePath);
-    fileSystem.ensureDir(path.dirname(outputPath));
-    fileSystem.write(outputPath, contents);
-    appLogger.debug(`Generated static page: ${routePath} -> ${outputPath}`);
+      runtimeOrigin: this.appConfig.baseUrl,
+      routeRendererFactory,
+      errors: STATIC_SITE_GENERATOR_ERRORS
+    });
+    return {
+      renderer,
+      routeEntries: await this.listExplicitStaticRouteEntries(routePath, view)
+    };
   }
-  /**
-   * Generate static pages for a dynamic route using staticPaths.
-   */
-  async generateDynamicStaticRoute(routePath, view, routeRendererFactory) {
+  async createExplicitStaticContents(routePath, view, params, routeRendererFactory, renderer) {
+    const { props, view: renderableView } = await prepareExplicitStaticRender({
+      routePath,
+      view,
+      params,
+      appConfig: this.appConfig,
+      runtimeOrigin: this.appConfig.baseUrl,
+      routeRendererFactory,
+      errors: STATIC_SITE_GENERATOR_ERRORS
+    });
+    const response = await renderer.renderToResponse(renderableView, props, {});
+    return response.text();
+  }
+  async listExplicitStaticRouteEntries(routePath, view) {
+    const isDynamic = routePath.includes(":") || routePath.includes("[");
+    if (!isDynamic) {
+      return [{ pathname: routePath, params: {} }];
+    }
     if (!view.staticPaths) {
       throw new Error(STATIC_SITE_GENERATOR_ERRORS.dynamicRouteRequiresStaticPaths(routePath));
     }
-    const integrationName = view.config?.__eco?.integration;
-    if (!integrationName) {
-      throw new Error(STATIC_SITE_GENERATOR_ERRORS.missingIntegration(routePath));
-    }
-    const renderer = routeRendererFactory.getRendererByIntegration(integrationName);
-    if (!renderer) {
-      throw new Error(STATIC_SITE_GENERATOR_ERRORS.noRendererForIntegration(integrationName));
-    }
     const { paths } = await view.staticPaths({
       appConfig: this.appConfig,
       runtimeOrigin: this.appConfig.baseUrl
     });
-    for (const { params } of paths) {
-      const resolvedPath = this.resolveRoutePath(routePath, params);
-      const props = view.staticProps ? (await view.staticProps({
-        pathname: { params },
-        appConfig: this.appConfig,
-        runtimeOrigin: this.appConfig.baseUrl
-      })).props : {};
-      const response = await renderer.renderToResponse(view, props, {});
-      const contents = await response.text();
-      const outputPath = this.getOutputPath(resolvedPath);
-      fileSystem.ensureDir(path.dirname(outputPath));
-      fileSystem.write(outputPath, contents);
-      appLogger.debug(`Generated static page: ${resolvedPath} -> ${outputPath}`);
-    }
+    return paths.map(({ params }) => ({
+      pathname: this.resolveRoutePath(routePath, params),
+      params
+    }));
   }
   /**
    * Resolve a route path template with actual params.
@@ -332,10 +296,12 @@ class StaticSiteGenerator {
   /**
    * Get the output file path for a given route.
    */
-  getOutputPath(routePath) {
+  getOutputPath(routePath, directories = []) {
     let outputName;
     if (routePath === "/") {
       outputName = "index.html";
+    } else if (directories.includes(routePath)) {
+      outputName = `${routePath}/index.html`;
     } else if (routePath.endsWith("/")) {
       outputName = `${routePath}index.html`;
     } else {
@@ -344,9 +310,6 @@ class StaticSiteGenerator {
     return path.join(this.getExportDir(), outputName);
   }
 }
-function templateSegmentsFromPath(path2) {
-  return path2.split("/").filter(Boolean);
-}
 export {
   STATIC_SITE_GENERATOR_ERRORS,
   StaticSiteGenerator

package/src/{internal-types.d.ts → types/internal-types.d.ts}

@@ -1,17 +1,18 @@
-import type { EcoBuildPlugin } from './build/build-types.js';
-import type { AppBuildManifest } from './build/build-manifest.js';
-import type { BuildAdapter, BuildExecutor } from './build/build-adapter.js';
-import type { IntegrationPlugin } from './plugins/integration-plugin.js';
-import type { Processor } from './plugins/processor.js';
+import type { EcoBuildPlugin } from '../build/build-types.js';
+import type { AppBuildManifest } from '../build/build-manifest.js';
+import type { BuildAdapter, BuildExecutor, BuildOwnership } from '../build/build-adapter.js';
+import type { AnyIntegrationPlugin } from '../plugins/integration-plugin.js';
+import type { Processor } from '../plugins/processor.js';
+import type { EcoSourceTransform } from '../plugins/source-transform.js';
 import type { PageMetadataProps } from './public-types.js';
-import type { FSRouter } from './router/server/fs-router.js';
-import type { CacheConfig } from './services/cache/cache.types.js';
-import type { DevGraphService } from './services/runtime-state/dev-graph.service.js';
-import type { EntrypointDependencyGraph } from './services/runtime-state/entrypoint-dependency-graph.service.js';
-import type { NodeRuntimeManifest } from './services/runtime-manifest/node-runtime-manifest.service.js';
-import type { RuntimeSpecifierRegistry } from './services/runtime-state/runtime-specifier-registry.service.js';
-import type { ServerInvalidationState } from './services/runtime-state/server-invalidation-state.service.js';
-import type { ServerModuleTranspiler } from './services/module-loading/server-module-transpiler.service.js';
+import type { RouteRegistry } from '../router/server/route-registry.js';
+import type { CacheConfig } from '../services/cache/cache.types.js';
+import type { DevGraphService } from '../services/runtime-state/dev-graph.service.js';
+import type { AppModuleLoader } from '../services/module-loading/app-module-loader.service.js';
+import type { SourceModuleLoader } from '../services/module-loading/module-loading-types.js';
+import type { EntrypointDependencyGraph } from '../services/runtime-state/entrypoint-dependency-graph.service.js';
+import type { ServerInvalidationState } from '../services/runtime-state/server-invalidation-state.service.js';
+import type { ServerModuleTranspiler } from '../services/module-loading/server-module-transpiler.service.js';
 export interface RobotsPreference {
     /**
      * The user agent
@@ -100,7 +101,7 @@ export type EcoPagesAppConfig = {
      */
     defaultMetadata: PageMetadataProps;
     /** Integrations plugins */
-    integrations: IntegrationPlugin[];
+    integrations: AnyIntegrationPlugin[];
     /** Integrations dependencies */
     integrationsDependencies: IntegrationDependencyConfig[];
     /** Derived Paths */
@@ -126,6 +127,11 @@ export type EcoPagesAppConfig = {
      * Loaders to be used in the app, these are used to process the files when importing them
      */
     loaders: Map<string, EcoBuildPlugin>;
+    /**
+     * App-owned source transforms that can be adapted into Vite or other
+     * transform-first bundlers.
+     */
+    sourceTransforms: Map<string, EcoSourceTransform>;
     /**
      * Cache configuration for ISR and page caching.
      * @default { store: 'memory', defaultStrategy: 'static', enabled: true }
@@ -139,13 +145,15 @@ export type EcoPagesAppConfig = {
      * process-global registries.
      */
     runtime?: {
+        appModuleLoader?: AppModuleLoader;
+        buildOwnership?: BuildOwnership;
         buildAdapter?: BuildAdapter;
         buildManifest?: AppBuildManifest;
         buildExecutor?: BuildExecutor;
         devGraphService?: DevGraphService;
         entrypointDependencyGraph?: EntrypointDependencyGraph;
-        nodeRuntimeManifest?: NodeRuntimeManifest;
-        runtimeSpecifierRegistry?: RuntimeSpecifierRegistry;
+        hostModuleLoader?: SourceModuleLoader;
+        rendererModuleContext?: unknown;
         serverInvalidationState?: ServerInvalidationState;
         serverModuleTranspiler?: ServerModuleTranspiler;
     };
@@ -174,11 +182,14 @@ export type RouteKind = 'exact' | 'catch-all' | 'dynamic';
  * Represents the result of a route match.
  */
 export type MatchResult = {
-    filePath: string;
-    kind: RouteKind;
-    pathname: string;
-    query?: Record<string, string>;
-    params?: Record<string, string | string[]>;
+    requestedPathname: string;
+    templateRoute: {
+        filePath: string;
+        kind: RouteKind;
+        pathname: string;
+    };
+    query: Record<string, string>;
+    params: Record<string, string | string[]>;
 };
 /**
  * Represents a route in EcoPages.
@@ -204,10 +215,10 @@ export type FileSystemServerOptions = {
  */
 export interface EcoPagesFileSystemServerAdapter<ServerInstanceOptions = unknown> {
     startServer(serverOptions: ServerInstanceOptions): {
-        router: FSRouter;
+        router: RouteRegistry;
         server: unknown;
     } | Promise<{
-        router: FSRouter;
+        router: RouteRegistry;
         server: unknown;
     }>;
 }