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

package/src/{route-renderer/orchestration/page-packaging.service.test.ts → services/assets/asset-processing-service/page-package.test.ts}

@@ -1,10 +1,9 @@
 import { describe, expect, it } from 'vitest';
-import type { ProcessedAsset } from '../../services/assets/asset-processing-service/index.ts';
-import { PagePackagingService } from './page-packaging.service.ts';
+import type { ProcessedAsset } from './assets.types.ts';
+import { createPagePackage } from './page-package.ts';
 
-describe('PagePackagingService', () => {
+describe('createPagePackage', () => {
 	it('classifies page assets, inline assets, separate assets, and dynamic chunks', () => {
-		const service = new PagePackagingService();
 		const pageScript = {
 			kind: 'script',
 			srcUrl: '/assets/page.js',
@@ -35,13 +34,7 @@ describe('PagePackagingService', () => {
 			packageRole: 'dynamic-chunk',
 		} as ProcessedAsset;
 
-		const result = service.createPagePackage([
-			pageStylesheet,
-			pageScript,
-			runtimeScript,
-			inlineScript,
-			dynamicChunk,
-		]);
+		const result = createPagePackage([pageStylesheet, pageScript, runtimeScript, inlineScript, dynamicChunk]);
 
 		expect(result.pageScript).toBe(pageScript);
 		expect(result.pageStylesheet).toBe(pageStylesheet);
@@ -52,7 +45,6 @@ describe('PagePackagingService', () => {
 	});
 
 	it('prefers explicit page roles over visibility heuristics', () => {
-		const service = new PagePackagingService();
 		const hiddenPageScript = {
 			kind: 'script',
 			srcUrl: '/assets/pages/index.js',
@@ -67,10 +59,42 @@ describe('PagePackagingService', () => {
 			packageRole: 'keep-separate',
 		} as ProcessedAsset;
 
-		const result = service.createPagePackage([hiddenPageScript, hydrationBootstrap]);
+		const result = createPagePackage([hiddenPageScript, hydrationBootstrap]);
 
 		expect(result.pageScript).toBe(hiddenPageScript);
 		expect(result.htmlAssets).toEqual([hydrationBootstrap]);
 		expect(result.separateAssets).toEqual([hydrationBootstrap]);
 	});
-});
+
+	it('suppresses bundled source stylesheet assets from final html assets', () => {
+		const pageStylesheet = {
+			kind: 'stylesheet',
+			srcUrl: '/assets/page.css',
+			position: 'head',
+			packageRole: 'page-style',
+			bundledSourceFilepaths: ['/app/src/styles/tailwind.css', '/app/src/styles/fonts.css'],
+		} as ProcessedAsset;
+		const bundledTailwind = {
+			kind: 'stylesheet',
+			srcUrl: '/assets/styles/tailwind.css',
+			position: 'head',
+			sourceFilepath: '/app/src/styles/tailwind.css',
+		} as ProcessedAsset;
+		const bundledFonts = {
+			kind: 'stylesheet',
+			srcUrl: '/assets/styles/fonts.css',
+			position: 'head',
+			sourceFilepath: '/app/src/styles/fonts.css',
+		} as ProcessedAsset;
+		const pageScript = {
+			kind: 'script',
+			srcUrl: '/assets/page.js',
+			position: 'head',
+		} as ProcessedAsset;
+
+		const result = createPagePackage([pageStylesheet, bundledTailwind, bundledFonts, pageScript]);
+
+		expect(result.pageStylesheet).toBe(pageStylesheet);
+		expect(result.htmlAssets).toEqual([pageStylesheet, pageScript]);
+	});
+});

package/src/services/assets/asset-processing-service/page-package.ts

@@ -0,0 +1,93 @@
+import type { PagePackageResult } from '../../../types/public-types.ts';
+import type { ProcessedAsset } from './assets.types.ts';
+
+function getSuppressedSourceFilepaths(assets: ProcessedAsset[]): Set<string> {
+	const suppressed = new Set<string>();
+
+	for (const asset of assets) {
+		if (
+			(asset.packageRole === 'page-style' || asset.packageRole === 'page-script') &&
+			Array.isArray(asset.bundledSourceFilepaths)
+		) {
+			for (const filepath of asset.bundledSourceFilepaths) {
+				suppressed.add(filepath);
+			}
+		}
+	}
+
+	return suppressed;
+}
+
+export function createPagePackage(assets: ProcessedAsset[]): PagePackageResult {
+	const inlineAssets: ProcessedAsset[] = [];
+	const separateAssets: ProcessedAsset[] = [];
+	const dynamicChunks: ProcessedAsset[] = [];
+	let pageScript: ProcessedAsset | undefined;
+	let pageStylesheet: ProcessedAsset | undefined;
+	const suppressedSourceFilepaths = getSuppressedSourceFilepaths(assets);
+
+	for (const asset of assets) {
+		if (asset.inline) {
+			inlineAssets.push(asset);
+			continue;
+		}
+
+		if (asset.packageRole === 'dynamic-chunk') {
+			dynamicChunks.push(asset);
+			continue;
+		}
+
+		if (!pageScript && asset.packageRole === 'page-script') {
+			pageScript = asset;
+			continue;
+		}
+
+		if (!pageStylesheet && asset.packageRole === 'page-style') {
+			pageStylesheet = asset;
+			continue;
+		}
+
+		if (asset.packageRole === 'keep-separate' || asset.packageRole === 'runtime') {
+			separateAssets.push(asset);
+			continue;
+		}
+
+		if (!pageScript && asset.kind === 'script' && !asset.excludeFromHtml) {
+			pageScript = asset;
+			continue;
+		}
+
+		if (!pageStylesheet && asset.kind === 'stylesheet') {
+			pageStylesheet = asset;
+			continue;
+		}
+
+		separateAssets.push(asset);
+	}
+
+	return {
+		assets,
+		htmlAssets: assets.filter((asset) => shouldIncludeInHtml(asset, suppressedSourceFilepaths)),
+		pageScript,
+		pageStylesheet,
+		inlineAssets,
+		separateAssets,
+		dynamicChunks,
+	};
+}
+
+function shouldIncludeInHtml(asset: ProcessedAsset, suppressedSourceFilepaths: Set<string>): boolean {
+	if (asset.excludeFromHtml) {
+		return false;
+	}
+
+	if (asset.packageRole === 'runtime') {
+		return false;
+	}
+
+	if (asset.sourceFilepath && suppressedSourceFilepaths.has(asset.sourceFilepath)) {
+		return false;
+	}
+
+	return true;
+}

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

@@ -6,10 +6,7 @@ import { fileSystem } from '@ecopages/file-system';
 import path from 'node:path';
 import type { ScriptAsset } from '../../assets.types.ts';
 import { BaseProcessor } from './base-processor.ts';
-import {
-	BrowserBundleService,
-	type BrowserBundleGroupedEntry,
-} from '../../../browser-bundle.service.ts';
+import { BrowserBundleService, type BrowserBundleGroupedEntry } from '../../../browser-bundle.service.ts';
 
 export abstract class BaseScriptProcessor<T extends ScriptAsset> extends BaseProcessor<T> {
 	private readonly browserBundleService: BrowserBundleService;
@@ -151,7 +148,9 @@ export abstract class BaseScriptProcessor<T extends ScriptAsset> extends BasePro
 				continue;
 			}
 
-			const hashedOutput = outputs.find((outputPath) => path.basename(outputPath).startsWith(`${entry.entryName}-`));
+			const hashedOutput = outputs.find((outputPath) =>
+				path.basename(outputPath).startsWith(`${entry.entryName}-`),
+			);
 			if (hashedOutput) {
 				entryOutputs.set(entry.entryName, hashedOutput);
 				continue;

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

@@ -143,15 +143,18 @@ describe('ContentScriptProcessor', () => {
 
 	test('processGrouped should fall back to per-entry processing when bundling is disabled', async () => {
 		const processor = new ContentScriptProcessor({ appConfig: createMockConfig() });
-		const processSpy = vi.spyOn(processor, 'process').mockResolvedValueOnce({
-			kind: 'script',
-			inline: false,
-			filepath: '/tmp/first.js',
-		}).mockResolvedValueOnce({
-			kind: 'script',
-			inline: false,
-			filepath: '/tmp/second.js',
-		});
+		const processSpy = vi
+			.spyOn(processor, 'process')
+			.mockResolvedValueOnce({
+				kind: 'script',
+				inline: false,
+				filepath: '/tmp/first.js',
+			})
+			.mockResolvedValueOnce({
+				kind: 'script',
+				inline: false,
+				filepath: '/tmp/second.js',
+			});
 
 		const results = await processor.processGrouped([
 			{
@@ -189,4 +192,4 @@ describe('ContentScriptProcessor', () => {
 
 		expect(fileSystem.remove).toHaveBeenCalledTimes(1);
 	});
-});
+});

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

@@ -62,6 +62,7 @@ export class ContentScriptProcessor extends BaseScriptProcessor<ContentScriptAss
 					excludeFromHtml: dep.excludeFromHtml,
 					packageRole: dep.packageRole,
 					groupedBundle: dep.groupedBundle,
+					bundledSourceFilepaths: dep.bundledSourceFilepaths,
 				};
 			});
 		} finally {
@@ -87,6 +88,7 @@ export class ContentScriptProcessor extends BaseScriptProcessor<ContentScriptAss
 				inline: dep.inline,
 				excludeFromHtml: dep.excludeFromHtml,
 				packageRole: dep.packageRole,
+				bundledSourceFilepaths: dep.bundledSourceFilepaths,
 			};
 
 			this.writeCacheFile(filename, unbundledProcessedAsset);
@@ -120,6 +122,7 @@ export class ContentScriptProcessor extends BaseScriptProcessor<ContentScriptAss
 				excludeFromHtml: dep.excludeFromHtml,
 				packageRole: dep.packageRole,
 				groupedBundle: dep.groupedBundle,
+				bundledSourceFilepaths: dep.bundledSourceFilepaths,
 			};
 
 			fileSystem.remove(tempFileName);

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

@@ -39,6 +39,7 @@ export class FileScriptProcessor extends BaseScriptProcessor<FileScriptAsset> {
 			const outputFilepath = this.resolveHmrOutputFilepath(dep.filepath);
 			return {
 				filepath: outputFilepath ?? dep.filepath,
+				sourceFilepath: dep.filepath,
 				srcUrl: outputUrl,
 				kind: 'script',
 				position: dep.position,
@@ -46,6 +47,7 @@ export class FileScriptProcessor extends BaseScriptProcessor<FileScriptAsset> {
 				inline: false,
 				excludeFromHtml: dep.excludeFromHtml,
 				packageRole: dep.packageRole,
+				bundledSourceFilepaths: dep.bundledSourceFilepaths,
 			};
 		}
 
@@ -72,6 +74,7 @@ export class FileScriptProcessor extends BaseScriptProcessor<FileScriptAsset> {
 
 				return {
 					filepath,
+					sourceFilepath: dep.filepath,
 					content,
 					kind: 'script',
 					position: dep.position,
@@ -79,6 +82,7 @@ export class FileScriptProcessor extends BaseScriptProcessor<FileScriptAsset> {
 					inline: dep.inline,
 					excludeFromHtml: dep.excludeFromHtml,
 					packageRole: dep.packageRole,
+					bundledSourceFilepaths: dep.bundledSourceFilepaths,
 				};
 			}
 
@@ -97,6 +101,7 @@ export class FileScriptProcessor extends BaseScriptProcessor<FileScriptAsset> {
 
 			return {
 				filepath: bundledFilePath,
+				sourceFilepath: dep.filepath,
 				content: dep.inline ? fileSystem.readFileSync(bundledFilePath).toString() : undefined,
 				kind: 'script',
 				position: dep.position,
@@ -104,6 +109,7 @@ export class FileScriptProcessor extends BaseScriptProcessor<FileScriptAsset> {
 				inline: dep.inline,
 				excludeFromHtml: dep.excludeFromHtml,
 				packageRole: dep.packageRole,
+				bundledSourceFilepaths: dep.bundledSourceFilepaths,
 			};
 		});
 	}

package/src/services/assets/asset-processing-service/processors/script/node-module-script.processor.ts

@@ -25,6 +25,7 @@ export class NodeModuleScriptProcessor extends BaseScriptProcessor<NodeModuleScr
 					inline: true,
 					excludeFromHtml: dep.excludeFromHtml,
 					packageRole: dep.packageRole,
+					bundledSourceFilepaths: dep.bundledSourceFilepaths,
 				};
 			}
 
@@ -47,6 +48,7 @@ export class NodeModuleScriptProcessor extends BaseScriptProcessor<NodeModuleScr
 				inline: dep.inline,
 				excludeFromHtml: dep.excludeFromHtml,
 				packageRole: dep.packageRole,
+				bundledSourceFilepaths: dep.bundledSourceFilepaths,
 			};
 		});
 	}

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

