@prisma/cli 3.0.0-alpha.1 → 3.0.0-alpha.10

package/dist/shell/ui.js

@@ -25,6 +25,18 @@ function createShellUi(runtime, flags) {
 		strong: (text) => colors.bold(text)
 	};
 }
+function renderCommandHeader(ui, options) {
+	if (!ui.isTTY) return [];
+	const rows = options.rows ?? [];
+	const lines = [`${ui.strong(options.commandLabel)} ${ui.dim("→")} ${ui.dim(options.description)}`, ""];
+	const rail = ui.dim("│");
+	const keyWidth = rows.length > 0 ? Math.max(...rows.map((row) => stringWidth(`${row.key}:`)), stringWidth("Read more")) : stringWidth("Read more");
+	for (const row of rows) lines.push(`${rail}  ${ui.accent(padDisplay(`${row.key}:`, keyWidth))}  ${formatHeaderValue(ui, row)}`);
+	if (rows.length > 0 || options.docsPath) lines.push(rail);
+	if (options.docsPath) lines.push(`${rail}  ${ui.accent(padDisplay("Read more", keyWidth))}  ${ui.link(options.docsPath)}`);
+	lines.push("");
+	return lines;
+}
 function renderSummaryLine(ui, status, text) {
 	return `${status === "success" ? ui.success("✔") : status === "error" ? ui.error("✘") : status === "warning" ? ui.warning("⚠") : ui.info("ℹ")} ${text}`;
 }
@@ -55,5 +67,11 @@ function resolveColorEnabled(runtime, flags, isTTY) {
 	if (runtime.env.NO_COLOR !== void 0) return false;
 	return isTTY;
 }
+function formatHeaderValue(ui, row) {
+	const value = row.sensitive ? maskValue(row.value) : row.value;
+	if (row.tone === "dim") return ui.dim(value);
+	if (row.tone === "link") return ui.link(value);
+	return value;
+}
 //#endregion
-export { createShellUi, maskValue, padDisplay, renderNextSteps, renderSummaryLine, wrapText };
+export { createShellUi, maskValue, padDisplay, renderCommandHeader, renderNextSteps, renderSummaryLine, wrapText };

package/dist/use-cases/auth.js

@@ -18,35 +18,34 @@ function createAuthUseCases(dependencies) {
 		listProviders: async () => dependencies.identityGateway.listProviders(),
 		resolveProvider: async (providerId) => {
 			const provider = dependencies.identityGateway.getProvider(providerId);
-			if (!provider) throw usageError("Login requires a valid mock provider", `The mock provider "${providerId}" does not exist.`, "Use --provider github or --provider google.", ["prisma auth login"], "auth");
+			if (!provider) throw usageError("Login requires a valid mock provider", `The mock provider "${providerId}" does not exist.`, "Use --provider github or --provider google.", ["prisma-cli auth login"], "auth");
 			return provider;
 		},
 		listUsersForProvider: async (providerId) => {
 			const users = dependencies.identityGateway.listUsersForProvider(providerId);
-			if (users.length === 0) throw usageError("Login requires a valid mock user", `No mock users support provider "${providerId}".`, "Update the fixture data or choose a different provider.", ["prisma auth login"], "auth");
+			if (users.length === 0) throw usageError("Login requires a valid mock user", `No mock users support provider "${providerId}".`, "Update the fixture data or choose a different provider.", ["prisma-cli auth login"], "auth");
 			return users;
 		},
 		resolveUserForProvider: async (providerId, userId) => {
 			const user = dependencies.identityGateway.getUserForProvider(providerId, userId);
-			if (!user) throw usageError("Login requires a valid mock user", `The mock user "${userId}" is not available for provider "${providerId}".`, "Choose a user that supports the selected provider.", ["prisma auth login"], "auth");
+			if (!user) throw usageError("Login requires a valid mock user", `The mock user "${userId}" is not available for provider "${providerId}".`, "Choose a user that supports the selected provider.", ["prisma-cli auth login"], "auth");
 			return user;
 		},
 		listWorkspacesForUser: async (userId) => dependencies.identityGateway.listUserWorkspaces(userId),
 		resolveWorkspaceForUser: async (userId, workspaceId) => {
 			const workspace = dependencies.identityGateway.getUserWorkspace(userId, workspaceId);
-			if (!workspace) throw usageError("Login requires a valid mock workspace", `The mock workspace "${workspaceId}" is not available for the selected user.`, "Choose a workspace that the selected user can access.", ["prisma auth login"], "auth");
+			if (!workspace) throw usageError("Login requires a valid mock workspace", `The mock workspace "${workspaceId}" is not available for the selected user.`, "Choose a workspace that the selected user can access.", ["prisma-cli auth login"], "auth");
 			return workspace;
 		}
 	};
 }
 async function resolveCurrentAuthState(dependencies) {
-	const [session, linkedProjectId] = await Promise.all([dependencies.sessionGateway.readAuthSession(), dependencies.projectConfigGateway.readLinkedProjectId()]);
+	const session = await dependencies.sessionGateway.readAuthSession();
 	if (!session) return {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null,
-		linkedProjectId
+		workspace: null
 	};
 	const provider = dependencies.identityGateway.getProvider(session.provider);
 	const user = dependencies.identityGateway.getUser(session.userId);
@@ -55,15 +54,13 @@ async function resolveCurrentAuthState(dependencies) {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null,
-		linkedProjectId
+		workspace: null
 	};
 	return {
 		authenticated: true,
 		provider: provider.id,
-		user,
-		workspace,
-		linkedProjectId
+		user: { email: user.email },
+		workspace
 	};
 }
 //#endregion

