@openfairygui/functions 0.2.0-alpha.1 → 0.2.0-alpha.11

package/src/restore.ts

@@ -757,9 +757,16 @@ class RestoreWorkflow {
 	): Promise<RestorableResource | null> {
 		const resources = pkg.listResources() as RestorableResource[];
 		const existing = this._findResourceByFile(resources, owner, 'ImageResource', fileName);
-		if (existing) return existing;
 		const sourcePath = await this._resolveLooseSourceFile(pkg, sourceDir, fileName);
-		if (!sourcePath) return null;
+		if (!sourcePath) return existing ?? null;
+		if (existing) {
+			existing.setExtras?.({
+				...(existing.getExtras?.() ?? {}),
+				_publishedFile: fileBaseName(sourcePath),
+				_restoreAsLooseImage: true,
+			});
+			return existing;
+		}
 		const resource = doc.createImageResource(stripExtension(fileName));
 		resource
 			.setId(generateId())
@@ -772,7 +779,7 @@ class RestoreWorkflow {
 			...(resource.getExtras?.() ?? {}),
 			_publishedFile: fileBaseName(sourcePath),
 			_suppressPackageSize: true,
-			_syntheticLooseImage: true,
+			_restoreAsLooseImage: true,
 		});
 		pkg.addResource(resource);
 		return resource as RestorableResource;