@@ -65,6 +65,7 @@ export class ContentStylesheetProcessor extends BaseProcessor<ContentStylesheetA
 				attributes: dep.attributes,
 				inline: dep.inline,
 				packageRole: dep.packageRole,
+				bundledSourceFilepaths: dep.bundledSourceFilepaths,
 			};
 		});
 	}

package/src/services/assets/asset-processing-service/processors/stylesheet/file-stylesheet.processor.ts

@@ -69,12 +69,14 @@ export class FileStylesheetProcessor extends BaseProcessor<FileStylesheetAsset>
 
 			return {
 				filepath: filepath,
+				sourceFilepath: dep.filepath,
 				content: dep.inline ? processedContent : undefined,
 				kind: 'stylesheet',
 				position: dep.position,
 				attributes: dep.attributes,
 				inline: dep.inline,
 				packageRole: dep.packageRole,
+				bundledSourceFilepaths: dep.bundledSourceFilepaths,
 			};
 		});
 	}

package/src/services/assets/asset-processing-service/ungrouped-dependency-processing.ts

@@ -62,4 +62,4 @@ export async function processUngroupedDependency(
 		logProcessingError(dep, error);
 		return null;
 	}
-}
+}

package/src/services/html/html-transformer.service.test.ts

@@ -435,10 +435,7 @@ describe('HtmlTransformerService', () => {
 			packageRole: 'runtime',
 		} as ProcessedAsset;
 
-		expect(transformer.dedupeProcessedAssets([pageScript, runtimeScript])).toEqual([
-			pageScript,
-			runtimeScript,
-		]);
+		expect(transformer.dedupeProcessedAssets([pageScript, runtimeScript])).toEqual([pageScript, runtimeScript]);
 	});
 
 	it('should prefer page package html assets during transform', async () => {

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

@@ -53,9 +53,7 @@ export function createAppModuleLoader(appConfig: EcoPagesAppConfig): AppModuleLo
 		getHostModuleLoader: () => getAppHostModuleLoader(appConfig),
 	});
 	const getDefaultPlugins =
