@openfairygui/cli 0.2.0-alpha.7 → 0.2.0-alpha.9

package/dist/cli.mjs

@@ -1263,6 +1263,7 @@ var ImageResource = class extends ExtensibleProperty {
 			path: "",
 			branch: "",
 			branchItemIds: [],
+			highResolutionItemIds: [],
 			width: 0,
 			height: 0,
 			exported: false,
@@ -1309,6 +1310,12 @@ var ImageResource = class extends ExtensibleProperty {
 	setBranchItemIds(ids) {
 		return this.set("branchItemIds", [...ids]);
 	}
+	getHighResolutionItemIds() {
+		return [...this.get("highResolutionItemIds")];
+	}
+	setHighResolutionItemIds(ids) {
+		return this.set("highResolutionItemIds", [...ids]);
+	}
 	getWidth() {
 		return this.get("width");
 	}
@@ -1678,6 +1685,7 @@ var MovieClipResource = class extends ExtensibleProperty {
 			path: "",
 			branch: "",
 			branchItemIds: [],
+			highResolutionItemIds: [],
 			fileName: "",
 			exported: false,
 			width: 0,
@@ -1713,6 +1721,12 @@ var MovieClipResource = class extends ExtensibleProperty {
 	setBranchItemIds(ids) {
 		return this.set("branchItemIds", [...ids]);
 	}
+	getHighResolutionItemIds() {
+		return [...this.get("highResolutionItemIds")];
+	}
+	setHighResolutionItemIds(ids) {
+		return this.set("highResolutionItemIds", [...ids]);
+	}
 	getFileName() {
 		return this.get("fileName");
 	}
@@ -18404,11 +18418,13 @@ var BinaryReader = class {
 				if (branchCnt2 > 0) if (branchIncluded) branchItemIds = buf.readSArray(branchCnt2);
 				else branchItemIds = [buf.readS() ?? ""];
 				const highResCnt = buf.getUint8();
-				if (highResCnt > 0) buf.readSArray(highResCnt);
+				const highResolutionItemIds = [];
+				for (let highResIndex = 0; highResIndex < highResCnt; highResIndex++) highResolutionItemIds.push(buf.readS());
 				if (createdResource) {
 					createdResource.setPath(itemPath);
 					createdResource.setBranch(branchName);
 					createdResource.setBranchItemIds(branchItemIds);
+					createdResource.setHighResolutionItemIds?.(highResolutionItemIds);
 				}
 			}
 			buf.pos = nextPos;
@@ -20451,7 +20467,9 @@ var BinaryWriter = class {
 				data.writeSEx(branchName || null);
 				data.writeUint8(branchItemIds.length);
 				for (const branchItemId of branchItemIds) data.writeSEx(branchItemId || null);
-				data.writeUint8(0);
+				const highResolutionItemIds = getItemHighResolutionItemIds(res, publishedItemIdMap, packageItemIds);
+				data.writeUint8(highResolutionItemIds.length);
+				for (const highResolutionItemId of highResolutionItemIds) data.writeS(highResolutionItemId);
 			}
 			const nextPos = data.pos;
 			const savedPos = data.pos;
@@ -20722,6 +20740,15 @@ function getItemBranchItemIds(item, branchNames, branchItemIdsMap) {
 	if (!inferred) return [];
 	return inferred.some((value) => !!value) ? [...inferred] : [];
 }
+function getItemHighResolutionItemIds(item, publishedItemIdMap, packageItemIds) {
+	const resolvedIds = (item.getHighResolutionItemIds?.() ?? []).map((id) => {
+		if (!id) return null;
+		const publishedId = publishedItemIdMap.get(id) ?? id;
+		return packageItemIds.has(publishedId) ? publishedId : null;
+	});
+	while (resolvedIds.length > 0 && !resolvedIds[resolvedIds.length - 1]) resolvedIds.pop();
+	return resolvedIds;
+}
 function getAtlasId(atlas) {
 	return `atlas${atlas.getIndex()}`;
 }
@@ -21862,15 +21889,15 @@ function atlas(_options = {}) {
 			}
 			for (const res of orderedAllResources) if (isImageResource$1(res)) {
 				const resId = res.getId();
-				if (!res.getExported() && referencedIds.size > 0 && !referencedIds.has(resId)) continue;
+				if (selectedPublishIds.size === 0 && !res.getExported() && referencedIds.size > 0 && !referencedIds.has(resId)) continue;
 				await _collectImage(res, pkg, inputs, encoder, options, doTrim, logger);
 			} else if (isMovieClipResource$1(res)) {
 				const resId = res.getId();
-				if (!res.getExported() && referencedIds.size > 0 && !referencedIds.has(resId)) continue;
+				if (selectedPublishIds.size === 0 && !res.getExported() && referencedIds.size > 0 && !referencedIds.has(resId)) continue;
 				await _collectMovieClipFrames(doc, res, pkg, inputs, encoder, options, logger);
 			} else if (isFontResource$1(res)) {
 				const resId = res.getId();
-				if (!res.getExported() && referencedIds.size > 0 && !referencedIds.has(resId)) continue;
+				if (selectedPublishIds.size === 0 && !res.getExported() && referencedIds.size > 0 && !referencedIds.has(resId)) continue;
 				await _collectFontTexture(doc, res, pkg, options);
 			}
 			if (inputs.length === 0) continue;
@@ -23976,6 +24003,9 @@ function isImageResource(resource) {
 function isMovieClipResource(resource) {
 	return resource.propertyType === "MovieClipResource";
 }
+function isHighResolutionResource(resource) {
+	return isImageResource(resource) || isMovieClipResource(resource);
+}
 function isMiscResource(resource) {
 	return resource.propertyType === "MiscResource";
 }
@@ -24096,6 +24126,70 @@ function getBranchName(resource) {
 function buildBranchResourceKey(resource) {
 	return `${resource.propertyType}|${resource.getPath() ?? ""}|${resource.getName() ?? ""}`;
 }
+const HIGH_RESOLUTION_LEVELS = [
+	{
+		scale: 2,
+		bit: 1,
+		slot: 0
+	},
+	{
+		scale: 3,
+		bit: 2,
+		slot: 1
+	},
+	{
+		scale: 4,
+		bit: 4,
+		slot: 2
+	}
+];
+function buildHighResolutionResourceKey(resource, name = resource.getName()) {
+	return `${resource.propertyType}|${resource.getBranch?.() ?? ""}|${resource.getPath() ?? ""}|${name}`;
+}
+function isHighResolutionVariantName(name) {
+	return /@(?:2|3|4)x(?:\.[^./\\]+)?$/iu.test(name);
+}
+function appendHighResolutionScaleToName(name, scale) {
+	const extensionIndex = name.lastIndexOf(".");
+	if (extensionIndex > 0) return `${name.slice(0, extensionIndex)}@${scale}x${name.slice(extensionIndex)}`;
+	return `${name}@${scale}x`;
+}
+function trimTrailingMissingHighResolutionIds(ids) {
+	while (ids.length > 0 && !ids[ids.length - 1]) ids.pop();
+	return ids;
+}
+function collectHighResolutionItemIds(resources, publishedResourceIds, includeHighResolution) {
+	const result = /* @__PURE__ */ new Map();
+	if (includeHighResolution <= 0) return result;
+	const highResolutionResourceByKey = /* @__PURE__ */ new Map();
+	for (const resource of resources) {
+		if (!isHighResolutionResource(resource)) continue;
+		highResolutionResourceByKey.set(buildHighResolutionResourceKey(resource), resource);
+	}
+	for (const resource of resources) {
+		if (!isHighResolutionResource(resource)) continue;
+		if (!publishedResourceIds.has(resource.getId())) continue;
+		if (isHighResolutionVariantName(resource.getName())) continue;
+		const ids = [];
+		for (const level of HIGH_RESOLUTION_LEVELS) {
+			if ((includeHighResolution & level.bit) === 0) {
+				ids[level.slot] = null;
+				continue;
+			}
+			const highResolutionResource = highResolutionResourceByKey.get(buildHighResolutionResourceKey(resource, appendHighResolutionScaleToName(resource.getName(), level.scale)));
+			if (!highResolutionResource) {
+				ids[level.slot] = null;
+				continue;
+			}
+			const highResolutionId = highResolutionResource.getId();
+			publishedResourceIds.add(highResolutionId);
+			ids[level.slot] = highResolutionId;
+		}
+		trimTrailingMissingHighResolutionIds(ids);
+		if (ids.length > 0) result.set(resource.getId(), ids);
+	}
+	return result;
+}
 function collectPackagePublishContext(pkg, options) {
 	const pkgId = pkg.getId();
 	const resources = pkg.listResources();
@@ -24199,6 +24293,7 @@ function collectPackagePublishContext(pkg, options) {
 			}
 		}
 	}
+	const highResolutionItemIds = collectHighResolutionItemIds(resources, publishedResourceIds, options.includeHighResolution);
 	if (!options.includeBranches) {
 		const mainByKey = /* @__PURE__ */ new Map();
 		const activeBranchByKey = /* @__PURE__ */ new Map();
@@ -24247,6 +24342,7 @@ function collectPackagePublishContext(pkg, options) {
 			referencedIds,
 			publishedResourceIds,
 			pixelHitTestImageIds,
+			highResolutionItemIds,
 			effectiveResourceIds,
 			includeBranches: false
 		};
@@ -24255,6 +24351,7 @@ function collectPackagePublishContext(pkg, options) {
 		referencedIds,
 		publishedResourceIds,
 		pixelHitTestImageIds,
+		highResolutionItemIds,
 		effectiveResourceIds: new Map([...publishedResourceIds].map((resourceId) => [resourceId, resourceId])),
 		includeBranches: true
 	};
@@ -24303,8 +24400,11 @@ async function applyPixelHitTests(pkg, imageIds, basePath, encoder) {
 	}
 }
 async function annotatePackagePublishArtifacts(pkg, basePath, encoder, options) {
-	const { publishedResourceIds, pixelHitTestImageIds, effectiveResourceIds, includeBranches } = collectPackagePublishContext(pkg, options);
-	for (const resource of pkg.listResources()) setPublishedIdExtra(resource, effectiveResourceIds.get(resource.getId()) ?? null);
+	const { publishedResourceIds, pixelHitTestImageIds, highResolutionItemIds, effectiveResourceIds, includeBranches } = collectPackagePublishContext(pkg, options);
+	for (const resource of pkg.listResources()) {
+		setPublishedIdExtra(resource, effectiveResourceIds.get(resource.getId()) ?? null);
+		if (isHighResolutionResource(resource)) resource.setHighResolutionItemIds(highResolutionItemIds.get(resource.getId()) ?? []);
+	}
 	await applyPixelHitTests(pkg, pixelHitTestImageIds, basePath, encoder);
 	const extras = pkg.getExtras() ?? {};
 	pkg.setExtras({
@@ -24441,6 +24541,7 @@ function publish(options) {
 		}
 		const includeBranches = (publishSettings.branchProcessing ?? 0) === 0;
 		const activeBranch = includeBranches ? "" : options.branch ?? "";
+		const includeHighResolution = publishSettings.includeHighResolution ?? 0;
 		const atlasRuntimeOptions = resolvePublishAtlasRuntimeOptions(ext);
 		const allDocPackages = root.listPackages();
 		const pkgMap = /* @__PURE__ */ new Map();
@@ -24449,7 +24550,8 @@ function publish(options) {
 			_computeDependencies(pkg, pkgMap);
 			await annotatePackagePublishArtifacts(pkg, options.basePath, options.encoder, {
 				includeBranches,
-				activeBranch
+				activeBranch,
+				includeHighResolution
 			});
 		}
 		await atlas({

package/package.json

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