@openfairygui/functions 0.2.0-alpha.34 → 0.2.0-alpha.36

package/dist/{publish-BJk8UzRP.js → publish-DXoaC1Nl.js}

@@ -1,4 +1,4 @@
-import { BinaryWriter, GearType, ProjectType, TransitionActionType } from "@openfairygui/core";
+import { BinaryWriter, GearType, ProjectType, TransitionActionType, deriveMovieClipModel, parseJta, probeRasterImage } from "@openfairygui/core";
 //#region src/utils.ts
 /**
 * Wraps a transform function, assigning it a name for the transform stack.
@@ -599,153 +599,76 @@ function parseFnt(text) {
 }
 //#endregion
 //#region src/atlas/jta.ts
-const PNG_SIGNATURE = new Uint8Array([
-	137,
-	80,
-	78,
-	71,
-	13,
-	10,
-	26,
-	10
-]);
 function extractJtaFrames(data) {
-	const frames = [];
-	let offset = 0;
-	let firstPngOffset = -1;
-	while (offset < data.length) {
-		const signatureIndex = findPngSignature(data, offset);
-		if (signatureIndex === -1) break;
-		if (firstPngOffset === -1) firstPngOffset = signatureIndex;
-		const end = findPngEnd(data, signatureIndex);
-		if (end === -1) break;
-		frames.push(data.subarray(signatureIndex, end));
-		offset = end;
-	}
-	if (firstPngOffset === -1 || frames.length === 0) return { frames: [] };
+	const parsed = parseJta(data);
+	const derived = deriveMovieClipModel(parsed);
 	return {
-		frames,
-		meta: parseJtaHeader(data, firstPngOffset, frames.length)
+		frames: parsed.textures.map((texture) => texture.raw),
+		meta: {
+			interval: derived.interval,
+			repeatDelay: derived.repeatDelay,
+			swing: derived.swing,
+			width: derived.dimensions.width,
+			height: derived.dimensions.height,
+			frames: derived.frames.map((frame) => ({
+				addDelay: frame.addDelay,
+				offsetX: frame.rectX,
+				offsetY: frame.rectY,
+				width: frame.rectWidth,
+				height: frame.rectHeight,
+				textureIndex: frame.textureIndex
+			}))
+		}
 	};
 }
-function findPngSignature(data, fromIndex) {
-	for (let index = fromIndex; index <= data.length - PNG_SIGNATURE.length; index += 1) {
-		let matched = true;
-		for (let signatureIndex = 0; signatureIndex < PNG_SIGNATURE.length; signatureIndex += 1) if (data[index + signatureIndex] !== PNG_SIGNATURE[signatureIndex]) {
-			matched = false;
-			break;
-		}
-		if (matched) return index;
-	}
-	return -1;
-}
-function findPngEnd(data, start) {
-	let position = start + PNG_SIGNATURE.length;
-	while (position + 8 <= data.length) {
-		const length = readUint32BE(data, position);
-		position += 8;
-		if (position + length + 4 > data.length) return -1;
-		const isEnd = data[position - 4] === 73 && data[position - 3] === 69 && data[position - 2] === 78 && data[position - 1] === 68;
-		position += length + 4;
-		if (isEnd) return position;
-	}
-	return -1;
-}
-function parseJtaHeader(data, firstPngOffset, frameCount) {
-	if (data.length < 10) return void 0;
-	const state = { offset: 0 };
-	const end = Math.min(firstPngOffset, data.length);
-	if (!readUtfBE(data, state, end)) return void 0;
-	const version = readInt32BEAt(data, state, end);
-	if (version == null) return void 0;
-	const fpsRaw = readInt8At(data, state, end);
-	if (fpsRaw == null) return void 0;
-	const fps = fpsRaw > 0 ? fpsRaw : 24;
-	if (state.offset + 3 > end) return void 0;
-	state.offset += 3;
-	if (version < 102) return void 0;
-	readUint16BEAt(data, state, end);
-	readUint16BEAt(data, state, end);
-	const width = readUint16BEAt(data, state, end);
-	const height = readUint16BEAt(data, state, end);
-	if (width == null || height == null) return void 0;
-	const speedRaw = readUint8At(data, state, end);
-	const repeatDelayRaw = readUint8At(data, state, end);
-	const swingRaw = readInt8At(data, state, end);
-	const frameTableCount = readInt16BEAt(data, state, end);
-	if (speedRaw == null || repeatDelayRaw == null || swingRaw == null || frameTableCount == null) return void 0;
-	const frames = [];
-	for (let index = 0; index < frameTableCount; index += 1) {
-		const delayRaw = readInt16BEAt(data, state, end);
-		const offsetX = readInt16BEAt(data, state, end);
-		const offsetY = readInt16BEAt(data, state, end);
-		const frameWidth = readInt16BEAt(data, state, end);
-		const frameHeight = readInt16BEAt(data, state, end);
-		const textureIndex = readInt16BEAt(data, state, end);
-		if (delayRaw == null || offsetX == null || offsetY == null || frameWidth == null || frameHeight == null || textureIndex == null) break;
-		frames.push({
-			addDelay: Math.trunc(1e3 / fps * delayRaw),
-			offsetX,
-			offsetY,
-			width: frameWidth,
-			height: frameHeight,
-			textureIndex
+function detectSupportedRasterFormat(data) {
+	if (data.length >= 8 && data[0] === 137 && data[1] === 80 && data[2] === 78 && data[3] === 71 && data[4] === 13 && data[5] === 10 && data[6] === 26 && data[7] === 10) return "png";
+	if (data.length >= 2 && data[0] === 255 && data[1] === 216) return "jpeg";
+	return null;
+}
+function couldNotDecode(filePath, frameIndex, textureIndex) {
+	return /* @__PURE__ */ new Error(`atlas: Could not decode MovieClip "${filePath}" frame ${frameIndex} (texture ${textureIndex}).`);
+}
+async function prepareJtaForPublish(data, encoder, filePath) {
+	const extracted = extractJtaFrames(data);
+	const firstFrameIndexByTextureIndex = /* @__PURE__ */ new Map();
+	for (let frameIndex = 0; frameIndex < extracted.meta.frames.length; frameIndex += 1) {
+		const textureIndex = extracted.meta.frames[frameIndex].textureIndex;
+		if (textureIndex >= 0 && !firstFrameIndexByTextureIndex.has(textureIndex)) firstFrameIndexByTextureIndex.set(textureIndex, frameIndex);
+	}
+	const referencedTextures = [];
+	for (let textureIndex = 0; textureIndex < extracted.frames.length; textureIndex += 1) {
+		const firstFrameIndex = firstFrameIndexByTextureIndex.get(textureIndex);
+		if (firstFrameIndex === void 0) continue;
+		const raw = extracted.frames[textureIndex];
+		if (raw.byteLength === 0) throw new Error(`atlas: MovieClip "${filePath}" frame ${firstFrameIndex} references empty texture ${textureIndex}.`);
+		const detectedFormat = detectSupportedRasterFormat(raw);
+		if (!detectedFormat) throw new Error(`atlas: MovieClip "${filePath}" frame ${firstFrameIndex} (texture ${textureIndex}) uses an unsupported raster format; only PNG and JPEG are supported.`);
+		const imageInfo = probeRasterImage(raw);
+		if (!imageInfo || imageInfo.format !== detectedFormat) throw couldNotDecode(filePath, firstFrameIndex, textureIndex);
+		let buffer = raw;
+		if (encoder) {
+			try {
+				buffer = await encoder(raw).png().toBuffer();
+			} catch {
+				throw couldNotDecode(filePath, firstFrameIndex, textureIndex);
+			}
+			const normalizedInfo = probeRasterImage(buffer);
+			if (!normalizedInfo || normalizedInfo.format !== "png" || normalizedInfo.width !== imageInfo.width || normalizedInfo.height !== imageInfo.height) throw couldNotDecode(filePath, firstFrameIndex, textureIndex);
+		}
+		referencedTextures.push({
+			textureIndex,
+			firstFrameIndex,
+			buffer,
+			width: imageInfo.width,
+			height: imageInfo.height
 		});
 	}
 	return {
-		interval: Math.trunc(1e3 / fps * (speedRaw || 1)),
-		repeatDelay: Math.trunc(1e3 / fps * repeatDelayRaw),
-		swing: swingRaw === 1,
-		width,
-		height,
-		frames: frames.length === 0 && frameCount > 0 ? [] : frames
+		...extracted,
+		referencedTextures
 	};
 }
