@openfairygui/cli 0.2.0-alpha.11 → 0.2.0-alpha.13

package/dist/cli.mjs

@@ -3,7 +3,6 @@ import { Command } from "commander";
 import { createNodeBackendRuntime } from "@openfairygui/backend/node";
 import * as path$1 from "node:path";
 import path from "node:path";
-import { createJiti } from "jiti";
 import * as fs$1 from "node:fs/promises";
 import fs from "node:fs/promises";
 //#region src/commands/backend-capabilities.ts
@@ -21884,7 +21883,7 @@ async function resolveEditorCompatibleResourceOrder(pkg, allResources, options)
 *
 * This transform performs MaxRects bin-packing on all ImageResource items
 * within each package, creating Atlas and Sprite property nodes. When an
-* `encoder` (sharp) is provided, it also composites the actual PNG files.
+* a raster backend is provided, it also composites the actual PNG files.
 *
 * When `trimImage` is enabled and encoder is available, transparent pixels
 * at image edges are trimmed before packing. The trimmed offset and original
@@ -22486,7 +22485,7 @@ function groupStandaloneInputs(doc, inputs, options) {
 	};
 }
 /**
-* Trim transparent edges from an image using sharp.
+* Trim transparent edges from an image using the host raster backend.
 * Returns the trimmed buffer, dimensions, and offsets.
 * Falls back to the original image if trim fails (e.g. no alpha channel, no transparent edges).
 */
@@ -22576,7 +22575,11 @@ async function _collectImage(resource, pkg, inputs, encoder, options, doTrim, lo
 			}
 			sourceHasAlpha = metadata.hasAlpha === true || metadata.channels === 4;
 			if (/\.svg$/i.test(resolveImageFileName$1(resource)) && declaredWidth > 0 && declaredHeight > 0) {
-				rasterizedBuffer = await encoder(filePath).resize(declaredWidth, declaredHeight, { fit: "fill" }).png().toBuffer();
+				rasterizedBuffer = await encoder(filePath).resize({
+					width: declaredWidth,
+					height: declaredHeight,
+					fit: "fill"
+				}).png().toBuffer();
 				sourceHasAlpha = true;
 			}
 		} catch {
@@ -23045,61 +23048,10 @@ const FGUI_TYPESCRIPT_BINDER_TEMPLATE = `{{generatedMark}}
 }
 `;
 //#endregion
-//#region ../functions/src/plugins/loader.ts
-const importNative = new Function("id", "return import(id)");
-async function loadPlugins(doc, pluginsDir) {
-	if (!pluginsDir) return [];
-	const fs = await importNative("node:fs/promises");
-	const path = await importNative("node:path");
-	let entries;
-	try {
-		entries = await fs.readdir(pluginsDir, { withFileTypes: true });
-	} catch {
-		return [];
-	}
-	const plugins = [];
-	for (const entry of entries) {
-		if (!entry.isDirectory()) continue;
-		const pluginDir = path.join(pluginsDir, entry.name);
-		try {
-			const manifest = await readPluginManifest(fs, path, pluginDir);
-			if (!manifest) continue;
-			const plugin = await loadPlugin(resolvePluginMain(path, pluginDir, manifest));
-			plugins.push({
-				name: manifest.name,
-				plugin
-			});
-		} catch (error) {
-			doc.getLogger().warn(`publish: Plugin "${entry.name}" was skipped: ${formatPluginError(error)}`);
-		}
-	}
-	return plugins;
-}
+//#region ../functions/src/plugins/types.ts
 function formatPluginError(error) {
 	return error instanceof Error ? error.message : String(error);
 }
-async function readPluginManifest(fs, path, pluginDir) {
-	const manifestPath = path.join(pluginDir, "package.json");
-	const content = await fs.readFile(manifestPath, "utf-8");
-	const manifest = JSON.parse(content);
-	if (!manifest.name) throw new Error(`Codegen plugin at ${pluginDir} is missing package.json name.`);
-	if (!manifest.main) throw new Error(`Codegen plugin "${manifest.name}" is missing package.json main.`);
-	return manifest;
-}
-function resolvePluginMain(path, pluginDir, manifest) {
-	const mainPath = path.resolve(pluginDir, manifest.main);
-	const relative = path.relative(pluginDir, mainPath);
-	if (relative.startsWith("..") || path.isAbsolute(relative)) throw new Error(`Codegen plugin "${manifest.name}" main must resolve inside its plugin directory.`);
-	return mainPath;
-}
-async function loadPlugin(mainPath) {
-	const mod = await createJiti(import.meta.url).import(mainPath);
-	const defaultExport = mod.default;
-	return isObject(defaultExport) ? defaultExport : mod;
-}
-function isObject(value) {
-	return value !== null && typeof value === "object";
-}
 //#endregion
 //#region ../functions/src/codegen.ts
 const AUTO_GENERATED_CODE_MARK = "/** This is an automatically generated class by FairyGUI. Please do not modify it. **/";
@@ -24331,14 +24283,6 @@ async function runPublishPluginHook(plugins, hook, doc, options) {
 		}
 	}
 }
