@farm.js/cli 0.1.0-beta.16 → 0.1.0-beta.17

package/bin/farm.js

@@ -468,8 +468,10 @@ program
       const { deployFarm } = require("../dist/index.js");
       await deployFarm(options);
     } catch (error) {
-      console.error("Failed to deploy:", error);
-      process.exit(1);
+      const code = error?.name === "FarmDeployError" ? ` [${error.code}]` : "";
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(`Failed to deploy${code}: ${message}`);
+      process.exitCode = 1;
     }
   });
 

package/dist/index.js

@@ -19,6 +19,15 @@ let croner = require("croner");
 let node_module = require("node:module");
 let node_url = require("node:url");
 //#region src/deploy.ts
+var FarmDeployError = class extends Error {
+	constructor(code, platform, message, options) {
+		super(message);
+		this.name = "FarmDeployError";
+		this.code = code;
+		this.platform = platform;
+		this.cause = options?.cause;
+	}
+};
 /**
 * Deploy Farm.js application
 */
@@ -33,7 +42,7 @@ async function deployFarm(options = {}) {
 		root: plan.root,
 		preset: plan.preset
 	});
-	if (!(0, fs.existsSync)(plan.outputDir)) throw new Error(`Build output not found at ${plan.outputDir}. Please run 'farm build' first.`);
+	if (!(0, fs.existsSync)(plan.outputDir)) throw new FarmDeployError("INVALID_BUILD_OUTPUT", plan.target, `Build output not found at ${plan.outputDir}. Please run 'farm build' first.`);
 	await deployPlatform(plan.target, plan.root, plan.outputDir, deployConfig, options.prod);
 	return plan;
 }
@@ -95,26 +104,64 @@ async function resolveFarmDeployContext(options) {
 	};
 }
 function createDeployCommand(platform, root, outputDir, deployConfig, prod, cloudflareAgent) {
-	if (platform === "vercel") return {
-		command: `vercel deploy --prebuilt --yes${prod ? " --prod" : ""}`,
-		cwd: path.default.resolve(root)
-	};
+	if (platform === "vercel") {
+		const args = [
+			"deploy",
+			"--prebuilt",
+			"--yes",
+			...prod ? ["--prod"] : []
+		];
+		return {
+			command: formatCommand$1("vercel", args),
+			cwd: path.default.resolve(root),
+			executable: "vercel",
+			args
+		};
+	}
 	if (platform === "netlify") {
-		const site = deployConfig.netlify?.site;
+		const args = createNetlifyDeployArgs(deployConfig.netlify?.site);
 		return {
-			command: `netlify deploy --prod --dir=.${site ? ` --site=${site}` : ""}`,
-			cwd: outputDir
+			command: formatCommand$1("netlify", args),
+			cwd: outputDir,
+			executable: "netlify",
+			args
 		};
 	}
-	if (cloudflareAgent) return {
-		command: `wrangler deploy --config ${cloudflareAgent.configPath}${cloudflareAgent.environment ? ` --env ${cloudflareAgent.environment}` : ""}`,
-		cwd: path.default.resolve(root)
-	};
+	if (cloudflareAgent) {
+		const args = [
+			"deploy",
+			"--config",
+			cloudflareAgent.configPath,
+			...cloudflareAgent.environment ? ["--env", cloudflareAgent.environment] : []
+		];
+		return {
+			command: formatCommand$1("wrangler", args),
+			cwd: path.default.resolve(root),
+			executable: "wrangler",
+			args
+		};
+	}
+	const args = [
+		"pages",
+		"deploy",
+		".",
+		`--project-name=${deployConfig.cloudflare?.projectName || deployConfig.projectName || "farm-app"}`
+	];
 	return {
-		command: `wrangler pages deploy . --project-name=${deployConfig.cloudflare?.projectName || deployConfig.projectName || "farm-app"}`,
-		cwd: outputDir
+		command: formatCommand$1("wrangler", args),
+		cwd: outputDir,
+		executable: "wrangler",
+		args
 	};
 }
+function createNetlifyDeployArgs(site) {
+	return [
+		"deploy",
+		"--prod",
+		"--dir=.",
+		...site ? [`--site=${site}`] : []
+	];
+}
 /**
 * Deploy using platform's native CLI (user credentials)
 */
