@prisma/cli 3.0.0-dev.71.1 → 3.0.0-dev.73.1

package/dist/controllers/app.js

@@ -31,6 +31,7 @@ import { listRealWorkspaceProjects } from "./project.js";
 import { access, readFile } from "node:fs/promises";
 import path from "node:path";
 import open from "open";
+import { Result, matchError } from "better-result";
 //#region src/controllers/app.ts
 const DEPLOY_FRAMEWORKS = [
 	"nextjs",
@@ -112,9 +113,9 @@ async function runAppDeploy(context, appName, options) {
 		createProjectName: options?.createProjectName,
 		envProjectId
 	});
-	const skipLocalPin = Boolean(envProjectId || options?.projectRef || options?.createProjectName);
-	const localPin = skipLocalPin ? { kind: "missing" } : await readLocalResolutionPin(context.runtime.cwd, context.runtime.signal);
-	if (!skipLocalPin && localPin.kind === "invalid") throw localResolutionPinStaleError();
+	const localPinReadResult = Boolean(envProjectId || options?.projectRef || options?.createProjectName) ? Result.ok({ kind: "missing" }) : await readLocalResolutionPin(context.runtime.cwd, context.runtime.signal);
+	if (localPinReadResult.isErr()) throw localPinReadErrorToDeployError(localPinReadResult.error);
+	const localPin = localPinReadResult.value;
 	const branch = await resolveDeployBranch(context, options?.branchName);
 	if (options?.httpPort) parseDeployHttpPort(options.httpPort);
 	assertSupportedEntrypointForRequestedDeployShape({
@@ -1976,6 +1977,18 @@ function localResolutionPinStaleError() {
 		]
 	});
 }
