@farm.js/cli 0.1.0-beta.57 → 0.1.0-beta.59

package/bin/farm.js

@@ -54,19 +54,14 @@ function telemetryDeployTarget(commandPath, options) {
   return undefined;
 }
 
-program.hook("preAction", async (_command, actionCommand) => {
+program.hook("preAction", (_command, actionCommand) => {
   const commandPath = telemetryCommandPath(actionCommand);
   if (commandPath.startsWith("telemetry")) return;
-  const {
-    resolveFarmTelemetryCommand,
-    showFarmTelemetryNotice,
-    trackFarmCommand,
-  } = require("../dist/telemetry.js");
-  await showFarmTelemetryNotice();
+  const { resolveFarmTelemetryCommand, trackFarmCommand } = require("../dist/telemetry.js");
   const command = resolveFarmTelemetryCommand(commandPath);
   if (!command) return;
   const options = actionCommand.opts();
-  await trackFarmCommand({
+  void trackFarmCommand({
     command,
     packageVersion: version,
     deployTarget: telemetryDeployTarget(commandPath, options),

package/dist/index.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-VH7oDXx4.js");
 const require_add_integration = require("./add-integration-Bz7WjUfh.js");
 const require_build = require("./build.js");
-const require_telemetry = require("./telemetry.js");
+const require_telemetry = require("./telemetry-9Y6041mK.js");
 let _farm_js_core_server = require("@farm.js/core/server");
 let node_fs = require("node:fs");
 let node_fs_promises = require("node:fs/promises");
@@ -431,8 +431,9 @@ async function deployNetlify(root, outputDir, site) {
 function formatCommand$1(executable, args) {
 	return [executable, ...args].map(formatCommandArgument).join(" ");
 }
+const SAFE_ARGUMENT = process.platform === "win32" ? /^[A-Za-z0-9_.\\/:=@+-]+$/ : /^[A-Za-z0-9_./:=@+-]+$/;
 function formatCommandArgument(argument) {
-	if (/^[A-Za-z0-9_./:=@+-]+$/.test(argument)) return argument;
+	if (SAFE_ARGUMENT.test(argument)) return argument;
 	return `'${argument.replace(/'/g, `'"'"'`)}'`;
 }
 function getErrorMessage(error) {
@@ -645,6 +646,9 @@ async function createGatewaySession(plan, timeoutMs) {
 	if (!session.id || !session.token || !session.publicUrl) throw new Error("Preview gateway returned an invalid session.");
 	return session;
 }
+function getSetCookies(headers) {
+	return headers.getSetCookie?.call(headers) || [];
+}
 async function forwardGatewayRequest(target, request) {
 	const headers = new Headers();
 	for (const [key, value] of Object.entries(request.headers || {})) {
@@ -663,8 +667,10 @@ async function forwardGatewayRequest(target, request) {
 	const responseHeaders = {};
 	response.headers.forEach((value, key) => {
 		const normalized = key.toLowerCase();
-		if (!HOP_BY_HOP_HEADERS.has(normalized)) responseHeaders[key] = value;
+		if (!HOP_BY_HOP_HEADERS.has(normalized) && normalized !== "set-cookie") responseHeaders[key] = value;
 	});
+	const setCookies = getSetCookies(response.headers);
+	if (setCookies.length > 0) responseHeaders["set-cookie"] = setCookies;
 	return {
 		status: response.status,
 		headers: responseHeaders,
@@ -1378,18 +1384,18 @@ function renderPrismaModel(model) {
 		const defaultAttribute = getPrismaDefaultAttribute(field);
 		if (defaultAttribute) attributes.push(defaultAttribute);
 		if (field.meta?.autoUpdate && field.type === "datetime") attributes.push("@updatedAt");
-		if (field.name !== fieldKey) attributes.push(`@map("${escapeString(field.name)}")`);
+		if (field.name !== fieldKey) attributes.push(`@map("${escapeDoubleQuoted(field.name)}")`);
 		if (attributes.length) parts.push(attributes.join(" "));
 		lines.push(`  ${parts.join(" ")}`);
-		if (field.index) modelLevelConstraints.push(`@@index([${fieldKey}], map: "${escapeString(`${model.modelName}_${field.name}_idx`)}")`);
+		if (field.index) modelLevelConstraints.push(`@@index([${fieldKey}], map: "${escapeDoubleQuoted(`${model.modelName}_${field.name}_idx`)}")`);
 	}
 	for (const constraint of model.model.constraints || []) {
 		const fields = constraint.fields.join(", ");
 		const attribute = constraint.type === "unique" ? "@@unique" : "@@index";
-		const suffix = constraint.name ? `, map: "${escapeString(constraint.name)}"` : "";
+		const suffix = constraint.name ? `, map: "${escapeDoubleQuoted(constraint.name)}"` : "";
 		modelLevelConstraints.push(`${attribute}([${fields}]${suffix})`);
 	}
-	lines.push(`  @@map("${escapeString(model.modelName)}")`);
+	lines.push(`  @@map("${escapeDoubleQuoted(model.modelName)}")`);
 	for (const constraint of modelLevelConstraints) lines.push(`  ${constraint}`);
 	lines.push("}");
 	return lines.join("\n");
@@ -1407,7 +1413,7 @@ function getPrismaFieldType(field) {
 function getPrismaDefaultAttribute(field) {
 	if (field.default === void 0) return null;
 	if (field.type === "datetime" && field.default === "now") return "@default(now())";
-	if (typeof field.default === "string") return `@default("${escapeString(field.default)}")`;
+	if (typeof field.default === "string") return `@default("${escapeDoubleQuoted(field.default)}")`;
 	if (typeof field.default === "number" || typeof field.default === "boolean") return `@default(${String(field.default)})`;
 	return null;
 }
@@ -1445,12 +1451,12 @@ function renderDrizzleModel(model, dialect, tableFactoryName) {
 		lines.push(`  ${fieldKey}: ${renderDrizzleColumn(field, dialect)},`);
 	}
 	lines.push("}, (table) => ({");
-	for (const [fieldKey, field] of Object.entries(model.model.fields)) if (field.index) lines.push(`  ${fieldKey}Idx: index("${escapeString(`${model.modelName}_${field.name}_idx`)}").on(table.${fieldKey}),`);
+	for (const [fieldKey, field] of Object.entries(model.model.fields)) if (field.index) lines.push(`  ${fieldKey}Idx: index("${escapeDoubleQuoted(`${model.modelName}_${field.name}_idx`)}").on(table.${fieldKey}),`);
 	for (const constraint of model.model.constraints || []) {
 		const builder = constraint.type === "unique" ? "uniqueIndex" : "index";
 		const accessor = constraint.fields.map((fieldKey) => `table.${fieldKey}`).join(", ");
 		const name = constraint.name || `${model.modelName}_${constraint.fields.map((fieldKey) => model.model.fields[fieldKey]?.name || fieldKey).join("_")}_${constraint.type}`;
-		lines.push(`  ${toCamelCase(name)}: ${builder}("${escapeString(name)}").on(${accessor}),`);
+		lines.push(`  ${toCamelCase(name)}: ${builder}("${escapeDoubleQuoted(name)}").on(${accessor}),`);
 	}
 	lines.push("}));");
 	return lines.join("\n");
@@ -1528,7 +1534,7 @@ function renderSqliteDrizzleColumn(field) {
 function getDrizzleDefaultExpression(field, dialect) {
 	if (field.default === void 0) return "";
 	if (field.type === "datetime" && field.default === "now") return dialect === "sqlite" ? "" : ".defaultNow()";
-	if (typeof field.default === "string") return `.default("${escapeString(field.default)}")`;
+	if (typeof field.default === "string") return `.default("${escapeDoubleQuoted(field.default)}")`;
 	if (typeof field.default === "number" || typeof field.default === "boolean") return `.default(${String(field.default)})`;
 	return "";
 }
@@ -1619,7 +1625,7 @@ function getSqlColumnType(field, dialect) {
 function getSqlDefaultExpression(field, dialect) {
 	if (field.default === void 0) return null;
 	if (field.type === "datetime" && field.default === "now") return "CURRENT_TIMESTAMP";
-	if (typeof field.default === "string") return `'${escapeString(field.default)}'`;
+	if (typeof field.default === "string") return `'${escapeSqlString(field.default)}'`;
 	if (typeof field.default === "number") return String(field.default);
 	if (typeof field.default === "boolean") {
 		if (dialect === "sqlite") return field.default ? "1" : "0";
@@ -1636,20 +1642,20 @@ function generateMongoBootstrap(models) {
 	];
 	for (const model of models) {
 		lines.push(`  // Integration "${model.integrationKey}" model "${model.modelKey}"`);
-		lines.push(`  const ${model.exportName} = db.collection("${escapeString(model.modelName)}");`);
+		lines.push(`  const ${model.exportName} = db.collection("${escapeDoubleQuoted(model.modelName)}");`);
 		for (const [fieldKey, field] of Object.entries(model.model.fields)) {
 			if (field.unique) {
 				const options = ["unique: true"];
 				if (isNullableField(field)) options.push("sparse: true");
-				options.push(`name: "${escapeString(`${model.modelName}_${field.name}_unique`)}"`);
+				options.push(`name: "${escapeDoubleQuoted(`${model.modelName}_${field.name}_unique`)}"`);
 				lines.push(`  await ${model.exportName}.createIndex({ ${JSON.stringify(field.name)}: 1 }, { ${options.join(", ")} });`);
-			} else if (field.index) lines.push(`  await ${model.exportName}.createIndex({ ${JSON.stringify(field.name)}: 1 }, { name: "${escapeString(`${model.modelName}_${field.name}_idx`)}" });`);
+			} else if (field.index) lines.push(`  await ${model.exportName}.createIndex({ ${JSON.stringify(field.name)}: 1 }, { name: "${escapeDoubleQuoted(`${model.modelName}_${field.name}_idx`)}" });`);
 			if (field.reference) lines.push(`  // ${fieldKey} references ${field.reference.model}.${field.reference.field}${field.reference.onDelete ? ` (onDelete: ${field.reference.onDelete})` : ""}`);
 		}
 		for (const constraint of model.model.constraints || []) {
 			const indexSpec = constraint.fields.map((fieldKey) => `${JSON.stringify(model.model.fields[fieldKey]?.name || fieldKey)}: 1`).join(", ");
 			const indexName = constraint.name || `${model.modelName}_${constraint.fields.map((fieldKey) => model.model.fields[fieldKey]?.name || fieldKey).join("_")}_${constraint.type}`;
-			const options = constraint.type === "unique" ? `{ unique: true, name: "${escapeString(indexName)}" }` : `{ name: "${escapeString(indexName)}" }`;
+			const options = constraint.type === "unique" ? `{ unique: true, name: "${escapeDoubleQuoted(indexName)}" }` : `{ name: "${escapeDoubleQuoted(indexName)}" }`;
 			lines.push(`  await ${model.exportName}.createIndex({ ${indexSpec} }, ${options});`);
 		}
 		lines.push("");
@@ -1681,8 +1687,11 @@ function toCamelCase(value) {
 	const pascal = toPascalCase(value);
 	return pascal ? pascal.charAt(0).toLowerCase() + pascal.slice(1) : pascal;
 }
-function escapeString(value) {
-	return value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"").replace(/'/g, "''");
+function escapeDoubleQuoted(value) {
+	return value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+}
+function escapeSqlString(value) {
+	return value.replace(/'/g, "''");
 }
 function escapeRegExp$1(value) {
 	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -1792,6 +1801,10 @@ async function fetchLiveSnapshot(baseUrl, options) {
 		clearTimeout(timeout);
 	}
 }
+/** Reported paths are shown to the user, so keep them POSIX on every platform. */
+function toPosix$1(value) {
+	return value.split(node_path.default.sep).join("/");
+}
 function createLiveReport(snapshot, baseUrl, now) {
 	const checks = [
 		{
@@ -1875,7 +1888,7 @@ async function createProjectReport(root, options) {
 				status: "pass",
 				code: "CONFIG_VALID",
 				title: "Farm config loads successfully",
-				message: configFile ? node_path.default.relative(root, configFile) || node_path.default.basename(configFile) : "Resolved config"
+				message: configFile ? toPosix$1(node_path.default.relative(root, configFile)) || node_path.default.basename(configFile) : "Resolved config"
 			});
 		}
 	} catch (error) {
@@ -1921,7 +1934,7 @@ function applySafeProjectFixes(root, config, checks) {
 			fixes.push({
 				code: "ROOT_LAYOUT_CREATED",
 				title: "Created the missing root layout",
-				filePath: node_path.default.relative(root, layoutPath)
+				filePath: toPosix$1(node_path.default.relative(root, layoutPath))
 			});
 		}
 	}
@@ -3374,7 +3387,10 @@ Object.defineProperty(exports, "createServer", {
 });
 exports.deployFarm = deployFarm;
 exports.detectFarmPackageManager = detectFarmPackageManager;
+exports.escapeDoubleQuoted = escapeDoubleQuoted;
+exports.escapeSqlString = escapeSqlString;
 exports.explainFarmRoute = explainFarmRoute;
+exports.flushFarmTelemetry = require_telemetry.flushFarmTelemetry;
 exports.formatFarmCronJobs = formatFarmCronJobs;
 exports.formatFarmDeployPlan = formatFarmDeployPlan;
 exports.formatFarmDoctorReport = formatFarmDoctorReport;