@prisma/cli 3.0.0-dev.65.1 → 3.0.0-dev.69.1

package/dist/commands/app/index.js

@@ -65,7 +65,7 @@ function createDeployCommand(runtime) {
 		"hono",
 		"tanstack-start",
 		"bun"
-	])).addOption(new Option("--entry <path>", "Entrypoint path for Bun deploys")).addOption(new Option("--http-port <port>", "HTTP port override for the deployed app")).addOption(new Option("--env <name=value>", "Environment variable").argParser(collectRepeatableValues)).addOption(new Option("--db", "Create and wire an isolated database for the preview Branch")).addOption(new Option("--no-db", "Skip branch database setup")).addOption(new Option("--prod", "Confirm intent to deploy to production"));
+	])).addOption(new Option("--entry <path>", "Entrypoint path for Bun deploys")).addOption(new Option("--http-port <port>", "HTTP port override for the deployed app")).addOption(new Option("--env <name=value|file>", "Environment variable assignment or dotenv file").argParser(collectRepeatableValues)).addOption(new Option("--db", "Create and wire an isolated database for the preview Branch")).addOption(new Option("--no-db", "Skip branch database setup")).addOption(new Option("--prod", "Confirm intent to deploy to production"));
 	addGlobalFlags(command);
 	command.action(async (options) => {
 		const appName = options.app;

package/dist/controllers/app-env.js

@@ -1,11 +1,11 @@
 import { CliError, authRequiredError, usageError, workspaceRequiredError } from "../shell/errors.js";
 import { requireComputeAuth } from "../lib/auth/guard.js";
+import { formatScopeLabel, parseKeyValuePositional, resolveEnvScope } from "../lib/app/env-config.js";
+import { readEnvFileAssignments } from "../lib/app/env-file.js";
 import { resolveProjectTarget } from "../lib/project/resolution.js";
 import { readLocalGitBranch } from "../lib/git/local-branch.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
 import { listRealWorkspaceProjects } from "./project.js";
-import { formatScopeLabel, parseKeyValuePositional, resolveEnvScope } from "../lib/app/env-config.js";
-import { readEnvFileAssignments } from "../lib/app/env-file.js";
 import { apiCallError, findVariableByNaturalKey, toMetadata } from "./app-env-api.js";
 import { runEnvAddFile, runEnvUpdateFile } from "./app-env-file.js";
 //#region src/controllers/app-env.ts

package/dist/controllers/app.js

@@ -7,7 +7,7 @@ import { canPrompt } from "../shell/runtime.js";
 import { confirmPrompt, selectPrompt, textPrompt } from "../shell/prompt.js";
 import { requireComputeAuth } from "../lib/auth/guard.js";
 import { readAuthState } from "../lib/auth/auth-ops.js";
-import { envVarNames, parseEnvAssignments } from "../lib/app/env-vars.js";
+import { envVarNames, parseEnvInputs } from "../lib/app/env-vars.js";
 import { renderDeployOutputRows, renderDeploySettingsPreview } from "../lib/app/deploy-output.js";
 import { readBunPackageEntrypoint, readBunPackageJson } from "../lib/app/bun-project.js";
 import { DEFAULT_LOCAL_DEV_PORT, resolveLocalBuildType, runLocalApp } from "../lib/app/local-dev.js";
@@ -138,7 +138,7 @@ async function runAppDeploy(context, appName, options) {
 	});
 	let runtime = resolveDeployRuntime(options?.httpPort, framework);
 	assertSupportedEntrypoint(framework.buildType, options?.entrypoint, "deploy");
-	const envVars = toOptionalEnvVars(parseEnvAssignments(options?.envAssignments, { commandName: "deploy" }));
+	const envVars = toOptionalEnvVars(await parseEnvInputs(context.runtime.cwd, options?.envAssignments, { commandName: "deploy" }));
 	const selectedApp = await resolveDeployAppSelection(context, projectId, await listApps(context, provider, projectId, target.branch.name), {
 		explicitAppName: appName,
 		explicitAppId: envAppId,
@@ -173,7 +173,7 @@ async function runAppDeploy(context, appName, options) {
 	const portMapping = parseDeployPortMapping(String(runtime.port));
 	const branchDatabaseSetup = await maybeSetupBranchDatabase(context, provider, projectId, toBranchDatabaseDeployBranch(target.branch), {
 		db: options?.db,
-		inlineEnvVars: envVars
+		providedEnvVars: envVars
 	});
 	const progressState = createPreviewDeployProgressState();
 	const deployStartedAt = Date.now();

package/dist/lib/app/branch-database-deploy.js

@@ -8,8 +8,8 @@ import path from "node:path";
 //#region src/lib/app/branch-database-deploy.ts
 async function maybeSetupBranchDatabase(context, provider, projectId, branch, options) {
 	if (options.db === false) return emptyBranchDatabaseSetupOutcome();
-	if (hasInlineDatabaseEnvVars(options.inlineEnvVars)) {
-		if (options.db === true) throw usageError("Branch database setup cannot be combined with inline database env vars", "The deploy command received --db and an inline DATABASE_URL or DIRECT_URL value.", "Remove the inline --env database value to let --db create a branch override, or remove --db to deploy with the provided value.", ["prisma-cli app deploy --db", "prisma-cli app deploy --env DATABASE_URL=postgresql://example"], "app");
+	if (hasProvidedDatabaseEnvVars(options.providedEnvVars)) {
+		if (options.db === true) throw usageError("Branch database setup cannot be combined with provided database env vars", "The deploy command received --db and a DATABASE_URL or DIRECT_URL value from --env.", "Remove the --env database value to let --db create a branch override, or remove --db to deploy with the provided value.", ["prisma-cli app deploy --db", "prisma-cli app deploy --env DATABASE_URL=postgresql://example"], "app");
 		return emptyBranchDatabaseSetupOutcome();
 	}
 	if (branch.kind === "production") {
@@ -184,7 +184,7 @@ async function inspectBranchDatabaseEnv(provider, projectId, branchId, signal) {
 function findEnvVar(rows, options) {
 	return rows.find((row) => row.branchId === options.branchId) ?? null;
 }
-function hasInlineDatabaseEnvVars(envVars) {
+function hasProvidedDatabaseEnvVars(envVars) {
 	return Boolean(envVars && ("DATABASE_URL" in envVars || "DIRECT_URL" in envVars));
 }
 function maybeRenderBranchDatabaseSignal(context, branchName, signal, envState) {

package/dist/lib/app/env-file.js

@@ -11,7 +11,7 @@ async function readEnvFileAssignments(cwd, filePath, command) {
 	try {
 		contents = await readFile(resolvedPath, "utf8");
 	} catch (error) {
-		throw usageError(`Failed to read env file "${filePath}"`, error instanceof Error ? error.message : "The file could not be read.", "Pass a readable dotenv file path.", [`prisma-cli project env ${command} --file .env --role preview`], "app");
+		throw usageError(`Failed to read env file "${filePath}"`, error instanceof Error ? error.message : "The file could not be read.", "Pass a readable dotenv file path.", [command === "deploy" ? "prisma-cli app deploy --env .env" : `prisma-cli project env ${command} --file .env --role preview`], "app");
 	}
 	return parseEnvFileContents(contents, filePath, command);
 }
@@ -63,7 +63,7 @@ function extractParsedKeys(contents) {
 }
 function validateEnvFileKey(key, line, filePath, command) {
 	try {
-		validateKey(key, command);
+		validateKey(key, command === "deploy" ? "add" : command);
 	} catch (error) {
 		const reason = error instanceof Error && error.message.length > 0 ? error.message : "Invalid environment variable key.";
 		throw usageError(`Invalid environment variable "${key}" in "${filePath}"`, `Line ${line}: ${reason}`, "Use a valid env-var key and retry the import.", [], "app");

package/dist/lib/app/env-vars.js

@@ -1,4 +1,6 @@
 import { usageError } from "../../shell/errors.js";
+import { validateKey } from "./env-config.js";
+import { readEnvFileAssignments } from "./env-file.js";
 //#region src/lib/app/env-vars.ts
 function parseEnvAssignments(assignments, options) {
 	const values = assignments ?? [];
@@ -10,15 +12,39 @@ function parseEnvAssignments(assignments, options) {
 		if (separatorIndex === -1) throw usageError("Environment variable assignment must use NAME=VALUE", "A provided --env flag is missing the = separator.", `Pass repeated --env NAME=VALUE flags, for example prisma-cli app ${options.commandName} --env DATABASE_URL=postgresql://example.`, [`prisma-cli app ${options.commandName} --env DATABASE_URL=postgresql://example`], "app");
 		const name = assignment.slice(0, separatorIndex);
 		if (name.length === 0) throw usageError("Environment variable name is required", "A provided --env flag has an empty variable name.", `Pass repeated --env NAME=VALUE flags, for example prisma-cli app ${options.commandName} --env DATABASE_URL=postgresql://example.`, [`prisma-cli app ${options.commandName} --env DATABASE_URL=postgresql://example`], "app");
+		validateEnvAssignmentName(name, options.commandName);
 		if (seen.has(name)) throw usageError(`Environment variable "${name}" was provided more than once`, "Each environment variable name may be set only once per command invocation.", `Remove the duplicate "${name}" assignment and rerun prisma-cli app ${options.commandName}.`, [`prisma-cli app ${options.commandName} --env ${name}=value`], "app");
+		const value = assignment.slice(separatorIndex + 1);
+		if (value.length === 0) throw usageError(`Environment variable "${name}" has an empty value`, `A provided --env flag defines ${name} with no value.`, "Pass a non-empty value, or omit the key from the deploy command.", [`prisma-cli app ${options.commandName} --env ${name}=value`], "app");
 		seen.add(name);
-		parsed[name] = assignment.slice(separatorIndex + 1);
+		parsed[name] = value;
 	}
 	return parsed;
 }
+async function parseEnvInputs(cwd, inputs, options) {
+	const values = inputs ?? [];
+	const expandedAssignments = [];
+	for (const value of values) {
+		if (value.includes("=")) {
+			expandedAssignments.push(value);
+			continue;
+		}
+		const fileAssignments = await readEnvFileAssignments(cwd, value, options.commandName);
+		expandedAssignments.push(...fileAssignments.map((assignment) => `${assignment.key}=${assignment.value}`));
+	}
+	return parseEnvAssignments(expandedAssignments, options);
+}
+function validateEnvAssignmentName(name, commandName) {
+	try {
+		validateKey(name, "add");
+	} catch (error) {
+		const reason = error instanceof Error && error.message.length > 0 ? error.message : "Invalid environment variable name.";
+		throw usageError(`Invalid environment variable "${name}"`, reason, "Use a valid env-var name and retry the deploy.", [`prisma-cli app ${commandName} --env DATABASE_URL=postgresql://example`], "app");
+	}
+}
 function envVarNames(envVars) {
 	if (!envVars) return [];
 	return Object.entries(envVars).filter(([, value]) => value !== null).map(([name]) => name).sort((left, right) => left.localeCompare(right));
 }
 //#endregion
-export { envVarNames, parseEnvAssignments };
+export { envVarNames, parseEnvInputs };

package/dist/shell/command-meta.js

@@ -194,6 +194,7 @@ const DESCRIPTORS = [
 			"prisma-cli app deploy --project proj_123",
 			"prisma-cli app deploy --create-project my-app --yes",
 			"prisma-cli app deploy --app my-app --env DATABASE_URL=postgresql://example",
+			"prisma-cli app deploy --env .env",
 			"prisma-cli app deploy --db",
 			"prisma-cli app deploy --db --yes",
 			"prisma-cli app deploy --app my-app --framework nextjs --http-port 3000",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-dev.65.1",
+  "version": "3.0.0-dev.69.1",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {
@@ -36,7 +36,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@clack/prompts": "^1.5.0",
-    "@prisma/compute-sdk": "^0.21.0",
+    "@prisma/compute-sdk": "^0.22.0",
     "@prisma/credentials-store": "^7.8.0",
     "@prisma/management-api-sdk": "^1.37.0",
     "c12": "4.0.0-beta.5",