@@ -135,19 +182,20 @@ async function deployPlatform(platform, root, outputDir, deployConfig, prod) {
 async function deployVercel(root, outputDir, prod) {
 	_farm_js_core.logger.info("🚀 Deploying to Vercel...");
 	try {
-		(0, child_process.execSync)("vercel --version", { stdio: "ignore" });
-	} catch {
-		_farm_js_core.logger.error("❌ Vercel CLI is not installed.");
-		_farm_js_core.logger.info("💡 Install it with: npm i -g vercel");
-		process.exit(1);
+		(0, child_process.execFileSync)("vercel", ["--version"], {
+			stdio: "ignore",
+			cwd: root
+		});
+	} catch (error) {
+		throw new FarmDeployError("CLI_NOT_INSTALLED", "vercel", "Vercel CLI is not installed. Install it with: npm i -g vercel", { cause: error });
 	}
 	try {
-		(0, child_process.execSync)("vercel whoami", { stdio: "ignore" });
-	} catch {
-		_farm_js_core.logger.warn("⚠️  Not logged in to Vercel.");
-		_farm_js_core.logger.info("💡 Please run: vercel login");
-		_farm_js_core.logger.info("   Then run: farm deploy --vercel");
-		process.exit(1);
+		(0, child_process.execFileSync)("vercel", ["whoami"], {
+			stdio: "ignore",
+			cwd: root
+		});
+	} catch (error) {
+		throw new FarmDeployError("CLI_NOT_AUTHENTICATED", "vercel", "Vercel CLI is not authenticated. Run 'vercel login', then retry the deployment.", { cause: error });
 	}
 	try {
 		const { existsSync, statSync, readdirSync } = await import("fs");
@@ -156,14 +204,8 @@ async function deployVercel(root, outputDir, prod) {
 		const configFile = path.default.join(outputDir, "config.json");
 		const serverIndex = path.default.join(functionsDir, "index.mjs");
 		_farm_js_core.logger.info("🔍 Verifying deployment structure...");
-		if (!existsSync(functionsDir)) {
-			_farm_js_core.logger.error(`❌ Functions directory not found at ${functionsDir}`);
-			process.exit(1);
-		}
-		if (!existsSync(serverIndex)) {
-			_farm_js_core.logger.error(`❌ Server entry point not found at ${serverIndex}`);
-			process.exit(1);
-		}
+		if (!existsSync(functionsDir)) throw new FarmDeployError("INVALID_BUILD_OUTPUT", "vercel", `Functions directory not found at ${functionsDir}.`);
+		if (!existsSync(serverIndex)) throw new FarmDeployError("INVALID_BUILD_OUTPUT", "vercel", `Server entry point not found at ${serverIndex}.`);
 		_farm_js_core.logger.info(`✅ Functions directory: ${functionsDir}`);
 		if (!existsSync(staticDir)) _farm_js_core.logger.warn(`⚠️  Static directory not found at ${staticDir}`);
 		else {
@@ -244,14 +286,19 @@ async function deployVercel(root, outputDir, prod) {
 		_farm_js_core.logger.info(`   Static: ${staticDir}`);
 		_farm_js_core.logger.info(`   Config: ${configFile}`);
 		_farm_js_core.logger.info("📤 Uploading to Vercel...");
-		(0, child_process.execSync)(`vercel deploy --prebuilt --yes${prod ? " --prod" : ""}`, {
+		(0, child_process.execFileSync)("vercel", [
+			"deploy",
+			"--prebuilt",
+			"--yes",
+			...prod ? ["--prod"] : []
+		], {
 			stdio: "inherit",
 			cwd: root
 		});
 		_farm_js_core.logger.success("✅ Deployed to Vercel successfully!");
 	} catch (error) {
-		_farm_js_core.logger.error(`❌ Failed to deploy to Vercel: ${error.message}`);
-		process.exit(1);
+		if (error instanceof FarmDeployError) throw error;
+		throw new FarmDeployError("DEPLOY_FAILED", "vercel", `Failed to deploy to Vercel: ${getErrorMessage(error)}`, { cause: error });
 	}
 }
 /** Deploy to a composed Worker or fall back to Cloudflare Pages. */
@@ -272,8 +319,7 @@ async function deployCloudflare(root, outputDir, projectName) {
 			});
 			_farm_js_core.logger.success("✅ Deployed Farm and Cloudflare Agents successfully!");
 		} catch (error) {
-			_farm_js_core.logger.error(`❌ Failed to deploy to Cloudflare: ${error.message}`);
-			process.exit(1);
+			throw new FarmDeployError("DEPLOY_FAILED", "cloudflare", `Failed to deploy to Cloudflare: ${getErrorMessage(error)}`, { cause: error });
 		}
 		return;
 	}
@@ -291,8 +337,7 @@ async function deployCloudflare(root, outputDir, projectName) {
 		});
 		_farm_js_core.logger.success("✅ Deployed to Cloudflare Pages successfully!");
 	} catch (error) {
-		_farm_js_core.logger.error(`❌ Failed to deploy to Cloudflare: ${error.message}`);
-		process.exit(1);
+		throw new FarmDeployError("DEPLOY_FAILED", "cloudflare", `Failed to deploy to Cloudflare: ${getErrorMessage(error)}`, { cause: error });
 	}
 }
 /** Read the trusted Workers deployment handoff emitted by @farm.js/cf-agent. */
