@prisma/cli 3.0.0-alpha.3 → 3.0.0-alpha.5

package/dist/shell/command-meta.js

@@ -8,6 +8,12 @@ const DESCRIPTORS = [
 		examples: ["prisma-cli auth login", "prisma-cli app deploy"],
 		longDescription: "Deploy your app with isolated infrastructure for every branch"
 	},
+	{
+		id: "version",
+		path: ["prisma", "version"],
+		description: "Show CLI build and environment",
+		examples: ["prisma-cli version", "prisma-cli version --json"]
+	},
 	{
 		id: "auth",
 		path: ["prisma", "auth"],
@@ -47,7 +53,7 @@ const DESCRIPTORS = [
 	{
 		id: "project",
 		path: ["prisma", "project"],
-		description: "Manage the link between this directory and a Prisma project",
+		description: "Manage and inspect your Prisma projects",
 		examples: ["prisma-cli project list", "prisma-cli project show"]
 	},
 	{
@@ -62,6 +68,12 @@ const DESCRIPTORS = [
 		description: "View your active Platform branches",
 		examples: ["prisma-cli branch list", "prisma-cli branch show"]
 	},
+	{
+		id: "git",
+		path: ["prisma", "git"],
+		description: "Manage Git repository connections for a project",
+		examples: ["prisma-cli git connect", "prisma-cli git disconnect"]
+	},
 	{
 		id: "project.list",
 		path: [
@@ -79,18 +91,32 @@ const DESCRIPTORS = [
 			"project",
 			"show"
 		],
-		description: "Show the Prisma project linked to this directory",
-		examples: ["prisma-cli project show", "prisma-cli project show --json"]
+		description: "Show which project is active for this directory",
+		examples: ["prisma-cli project show", "prisma-cli project show --project proj_123 --json"]
 	},
 	{
-		id: "project.link",
+		id: "git.connect",
 		path: [
 			"prisma",
-			"project",
-			"link"
+			"git",
+			"connect"
 		],
-		description: "Link this directory to a Prisma project",
-		examples: ["prisma-cli project link", "prisma-cli project link proj_123"]
+		description: "Connect the resolved project to a GitHub repository",
+		examples: [
+			"prisma-cli git connect",
+			"prisma-cli git connect git@github.com:prisma/prisma-cli.git",
+			"prisma-cli git connect --project proj_123"
+		]
+	},
+	{
+		id: "git.disconnect",
+		path: [
+			"prisma",
+			"git",
+			"disconnect"
+		],
+		description: "Disconnect the GitHub repository from the resolved project",
+		examples: ["prisma-cli git disconnect", "prisma-cli git disconnect --project proj_123"]
 	},
 	{
 		id: "branch.list",
@@ -99,7 +125,7 @@ const DESCRIPTORS = [
 			"branch",
 			"list"
 		],
-		description: "List active Platform branches linked to this project",
+		description: "List active Platform branches for the resolved project",
 		examples: ["prisma-cli branch list", "prisma-cli branch list --json"]
 	},
 	{
@@ -268,7 +294,7 @@ const DESCRIPTORS = [
 			"project",
 			"env"
 		],
-		description: "Manage environment variables for the linked project.",
+		description: "Manage environment variables for the active project",
 		examples: [
 			"prisma-cli project env list --role production",
 			"prisma-cli project env add STRIPE_KEY=sk_test_xxx --role production",
@@ -284,7 +310,11 @@ const DESCRIPTORS = [
 			"add"
 		],
 		description: "Create a new environment variable.",
-		examples: ["prisma-cli project env add STRIPE_KEY=sk_test_xxx --role production", "prisma-cli project env add STRIPE_KEY=sk_test_xxx --role preview"]
+		examples: [
+			"prisma-cli project env add STRIPE_KEY=sk_test_xxx --role production",
+			"prisma-cli project env add STRIPE_KEY=sk_test_xxx --role preview",
+			"API_URL=https://api.example prisma-cli project env add API_URL --project proj_123 --role preview"
+		]
 	},
 	{
 		id: "project.env.update",

package/dist/shell/errors.js

@@ -51,6 +51,9 @@ function authRequiredError(nextSteps = ["prisma-cli auth login"]) {
 		nextSteps
 	});
 }
+function workspaceRequiredError() {
+	return usageError("Workspace required", "This command needs an active workspace, but the authenticated session does not have one.", "Run prisma-cli auth login and choose a workspace.", ["prisma-cli auth login"], "auth");
+}
 function featureUnavailableError(summary, why, fix, nextSteps = [], domain = "cli") {
 	return new CliError({
 		code: "FEATURE_UNAVAILABLE",
@@ -63,4 +66,4 @@ function featureUnavailableError(summary, why, fix, nextSteps = [], domain = "cl
 	});
 }
 //#endregion
-export { CliError, authRequiredError, featureUnavailableError, usageError };
+export { CliError, authRequiredError, featureUnavailableError, usageError, workspaceRequiredError };

package/dist/shell/global-flags.js

@@ -6,7 +6,8 @@ const COMPACT_GLOBAL_OPTION_FLAGS = [
 	"-v, --verbose",
 	"--trace",
 	"--no-interactive",
-	"-y, --yes"
+	"-y, --yes",
+	"--version"
 ];
 function addGlobalFlags(command) {
 	return command.option("--json", "Emit structured JSON output.").option("-q, --quiet", "Reduce human-oriented output.").option("-v, --verbose", "Increase human-oriented output detail.").option("--trace", "Show deeper diagnostics for failures.").option("-y, --yes", "Accept supported confirmation prompts.").addOption(new Option("--interactive", "Force interactive behavior when prompts are supported.")).addOption(new Option("--no-interactive", "Disable interactive behavior and prompts.")).addOption(new Option("--color", "Force color output in supported terminals.")).addOption(new Option("--no-color", "Disable color output."));

package/dist/use-cases/auth.js

@@ -40,13 +40,12 @@ function createAuthUseCases(dependencies) {
 	};
 }
 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: { email: user.email },
-		workspace,
-		linkedProjectId
+		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-cli project link.", ["prisma-cli 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-cli 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-cli 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.3",
+  "version": "3.0.0-alpha.5",
   "description": "Preview of the unified Prisma CLI.",
   "type": "module",
   "bin": {

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 };