-function readUtfBE(data, state, end) {
-	const length = readUint16BEAt(data, state, end);
-	if (length == null || state.offset + length > end) return null;
-	const value = new TextDecoder().decode(data.subarray(state.offset, state.offset + length));
-	state.offset += length;
-	return value;
-}
-function readUint8At(data, state, end) {
-	if (state.offset + 1 > end) return null;
-	const value = data[state.offset];
-	state.offset += 1;
-	return value ?? 0;
-}
-function readInt8At(data, state, end) {
-	if (state.offset + 1 > end) return null;
-	const value = new DataView(data.buffer, data.byteOffset, data.byteLength).getInt8(state.offset);
-	state.offset += 1;
-	return value;
-}
-function readUint16BEAt(data, state, end) {
-	if (state.offset + 2 > end) return null;
-	const value = readUint16BE(data, state.offset);
-	state.offset += 2;
-	return value;
-}
-function readInt16BEAt(data, state, end) {
-	if (state.offset + 2 > end) return null;
-	const value = new DataView(data.buffer, data.byteOffset, data.byteLength).getInt16(state.offset, false);
-	state.offset += 2;
-	return value;
-}
-function readInt32BEAt(data, state, end) {
-	if (state.offset + 4 > end) return null;
-	const value = new DataView(data.buffer, data.byteOffset, data.byteLength).getInt32(state.offset, false);
-	state.offset += 4;
-	return value;
-}
-function readUint16BE(data, offset) {
-	if (offset + 1 >= data.length) return 0;
-	return data[offset] << 8 | data[offset + 1];
-}
-function readUint32BE(data, offset) {
-	if (offset + 3 >= data.length) return 0;
-	return data[offset] * 16777216 + ((data[offset + 1] ?? 0) << 16) + ((data[offset + 2] ?? 0) << 8) + (data[offset + 3] ?? 0);
-}
 //#endregion
 //#region src/atlas/inputs.ts
 function getPublishedItemId(resource) {
@@ -815,6 +738,27 @@ async function _trimImage(encoder, input, originalWidth, originalHeight) {
 		};
 	}
 }
