@prisma/cli 3.0.0-beta.2 → 3.0.0-beta.21

package/dist/presenters/branch.js

@@ -1,111 +1,46 @@
-import { renderList, renderMutate, renderShow, serializeList } from "../output/patterns.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) {
-	return renderList({
-		title: "Listing branches for the resolved project.",
-		descriptor,
-		parentContext: {
-			key: "project",
-			value: result.projectName ?? "not resolved"
-		},
-		items: result.branches.map((branch) => ({
-			noun: "branch",
-			label: branch.name,
-			id: branch.id,
-			status: branch.active ? "active" : null
-		})),
-		emptyMessage: "No branches found."
-	}, context.ui);
+	const ui = context.ui;
+	const lines = [`${ui.strong(formatDescriptorLabel(descriptor))} ${ui.dim("→")} ${ui.dim("Listing branches for the resolved project.")}`, ""];
+	const rail = ui.dim("│");
+	lines.push(`${rail}  ${ui.accent("project:")}  ${result.projectName}`);
+	lines.push(rail);
+	if (result.branches.length === 0) {
+		lines.push(`${rail}  ${ui.dim("No branches found.")}`);
+		lines.push(...renderBranchResolvedContextBlock(context, result));
+		return lines;
+	}
+	const widths = [
+		Math.max(4, ...result.branches.map((branch) => branch.name.length)),
+		Math.max(4, ...result.branches.map((branch) => branch.role.length)),
+		Math.max(7, ...result.branches.map((branch) => branch.envMap.length))
+	];
+	lines.push(`${rail}  ${ui.accent(formatColumns([
+		"Name",
+		"Role",
+		"Env map"
+	], widths))}`);
+	for (const branch of result.branches) lines.push(`${rail}  ${formatColumns([
+		branch.name,
+		branch.role,
+		branch.envMap
+	], widths)}`);
+	lines.push(...renderBranchResolvedContextBlock(context, result));
+	return lines;
 }
 function serializeBranchList(result) {
-	return serializeList({
-		context: { project: result.projectName ?? "not resolved" },
-		items: result.branches.map((branch) => ({
-			noun: "branch",
-			label: branch.name,
-			id: branch.id,
-			status: branch.active ? "active" : null
-		}))
-	});
-}
-function serializeBranchShow(result) {
+	const { verboseContext: _verboseContext, ...serializable } = result;
 	return {
-		projectId: result.projectId,
-		projectName: result.projectName,
-		branch: {
-			name: result.branch.name,
-			kind: result.branch.kind,
-			active: result.branch.active,
-			remoteState: result.branch.remoteState,
-			liveDeployment: result.branch.liveDeployment
-		}
+		projectId: serializable.projectId,
+		projectName: serializable.projectName,
+		branches: serializable.branches
 	};
 }
