fundus 0.14.0 → 0.16.0

package/build/server/chunks/chunks/{contract.js-itFN0Gon.js → contract.js-IY1F-HE_.js}

@@ -1,7 +1,7 @@
-import { a as plugins, b as audioPlugin, d as chromaKeyVideoPlugin, v as videoPlugin, s as slicePlugin, e as imagePlugin, n as normalizeFolderPath, g as canonicalizeParameters, h as folderOfRawPath, j as rawFileNameOfPath, f as folderPathError, k as parentFolderPath, l as folderNameError, m as joinFolderPath, o as folderNameOf, q as isFolderOrDescendant, t as replaceFolderPrefix, u as portableFolderPathKey, c as compareCodeUnits, w as isCustomFfmpegVideoPreset, x as processedSliceInsets, y as defaultInsetsForSize, F as FOLDER_SENTINEL, r as rawFilePathError, z as materializeFfmpegCommand, A as slicedAxesFor, B as isAssetReference, C as validateVideoPreset, V as VIDEO_BUILT_IN_PRESETS, D as validateAudioPreset, E as AUDIO_BUILT_IN_PRESETS, G as validateImagePreset, I as IMAGE_BUILT_IN_PRESETS, S as SLICE_BUILT_IN_PRESETS } from './core.js-CABVXpby.js';
-import { a as assetIdError, r as referenceErrors, c as collectAllReferences, b as computeLibraryMembership, m as manifestNameError, d as allDeliveredAssetIds, t as topologicalReferenceOrder } from './manifest-membership.js-BnSECWpJ.js';
+import { a as plugins, b as audioPlugin, d as chromaKeyVideoPlugin, v as videoPlugin, s as slicePlugin, e as imagePlugin, n as normalizeFolderPath, g as canonicalizeParameters, h as folderOfRawPath, j as rawFileNameOfPath, f as folderPathError, k as parentFolderPath, l as folderNameError, m as joinFolderPath, o as folderNameOf, q as isFolderOrDescendant, t as replaceFolderPrefix, u as portableFolderPathKey, c as compareCodeUnits, w as isCustomFfmpegVideoPreset, x as processedSliceInsets, y as defaultInsetsForSize, F as FOLDER_SENTINEL, r as rawFilePathError, z as materializeFfmpegCommand, A as slicedAxesFor, B as isAssetReference, C as validateVideoPreset, V as VIDEO_BUILT_IN_PRESETS, D as validateAudioPreset, E as AUDIO_BUILT_IN_PRESETS, G as validateImagePreset, I as IMAGE_BUILT_IN_PRESETS, S as SLICE_BUILT_IN_PRESETS } from './core.js-D1sYC_78.js';
+import { a as assetIdError, c as collectAllReferences, b as computeLibraryMembership, r as referenceErrors, m as manifestNameError, d as allDeliveredAssetIds, t as topologicalReferenceOrder } from './manifest-membership.js-Cm_2fU-Z.js';
 import { m as manifestColorError, a as manifestEmojiError } from './manifest-appearance.js-DTk355LQ.js';
-import { v as verifyStableRawFile } from './raw-reconciliation2.js-CscuoBC2.js';
+import { v as verifyStableRawFile } from './raw-reconciliation2.js-CcO9li5n.js';
 import { join, extname, dirname, isAbsolute, basename, resolve } from 'node:path';
 import { existsSync } from 'node:fs';
 import { readFile, mkdir, writeFile, rename, unlink, rm, stat, readdir, mkdtemp } from 'node:fs/promises';
