@openfairygui/functions 0.2.4 → 0.2.6

package/src/publish/resource-references.ts

@@ -3,7 +3,9 @@ import type { HasOptionalFont } from '../shared-types.js';
 
 interface ReferenceItem {
 	icon?: string | null;
+	selectedIcon?: string | null;
 	url?: string | null;
+	propertyOverrides?: Array<{ value: string }>;
 }
 
 interface ReferenceGear {
@@ -24,6 +26,7 @@ interface ReferenceChild extends HasOptionalFont {
 	getPackageId?(): string;
 	getSrc?(): string;
 	getUrl?(): string;
+	getClearOnPublish?(): boolean;
 	getInstanceSound?(): string;
 	getDefaultItem?(): string;
 	getIcon?(): string;
@@ -31,6 +34,7 @@ interface ReferenceChild extends HasOptionalFont {
 	getDropdown?(): string;
 	getSound?(): string;
 	getText?(): string;
+	getAutoClearText?(): boolean;
 	getInstanceIcon?(): string;
 	getInstanceSelectedIcon?(): string;
 	getVtScrollBarRes?(): string;
@@ -38,7 +42,10 @@ interface ReferenceChild extends HasOptionalFont {
 	getHeaderRes?(): string;
 	getFooterRes?(): string;
 	getInstanceComboItems?(): Array<{ icon: string | null }>;
+	getInstanceAutoClearItems?(): boolean;
 	getListItems?(): ReferenceItem[];
+	getAutoClearItems?(): boolean;
+	getPropertyOverrides?(): Array<{ value: string }>;
 	listGears?(): ReferenceGear[];
 }
 
@@ -130,7 +137,7 @@ function collectComponentReferences(
 	ownerPackageId: string,
 	component: Component,
 ): void {
-	const referenceComponent = component as Component & ReferenceComponent;
+	const referenceComponent = component as unknown as ReferenceComponent;
 	for (const child of referenceComponent.listChildren()) {
 		const sourceId = child.getSrc?.();
 		if (sourceId) {
@@ -141,9 +148,9 @@ function collectComponentReferences(
 		if (sourcePackageId && sourcePackageId !== ownerPackageId) target.packageIds.add(sourcePackageId);
 
 		addFontReferences(target, ownerPackageId, child.getFont?.());
-		addTextReferences(target, ownerPackageId, child.getText?.());
+		if (!child.getAutoClearText?.()) addTextReferences(target, ownerPackageId, child.getText?.());
 		for (const reference of [
-			child.getUrl?.(),
+			child.getClearOnPublish?.() ? undefined : child.getUrl?.(),
 			child.getDefaultItem?.(),
 			child.getIcon?.(),
 			child.getSelectedIcon?.(),
@@ -159,13 +166,20 @@ function collectComponentReferences(
 		]) {
 			addUiReference(target, ownerPackageId, reference);
 		}
-		for (const item of child.getInstanceComboItems?.() ?? []) {
+		for (const item of child.getInstanceAutoClearItems?.() ? [] : (child.getInstanceComboItems?.() ?? [])) {
 			addUiReference(target, ownerPackageId, item.icon);
 		}
-		for (const item of child.getListItems?.() ?? []) {
+		for (const item of child.getAutoClearItems?.() ? [] : (child.getListItems?.() ?? [])) {
 			addUiReference(target, ownerPackageId, item.icon);
+			addUiReference(target, ownerPackageId, item.selectedIcon);
 			addUiReference(target, ownerPackageId, item.url);
+			addUnknownReferences(target, ownerPackageId, item.propertyOverrides?.map((property) => property.value));
 		}
+		addUnknownReferences(
+			target,
+			ownerPackageId,
+			child.getPropertyOverrides?.().map((property) => property.value),
+		);
 		for (const gear of child.listGears?.() ?? []) {
 			addUnknownReferences(target, ownerPackageId, gear.getValues?.());
 			addUnknownReferences(target, ownerPackageId, gear.getDefaultValue?.());
@@ -201,8 +215,9 @@ export function collectPackageResourceReferences(pkg: Package): PackageResourceR
 		localResourceIds: new Set<string>(),
 		packageIds: new Set<string>(),
 	};
+	const excludedResourceIds = new Set(pkg.getSourceAtlasSettings().excludedResourceIds);
 	for (const resource of pkg.listResources()) {
-		if (resource.propertyType === 'Component') {
+		if (resource.propertyType === 'Component' && !excludedResourceIds.has(resource.getId())) {
 			collectComponentReferences(references, pkg.getId(), resource);
 		}
 	}

package/src/publish.ts

@@ -5,6 +5,7 @@ import {
 	type FileSystem,
 	type MovieClipResource,
 	type Package,
+	ProjectType,
 	type Transform,
 } from '@openfairygui/core';
 import { atlas } from './atlas.js';
@@ -194,6 +195,26 @@ export function publish(options: PublishOptions): Transform {
 				}
 			}
 			const publishName = pkg.getPublishName() || pkg.getName();
+			const sourceAtlas = pkg.getSourceAtlasSettings();
+			const usePackageAtlas = !sourceAtlas.useGlobal;
+			const atlas: ResolvedPublishAtlasOptions = {
+				...config.atlas,
+				maxSize: options.atlas?.maxSize ?? (usePackageAtlas ? sourceAtlas.maxSize : config.atlas.maxSize),
+				allowRotation: config.projectType === ProjectType.LayaBox
+					? false
+					: (options.atlas?.allowRotation ?? (usePackageAtlas ? sourceAtlas.allowRotation : config.atlas.allowRotation)),
+				powerOfTwo: options.atlas?.powerOfTwo
+					?? (usePackageAtlas ? sourceAtlas.sizeOption === 'pot' : config.atlas.powerOfTwo),
+				maxAtlasIndex: options.atlas?.maxAtlasIndex ?? sourceAtlas.maxIndex,
+				multipleOfFour: options.atlas?.multipleOfFour
+					?? (usePackageAtlas ? sourceAtlas.sizeOption === 'mof' : config.atlas.multipleOfFour),
+				square: options.atlas?.square ?? (usePackageAtlas ? sourceAtlas.forceSquare : config.atlas.square),
+				multiPage: options.atlas?.multiPage ?? (usePackageAtlas ? sourceAtlas.paging : config.atlas.multiPage),
+				extractAlpha: config.projectType === ProjectType.Unity && (
+					options.atlas?.extractAlpha
+					?? (usePackageAtlas || sourceAtlas.extractAlpha ? sourceAtlas.extractAlpha : config.atlas.extractAlpha)
+				),
+			};
 
 			return {
 				pkg,
@@ -206,7 +227,7 @@ export function publish(options: PublishOptions): Transform {
 				activeBranch: config.activeBranch,
 				includeHighResolution: config.includeHighResolution,
 				separatedAtlasForBranch: config.separatedAtlasForBranch,
-				atlas: config.atlas,
+				atlas,
 			};
 		};
 
@@ -255,7 +276,6 @@ export function publish(options: PublishOptions): Transform {
 			const atlasRuntimeOptions = resolvePublishAtlasRuntimeOptions(plan.fileExtension);
 			await atlas({
 				...plan.atlas,
-				...(options.atlas ?? {}),
 				separatedAtlasForBranch: plan.separatedAtlasForBranch,
 				encoder: options.encoder,
 				basePath: options.basePath,

package/src/utils.ts

@@ -13,7 +13,7 @@ export function createTransform(name: string, fn: Transform): Transform {
 	return fn;
 }
 
-export function parseTextureSetMode(value: string | null | undefined): TextureSetMode {
+export function parseTextureSetMode(value: string | null | undefined, maxAtlasIndex = 10): TextureSetMode {
 	const raw = value?.trim() ?? '';
 	if (!raw) {
 		return { kind: 'auto', raw: '' };
@@ -29,7 +29,7 @@ export function parseTextureSetMode(value: string | null | undefined): TextureSe
 	}
 	if (/^\d+$/.test(raw)) {
 		const pageIndex = Number(raw);
-		if (pageIndex >= 0 && pageIndex <= 10) {
+		if (pageIndex >= 0 && pageIndex <= maxAtlasIndex) {
 			return { kind: 'page', raw, pageIndex };
 		}
 	}