-function renderBranchShow(context, descriptor, result) {
-	const fields = [
-		{
-			key: "project",
-			value: result.projectName ?? "not resolved",
-			tone: result.projectName ? "default" : "dim"
-		},
-		{
-			key: "branch",
-			value: result.branch.name,
-			tone: result.branch.active ? "success" : "default"
-		},
-		{
-			key: "kind",
-			value: result.branch.kind
-		}
-	];
-	if (result.branch.liveDeployment) {
-		fields.push({
-			key: "status",
-			value: result.branch.liveDeployment.status,
-			tone: toneForDeploymentStatus(result.branch.liveDeployment.status)
-		});
-		if (result.branch.liveDeployment.url) fields.push({
-			key: "url",
-			value: result.branch.liveDeployment.url,
-			tone: "link"
-		});
-	} else if (!result.branch.remoteState) fields.push({
-		key: "remote state",
-		value: "not created yet",
-		tone: "dim"
-	});
-	return renderShow({
-		title: "Showing the current active branch context.",
-		descriptor,
-		fields
-	}, context.ui);
-}
-function toneForDeploymentStatus(status) {
-	if (status === "ready" || status === "active" || status === "healthy") return "success";
-	if (status === "pending" || status === "building" || status === "starting") return "warning";
-	if (status === "failed" || status === "error") return "error";
-	return "default";
-}
-function renderBranchUse(context, descriptor, result) {
-	return renderMutate({
-		title: "Changing the local default branch context.",
-		descriptor,
-		context: [{
-			key: "project",
-			value: result.projectName ?? "not resolved",
-			tone: result.projectName ? "default" : "dim"
-		}, {
-			key: "branch",
-			value: result.branch.name
-		}],
-		operationDescription: "Applying active branch change",
-		operationCount: 1,
-		details: ["Active branch updated in local CLI state for this repo."],
-		alerts: result.branch.kind === "production" ? [{
-			tone: "warning",
-			text: "Production is protected and durable. Use with care"
-		}] : void 0
-	}, context.ui);
+function renderBranchResolvedContextBlock(context, result) {
+	return renderResolvedProjectContextBlock(context.ui, result.verboseContext);
 }
 //#endregion
-export { renderBranchList, renderBranchShow, renderBranchUse, serializeBranchList, serializeBranchShow };
+export { renderBranchList, serializeBranchList };

package/dist/presenters/database.js

@@ -0,0 +1,274 @@
+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
+function renderDatabaseList(context, descriptor, result) {
+	const ui = context.ui;
+	const lines = [`${ui.strong(formatDescriptorLabel(descriptor))} ${ui.dim("→")} ${ui.dim("Listing databases for the resolved project.")}`, ""];
+	const rail = ui.dim("│");
+	lines.push(`${rail}  ${ui.accent("project:")}  ${result.projectName}`);
+	if (result.branchName) lines.push(`${rail}  ${ui.accent("branch:")}   ${result.branchName}`);
+	lines.push(rail);
+	if (result.databases.length === 0) {
+		lines.push(`${rail}  ${ui.dim("No databases found.")}`);
+		lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+		return lines;
+	}
+	const rows = result.databases.map((database) => [
+		database.name,
+		database.branchName ?? "unscoped",
+		database.region ?? "unknown",
+		formatStatus(database),
+		database.id
+	]);
+	const widths = [
+		Math.max(4, ...rows.map((row) => row[0].length)),
+		Math.max(6, ...rows.map((row) => row[1].length)),
+		Math.max(6, ...rows.map((row) => row[2].length)),
+		Math.max(6, ...rows.map((row) => row[3].length)),
+		Math.max(2, ...rows.map((row) => row[4].length))
+	];
+	lines.push(`${rail}  ${ui.accent(formatColumns([
+		"Name",
+		"Branch",
+		"Region",
+		"Status",
+		"Id"
+	], widths))}`);
+	for (const row of rows) lines.push(`${rail}  ${formatColumns(row, widths)}`);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
+}
+function serializeDatabaseList(result) {
+	return {
+		...serializeList({
+			context: {
+				project: result.projectName,
+				...result.branchName ? { branch: result.branchName } : {}
+			},
+			items: result.databases.map((database) => ({
+				noun: "database",
+				label: database.name,
+				id: database.id,
+				status: database.isDefault ? "default" : null
+			}))
+		}),
+		projectId: result.projectId,
+		branchName: result.branchName,
+		databases: result.databases
+	};
+}
+function renderDatabaseShow(context, descriptor, result) {
+	const lines = renderShow({
+		title: "Showing database metadata.",
+		descriptor,
+		fields: [
+			{
+				key: "project",
+				value: result.projectName
+			},
+			{
+				key: "database",
+				value: result.database.name
+			},
+			{
+				key: "id",
+				value: result.database.id,
+				tone: "dim"
+			},
+			{
+				key: "branch",
+				value: result.database.branchName ?? "unscoped",
+				tone: result.database.branchName ? "default" : "dim"
+			},
+			{
+				key: "region",
+				value: result.database.region ?? "unknown",
+				tone: result.database.region ? "default" : "dim"
+			},
+			{
+				key: "status",
+				value: formatStatus(result.database)
+			},
+			{
+				key: "connections",
+				value: String(result.connections.length)
+			}
+		]
+	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
+}
+function serializeDatabaseShow(result) {
+	return stripVerboseContext(result);
+}
+function renderDatabaseCreateStdout(_context, _descriptor, result) {
+	return [result.connectionString];
+}
+function renderDatabaseCreate(context, _descriptor, result) {
+	const ui = context.ui;
+	const lines = [
+		"Creating database...",
+		renderSummaryLine(ui, "success", `Created database "${result.database.name}" in ${formatDatabaseTarget(result.projectName, result.database.branchName)}.`),
+		"  The connection URL below is shown once, so save it now."
+	];
+	if (ui.verbose) {
+		lines.push("");
+		lines.push(...renderDatabaseCreateVerboseRows(context, result));
+	}
+	return lines;
+}
+function serializeDatabaseCreate(result) {
+	return stripVerboseContext(result);
+}
+function renderDatabaseRemove(context, descriptor, result) {
+	const lines = renderMutate({
+		title: "Removing database.",
+		descriptor,
+		context: [
+			{
+				key: "project",
+				value: result.projectName
+			},
+			{
+				key: "database",
+				value: result.database.name
+			},
+			{
+				key: "id",
+				value: result.database.id,
+				tone: "dim"
+			}
+		],
+		operationDescription: "Removing database",
+		operationCount: 1,
+		details: ["Database and its connection metadata were removed."]
+	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
+}
+function serializeDatabaseRemove(result) {
+	return stripVerboseContext(result);
+}
+function renderDatabaseConnectionList(context, descriptor, result) {
+	const ui = context.ui;
+	const lines = [`${ui.strong(formatDescriptorLabel(descriptor))} ${ui.dim("→")} ${ui.dim("Listing database connection metadata.")}`, ""];
+	const rail = ui.dim("│");
+	lines.push(`${rail}  ${ui.accent("database:")}  ${result.database.name}`);
+	lines.push(rail);
+	if (result.connections.length === 0) {
+		lines.push(`${rail}  ${ui.dim("No database connections found.")}`);
+		lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+		return lines;
+	}
+	const rows = result.connections.map((connection) => [
+		connection.name,
+		connection.id,
+		connection.createdAt ?? "unknown"
+	]);
+	const widths = [
+		Math.max(4, ...rows.map((row) => row[0].length)),
+		Math.max(2, ...rows.map((row) => row[1].length)),
+		Math.max(7, ...rows.map((row) => row[2].length))
+	];
+	lines.push(`${rail}  ${ui.accent(formatColumns([
+		"Name",
+		"Id",
+		"Created"
+	], widths))}`);
+	for (const row of rows) lines.push(`${rail}  ${formatColumns(row, widths)}`);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
+}
+function serializeDatabaseConnectionList(result) {
+	return {
+		...serializeList({
+			context: {
+				project: result.projectName,
+				database: result.database.name
+			},
+			items: result.connections.map((connection) => ({
+				noun: "connection",
+				label: connection.name,
+				id: connection.id,
+				status: null
+			}))
+		}),
+		projectId: result.projectId,
+		database: result.database,
+		connections: result.connections
+	};
+}
+function renderDatabaseConnectionCreateStdout(_context, _descriptor, result) {
+	return [result.connectionString];
+}
+function renderDatabaseConnectionCreate(context, _descriptor, result) {
+	const ui = context.ui;
+	const lines = [
+		"Creating connection...",
+		renderSummaryLine(ui, "success", `Added a connection to "${result.database.name}" in ${formatDatabaseTarget(result.projectName, result.database.branchName)}.`),
+		"  The connection URL below is shown once, so save it now."
+	];
+	if (ui.verbose) {
+		lines.push("");
+		lines.push(...renderDatabaseConnectionCreateVerboseRows(context, result));
+	}
+	return lines;
+}
+function serializeDatabaseConnectionCreate(result) {
+	return stripVerboseContext(result);
+}
+function renderDatabaseConnectionRemove(context, descriptor, result) {
+	return renderMutate({
+		title: "Removing database connection.",
+		descriptor,
+		context: [{
+			key: "connection",
+			value: result.connection.id,
+			tone: "dim"
+		}],
+		operationDescription: "Removing database connection",
+		operationCount: 1,
+		details: ["The connection metadata was removed. Existing one-time secrets were not shown."]
+	}, context.ui);
+}
+function serializeDatabaseConnectionRemove(result) {
+	return { connection: result.connection };
+}
+function formatStatus(database) {
+	return database.status ?? (database.isDefault ? "default" : "unknown");
+}
+function formatDatabaseTarget(projectName, branchName) {
+	return branchName ? `${projectName} / ${branchName}` : projectName;
+}
+function renderDatabaseCreateVerboseRows(context, result) {
+	return renderMetadataRows([
+		...renderWorkspaceProjectRows(result),
+		["branch", result.database.branchName ?? "unscoped"],
+		["database", formatResourceWithId(context, result.database.name, result.database.id)],
+		["region", result.database.region ?? "unknown"],
+		["status", formatStatus(result.database)],
+		["connection", formatResourceWithId(context, result.connection.name, result.connection.id)]
+	]);
+}
+function renderDatabaseConnectionCreateVerboseRows(context, result) {
+	return renderMetadataRows([
+		...renderWorkspaceProjectRows(result),
+		["branch", result.database.branchName ?? "unscoped"],
+		["database", formatResourceWithId(context, result.database.name, result.database.id)],
+		["connection", formatResourceWithId(context, result.connection.name, result.connection.id)]
+	]);
+}
+function renderWorkspaceProjectRows(result) {
+	return [...result.verboseContext ? [["workspace", result.verboseContext.workspace.name]] : [], ["project", result.projectName]];
+}
+function formatResourceWithId(context, name, id) {
+	return `${name}  ${context.ui.dim(`(${id})`)}`;
+}
+function renderMetadataRows(rows) {
+	const widths = [Math.max(...rows.map((row) => row[0].length)), 0];
+	return rows.map(([key, value]) => `  ${formatColumns([key, value], widths)}`);
+}
+//#endregion
+export { renderDatabaseConnectionCreate, renderDatabaseConnectionCreateStdout, renderDatabaseConnectionList, renderDatabaseConnectionRemove, renderDatabaseCreate, renderDatabaseCreateStdout, renderDatabaseList, renderDatabaseRemove, renderDatabaseShow, serializeDatabaseConnectionCreate, serializeDatabaseConnectionList, serializeDatabaseConnectionRemove, serializeDatabaseCreate, serializeDatabaseList, serializeDatabaseRemove, serializeDatabaseShow };

package/dist/presenters/project.js

@@ -1,25 +1,25 @@
-import { padDisplay, renderNextSteps, renderSummaryLine } from "../shell/ui.js";
-import { formatDescriptorLabel } from "../shell/command-meta.js";
 import { formatCommandArgument } from "../shell/command-arguments.js";
-import { renderList, renderMutate, renderShow, serializeList } from "../output/patterns.js";
-import path from "node:path";
+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 { renderMutate, renderShow, serializeList } from "../output/patterns.js";
+import { renderResolvedProjectContextBlock } from "./verbose-context.js";
+import stringWidth from "string-width";
 //#region src/presenters/project.ts
 function renderProjectList(context, descriptor, result) {
-	const lines = renderList({
-		title: "Listing projects for the authenticated workspace.",
-		descriptor,
-		parentContext: {
-			key: "workspace",
-			value: result.workspace.name
-		},
-		items: result.projects.map((project) => ({
-			noun: "project",
-			label: project.name,
-			id: project.id,
-			status: null
-		})),
-		emptyMessage: "No projects found."
-	}, context.ui);
+	const ui = context.ui;
+	const rail = ui.dim("│");
+	const lines = [`${ui.strong(formatDescriptorLabel(descriptor))} ${ui.dim("→")} ${ui.dim("Listing projects for the authenticated workspace.")}`, ""];
+	lines.push(`${rail}  ${ui.accent("workspace:")}  ${result.workspace.name}`);
+	if (result.projects.length === 0) {
+		lines.push(`${rail}  ${ui.dim("No projects found.")}`);
+		if (result.localBinding?.status === "not-linked" || result.localBinding?.status === "invalid") lines.push(...renderNextSteps(["Link an existing Project you choose: prisma-cli project link <id-or-name>", "Create a new Project: prisma-cli project create <name>"]));
+		return lines;
+	}
+	const nameWidth = Math.max(4, ...result.projects.map((project) => stringWidth(project.name)));
+	lines.push(rail);
+	lines.push(`${rail}  ${ui.accent(padDisplay("name", nameWidth))}  ${ui.accent("id")}`);
+	for (const project of result.projects) lines.push(`${rail}  ${padDisplay(project.name, nameWidth)}  ${project.id}`);
 	if (result.localBinding?.status === "not-linked" || result.localBinding?.status === "invalid") lines.push(...renderNextSteps(["Link an existing Project you choose: prisma-cli project link <id-or-name>", "Create a new Project: prisma-cli project create <name>"]));
 	return lines;
 }
@@ -51,6 +51,25 @@ function renderProjectShow(context, descriptor, result) {
 				tone: "warning"
 			}]
 		}, context.ui);
+		lines.push(...renderVerboseBlock(context.ui, [
+			{
+				key: "workspace",
+				value: result.workspace.name
+			},
+			{
+				key: "workspace id",
+				value: result.workspace.id,
+				tone: "dim"
+			},
+			{
+				key: "project source",
+				value: "unbound"
+			},
+			{
+				key: "suggested name",
+				value: `${result.suggestedProjectName} (${result.suggestedProjectNameSource})`
+			}
+		], { title: "Resolved context" }));
 		lines.push(...renderNextSteps(["Link an existing Project you choose: prisma-cli project link <id-or-name>", `Create a new Project: prisma-cli project create ${formatCommandArgument(result.suggestedProjectName)}`]));
 		return lines;
 	}
@@ -133,16 +152,15 @@ function renderBoundProjectShow(context, descriptor, result) {
 		lines.push(rail);
 		lines.push(`${rail}  ${ui.dim("→")} ${ui.link(result.project.url)}`);
 	}
+	lines.push(...renderResolvedProjectContextBlock(context.ui, {
+		workspace: result.workspace,
+		project: result.project,
+		resolution: result.resolution
+	}));
 	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/presenters/verbose-context.js

@@ -0,0 +1,64 @@
+import { renderVerboseBlock } from "../shell/ui.js";
+//#region src/presenters/verbose-context.ts
+function renderResolvedProjectContextBlock(ui, context, options = {}) {
+	if (!context) return [];
+	return renderVerboseBlock(ui, [...projectResolutionRows(context), ...options.extraRows ?? []], { title: options.title ?? "Resolved context" });
+}
+function projectResolutionRows(context) {
+	return [
+		{
+			key: "workspace",
+			value: context.workspace.name
+		},
+		{
+			key: "workspace id",
+			value: context.workspace.id,
+			tone: "dim"
+		},
+		{
+			key: "project",
+			value: context.project.name
+		},
+		{
+			key: "project id",
+			value: context.project.id,
+			tone: "dim"
+		},
+		{
+			key: "project source",
+			value: formatProjectSource(context.resolution.projectSource)
+		},
+		...context.resolution.targetName ? [{
+			key: "target name",
+			value: formatTargetName(context.resolution)
+		}] : [],
+		...context.branch ? [{
+			key: "branch",
+			value: `${context.branch.name} (${context.branch.kind})`
+		}, ...context.branch.id ? [{
+			key: "branch id",
+			value: context.branch.id,
+			tone: "dim"
+		}] : []] : []
+	];
+}
+function stripVerboseContext(result) {
+	const { verboseContext: _verboseContext, ...serialized } = result;
+	return serialized;
+}
+function formatProjectSource(source) {
+	switch (source) {
+		case "explicit": return "--project";
+		case "env": return "environment";
+		case "local-pin": return ".prisma/local.json";
+		case "platform-mapping": return "platform mapping";
+		case "created": return "created";
+		case "prompt": return "prompt";
+		case "unbound": return "unbound";
+	}
+}
+function formatTargetName(resolution) {
+	return resolution.targetNameSource ? `${resolution.targetName} (${resolution.targetNameSource})` : String(resolution.targetName);
+}
+//#endregion
+export { renderResolvedProjectContextBlock, stripVerboseContext };

package/dist/shell/cli-command.js

@@ -0,0 +1,12 @@
+const PRISMA_CLI_PACKAGE_SPEC = `@prisma/cli@latest`;
+const DEFAULT_PRISMA_CLI_PACKAGE_RUNNER = ["npx", "-y"];
+const PRISMA_CLI_BINARY = "prisma-cli";
+function formatPrismaCliCommand(args, options = {}) {
+	return [...getPrismaCliCommandPrefix(options), ...args].join(" ");
+}
+function getPrismaCliCommandPrefix({ invocation = "package", packageRunner = DEFAULT_PRISMA_CLI_PACKAGE_RUNNER }) {
+	if (invocation === "binary") return [PRISMA_CLI_BINARY];
+	return [...packageRunner, PRISMA_CLI_PACKAGE_SPEC];
+}
+//#endregion
+export { formatPrismaCliCommand };

package/dist/shell/command-arguments.js

@@ -2,5 +2,11 @@
 function formatCommandArgument(value) {
 	return /^[A-Za-z0-9._/-]+$/.test(value) && !value.startsWith("-") ? value : `'${value.replace(/'/g, "'\\''")}'`;
 }
+function formatShellCommand(command) {
+	return command.map(formatShellCommandWord).join(" ");
+}
+function formatShellCommandWord(value) {
+	return /^[A-Za-z0-9_./:@=-]+$/.test(value) ? value : `'${value.replace(/'/g, "'\\''")}'`;
+}
 //#endregion
-export { formatCommandArgument };
+export { formatCommandArgument, formatShellCommand };