@openfairygui/cli 0.3.0-alpha.2 → 0.3.0-alpha.3

package/dist/cli.mjs

@@ -821,7 +821,7 @@ var ExtensibleProperty = class extends Property {
 };
 //#endregion
 //#region ../core/src/constants.ts
-const VERSION = `v0.3.0-alpha.2`;
+const VERSION = `v0.3.0-alpha.3`;
 /** Binary package file magic number: "FGUI" as uint32. */
 const FGUI_MAGIC = 1179080009;
 /** Null string index in the binary string table. */
@@ -20447,6 +20447,84 @@ function getXmlNode(value) {
 	if (!node || typeof node !== "object" || Array.isArray(node)) return null;
 	return node;
 }
+const COMPONENT_INT32_RULES = [
+	[PROJECT_XML_PROTOCOL.componentRoot.attrs.size, 2],
+	[PROJECT_XML_PROTOCOL.componentRoot.attrs.restrictSize, 4],
+	[PROJECT_XML_PROTOCOL.componentRoot.attrs.margin, 4],
+	[PROJECT_XML_PROTOCOL.componentRoot.attrs.scrollBarMargin, 4],
+	[PROJECT_XML_PROTOCOL.componentRoot.attrs.clipSoftness, 2],
+	[PROJECT_XML_PROTOCOL.componentRoot.attrs.designImageOffsetX, 1],
+	[PROJECT_XML_PROTOCOL.componentRoot.attrs.designImageOffsetY, 1]
+];
+const DISPLAY_OBJECT_INT32_RULES = [
+	[PROJECT_XML_PROTOCOL.list.attrs.xy, 2],
+	[PROJECT_XML_PROTOCOL.list.attrs.size, 2],
+	[PROJECT_XML_PROTOCOL.list.attrs.restrictSize, 4]
+];
+const LIST_INT32_RULES = [
+	[PROJECT_XML_PROTOCOL.list.attrs.margin, 4],
+	[PROJECT_XML_PROTOCOL.list.attrs.scrollBarMargin, 4],
+	[PROJECT_XML_PROTOCOL.list.attrs.clipSoftness, 2]
+];
+function isProjectInt32(value) {
+	const trimmed = value.trim();
+	if (!/^[+-]?\d+$/.test(trimmed)) return false;
+	const parsed = BigInt(trimmed);
+	return parsed >= -2147483648n && parsed <= 2147483647n;
+}
+function hasInvalidProjectInt32Parts(value, partCount, allowSuffix = false) {
+	const parts = String(value).split(",");
+	if (allowSuffix ? parts.length < partCount : parts.length !== partCount) return true;
+	return parts.slice(0, partCount).some((part) => !isProjectInt32(part));
+}
+function validateComponentXmlGeometry(ctx, comp, sourcePath, componentNode) {
+	const addDiagnostics = (attrs, rules, path, nodeId) => {
+		for (const [spec, partCount] of rules) {
+			const value = readXmlAttr(attrs, spec);
+			if (value === void 0 || !hasInvalidProjectInt32Parts(value, partCount)) continue;
+			ctx.addDiagnostic({
+				severity: "error",
+				code: "desktop_incompatible_geometry",
+				path: `${path}.${spec.canonical}`,
+				message: `FairyGUI Desktop requires "${spec.canonical}" to contain ${partCount} signed 32-bit integer value(s); received ${JSON.stringify(String(value))}.`,
+				resourceId: comp.getId(),
+				...nodeId ? { nodeId } : {},
+				sourcePath
+			});
+		}
+	};
+	const componentPath = `components.${comp.getId()}`;
+	addDiagnostics(componentNode, COMPONENT_INT32_RULES, `${componentPath}.component`);
+	const displayList = getXmlNode(componentNode.displayList);
+	if (!displayList) return;
+	let nodeIndex = 0;
+	for (const [tagName, definitions] of Object.entries(displayList)) for (const definition of ensureArray(definitions)) {
+		const attrs = getXmlNode(definition);
+		if (!attrs) continue;
+		const nodeId = readXmlAttr(attrs, PROJECT_XML_PROTOCOL.displayObject.attrs.id);
+		const nodePath = `${componentPath}.displayList.${nodeIndex++}`;
+		addDiagnostics(attrs, DISPLAY_OBJECT_INT32_RULES, nodePath, nodeId);
+		const normalizedTagName = tagName.toLowerCase();
+		if (normalizedTagName === "list" || normalizedTagName === "tree") addDiagnostics(attrs, LIST_INT32_RULES, nodePath, nodeId);
+		for (const gearTag of ["gearXY", "gearSize"]) for (const [gearIndex, gearDefinition] of ensureArray(attrs[gearTag]).entries()) {
+			const gear = getXmlNode(gearDefinition);
+			if (!gear) continue;
+			for (const spec of [PROJECT_XML_PROTOCOL.gear.attrs.values, PROJECT_XML_PROTOCOL.gear.attrs.default]) {
+				const value = readXmlAttr(gear, spec);
+				if (value === void 0 || !String(value).split("|").some((segment) => segment.trim() !== "-" && hasInvalidProjectInt32Parts(segment, 2, true))) continue;
+				ctx.addDiagnostic({
+					severity: "error",
+					code: "desktop_incompatible_geometry",
+					path: `${nodePath}.${gearTag}.${gearIndex}.${spec.canonical}`,
+					message: `FairyGUI Desktop requires each "${gearTag}.${spec.canonical}" segment to start with two signed 32-bit integers; received ${JSON.stringify(String(value))}.`,
+					resourceId: comp.getId(),
+					...nodeId ? { nodeId } : {},
+					sourcePath
+				});
+			}
+		}
+	}
+}
 function assignSetting(settings, key, value) {
 	switch (key) {
 		case "publish":
@@ -20569,7 +20647,9 @@ var ProjectReader = class {
 				const compContent = await fs.readFile(compPath);
 				if (diagnostics) {
 					assertWellFormedXml(compContent);
-					if (!getXmlNode(parseXML(compContent).component)) throw new Error("Component XML must contain a component root element.");
+					const componentNode = getXmlNode(parseXML(compContent).component);
+					if (!componentNode) throw new Error("Component XML must contain a component root element.");
+					validateComponentXmlGeometry(ctx, comp, compPath, componentNode);
 				}
 				readComponentXml(ctx, comp, compContent);
 			} catch (err) {
@@ -21297,6 +21377,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);
 }
@@ -21354,7 +21445,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) => {
@@ -21365,12 +21456,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("|");
@@ -21390,10 +21492,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,
@@ -21401,7 +21503,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;
@@ -21431,8 +21533,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 {
@@ -21950,7 +22057,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}`);
@@ -21958,9 +22065,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");
@@ -22202,7 +22309,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}`);
@@ -22215,14 +22322,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);
@@ -22231,9 +22338,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?.();
@@ -22241,7 +22348,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) {
@@ -22271,7 +22378,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}`);
@@ -31403,7 +31510,7 @@ function registerValidateCommand(program) {
 //#region src/utils/package-version.ts
 const require$1 = createRequire(import.meta.url);
 function getInjectedPackageVersion() {
-	const version = "0.3.0-alpha.2";
+	const version = "0.3.0-alpha.3";
 	return typeof version === "string" && true ? version : null;
 }
 function readPackageVersion() {

package/package.json

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