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

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.3`;
+const VERSION = `v0.3.0-alpha.4`;
 /** Binary package file magic number: "FGUI" as uint32. */
 const FGUI_MAGIC = 1179080009;
 /** Null string index in the binary string table. */
@@ -19366,8 +19366,8 @@ function createDisplayObject$1(ctx, doc, tagName, attrs, localControllers) {
 			const groupLayout = readXmlAttr(attrs, PROJECT_XML_PROTOCOL.group.attrs.layout);
 			if (groupLayout) g.setLayout({
 				none: 0,
-				horizontal: 1,
-				vertical: 2
+				hz: 1,
+				vt: 2
 			}[groupLayout] ?? 0);
 			const groupLineGap = readXmlAttr(attrs, PROJECT_XML_PROTOCOL.group.attrs.lineGap);
 			if (groupLineGap !== void 0) g.setLineGap(parseInt2(groupLineGap));
@@ -20472,12 +20472,53 @@ function isProjectInt32(value) {
 	const parsed = BigInt(trimmed);
 	return parsed >= -2147483648n && parsed <= 2147483647n;
 }
+function isProjectFiniteNumber(value) {
+	const trimmed = value.trim();
+	return /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$/.test(trimmed) && Number.isFinite(Number(trimmed));
+}
+function isProjectBoolean(value) {
+	return [
+		"true",
+		"false",
+		"1",
+		"0"
+	].includes(value.trim());
+}
 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) {
+function validateComponentXmlValues(ctx, comp, sourcePath, componentNode) {
+	const addInvalidValue = (attrs, spec, path, expectation, isValid, nodeId) => {
+		if (!spec) return;
+		const value = readXmlAttr(attrs, spec);
+		if (value === void 0 || isValid(String(value))) return;
+		ctx.addDiagnostic({
+			severity: "error",
+			code: "invalid_project_value",
+			path: `${path}.${spec.canonical}`,
+			message: `Attribute "${spec.canonical}" must be ${expectation}; received ${JSON.stringify(String(value))}.`,
+			resourceId: comp.getId(),
+			...nodeId ? { nodeId } : {},
+			sourcePath
+		});
+	};
+	const validateBooleanAttrs = (attrs, specs, path, nodeId) => {
+		for (const spec of specs) addInvalidValue(attrs, spec, path, "true, false, 1, or 0", isProjectBoolean, nodeId);
+	};
+	const validateInt32Attrs = (attrs, specs, path, nodeId) => {
+		for (const spec of specs) addInvalidValue(attrs, spec, path, "a signed 32-bit integer", isProjectInt32, nodeId);
+	};
+	const validateNumberTuple = (attrs, spec, partCount, path, nodeId) => {
+		addInvalidValue(attrs, spec, path, `exactly ${partCount} finite number(s)`, (value) => {
+			const parts = value.split(",");
+			return parts.length === partCount && parts.every(isProjectFiniteNumber);
+		}, nodeId);
+	};
+	const validateEnum = (attrs, spec, values, path, nodeId) => {
+		addInvalidValue(attrs, spec, path, `one of ${values.map((value) => JSON.stringify(value)).join(", ")}`, (value) => values.includes(value.trim()), nodeId);
+	};
 	const addDiagnostics = (attrs, rules, path, nodeId) => {
 		for (const [spec, partCount] of rules) {
 			const value = readXmlAttr(attrs, spec);
@@ -20494,7 +20535,38 @@ function validateComponentXmlGeometry(ctx, comp, sourcePath, componentNode) {
 		}
 	};
 	const componentPath = `components.${comp.getId()}`;
-	addDiagnostics(componentNode, COMPONENT_INT32_RULES, `${componentPath}.component`);
+	const rootPath = `${componentPath}.component`;
+	const rootAttrs = PROJECT_XML_PROTOCOL.componentRoot.attrs;
+	addDiagnostics(componentNode, COMPONENT_INT32_RULES, rootPath);
+	validateBooleanAttrs(componentNode, [
+		rootAttrs.anchor,
+		rootAttrs.opaque,
+		rootAttrs.reversedMask,
+		rootAttrs.bgColorEnabled
+	], rootPath);
+	validateInt32Attrs(componentNode, [
+		rootAttrs.scrollBarFlags,
+		rootAttrs.designImageAlpha,
+		rootAttrs.designImageLayer,
+		rootAttrs.idnum
+	], rootPath);
+	validateNumberTuple(componentNode, rootAttrs.pivot, 2, rootPath);
+	validateEnum(componentNode, rootAttrs.overflow, [
+		"visible",
+		"hidden",
+		"scroll"
+	], rootPath);
+	validateEnum(componentNode, rootAttrs.scroll, [
+		"horizontal",
+		"vertical",
+		"both"
+	], rootPath);
+	validateEnum(componentNode, rootAttrs.scrollBar, [
+		"default",
+		"visible",
+		"auto",
+		"hidden"
+	], rootPath);
 	const displayList = getXmlNode(componentNode.displayList);
 	if (!displayList) return;
 	let nodeIndex = 0;
@@ -20505,7 +20577,209 @@ function validateComponentXmlGeometry(ctx, comp, sourcePath, componentNode) {
 		const nodePath = `${componentPath}.displayList.${nodeIndex++}`;
 		addDiagnostics(attrs, DISPLAY_OBJECT_INT32_RULES, nodePath, nodeId);
 		const normalizedTagName = tagName.toLowerCase();
+		const displayAttrs = (Object.entries(PROJECT_XML_PROTOCOL.componentRoot.containers?.displayList?.items ?? {}).find(([name]) => name.toLowerCase() === normalizedTagName)?.[1])?.attrs;
+		if (displayAttrs) {
+			validateBooleanAttrs(attrs, [
+				displayAttrs.locked,
+				displayAttrs.aspect,
+				displayAttrs.anchor,
+				displayAttrs.visible,
+				displayAttrs.touchable,
+				displayAttrs.grayed
+			], nodePath, nodeId);
+			for (const spec of [
+				displayAttrs.pivot,
+				displayAttrs.scale,
+				displayAttrs.skew
+			]) validateNumberTuple(attrs, spec, 2, nodePath, nodeId);
+			addInvalidValue(attrs, displayAttrs.rotation, nodePath, "a finite number", isProjectFiniteNumber, nodeId);
+			addInvalidValue(attrs, displayAttrs.alpha, nodePath, "a finite number between 0 and 1", (value) => isProjectFiniteNumber(value) && Number(value) >= 0 && Number(value) <= 1, nodeId);
+		}
 		if (normalizedTagName === "list" || normalizedTagName === "tree") addDiagnostics(attrs, LIST_INT32_RULES, nodePath, nodeId);
+		if (displayAttrs && [
+			"text",
+			"richtext",
+			"inputtext"
+		].includes(normalizedTagName)) {
+			validateBooleanAttrs(attrs, [
+				displayAttrs.input,
+				displayAttrs.singleLine,
+				displayAttrs.autoClearText,
+				displayAttrs.vars,
+				displayAttrs.ubb,
+				displayAttrs.underline,
+				displayAttrs.italic,
+				displayAttrs.bold,
+				displayAttrs.strikethrough,
+				displayAttrs.password
+			], nodePath, nodeId);
+			validateInt32Attrs(attrs, [
+				displayAttrs.leading,
+				displayAttrs.letterSpacing,
+				displayAttrs.maxLength,
+				displayAttrs.keyboardType
+			], nodePath, nodeId);
+			addInvalidValue(attrs, displayAttrs.fontSize, nodePath, "a positive signed 32-bit integer", (value) => isProjectInt32(value) && BigInt(value.trim()) > 0n, nodeId);
+			for (const spec of [
+				displayAttrs.strokeSize,
+				displayAttrs.faceDilate,
+				displayAttrs.underlaySoftness
+			]) addInvalidValue(attrs, spec, nodePath, "a finite number", isProjectFiniteNumber, nodeId);
+			validateNumberTuple(attrs, displayAttrs.shadowOffset, 2, nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.align, [
+				"left",
+				"center",
+				"right"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.vAlign, [
+				"top",
+				"middle",
+				"bottom"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.autoSize, [
+				"none",
+				"both",
+				"height",
+				"shrink",
+				"ellipsis"
+			], nodePath, nodeId);
+		}
+		if (displayAttrs && (normalizedTagName === "list" || normalizedTagName === "tree")) {
+			validateBooleanAttrs(attrs, [
+				displayAttrs.autoResizeItem,
+				displayAttrs.treeView,
+				displayAttrs.autoClearItems,
+				displayAttrs.scrollItemToViewOnClick,
+				displayAttrs.foldInvisibleItems
+			], nodePath, nodeId);
+			validateInt32Attrs(attrs, [
+				displayAttrs.lineGap,
+				displayAttrs.columnGap,
+				displayAttrs.lineItemCount,
+				displayAttrs.lineItemCount2,
+				displayAttrs.apexIndex,
+				displayAttrs.scrollBarFlags,
+				displayAttrs.indent,
+				displayAttrs.clickToExpand
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.layout, [
+				"singleColumn",
+				"singleRow",
+				"flowHorizontal",
+				"flowVertical",
+				"pagination",
+				"single_column",
+				"single_row",
+				"flow_hz",
+				"flow_vt",
+				"column",
+				"row"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.align, [
+				"left",
+				"center",
+				"right"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.vAlign, [
+				"top",
+				"middle",
+				"bottom"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.childrenRenderOrder, [
+				"ascent",
+				"descent",
+				"arch"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.selectionMode, [
+				"single",
+				"multiple",
+				"multipleSingleClick",
+				"none"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.overflow, [
+				"visible",
+				"hidden",
+				"scroll"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.scroll, [
+				"horizontal",
+				"vertical",
+				"both"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.scrollBar, [
+				"default",
+				"visible",
+				"auto",
+				"hidden"
+			], nodePath, nodeId);
+		}
+		if (displayAttrs && normalizedTagName === "group") {
+			validateBooleanAttrs(attrs, [
+				displayAttrs.advanced,
+				displayAttrs.excludeInvisibles,
+				displayAttrs.autoSizeDisabled
+			], nodePath, nodeId);
+			validateInt32Attrs(attrs, [
+				displayAttrs.lineGap,
+				displayAttrs.columnGap,
+				displayAttrs.mainGridIndex
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.layout, [
+				"none",
+				"hz",
+				"vt"
+			], nodePath, nodeId);
+		}
+		if (displayAttrs && [
+			"image",
+			"loader",
+			"loader3d"
+		].includes(normalizedTagName)) {
+			validateBooleanAttrs(attrs, [
+				displayAttrs.fillClockwise,
+				displayAttrs.shrinkOnly,
+				displayAttrs.autoSize,
+				displayAttrs.useResize,
+				displayAttrs.playing,
+				displayAttrs.loop,
+				displayAttrs.clearOnPublish
+			], nodePath, nodeId);
+			validateInt32Attrs(attrs, [
+				displayAttrs.frame,
+				displayAttrs.fillOrigin,
+				displayAttrs.fillAmount
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.align, [
+				"left",
+				"center",
+				"right"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.vAlign, [
+				"top",
+				"middle",
+				"bottom"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.fill, [
+				"none",
+				"scale",
+				"scaleMatchHeight",
+				"scaleMatchWidth",
+				"scaleFree",
+				"scaleNoBorder"
+			], nodePath, nodeId);
+			validateEnum(attrs, displayAttrs.fillMethod, [
+				"none",
+				"hz",
+				"vt",
+				"radial90",
+				"radial180",
+				"radial360"
+			], nodePath, nodeId);
+		}
+		if (displayAttrs && (normalizedTagName === "movieclip" || normalizedTagName === "jta")) {
+			validateBooleanAttrs(attrs, [displayAttrs.playing], nodePath, nodeId);
+			validateInt32Attrs(attrs, [displayAttrs.frame], nodePath, nodeId);
+		}
 		for (const gearTag of ["gearXY", "gearSize"]) for (const [gearIndex, gearDefinition] of ensureArray(attrs[gearTag]).entries()) {
 			const gear = getXmlNode(gearDefinition);
 			if (!gear) continue;
@@ -20649,7 +20923,7 @@ var ProjectReader = class {
 					assertWellFormedXml(compContent);
 					const componentNode = getXmlNode(parseXML(compContent).component);
 					if (!componentNode) throw new Error("Component XML must contain a component root element.");
-					validateComponentXmlGeometry(ctx, comp, compPath, componentNode);
+					validateComponentXmlValues(ctx, comp, compPath, componentNode);
 				}
 				readComponentXml(ctx, comp, compContent);
 			} catch (err) {
@@ -21970,8 +22244,8 @@ function serializeChild(obj) {
 		const layout = typedObj.getLayout?.();
 		if (layout !== void 0 && layout !== 0) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.group.attrs.layout, {
 			0: "none",
-			1: "horizontal",
-			2: "vertical"
+			1: "hz",
+			2: "vt"
 		}[layout] ?? "none");
 		const lineGap = typedObj.getLineGap?.() ?? 0;
 		if (lineGap !== 0) writeXmlAttr(attrs, PROJECT_XML_PROTOCOL.group.attrs.lineGap, String(lineGap));
@@ -31510,7 +31784,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.3";
+	const version = "0.3.0-alpha.4";
 	return typeof version === "string" && true ? version : null;
 }
 function readPackageVersion() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfairygui/cli",
-  "version": "0.3.0-alpha.3",
+  "version": "0.3.0-alpha.4",
   "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.3",
-    "@openfairygui/core": "0.3.0-alpha.3"
+    "@openfairygui/core": "0.3.0-alpha.4",
+    "@openfairygui/functions": "0.3.0-alpha.4"
   },
   "dependencies": {
     "commander": "^14.0.2",
     "jiti": "^2.7.0",
-    "@openfairygui/backend": "0.3.0-alpha.3"
+    "@openfairygui/backend": "0.3.0-alpha.4"
   },
   "optionalDependencies": {
     "sharp": ">=0.33.0"