@prisma/cli 3.0.0-beta.4 → 3.0.0-beta.6

package/dist/lib/project/resolution.js

@@ -5,8 +5,12 @@ import { readFile } from "node:fs/promises";
 import path from "node:path";
 //#region src/lib/project/resolution.ts
 async function resolveProjectTarget(options) {
+	const localPin = await readImplicitLocalPin(options, { allowEnvProjectId: true });
 	const projects = await options.listProjects();
-	const target = await resolveBoundProjectTarget(options, projects, { allowEnvProjectId: true });
+	const target = await resolveBoundProjectTarget(options, projects, {
+		allowEnvProjectId: true,
+		localPin
+	});
 	if (target) return target;
 	throw await projectSetupRequiredError({
 		cwd: options.context.runtime.cwd,
@@ -16,8 +20,12 @@ async function resolveProjectTarget(options) {
 	});
 }
 async function inspectProjectBinding(options) {
+	const localPin = await readImplicitLocalPin(options, { allowEnvProjectId: false });
 	const projects = await options.listProjects();
-	const target = await resolveBoundProjectTarget(options, projects, { allowEnvProjectId: false });
+	const target = await resolveBoundProjectTarget(options, projects, {
+		allowEnvProjectId: false,
+		localPin
+	});
 	if (target) return target;
 	return {
 		workspace: options.workspace,
@@ -73,6 +81,28 @@ function localStateStaleError() {
 		nextSteps: ["prisma-cli project list", "prisma-cli project link <id-or-name>"]
 	});
 }
+function localProjectWorkspaceMismatchError(options) {
+	return new CliError({
+		code: "LOCAL_PROJECT_WORKSPACE_MISMATCH",
+		domain: "project",
+		summary: "Project link uses another workspace",
+		why: `${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} links this directory to project ${options.pinnedProjectId} in workspace ${options.pinnedWorkspaceId}, but your current CLI session is workspace "${options.activeWorkspace.name}" (${options.activeWorkspace.id}).`,
+		fix: "Sign in to the linked workspace, or relink this directory to a project in the current workspace.",
+		meta: {
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH,
+			pinnedWorkspaceId: options.pinnedWorkspaceId,
+			pinnedProjectId: options.pinnedProjectId,
+			activeWorkspaceId: options.activeWorkspace.id,
+			activeWorkspaceName: options.activeWorkspace.name
+		},
+		exitCode: 1,
+		nextSteps: [
+			"prisma-cli auth login",
+			"prisma-cli project list",
+			"prisma-cli project link <id-or-name>"
+		]
+	});
+}
 async function buildProjectSetupSuggestion(options) {
 	const suggestedName = await inferTargetName(options.cwd, options.signal);
 	const candidates = sortProjects(options.projects.filter((project) => projectMatchesSuggestedName(project, suggestedName.name))).map(toProjectSummary);
@@ -192,10 +222,15 @@ async function resolveBoundProjectTarget(options, projects, settings) {
 			targetNameSource: "env"
 		});
 	}
