@openfairygui/functions 0.2.0-alpha.33 → 0.2.0-alpha.35

package/dist/web.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_publish = require("./publish-DCP0AYx2.cjs");
+const require_publish = require("./publish-Bv7E2fZE.cjs");
 let _openfairygui_core = require("@openfairygui/core");
 //#region src/adapters/web/raster.ts
 function getBrowserContext(canvas) {
@@ -223,6 +223,15 @@ function toResult(success, files, diagnostics) {
 		diagnostics
 	};
 }
+function unsupportedSetting(setting, path, message) {
+	return {
+		level: "error",
+		code: "unsupported_publish_setting",
+		setting,
+		path,
+		message
+	};
+}
 /**
 * Publish a loaded FairyGUI project to browser-provided storage.
 *
@@ -238,14 +247,33 @@ async function publishBrowser(options) {
 	options.document.setLogger(createDiagnosticLogger(previousLogger, diagnostics));
 	try {
 		if (options.projectType !== "layabox") throw new Error(`publishBrowser: unsupported project type "${String(options.projectType)}".`);
-		assertBrowserImageSupport();
 		root.setProjectType(_openfairygui_core.ProjectType.LayaBox);
+		const resolved = require_publish.resolvePublishOptions(options.document, {
+			compressed: options.compressed,
+			packages: options.packages,
+			atlas: options.atlas
+		});
+		if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(resolved.fileExtension)) {
+			diagnostics.push(unsupportedSetting("fileExtension", "settings.publish.fileExtension", `publishBrowser: unsupported fileExtension "${resolved.fileExtension}".`));
+			return toResult(false, files, diagnostics);
+		}
+		const selectedPackageNames = options.packages?.length ? new Set(options.packages) : null;
+		const selectedPackages = root.listPackages().filter((pkg) => !selectedPackageNames || selectedPackageNames.has(pkg.getName()));
+		if (require_publish.resolveCodeGenerationSettings(options.document).allowGenCode) {
+			const packageIndex = selectedPackages.findIndex((pkg) => pkg.getGenCode());
+			if (packageIndex >= 0) {
+				const pkg = selectedPackages[packageIndex];
+				diagnostics.push(unsupportedSetting("codeGeneration", `packages[${root.listPackages().indexOf(pkg)}].publish.genCode`, `publishBrowser: code generation requested by package "${pkg.getName()}" is not supported.`));
+				return toResult(false, files, diagnostics);
+			}
+		}
+		assertBrowserImageSupport();
 		const outputFileSystem = createTrackingFileSystem(options.outputFileSystem, files);
 		const sourceAssetsPath = options.sourceFileSystem.join(options.document.getProjectDir(), "assets");
 		await options.document.transform(require_publish.publish({
 			output: options.output,
-			compressed: options.compressed,
-			fileExtension: "fui",
+			compressed: resolved.compressed,
+			fileExtension: resolved.fileExtension,
 			packages: options.packages,
 			branch: options.branch,
 			basePath: sourceAssetsPath,
@@ -262,6 +290,7 @@ async function publishBrowser(options) {
 	} catch (error) {
 		diagnostics.push({
 			level: "error",
+			code: "publish_failed",
 			message: error instanceof Error ? error.message : String(error)
 		});
 		return toResult(false, files, diagnostics);

package/dist/web.d.cts

@@ -20,6 +20,9 @@ interface BrowserPublishOptions {
 interface BrowserPublishDiagnostic {
   level: 'debug' | 'info' | 'warning' | 'error';
   message: string;
+  code?: 'unsupported_publish_setting' | 'publish_failed';
+  setting?: string;
+  path?: string;
 }
 interface BrowserPublishedFile {
   path: string;

package/dist/web.d.ts

@@ -20,6 +20,9 @@ interface BrowserPublishOptions {
 interface BrowserPublishDiagnostic {
   level: 'debug' | 'info' | 'warning' | 'error';
   message: string;
+  code?: 'unsupported_publish_setting' | 'publish_failed';
+  setting?: string;
+  path?: string;
 }
 interface BrowserPublishedFile {
   path: string;

package/dist/web.js

@@ -1,4 +1,4 @@
-import { t as publish } from "./publish-BJk8UzRP.js";
+import { c as resolveCodeGenerationSettings, n as resolvePublishOptions, t as publish } from "./publish--8vagaSA.js";
 import { ProjectType } from "@openfairygui/core";
 //#region src/adapters/web/raster.ts
 function getBrowserContext(canvas) {
@@ -222,6 +222,15 @@ function toResult(success, files, diagnostics) {
 		diagnostics
 	};
 }
+function unsupportedSetting(setting, path, message) {
+	return {
+		level: "error",
+		code: "unsupported_publish_setting",
+		setting,
+		path,
+		message
+	};
+}
 /**
 * Publish a loaded FairyGUI project to browser-provided storage.
 *
@@ -237,14 +246,33 @@ async function publishBrowser(options) {
 	options.document.setLogger(createDiagnosticLogger(previousLogger, diagnostics));
 	try {
 		if (options.projectType !== "layabox") throw new Error(`publishBrowser: unsupported project type "${String(options.projectType)}".`);
-		assertBrowserImageSupport();
 		root.setProjectType(ProjectType.LayaBox);
+		const resolved = resolvePublishOptions(options.document, {
+			compressed: options.compressed,
+			packages: options.packages,
+			atlas: options.atlas
+		});
+		if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(resolved.fileExtension)) {
+			diagnostics.push(unsupportedSetting("fileExtension", "settings.publish.fileExtension", `publishBrowser: unsupported fileExtension "${resolved.fileExtension}".`));
+			return toResult(false, files, diagnostics);
+		}
+		const selectedPackageNames = options.packages?.length ? new Set(options.packages) : null;
+		const selectedPackages = root.listPackages().filter((pkg) => !selectedPackageNames || selectedPackageNames.has(pkg.getName()));
+		if (resolveCodeGenerationSettings(options.document).allowGenCode) {
+			const packageIndex = selectedPackages.findIndex((pkg) => pkg.getGenCode());
+			if (packageIndex >= 0) {
+				const pkg = selectedPackages[packageIndex];
+				diagnostics.push(unsupportedSetting("codeGeneration", `packages[${root.listPackages().indexOf(pkg)}].publish.genCode`, `publishBrowser: code generation requested by package "${pkg.getName()}" is not supported.`));
+				return toResult(false, files, diagnostics);
+			}
+		}
+		assertBrowserImageSupport();
 		const outputFileSystem = createTrackingFileSystem(options.outputFileSystem, files);
 		const sourceAssetsPath = options.sourceFileSystem.join(options.document.getProjectDir(), "assets");
 		await options.document.transform(publish({
 			output: options.output,
-			compressed: options.compressed,
-			fileExtension: "fui",
+			compressed: resolved.compressed,
+			fileExtension: resolved.fileExtension,
 			packages: options.packages,
 			branch: options.branch,
 			basePath: sourceAssetsPath,
@@ -261,6 +289,7 @@ async function publishBrowser(options) {
 	} catch (error) {
 		diagnostics.push({
 			level: "error",
+			code: "publish_failed",
 			message: error instanceof Error ? error.message : String(error)
 		});
 		return toResult(false, files, diagnostics);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfairygui/functions",
-  "version": "0.2.0-alpha.33",
+  "version": "0.2.0-alpha.35",
   "description": "FairyGUI Headless Authoring SDK — composable transform functions.",
   "author": "OpenFairyGUI Contributors",
   "license": "MIT",
@@ -74,7 +74,7 @@
   ],
   "dependencies": {
     "jiti": "^2.6.1",
-    "@openfairygui/core": "0.2.0-alpha.33"
+    "@openfairygui/core": "0.2.0-alpha.35"
   },
   "optionalDependencies": {
     "sharp": ">=0.33.0"

package/src/adapters/web/publish.ts

@@ -1,11 +1,13 @@
 import { type Document, type ILogger, ProjectType } from '@openfairygui/core';
 import type { AtlasOptions } from '../../atlas.js';
+import { resolveCodeGenerationSettings } from '../../codegen.js';
 import { publish } from '../../publish.js';
 import type {
 	PublishFileSystem,
 	PublishOutputFileSystem,
 	PublishSourceFileSystem,
 } from '../../publish/contracts.js';
+import { resolvePublishOptions } from '../../publish/options.js';
 import { assertBrowserImageSupport, createBrowserImageEncoder } from './raster.js';
 
 export type BrowserPublishProjectType = 'layabox';
@@ -42,6 +44,9 @@ export interface BrowserPublishOptions {
 export interface BrowserPublishDiagnostic {
 	level: 'debug' | 'info' | 'warning' | 'error';
 	message: string;
+	code?: 'unsupported_publish_setting' | 'publish_failed';
+	setting?: string;
+	path?: string;
 }
 
 export interface BrowserPublishedFile {
@@ -103,6 +108,10 @@ function toResult(
 	};
 }
 
+function unsupportedSetting(setting: string, path: string, message: string): BrowserPublishDiagnostic {
+	return { level: 'error', code: 'unsupported_publish_setting', setting, path, message };
+}
+
 /**
  * Publish a loaded FairyGUI project to browser-provided storage.
  *
@@ -121,16 +130,43 @@ export async function publishBrowser(options: BrowserPublishOptions): Promise<Br
 		if (options.projectType !== 'layabox') {
 			throw new Error(`publishBrowser: unsupported project type "${String(options.projectType)}".`);
 		}
-		assertBrowserImageSupport();
 		root.setProjectType(ProjectType.LayaBox);
+		const resolved = resolvePublishOptions(options.document, {
+			compressed: options.compressed,
+			packages: options.packages,
+			atlas: options.atlas,
+		});
+		if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(resolved.fileExtension)) {
+			diagnostics.push(unsupportedSetting(
+				'fileExtension',
+				'settings.publish.fileExtension',
+				`publishBrowser: unsupported fileExtension "${resolved.fileExtension}".`,
+			));
+			return toResult(false, files, diagnostics);
+		}
+		const selectedPackageNames = options.packages?.length ? new Set(options.packages) : null;
+		const selectedPackages = root.listPackages().filter((pkg) => !selectedPackageNames || selectedPackageNames.has(pkg.getName()));
+		if (resolveCodeGenerationSettings(options.document).allowGenCode) {
+			const packageIndex = selectedPackages.findIndex((pkg) => pkg.getGenCode());
+			if (packageIndex >= 0) {
+				const pkg = selectedPackages[packageIndex]!;
+				diagnostics.push(unsupportedSetting(
+					'codeGeneration',
+					`packages[${root.listPackages().indexOf(pkg)}].publish.genCode`,
+					`publishBrowser: code generation requested by package "${pkg.getName()}" is not supported.`,
+				));
+				return toResult(false, files, diagnostics);
+			}
+		}
+		assertBrowserImageSupport();
 		const outputFileSystem = createTrackingFileSystem(options.outputFileSystem, files);
 		const sourceAssetsPath = options.sourceFileSystem.join(options.document.getProjectDir(), 'assets');
 
 		await options.document.transform(
 			publish({
 				output: options.output,
-				compressed: options.compressed,
-				fileExtension: 'fui',
+				compressed: resolved.compressed,
+				fileExtension: resolved.fileExtension,
 				packages: options.packages,
 				branch: options.branch,
 				basePath: sourceAssetsPath,
@@ -149,6 +185,7 @@ export async function publishBrowser(options: BrowserPublishOptions): Promise<Br
 	} catch (error) {
 		diagnostics.push({
 			level: 'error',
+			code: 'publish_failed',
 			message: error instanceof Error ? error.message : String(error),
 		});
 		return toResult(false, files, diagnostics);

package/src/atlas/inputs.ts

@@ -21,7 +21,7 @@ import {
 } from '../publish/package-context.js';
 import type { ExtrasMap } from '../shared-types.js';
 import { parseFnt } from './font.js';
-import { extractJtaFrames } from './jta.js';
+import { prepareJtaForPublish, type PreparedJtaData } from './jta.js';
 
 /** Trim info for a single image. */
 interface TrimInfo {
@@ -181,6 +181,36 @@ export interface PagedAtlasGroup {
 	inputs: InputItem[];
 }
 
+export function resolveMovieClipSourcePath(resource: MovieClipResource, pkg: Package, basePath: string): string {
+	const fileName = `${resource.getName()}.jta`;
+	const resourcePath = resource.getPath() ?? '/';
+	return `${basePath}/${pkg.getName()}${resourcePath}${fileName}`;
+}
+
+export async function prepareMovieClipResource(
+	resource: MovieClipResource,
+	pkg: Package,
+	encoder: AtlasRasterBackend | undefined,
+	basePath: string,
+	readFileRaw: (path: string) => Promise<Uint8Array>,
+): Promise<PreparedJtaData> {
+	const filePath = resolveMovieClipSourcePath(resource, pkg, basePath);
+	let raw: Uint8Array;
+	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. */
 export async function collectImage(
 	resource: ImageResource,
@@ -285,130 +315,62 @@ export async function collectMovieClipFrames(
 	}
 
 	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 raw = await options.readFileRaw(filePath);
-		const jta = extractJtaFrames(raw);
-		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 = new Map<number, number>();
-			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 = new Map<number, string>();
-			for (let textureIndex = 0; textureIndex < jta.frames.length; textureIndex += 1) {
-				const exportFrameIndex = firstFrameIndexByTextureIndex.get(textureIndex);
-				if (exportFrameIndex === undefined) continue;
-				const itemId = `${mcId}_${exportFrameIndex}`;
-			const input = await createMovieClipFrameInput(
-				jta.frames[textureIndex],
-				itemId,
+			.setInterval(jta.meta.interval)
+			.setSwing(jta.meta.swing)
+			.setRepeatDelay(jta.meta.repeatDelay);
+		const spriteIdByTextureIndex = new Map<number, string>();
+		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,
-				encoder,
-				options.strictOutput,
-			);
-				if (!input) continue;
-				inputs.push(input);
-				spriteIdByTextureIndex.set(textureIndex, itemId);
-			}
+				trimBuffer: texture.buffer,
+				sourceKind: 'movieclip-frame',
+			});
+			spriteIdByTextureIndex.set(texture.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.addFrame(frame);
-			}
+		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: Uint8Array,
-	itemId: string,
-	resource: MovieClipResource,
-	encoder: AtlasRasterBackend | undefined,
-	strictOutput: boolean,
-): Promise<InputItem | null> {
-	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. */
 export async function collectFontTexture(
 	doc: Document,