@openfairygui/cli 0.2.0 → 0.2.2

package/dist/cli.mjs

@@ -864,7 +864,7 @@ var ExtensibleProperty = class extends Property {
 };
 //#endregion
 //#region ../core/src/constants.ts
-const VERSION = `v0.2.0`;
+const VERSION = `v0.2.2`;
 /** Binary package file magic number: "FGUI" as uint32. */
 const FGUI_MAGIC = 1179080009;
 /** Null string index in the binary string table. */
@@ -19463,6 +19463,17 @@ function formatTrimmedFixed$1(value, precision = 2) {
 	if (precision === 0) return value.toFixed(0);
 	return value.toFixed(precision).replace(/(?:\.0+|(\.\d*?[1-9])0+)$/, "$1");
 }
+const INT32_MIN = -2147483648;
+const INT32_MAX = 2147483647;
+function formatProjectInt32(value, field = "project XML integer") {
+	if (!Number.isFinite(value)) throw new Error(`${field} must be finite.`);
+	const normalized = Math.trunc(value);
+	if (normalized < INT32_MIN || normalized > INT32_MAX) throw new Error(`${field} must fit a signed 32-bit integer.`);
+	return Object.is(normalized, -0) ? "0" : String(normalized);
+}
+function formatProjectInt32List(values, field) {
+	return values.map((value) => formatProjectInt32(value, field)).join(",");
+}
 function formatDisplayAlpha(value) {
 	return formatTrimmedFixed$1(value, 2);
 }
