@prisma/cli 3.0.0-dev.90.1 → 3.0.0-dev.91.1

package/dist/controllers/app.js

@@ -22,6 +22,7 @@ import { createDeployProgress, createDeployProgressState, createPromoteProgress
 import { formatDomainFailureFix } from "../lib/app/domain-guidance.js";
 import { DEFAULT_LOCAL_DEV_PORT, runLocalApp } from "../lib/app/local-dev.js";
 import { enforceProductionDeployGate } from "../lib/app/production-deploy-gate.js";
+import { resolveReadBranch } from "../lib/app/read-branch.js";
 import { requireComputeAuth } from "../lib/auth/guard.js";
 import { readAuthState } from "../lib/auth/auth-ops.js";
 import { readLocalGitBranch } from "../lib/git/local-branch.js";
@@ -1584,13 +1585,18 @@ async function resolveProjectContext(context, client, explicitProject, options)
 	});
 	if (resolvedResult.isErr()) throw projectResolutionErrorToCliError(resolvedResult.error);
 	const resolved = resolvedResult.value;
-	const branch = options?.branch ?? await resolveDeployBranch(context, void 0);
+	const requested = options?.branch ?? await resolveDeployBranch(context, void 0);
+	const remoteBranch = options?.branch ? null : await resolveReadBranch(client, {
+		projectId: resolved.project.id,
+		branchName: requested.name,
+		signal: context.runtime.signal
+	});
 	return {
 		...resolved,
-		branch: {
+		branch: remoteBranch ?? {
 			id: null,
-			name: branch.name,
-			kind: toBranchKind(branch.name)
+			name: requested.name,
+			kind: toBranchKind(requested.name)
 		}
 	};
 }

package/dist/lib/app/read-branch.js

@@ -0,0 +1,30 @@
+//#region src/lib/app/read-branch.ts
+/**
+* Resolves the branch an app management command should read from, without ever
+* creating one. Returns the branch whose `gitName` matches `branchName`, else
+* the project's default branch, else null when the project has no branches.
+*/
+async function resolveReadBranch(client, options) {
+	const branches = [];
+	let cursor;
+	do {
+		const result = await client.GET("/v1/projects/{projectId}/branches", {
+			params: {
+				path: { projectId: options.projectId },
+				query: { cursor }
+			},
+			signal: options.signal
+		});
+		if (result.error || !result.data) throw new Error(`Failed to list branches for project ${options.projectId}: ${JSON.stringify(result.error)}`);
+		branches.push(...result.data.data);
+		cursor = result.data.pagination.hasMore ? result.data.pagination.nextCursor ?? void 0 : void 0;
+	} while (cursor);
+	const chosen = branches.find((branch) => branch.gitName === options.branchName) ?? branches.find((branch) => branch.isDefault) ?? null;
+	return chosen ? {
+		id: chosen.id,
+		name: chosen.gitName,
+		kind: chosen.role
+	} : null;
+}
+//#endregion
+export { resolveReadBranch };

package/package.json

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