@@ -344,10 +389,8 @@ function assertWranglerInstalled(root) {
 			stdio: "ignore",
 			cwd: root
 		});
-	} catch {
-		_farm_js_core.logger.error("❌ Wrangler CLI is not installed.");
-		_farm_js_core.logger.info("💡 Install it in this project with: npm i -D wrangler");
-		process.exit(1);
+	} catch (error) {
+		throw new FarmDeployError("CLI_NOT_INSTALLED", "cloudflare", "Wrangler CLI is not installed. Install it in this project with: npm i -D wrangler", { cause: error });
 	}
 }
 function isRecord(value) {
@@ -359,22 +402,33 @@ function isRecord(value) {
 async function deployNetlify(root, outputDir, site) {
 	_farm_js_core.logger.info("🚀 Deploying to Netlify...");
 	try {
-		(0, child_process.execSync)("netlify --version", { stdio: "ignore" });
-	} catch {
-		_farm_js_core.logger.error("❌ Netlify CLI is not installed.");
-		_farm_js_core.logger.info("💡 Install it with: npm i -g netlify-cli");
-		process.exit(1);
+		(0, child_process.execFileSync)("netlify", ["--version"], {
+			stdio: "ignore",
+			cwd: root
+		});
+	} catch (error) {
+		throw new FarmDeployError("CLI_NOT_INSTALLED", "netlify", "Netlify CLI is not installed. Install it with: npm i -g netlify-cli", { cause: error });
 	}
 	try {
-		process.chdir(outputDir);
-		const siteFlag = site ? ` --site=${site}` : "";
-		(0, child_process.execSync)(`netlify deploy --prod --dir=.${siteFlag}`, { stdio: "inherit" });
+		(0, child_process.execFileSync)("netlify", createNetlifyDeployArgs(site), {
+			stdio: "inherit",
+			cwd: outputDir
+		});
 		_farm_js_core.logger.success("✅ Deployed to Netlify successfully!");
 	} catch (error) {
-		_farm_js_core.logger.error(`❌ Failed to deploy to Netlify: ${error.message}`);
-		process.exit(1);
+		throw new FarmDeployError("DEPLOY_FAILED", "netlify", `Failed to deploy to Netlify: ${getErrorMessage(error)}`, { cause: error });
 	}
 }
+function formatCommand$1(executable, args) {
+	return [executable, ...args].map(formatCommandArgument).join(" ");
+}
+function formatCommandArgument(argument) {
+	if (/^[A-Za-z0-9_./:=@+-]+$/.test(argument)) return argument;
+	return `'${argument.replace(/'/g, `'"'"'`)}'`;
+}
+function getErrorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
+}
 //#endregion
 //#region src/preview-gateway.ts
 const DEFAULT_GATEWAY_URL = "https://preview.farming-labs.dev";
@@ -2072,9 +2126,8 @@ function discoverMatchingPages(config, pathname) {
 		}
 		const sourceDirectory = node_path.default.join(source.root, source.srcDir);
 		if (!(0, node_fs.existsSync)(sourceDirectory)) continue;
-		for (const entry of (0, node_fs.readdirSync)(sourceDirectory, { withFileTypes: true })) {
-			if (!entry.isFile() || !(0, _farm_js_core.isProgrammaticRoutesFileName)(entry.name)) continue;
-			const filePath = node_path.default.join(sourceDirectory, entry.name);
+		for (const filePath of walkFiles(sourceDirectory)) {
+			if (!/\.(?:tsx?|jsx?)$/.test(filePath) || filePath.endsWith(".d.ts")) continue;
 			const moduleSource = (0, node_fs.readFileSync)(filePath, "utf8");
 			for (const pattern of (0, _farm_js_core.scanProgrammaticPagePaths)(moduleSource)) {
 				const match = matchRoutePattern(pattern, pathname);
@@ -3153,6 +3206,7 @@ function formatError(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 //#endregion
+exports.FarmDeployError = FarmDeployError;
 exports.FarmGeneratedArtifactsStaleError = FarmGeneratedArtifactsStaleError;
 exports.addFarmIntegration = require_add_integration.addFarmIntegration;
 exports.buildFarm = require_build.buildFarm;