@@ -148,6 +148,49 @@ function serializeLibrary(library) {
 	}), null, "	")}\n`;
 }
 //#endregion
+//#region src/lib/core/library-validation.ts
+function flatLibraryIssues(library, plugins) {
+	const issues = [];
+	for (const [name, record] of Object.entries(library.manifests)) {
+		const nameProblem = manifestNameError(name);
+		if (nameProblem) issues.push({ message: nameProblem });
+		if (record.color !== void 0) {
+			const colorProblem = manifestColorError(record.color);
+			if (colorProblem) issues.push({ message: `Manifest "${name}": ${colorProblem}` });
+		}
+		if (record.emoji !== void 0) {
+			const emojiProblem = manifestEmojiError(record.emoji);
+			if (emojiProblem) issues.push({ message: `Manifest "${name}": ${emojiProblem}` });
+		}
+	}
+	for (const [assetId, record] of Object.entries(library.assets)) {
+		const idProblem = assetIdError(assetId);
+		if (idProblem) issues.push({
+			assetId,
+			message: idProblem
+		});
+		const plugin = plugins[record.type];
+		if (!plugin) issues.push({
+			assetId,
+			message: `Unknown asset type "${record.type}".`
+		});
+		else try {
+			plugin.validateParameters(record.parameters);
+		} catch (cause) {
+			issues.push({
+				assetId,
+				message: `Invalid parameters: ${cause instanceof Error ? cause.message : String(cause)}`
+			});
+		}
+		for (const manifest of record.manifests) if (!library.manifests[manifest]) issues.push({
+			assetId,
+			message: `Unknown manifest "${manifest}".`
+		});
+	}
+	issues.push(...referenceErrors(library, collectAllReferences(library, plugins)));
+	return issues;
+}
+//#endregion
 //#region src/lib/server/processing/ffmpeg.ts
 /**
 * The ffmpeg/ffprobe toolchain layer: binary resolution (bundled `-static`
@@ -871,6 +914,18 @@ function kebabCaseFromCamel(name) {
 function manifestModuleFileName(manifestName) {
 	return `${kebabCaseFromCamel(manifestName)}.generated.ts`;
 }
+/** Two manifest names that would generate the same kebab-case module file. */
+function manifestModuleCollisionIssues(manifests) {
+	const issues = [];
+	const namesByModuleFile = /* @__PURE__ */ new Map();
+	for (const name of Object.keys(manifests)) {
+		const fileName = manifestModuleFileName(name);
+		const existingName = namesByModuleFile.get(fileName);
+		if (existingName !== void 0) issues.push({ message: `Manifests "${existingName}" and "${name}" would both generate "${fileName}".` });
+		else namesByModuleFile.set(fileName, name);
+	}
+	return issues;
+}
 /**
 * Build the entry data codegen emits for one asset — delegated to
 * the owning server plugin's `buildManifestEntry`. Reference fields
@@ -1303,7 +1358,8 @@ var LibraryStore = class {
 		const folder = options.folder === void 0 ? "" : normalizeFolderPath(options.folder);
 		this.#requireFolder(library, folder);
 		const manifests = [...new Set(options.manifests ?? [])].sort();
-		for (const manifest of manifests) if (!Object.hasOwn(library.manifests, manifest)) throw new Error(`Unknown manifest "${manifest}".`);
+		const validManifests = this.#validManifestNames(library);
+		for (const manifest of manifests) if (!validManifests.has(manifest)) throw new Error(`Unknown manifest "${manifest}".`);
 		const rawDirectory = join(this.#config.rawDir, folder);
 		await mkdir(rawDirectory, { recursive: true });
 		const storedName = this.#uniqueRawName(sanitizeFileName(options.fileName), folder);
@@ -1313,12 +1369,16 @@ var LibraryStore = class {
 		let installed = false;
 		try {
 			await writeFile(temporaryPath, options.bytes);
-			let parameters = plugin.descriptor.validateParameters(plugin.descriptor.defaultParameters(plugin.pluginConfig(this.#config)));
-			if (prepareParameters) parameters = plugin.descriptor.validateParameters(await prepareParameters({
-				rawPath: temporaryPath,
-				rawFileName: storedName,
-				parameters
-			}));
+			let parameters;
+			if (options.parametersOverride !== void 0) parameters = options.parametersOverride;
+			else {
+				parameters = plugin.descriptor.validateParameters(plugin.descriptor.defaultParameters(plugin.pluginConfig(this.#config)));
+				if (prepareParameters) parameters = plugin.descriptor.validateParameters(await prepareParameters({
+					rawPath: temporaryPath,
+					rawFileName: storedName,
+					parameters
+				}));
+			}
 			const record = {
 				type: options.type,
 				raw: storedPath,
@@ -1364,7 +1424,7 @@ var LibraryStore = class {
 		if (sourceOptions) {
 			const currentSource = record.importSource ? canonicalizeParameters(record.importSource) : null;
 			if (record.raw !== sourceOptions.expected.raw || record.rawHash !== sourceOptions.expected.rawHash || record.type !== sourceOptions.expected.type || currentSource !== sourceOptions.expected.canonicalSource) throw new Error("stale-import");
-			const { verifyStableRawFile } = await import('./raw-reconciliation.js-ZEOCk_jA.js');
+			const { verifyStableRawFile } = await import('./raw-reconciliation.js-1_IwPhKb.js');
 			try {
 				await verifyStableRawFile(join(this.#config.rawDir, record.raw), sourceOptions.expected.rawHash);
 			} catch {
@@ -1430,7 +1490,7 @@ var LibraryStore = class {
 			const record = this.#requireAsset(library, id);
 			if (record.raw !== expected.raw || record.rawHash !== expected.rawHash || record.type !== expected.type || !record.importSource || canonicalizeParameters(record.importSource) !== expected.canonicalSource) throw new Error("stale-import");
 			const absolutePath = join(this.#config.rawDir, record.raw);
-			const { verifyStableRawFile } = await import('./raw-reconciliation.js-ZEOCk_jA.js');
+			const { verifyStableRawFile } = await import('./raw-reconciliation.js-1_IwPhKb.js');
 			try {
 				await verifyStableRawFile(absolutePath, expected.rawHash);
 			} catch {
@@ -1486,7 +1546,8 @@ var LibraryStore = class {
 		const library = await this.read();
 		const record = this.#requireAsset(library, id);
 		const unique = [...new Set(manifests)];
-		for (const name of unique) if (!Object.hasOwn(library.manifests, name)) throw new Error(`Unknown manifest "${name}".`);
+		const validManifests = this.#validManifestNames(library);
+		for (const name of unique) if (!validManifests.has(name)) throw new Error(`Unknown manifest "${name}".`);
 		record.manifests = unique.sort();
 		await this.write(library);
 		return library;
@@ -1857,7 +1918,8 @@ var LibraryStore = class {
 	* type, dangling raw pointer, invalid parameters, unknown manifest names,
 	* and reference errors (dangling target, type mismatch, cycles).
 	*/
-	async validate(library) {
+	async validate(library, options = {}) {
+		const flatSpace = options.flatSpace ?? true;
 		const issues = [];
 		const folderKeys = /* @__PURE__ */ new Map();
 		for (const folder of library.folders) {
@@ -1872,44 +1934,7 @@ var LibraryStore = class {
 			if (parent !== "" && !library.folders.includes(parent)) issues.push({ message: `Folder "${folder}" has missing parent "${parent}".` });
 			for (const root of [this.#config.rawDir, this.#config.proxyDir]) if (!existsSync(join(root, folder, ".gitkeep"))) issues.push({ message: `Folder "${folder}" is not mirrored with a .gitkeep in ${root}.` });
 		}
-		for (const [name, record] of Object.entries(library.manifests)) {
-			const nameProblem = manifestNameError(name);
-			if (nameProblem) issues.push({ message: nameProblem });
-			if (record.color !== void 0) {
-				const colorProblem = manifestColorError(record.color);
-				if (colorProblem) issues.push({ message: `Manifest "${name}": ${colorProblem}` });
-			}
-			if (record.emoji !== void 0) {
-				const emojiProblem = manifestEmojiError(record.emoji);
-				if (emojiProblem) issues.push({ message: `Manifest "${name}": ${emojiProblem}` });
-			}
-		}
-		const namesByModuleFile = /* @__PURE__ */ new Map();
-		for (const name of Object.keys(library.manifests)) {
-			const fileName = manifestModuleFileName(name);
-			const existingName = namesByModuleFile.get(fileName);
-			if (existingName !== void 0) issues.push({ message: `Manifests "${existingName}" and "${name}" would both generate "${fileName}".` });
-			else namesByModuleFile.set(fileName, name);
-		}
 		for (const [assetId, record] of Object.entries(library.assets)) {
-			const idProblem = assetIdError(assetId);
-			if (idProblem) issues.push({
-				assetId,
-				message: idProblem
-			});
-			const plugin = this.#registry[record.type];
-			if (!plugin) issues.push({
-				assetId,
-				message: `Unknown asset type "${record.type}".`
-			});
-			else try {
-				plugin.descriptor.validateParameters(record.parameters);
-			} catch (cause) {
-				issues.push({
-					assetId,
-					message: `Invalid parameters: ${cause instanceof Error ? cause.message : String(cause)}`
-				});
-			}
 			try {
 				assertSafeRelativeFilePath(record.raw);
 			} catch (cause) {
@@ -1927,12 +1952,11 @@ var LibraryStore = class {
 				assetId,
 				message: `Raw file "${record.raw}" is missing from the raw directory.`
 			});
-			for (const manifest of record.manifests) if (!library.manifests[manifest]) issues.push({
-				assetId,
-				message: `Unknown manifest "${manifest}".`
-			});
 		}
-		issues.push(...referenceErrors(library, collectAllReferences(library, descriptorsByType(this.#registry))));
+		if (flatSpace) {
+			issues.push(...flatLibraryIssues(library, descriptorsByType(this.#registry)));
+			issues.push(...manifestModuleCollisionIssues(library.manifests));
+		}
 		return issues;
 	}
 	async #deleteProxiesOf(assetId) {
@@ -1946,6 +1970,18 @@ var LibraryStore = class {
 		if (!Object.hasOwn(library.assets, id)) throw new Error(`Unknown asset "${id}".`);
 		return library.assets[id];
 	}
+	/**
+	* Valid manifest names for asset membership: the host library's own manifests
+	* plus any a configured Package introduces. The effective (merged) library
+	* unions both, so a host asset (or slot fill) may be placed into a
+	* Package-introduced manifest — validating against the host manifests alone
+	* would wrongly reject that placement.
+	*/
+	#validManifestNames(library) {
+		const names = new Set(Object.keys(library.manifests));
+		for (const pkg of this.#config.packages ?? []) for (const name of Object.keys(pkg.declaration.manifests)) names.add(name);
+		return names;
+	}
 	/** Resolve a non-colliding raw file name, appending `-1`, `-2`, … before the extension. */
 	#uniqueRawName(fileName, folder) {
 		if (!existsSync(join(this.#config.rawDir, folder, fileName))) return fileName;
@@ -1982,5 +2018,5 @@ function invalidInput(message) {
 	throw new SourceImportError("invalid-input", message);
 }
 
-export { LibraryStore as L, SourceImportError as S, serializeLibrary as a, serverPluginForType as b, invalidInput as c, descriptorsByType as d, encodeRelativePathForUrl as e, parseLibrary as f, generateManifestModules as g, assertSafeRelativeFilePath as h, isRecord as i, locateGeneratedAssetDeclaration as l, manifestModuleFileName as m, processAssets as p, readCurrentProxy as r, serverPluginsByType as s };
-//# sourceMappingURL=contract.js-itFN0Gon.js.map
+export { LibraryStore as L, SourceImportError as S, serializeLibrary as a, serverPluginForType as b, manifestModuleCollisionIssues as c, descriptorsByType as d, encodeRelativePathForUrl as e, flatLibraryIssues as f, generateManifestModules as g, invalidInput as h, isRecord as i, parseLibrary as j, isRecord$1 as k, locateGeneratedAssetDeclaration as l, manifestModuleFileName as m, assertSafeKey as n, parseManifestRecord as o, processAssets as p, parseImportSource as q, readCurrentProxy as r, serverPluginsByType as s, assertSafeRelativeFilePath as t };
+//# sourceMappingURL=contract.js-IY1F-HE_.js.map