-function resolvePublishPluginsDir(doc, options) {
-	const fs = options.fs;
-	const projectDir = doc.getProjectDir?.() ?? "";
-	if (projectDir) return fs?.join ? fs.join(projectDir, "plugins") : `${projectDir.replace(/[/\\]+$/, "")}/plugins`;
-	const projectBasePath = resolveProjectBasePath(options.basePath);
-	if (!projectBasePath) return "";
-	return fs?.join ? fs.join(projectBasePath, "plugins") : `${projectBasePath.replace(/[/\\]+$/, "")}/plugins`;
-}
 const UNITY_PROJECT_TYPE = ProjectType.Unity;
 const COCOS_CREATOR_PROJECT_TYPE = ProjectType.CocosCreator;
 function resolveDefaultPublishFileExtension(projectType, publishSettings) {
@@ -24942,10 +24886,13 @@ async function exportPackageExternalResources(pkg, outputDir, basePath, fs, read
 * Publishes a FairyGUI project.
 *
 * Orchestrates:
-* 1. Atlas packing (MaxRects layout + optional sharp compositing)
+* 1. Atlas packing (MaxRects layout + optional raster compositing)
 * 2. Per-package .fui binary serialization
 * 3. File writing to the output directory
 *
+* This is the capability-injected core. Standard hosts should use
+* `publishNode()` or `publishBrowser()` through their dedicated entries.
+*
 * ```ts
 * import sharp from 'sharp';
 * const io = new NodeIO();
@@ -25055,8 +25002,7 @@ function publish(options) {
 		const root = doc.getRoot();
 		const logger = doc.getLogger();
 		const projectBasePath = resolveProjectBasePath(options.basePath) || doc.getProjectDir?.() || "";
-		const pluginsDir = resolvePublishPluginsDir(doc, options);
-		const plugins = pluginsDir ? await loadPlugins(doc, pluginsDir) : [];
+		const plugins = options.plugins ?? [];
 		await runPublishPluginHook(plugins, "onPublishStart", doc, options);
 		const resolved = resolveProjectPublishConfig();
 		let allPackages = root.listPackages();
@@ -25093,7 +25039,7 @@ function publish(options) {
 		if (unresolvedPlan) throw new Error(`publish: no output directory resolved for package "${unresolvedPlan.pkg.getName()}". Provide --output, or configure global publish.path / package publishPath.`);
 		const writerFs = toBinaryWriterFileSystem(options.fs);
 		for (const plan of plans) await publishPackage(plan, writerFs, allDocPackages.indexOf(plan.pkg));
-		await publishCodeGeneration(doc, {
+		if (options.codeGeneration !== false) await publishCodeGeneration(doc, {
 			basePath: options.basePath,
 			fs: options.fs,
 			packages: allPackages,
@@ -25323,6 +25269,131 @@ function printReport(report) {
 	}
 }
 //#endregion
+//#region ../functions/src/adapters/node/plugins.ts
+const importNative$1 = new Function("id", "return import(id)");
+async function loadPlugins(doc, pluginsDir) {
+	if (!pluginsDir) return [];
+	const fs = await importNative$1("node:fs/promises");
+	const path = await importNative$1("node:path");
+	let entries;
+	try {
+		entries = await fs.readdir(pluginsDir, { withFileTypes: true });
+	} catch {
+		return [];
+	}
+	const plugins = [];
+	for (const entry of entries) {
+		if (!entry.isDirectory()) continue;
+		const pluginDir = path.join(pluginsDir, entry.name);
+		try {
+			const manifest = await readPluginManifest(fs, path, pluginDir);
+			if (!manifest) continue;
+			const plugin = await loadPlugin(resolvePluginMain(path, pluginDir, manifest));
+			plugins.push({
+				name: manifest.name,
+				plugin
+			});
+		} catch (error) {
+			doc.getLogger().warn(`publish: Plugin "${entry.name}" was skipped: ${formatPluginError(error)}`);
+		}
+	}
+	return plugins;
+}
+async function readPluginManifest(fs, path, pluginDir) {
+	const manifestPath = path.join(pluginDir, "package.json");
+	const content = await fs.readFile(manifestPath, "utf-8");
+	const manifest = JSON.parse(content);
+	if (!manifest.name) throw new Error(`Codegen plugin at ${pluginDir} is missing package.json name.`);
+	if (!manifest.main) throw new Error(`Codegen plugin "${manifest.name}" is missing package.json main.`);
+	return manifest;
+}
+function resolvePluginMain(path, pluginDir, manifest) {
+	const mainPath = path.resolve(pluginDir, manifest.main);
+	const relative = path.relative(pluginDir, mainPath);
+	if (relative.startsWith("..") || path.isAbsolute(relative)) throw new Error(`Codegen plugin "${manifest.name}" main must resolve inside its plugin directory.`);
+	return mainPath;
+}
+async function loadPlugin(mainPath) {
+	const { createJiti } = await importNative$1("jiti");
+	const mod = await createJiti(import.meta.url).import(mainPath);
+	const defaultExport = mod.default;
+	return isObject(defaultExport) ? defaultExport : mod;
+}
+function isObject(value) {
+	return value !== null && typeof value === "object";
+}
+//#endregion
+//#region ../functions/src/adapters/node/publish.ts
+const importNative = new Function("id", "return import(id)");
+async function createNodePublishFileSystem() {
+	const [fs, path] = await Promise.all([importNative("node:fs/promises"), importNative("node:path")]);
+	return {
+		async readFileRaw(filePath) {
+			const data = await fs.readFile(filePath);
+			return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+		},
+		async writeFileRaw(filePath, data) {
+			await fs.mkdir(path.dirname(filePath), { recursive: true });
+			await fs.writeFile(filePath, data);
+		},
+		async mkdir(dirPath) {
+			await fs.mkdir(dirPath, { recursive: true });
+		},
+		async readdir(dirPath) {
+			return fs.readdir(dirPath);
+		},
+		async deleteFile(filePath) {
+			await fs.rm(filePath, { force: true });
+		},
+		join(...paths) {
+			return path.join(...paths);
+		}
+	};
+}
+async function resolveNodeAssetsPath(document, assetsPath) {
+	if (assetsPath) return assetsPath;
+	const projectDir = document.getProjectDir?.() ?? "";
+	if (!projectDir) return void 0;
+	return (await importNative("node:path")).join(projectDir, "assets");
+}
+async function loadSharpBackend() {
+	try {
+		const sharp = await importNative("sharp");
+		return sharp.default ?? sharp;
+	} catch {
+		return;
+	}
+}
+async function loadNodePublishPlugins(document, assetsPath) {
+	const projectDir = document.getProjectDir?.() || (assetsPath ? resolveProjectBasePath(assetsPath) : "");
+	if (!projectDir) return [];
+	return loadPlugins(document, (await importNative("node:path")).join(projectDir, "plugins"));
+}
+/**
+* Publish a FairyGUI project through the standard Node host adapter.
+*
+* The adapter owns Node filesystem, Sharp, and project plugin discovery.
+* For custom environments, use the lower-level `publish()` core with explicit
+* capabilities instead.
+*/
+async function publishNode(options) {
+	const { document, assetsPath: configuredAssetsPath, atlas, encoder: configuredEncoder, plugins: configuredPlugins, ...publishOptions } = options;
+	const [fileSystem, assetsPath] = await Promise.all([createNodePublishFileSystem(), resolveNodeAssetsPath(document, configuredAssetsPath)]);
+	const [encoder, plugins] = await Promise.all([configuredEncoder === void 0 ? loadSharpBackend() : Promise.resolve(configuredEncoder), configuredPlugins === void 0 ? loadNodePublishPlugins(document, assetsPath) : Promise.resolve(configuredPlugins)]);
+	if (!encoder) document.getLogger().warn("publish: Sharp is unavailable; atlas layout will be generated without PNG output.");
+	await document.transform(publish({
+		...publishOptions,
+		basePath: assetsPath,
+		encoder,
+		atlas: {
+			...atlas,
+			readFileRaw: fileSystem.readFileRaw
+		},
+		fs: fileSystem,
+		plugins
+	}));
+}
+//#endregion
 //#region src/utils/project-type.ts
 function parseProjectType(value) {
 	if (!value) return void 0;
@@ -25369,54 +25440,16 @@ function registerPublishCommand(program) {
 		});
 		console.log(`Settings: ext=${resolved.fileExtension}, compressed=${resolved.compressed}`);
 		if (options.branch) console.log(`Active branch: ${options.branch}`);
-		const atlasConfig = {
-			...resolved.atlas,
-			readFileRaw: async (filePath) => {
-				const buf = await fs.readFile(filePath);
-				return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
-			}
-		};
-		let encoder;
-		try {
-			const sharp = await import("sharp");
-			encoder = sharp.default ?? sharp;
-			console.log("Sharp loaded — atlas PNGs will be generated.");
-		} catch {
-			console.log("Sharp not available — atlas PNGs will NOT be generated (layout only).");
-			console.log("  Install sharp to enable: pnpm add sharp");
-		}
-		await doc.transform(publish({
+		await publishNode({
+			document: doc,
 			output: outputDir,
 			compressed: resolved.compressed,
 			fileExtension: resolved.fileExtension,
 			packages: resolved.packages,
-			fs: {
-				async readFileRaw(filePath) {
-					const buf = await fs.readFile(filePath);
-					return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
-				},
-				async writeFileRaw(filePath, data) {
-					await fs.mkdir(path.dirname(filePath), { recursive: true });
-					await fs.writeFile(filePath, data);
-				},
-				async mkdir(dirPath) {
-					await fs.mkdir(dirPath, { recursive: true });
-				},
-				async readdir(dirPath) {
-					return fs.readdir(dirPath);
-				},
-				async deleteFile(filePath) {
-					await fs.rm(filePath, { force: true });
-				},
-				join(...paths) {
-					return path.join(...paths);
-				}
-			},
-			encoder,
-			basePath: path.join(projectRootDir, "assets"),
-			atlas: atlasConfig,
+			assetsPath: path.join(projectRootDir, "assets"),
+			atlas: resolved.atlas,
 			branch: options.branch
-		}));
+		});
 		console.log(`\nDone!${outputDir ? ` Output override: ${outputDir}` : ""}`);
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfairygui/cli",
-  "version": "0.2.0-alpha.11",
+  "version": "0.2.0-alpha.13",
   "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.11",
-    "@openfairygui/functions": "0.2.0-alpha.11"
+    "@openfairygui/core": "0.2.0-alpha.13",
+    "@openfairygui/functions": "0.2.0-alpha.13"
   },
   "dependencies": {
     "commander": "^14.0.2",
     "jiti": "^2.7.0",
-    "@openfairygui/backend": "0.2.0-alpha.10"
+    "@openfairygui/backend": "0.2.0-alpha.13"
   },
   "optionalDependencies": {
     "sharp": ">=0.33.0"

package/src/commands/publish.ts

@@ -1,7 +1,7 @@
 import type { Command } from 'commander';
 import { NodeIO } from '@openfairygui/core/node';
-import { publish, resolvePublishOptions, type PublishOptions } from '@openfairygui/functions';
-import fs from 'node:fs/promises';
+import { resolvePublishOptions } from '@openfairygui/functions';
+import { publishNode } from '@openfairygui/functions/node';
 import path from 'node:path';
 import { resolveFairyPath } from '../utils/project-input.js';
 import { parseProjectType } from '../utils/project-type.js';
@@ -23,7 +23,10 @@ export function registerPublishCommand(program: Command): void {
 		.option('-c, --compressed', 'Compress binary data (overrides project setting)')
 		.option('-p, --packages <a,b,c>', 'Only publish specific packages (comma-separated)')
 		.option('-b, --branch <name>', 'Active branch used by "主干合并活跃分支"; omit for main branch')
-		.option('-t, --project-type <name|id>', 'Override project type (for example: unity, layabox, cocoscreator, 0, 4, 3)')
+		.option(
+			'-t, --project-type <name|id>',
+			'Override project type (for example: unity, layabox, cocoscreator, 0, 4, 3)',
+		)
 		.action(async (projectDir: string, options: PublishCommandOptions) => {
 			const fairyPath = await resolveFairyPath(projectDir);
 			const projectRootDir = path.dirname(fairyPath);
@@ -48,60 +51,16 @@ export function registerPublishCommand(program: Command): void {
 				console.log(`Active branch: ${options.branch}`);
 			}
 
-			const atlasConfig: NonNullable<PublishOptions['atlas']> = {
-				...resolved.atlas,
-				readFileRaw: async (filePath: string) => {
-					const buf = await fs.readFile(filePath);
-					return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
-				},
-			};
-
-			let encoder: PublishOptions['encoder'];
-			try {
-				const sharp = await import('sharp');
-				encoder = sharp.default ?? sharp;
-				console.log('Sharp loaded — atlas PNGs will be generated.');
-			} catch {
-				console.log('Sharp not available — atlas PNGs will NOT be generated (layout only).');
-				console.log('  Install sharp to enable: pnpm add sharp');
-			}
-
-			const publishFs: NonNullable<PublishOptions['fs']> = {
-				async readFileRaw(filePath: string): Promise<Uint8Array> {
-					const buf = await fs.readFile(filePath);
-					return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
-				},
-				async writeFileRaw(filePath: string, data: Uint8Array): Promise<void> {
-					await fs.mkdir(path.dirname(filePath), { recursive: true });
-					await fs.writeFile(filePath, data);
-				},
-				async mkdir(dirPath: string): Promise<void> {
-					await fs.mkdir(dirPath, { recursive: true });
-				},
-				async readdir(dirPath: string): Promise<string[]> {
-					return fs.readdir(dirPath);
-				},
-				async deleteFile(filePath: string): Promise<void> {
-					await fs.rm(filePath, { force: true });
-				},
-				join(...paths: string[]): string {
-					return path.join(...paths);
-				},
-			};
-
-			await doc.transform(
-				publish({
-					output: outputDir,
-					compressed: resolved.compressed,
-					fileExtension: resolved.fileExtension,
-					packages: resolved.packages,
-					fs: publishFs,
-					encoder,
-					basePath: path.join(projectRootDir, 'assets'),
-					atlas: atlasConfig,
-					branch: options.branch,
-				}),
-			);
+			await publishNode({
+				document: doc,
+				output: outputDir,
+				compressed: resolved.compressed,
+				fileExtension: resolved.fileExtension,
+				packages: resolved.packages,
+				assetsPath: path.join(projectRootDir, 'assets'),
+				atlas: resolved.atlas,
+				branch: options.branch,
+			});
 
 			console.log(`\nDone!${outputDir ? ` Output override: ${outputDir}` : ''}`);
 		});