@@ -1022,8 +1029,8 @@ class RestoreWorkflow {
 		warnings: string[],
 	): Promise<void> {
 		for (const resource of pkg.listResources() as RestorableResource[]) {
-			const syntheticLooseImage = resource.getExtras?.()?._syntheticLooseImage === true;
-			if (!['SoundResource', 'MiscResource', 'SpineResource', 'DragonBonesResource'].includes(resource.propertyType) && !syntheticLooseImage) {
+			const restoreAsLooseImage = resource.getExtras?.()?._restoreAsLooseImage === true;
+			if (!['SoundResource', 'MiscResource', 'SpineResource', 'DragonBonesResource'].includes(resource.propertyType) && !restoreAsLooseImage) {
 				continue;
 			}
 			const fileName = resourceFileName(resource);

package/src/shared-types.ts

@@ -41,6 +41,7 @@ export interface PublishDependency {
 
 export interface PackagePublishArtifactsExtras extends ExtrasMap {
 	publishedResourceIds?: string[];
+	exportedResourceIds?: string[];
 	publishedIncludeBranches?: boolean;
 	publishedEffectiveResourceIds?: Record<string, string>;
 }

package/src/uam-transaction.ts

@@ -6,7 +6,7 @@ import {
 	type UamTransactionOperation,
 	type UamTransactionSupportIssue,
 	type UamValidationIssue,
-} from '@openfairygui/core';
+} from '@openfairygui/core/uam';
 
 export interface ApplyUamTransactionAppInput {
 	project: UamProject;
@@ -20,8 +20,10 @@ export interface ApplyUamTransactionAppError {
 	opIndex?: number;
 	opId?: string;
 	opKind?: UamTransactionOperation['kind'];
+	operationKind?: UamTransactionOperation['kind'];
 	selector?: Record<string, unknown>;
 	issues?: UamValidationIssue[] | UamTransactionSupportIssue[];
+	diagnostics: ApplyUamTransactionAppDiagnostic[];
 }
 
 export type ApplyUamTransactionAppResult =
@@ -41,6 +43,70 @@ function mapTransactionErrorStage(error: UamTransactionError): ApplyUamTransacti
 	}
 }
 
+export interface ApplyUamTransactionAppDiagnostic {
+	code: string;
+	message: string;
+	severity: 'error';
+	path?: string;
+	nodeKind?: string;
+	resourceKind?: string;
+	gearKind?: string;
+	field?: string;
+	operationKind?: UamTransactionOperation['kind'];
+	opIndex?: number;
+	opId?: string;
+}
+
+function compactDiagnostic(diagnostic: ApplyUamTransactionAppDiagnostic): ApplyUamTransactionAppDiagnostic {
+	return Object.fromEntries(Object.entries(diagnostic).filter(([, value]) => value !== undefined)) as ApplyUamTransactionAppDiagnostic;
+}
+
+function isTransactionSupportIssue(issue: UamValidationIssue | UamTransactionSupportIssue): issue is UamTransactionSupportIssue {
+	return 'code' in issue;
+}
+
+function mapTransactionDiagnostics(error: UamTransactionError): ApplyUamTransactionAppDiagnostic[] {
+	if (error.issues?.length) {
+		return error.issues.map((issue) => {
+			if (isTransactionSupportIssue(issue)) {
+				return compactDiagnostic({
+					code: issue.code,
+					message: issue.message,
+					severity: 'error' as const,
+					path: issue.path,
+					nodeKind: issue.nodeKind,
+					resourceKind: issue.resourceKind,
+					gearKind: issue.gearKind,
+					field: issue.field,
+					operationKind: issue.operationKind ?? error.opKind,
+					opIndex: error.opIndex,
+					opId: error.opId,
+				});
+			}
+			return compactDiagnostic({
+				code: error.code,
+				message: issue.message,
+				severity: 'error' as const,
+				path: issue.path,
+				operationKind: error.opKind,
+				opIndex: error.opIndex,
+				opId: error.opId,
+			});
+		});
+	}
+	return [
+		compactDiagnostic({
+			code: error.code,
+			message: error.message,
+			severity: 'error',
+			path: error.opIndex === undefined ? undefined : `operations[${error.opIndex}]`,
+			operationKind: error.opKind,
+			opIndex: error.opIndex,
+			opId: error.opId,
+		}),
+	];
+}
+
 export function applyUamTransactionApp(input: ApplyUamTransactionAppInput): ApplyUamTransactionAppResult {
 	try {
 		return {
@@ -58,8 +124,10 @@ export function applyUamTransactionApp(input: ApplyUamTransactionAppInput): Appl
 					opIndex: error.opIndex,
 					opId: error.opId,
 					opKind: error.opKind,
+					operationKind: error.opKind,
 					selector: error.selector,
 					issues: error.issues,
+					diagnostics: mapTransactionDiagnostics(error),
 				},
 			};
 		}

package/src/utils.ts

@@ -1,5 +1,10 @@
 import type { Transform } from '@openfairygui/core';
 
+export type TextureSetMode =
+	| { kind: 'auto'; raw: string }
+	| { kind: 'standalone'; raw: string; sizeMode: 'default' | 'npot' | 'multipleOf4' }
+	| { kind: 'page'; raw: string; pageIndex: number };
+
 /**
  * Wraps a transform function, assigning it a name for the transform stack.
  */
@@ -7,3 +12,26 @@ export function createTransform(name: string, fn: Transform): Transform {
 	Object.defineProperty(fn, 'name', { value: name });
 	return fn;
 }
+
+export function parseTextureSetMode(value: string | null | undefined): TextureSetMode {
+	const raw = value?.trim() ?? '';
+	if (!raw) {
+		return { kind: 'auto', raw: '' };
+	}
+	if (raw === 'alone') {
+		return { kind: 'standalone', raw, sizeMode: 'default' };
+	}
+	if (raw === 'alone_npot') {
+		return { kind: 'standalone', raw, sizeMode: 'npot' };
+	}
+	if (raw === 'alone_mof') {
+		return { kind: 'standalone', raw, sizeMode: 'multipleOf4' };
+	}
+	if (/^\d+$/.test(raw)) {
+		const pageIndex = Number(raw);
+		if (pageIndex >= 0 && pageIndex <= 10) {
+			return { kind: 'page', raw, pageIndex };
+		}
+	}
+	return { kind: 'auto', raw };
+}