@prisma/cli 3.0.0-dev.62.1 → 3.0.0-dev.63.1

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/project.js

@@ -1,25 +1,24 @@
 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 { renderMutate, renderShow, serializeList } from "../output/patterns.js";
 import path from "node:path";
+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;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-dev.62.1",
+  "version": "3.0.0-dev.63.1",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {