@ecopages/core 0.2.0-beta.25 → 0.2.0-beta.27

package/src/services/assets/asset-processing-service/processors/base/base-script-processor.js

@@ -1,5 +1,4 @@
 import { appLogger } from "../../../../../global/app-logger.js";
-import { getAppBrowserBuildPlugins } from "../../../../../build/build-adapter.js";
 import { fileSystem } from "@ecopages/file-system";
 import path from "node:path";
 import { BaseProcessor } from "./base-processor.js";
@@ -22,14 +21,6 @@ class BaseScriptProcessor extends BaseProcessor {
     }
     return dep.bundleOptions || {};
   }
-  collectBuildPlugins(excludePluginNames) {
-    const buildPlugins = getAppBrowserBuildPlugins(this.appConfig);
-    if (!excludePluginNames || excludePluginNames.length === 0) {
-      return buildPlugins;
-    }
-    const excluded = new Set(excludePluginNames);
-    return buildPlugins.filter((plugin) => !excluded.has(plugin.name));
-  }
   async bundleScript({
     entrypoint,
     outdir,
@@ -37,8 +28,6 @@ class BaseScriptProcessor extends BaseProcessor {
     plugins: additionalPlugins,
     ...rest
   }) {
-    const buildPlugins = this.collectBuildPlugins(excludeAppBuildPlugins);
-    const allPlugins = additionalPlugins ? [...additionalPlugins, ...buildPlugins] : buildPlugins;
     const buildResult = await this.browserBundleService.bundle({
       profile: "browser-script",
       entrypoints: [entrypoint],
@@ -47,7 +36,7 @@ class BaseScriptProcessor extends BaseProcessor {
       excludeAppBuildPlugins,
       splitting: true,
       naming: "[name]-[hash].[ext]",
-      plugins: allPlugins,
+      plugins: additionalPlugins,
       ...rest
     });
     if (!buildResult.success) {
@@ -86,8 +75,6 @@ class BaseScriptProcessor extends BaseProcessor {
     plugins: additionalPlugins,
     ...rest
   }) {
-    const buildPlugins = this.collectBuildPlugins(excludeAppBuildPlugins);
-    const allPlugins = additionalPlugins ? [...additionalPlugins, ...buildPlugins] : buildPlugins;
     const buildResult = await this.browserBundleService.bundleGroupedEntries(entries, {
       profile: "browser-script",
       outdir,
@@ -96,7 +83,7 @@ class BaseScriptProcessor extends BaseProcessor {
       ...rest,
       splitting: true,
       naming: "[name]-[hash].[ext]",
-      plugins: allPlugins
+      plugins: additionalPlugins
     });
     if (!buildResult.success) {
       for (const log of buildResult.logs) {

package/src/services/assets/asset-processing-service/processors/script/content-script.processor.d.ts

@@ -3,11 +3,12 @@ import { BaseScriptProcessor } from '../base/base-script-processor.js';
 export declare class ContentScriptProcessor extends BaseScriptProcessor<ContentScriptAsset> {
     private getContentScriptEntryDir;
     private getContentScriptEntryPath;
-    private createBundleConfigHash;
-    private createContentScriptCacheKey;
     private toProcessedAsset;
     private removeContentScriptEntry;
     processGrouped(deps: ContentScriptAsset[]): Promise<ProcessedAsset[]>;
     private getGroupedBundlerOptions;
+    /**
+     * Emits one content script asset. Cache reuse is owned by {@link AssetProcessingService}.
+     */
     process(dep: ContentScriptAsset): Promise<ProcessedAsset>;
 }

package/src/services/assets/asset-processing-service/processors/script/content-script.processor.js

@@ -1,6 +1,7 @@
 import path from "node:path";
 import { fileSystem } from "@ecopages/file-system";
-import { shouldUseDevBrowserScriptCache } from "../../../../../build/dev-browser-script-cache.js";
+import { resolveInlineContentScriptBody } from "../../inline-content-script-body.js";
+import { shouldUseDevBrowserScriptCache } from "../../../../../build/cache/dev-browser-script-cache.js";
 import { BaseScriptProcessor } from "../base/base-script-processor.js";
 class ContentScriptProcessor extends BaseScriptProcessor {
   getContentScriptEntryDir() {
@@ -11,24 +12,10 @@ class ContentScriptProcessor extends BaseScriptProcessor {
   getContentScriptEntryPath(contentHash) {
     return path.join(this.getContentScriptEntryDir(), `${contentHash}.js`);
   }
-  createBundleConfigHash(dep, shouldBundle) {
-    return this.generateHash(
-      JSON.stringify({
-        bundle: shouldBundle,
-        minify: shouldBundle && this.isProduction,
-        opts: dep.bundleOptions
-      })
-    );
-  }
-  createContentScriptCacheKey(dep, shouldBundle) {
-    const contentHash = this.generateHash(dep.content);
-    const configHash = this.createBundleConfigHash(dep, shouldBundle);
-    return `${this.buildCacheKey(`content-script:${contentHash}`, contentHash, dep)}:${configHash}`;
-  }
-  toProcessedAsset(dep, filepath, inlineContent) {
+  toProcessedAsset(dep, filepath) {
     return {
       filepath,
-      content: dep.inline ? inlineContent : void 0,
+      content: resolveInlineContentScriptBody(dep, filepath),
       kind: "script",
       position: dep.position,
       attributes: dep.attributes,
@@ -81,11 +68,7 @@ class ContentScriptProcessor extends BaseScriptProcessor {
         if (!bundledFilePath) {
           throw new Error(`Missing grouped bundle output for ${entryName}`);
         }
-        return this.toProcessedAsset(
-          dep,
-          bundledFilePath,
-          dep.inline ? fileSystem.readFileSync(bundledFilePath).toString() : void 0
-        );
+        return this.toProcessedAsset(dep, bundledFilePath);
       });
     } finally {
       for (const { contentHash } of tempEntries) {
@@ -104,41 +87,37 @@ class ContentScriptProcessor extends BaseScriptProcessor {
     }
     return options;
   }
+  /**
+   * Emits one content script asset. Cache reuse is owned by {@link AssetProcessingService}.
+   */
   async process(dep) {
     const shouldBundle = this.shouldBundle(dep);
-    const cacheKey = this.createContentScriptCacheKey(dep, shouldBundle);
-    return this.getOrProcess(cacheKey, async () => {
-      const hash = this.generateHash(dep.content);
-      const filename = dep.name ? `${dep.name}.js` : `script-${hash}.js`;
-      const filepath = path.join(this.getAssetsDir(), "scripts", filename);
-      if (!shouldBundle) {
-        if (!dep.inline) {
-          fileSystem.write(filepath, dep.content);
-        }
-        return this.toProcessedAsset(dep, filepath, dep.inline ? dep.content : void 0);
+    const hash = this.generateHash(dep.content);
+    const filename = dep.name ? `${dep.name}.js` : `script-${hash}.js`;
+    const filepath = path.join(this.getAssetsDir(), "scripts", filename);
+    if (!shouldBundle) {
+      if (!dep.inline) {
+        fileSystem.write(filepath, dep.content);
       }
-      if (!dep.content) {
-        throw new Error("No content found for script asset");
-      }
-      const entryPath = this.getContentScriptEntryPath(hash);
-      fileSystem.write(entryPath, dep.content);
-      try {
-        const bundledFilePath = await this.bundleScript({
-          entrypoint: entryPath,
-          outdir: this.getAssetsDir(),
-          minify: this.isProduction,
-          naming: `${path.parse(filename).name}-[hash].[ext]`,
-          ...this.getBundlerOptions(dep)
-        });
-        return this.toProcessedAsset(
-          dep,
-          bundledFilePath,
-          dep.inline ? fileSystem.readFileSync(bundledFilePath).toString() : void 0
-        );
-      } finally {
-        this.removeContentScriptEntry(hash);
-      }
-    });
+      return this.toProcessedAsset(dep, filepath);
+    }
+    if (!dep.content) {
+      throw new Error("No content found for script asset");
+    }
+    const entryPath = this.getContentScriptEntryPath(hash);
+    fileSystem.write(entryPath, dep.content);
+    try {
+      const bundledFilePath = await this.bundleScript({
+        entrypoint: entryPath,
+        outdir: this.getAssetsDir(),
+        minify: this.isProduction,
+        naming: `${path.parse(filename).name}-[hash].[ext]`,
+        ...this.getBundlerOptions(dep)
+      });
+      return this.toProcessedAsset(dep, bundledFilePath);
+    } finally {
+      this.removeContentScriptEntry(hash);
+    }
   }
 }
 export {

package/src/services/assets/browser-bundle.service.d.ts

@@ -1,6 +1,24 @@
-import type { BuildResult, BuildTranspileProfile } from '../../build/build-adapter.js';
-import type { EcoBuildPlugin } from '../../build/build-types.js';
+import type { BuildResult } from '../../build/build-adapter.js';
+import type { BuildTranspileProfile } from '../../build/build-adapter.js';
+import type { EcoBuildPlugin } from '../../build/contracts/build-types.js';
 import type { EcoPagesAppConfig } from '../../types/internal-types.js';
+/**
+ * Browser-oriented build request accepted by {@link BrowserBundleService}.
+ *
+ * @remarks
+ * `profile` is a {@link BuildTranspileProfile} (transpile settings only).
+ * `executor` selects the {@link BuildRuntime} concurrency slot:
+ * - `'hmr'` + (`hmr-entrypoint` | `hmr-runtime`) → `'browser-hmr'`
+ * - everything else (including `browser-script`, and `'build'`) → `'route-module'`
+ *
+ * Defaults `executor` to `'hmr'`. Request options are always assembled with
+ * browser-hmr *defaults* via {@link createBrowserBuildRequest}; only the
+ * concurrency/dedupe wrapper differs.
+ *
+ * Uses request-scope {@link requestBuildDedupe} plus in-flight
+ * {@link DedupingBuildExecutor} coalescing; both key on
+ * {@link createBuildRequestIdentity}.
+ */
 export type BrowserBundleOptions = {
     entrypoints: string[] | Record<string, string>;
     outdir?: string;
@@ -17,28 +35,10 @@ export type BrowserBundleOptions = {
     external?: string[];
     plugins?: EcoBuildPlugin[];
     executor?: 'build' | 'hmr';
-    [key: string]: unknown;
-    profile: BuildTranspileProfile;
-    excludeAppBuildPlugins?: string[];
-};
-type BrowserBundleGroupedOptions = {
-    outdir?: string;
-    outbase?: string;
-    naming?: string;
-    conditions?: string[];
-    define?: Record<string, string>;
-    minify?: boolean;
-    treeshaking?: boolean;
-    splitting?: boolean;
-    root?: string;
-    bundle?: boolean;
-    externalPackages?: boolean;
-    external?: string[];
-    plugins?: EcoBuildPlugin[];
-    [key: string]: unknown;
     profile: BuildTranspileProfile;
     excludeAppBuildPlugins?: string[];
 };
+type BrowserBundleGroupedOptions = Omit<BrowserBundleOptions, 'entrypoints'>;
 export interface BrowserBundleExecutor {
     bundle(options: BrowserBundleOptions): Promise<BuildResult>;
 }
@@ -50,24 +50,20 @@ export type BrowserBundleGroupedEntry = {
  * App-owned boundary for browser-oriented bundle work.
  *
  * @remarks
- * This service owns the shared browser transpile defaults and ensures browser
- * builds always run through the app-owned executor rather than direct backend
- * calls scattered across HMR and asset processing paths.
+ * Owns shared browser transpile defaults and ensures browser builds run through
+ * the app-owned executor rather than direct backend calls. Assembles a complete
+ * request via {@link createBrowserBuildRequest} before scheduling.
  */
 export declare class BrowserBundleService implements BrowserBundleExecutor {
     private readonly appConfig;
-    /**
-     * Creates the browser bundle boundary for one finalized app instance.
-     */
     constructor(appConfig: EcoPagesAppConfig);
     /**
      * Runs one browser-targeted build through the app-owned executor.
      *
      * @remarks
-     * Browser defaults and app-owned browser build plugins are applied here so HMR
-     * and runtime asset generation do not have to recreate that policy at each call
-     * site. Also forwards {@link getAppSourceTransforms | app source transforms} so
-     * metadata injection runs after boundary/runtime `onLoad` rewrites.
+     * Browser defaults, app-owned browser plugins, and
+     * {@link getAppSourceTransforms | app source transforms} are applied here
+     * so HMR and asset generation do not recreate that policy at each call site.
      */
     bundle(options: BrowserBundleOptions): Promise<BuildResult>;
     bundleGroupedEntries(entries: BrowserBundleGroupedEntry[], options: BrowserBundleGroupedOptions): Promise<BuildResult>;

package/src/services/assets/browser-bundle.service.js

@@ -1,10 +1,8 @@
-import { getAppBrowserBuildPlugins, getAppTranspileOptions } from "../../build/build-adapter.js";
-import { requireBuildRuntime } from "../../build/build-runtime.js";
-import { mergeEcoBuildPlugins } from "../../build/build-manifest.js";
-import { getAppSourceTransforms } from "../../plugins/source-transform.js";
+import { createBrowserBuildRequest } from "../../build/runtime/build-request-policy.js";
+import { requireBuildRuntime } from "../../build/runtime/build-runtime.js";
 import { startupTrace } from "../../diagnostics/startup-trace.js";
 import { requestBuildDedupe } from "../../diagnostics/request-build-dedupe.js";
-import { createBuildOptionsDedupeKey } from "../../build/deduping-build-executor.js";
+import { createBuildRequestIdentity } from "../../build/runtime/build-request-identity.js";
 function resolveBrowserBundleExecutor(appConfig, profile, executor) {
   const buildRuntime = requireBuildRuntime(appConfig);
   if (executor === "hmr" && (profile === "hmr-entrypoint" || profile === "hmr-runtime")) {
@@ -14,9 +12,6 @@ function resolveBrowserBundleExecutor(appConfig, profile, executor) {
 }
 class BrowserBundleService {
   appConfig;
-  /**
-   * Creates the browser bundle boundary for one finalized app instance.
-   */
   constructor(appConfig) {
     this.appConfig = appConfig;
   }
@@ -24,24 +19,18 @@ class BrowserBundleService {
    * Runs one browser-targeted build through the app-owned executor.
    *
    * @remarks
-   * Browser defaults and app-owned browser build plugins are applied here so HMR
-   * and runtime asset generation do not have to recreate that policy at each call
-   * site. Also forwards {@link getAppSourceTransforms | app source transforms} so
-   * metadata injection runs after boundary/runtime `onLoad` rewrites.
+   * Browser defaults, app-owned browser plugins, and
+   * {@link getAppSourceTransforms | app source transforms} are applied here
+   * so HMR and asset generation do not recreate that policy at each call site.
    */
   async bundle(options) {
-    const { profile, excludeAppBuildPlugins, plugins, executor = "hmr", ...rawBuildOptions } = options;
-    const appBrowserPlugins = getAppBrowserBuildPlugins(this.appConfig);
-    const filteredAppBrowserPlugins = excludeAppBuildPlugins && excludeAppBuildPlugins.length > 0 ? appBrowserPlugins.filter((plugin) => !excludeAppBuildPlugins.includes(plugin.name)) : appBrowserPlugins;
-    const request = {
-      ...rawBuildOptions,
-      entrypoints: options.entrypoints,
-      ...getAppTranspileOptions(this.appConfig, profile),
-      plugins: mergeEcoBuildPlugins(plugins, filteredAppBrowserPlugins),
-      sourceTransforms: getAppSourceTransforms(this.appConfig)
-    };
+    const { profile, executor = "hmr", ...requestInput } = options;
+    const request = createBrowserBuildRequest(this.appConfig, {
+      ...requestInput,
+      profile
+    });
     const buildExecutor = resolveBrowserBundleExecutor(this.appConfig, profile, executor);
-    const dedupeKey = createBuildOptionsDedupeKey(request);
+    const dedupeKey = createBuildRequestIdentity(request);
     return requestBuildDedupe.dedupeBuild(dedupeKey, async () => {
       const result = await buildExecutor.build(request);
       startupTrace.recordBrowserBundle(result.outputs);

package/src/services/module-loading/app-server-module-transpiler.service.d.ts

@@ -5,6 +5,14 @@ import { ServerModuleTranspiler } from './server-module-transpiler.service.js';
 export declare function shouldAppUseHostModuleLoader(appConfig: EcoPagesAppConfig, filePath: string): boolean;
 export declare function getAppHostModuleLoader(appConfig: EcoPagesAppConfig): SourceModuleLoader | undefined;
 export declare function setAppHostModuleLoader(appConfig: EcoPagesAppConfig, hostModuleLoader?: SourceModuleLoader): void;
+/**
+ * Creates the app module loader that imports route modules through the build pipeline.
+ *
+ * @remarks
+ * Caller `plugins` are treated as contributions only.
+ * {@link PageModuleImportService} assembles the complete server request via
+ * {@link createServerBuildRequest}; this loader does not merge app plugins.
+ */
 export declare function createAppModuleLoader(appConfig: EcoPagesAppConfig): AppModuleLoader;
 export declare function getAppModuleLoader(appConfig: EcoPagesAppConfig): AppModuleLoader;
 export declare function setAppModuleLoader(appConfig: EcoPagesAppConfig, appModuleLoader: AppModuleLoader): void;

package/src/services/module-loading/app-server-module-transpiler.service.js

@@ -1,6 +1,4 @@
-import { getAppServerBuildPlugins } from "../../build/build-adapter.js";
-import { requireBuildRuntime } from "../../build/build-runtime.js";
-import { getJsxOwnershipPlugins } from "../../build/jsx-ownership-plugins.js";
+import { requireBuildRuntime } from "../../build/runtime/build-runtime.js";
 import path from "node:path";
 import { DevelopmentInvalidationService } from "../invalidation/development-invalidation.service.js";
 import {} from "./app-module-loader.service.js";
@@ -44,8 +42,6 @@ function createAppModuleLoader(appConfig) {
     canLoadSourceModuleFromHost: (filePath) => shouldAppUseHostModuleLoader(appConfig, filePath),
     getHostModuleLoader: () => getAppHostModuleLoader(appConfig)
   });
-  const appServerBuildPlugins = appConfig.runtime?.buildManifest ? getAppServerBuildPlugins(appConfig) : Array.from(appConfig.loaders?.values() ?? []);
-  const jsxOwnershipPlugins = getJsxOwnershipPlugins(appConfig);
   const appModuleLoader = {
     get owner() {
       return getAppModuleLoaderOwner(appConfig);
@@ -53,10 +49,8 @@ function createAppModuleLoader(appConfig) {
     pageModuleImportService,
     async importModule(options) {
       const invalidationVersion = options.invalidationVersion ?? invalidationService.getServerModuleInvalidationVersion();
-      const mergedPlugins = [...appServerBuildPlugins, ...jsxOwnershipPlugins, ...options.plugins ?? []];
       return await pageModuleImportService.importModule({
         ...options,
-        ...mergedPlugins.length > 0 ? { plugins: mergedPlugins } : {},
         buildExecutor: options.buildExecutor ?? requireBuildRuntime(appConfig).getProfile("route-module"),
         invalidationVersion
       });

package/src/services/module-loading/page-module-import.service.d.ts

@@ -1,5 +1,5 @@
 import { build, type BuildExecutor, type BuildResult } from '../../build/build-adapter.js';
-import type { EcoBuildPlugin } from '../../build/build-types.js';
+import type { EcoBuildPlugin } from '../../build/contracts/build-types.js';
 import type { EcoPagesAppConfig } from '../../types/internal-types.js';
 import type { SourceModuleLoaderFactory } from './module-loading-types.js';
 interface PageModuleImportBaseOptions {

package/src/services/module-loading/page-module-import.service.js

@@ -2,19 +2,16 @@ import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { fileSystem } from "@ecopages/file-system";
 import { build } from "../../build/build-adapter.js";
-import { resolveBuildProfileOptions } from "../../build/build-profile-options.js";
-import { normalizeNodeRuntimeBuildOutputFile } from "../../build/runtime-build-output-normalizer.js";
+import { createServerBuildRequest } from "../../build/runtime/build-request-policy.js";
+import { resolveBuildProfileOptions } from "../../build/runtime/build-profile-options.js";
 import {
   importPagesUnifiedGraphModule,
   isPagesUnifiedGraphPage,
   shouldBuildPagesUnifiedGraph
-} from "../../build/pages-unified-graph-build.js";
-import { recordPageModuleBuildInvocation } from "../../build/rolldown-build-invocation-metrics.js";
-import {
-  resolvePageModuleOutputFileName,
-  createPluginCacheKey,
-  createJsxCacheKey
-} from "./route-module-build-cache.js";
+} from "../../build/cache/pages-unified-graph-build.js";
+import { recordPageModuleBuildInvocation } from "../../build/rolldown/rolldown-build-invocation-metrics.js";
+import { resolvePageModuleOutputFileName } from "./route-module-build-cache.js";
+import { createPluginCacheKey, createJsxCacheKey } from "../../build/cache/cache-keys.js";
 import { getSharedRouteModuleBuildCache } from "./route-module-build-cache-registry.js";
 import {
   RouteModuleDependencyHasher,
@@ -151,11 +148,41 @@ class PageModuleImportService {
     });
     const outputNamingTemplate = outputFileName.replace(/\.mjs$/u, ".[ext]");
     const preferredOutputPath = path.join(outdir, outputFileName);
-    const routeModuleBuildCache = this.getRouteModuleBuildCache(outdir);
-    const cachedBuild = routeModuleBuildCache.lookup({
+    const buildOptions = this.appConfig ? createServerBuildRequest(this.appConfig, {
+      profile: "route-module",
+      entrypoints: [filePath],
+      outdir,
+      naming: outputNamingTemplate,
+      splitting: splitting ?? true,
+      jsx: options.jsx,
+      plugins: options.plugins,
+      root: rootDir,
+      ...externalPackages !== void 0 ? { externalPackages } : {}
+    }) : {
+      ...resolveBuildProfileOptions("route-module", { rootDir }, {
+        entrypoints: [filePath],
+        outdir,
+        naming: outputNamingTemplate,
+        splitting: splitting ?? true,
+        jsx: options.jsx,
+        plugins: options.plugins,
+        ...externalPackages !== void 0 ? { externalPackages } : {}
+      }),
+      root: rootDir,
+      entrypoints: [filePath]
+    };
+    const cacheBuildOptions = {
       ...options,
+      rootDir: buildOptions.root ?? rootDir,
+      outdir: buildOptions.outdir ?? outdir,
+      splitting: buildOptions.splitting,
+      externalPackages: buildOptions.externalPackages,
+      jsx: buildOptions.jsx,
+      plugins: buildOptions.plugins,
       fileHash
-    });
+    };
+    const routeModuleBuildCache = this.getRouteModuleBuildCache(outdir);
+    const cachedBuild = routeModuleBuildCache.lookup(cacheBuildOptions);
     if (cachedBuild) {
       return await import(
         /* @vite-ignore */
@@ -169,19 +196,6 @@ class PageModuleImportService {
       }
     }
     recordPageModuleBuildInvocation();
-    const buildOptions = {
-      ...resolveBuildProfileOptions("route-module", this.appConfig ?? { rootDir }, {
-        entrypoints: [filePath],
-        outdir,
-        naming: outputNamingTemplate,
-        splitting: splitting ?? true,
-        jsx: options.jsx,
-        plugins: options.plugins,
-        ...externalPackages !== void 0 ? { externalPackages } : {}
-      }),
-      root: rootDir,
-      entrypoints: [filePath]
-    };
     const buildResult = await this.dependencies.buildModule(buildOptions, options.buildExecutor);
     if (!buildResult.success) {
       const details = buildResult.logs.map((log) => log.message).join(" | ");
@@ -191,7 +205,6 @@ class PageModuleImportService {
     if (!compiledOutput) {
       throw new Error(noOutputMessage(filePath));
     }
-    normalizeNodeRuntimeBuildOutputFile(compiledOutput, rootDir);
     const dependencyModulePaths = resolveRouteModuleDependencyPaths(buildResult, filePath, rootDir);
     const dependencyHashes = this.dependencyHasher.createDependencyHashes(dependencyModulePaths);
     dependencyHashes[path.normalize(filePath)] = fileHash;
@@ -202,8 +215,7 @@ class PageModuleImportService {
       }
     }
     routeModuleBuildCache.recordBuild({
-      ...options,
-      fileHash,
+      ...cacheBuildOptions,
       outputPath: compiledOutput,
       dependencyModulePaths
     });

package/src/services/module-loading/route-module-build-cache.store.js

@@ -14,7 +14,7 @@ import {
 import {
   isProductionCacheManifestCurrent,
   matchesProductionCacheFingerprint
-} from "../../build/production-build-cache.js";
+} from "../../build/cache/production-build-cache.js";
 class RouteModuleBuildCache {
   manifestPath;
   dependencies;

package/src/services/module-loading/route-module-build-manifest.d.ts

@@ -1,8 +1,7 @@
-import type { EcoBuildPlugin } from '../../build/build-types.js';
 import type { PageModuleBuildImportOptions } from './page-module-import.service.js';
 import type { RouteModuleDependencyHashes } from './route-module-dependency-hasher.js';
-/** Filename written beside transpiled server modules that stores incremental build metadata. */
-export declare const ROUTE_MODULE_BUILD_CACHE_FILENAME = ".build-cache.json";
+export { createJsxCacheKey, createPluginCacheKey, getCorePackageVersion, hashPluginSetup, } from '../../build/cache/cache-keys.js';
+export { ROUTE_MODULE_BUILD_CACHE_FILENAME } from '../../build/cache/cache-constants.js';
 /** One persisted route-module build entry in {@link ROUTE_MODULE_BUILD_CACHE_FILENAME}. */
 export interface RouteModuleBuildCacheEntry {
     sourceHash: string;
@@ -37,8 +36,6 @@ export interface RouteModuleStaticRenderCacheContext {
 }
 export type RouteModuleBuildCacheManifestReader = (manifestPath: string) => RouteModuleBuildCacheManifest | undefined;
 export type RouteModuleBuildCacheManifestWriter = (manifestPath: string, manifest: RouteModuleBuildCacheManifest) => void;
-/** Returns the installed `@ecopages/core` package version used to invalidate persisted caches. */
-export declare function getCorePackageVersion(): string;
 /** Normalizes filesystem paths used as manifest keys and build-key inputs. */
 export declare function normalizeRouteModuleCachePath(filePath: string): string;
 /** Returns whether route-module disk caching should run for the current import. */
@@ -55,7 +52,3 @@ export declare function createPersistedRouteModuleBuildKey(options: PageModuleBu
 export declare function createEmptyRouteModuleBuildCacheManifest(): RouteModuleBuildCacheManifest;
 export declare function readRouteModuleBuildCacheManifest(manifestPath: string): RouteModuleBuildCacheManifest | undefined;
 export declare function writeRouteModuleBuildCacheManifest(manifestPath: string, manifest: RouteModuleBuildCacheManifest): void;
-export declare function createJsxCacheKey(jsx: PageModuleBuildImportOptions['jsx']): string;
-export declare function createPluginCacheKey(plugins?: EcoBuildPlugin[]): string;
-/** Exported for in-process import caches that must match persisted build keys. */
-export declare function hashPluginSetup(setup: EcoBuildPlugin['setup']): string;

package/src/services/module-loading/route-module-build-manifest.js

@@ -1,17 +1,13 @@
-import { readFileSync } from "node:fs";
 import path from "node:path";
-import { readProductionCacheManifest, writeProductionCacheManifest } from "../../build/production-build-cache.js";
-const ROUTE_MODULE_BUILD_CACHE_FILENAME = ".build-cache.json";
-let cachedCorePackageVersion;
-function getCorePackageVersion() {
-  if (cachedCorePackageVersion) {
-    return cachedCorePackageVersion;
-  }
-  const packageJsonPath = new URL("../../../package.json", import.meta.url);
-  const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-  cachedCorePackageVersion = packageJson.version ?? "0.0.0";
-  return cachedCorePackageVersion;
-}
+import { readProductionCacheManifest, writeProductionCacheManifest } from "../../build/cache/production-build-cache.js";
+import { createJsxCacheKey, createPluginCacheKey, getCorePackageVersion } from "../../build/cache/cache-keys.js";
+import {
+  createJsxCacheKey as createJsxCacheKey2,
+  createPluginCacheKey as createPluginCacheKey2,
+  getCorePackageVersion as getCorePackageVersion2,
+  hashPluginSetup
+} from "../../build/cache/cache-keys.js";
+import { ROUTE_MODULE_BUILD_CACHE_FILENAME } from "../../build/cache/cache-constants.js";
 function normalizeRouteModuleCachePath(filePath) {
   return path.resolve(filePath);
 }
@@ -73,40 +69,13 @@ function shouldVersionBuildOutputPath(invalidationVersion) {
 function sanitizeCacheScope(cacheScope) {
   return cacheScope.replace(/[^a-zA-Z0-9_-]+/g, "-");
 }
-function createJsxCacheKey(jsx) {
-  if (!jsx) {
-    return "jsx:default";
-  }
-  return JSON.stringify({
-    development: jsx.development ?? false,
-    factory: jsx.factory ?? null,
-    fragment: jsx.fragment ?? null,
-    importSource: jsx.importSource ?? null,
-    runtime: jsx.runtime ?? null,
-    sideEffects: jsx.sideEffects ?? null
-  });
-}
-function createPluginCacheKey(plugins) {
-  if (!plugins || plugins.length === 0) {
-    return "plugins:default";
-  }
-  return `plugins:${plugins.map((plugin) => `${plugin.name}:${hashPluginSetup(plugin.setup)}`).join(",")}`;
-}
-function hashPluginSetup(setup) {
-  let hash = 0;
-  const source = setup.toString();
-  for (let index = 0; index < source.length; index += 1) {
-    hash = hash * 31 + source.charCodeAt(index) | 0;
-  }
-  return (hash >>> 0).toString(36);
-}
 export {
   ROUTE_MODULE_BUILD_CACHE_FILENAME,
   createEmptyRouteModuleBuildCacheManifest,
-  createJsxCacheKey,
+  createJsxCacheKey2 as createJsxCacheKey,
   createPersistedRouteModuleBuildKey,
-  createPluginCacheKey,
-  getCorePackageVersion,
+  createPluginCacheKey2 as createPluginCacheKey,
+  getCorePackageVersion2 as getCorePackageVersion,
   hashPluginSetup,
   normalizeRouteModuleCachePath,
   readRouteModuleBuildCacheManifest,

package/src/services/module-loading/server-module-transpiler.service.d.ts

@@ -1,5 +1,5 @@
 import type { BuildExecutor } from '../../build/build-adapter.js';
-import type { EcoBuildPlugin } from '../../build/build-types.js';
+import type { EcoBuildPlugin } from '../../build/contracts/build-types.js';
 import type { AppModuleLoader } from './app-module-loader.service.js';
 import { type PageModuleBuildImportOptions } from './page-module-import.service.js';
 import type { SourceModuleLoaderFactory } from './module-loading-types.js';

package/src/static-site-generator/README.md

@@ -33,7 +33,7 @@ It should not invent a parallel rendering stack just for build mode.
 | `static-export-context.ts`     | Hook context type for `beforeStaticExport` / `afterStaticExport`             |
 | `static-build-invalidation.ts` | `dist/` reset policy, production cache clearing, static-render cache context |
 
-Build-input fingerprinting (`hashAppConfigFile`, `createBuildInputsFingerprint`) lives in `packages/core/src/build/build-input-fingerprint.ts` and is shared with server-entry and unified-graph caches.
+Build-input fingerprinting (`hashAppConfigFile`, `createBuildInputsFingerprint`) lives in `packages/core/src/build/cache/build-input-fingerprint.ts` and is shared with server-entry and unified-graph caches.
 
 ## Incremental static export