package/dist/use-cases/branch.js

@@ -2,41 +2,41 @@
 function createBranchUseCases(dependencies) {
 	return {
 		list: async () => {
-			const [linkedProjectId, activeBranch] = await Promise.all([dependencies.projectConfigGateway.readLinkedProjectId(), dependencies.branchStateGateway.readActiveBranch()]);
-			const remoteBranches = await listRemoteBranches(dependencies.branchGateway, linkedProjectId);
+			const [projectId, activeBranch] = await Promise.all([dependencies.projectStateGateway.readRememberedProjectId(), dependencies.branchStateGateway.readActiveBranch()]);
+			const remoteBranches = await listRemoteBranches(dependencies.branchGateway, projectId);
 			return {
-				linkedProjectId,
-				projectName: resolveProjectName(dependencies.projectGateway, linkedProjectId),
+				projectId,
+				projectName: resolveProjectName(dependencies.projectGateway, projectId),
 				activeBranch,
 				branches: buildBranchSummaries(activeBranch, remoteBranches)
 			};
 		},
 		show: async () => {
-			const [linkedProjectId, activeBranch] = await Promise.all([dependencies.projectConfigGateway.readLinkedProjectId(), dependencies.branchStateGateway.readActiveBranch()]);
+			const [projectId, activeBranch] = await Promise.all([dependencies.projectStateGateway.readRememberedProjectId(), dependencies.branchStateGateway.readActiveBranch()]);
 			return {
-				linkedProjectId,
-				projectName: resolveProjectName(dependencies.projectGateway, linkedProjectId),
-				branch: buildBranchDetail(dependencies.branchGateway, linkedProjectId, activeBranch)
+				projectId,
+				projectName: resolveProjectName(dependencies.projectGateway, projectId),
+				branch: buildBranchDetail(dependencies.branchGateway, projectId, activeBranch)
 			};
 		},
 		use: async (branchName) => {
 			await dependencies.branchStateGateway.writeActiveBranch(branchName);
-			const linkedProjectId = await dependencies.projectConfigGateway.readLinkedProjectId();
+			const projectId = await dependencies.projectStateGateway.readRememberedProjectId();
 			return {
-				linkedProjectId,
-				projectName: resolveProjectName(dependencies.projectGateway, linkedProjectId),
-				branch: buildBranchDetail(dependencies.branchGateway, linkedProjectId, branchName)
+				projectId,
+				projectName: resolveProjectName(dependencies.projectGateway, projectId),
+				branch: buildBranchDetail(dependencies.branchGateway, projectId, branchName)
 			};
 		}
 	};
 }
