@openfairygui/cli 0.2.0-alpha.32 → 0.2.0-alpha.33

package/dist/cli.mjs

@@ -12490,6 +12490,10 @@ var ProjectReader = class {
 		if (!desc) return;
 		let pkg = ctx.document.getRoot().getPackage(dirName);
 		if (!pkg) pkg = ctx.document.createPackage(dirName);
+		pkg.setExtras({
+			...pkg.getExtras(),
+			_preservePackageResourceOrder: true
+		});
 		if (!branchName) {
 			const packageId = readXmlAttr(desc, PROJECT_XML_PROTOCOL.packageDescription.attrs.id) || "";
 			pkg.setId(packageId);
@@ -14221,8 +14225,9 @@ var ProjectWriter = class {
 			return attrs;
 		});
 		if (publishAtlases.length > 0) publishAttrs.atlas = publishAtlases;
+		const preserveResourceOrder = pkg.getExtras()._preservePackageResourceOrder === true;
 		const packageDescriptorPath = fs.join(pkgDir, "package.xml");
-		await fs.writeFile(packageDescriptorPath, this._renderPackageDescriptionXml(packageDescriptionAttrs, mainFolders, mainResources, publishAttrs));
+		await fs.writeFile(packageDescriptorPath, this._renderPackageDescriptionXml(packageDescriptionAttrs, mainFolders, mainResources, publishAttrs, preserveResourceOrder));
 		currentSourceFilePaths.add(packageDescriptorPath);
 		await this._writeResourceFolders(mainFolders, pkgDir, currentResourceFolderPaths);
 		for (const comp of mainResources.filter((resource) => resource.propertyType === "Component")) {
@@ -14239,7 +14244,7 @@ var ProjectWriter = class {
 			const branchPkgDir = fs.join(basePath, `assets_${branchName}`, pkg.getName());
 			await fs.mkdir(branchPkgDir);
 			const branchDescriptorPath = fs.join(branchPkgDir, "package_branch.xml");
-			await fs.writeFile(branchDescriptorPath, this._renderBranchDescriptionXml(branchFolders, branchResources));
+			await fs.writeFile(branchDescriptorPath, this._renderBranchDescriptionXml(branchFolders, branchResources, preserveResourceOrder));
 			currentSourceFilePaths.add(branchDescriptorPath);
 			await this._writeResourceFolders(branchFolders, branchPkgDir, currentResourceFolderPaths);
 			for (const comp of branchResources.filter((resource) => resource.propertyType === "Component")) {
@@ -14364,14 +14369,14 @@ var ProjectWriter = class {
 		if (segments.some((segment) => segment === "." || segment === ".." || segment.includes(":"))) throw new Error(`Invalid project source path "${value}".`);
 		return segments.join("/");
 	}
-	_renderPackageDescriptionXml(packageDescriptionAttrs, folders, resources, publishAttrs) {
+	_renderPackageDescriptionXml(packageDescriptionAttrs, folders, resources, publishAttrs, preserveResourceOrder) {
 		const publishNodeAttrs = Object.fromEntries(Object.entries(publishAttrs).filter(([key]) => key !== "atlas"));
 		const lines = [
 			"<?xml version=\"1.0\" encoding=\"utf-8\"?>",
 			`<packageDescription${renderXmlAttrs(packageDescriptionAttrs)}>`,
 			"  <resources>",
 			...this._renderPackageResourceFolderLines(folders, "    "),
-			...this._renderPackageResourceLines(resources, "    "),
+			...this._renderPackageResourceLines(resources, "    ", preserveResourceOrder),
 			"  </resources>",
 			`  <publish${renderXmlAttrs(publishNodeAttrs)}>`
 		];
@@ -14381,13 +14386,13 @@ var ProjectWriter = class {
 		lines.push("</packageDescription>");
 		return `${lines.join("\n")}\n`;
 	}
-	_renderBranchDescriptionXml(folders, resources) {
+	_renderBranchDescriptionXml(folders, resources, preserveResourceOrder) {
 		return `${[
 			"<?xml version=\"1.0\" encoding=\"utf-8\"?>",
 			"<branchDescription>",
 			"  <resources>",
 			...this._renderPackageResourceFolderLines(folders, "    "),
-			...this._renderPackageResourceLines(resources, "    "),
+			...this._renderPackageResourceLines(resources, "    ", preserveResourceOrder),
 			"  </resources>",
 			"</branchDescription>"
 		].join("\n")}\n`;
@@ -14404,17 +14409,15 @@ var ProjectWriter = class {
 			return `${indent}<folder${renderXmlAttrs(attrs)}/>`;
 		});
 	}
-	_renderPackageResourceLines(resources, indent) {
-		return this._orderedPackageResources(resources).map((resource) => {
+	_renderPackageResourceLines(resources, indent, preserveResourceOrder) {
+		return this._orderedPackageResources(resources, preserveResourceOrder).map((resource) => {
 			const serialized = this._serializePackageResourceEntry(resource);
 			if (!serialized) return null;
 			return `${indent}<${serialized.tagName}${renderXmlAttrs(serialized.attrs)}/>`;
 		}).filter((line) => !!line);
 	}
-	_orderedPackageResources(resources) {
-		const original = [...resources].sort((a, b) => {
-			return compareResourceIdSequence(a.getId?.() ?? "", b.getId?.() ?? "");
-		});
+	_orderedPackageResources(resources, preserveResourceOrder) {
+		const original = preserveResourceOrder ? [...resources] : [...resources].sort((a, b) => compareResourceIdSequence(a.getId?.() ?? "", b.getId?.() ?? ""));
 		const syntheticAfter = /* @__PURE__ */ new Map();
 		const trailing = [];
 		for (const resource of original) {

package/package.json

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