+function resolveMovieClipSourcePath(resource, pkg, basePath) {
+	const fileName = `${resource.getName()}.jta`;
+	const resourcePath = resource.getPath() ?? "/";
+	return `${basePath}/${pkg.getName()}${resourcePath}${fileName}`;
+}
+async function prepareMovieClipResource(resource, pkg, encoder, basePath, readFileRaw) {
+	const filePath = resolveMovieClipSourcePath(resource, pkg, basePath);
+	let raw;
+	try {
+		raw = await readFileRaw(filePath);
+	} catch {
+		throw new Error(`atlas: Could not read MovieClip "${filePath}".`);
+	}
+	try {
+		return await prepareJtaForPublish(raw, encoder, filePath);
+	} catch (error) {
+		if (error instanceof Error && error.message.startsWith("atlas:")) throw error;
+		const detail = error instanceof Error ? ` ${error.message}` : "";
+		throw new Error(`atlas: Could not parse MovieClip "${filePath}".${detail}`);
+	}
+}
 /** Collect a single ImageResource into the inputs array. */
 async function collectImage(resource, pkg, inputs, encoder, options, doTrim, logger) {
 	let origW = resource.getWidth() ?? 0;
@@ -842,8 +786,11 @@ async function collectImage(resource, pkg, inputs, encoder, options, doTrim, log
 				}).png().toBuffer();
 				sourceHasAlpha = true;
 			}
