@askrjs/askr 0.0.95 → 0.0.96

package/dist/benchmark.js

@@ -63,8 +63,8 @@ function BenchmarkTable({ rows, isSelected, onSelect, onRemove }) {
 installRendererBridge();
 const benchmarkMetadata = {
 	packageName: "@askrjs/askr",
-	packageVersion: "0.0.95",
-	buildLabel: "0.0.95-local"
+	packageVersion: "0.0.96",
+	buildLabel: "0.0.96-local"
 };
 function getBenchmarkMetadata() {
 	return { ...benchmarkMetadata };

package/dist/ssg/index.js

@@ -10,6 +10,23 @@ import * as pathModule from "node:path";
 import * as os from "node:os";
 import * as fsSync from "node:fs";
 //#region src/ssg/route-utils.ts
+function getPortableOutputPathKey(filePath) {
+	return filePath.normalize("NFC").replaceAll("\\", "/").toLowerCase();
+}
+function describeRoute(descriptor) {
+	if (descriptor.route.path === descriptor.path) return `"${descriptor.path}"`;
+	return `"${descriptor.route.path}" (resolved as "${descriptor.path}")`;
+}
+/** Reject routes that could overwrite one another on any supported filesystem. */
+function validateOutputPathCollisions(descriptors) {
+	const seen = /* @__PURE__ */ new Map();
+	for (const descriptor of descriptors) {
+		const key = getPortableOutputPathKey(descriptor.filePath);
+		const existing = seen.get(key);
+		if (existing) throw new Error(`SSG output path collision: routes ${describeRoute(existing)} and ${describeRoute(descriptor)} both map to "${descriptor.filePath}" after case-insensitive normalization`);
+		seen.set(key, descriptor);
+	}
+}
 function assertSafeRoutePath(pathStr) {
 	if (!pathStr.startsWith("/") || pathStr.startsWith("//") || pathStr.includes("\\") || pathStr.includes("\0") || pathStr.split("/").some((segment) => segment === "." || segment === "..")) throw new Error(`SSG route path must be an absolute URL path without dot segments or backslashes: ${pathStr}`);
 }
@@ -663,6 +680,24 @@ function resolveParallelism(requested) {
 	const availableParallelism = os.availableParallelism;
 	return Math.max(1, availableParallelism?.() ?? os.cpus().length ?? 1);
 }
+const outputDirectoryQueues = /* @__PURE__ */ new Map();
+async function withOutputDirectoryLock(outputDir, operation) {
+	const key = pathModule.resolve(outputDir).normalize("NFC").toLowerCase();
+	const previous = outputDirectoryQueues.get(key) ?? Promise.resolve();
+	let release;
+	const current = new Promise((resolve) => {
+		release = resolve;
+	});
+	const tail = previous.then(() => current, () => current);
+	outputDirectoryQueues.set(key, tail);
+	await previous.catch(() => void 0);
+	try {
+		return await operation();
+	} finally {
+		release();
+		if (outputDirectoryQueues.get(key) === tail) outputDirectoryQueues.delete(key);
+	}
+}
 async function createStagingDirectory(outputDir) {
 	const parent = pathModule.dirname(outputDir);
 	const base = pathModule.basename(outputDir);
@@ -753,136 +788,142 @@ function createStaticGen(options) {
 		* Returns detailed results
 		*/
 		async generate(generateOptions = {}) {
-			const splitRoutes = await splitStaticRoutes(configuredRoutes);
-			const routes = splitRoutes.routes;
-			validateRoutes(routes);
-			const changedKeys = dedupeStrings(generateOptions.changedKeys);
-			const changedRoutes = dedupeStrings(generateOptions.changedRoutes);
-			const requestedMode = generateOptions.mode ?? "full";
-			const previousManifest = !generateOptions.forceFull && requestedMode === "incremental" ? readIncrementalManifest(options.outputDir, seed) : null;
-			const effectiveMode = generateOptions.forceFull || requestedMode !== "incremental" || previousManifest === null ? "full" : "incremental";
-			const dataMap = resolveSsgData(routes, { dataOverrides: options.dataOverrides });
-			const descriptors = routes.map(resolveRouteDescriptor);
-			const routeResultsById = /* @__PURE__ */ new Map();
-			for (const runtimeRoute of splitRoutes.runtimeOnly) routeResultsById.set(runtimeRoute.routeId, runtimeRoute.result);
-			const eligibleDescriptors = descriptors;
-			const previousEntries = new Map((previousManifest?.routes ?? []).map((entry) => [entry.routeId, entry]));
-			const currentRouteIds = new Set(eligibleDescriptors.map((descriptor) => descriptor.routeId));
-			const selected = [];
-			const routesToRender = [];
-			for (let index = 0; index < eligibleDescriptors.length; index += 1) {
-				const descriptor = eligibleDescriptors[index];
-				const entry = selectRouteForGeneration(descriptor, previousEntries.get(descriptor.routeId) ?? null, effectiveMode, changedKeys, changedRoutes);
-				selected.push(entry);
-				if (entry.reason !== "unchanged") routesToRender.push(entry);
-			}
-			const renderStartTime = performance.now();
-			const renderedResults = routesToRender.length > 0 ? await batchRenderRoutes(getRoutesToRender(routesToRender), {
-				seed,
-				dataMap,
-				concurrency: resolvedConcurrency,
-				document: options.document,
-				styleRegistrationValidation: options.styleRegistrationValidation
-			}) : [];
-			performance.now() - renderStartTime;
-			const renderedByRouteId = /* @__PURE__ */ new Map();
-			for (let index = 0; index < renderedResults.length; index += 1) renderedByRouteId.set(routesToRender[index].descriptor.routeId, renderedResults[index]);
-			let cacheHits = 0;
-			const nextManifestRoutes = [];
-			for (const entry of selected) {
-				const { descriptor, previous, reason } = entry;
-				const resolvedData = resolveSsgRouteData(dataMap, descriptor.route.path, descriptor.path);
-				const baseData = resolvedData.hasData ? resolvedData.data : void 0;
-				const resourceCount = resolvedData.hasData && baseData ? Object.keys(baseData).length : 0;
-				if (reason === "unchanged") {
-					routeResultsById.set(descriptor.routeId, {
+			return withOutputDirectoryLock(options.outputDir, async () => {
+				const splitRoutes = await splitStaticRoutes(configuredRoutes);
+				const routes = splitRoutes.routes;
+				validateRoutes(routes);
+				const changedKeys = dedupeStrings(generateOptions.changedKeys);
+				const changedRoutes = dedupeStrings(generateOptions.changedRoutes);
+				const requestedMode = generateOptions.mode ?? "full";
+				const previousManifest = !generateOptions.forceFull && requestedMode === "incremental" ? readIncrementalManifest(options.outputDir, seed) : null;
+				const effectiveMode = generateOptions.forceFull || requestedMode !== "incremental" || previousManifest === null ? "full" : "incremental";
+				const dataMap = resolveSsgData(routes, { dataOverrides: options.dataOverrides });
+				const descriptors = routes.map(resolveRouteDescriptor);
+				validateOutputPathCollisions(descriptors);
+				const routeResultsById = /* @__PURE__ */ new Map();
+				for (const runtimeRoute of splitRoutes.runtimeOnly) routeResultsById.set(runtimeRoute.routeId, runtimeRoute.result);
+				const eligibleDescriptors = descriptors;
+				const previousEntries = new Map((previousManifest?.routes ?? []).map((entry) => [entry.routeId, entry]));
+				const currentRouteIds = new Set(eligibleDescriptors.map((descriptor) => descriptor.routeId));
+				const selected = [];
+				const routesToRender = [];
+				for (let index = 0; index < eligibleDescriptors.length; index += 1) {
+					const descriptor = eligibleDescriptors[index];
+					const entry = selectRouteForGeneration(descriptor, previousEntries.get(descriptor.routeId) ?? null, effectiveMode, changedKeys, changedRoutes);
+					selected.push(entry);
+					if (entry.reason !== "unchanged") routesToRender.push(entry);
+				}
+				const renderStartTime = performance.now();
+				const renderedResults = routesToRender.length > 0 ? await batchRenderRoutes(getRoutesToRender(routesToRender), {
+					seed,
+					dataMap,
+					concurrency: resolvedConcurrency,
+					document: options.document,
+					styleRegistrationValidation: options.styleRegistrationValidation
+				}) : [];
+				performance.now() - renderStartTime;
+				const renderedByRouteId = /* @__PURE__ */ new Map();
+				for (let index = 0; index < renderedResults.length; index += 1) renderedByRouteId.set(routesToRender[index].descriptor.routeId, renderedResults[index]);
+				let cacheHits = 0;
+				const nextManifestRoutes = [];
+				for (const entry of selected) {
+					const { descriptor, previous, reason } = entry;
+					const resolvedData = resolveSsgRouteData(dataMap, descriptor.route.path, descriptor.path);
+					const baseData = resolvedData.hasData ? resolvedData.data : void 0;
+					const resourceCount = resolvedData.hasData && baseData ? Object.keys(baseData).length : 0;
+					if (reason === "unchanged") {
+						routeResultsById.set(descriptor.routeId, {
+							path: descriptor.path,
+							filePath: descriptor.filePath,
+							html: "",
+							fileSize: previous?.htmlHash !== null && previous !== null ? getExistingOutputFileSize(options.outputDir, descriptor.filePath) : 0,
+							renderDuration: 0,
+							resourceCount,
+							status: "skipped",
+							reason: "unchanged",
+							written: false
+						});
+						if (previous) nextManifestRoutes.push({
+							...previous,
+							path: descriptor.path,
+							filePath: descriptor.filePath,
+							invalidationKeys: descriptor.invalidationKeys.slice()
+						});
+						continue;
+					}
+					const rendered = renderedByRouteId.get(descriptor.routeId);
+					if (!rendered) throw new Error(`Missing rendered result for route "${descriptor.path}"`);
+					const nextResult = {
+						...rendered,
 						path: descriptor.path,
 						filePath: descriptor.filePath,
-						html: "",
-						fileSize: previous?.htmlHash !== null && previous !== null ? getExistingOutputFileSize(options.outputDir, descriptor.filePath) : 0,
-						renderDuration: 0,
 						resourceCount,
-						status: "skipped",
-						reason: "unchanged",
+						reason,
 						written: false
-					});
-					if (previous) nextManifestRoutes.push({
-						...previous,
-						path: descriptor.path,
-						filePath: descriptor.filePath,
-						invalidationKeys: descriptor.invalidationKeys.slice()
-					});
-					continue;
-				}
-				const rendered = renderedByRouteId.get(descriptor.routeId);
-				if (!rendered) throw new Error(`Missing rendered result for route "${descriptor.path}"`);
-				const nextResult = {
-					...rendered,
-					path: descriptor.path,
-					filePath: descriptor.filePath,
-					resourceCount,
-					reason,
-					written: false
-				};
-				if (nextResult.status === "success") {
-					const htmlDigest = hashHtml(nextResult.html);
-					const shouldWrite = effectiveMode === "full" || !previous || previous.htmlHash !== htmlDigest || !outputFileExists(options.outputDir, descriptor.filePath);
-					nextResult.written = shouldWrite;
-					if (!shouldWrite) cacheHits += 1;
-					nextManifestRoutes.push({
+					};
+					if (nextResult.status === "success") {
+						const htmlDigest = hashHtml(nextResult.html);
+						const shouldWrite = effectiveMode === "full" || !previous || previous.htmlHash !== htmlDigest || !outputFileExists(options.outputDir, descriptor.filePath);
+						nextResult.written = shouldWrite;
+						if (!shouldWrite) cacheHits += 1;
+						nextManifestRoutes.push({
+							routeId: descriptor.routeId,
+							path: descriptor.path,
+							filePath: descriptor.filePath,
+							invalidationKeys: descriptor.invalidationKeys.slice(),
+							htmlHash: htmlDigest,
+							lastStatus: "success"
+						});
+					} else nextManifestRoutes.push({
 						routeId: descriptor.routeId,
 						path: descriptor.path,
 						filePath: descriptor.filePath,
 						invalidationKeys: descriptor.invalidationKeys.slice(),
-						htmlHash: htmlDigest,
-						lastStatus: "success"
+						htmlHash: previous?.htmlHash ?? null,
+						lastStatus: "error"
 					});
-				} else nextManifestRoutes.push({
-					routeId: descriptor.routeId,
-					path: descriptor.path,
-					filePath: descriptor.filePath,
-					invalidationKeys: descriptor.invalidationKeys.slice(),
-					htmlHash: previous?.htmlHash ?? null,
-					lastStatus: "error"
-				});
-				routeResultsById.set(descriptor.routeId, nextResult);
-			}
-			const removedResults = collectRemovedRouteResults(previousManifest, currentRouteIds);
-			const routeResults = [];
-			for (const routeId of splitRoutes.outputRouteIds) {
-				const routeResult = routeResultsById.get(routeId);
-				if (routeResult) routeResults.push(routeResult);
-			}
-			routeResults.push(...removedResults);
-			result = generateSSGResult(routeResults, {
-				mode: effectiveMode,
-				cacheHits,
-				invalidatedKeys: changedKeys,
-				invalidatedRoutes: changedRoutes
-			});
-			if (effectiveMode === "full" && result.failed > 0) return result;
-			const targetOutputDir = effectiveMode === "full" ? await createStagingDirectory(options.outputDir) : options.outputDir;
-			try {
-				const writeStartTime = performance.now();
-				await writeStaticFiles(routeResults, targetOutputDir, { concurrency: resolvedConcurrency });
-				performance.now() - writeStartTime;
-				await writeMetadata(resultToMetadata(result), targetOutputDir);
-				await writeIncrementalManifest({
-					schemaVersion: 1,
-					seed,
+					routeResultsById.set(descriptor.routeId, nextResult);
+				}
+				const removedResults = collectRemovedRouteResults(previousManifest, currentRouteIds);
+				const routeResults = [];
+				for (const routeId of splitRoutes.outputRouteIds) {
+					const routeResult = routeResultsById.get(routeId);
+					if (routeResult) routeResults.push(routeResult);
+				}
+				routeResults.push(...removedResults);
+				result = generateSSGResult(routeResults, {
 					mode: effectiveMode,
-					routes: nextManifestRoutes
-				}, targetOutputDir);
-				await copyStaticAssets(options.assets, targetOutputDir);
-				if (effectiveMode === "full") await replaceOutputDirectory(targetOutputDir, options.outputDir);
-			} catch (error) {
-				if (effectiveMode === "full") await fs.rm(targetOutputDir, {
-					recursive: true,
-					force: true
+					cacheHits,
+					invalidatedKeys: changedKeys,
+					invalidatedRoutes: changedRoutes
 				});
-				throw error;
-			}
-			return result;
+				if (effectiveMode === "full" && result.failed > 0) {
+					for (const routeResult of result.routes) if (routeResult.status === "success") routeResult.written = false;
+					return result;
+				}
+				const targetOutputDir = effectiveMode === "full" ? await createStagingDirectory(options.outputDir) : options.outputDir;
+				try {
+					const writeStartTime = performance.now();
+					await writeStaticFiles(routeResults, targetOutputDir, { concurrency: resolvedConcurrency });
+					performance.now() - writeStartTime;
+					await writeMetadata(resultToMetadata(result), targetOutputDir);
+					await writeIncrementalManifest({
+						schemaVersion: 1,
+						seed,
+						mode: effectiveMode,
+						routes: nextManifestRoutes
+					}, targetOutputDir);
+					await copyStaticAssets(options.assets, targetOutputDir);
+					if (effectiveMode === "full") await replaceOutputDirectory(targetOutputDir, options.outputDir);
+				} catch (error) {
+					if (effectiveMode === "full") await fs.rm(targetOutputDir, {
+						recursive: true,
+						force: true
+					});
+					throw error;
+				}
+				return result;
+			});
 		},
 		/**
 		* Get effective config in a serializable form for diagnostics.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askrjs/askr",
-  "version": "0.0.95",
+  "version": "0.0.96",
   "description": "Actor-backed deterministic UI framework",
   "keywords": [
     "askr",