-		typeof Bun === 'undefined' && appConfig.rootDir
-			? () => [createAppNodeBootstrapPlugin(appConfig)]
-			: () => [];
+		typeof Bun === 'undefined' && appConfig.rootDir ? () => [createAppNodeBootstrapPlugin(appConfig)] : () => [];
 	const appModuleLoader: AppModuleLoader & {
 		pageModuleImportService: PageModuleImportService;
 	} = {

package/src/services/module-loading/node-bootstrap-plugin.ts

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { existsSync, lstatSync, mkdirSync, readFileSync, realpathSync, rmSync, symlinkSync } from 'node:fs';
+import { existsSync, lstatSync, mkdirSync, readFileSync, realpathSync, rmSync, symlinkSync, unlinkSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import type { EcoBuildOnResolveArgs, EcoBuildOnResolveResult, EcoBuildPlugin } from '../../build/build-types.ts';
@@ -72,7 +72,7 @@ function ensureRuntimePackageLink(nodeModulesDir: string, specifier: string, res
 			return;
 		}
 
-		rmSync(linkPath, { recursive: true, force: true });
+		removeRuntimePackageLink(linkPath);
 	}
 
 	try {
@@ -86,11 +86,25 @@ function ensureRuntimePackageLink(nodeModulesDir: string, specifier: string, res
 			return;
 		}
 
-		rmSync(linkPath, { recursive: true, force: true });
+		removeRuntimePackageLink(linkPath);
 		symlinkSync(packageRoot, linkPath, 'dir');
 	}
 }
 
+function removeRuntimePackageLink(linkPath: string): void {
+	try {
+		const stats = lstatSync(linkPath);
+		if (stats.isSymbolicLink()) {
+			unlinkSync(linkPath);
+			return;
+		}
+	} catch {
+		return;
+	}
+
+	rmSync(linkPath, { recursive: true, force: true });
+}
+
 export interface NodeBootstrapResolutionOptions {
 	/**
 	 * App root used as the fallback package boundary when an importer does not

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

@@ -249,4 +249,3 @@ function createRuntimeModuleUrl(
 function sanitizeCacheScope(cacheScope: string): string {
 	return cacheScope.replace(/[^a-zA-Z0-9_-]+/g, '-');
 }
-

package/src/services/module-loading/source-module-support.ts

@@ -16,4 +16,4 @@ export function supportsSourceModuleLoading(filePath: string): boolean {
 		extension === '.cjs' ||
 		extension === '.cts'
 	);
-}
+}