-		} catch {
-			if (options.strictOutput) throw new Error(`atlas: Could not read image "${filePath}".`);
+		} catch (error) {
+			if (options.strictOutput) {
+				const detail = error instanceof Error && error.message.startsWith("publishBrowser:") ? ` ${error.message}` : "";
+				throw new Error(`atlas: Could not read image "${filePath}".${detail}`);
+			}
 			if (origW === 0 || origH === 0) {
 				logger.warn(`atlas: Could not read image "${filePath}", skipping.`);
 				return;
@@ -888,82 +835,45 @@ async function collectMovieClipFrames(doc, resource, pkg, inputs, encoder, optio
 	}
 	if (!encoder && options.strictOutput) throw new Error(`atlas: MovieClip "${resource.getId()}" requires an encoder for complete raster output.`);
 	const mcId = resource.getId();
-	const mcName = resource.getName() + ".jta";
-	const mcPath = resource.getPath() ?? "/";
-	const filePath = `${options.basePath}/${pkg.getName()}${mcPath}${mcName}`;
+	const filePath = resolveMovieClipSourcePath(resource, pkg, options.basePath);
 	try {
-		const jta = extractJtaFrames(await options.readFileRaw(filePath));
-		if (jta.frames.length === 0) return;
-		const frameMetas = jta.meta?.frames ?? [];
+		const jta = options.preparedMovieClips?.get(resource) ?? await prepareMovieClipResource(resource, pkg, encoder, options.basePath, options.readFileRaw);
 		for (const frame of resource.listFrames()) resource.removeFrame(frame);
-		resource.setInterval(jta.meta?.interval ?? 100).setSwing(jta.meta?.swing ?? false).setRepeatDelay(jta.meta?.repeatDelay ?? 0);
-		if (frameMetas.length > 0) {
-			const firstFrameIndexByTextureIndex = /* @__PURE__ */ new Map();
-			for (let frameIndex = 0; frameIndex < frameMetas.length; frameIndex += 1) {
-				const meta = frameMetas[frameIndex];
-				const textureIndex = Number.isFinite(meta.textureIndex) ? meta.textureIndex : frameIndex;
-				if (!firstFrameIndexByTextureIndex.has(textureIndex)) firstFrameIndexByTextureIndex.set(textureIndex, frameIndex);
-			}
-			const spriteIdByTextureIndex = /* @__PURE__ */ new Map();
-			for (let textureIndex = 0; textureIndex < jta.frames.length; textureIndex += 1) {
-				const exportFrameIndex = firstFrameIndexByTextureIndex.get(textureIndex);
-				if (exportFrameIndex === void 0) continue;
-				const itemId = `${mcId}_${exportFrameIndex}`;
-				const input = await createMovieClipFrameInput(jta.frames[textureIndex], itemId, resource, encoder, options.strictOutput);
-				if (!input) continue;
-				inputs.push(input);
-				spriteIdByTextureIndex.set(textureIndex, itemId);
-			}
-			for (let frameIndex = 0; frameIndex < frameMetas.length; frameIndex += 1) {
-				const meta = frameMetas[frameIndex];
-				const textureIndex = Number.isFinite(meta.textureIndex) ? meta.textureIndex : frameIndex;
-				const frame = doc.createMovieFrame(`${mcId}_${frameIndex}`);
-				frame.setRectX(meta.offsetX).setRectY(meta.offsetY).setRectWidth(meta.width).setRectHeight(meta.height).setAddDelay(meta.addDelay).setSpriteId(spriteIdByTextureIndex.get(textureIndex) ?? "");
-				resource.addFrame(frame);
-			}
-		} else for (let frameIndex = 0; frameIndex < jta.frames.length; frameIndex += 1) {
-			const itemId = `${mcId}_${frameIndex}`;
-			const input = await createMovieClipFrameInput(jta.frames[frameIndex], itemId, resource, encoder, options.strictOutput);
-			if (!input) continue;
-			inputs.push(input);
-			const frame = doc.createMovieFrame(itemId);
-			frame.setRectX(0).setRectY(0).setRectWidth(input.originalWidth).setRectHeight(input.originalHeight).setAddDelay(0).setSpriteId(itemId);
+		resource.setInterval(jta.meta.interval).setSwing(jta.meta.swing).setRepeatDelay(jta.meta.repeatDelay);
+		const spriteIdByTextureIndex = /* @__PURE__ */ new Map();
+		for (const texture of jta.referencedTextures) {
+			if (texture.width <= 0 || texture.height <= 0) continue;
+			const itemId = `${mcId}_${texture.firstFrameIndex}`;
+			inputs.push({
+				id: itemId,
+				width: texture.width,
+				height: texture.height,
+				originalWidth: texture.width,
+				originalHeight: texture.height,
+				offsetX: 0,
+				offsetY: 0,
+				resource,
+				trimBuffer: texture.buffer,
+				sourceKind: "movieclip-frame"
+			});
+			spriteIdByTextureIndex.set(texture.textureIndex, itemId);
+		}
+		for (let frameIndex = 0; frameIndex < jta.meta.frames.length; frameIndex += 1) {
+			const meta = jta.meta.frames[frameIndex];
+			const frame = doc.createMovieFrame(`${mcId}_${frameIndex}`);
+			frame.setRectX(meta.offsetX).setRectY(meta.offsetY).setRectWidth(meta.width).setRectHeight(meta.height).setAddDelay(meta.addDelay).setSpriteId(meta.textureIndex === -1 ? "" : spriteIdByTextureIndex.get(meta.textureIndex) ?? "");
 			resource.addFrame(frame);
 		}
-		if ((jta.meta?.width ?? 0) > 0 && (jta.meta?.height ?? 0) > 0) {
-			resource.setWidth(jta.meta?.width ?? 0);
-			resource.setHeight(jta.meta?.height ?? 0);
+		if (jta.meta.width > 0 && jta.meta.height > 0) {
+			resource.setWidth(jta.meta.width);
+			resource.setHeight(jta.meta.height);
 		}
-	} catch {
-		const message = `atlas: Could not parse MovieClip "${filePath}".`;
-		if (options.strictOutput) throw new Error(message);
+	} catch (error) {
+		const message = error instanceof Error ? error.message : `atlas: Could not parse MovieClip "${filePath}".`;
+		if (options.strictOutput) throw error;
 		logger.warn(`${message} Skipping frames.`);
 	}
 }
-async function createMovieClipFrameInput(buffer, itemId, resource, encoder, strictOutput) {
-	if (!encoder || buffer.length === 0) return null;
-	try {
-		const meta = await encoder(buffer).metadata();
-		const width = meta.width ?? 0;
-		const height = meta.height ?? 0;
-		if (width <= 0 || height <= 0) return null;
-		return {
-			id: itemId,
-			width,
-			height,
-			originalWidth: width,
-			originalHeight: height,
-			offsetX: 0,
-			offsetY: 0,
-			resource,
-			trimBuffer: buffer,
-			sourceKind: "movieclip-frame"
-		};
-	} catch {
-		if (strictOutput) throw new Error(`atlas: Could not decode MovieClip frame "${itemId}".`);
-		return null;
-	}
-}
 /** Collect a Bitmap Font's texture image, packed under the font's ID. */
 async function collectFontTexture(doc, fontRes, pkg, options) {
 	const textureId = fontRes.getTextureId?.() ?? "";
@@ -3137,7 +3047,7 @@ function publish(options) {
 				return paths.join("/");
 			}
 		});
-		const publishPackage = async (plan, writerFs, packageIndex) => {
+		const publishPackage = async (plan, writerFs, packageIndex, preparedMovieClips) => {
 			if (options.fs && !plan.outputDir) throw new Error("publish: no output directory resolved. Provide --output, or configure global publish.path / package publishPath.");
 			if (options.fs) {
 				await options.fs.mkdir(plan.outputDir);
@@ -3155,6 +3065,7 @@ function publish(options) {
 				mkdir: options.fs ? options.fs.mkdir : void 0,
 				readFileRaw: options.atlas?.readFileRaw ?? options.fs?.readFileRaw,
 				strictOutput: options.fs !== void 0,
+				preparedMovieClips,
 				packages: [plan.pkg.getName()],
 				...atlasRuntimeOptions
 			})(doc);
@@ -3207,8 +3118,25 @@ function publish(options) {
 		}
 		const unresolvedPlan = plans.find((plan) => !plan.outputDir);
 		if (unresolvedPlan) throw new Error(`publish: no output directory resolved for package "${unresolvedPlan.pkg.getName()}". Provide --output, or configure global publish.path / package publishPath.`);
+		const publishedMovieClips = allPackages.flatMap((pkg) => {
+			const publishedResourceIds = getAnnotatedPublishedResourceIds(pkg);
+			return pkg.listResources().filter((resource) => {
+				return publishedResourceIds.has(resource.getId()) && isMovieClipResource(resource);
+			}).map((resource) => ({
+				pkg,
+				resource
+			}));
+		});
+		const preparedMovieClips = /* @__PURE__ */ new Map();
+		if (publishedMovieClips.length > 0) {
+			if (!options.encoder) throw new Error("publish: MovieClip output requires an encoder.");
+			if (!options.basePath) throw new Error("publish: MovieClip output requires basePath.");
+			const readFileRaw = options.atlas?.readFileRaw ?? options.fs.readFileRaw;
+			if (!readFileRaw) throw new Error("publish: MovieClip output requires readFileRaw.");
+			for (const { pkg, resource } of publishedMovieClips) preparedMovieClips.set(resource, await prepareMovieClipResource(resource, pkg, options.encoder, options.basePath, readFileRaw));
+		}
 		const writerFs = toBinaryWriterFileSystem(options.fs);
-		for (const plan of plans) await publishPackage(plan, writerFs, allDocPackages.indexOf(plan.pkg));
+		for (const plan of plans) await publishPackage(plan, writerFs, allDocPackages.indexOf(plan.pkg), preparedMovieClips);
 		if (options.codeGeneration !== false) await publishCodeGeneration(doc, {
 			basePath: options.basePath,
 			fs: options.fs,
@@ -3243,4 +3171,4 @@ function _computeDependencies(doc, pkg, pkgMap) {
 	}
 }
 //#endregion
-export { decodeText as a, resolvePackageCodegenPlan as c, normalizeComparablePath as d, trimTrailingSlashes as f, createTransform as h, buildCodegenClasses as i, resolveProjectBasePath as l, atlas as m, resolvePublishOptions as n, encodeText as o, formatPluginError as p, AUTO_GENERATED_CODE_MARK as r, publishCodeGeneration as s, publish as t, basename as u };
+export { decodeText as a, resolveCodeGenerationSettings as c, basename as d, normalizeComparablePath as f, createTransform as g, atlas as h, buildCodegenClasses as i, resolvePackageCodegenPlan as l, formatPluginError as m, resolvePublishOptions as n, encodeText as o, trimTrailingSlashes as p, AUTO_GENERATED_CODE_MARK as r, publishCodeGeneration as s, publish as t, resolveProjectBasePath as u };

package/dist/{restore-C98ugT2H.js → restore-BQp01WY3.js}

@@ -1,4 +1,4 @@
-import { d as normalizeComparablePath, f as trimTrailingSlashes, u as basename } from "./publish-BJk8UzRP.js";
+import { d as basename, f as normalizeComparablePath, p as trimTrailingSlashes } from "./publish-DXoaC1Nl.js";
 import { BinaryReader, ProjectType, ProjectWriter, generateId } from "@openfairygui/core";
 //#region src/restore-internals/output-transaction.ts
 function isPathWithin(root, candidate) {
@@ -486,6 +486,14 @@ var RestoreWorkflow = class {
 			common: {},
 			adaptation: {}
 		});
+		for (const pkg of doc.getRoot().listPackages()) pkg.setSourceAtlasSettings({
+			...pkg.getSourceAtlasSettings(),
+			atlases: pkg.listAtlases().map((atlas) => ({
+				index: atlas.getIndex(),
+				name: atlas.getIndex() === 0 ? "Default" : atlas.getName(),
+				compression: false
+			}))
+		});
 	}
 	_initializeImageFileNames(doc) {
 		for (const pkg of doc.getRoot().listPackages()) for (const resource of pkg.listResources()) {

package/dist/{restore-BUaCK8ui.cjs → restore-CEywQUHz.cjs}

@@ -1,4 +1,4 @@
-const require_publish = require("./publish-DCP0AYx2.cjs");
+const require_publish = require("./publish-CykUJfVa.cjs");
 let _openfairygui_core = require("@openfairygui/core");
 //#region src/restore-internals/output-transaction.ts
 function isPathWithin(root, candidate) {
@@ -486,6 +486,14 @@ var RestoreWorkflow = class {
 			common: {},
 			adaptation: {}
 		});
+		for (const pkg of doc.getRoot().listPackages()) pkg.setSourceAtlasSettings({
+			...pkg.getSourceAtlasSettings(),
+			atlases: pkg.listAtlases().map((atlas) => ({
+				index: atlas.getIndex(),
+				name: atlas.getIndex() === 0 ? "Default" : atlas.getName(),
+				compression: false
+			}))
+		});
 	}
 	_initializeImageFileNames(doc) {
 		for (const pkg of doc.getRoot().listPackages()) for (const resource of pkg.listResources()) {