+function localPinReadErrorToDeployError(error) {
+	return matchError(error, {
+		LocalResolutionPinInvalidJsonError: () => localResolutionPinStaleError(),
+		LocalResolutionPinInvalidShapeError: () => localResolutionPinStaleError(),
+		LocalResolutionPinReadAbortedError: (error) => {
+			throw error;
+		},
+		UnhandledException: (error) => {
+			throw error;
+		}
+	});
+}
 function readDeployEnvOverride(context, name) {
 	const value = context.runtime.env[name]?.trim();
 	return value ? value : void 0;

package/dist/controllers/project.js

@@ -13,6 +13,7 @@ import { requireAuthenticatedAuthState } from "./auth.js";
 import { parseGitHubRepositoryUrl, readGitOriginRemote } from "../adapters/git.js";
 import { createProjectUseCases } from "../use-cases/project.js";
 import open from "open";
+import { matchError } from "better-result";
 //#region src/controllers/project.ts
 const GITHUB_INSTALL_POLL_INTERVAL_MS = 2e3;
 const GITHUB_INSTALL_POLL_TIMEOUT_MS = 12e4;
@@ -20,11 +21,24 @@ function isRealMode(context) {
 	return !context.runtime.fixturePath && !context.runtime.env.PRISMA_CLI_MOCK_FIXTURE_PATH;
 }
 async function readProjectListLocalBinding(cwd, workspace, projects, signal) {
-	const pin = await readLocalResolutionPin(cwd, signal);
+	const pinResult = await readLocalResolutionPin(cwd, signal);
+	if (pinResult.isErr()) return localPinReadErrorToInvalidLocalBinding(pinResult.error);
+	const pin = pinResult.value;
 	if (pin.kind === "present") return pin.pin.workspaceId === workspace.id && projects.some((project) => project.id === pin.pin.projectId) ? { status: "linked" } : { status: "invalid" };
-	if (pin.kind === "invalid") return { status: "invalid" };
 	return { status: "not-linked" };
 }
+function localPinReadErrorToInvalidLocalBinding(error) {
+	return matchError(error, {
+		LocalResolutionPinInvalidJsonError: () => ({ status: "invalid" }),
+		LocalResolutionPinInvalidShapeError: () => ({ status: "invalid" }),
+		LocalResolutionPinReadAbortedError: (error) => {
+			throw error;
+		},
+		UnhandledException: (error) => {
+			throw error;
+		}
+	});
+}
 async function runProjectList(context) {
 	const authState = await requireAuthenticatedAuthState(context);
 	const workspace = authState.workspace;

package/dist/lib/app/branch-database-deploy.js

@@ -3,6 +3,7 @@ import { renderSummaryLine } from "../../shell/ui.js";
 import { canPrompt } from "../../shell/runtime.js";
 import { confirmPrompt } from "../../shell/prompt.js";
 import { formatCommandArgument } from "../../shell/command-arguments.js";
+import "../project/setup.js";
 import { hasBranchDatabaseSignal, inspectBranchDatabaseSignal, runBranchDatabaseSchemaSetup } from "./branch-database.js";
 import path from "node:path";
 //#region src/lib/app/branch-database-deploy.ts

package/dist/lib/project/local-pin.js

@@ -1,25 +1,75 @@
 import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
 import path from "node:path";
+import { Result, TaggedError, UnhandledException } from "better-result";
 //#region src/lib/project/local-pin.ts
 const LOCAL_RESOLUTION_PIN_RELATIVE_PATH = ".prisma/local.json";
-async function readLocalResolutionPin(cwd, signal) {
-	signal?.throwIfAborted();
-	try {
-		const raw = await readFile(path.join(cwd, LOCAL_RESOLUTION_PIN_RELATIVE_PATH), {
-			encoding: "utf8",
-			signal
+var LocalResolutionPinInvalidJsonError = class extends TaggedError("LocalResolutionPinInvalidJsonError")() {
+	constructor(cause) {
+		super({
+			message: `${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} contains invalid JSON.`,
+			cause,
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH
+		});
+	}
+};
+var LocalResolutionPinInvalidShapeError = class extends TaggedError("LocalResolutionPinInvalidShapeError")() {
+	constructor() {
+		super({
+			message: `${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} must contain workspaceId and projectId string fields only.`,
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH
+		});
+	}
+};
+var LocalResolutionPinReadAbortedError = class extends TaggedError("LocalResolutionPinReadAbortedError")() {
+	constructor(cause) {
+		super({
+			message: `Reading ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} was aborted.`,
+			cause,
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH
 		});
-		const parsed = JSON.parse(raw);
-		if (!isLocalResolutionPin(parsed)) return { kind: "invalid" };
-		return {
+	}
+};
+async function readLocalResolutionPin(cwd, signal) {
+	return Result.gen(async function* () {
+		yield* ensureLocalResolutionPinReadNotAborted(signal);
+		const file = yield* Result.await(readLocalResolutionPinFile(cwd, signal));
+		if (file.kind === "missing") return Result.ok({ kind: "missing" });
+		const parsed = yield* parseLocalResolutionPin(file.raw);
+		if (!isLocalResolutionPin(parsed)) return Result.err(new LocalResolutionPinInvalidShapeError());
+		return Result.ok({
 			kind: "present",
 			pin: parsed
-		};
-	} catch (error) {
-		if (error.code === "ENOENT") return { kind: "missing" };
-		if (error instanceof SyntaxError) return { kind: "invalid" };
-		throw error;
+		});
+	});
+}
+function ensureLocalResolutionPinReadNotAborted(signal) {
+	return Result.try({
+		try: () => signal?.throwIfAborted(),
+		catch: (cause) => new LocalResolutionPinReadAbortedError(cause)
+	});
+}
+async function readLocalResolutionPinFile(cwd, signal) {
+	const readResult = await Result.tryPromise({
+		try: () => readFile(path.join(cwd, LOCAL_RESOLUTION_PIN_RELATIVE_PATH), {
+			encoding: "utf8",
+			signal
+		}),
+		catch: (cause) => signal?.aborted ? new LocalResolutionPinReadAbortedError(cause) : new UnhandledException({ cause })
+	});
+	if (readResult.isErr()) {
+		if (readResult.error instanceof UnhandledException && readResult.error.cause.code === "ENOENT") return Result.ok({ kind: "missing" });
+		return Result.err(readResult.error);
 	}
+	return Result.ok({
+		kind: "present",
+		raw: readResult.value
+	});
+}
+function parseLocalResolutionPin(raw) {
+	return Result.try({
+		try: () => JSON.parse(raw),
+		catch: (cause) => cause instanceof SyntaxError ? new LocalResolutionPinInvalidJsonError(cause) : new UnhandledException({ cause })
+	});
 }
 async function writeLocalResolutionPin(cwd, pin, signal) {
 	const prismaDir = path.join(cwd, ".prisma");

package/dist/lib/project/resolution.js

@@ -3,6 +3,7 @@ import { formatCommandArgument } from "../../shell/command-arguments.js";
 import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, readLocalResolutionPin } from "./local-pin.js";
 import { readFile } from "node:fs/promises";
 import path from "node:path";
+import { matchError } from "better-result";
 //#region src/lib/project/resolution.ts
 async function resolveProjectTarget(options) {
 	const localPin = await readImplicitLocalPin(options, { allowEnvProjectId: true });
@@ -224,7 +225,6 @@ async function resolveBoundProjectTarget(options, projects, settings) {
 	}
 	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 localProjectWorkspaceMismatchError({
 			pinnedWorkspaceId: localPin.pin.workspaceId,
@@ -247,7 +247,9 @@ async function resolveBoundProjectTarget(options, projects, settings) {
 }
 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);
+	const localPinResult = await readLocalResolutionPin(options.context.runtime.cwd, options.context.runtime.signal);
+	if (localPinResult.isErr()) throw localPinReadErrorToProjectError(localPinResult.error);
+	const localPin = localPinResult.value;
 	if (localPin.kind === "present" && localPin.pin.workspaceId !== options.workspace.id) throw localProjectWorkspaceMismatchError({
 		pinnedWorkspaceId: localPin.pin.workspaceId,
 		pinnedProjectId: localPin.pin.projectId,
@@ -255,6 +257,18 @@ async function readImplicitLocalPin(options, settings) {
 	});
 	return localPin;
 }
+function localPinReadErrorToProjectError(error) {
+	return matchError(error, {
+		LocalResolutionPinInvalidJsonError: () => localStateStaleError(),
+		LocalResolutionPinInvalidShapeError: () => localStateStaleError(),
+		LocalResolutionPinReadAbortedError: (error) => {
+			throw error;
+		},
+		UnhandledException: (error) => {
+			throw error;
+		}
+	});
+}
 function resolvedTarget(workspace, project, projectSource, resolutionDetails) {
 	return {
 		workspace,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-dev.71.1",
+  "version": "3.0.0-dev.73.1",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {
@@ -39,6 +39,7 @@
     "@prisma/compute-sdk": "^0.22.0",
     "@prisma/credentials-store": "^7.8.0",
     "@prisma/management-api-sdk": "^1.37.0",
+    "better-result": "^2.9.2",
     "c12": "4.0.0-beta.5",
     "colorette": "^2.0.20",
     "commander": "^14.0.3",