@@ -19520,7 +19531,7 @@ function normalizeGearSizeSegment(segment, fixedScale, omitIdentityScale) {
 	if (!segment || segment === "-") return segment;
 	const parts = segment.split(",");
 	if (parts.length < 2) return segment;
-	const normalized = [String(Math.trunc(Number(parts[0] ?? 0))), String(Math.trunc(Number(parts[1] ?? 0)))];
+	const normalized = [formatProjectInt32(Number(parts[0] ?? 0), "gearSize width"), formatProjectInt32(Number(parts[1] ?? 0), "gearSize height")];
 	if (parts.length >= 4) {
 		if (omitIdentityScale && isIdentityGearSizeScale(segment)) return normalized.join(",");
 		const scaleFormatter = fixedScale ? (value) => {
@@ -19531,12 +19542,23 @@ function normalizeGearSizeSegment(segment, fixedScale, omitIdentityScale) {
 	}
 	return normalized.join(",");
 }
+function normalizeGearXYSegment(segment) {
+	if (!segment || segment === "-") return segment;
+	const parts = segment.split(",");
+	if (parts.length < 2) return segment;
+	return [
+		formatProjectInt32(Number(parts[0] ?? 0), "gearXY x"),
+		formatProjectInt32(Number(parts[1] ?? 0), "gearXY y"),
+		...parts.slice(2)
+	].join(",");
+}
 function shouldCompactTextGearColor(ownerType, ownerName) {
 	return (ownerType === "GTextField" || ownerType === "GRichTextField" || ownerType === "GTextInput") && ownerName === "title";
 }
 function normalizeGearXmlValue(gearType, value, ownerType, ownerName, gear) {
 	const raw = String(value ?? "");
 	switch (gearType) {
+		case GearType.XY: return raw.split("|").map((segment) => normalizeGearXYSegment(segment)).join("|");
 		case GearType.Size: {
 			const fixedScale = !gear?.getTween();
 			const segments = raw.split("|");
@@ -19556,10 +19578,10 @@ function normalizeGearXmlValue(gearType, value, ownerType, ownerName, gear) {
 }
 function writeCommonDisplayState(target, object, protocol) {
 	const specs = protocol.attrs;
-	if (specs.xy) writeXmlAttr(target, specs.xy, `${object.getX?.() ?? 0},${object.getY?.() ?? 0}`);
+	if (specs.xy) writeXmlAttr(target, specs.xy, formatProjectInt32List([object.getX?.() ?? 0, object.getY?.() ?? 0], "display object xy"));
 	const width = object.getWidth?.() ?? 0;
 	const height = object.getHeight?.() ?? 0;
-	if (specs.size && (width !== 0 || height !== 0)) writeXmlAttr(target, specs.size, `${width},${height}`);
+	if (specs.size && (width !== 0 || height !== 0)) writeXmlAttr(target, specs.size, formatProjectInt32List([width, height], "display object size"));
 	if (specs.locked && object.getLocked?.()) writeXmlAttr(target, specs.locked, "true");
 	const restrictSize = [
 		object.getMinWidth?.() ?? 0,
@@ -19567,7 +19589,7 @@ function writeCommonDisplayState(target, object, protocol) {
 		object.getMinHeight?.() ?? 0,
 		object.getMaxHeight?.() ?? 0
 	];
-	if (specs.restrictSize && restrictSize.some((value) => value !== 0)) writeXmlAttr(target, specs.restrictSize, restrictSize.join(","));
+	if (specs.restrictSize && restrictSize.some((value) => value !== 0)) writeXmlAttr(target, specs.restrictSize, formatProjectInt32List(restrictSize, "display object restrictSize"));
 	if (specs.aspect && object.getAspect?.()) writeXmlAttr(target, specs.aspect, "true");
 	const pivotX = object.getPivotX?.() ?? 0;
 	const pivotY = object.getPivotY?.() ?? 0;
@@ -19597,8 +19619,13 @@ function writeCommonDisplayState(target, object, protocol) {
 function hasNonZeroInsets(value) {
 	return !!value && !!(value.top || value.bottom || value.left || value.right);
 }
-function formatInsets(value) {
-	return `${value.top ?? 0},${value.bottom ?? 0},${value.left ?? 0},${value.right ?? 0}`;
+function formatInsets(value, field = "margin") {
+	return formatProjectInt32List([
+		value.top ?? 0,
+		value.bottom ?? 0,
+		value.left ?? 0,
+		value.right ?? 0
+	], field);
 }
 function formatFillMethod(fillMethod) {
 	return {
@@ -20116,7 +20143,7 @@ function serializeChild(obj) {
 		const scrollBarFlags = typedObj.getScrollBarFlags?.() ?? 0;
 		if (scrollBarFlags !== 0) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.scrollBarFlags, String(scrollBarFlags));
 		const scrollBarMargin = typedObj.getScrollBarMargin?.();
-		if (hasNonZeroInsets(scrollBarMargin)) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.scrollBarMargin, formatInsets(scrollBarMargin));
+		if (hasNonZeroInsets(scrollBarMargin)) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.scrollBarMargin, formatInsets(scrollBarMargin, "list scrollBarMargin"));
 		const vtScrollBarRes = typedObj.getVtScrollBarRes?.() ?? "";
 		const hzScrollBarRes = typedObj.getHzScrollBarRes?.() ?? "";
 		if (vtScrollBarRes || hzScrollBarRes) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.scrollBarRes, `${vtScrollBarRes},${hzScrollBarRes}`);
@@ -20124,9 +20151,9 @@ function serializeChild(obj) {
 		const footerRes = typedObj.getFooterRes?.() ?? "";
 		if (headerRes || footerRes) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.ptrRes, `${headerRes},${footerRes}`);
 		const margin = typedObj.getMargin?.();
-		if (hasNonZeroInsets(margin)) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.margin, formatInsets(margin));
+		if (hasNonZeroInsets(margin)) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.margin, formatInsets(margin, "list margin"));
 		const clipSoftness = typedObj.getClipSoftness?.();
-		if (clipSoftness && ((clipSoftness.x ?? 0) !== 0 || (clipSoftness.y ?? 0) !== 0)) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.clipSoftness, `${clipSoftness.x ?? 0},${clipSoftness.y ?? 0}`);
+		if (clipSoftness && ((clipSoftness.x ?? 0) !== 0 || (clipSoftness.y ?? 0) !== 0)) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.clipSoftness, formatProjectInt32List([clipSoftness.x ?? 0, clipSoftness.y ?? 0], "list clipSoftness"));
 		if (typedObj.getScrollItemToViewOnClick?.() === false) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.scrollItemToViewOnClick, "false");
 		if (typedObj.getFoldInvisibleItems?.() === true) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.foldInvisibleItems, "true");
 		if (typedObj.getAutoClearItems?.() === true) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.list.attrs.autoClearItems, "true");
@@ -20368,7 +20395,7 @@ async function writeComponent(fs, comp, pkgDir, sourceRelativePath) {
 	await fs.mkdir(fs.dirname(targetPath));
 	const compAttrs = {};
 	const [w, h] = [typedComp.getWidth?.() ?? 0, typedComp.getHeight?.() ?? 0];
-	if (w || h) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.size, `${w},${h}`);
+	if (w || h) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.size, formatProjectInt32List([w, h], "component size"));
 	const [pivotX, pivotY] = [typedComp.getPivotX?.() ?? 0, typedComp.getPivotY?.() ?? 0];
 	if (pivotX !== 0 || pivotY !== 0) {
 		writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.pivot, `${pivotX},${pivotY}`);