-function resolveProjectName(projectGateway, linkedProjectId) {
-	if (!linkedProjectId) return null;
-	return projectGateway.getProject(linkedProjectId)?.name ?? null;
+function resolveProjectName(projectGateway, projectId) {
+	if (!projectId) return null;
+	return projectGateway.getProject(projectId)?.name ?? null;
 }
-async function listRemoteBranches(branchGateway, linkedProjectId) {
-	if (!linkedProjectId) return [];
-	return branchGateway.listBranchesForProject(linkedProjectId);
+async function listRemoteBranches(branchGateway, projectId) {
+	if (!projectId) return [];
+	return branchGateway.listBranchesForProject(projectId);
 }
 function buildBranchSummaries(activeBranch, remoteBranches) {
 	const byName = /* @__PURE__ */ new Map();
@@ -56,9 +56,9 @@ function buildBranchSummaries(activeBranch, remoteBranches) {
 	});
 	return sortBranches([...byName.values()]);
 }
-function buildBranchDetail(branchGateway, linkedProjectId, branchName) {
+function buildBranchDetail(branchGateway, projectId, branchName) {
 	const kind = toBranchKind(branchName);
-	const remoteBranch = linkedProjectId ? branchGateway.getBranchForProject(linkedProjectId, branchName) : void 0;
+	const remoteBranch = projectId ? branchGateway.getBranchForProject(projectId, branchName) : void 0;
 	return {
 		name: branchName,
 		kind,

package/dist/use-cases/create-cli-gateways.js

@@ -1,5 +1,3 @@
-import { UnsafeConfigWriteError, readLinkedProjectId, writeLinkedProjectId } from "../adapters/config.js";
-import { usageError } from "../shell/errors.js";
 //#region src/use-cases/create-cli-gateways.ts
 function createCliUseCaseGateways(context) {
 	return {
@@ -44,17 +42,9 @@ function createCliUseCaseGateways(context) {
 			},
 			getDeployment: (deploymentId) => context.api.getDeployment(deploymentId)
 		},
-		projectConfigGateway: {
-			readLinkedProjectId: () => readLinkedProjectId(context.runtime.cwd),
-			writeLinkedProjectId: async (projectId) => {
-				try {
-					await writeLinkedProjectId(context.runtime.cwd, projectId);
-				} catch (error) {
-					if (error instanceof UnsafeConfigWriteError) throw usageError("Project link requires a writable Prisma config", error.message, "Update prisma.config.ts to use a recognizable project field, or remove it and rerun prisma project link.", ["prisma project link proj_123"], "project");
-					throw error;
-				}
-			}
-		},
+		projectStateGateway: { readRememberedProjectId: async () => {
+			return (await context.stateStore.readLastResolvedProject())?.id ?? null;
+		} },
 		sessionGateway: {
 			readAuthSession: async () => {
 				return (await context.stateStore.read()).auth;

package/dist/use-cases/project.js

@@ -1,4 +1,4 @@
-import { CliError, authRequiredError } from "../shell/errors.js";
+import { authRequiredError } from "../shell/errors.js";
 //#region src/use-cases/project.ts
 function createProjectUseCases(dependencies) {
 	return {
@@ -6,44 +6,9 @@ function createProjectUseCases(dependencies) {
 			const workspace = requireWorkspace(authState);
 			return {
 				workspace,
-				linkedProjectId: authState.linkedProjectId,
 				projects: listSortedWorkspaceProjects(dependencies.projectGateway, workspace.id).map(toProjectSummary)
 			};
 		},
-		show: async (authState) => {
-			if (!authState.linkedProjectId) return {
-				linkedProjectId: null,
-				workspace: null,
-				project: null
-			};
-			if (!authState.authenticated || !authState.workspace) return {
-				linkedProjectId: authState.linkedProjectId,
-				workspace: null,
-				project: null
-			};
-			const project = dependencies.projectGateway.getProjectForWorkspace(authState.workspace.id, authState.linkedProjectId);
-			if (!project) return {
-				linkedProjectId: authState.linkedProjectId,
-				workspace: null,
-				project: null
-			};
-			return {
-				linkedProjectId: authState.linkedProjectId,
-				workspace: authState.workspace,
-				project: toProjectSummary(project)
-			};
-		},
-		link: async (authState, projectId) => {
-			const workspace = requireWorkspace(authState);
-			const project = dependencies.projectGateway.getProjectForWorkspace(workspace.id, projectId);
-			if (!project) throw projectNotFoundError(`The project "${projectId}" does not exist in workspace "${workspace.name}".`, "Run prisma project list and choose a project id from the active workspace.");
-			await dependencies.projectConfigGateway.writeLinkedProjectId(project.id);
-			return {
-				linkedProjectId: project.id,
-				workspace,
-				project: toProjectSummary(project)
-			};
-		},
 		listProjectsForWorkspace: async (workspaceId) => listSortedWorkspaceProjects(dependencies.projectGateway, workspaceId).map(toProjectSummary)
 	};
 }
@@ -60,16 +25,5 @@ function toProjectSummary(project) {
 		name: project.name
 	};
 }
-function projectNotFoundError(why, fix, nextSteps = ["prisma project list"]) {
-	return new CliError({
-		code: "PROJECT_NOT_FOUND",
-		domain: "project",
-		summary: "Project not found",
-		why,
-		fix,
-		exitCode: 1,
-		nextSteps
-	});
-}
 //#endregion
-export { createProjectUseCases, projectNotFoundError };
+export { createProjectUseCases };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.10",
   "description": "Preview of the unified Prisma CLI.",
   "type": "module",
   "bin": {
@@ -36,10 +36,10 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@prisma/compute-sdk": "^0.17.0",
+    "@prisma/compute-sdk": "^0.18.0",
     "c12": "4.0.0-beta.4",
     "@prisma/credentials-store": "^7.7.0",
-    "@prisma/management-api-sdk": "^1.24.0",
+    "@prisma/management-api-sdk": "^1.27.0",
     "colorette": "^2.0.20",
     "commander": "^12.1.0",
     "magicast": "^0.3.5",

package/dist/adapters/config.js

@@ -1,74 +0,0 @@
-import path from "node:path";
-import { copyFile, mkdir, mkdtemp, readFile, rm } from "node:fs/promises";
-import os from "node:os";
-import { updateConfig } from "c12/update";
-//#region src/adapters/config.ts
-const PROJECT_FIELD_PATTERN = /project\s*:\s*["']([^"']+)["']/;
-async function readLinkedProjectId(cwd) {
-	const configPath = path.join(cwd, "prisma.config.ts");
-	try {
-		return (await readFile(configPath, "utf8")).match(PROJECT_FIELD_PATTERN)?.[1] ?? null;
-	} catch (error) {
-		if (error.code === "ENOENT") return null;
-		throw error;
-	}
-}
-var UnsafeConfigWriteError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "UnsafeConfigWriteError";
-	}
-};
-async function assertLinkedProjectIdWritable(cwd) {
-	const tempDir = await mkdtemp(path.join(os.tmpdir(), "prisma-cli-config-"));
-	const sourceConfigPath = path.join(cwd, "prisma.config.ts");
-	const tempConfigPath = path.join(tempDir, "prisma.config.ts");
-	try {
-		try {
-			await copyFile(sourceConfigPath, tempConfigPath);
-		} catch (error) {
-			if (error.code !== "ENOENT") throw error;
-		}
-		await applyLinkedProjectIdUpdate(tempDir, "proj_preflight");
-	} catch (error) {
-		throw toUnsafeConfigWriteError(error);
-	} finally {
-		await rm(tempDir, {
-			recursive: true,
-			force: true
-		});
-	}
-}
-async function writeLinkedProjectId(cwd, projectId) {
-	try {
-		await applyLinkedProjectIdUpdate(cwd, projectId);
-	} catch (error) {
-		if (error.code === "ENOENT") {
-			await mkdir(cwd, { recursive: true });
-			await applyLinkedProjectIdUpdate(cwd, projectId);
-			return;
-		}
-		throw toUnsafeConfigWriteError(error);
-	}
-}
-async function applyLinkedProjectIdUpdate(cwd, projectId) {
-	await updateConfig({
-		cwd,
-		configFile: "prisma.config",
-		onUpdate(config) {
-			config.project = projectId;
-		},
-		onCreate() {
-			return renderProjectConfig(projectId);
-		}
-	});
-}
-function renderProjectConfig(projectId) {
-	return `export default {\n  project: "${projectId}",\n};\n`;
-}
-function toUnsafeConfigWriteError(error) {
-	if (error instanceof UnsafeConfigWriteError) return error;
-	return new UnsafeConfigWriteError("The existing prisma.config.ts file could not be updated safely.");
-}
-//#endregion
-export { UnsafeConfigWriteError, assertLinkedProjectIdWritable, readLinkedProjectId, writeLinkedProjectId };