@ecopages/core 0.2.0-beta.4 → 0.2.0-beta.40

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

@@ -1,130 +1,115 @@
-import { getAppBuildExecutor, getAppServerBuildPlugins } from "../../build/build-adapter.js";
-import { createForeignJsxOverridePlugin } from "../../plugins/foreign-jsx-override-plugin.js";
-import path from "node:path";
-import { DevelopmentInvalidationService } from "../invalidation/development-invalidation.service.js";
-import {} from "./app-module-loader.service.js";
-import { PageModuleImportService } from "./page-module-import.service.js";
-import { supportsSourceModuleLoading } from "./source-module-support.js";
-import { ServerModuleTranspiler } from "./server-module-transpiler.service.js";
-function shouldAppUseHostModuleLoader(appConfig, filePath) {
-  if (appConfig.runtime?.hostModuleLoader) {
-    return supportsSourceModuleLoading(filePath);
-  }
-  const normalizedFilePath = path.normalize(filePath);
-  const frameworkOwnedDirectories = [
-    appConfig.absolutePaths.pagesDir,
-    appConfig.absolutePaths.includesDir,
-    appConfig.absolutePaths.layoutsDir,
-    appConfig.absolutePaths.componentsDir
-  ].map((directoryPath) => path.normalize(directoryPath));
-  const isFrameworkOwnedModule = frameworkOwnedDirectories.some((directoryPath) => {
-    return normalizedFilePath === directoryPath || normalizedFilePath.startsWith(`${directoryPath}${path.sep}`);
-  });
-  const isConfiguredTemplateModule = appConfig.templatesExt.some(
-    (extension) => normalizedFilePath.endsWith(extension)
-  );
-  return !(isFrameworkOwnedModule && isConfiguredTemplateModule);
+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';
+import { PageModuleImportService } from './page-module-import.service.js';
+import { supportsSourceModuleLoading } from './source-module-support.js';
+import { ServerModuleTranspiler } from './server-module-transpiler.service.js';
+export function shouldAppUseHostModuleLoader(appConfig, filePath) {
+    if (appConfig.runtime?.hostModuleLoader) {
+        return supportsSourceModuleLoading(filePath);
+    }
+    const normalizedFilePath = path.normalize(filePath);
+    const frameworkOwnedDirectories = [
+        appConfig.absolutePaths.pagesDir,
+        appConfig.absolutePaths.includesDir,
+        appConfig.absolutePaths.layoutsDir,
+        appConfig.absolutePaths.componentsDir,
+    ].map((directoryPath) => path.normalize(directoryPath));
+    const isFrameworkOwnedModule = frameworkOwnedDirectories.some((directoryPath) => {
+        return normalizedFilePath === directoryPath || normalizedFilePath.startsWith(`${directoryPath}${path.sep}`);
+    });
+    const isConfiguredTemplateModule = appConfig.templatesExt.some((extension) => normalizedFilePath.endsWith(extension));
+    return !(isFrameworkOwnedModule && isConfiguredTemplateModule);
 }
-function getAppHostModuleLoader(appConfig) {
-  return appConfig.runtime?.hostModuleLoader;
+export function getAppHostModuleLoader(appConfig) {
+    return appConfig.runtime?.hostModuleLoader;
 }
 function getAppModuleLoaderOwner(appConfig) {
-  return getAppHostModuleLoader(appConfig) ? "host" : "app";
+    return getAppHostModuleLoader(appConfig) ? 'host' : 'app';
 }
-function setAppHostModuleLoader(appConfig, hostModuleLoader) {
-  appConfig.runtime = {
-    ...appConfig.runtime ?? {},
-    hostModuleLoader
-  };
+export function setAppHostModuleLoader(appConfig, hostModuleLoader) {
+    appConfig.runtime = {
+        ...(appConfig.runtime ?? {}),
+        hostModuleLoader,
+    };
 }
-function getJsxOwnershipPlugins(appConfig) {
-  const jsxExtensions = (appConfig.integrations ?? []).filter((integration) => integration.jsxImportSource).flatMap(
-    (integration) => integration.extensions.filter((extension) => extension.endsWith(".tsx") || extension.endsWith(".jsx")).map((extension) => ({ integration, extension }))
-  ).sort((left, right) => right.extension.length - left.extension.length);
-  return jsxExtensions.map(
-    ({ integration, extension }) => createForeignJsxOverridePlugin({
-      hostJsxImportSource: integration.jsxImportSource,
-      foreignExtensions: [extension],
-      excludeExtensions: jsxExtensions.filter((candidate) => candidate.extension.length > extension.length).filter((candidate) => candidate.extension.endsWith(extension)).map((candidate) => candidate.extension),
-      name: `ecopages-jsx-ownership-${integration.name}-${extension.replace(/[^a-zA-Z0-9]+/g, "-")}`
-    })
-  );
+/**
+ * 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 function createAppModuleLoader(appConfig) {
+    const pageModuleImportService = new PageModuleImportService(appConfig, {
+        canLoadSourceModuleFromHost: (filePath) => shouldAppUseHostModuleLoader(appConfig, filePath),
+        getHostModuleLoader: () => getAppHostModuleLoader(appConfig),
+    });
+    const appModuleLoader = {
+        get owner() {
+            return getAppModuleLoaderOwner(appConfig);
+        },
+        pageModuleImportService,
+        async importModule(options) {
+            return await pageModuleImportService.importModule({
+                ...options,
+                buildExecutor: options.buildExecutor ?? requireBuildRuntime(appConfig).getProfile('route-module'),
+            });
+        },
+        invalidateDevelopmentGraph() {
+            pageModuleImportService.invalidateDevelopmentGraph();
+        },
+    };
+    return appModuleLoader;
 }
-function createAppModuleLoader(appConfig) {
-  const invalidationService = new DevelopmentInvalidationService(appConfig);
-  const pageModuleImportService = new PageModuleImportService({
-    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);
-    },
-    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 ?? getAppBuildExecutor(appConfig),
-        invalidationVersion
-      });
-    },
-    invalidateDevelopmentGraph() {
-      pageModuleImportService.invalidateDevelopmentGraph();
+export function getAppModuleLoader(appConfig) {
+    const existingModuleLoader = appConfig.runtime?.appModuleLoader;
+    if (existingModuleLoader) {
+        return existingModuleLoader;
     }
-  };
-  return appModuleLoader;
-}
-function getAppModuleLoader(appConfig) {
-  const existingModuleLoader = appConfig.runtime?.appModuleLoader;
-  if (existingModuleLoader) {
-    return existingModuleLoader;
-  }
-  const appModuleLoader = createAppModuleLoader(appConfig);
-  setAppModuleLoader(appConfig, appModuleLoader);
-  return appModuleLoader;
+    const appModuleLoader = createAppModuleLoader(appConfig);
+    setAppModuleLoader(appConfig, appModuleLoader);
+    return appModuleLoader;
 }
-function setAppModuleLoader(appConfig, appModuleLoader) {
-  appConfig.runtime = {
-    ...appConfig.runtime ?? {},
-    appModuleLoader
-  };
+export function setAppModuleLoader(appConfig, appModuleLoader) {
+    appConfig.runtime = {
+        ...(appConfig.runtime ?? {}),
+        appModuleLoader,
+    };
 }
-function createAppServerModuleTranspiler(appConfig) {
-  const invalidationService = new DevelopmentInvalidationService(appConfig);
-  return new ServerModuleTranspiler({
-    rootDir: appConfig.rootDir,
-    invalidateModules: (changedFiles) => invalidationService.invalidateServerModules(changedFiles),
-    pageModuleImportService: getAppModuleLoader(appConfig)
-  });
+/**
+ * Creates the shared app-scoped server-module transpiler for one runtime
+ * instance.
+ */
+export function createAppServerModuleTranspiler(appConfig) {
+    const invalidationService = new DevelopmentInvalidationService(appConfig);
+    return new ServerModuleTranspiler({
+        rootDir: appConfig.rootDir,
+        invalidateModules: (changedFiles) => invalidationService.invalidateServerModules(changedFiles),
+        pageModuleImportService: getAppModuleLoader(appConfig),
+    });
 }
-function getAppServerModuleTranspiler(appConfig) {
-  const existingTranspiler = appConfig.runtime?.serverModuleTranspiler;
-  if (existingTranspiler) {
-    return existingTranspiler;
-  }
-  const serverModuleTranspiler = createAppServerModuleTranspiler(appConfig);
-  setAppServerModuleTranspiler(appConfig, serverModuleTranspiler);
-  return serverModuleTranspiler;
+/**
+ * Returns the app-owned server-module transpiler, creating it lazily when the
+ * runtime first needs one.
+ */
+export function getAppServerModuleTranspiler(appConfig) {
+    const existingTranspiler = appConfig.runtime?.serverModuleTranspiler;
+    if (existingTranspiler) {
+        return existingTranspiler;
+    }
+    const serverModuleTranspiler = createAppServerModuleTranspiler(appConfig);
+    setAppServerModuleTranspiler(appConfig, serverModuleTranspiler);
+    return serverModuleTranspiler;
 }
-function setAppServerModuleTranspiler(appConfig, serverModuleTranspiler) {
-  appConfig.runtime = {
-    ...appConfig.runtime ?? {},
-    serverModuleTranspiler
-  };
+/**
+ * Installs the server-module transpiler that should serve one app instance.
+ */
+export function setAppServerModuleTranspiler(appConfig, serverModuleTranspiler) {
+    appConfig.runtime = {
+        ...(appConfig.runtime ?? {}),
+        serverModuleTranspiler,
+    };
 }
-export {
-  createAppModuleLoader,
-  createAppServerModuleTranspiler,
-  getAppHostModuleLoader,
-  getAppModuleLoader,
-  getAppServerModuleTranspiler,
-  setAppHostModuleLoader,
-  setAppModuleLoader,
-  setAppServerModuleTranspiler,
-  shouldAppUseHostModuleLoader
-};

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

@@ -0,0 +1,19 @@
+import type { EcoPagesAppConfig } from '../../types/internal-types.js';
+export type CollectionServerBuildArtifact = {
+    collectionName: string;
+    outputPath: string;
+    outputUrl: string;
+    sourcePaths: string[];
+    buildIdentity: string;
+};
+export declare function getCollectionServerBuildArtifact(appConfig: EcoPagesAppConfig, collectionName: string): CollectionServerBuildArtifact | undefined;
+export declare function clearCollectionServerBuildArtifacts(appConfig: EcoPagesAppConfig): void;
+/**
+ * Builds one generated collection server module as an independent server unit.
+ */
+export declare function buildCollectionServerModule(input: {
+    appConfig: EcoPagesAppConfig;
+    collectionName: string;
+    sourceFilePath: string;
+    ownedSourcePaths: readonly string[];
+}): Promise<CollectionServerBuildArtifact>;

package/src/services/module-loading/collection-server-module-build.service.js

@@ -0,0 +1,83 @@
+import { createHash } from 'node:crypto';
+import path from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { build } from '../../build/build-adapter.js';
+import { createBuildRequestIdentity } from '../../build/runtime/build-request-identity.js';
+import { createServerBuildRequest } from '../../build/runtime/build-request-policy.js';
+import { recordCollectionBuild } from '../../diagnostics/request-pipeline-metrics.js';
+import { resolveInternalExecutionDir } from '../../utils/resolve-work-dir.js';
+import { fileSystem } from '@ecopages/file-system';
+const artifactsByCollection = new WeakMap();
+function getArtifactMap(appConfig) {
+    let artifacts = artifactsByCollection.get(appConfig);
+    if (!artifacts) {
+        artifacts = new Map();
+        artifactsByCollection.set(appConfig, artifacts);
+    }
+    return artifacts;
+}
+export function getCollectionServerBuildArtifact(appConfig, collectionName) {
+    return getArtifactMap(appConfig).get(collectionName);
+}
+export function clearCollectionServerBuildArtifacts(appConfig) {
+    getArtifactMap(appConfig).clear();
+}
+function createCollectionBuildIdentity(buildRequestIdentity, sourceFilePath, ownedSourcePaths) {
+    const sourcePaths = [
+        ...new Set([sourceFilePath, ...ownedSourcePaths].map((sourcePath) => path.resolve(sourcePath))),
+    ].sort();
+    const sourceIdentity = sourcePaths
+        .map((sourcePath) => `${sourcePath}\0${fileSystem.exists(sourcePath) ? fileSystem.hash(sourcePath) : 'missing'}`)
+        .join('\0');
+    return createHash('sha256')
+        .update('collection-server-build-v2\0')
+        .update(buildRequestIdentity)
+        .update('\0')
+        .update(sourceIdentity)
+        .digest('hex')
+        .slice(0, 16);
+}
+/**
+ * Builds one generated collection server module as an independent server unit.
+ */
+export async function buildCollectionServerModule(input) {
+    const { appConfig, collectionName, sourceFilePath, ownedSourcePaths } = input;
+    const outdir = path.join(resolveInternalExecutionDir(appConfig), '.server-collections', collectionName);
+    const buildRequest = createServerBuildRequest(appConfig, {
+        profile: 'route-module',
+        entrypoints: [sourceFilePath],
+        outdir,
+        naming: '[name].[ext]',
+        splitting: false,
+        externalPackages: true,
+    });
+    const buildIdentity = createCollectionBuildIdentity(createBuildRequestIdentity(buildRequest), sourceFilePath, ownedSourcePaths);
+    const artifacts = getArtifactMap(appConfig);
+    const existing = artifacts.get(collectionName);
+    if (existing?.buildIdentity === buildIdentity) {
+        return existing;
+    }
+    const outputFileName = `${collectionName}-${buildIdentity}.mjs`;
+    const buildOptions = { ...buildRequest, naming: outputFileName.replace(/\.mjs$/u, '.[ext]') };
+    recordCollectionBuild();
+    const buildResult = await build(buildOptions);
+    if (!buildResult.success) {
+        const details = buildResult.logs.map((log) => log.message).join(' | ');
+        throw new Error(`Error building collection server module ${collectionName}: ${details}`);
+    }
+    const preferredOutputPath = path.join(outdir, outputFileName);
+    const compiledOutput = buildResult.outputs.find((output) => output.path === preferredOutputPath)?.path ??
+        buildResult.outputs.find((output) => /\.(?:[cm]?js)$/u.test(output.path))?.path;
+    if (!compiledOutput) {
+        throw new Error(`No compiled output generated for collection server module: ${sourceFilePath}`);
+    }
+    const artifact = {
+        collectionName,
+        outputPath: compiledOutput,
+        outputUrl: pathToFileURL(compiledOutput).href,
+        sourcePaths: [...ownedSourcePaths, sourceFilePath],
+        buildIdentity,
+    };
+    artifacts.set(collectionName, artifact);
+    return artifact;
+}

package/src/services/module-loading/host-module-loader-registry.js

@@ -1,15 +1,10 @@
 let hostModuleLoader;
-function setHostModuleLoader(loader) {
-  hostModuleLoader = loader;
+export function setHostModuleLoader(loader) {
+    hostModuleLoader = loader;
 }
-function getHostModuleLoader() {
-  return hostModuleLoader;
+export function getHostModuleLoader() {
+    return hostModuleLoader;
 }
-function clearHostModuleLoader() {
-  hostModuleLoader = void 0;
+export function clearHostModuleLoader() {
+    hostModuleLoader = undefined;
 }
-export {
-  clearHostModuleLoader,
-  getHostModuleLoader,
-  setHostModuleLoader
-};

package/src/services/module-loading/module-loading-types.js

@@ -0,0 +1 @@
+export {};

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

@@ -1,11 +1,10 @@
-import { build, type BuildExecutor, type BuildResult } from '../../build/build-adapter.js';
-import type { EcoBuildPlugin } from '../../build/build-types.js';
+import { build, type BuildExecutor, type BuildOptions, type BuildResult } from '../../build/build-adapter.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 {
     filePath: string;
     bypassCache?: boolean;
-    cacheScope?: string;
-    invalidationVersion?: number;
 }
 /**
  * Options for imports that must pass through the Ecopages build pipeline.
@@ -20,6 +19,7 @@ export interface PageModuleBuildImportOptions extends PageModuleImportBaseOption
     buildExecutor?: BuildExecutor;
     splitting?: boolean;
     externalPackages?: boolean;
+    sourceTransforms?: BuildOptions['sourceTransforms'];
     jsx?: {
         development?: boolean;
         factory?: string;
@@ -59,22 +59,19 @@ export interface PageModuleImportDependencies {
  * transpilation settings, and error semantics across the different callers.
  */
 export declare class PageModuleImportService {
+    private readonly appConfig?;
     private readonly dependencies;
+    private readonly dependencyHasher;
     private readonly importCache;
-    private developmentInvalidationVersion;
-    constructor(dependencies?: Partial<PageModuleImportDependencies>);
+    private developmentImportGeneration;
+    constructor(appConfig?: EcoPagesAppConfig, dependencies?: Partial<PageModuleImportDependencies>);
     /**
      * Clears the shared import cache used by framework-owned page-module loads.
      */
     clearImportCache(): void;
     /**
-     * Invalidates all previously imported modules in development by clearing the
-     * import cache and incrementing the invalidation version included in cache keys.
-     *
-     * This forces all modules to be reloaded on the next import, even if their
-     * source content hasn't changed. This is necessary to ensure that changes to
-     * non-content aspects of modules (e.g. dependencies, transpilation output)
-     * are picked up during development.
+     * Clears in-memory import promises and dependency-hash memoization so the next
+     * import revalidates against current source and transform identity.
      */
     invalidateDevelopmentGraph(): void;
     /**
@@ -91,5 +88,6 @@ export declare class PageModuleImportService {
      */
     importModule<T = unknown>(options: PageModuleBuildImportOptions): Promise<T>;
     private loadModule;
+    private getRouteModuleBuildCache;
 }
 export {};