@@ -20381,14 +20408,14 @@ async function writeComponent(fs, comp, pkgDir, sourceRelativePath) {
 		2: "scroll"
 	}[overflow] ?? "visible");
 	const margin = typedComp.getMargin?.();
-	if (hasNonZeroInsets(margin)) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.margin, formatInsets(margin));
+	if (hasNonZeroInsets(margin)) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.margin, formatInsets(margin, "component margin"));
 	const restrictSize = [
 		typedComp.getMinWidth?.() ?? 0,
 		typedComp.getMaxWidth?.() ?? 0,
 		typedComp.getMinHeight?.() ?? 0,
 		typedComp.getMaxHeight?.() ?? 0
 	];
-	if (restrictSize.some((value) => value !== 0)) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.restrictSize, restrictSize.join(","));
+	if (restrictSize.some((value) => value !== 0)) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.restrictSize, formatProjectInt32List(restrictSize, "component restrictSize"));
 	if (typedComp.getBgColorEnabled?.()) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.bgColorEnabled, "true");
 	const bgColor = typedComp.getBgColor?.();
 	if (bgColor) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.bgColor, bgColor);
@@ -20397,9 +20424,9 @@ async function writeComponent(fs, comp, pkgDir, sourceRelativePath) {
 	const designImageLayer = typedComp.getDesignImageLayer?.() ?? 0;
 	if (designImageLayer !== 0) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.designImageLayer, String(designImageLayer));
 	const designImageOffsetX = typedComp.getDesignImageOffsetX?.() ?? 0;
-	if (designImageOffsetX !== 0) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.designImageOffsetX, String(designImageOffsetX));
+	if (designImageOffsetX !== 0) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.designImageOffsetX, formatProjectInt32(designImageOffsetX, "designImageOffsetX"));
 	const designImageOffsetY = typedComp.getDesignImageOffsetY?.() ?? 0;
-	if (designImageOffsetY !== 0) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.designImageOffsetY, String(designImageOffsetY));
+	if (designImageOffsetY !== 0) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.designImageOffsetY, formatProjectInt32(designImageOffsetY, "designImageOffsetY"));
 	const idNum = typedComp.getIdNum?.() ?? 0;
 	if (idNum !== 0) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.idnum, String(idNum));
 	const initName = typedComp.getInitName?.();
@@ -20407,7 +20434,7 @@ async function writeComponent(fs, comp, pkgDir, sourceRelativePath) {
 	const remark = typedComp.getRemark?.();
 	if (remark) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.remark, remark);
 	const clipSoftness = typedComp.getClipSoftness?.();
-	if (clipSoftness && ((clipSoftness.x ?? 0) !== 0 || (clipSoftness.y ?? 0) !== 0)) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.clipSoftness, `${clipSoftness.x ?? 0},${clipSoftness.y ?? 0}`);
+	if (clipSoftness && ((clipSoftness.x ?? 0) !== 0 || (clipSoftness.y ?? 0) !== 0)) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.clipSoftness, formatProjectInt32List([clipSoftness.x ?? 0, clipSoftness.y ?? 0], "component clipSoftness"));
 	if (typedComp.getOpaque?.() === false) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.opaque, "false");
 	const mask = typedComp.getMask?.();
 	if (mask) {
@@ -20437,7 +20464,7 @@ async function writeComponent(fs, comp, pkgDir, sourceRelativePath) {
 		const scrollBarFlags = typedComp.getScrollBarFlags?.() ?? 0;
 		if (scrollBarFlags !== 0) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.scrollBarFlags, String(scrollBarFlags));
 		const scrollBarMargin = typedComp.getScrollBarMargin?.();
-		if (hasNonZeroInsets(scrollBarMargin)) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.scrollBarMargin, formatInsets(scrollBarMargin));
+		if (hasNonZeroInsets(scrollBarMargin)) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.scrollBarMargin, formatInsets(scrollBarMargin, "component scrollBarMargin"));
 		const vtScrollBarRes = typedComp.getVtScrollBarRes?.() ?? "";
 		const hzScrollBarRes = typedComp.getHzScrollBarRes?.() ?? "";
 		if (vtScrollBarRes || hzScrollBarRes) writeXmlAttr(compAttrs, PROJECT_XML_PROTOCOL.componentRoot.attrs.scrollBarRes, `${vtScrollBarRes},${hzScrollBarRes}`);
