@prisma/cli 3.0.0-beta.10 → 3.0.0-beta.12

package/dist/presenters/app.js

@@ -28,7 +28,8 @@ function renderAppBuild(context, descriptor, result) {
 function serializeAppBuild(result) {
 	return result;
 }
-function renderAppDeploy(context, descriptor, result) {
+function renderAppDeploy(context, descriptor, result, options) {
+	const logsCommand = options?.logsTarget ? `prisma-cli app logs ${options.logsTarget}` : "prisma-cli app logs";
 	return [
 		`Live in ${formatDuration(result.durationMs)}`,
 		...result.deployment.url ? [context.ui.link(result.deployment.url)] : [],
@@ -36,12 +37,37 @@ function renderAppDeploy(context, descriptor, result) {
 		"",
 		...renderDeployOutputRows(context.ui, [{
 			label: "Logs",
-			value: "prisma-cli app logs"
+			value: logsCommand
 		}]),
 		...renderDeployResolvedContextBlock(context, result),
 		...renderDeploySettingsBlock(context, result)
 	];
 }
+function isAppDeployAllResult(result) {
+	return "deployments" in result;
+}
+function renderAppDeployAll(context, descriptor, result) {
+	const lines = [];
+	for (const deployment of result.deployments) {
+		lines.push(deployment.target);
+		lines.push(...renderAppDeploy(context, descriptor, deployment.result, { logsTarget: deployment.target }).map((line) => line ? `  ${line}` : line));
+		lines.push("");
+	}
+	lines.push(...renderDeployOutputRows(context.ui, result.deployments.map((deployment) => ({
+		label: deployment.target,
+		value: deployment.result.deployment.url ?? deployment.result.deployment.id
+	}))));
+	return lines;
+}
+function serializeAppDeployAll(result) {
+	return {
+		count: result.deployments.length,
+		deployments: result.deployments.map((deployment) => ({
+			target: deployment.target,
+			...serializeAppDeploy(deployment.result)
+		}))
+	};
+}
 function serializeAppDeploy(result) {
 	const { deploySettings, localPin: _localPin, ...serialized } = result;
 	const { id: _branchId, ...branch } = serialized.branch;
@@ -57,27 +83,13 @@ function serializeAppDeploy(result) {
 }
 function renderBranchDatabaseDeploySummary(context, result) {
 	if (!result.branchDatabase || result.branchDatabase.status !== "created") return [];
-	return ["", ...renderDeployOutputRows(context.ui, [
-		{
-			label: "Database",
-			value: result.branchDatabase.database?.name ?? "created"
-		},
-		{
-			label: "Env",
-			value: result.branchDatabase.envVars.join(", ")
-		},
-		...result.branchDatabase.schema ? [{
-			label: "Schema",
-			value: formatBranchDatabaseSchemaCommand(result.branchDatabase.schema.command)
-		}] : []
-	])];
-}
-function formatBranchDatabaseSchemaCommand(command) {
-	switch (command) {
-		case "migrate-deploy": return "prisma migrate deploy";
-		case "db-push": return "prisma db push";
-		case "prisma-next-db-init": return "prisma-next db init";
-	}
+	return ["", ...renderDeployOutputRows(context.ui, [{
+		label: "Database",
+		value: result.branchDatabase.database?.name ?? "created"
+	}, {
+		label: "Env",
+		value: result.branchDatabase.envVars.join(", ")
+	}])];
 }
 function formatDuration(durationMs) {
 	if (durationMs < 1e3) return `${durationMs}ms`;
@@ -163,21 +175,14 @@ function branchDatabaseRows(branchDatabase) {
 		value: "not configured",
 		tone: "dim"
 	}];
-	return [
-		{
-			key: "branch db",
-			value: branchDatabase.status === "created" ? `created${branchDatabase.database ? ` (${branchDatabase.database.name})` : ""}` : `skipped${branchDatabase.reason ? ` (${branchDatabase.reason})` : ""}`,
-			tone: branchDatabase.status === "created" ? "success" : "dim"
-		},
-		...branchDatabase.envVars.length > 0 ? [{
-			key: "branch db env",
-			value: branchDatabase.envVars.join(", ")
-		}] : [],
-		...branchDatabase.schema ? [{
-			key: "branch db schema",
-			value: `${formatBranchDatabaseSchemaCommand(branchDatabase.schema.command)} (${branchDatabase.schema.source}, ${branchDatabase.schema.path})`
-		}] : []
-	];
+	return [{
+		key: "branch db",
+		value: branchDatabase.status === "created" ? `created${branchDatabase.database ? ` (${branchDatabase.database.name})` : ""}` : `skipped${branchDatabase.reason ? ` (${branchDatabase.reason})` : ""}`,
+		tone: branchDatabase.status === "created" ? "success" : "dim"
+	}, ...branchDatabase.envVars.length > 0 ? [{
+		key: "branch db env",
+		value: branchDatabase.envVars.join(", ")
+	}] : []];
 }
 function formatEnvVarNames(envVars) {
 	return envVars.length > 0 ? envVars.join(", ") : "none";
@@ -638,4 +643,4 @@ function formatRecentDeployments(deployments) {
 	return deployments.map((deployment) => `${deployment.id}${deployment.live ? " (live)" : ""}`).join(", ");
 }
 //#endregion
-export { renderAppBuild, renderAppDeploy, renderAppDomainAdd, renderAppDomainRemove, renderAppDomainRetry, renderAppDomainShow, renderAppListDeploys, renderAppOpen, renderAppPromote, renderAppRemove, renderAppRollback, renderAppRun, renderAppShow, renderAppShowDeploy, serializeAppBuild, serializeAppDeploy, serializeAppDomainAdd, serializeAppDomainRemove, serializeAppDomainRetry, serializeAppDomainShow, serializeAppListDeploys, serializeAppOpen, serializeAppPromote, serializeAppRemove, serializeAppRollback, serializeAppRun, serializeAppShow, serializeAppShowDeploy };
+export { isAppDeployAllResult, renderAppBuild, renderAppDeploy, renderAppDeployAll, renderAppDomainAdd, renderAppDomainRemove, renderAppDomainRetry, renderAppDomainShow, renderAppListDeploys, renderAppOpen, renderAppPromote, renderAppRemove, renderAppRollback, renderAppRun, renderAppShow, renderAppShowDeploy, serializeAppBuild, serializeAppDeploy, serializeAppDeployAll, serializeAppDomainAdd, serializeAppDomainRemove, serializeAppDomainRetry, serializeAppDomainShow, serializeAppListDeploys, serializeAppOpen, serializeAppPromote, serializeAppRemove, serializeAppRollback, serializeAppRun, serializeAppShow, serializeAppShowDeploy };

package/dist/presenters/branch.js

@@ -1,5 +1,5 @@
-import { formatColumns } from "../shell/ui.js";
 import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { formatColumns } from "../shell/ui.js";
 import { renderResolvedProjectContextBlock } from "./verbose-context.js";
 //#region src/presenters/branch.ts
 function renderBranchList(context, descriptor, result) {

package/dist/presenters/database.js

@@ -1,5 +1,5 @@
-import { formatColumns, renderSummaryLine } from "../shell/ui.js";
 import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { formatColumns, renderSummaryLine } from "../shell/ui.js";
 import { renderMutate, renderShow, serializeList } from "../output/patterns.js";
 import { renderResolvedProjectContextBlock, stripVerboseContext } from "./verbose-context.js";
 //#region src/presenters/database.ts
@@ -234,7 +234,7 @@ function renderDatabaseConnectionRemove(context, descriptor, result) {
 	}, context.ui);
 }
 function serializeDatabaseConnectionRemove(result) {
-	return result;
+	return { connection: result.connection };
 }
 function formatStatus(database) {
 	return database.status ?? (database.isDefault ? "default" : "unknown");

package/dist/presenters/project.js

@@ -1,9 +1,9 @@
-import { padDisplay, renderNextSteps, renderSummaryLine, renderVerboseBlock } from "../shell/ui.js";
 import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { padDisplay, renderNextSteps, renderSummaryLine, renderVerboseBlock } from "../shell/ui.js";
+import { shortenHomePath } from "../lib/fs/home-path.js";
 import { formatCommandArgument } from "../shell/command-arguments.js";
 import { renderMutate, renderShow, serializeList } from "../output/patterns.js";
 import { renderResolvedProjectContextBlock } from "./verbose-context.js";
-import path from "node:path";
 import stringWidth from "string-width";
 //#region src/presenters/project.ts
 function renderProjectList(context, descriptor, result) {
@@ -160,13 +160,7 @@ function renderBoundProjectShow(context, descriptor, result) {
 	return lines;
 }
 function formatLocalRepoPath(cwd, env) {
-	const resolved = path.resolve(cwd);
-	const home = env.HOME ? path.resolve(env.HOME) : null;
-	if (home && (resolved === home || resolved.startsWith(`${home}${path.sep}`))) {
-		const relative = path.relative(home, resolved);
-		return relative ? `~/${relative}` : "~";
-	}
-	return resolved;
+	return shortenHomePath(cwd, env);
 }
 function formatGitConnectionDetail(status) {
 	switch (status) {

package/dist/shell/command-runner.js

@@ -1,8 +1,8 @@
 import { CliError, authRequiredError, commandCanceledError } from "./errors.js";
-import { cliErrorToJson, writeHumanError, writeHumanLines, writeJsonError, writeJsonEvent, writeJsonSuccess } from "./output.js";
 import { getCommandDescriptor } from "./command-meta.js";
 import { resolveGlobalFlags } from "./global-flags.js";
 import { createCommandContext } from "./runtime.js";
+import { cliErrorToJson, writeHumanError, writeHumanLines, writeJsonError, writeJsonEvent, writeJsonSuccess } from "./output.js";
 import { collectCommandDiagnostics } from "../lib/diagnostics.js";
 import { renderCommandDiagnostics } from "./diagnostics-output.js";
 import { AuthError } from "@prisma/management-api-sdk";
@@ -18,44 +18,54 @@ function isCancellationError(error) {
 	return error.name === "AbortError" || error.name === "CancelledError";
 }
 async function runCommand(runtime, commandName, options, handler, presenter) {
-	const flags = resolveGlobalFlags(runtime.argv, options);
-	const context = await createCommandContext(runtime, flags);
+	const context = await createCommandContext(runtime, resolveGlobalFlags(runtime.argv, options));
 	const descriptor = getCommandDescriptor(commandName);
 	const startedAt = Date.now();
 	try {
-		const success = await handler(context);
-		if (flags.json) {
-			writeJsonSuccess(context.output, {
-				...success,
-				result: presenter.renderJson ? presenter.renderJson(success.result) : success.result
-			});
-			return;
-		}
-		const stdout = presenter.renderStdout?.(context, descriptor, success.result) ?? [];
-		if (flags.quiet) {
-			if (stdout.length > 0) context.output.stdout.write(`${stdout.join("\n")}\n`);
-			return;
-		}
-		const rendered = presenter.renderHuman(context, descriptor, success.result);
-		const diagnostics = await renderBestEffortCommandDiagnostics(context, {
-			enabled: flags.verbose && rendered.length > 0,
-			durationMs: Date.now() - startedAt
-		});
-		const humanLines = [...rendered, ...diagnostics];
-		if (stdout.length > 0 && humanLines.length > 0) humanLines.push("");
-		writeHumanLines(context.output, humanLines);
-		if (stdout.length > 0) context.output.stdout.write(`${stdout.join("\n")}\n`);
+		await writeCommandSuccess(context, descriptor, await handler(context), presenter, Date.now() - startedAt);
 	} catch (error) {
 		const cliError = toCliError(error, runtime);
 		if (cliError) {
-			if (flags.json) writeJsonError(context.output, commandName, cliError);
-			else writeHumanError(context.output, context.ui, cliError, { trace: flags.trace });
+			writeCommandError(context, commandName, cliError);
 			process.exitCode = cliError.exitCode;
 			return;
 		}
 		throw error;
 	}
 }
+async function writeCommandSuccess(context, descriptor, success, presenter, durationMs) {
+	if (context.flags.json) {
+		writeJsonSuccess(context.output, {
+			...success,
+			result: presenter.renderJson ? presenter.renderJson(success.result) : success.result
+		});
+		return;
+	}
+	const stdout = presenter.renderStdout?.(context, descriptor, success.result) ?? [];
+	if (context.flags.quiet) {
+		writeStdoutLines(context, stdout);
+		return;
+	}
+	const rendered = presenter.renderHuman(context, descriptor, success.result);
+	const diagnostics = await renderBestEffortCommandDiagnostics(context, {
+		enabled: context.flags.verbose && rendered.length > 0,
+		durationMs
+	});
+	const humanLines = [...rendered, ...diagnostics];
+	if (stdout.length > 0 && humanLines.length > 0) humanLines.push("");
+	writeHumanLines(context.output, humanLines);
+	writeStdoutLines(context, stdout);
+}
+function writeCommandError(context, commandName, cliError) {
+	if (context.flags.json) {
+		writeJsonError(context.output, commandName, cliError);
+		return;
+	}
+	writeHumanError(context.output, context.ui, cliError, { trace: context.flags.trace });
+}
+function writeStdoutLines(context, lines) {
+	if (lines.length > 0) context.output.stdout.write(`${lines.join("\n")}\n`);
+}
 async function renderBestEffortCommandDiagnostics(context, options) {
 	if (!options.enabled) return [];
 	try {

package/dist/shell/diagnostics-output.js

@@ -1,5 +1,5 @@
 import { renderVerboseBlock } from "./ui.js";
-import path from "node:path";
+import { shortenHomePath } from "../lib/fs/home-path.js";
 //#region src/shell/diagnostics-output.ts
 function renderCommandDiagnostics(context, diagnostics, rows = [], options = {}) {
 	if (!diagnostics) return [];
@@ -43,13 +43,7 @@ function renderCommandDiagnostics(context, diagnostics, rows = [], options = {})
 	], { title: options.title ?? "Local context" });
 }
 function formatLocalPath(value, env) {
-	const resolved = path.resolve(value);
-	const home = env.HOME ? path.resolve(env.HOME) : null;
-	if (home && (resolved === home || resolved.startsWith(`${home}${path.sep}`))) {
-		const relative = path.relative(home, resolved);
-		return relative ? `~/${relative}` : "~";
-	}
-	return resolved;
+	return shortenHomePath(value, env);
 }
 function formatDirtyState(dirty) {
 	if (dirty === null) return "unknown";

package/dist/shell/help.js

@@ -1,6 +1,6 @@
-import { createShellUi, padDisplay, wrapText } from "./ui.js";
 import { formatDescriptorLabel, getDescriptorForCommand } from "./command-meta.js";
 import { COMPACT_GLOBAL_OPTION_FLAGS, resolveGlobalFlags } from "./global-flags.js";
+import { createShellUi, padDisplay, wrapText } from "./ui.js";
 //#region src/shell/help.ts
 function renderHelp(command, runtime) {
 	const descriptor = getDescriptorForCommand(command);
@@ -10,28 +10,38 @@ function renderHelp(command, runtime) {
 	const visibleCommands = command.commands.filter((candidate) => candidate.name() !== "help" && !candidate.hidden);
 	const visibleOptions = command.options.filter((candidate) => !candidate.hidden);
 	if (visibleCommands.length > 0) lines.push(...renderCommandRows(rail, ui, visibleCommands));
-	if (descriptor.longDescription) {
-		lines.push(`${rail}`);
-		const wrapped = wrapText(descriptor.longDescription, Math.max(ui.width - 3, 40));
-		for (const line of wrapped) lines.push(`${rail}  ${line}`);
-	}
-	if (visibleOptions.length > 0) {
-		if (visibleCommands.length > 0) lines.push(`${rail}`);
-		if (visibleCommands.length > 0 && visibleOptions.every((option) => COMPACT_GLOBAL_OPTION_FLAGS.includes(option.flags))) lines.push(`${rail}  Global options:`);
-		lines.push(...renderOptionRows(rail, ui, visibleOptions));
-	}
-	if (descriptor.examples && descriptor.examples.length > 0) {
-		lines.push(`${rail}`);
-		lines.push(`${rail}  Examples:`);
-		for (const example of descriptor.examples) lines.push(`${rail}    $ ${example}`);
-	}
-	if (descriptor.docsPath) {
-		lines.push(`${rail}`);
-		lines.push(`${rail}  ${ui.accent(padDisplay("Read more", 16))}  ${ui.link(descriptor.docsPath)}`);
-	}
+	lines.push(...renderLongDescription(rail, ui, descriptor.longDescription));
+	lines.push(...renderVisibleOptions(rail, ui, visibleCommands, visibleOptions));
+	lines.push(...renderExamples(rail, descriptor.examples));
+	lines.push(...renderDocsPath(rail, ui, descriptor.docsPath));
 	lines.push("");
 	return `${lines.join("\n")}`;
 }
+function renderLongDescription(rail, ui, longDescription) {
+	if (!longDescription) return [];
+	return [`${rail}`, ...wrapText(longDescription, Math.max(ui.width - 3, 40)).map((line) => `${rail}  ${line}`)];
+}
+function renderVisibleOptions(rail, ui, visibleCommands, visibleOptions) {
+	if (visibleOptions.length === 0) return [];
+	const lines = visibleCommands.length > 0 ? [`${rail}`] : [];
+	if (shouldLabelGlobalOptions(visibleCommands, visibleOptions)) lines.push(`${rail}  Global options:`);
+	return [...lines, ...renderOptionRows(rail, ui, visibleOptions)];
+}
+function shouldLabelGlobalOptions(visibleCommands, visibleOptions) {
+	return visibleCommands.length > 0 && visibleOptions.every((option) => COMPACT_GLOBAL_OPTION_FLAGS.includes(option.flags));
+}
+function renderExamples(rail, examples) {
+	if (!examples || examples.length === 0) return [];
+	return [
+		`${rail}`,
+		`${rail}  Examples:`,
+		...examples.map((example) => `${rail}    $ ${example}`)
+	];
+}
+function renderDocsPath(rail, ui, docsPath) {
+	if (!docsPath) return [];
+	return [`${rail}`, `${rail}  ${ui.accent(padDisplay("Read more", 16))}  ${ui.link(docsPath)}`];
+}
 function renderCommandRows(rail, ui, commands) {
 	return renderAlignedRows(rail, ui, commands.map((command) => {
 		const descriptor = getDescriptorForCommand(command);

package/dist/shell/runtime.js

@@ -1,7 +1,8 @@
-import { createShellUi } from "./ui.js";
 import { LocalStateStore } from "../adapters/local-state.js";
 import { MockApi } from "../adapters/mock-api.js";
+import { createShellUi } from "./ui.js";
 import { renderHelp } from "./help.js";
+import { findComputeConfigDir } from "@prisma/compute-sdk/config";
 import path from "node:path";
 //#region src/shell/runtime.ts
 const DEFAULT_STATE_DIR_NAME = path.join(".prisma", "cli");
@@ -20,7 +21,7 @@ function configureRuntimeCommand(command, runtime) {
 }
 async function createCommandContext(runtime, flags) {
 	const fixturePath = runtime.fixturePath ?? runtime.env.PRISMA_CLI_MOCK_FIXTURE_PATH;
-	const stateDir = resolveStateDir(runtime);
+	const stateDir = await resolveStateDir(runtime);
 	let loadedApi;
 	if (fixturePath) loadedApi = await MockApi.load(fixturePath, runtime.signal);
 	return {
@@ -38,8 +39,11 @@ async function createCommandContext(runtime, flags) {
 		ui: createShellUi(runtime, flags)
 	};
 }
-function resolveStateDir(runtime) {
-	return runtime.stateDir ?? runtime.env.PRISMA_CLI_STATE_DIR ?? path.join(runtime.cwd, DEFAULT_STATE_DIR_NAME);
+async function resolveStateDir(runtime) {
+	const explicitStateDir = runtime.stateDir ?? runtime.env.PRISMA_CLI_STATE_DIR;
+	if (explicitStateDir) return explicitStateDir;
+	const projectDir = await findComputeConfigDir(runtime.cwd, runtime.signal);
+	return path.join(projectDir ?? runtime.cwd, DEFAULT_STATE_DIR_NAME);
 }
 function canPrompt(context) {
 	if (context.flags.json) return false;

package/dist/shell/ui.js

@@ -1,8 +1,9 @@
+import { createColors } from "colorette";
 import stringWidth from "string-width";
 import stripAnsi from "strip-ansi";
 import wrapAnsi from "wrap-ansi";
-import { createColors } from "colorette";
 //#region src/shell/ui.ts
+const URL_CREDENTIALS_PATTERN = /:\/\/[^:@/\s]+:[^@/\s]+@/g;
 const DEFAULT_WIDTH = 80;
 function createShellUi(runtime, flags) {
 	const isTTY = Boolean(runtime.stderr.isTTY);
@@ -73,7 +74,23 @@ function padDisplay(text, width) {
 	return `${text}${" ".repeat(padding)}`;
 }
 function maskValue(value) {
-	return value.replace(/([A-Za-z0-9._%+-]{1,})(?=@)/g, "****").replace(/:\/\/[^:@/\s]+:[^@/\s]+@/g, "://****:****@");
+	return maskEmailLocalParts(value).replace(URL_CREDENTIALS_PATTERN, "://****:****@");
+}
+function maskEmailLocalParts(value) {
+	let masked = "";
+	let segmentStart = 0;
+	for (let index = 0; index < value.length; index += 1) {
+		if (value[index] !== "@") continue;
+		let localStart = index;
+		while (localStart > segmentStart && isEmailLocalPartChar(value[localStart - 1])) localStart -= 1;
+		if (localStart === index) continue;
+		masked += `${value.slice(segmentStart, localStart)}****@`;
+		segmentStart = index + 1;
+	}
+	return masked + value.slice(segmentStart);
+}
+function isEmailLocalPartChar(char) {
+	return char >= "A" && char <= "Z" || char >= "a" && char <= "z" || char >= "0" && char <= "9" || char === "!" || char === "#" || char === "$" || char === "." || char === "&" || char === "'" || char === "*" || char === "%" || char === "+" || char === "-" || char === "/" || char === "=" || char === "?" || char === "^" || char === "_" || char === "`" || char === "{" || char === "|" || char === "}" || char === "~";
 }
 function resolveColorEnabled(runtime, flags, isTTY) {
 	if (flags.color === true) return true;

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-beta.10",
+  "version": "3.0.0-beta.12",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {
     "prisma-cli": "./dist/cli.js"
   },
+  "exports": {
+    "./package.json": "./package.json"
+  },
   "files": [
     "dist",
     "README.md",
@@ -34,13 +37,17 @@
     "url": "https://github.com/prisma/prisma-cli/issues"
   },
   "license": "Apache-2.0",
+  "scripts": {
+    "build": "tsdown",
+    "prepack": "pnpm run build",
+    "test": "vitest run"
+  },
   "dependencies": {
     "@clack/prompts": "^1.5.0",
-    "@prisma/compute-sdk": "^0.22.0",
+    "@prisma/compute-sdk": "^0.28.0",
     "@prisma/credentials-store": "^7.8.0",
     "@prisma/management-api-sdk": "^1.37.0",
     "better-result": "^2.9.2",
-    "c12": "4.0.0-beta.5",
     "colorette": "^2.0.20",
     "commander": "^14.0.3",
     "dotenv": "^17.4.2",
@@ -49,5 +56,12 @@
     "string-width": "^8.2.1",
     "strip-ansi": "^7.2.0",
     "wrap-ansi": "^10.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^22.19.19",
+    "tsdown": "^0.21.10",
+    "tsx": "^4.22.4",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.8"
   }
 }