-	const localPin = await readLocalResolutionPin(options.context.runtime.cwd, options.context.runtime.signal);
+	const localPin = settings.localPin;
+	if (!localPin) return null;
 	if (localPin.kind === "invalid") throw localStateStaleError();
 	if (localPin.kind === "present") {
-		if (localPin.pin.workspaceId !== options.workspace.id) throw localStateStaleError();
+		if (localPin.pin.workspaceId !== options.workspace.id) throw localProjectWorkspaceMismatchError({
+			pinnedWorkspaceId: localPin.pin.workspaceId,
+			pinnedProjectId: localPin.pin.projectId,
+			activeWorkspace: options.workspace
+		});
 		const project = projects.find((candidate) => candidate.id === localPin.pin.projectId);
 		if (!project) throw localStateStaleError();
 		return resolvedTarget(options.workspace, project, "local-pin", {
@@ -210,6 +245,16 @@ async function resolveBoundProjectTarget(options, projects, settings) {
 	});
 	return null;
 }
+async function readImplicitLocalPin(options, settings) {
+	if (options.explicitProject || settings.allowEnvProjectId && options.envProjectId) return null;
+	const localPin = await readLocalResolutionPin(options.context.runtime.cwd, options.context.runtime.signal);
+	if (localPin.kind === "present" && localPin.pin.workspaceId !== options.workspace.id) throw localProjectWorkspaceMismatchError({
+		pinnedWorkspaceId: localPin.pin.workspaceId,
+		pinnedProjectId: localPin.pin.projectId,
+		activeWorkspace: options.workspace
+	});
+	return localPin;
+}
 function resolvedTarget(workspace, project, projectSource, resolutionDetails) {
 	return {
 		workspace,

package/dist/presenters/app-env.js

@@ -1,4 +1,6 @@
+import { renderVerboseBlock } from "../shell/ui.js";
 import { renderList, renderShow, serializeList } from "../output/patterns.js";
+import { renderResolvedProjectContextBlock, stripVerboseContext } from "./verbose-context.js";
 //#region src/presenters/app-env.ts
 function scopeLabel(scope) {
 	if (scope.kind === "role") return scope.role ?? "unknown";
@@ -14,8 +16,102 @@ function listTargetLabel(result) {
 	}
 	return scopeLabel(result.scope);
 }
+function renderEnvVerboseBlocks(context, result) {
+	return [...renderEnvResolvedContextBlock(context, result.verboseContext), ...renderEnvTargetBlock(context, result)];
+}
+function renderEnvResolvedContextBlock(context, verboseContext) {
+	return renderResolvedProjectContextBlock(context.ui, verboseContext);
+}
+function renderEnvTargetBlock(context, result) {
+	return renderVerboseBlock(context.ui, envTargetRows(result), { title: "Env target" });
+}
+function envTargetRows(result) {
+	return [
+		{
+			key: "project id",
+			value: result.projectId,
+			tone: "dim"
+		},
+		{
+			key: "scope",
+			value: scopeLabel(result.scope)
+		},
+		...envListTargetRows(result),
+		...envFileRows(result),
+		{
+			key: "keys",
+			value: formatKeyNames(envResultKeys(result)),
+			tone: envResultKeys(result).length > 0 ? "default" : "dim"
+		}
+	];
+}
+function envListTargetRows(result) {
+	if (!("target" in result)) return [];
+	return [
+		{
+			key: "target source",
+			value: result.target.source
+		},
+		{
+			key: "env map",
+			value: result.target.envMap
+		},
+		...result.target.branchName ? [{
+			key: "branch",
+			value: result.target.branchName
+		}] : [],
+		...result.target.branchId ? [{
+			key: "branch id",
+			value: result.target.branchId,
+			tone: "dim"
+		}] : [],
+		...result.target.branchExists === false ? [{
+			key: "branch state",
+			value: "not created yet",
+			tone: "warning"
+		}] : []
+	];
+}
+function envFileRows(result) {
+	if (!("file" in result) || !result.file) return [];
+	return [{
+		key: "file",
+		value: result.file.path
+	}, {
+		key: "file count",
+		value: String(result.file.count)
+	}];
+}
+function envResultKeys(result) {
+	if ("variables" in result && result.variables) return result.variables.map((variable) => variable.key).sort((left, right) => left.localeCompare(right));
+	if ("variable" in result && result.variable) return [result.variable.key];
+	if ("key" in result) return [result.key];
+	return [];
+}
+function formatKeyNames(keys) {
+	return keys.length > 0 ? keys.join(", ") : "none";
+}
 function renderEnvAdd(context, descriptor, result) {
-	return renderShow({
+	if (result.variables !== void 0) {
+		const lines = renderList({
+			title: "Setting new environment variables from file.",
+			descriptor,
+			parentContext: {
+				key: "target",
+				value: `${scopeLabel(result.scope)} from ${result.file.path}`
+			},
+			items: result.variables.map((variable) => ({
+				noun: "variable",
+				label: `${variable.key} (${variable.source})`,
+				id: variable.id,
+				status: variable.isManagedBySystem ? "default" : null
+			})),
+			emptyMessage: "No environment variables imported."
+		}, context.ui);
+		lines.push(...renderEnvVerboseBlocks(context, result));
+		return lines;
+	}
+	const lines = renderShow({
 		title: "Setting a new environment variable.",
 		descriptor,
 		fields: [
@@ -43,12 +139,33 @@ function renderEnvAdd(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvAdd(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderEnvUpdate(context, descriptor, result) {
-	return renderShow({
+	if (result.variables !== void 0) {
+		const lines = renderList({
+			title: "Replacing environment variable values from file.",
+			descriptor,
+			parentContext: {
+				key: "target",
+				value: `${scopeLabel(result.scope)} from ${result.file.path}`
+			},
+			items: result.variables.map((variable) => ({
+				noun: "variable",
+				label: `${variable.key} (${variable.source})`,
+				id: variable.id,
+				status: variable.isManagedBySystem ? "default" : null
+			})),
+			emptyMessage: "No environment variables updated."
+		}, context.ui);
+		lines.push(...renderEnvVerboseBlocks(context, result));
+		return lines;
+	}
+	const lines = renderShow({
 		title: "Replacing the environment variable's value.",
 		descriptor,
 		fields: [
@@ -76,12 +193,14 @@ function renderEnvUpdate(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvUpdate(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderEnvList(context, descriptor, result) {
-	return renderList({
+	const lines = renderList({
 		title: "Listing environment variables for the selected scope.",
 		descriptor,
 		parentContext: {
@@ -96,26 +215,29 @@ function renderEnvList(context, descriptor, result) {
 		})),
 		emptyMessage: "No environment variables defined in this scope."
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvList(result) {
+	const serializable = stripVerboseContext(result);
 	return {
-		projectId: result.projectId,
-		scope: result.scope,
-		target: result.target,
+		projectId: serializable.projectId,
+		scope: serializable.scope,
+		target: serializable.target,
 		...serializeList({
-			context: { target: listTargetLabel(result) },
-			items: result.variables.map((variable) => ({
+			context: { target: listTargetLabel(serializable) },
+			items: serializable.variables.map((variable) => ({
 				noun: "variable",
 				label: `${variable.key} (${variable.source})`,
 				id: variable.id,
 				status: variable.isManagedBySystem ? "default" : null
 			}))
 		}),
-		variables: result.variables
+		variables: serializable.variables
 	};
 }
 function renderEnvRm(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: "Removing the environment variable from the scope.",
 		descriptor,
 		fields: [
@@ -133,9 +255,11 @@ function renderEnvRm(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvRm(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 //#endregion
 export { renderEnvAdd, renderEnvList, renderEnvRm, renderEnvUpdate, serializeEnvAdd, serializeEnvList, serializeEnvRm, serializeEnvUpdate };

package/dist/presenters/app.js

@@ -1,6 +1,8 @@
+import { renderVerboseBlock } from "../shell/ui.js";
 import { renderDeployOutputRows } from "../lib/app/deploy-output.js";
 import { formatDomainFailureFix } from "../lib/app/domain-guidance.js";
 import { renderList, renderShow, serializeList } from "../output/patterns.js";
+import { renderResolvedProjectContextBlock, stripVerboseContext } from "./verbose-context.js";
 //#region src/presenters/app.ts
 function renderAppBuild(context, descriptor, result) {
 	return renderShow({
@@ -30,23 +32,153 @@ function renderAppDeploy(context, descriptor, result) {
 	return [
 		`Live in ${formatDuration(result.durationMs)}`,
 		...result.deployment.url ? [context.ui.link(result.deployment.url)] : [],
+		...renderBranchDatabaseDeploySummary(context, result),
 		"",
 		...renderDeployOutputRows(context.ui, [{
 			label: "Logs",
 			value: "prisma-cli app logs"
-		}])
+		}]),
+		...renderDeployResolvedContextBlock(context, result),
+		...renderDeploySettingsBlock(context, result)
 	];
 }
 function serializeAppDeploy(result) {
-	const { localPin: _localPin, ...serialized } = result;
-	return serialized;
+	const { deploySettings: _deploySettings, localPin: _localPin, ...serialized } = result;
+	const { id: _branchId, ...branch } = serialized.branch;
+	return {
+		...serialized,
+		branch
+	};
+}
+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";
+	}
 }
 function formatDuration(durationMs) {
 	if (durationMs < 1e3) return `${durationMs}ms`;
 	return `${(durationMs / 1e3).toFixed(1)}s`;
 }
+function renderDeployResolvedContextBlock(context, result) {
+	return renderResolvedProjectContextBlock(context.ui, {
+		workspace: result.workspace,
+		project: result.project,
+		resolution: result.resolution,
+		branch: {
+			id: result.branch.id,
+			name: result.branch.name,
+			kind: result.branch.kind
+		}
+	}, { extraRows: [
+		{
+			key: "app",
+			value: result.app.name
+		},
+		{
+			key: "app id",
+			value: result.app.id,
+			tone: "dim"
+		},
+		{
+			key: "deployment id",
+			value: result.deployment.id,
+			tone: "dim"
+		},
+		{
+			key: "deployment status",
+			value: result.deployment.status
+		},
+		...result.localPin ? [{
+			key: "local pin",
+			value: result.localPin.path
+		}] : [],
+		{
+			key: "deploy duration",
+			value: formatDuration(result.durationMs)
+		}
+	] });
+}
+function renderDeploySettingsBlock(context, result) {
+	return renderVerboseBlock(context.ui, [...deploySettingsRows(result.deploySettings), ...branchDatabaseRows(result.branchDatabase)], { title: "Deploy settings" });
+}
+function deploySettingsRows(settings) {
+	return [
+		{
+			key: "framework",
+			value: `${settings.framework.name} (${settings.framework.buildType})`
+		},
+		{
+			key: "framework source",
+			value: settings.framework.source,
+			tone: "dim"
+		},
+		{
+			key: "entrypoint",
+			value: settings.entrypoint ?? "derived from build output",
+			tone: settings.entrypoint ? "default" : "dim"
+		},
+		{
+			key: "http port",
+			value: String(settings.httpPort)
+		},
+		{
+			key: "region",
+			value: settings.region ?? "existing app region",
+			tone: settings.region ? "default" : "dim"
+		},
+		{
+			key: "env vars",
+			value: formatEnvVarNames(settings.envVars),
+			tone: settings.envVars.length > 0 ? "default" : "dim"
+		}
+	];
+}
+function branchDatabaseRows(branchDatabase) {
+	if (!branchDatabase) return [{
+		key: "branch db",
+		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})`
+		}] : []
+	];
+}
+function formatEnvVarNames(envVars) {
+	return envVars.length > 0 ? envVars.join(", ") : "none";
+}
 function renderAppListDeploys(context, descriptor, result) {
-	return renderList({
+	const lines = renderList({
 		title: "Listing deployments for the selected app.",
 		descriptor,
 		parentContext: {
@@ -61,20 +193,23 @@ function renderAppListDeploys(context, descriptor, result) {
 		})),
 		emptyMessage: result.app ? "No deployments found." : "No apps found."
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppListDeploys(result) {
-	if (!result.app) return {
-		projectId: result.projectId,
+	const { verboseContext: _verboseContext, ...serializable } = result;
+	if (!serializable.app) return {
+		projectId: serializable.projectId,
 		app: null,
 		items: [],
 		count: 0
 	};
 	return {
-		projectId: result.projectId,
-		app: result.app,
+		projectId: serializable.projectId,
+		app: serializable.app,
 		...serializeList({
-			context: { app: result.app.name },
-			items: result.deployments.map((deployment) => ({
+			context: { app: serializable.app.name },
+			items: serializable.deployments.map((deployment) => ({
 				noun: "deployment",
 				label: deployment.id,
 				id: deployment.id,
@@ -84,7 +219,7 @@ function serializeAppListDeploys(result) {
 	};
 }
 function renderAppShow(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: "Showing the selected app state.",
 		descriptor,
 		fields: [
@@ -114,9 +249,11 @@ function renderAppShow(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppShow(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderAppShowDeploy(context, descriptor, result) {
 	return renderShow({
@@ -158,7 +295,7 @@ function serializeAppShowDeploy(result) {
 	return result;
 }
 function renderAppOpen(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: result.opened ? "Opening the live URL for the selected app." : "Resolving the live URL for the selected app.",
 		descriptor,
 		fields: [
@@ -182,9 +319,11 @@ function renderAppOpen(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppOpen(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderAppDomainAdd(context, descriptor, result) {
 	return renderShow({
@@ -286,7 +425,7 @@ function serializeAppDomainRetry(result) {
 	return result;
 }
 function renderAppPromote(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: "Switching the live deployment for the selected app.",
 		descriptor,
 		fields: [
@@ -324,12 +463,14 @@ function renderAppPromote(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppPromote(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderAppRollback(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: "Restoring the selected app to an earlier deployment.",
 		descriptor,
 		fields: [
@@ -372,9 +513,11 @@ function renderAppRollback(context, descriptor, result) {
 			}] : []
 		]
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppRollback(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderAppRun(_context, _descriptor, _result) {
 	return [];
@@ -383,7 +526,7 @@ function serializeAppRun(result) {
 	return result;
 }
 function renderAppRemove(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: "Removing the selected app.",
 		descriptor,
 		fields: [
@@ -402,9 +545,11 @@ function renderAppRemove(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppRemove(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function toneForStatus(status) {
 	if (status === "running" || status === "ready" || status === "healthy") return "success";

package/dist/presenters/branch.js

@@ -1,5 +1,6 @@
 import { formatColumns } from "../shell/ui.js";
 import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { renderResolvedProjectContextBlock } from "./verbose-context.js";
 //#region src/presenters/branch.ts
 function renderBranchList(context, descriptor, result) {
 	const ui = context.ui;
@@ -9,6 +10,7 @@ function renderBranchList(context, descriptor, result) {
 	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 = [
@@ -26,14 +28,19 @@ function renderBranchList(context, descriptor, result) {
 		branch.role,
 		branch.envMap
 	], widths)}`);
+	lines.push(...renderBranchResolvedContextBlock(context, result));
 	return lines;
 }
 function serializeBranchList(result) {
+	const { verboseContext: _verboseContext, ...serializable } = result;
 	return {
-		projectId: result.projectId,
-		projectName: result.projectName,
-		branches: result.branches
+		projectId: serializable.projectId,
+		projectName: serializable.projectName,
+		branches: serializable.branches
 	};
 }
+function renderBranchResolvedContextBlock(context, result) {
+	return renderResolvedProjectContextBlock(context.ui, result.verboseContext);
+}
 //#endregion
 export { renderBranchList, serializeBranchList };