@@ -28700,14 +28727,15 @@ function resolvePublishOptions(doc, overrides = {}) {
 	const root = doc.getRoot();
 	const publishSettings = (root.getSettings?.() ?? {}).publish ?? {};
 	const atlasSetting = publishSettings.atlasSetting ?? {};
-	const projectType = root.getProjectType();
-	const fileExtension = overrides.fileExtension ?? resolveDefaultPublishFileExtension(projectType, publishSettings);
+	const projectType = overrides.targetProjectType ?? root.getProjectType();
+	const explicitLayaboxTarget = overrides.targetProjectType === ProjectType.LayaBox;
+	const fileExtension = overrides.fileExtension ?? (explicitLayaboxTarget ? "fui" : resolveDefaultPublishFileExtension(projectType, publishSettings));
 	let compressed = overrides.compressed ?? publishSettings.compressDesc ?? false;
 	if (projectType === UNITY_PROJECT_TYPE) compressed = overrides.compressed ?? false;
 	const atlasOptions = {
 		maxSize: overrides.atlas?.maxSize ?? atlasSetting.maxSize ?? 2048,
 		fast: overrides.atlas?.fast ?? atlasSetting.fast ?? true,
-		allowRotation: overrides.atlas?.allowRotation ?? atlasSetting.allowRotation ?? false,
+		allowRotation: overrides.atlas?.allowRotation ?? (explicitLayaboxTarget ? false : atlasSetting.allowRotation ?? false),
 		padding: overrides.atlas?.padding ?? atlasSetting.padding ?? 2,
 		powerOfTwo: overrides.atlas?.powerOfTwo ?? atlasSetting.sizeOption === "pot",
 		square: overrides.atlas?.square ?? atlasSetting.forceSquare ?? false,
@@ -29382,7 +29410,8 @@ function registerPublishCommand(program) {
 		const pkgFilter = options.packages?.split(",").map((value) => value.trim());
 		const resolved = resolvePublishOptions(doc, {
 			compressed: options.compressed,
-			packages: pkgFilter
+			packages: pkgFilter,
+			targetProjectType: projectType
 		});
 		console.log(`Settings: ext=${resolved.fileExtension}, compressed=${resolved.compressed}`);
 		if (options.branch) console.log(`Active branch: ${options.branch}`);
@@ -29425,7 +29454,7 @@ function registerRestoreCommand(program) {
 //#region src/utils/package-version.ts
 const require$1 = createRequire(import.meta.url);
 function getInjectedPackageVersion() {
-	const version = "0.2.0";
+	const version = "0.2.2";
 	return typeof version === "string" && true ? version : null;
 }
 function readPackageVersion() {
@@ -29453,7 +29482,7 @@ function createProgram() {
 		"  openfairygui",
 		"",
 		"Input can be a .fairy file or a project root directory (auto-discovers .fairy file).",
-		"File extension and binary format are read from project settings."
+		"Publish settings are read from the project; --project-type applies target-specific output rules."
 	].join("\n"));
 	return program;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfairygui/cli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "FairyGUI Headless Authoring SDK — command-line interface.",
   "author": "OpenFairyGUI Contributors",
   "license": "MIT",
@@ -33,13 +33,13 @@
     "restore"
   ],
   "devDependencies": {
-    "@openfairygui/core": "0.2.0",
-    "@openfairygui/functions": "0.2.0"
+    "@openfairygui/core": "0.2.2",
+    "@openfairygui/functions": "0.2.2"
   },
   "dependencies": {
     "commander": "^14.0.2",
     "jiti": "^2.7.0",
-    "@openfairygui/backend": "0.2.0"
+    "@openfairygui/backend": "0.2.2"
   },
   "optionalDependencies": {
     "sharp": ">=0.33.0"

package/src/cli.ts

@@ -25,7 +25,7 @@ function createProgram(): Command {
 			'  openfairygui',
 			'',
 			'Input can be a .fairy file or a project root directory (auto-discovers .fairy file).',
-			'File extension and binary format are read from project settings.',
+			'Publish settings are read from the project; --project-type applies target-specific output rules.',
 		].join('\n'),
 	);
 

package/src/commands/publish.ts

@@ -1,8 +1,8 @@
-import type { Command } from 'commander';
+import path from 'node:path';
 import { NodeIO } from '@openfairygui/core/node';
 import { resolvePublishOptions } from '@openfairygui/functions';
 import { publishNode } from '@openfairygui/functions/node';
-import path from 'node:path';
+import type { Command } from 'commander';
 import { resolveFairyPath } from '../utils/project-input.js';
 import { parseProjectType } from '../utils/project-type.js';
 
@@ -44,6 +44,7 @@ export function registerPublishCommand(program: Command): void {
 			const resolved = resolvePublishOptions(doc, {
 				compressed: options.compressed,
 				packages: pkgFilter,
+				targetProjectType: projectType,
 			});
 
 			console.log(`Settings: ext=${resolved.fileExtension}, compressed=${resolved.compressed}`);