@openfairygui/cli 0.2.0-alpha.36 → 0.2.0-alpha.37

package/dist/cli.mjs

@@ -9503,6 +9503,11 @@ const preserveOrderParser = new XMLParser({
 	...defaultOptions,
 	preserveOrder: true
 });
+const rawPreserveOrderParser = new XMLParser({
+	...defaultOptions,
+	preserveOrder: true,
+	trimValues: false
+});
 function escapeXmlAttr(value) {
 	return String(value).replace(/&/g, "&amp;").replace(/\r\n/g, "&#xA;").replace(/[\r\n]/g, "&#xA;").replace(/\t/g, "&#x9;").replace(/"/g, "&quot;").replace(/'/g, "&apos;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
@@ -9521,6 +9526,9 @@ function parseXML(xml) {
 function parseXMLPreserveOrder(xml) {
 	return preserveOrderParser.parse(xml);
 }
+function parseXMLPreserveOrderRaw(xml) {
+	return rawPreserveOrderParser.parse(xml);
+}
 function parseXYString(v) {
 	if (!v) return [0, 0];
 	const parts = v.split(",");
@@ -18298,38 +18306,57 @@ function appendOrderedValue(target, key, value) {
 	}
 	target[key] = [current, value];
 }
-function normalizeOrderedChildren(entries) {
+function getOrderedElementEntries(entries) {
+	return entries.filter((entry) => Object.keys(entry).some((key) => key !== ":@" && key !== "#text"));
+}
+function normalizeOrderedChildren(entries, rawEntries = []) {
 	const out = {};
-	for (const entry of entries) {
+	const elements = getOrderedElementEntries(entries);
+	const rawElements = getOrderedElementEntries(rawEntries);
+	for (const [index, entry] of elements.entries()) {
 		const attrs = entry[":@"] ?? {};
+		const rawEntry = rawElements[index] ?? {};
+		const rawAttrs = rawEntry[":@"] ?? {};
 		for (const [tagName, value] of Object.entries(entry)) {
 			if (tagName === ":@" || tagName === "#text") continue;
-			const normalizedChildren = normalizeOrderedChildren(Array.isArray(value) ? value : []);
-			appendOrderedValue(out, tagName, Object.keys(normalizedChildren).length > 0 ? {
+			const normalizedChildren = normalizeOrderedChildren(Array.isArray(value) ? value : [], Array.isArray(rawEntry[tagName]) ? rawEntry[tagName] : []);
+			const normalizedAttrs = tagName === "property" && typeof rawAttrs.value === "string" ? {
 				...attrs,
+				value: rawAttrs.value
+			} : attrs;
+			appendOrderedValue(out, tagName, Object.keys(normalizedChildren).length > 0 ? {
+				...normalizedAttrs,
 				...normalizedChildren
-			} : { ...attrs });
+			} : { ...normalizedAttrs });
 		}
 	}
 	return out;
 }
 function getOrderedDisplayListItems(xmlContent) {
-	const componentEntry = parseXMLPreserveOrder(xmlContent).find((entry) => "component" in entry);
+	const ordered = parseXMLPreserveOrder(xmlContent);
+	const rawOrdered = parseXMLPreserveOrderRaw(xmlContent);
+	const componentEntry = ordered.find((entry) => "component" in entry);
+	const rawComponentEntry = rawOrdered.find((entry) => "component" in entry);
 	if (!componentEntry) return [];
 	const displayListEntry = (Array.isArray(componentEntry.component) ? componentEntry.component : []).find((entry) => "displayList" in entry);
+	const rawDisplayListEntry = (Array.isArray(rawComponentEntry?.component) ? rawComponentEntry.component : []).find((entry) => "displayList" in entry);
 	if (!displayListEntry) return [];
-	return (Array.isArray(displayListEntry.displayList) ? displayListEntry.displayList : []).flatMap((entry) => {
+	const displayListChildren = Array.isArray(displayListEntry.displayList) ? getOrderedElementEntries(displayListEntry.displayList) : [];
+	const rawDisplayListChildren = Array.isArray(rawDisplayListEntry?.displayList) ? getOrderedElementEntries(rawDisplayListEntry.displayList) : [];
+	return displayListChildren.flatMap((entry, index) => {
 		const rawTagName = Object.keys(entry).find((key) => key !== ":@" && key !== "#text");
 		if (!rawTagName) return [];
 		const attrs = entry[":@"] ?? {};
 		const nestedEntries = Array.isArray(entry[rawTagName]) ? entry[rawTagName] : [];
+		const rawEntry = rawDisplayListChildren[index] ?? {};
+		const rawNestedEntries = Array.isArray(rawEntry[rawTagName]) ? rawEntry[rawTagName] : [];
 		const rawAttrs = readRawDisplayListAttrs(xmlContent, rawTagName, attrs.id);
 		return [{
 			tagName: rawTagName.toLowerCase(),
 			attrs: {
 				...rawAttrs,
 				...attrs,
-				...normalizeOrderedChildren(nestedEntries)
+				...normalizeOrderedChildren(nestedEntries, rawNestedEntries)
 			}
 		}];
 	});

package/package.json

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