@prisma/cli 3.0.0-dev.75.1 → 3.0.0-dev.77.1

package/dist/controllers/app.js

@@ -14,7 +14,7 @@ import { DEFAULT_LOCAL_DEV_PORT, resolveLocalBuildType, runLocalApp } from "../l
 import { formatCommandArgument } from "../shell/command-arguments.js";
 import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, readLocalResolutionPin } from "../lib/project/local-pin.js";
 import { buildProjectSetupNextActions, inferTargetName, projectNotFoundError, resolveDurablePlatformMapping, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
-import { bindProjectToDirectory, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.js";
+import { bindProjectToDirectory, projectCreateFailedError, projectDirectoryBindingErrorToCliError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.js";
 import { promptForProjectSetupChoice } from "../lib/project/interactive-setup.js";
 import { readLocalGitBranch } from "../lib/git/local-branch.js";
 import { resolveOrCreatePreviewBuildSettings } from "../lib/app/preview-build-settings.js";
@@ -131,8 +131,10 @@ async function runAppDeploy(context, appName, options) {
 	let localPinResult;
 	if (target.localPinAction) {
 		const setupResult = await bindProjectToDirectory(context, target.workspace, target.project, target.localPinAction);
-		localPinResult = setupResult.localPin;
-		maybeRenderProjectLinked(context, setupResult.directory, setupResult.project.name, setupResult.localPin.path);
+		if (setupResult.isErr()) throw projectDirectoryBindingErrorToCliError(setupResult.error);
+		const projectSetup = setupResult.value;
+		localPinResult = projectSetup.localPin;
+		maybeRenderProjectLinked(context, projectSetup.directory, projectSetup.project.name, projectSetup.localPin.path);
 	}
 	let framework = await resolveDeployFramework(context, {
 		requestedFramework: options?.framework,

package/dist/controllers/project.js

@@ -5,7 +5,7 @@ import { requireComputeAuth } from "../lib/auth/guard.js";
 import { formatCommandArgument } from "../shell/command-arguments.js";
 import { readLocalResolutionPin } from "../lib/project/local-pin.js";
 import { buildProjectSetupNextActions, inferTargetName, inspectProjectBinding, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
-import { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.js";
+import { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectDirectoryBindingErrorToCliError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.js";
 import { promptForProjectSetupChoice } from "../lib/project/interactive-setup.js";
 import { createPreviewAppProvider } from "../lib/app/preview-provider.js";
 import { createCliUseCaseGateways } from "../use-cases/create-cli-gateways.js";
@@ -116,12 +116,14 @@ async function runProjectCreate(context, projectName) {
 			fallbackFix: "Retry the command, or choose an existing Project with prisma-cli project link <id-or-name>."
 		});
 	});
+	const bindResult = await bindProjectToDirectory(context, workspace, {
+		id: created.id,
+		name: created.name
+	}, "created");
+	if (bindResult.isErr()) throw projectDirectoryBindingErrorToCliError(bindResult.error);
 	return {
 		command: "project.create",
-		result: await bindProjectToDirectory(context, workspace, {
-			id: created.id,
-			name: created.name
-		}, "created"),
+		result: bindResult.value,
 		warnings: [],
 		nextSteps: ["prisma-cli app deploy"]
 	};
@@ -138,7 +140,7 @@ async function runProjectLink(context, projectRef) {
 		projects = await listRealWorkspaceProjects(client, workspace, context.runtime.signal);
 	} else projects = listFixtureWorkspaceProjects(context, workspace);
 	let result;
-	if (projectRef?.trim()) result = await bindProjectToDirectory(context, workspace, toProjectSummary(resolveProjectForSetup(projectRef.trim(), projects, workspace)), "linked");
+	if (projectRef?.trim()) result = await requireProjectDirectoryBinding(context, workspace, toProjectSummary(resolveProjectForSetup(projectRef.trim(), projects, workspace)), "linked");
 	else if (canPrompt(context) && !context.flags.yes) result = await resolveInteractiveProjectLinkSetup(context, workspace, projects, provider);
 	else throw await projectLinkTargetRequiredError(context, projects);
 	return {
@@ -162,7 +164,12 @@ async function resolveInteractiveProjectLinkSetup(context, workspace, projects,
 			nextSteps: ["prisma-cli project link <id-or-name>", "prisma-cli project create <name>"]
 		}
 	});
-	return bindProjectToDirectory(context, workspace, setup.project, setup.action);
+	return requireProjectDirectoryBinding(context, workspace, setup.project, setup.action);
+}
+async function requireProjectDirectoryBinding(context, workspace, project, action) {
+	const bindResult = await bindProjectToDirectory(context, workspace, project, action);
+	if (bindResult.isErr()) throw projectDirectoryBindingErrorToCliError(bindResult.error);
+	return bindResult.value;
 }
 async function createProjectForLinkSetup(provider, projectName, workspace, signal) {
 	const created = await provider.createProject({

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

@@ -29,6 +29,53 @@ var LocalResolutionPinReadAbortedError = class extends TaggedError("LocalResolut
 		});
 	}
 };
+var LocalResolutionPinSerializationError = class extends TaggedError("LocalResolutionPinSerializationError")() {
+	constructor(cause) {
+		super({
+			message: `Could not serialize ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH}.`,
+			cause,
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH
+		});
+	}
+};
+var LocalResolutionPinWriteAbortedError = class extends TaggedError("LocalResolutionPinWriteAbortedError")() {
+	constructor(cause) {
+		super({
+			message: `Writing ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} was aborted.`,
+			cause,
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH
+		});
+	}
+};
+var LocalResolutionPinWriteFailedError = class extends TaggedError("LocalResolutionPinWriteFailedError")() {
+	constructor(operation, cause) {
+		super({
+			message: `Could not write ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH}.`,
+			cause,
+			operation,
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH
+		});
+	}
+};
+var LocalResolutionPinGitignoreUpdateAbortedError = class extends TaggedError("LocalResolutionPinGitignoreUpdateAbortedError")() {
+	constructor(cause) {
+		super({
+			message: "Updating .gitignore for the local Project binding was aborted.",
+			cause,
+			gitignorePath: ".gitignore"
+		});
+	}
+};
+var LocalResolutionPinGitignoreUpdateFailedError = class extends TaggedError("LocalResolutionPinGitignoreUpdateFailedError")() {
+	constructor(operation, cause) {
+		super({
+			message: "Could not update .gitignore for the local Project binding.",
+			cause,
+			operation,
+			gitignorePath: ".gitignore"
+		});
+	}
+};
 async function readLocalResolutionPin(cwd, signal) {
 	return Result.gen(async function* () {
 		yield* ensureLocalResolutionPinReadNotAborted(signal);
@@ -72,41 +119,74 @@ function parseLocalResolutionPin(raw) {
 	});
 }
 async function writeLocalResolutionPin(cwd, pin, signal) {
-	const prismaDir = path.join(cwd, ".prisma");
-	signal?.throwIfAborted();
-	await mkdir(prismaDir, { recursive: true });
-	const pinPath = path.join(cwd, LOCAL_RESOLUTION_PIN_RELATIVE_PATH);
-	const tmpPath = path.join(prismaDir, `local.${process.pid}.${Date.now()}.tmp`);
-	await writeFile(tmpPath, `${JSON.stringify(pin, null, 2)}\n`, {
-		encoding: "utf8",
-		signal
+	return Result.gen(async function* () {
+		const prismaDir = path.join(cwd, ".prisma");
+		yield* ensureLocalResolutionPinWriteNotAborted(signal);
+		yield* Result.await(writeLocalResolutionPinBoundary(() => mkdir(prismaDir, { recursive: true }), "create-directory", signal));
+		const pinPath = path.join(cwd, LOCAL_RESOLUTION_PIN_RELATIVE_PATH);
+		const tmpPath = path.join(prismaDir, `local.${process.pid}.${Date.now()}.tmp`);
+		const serialized = yield* serializeLocalResolutionPin(pin);
+		yield* Result.await(writeLocalResolutionPinBoundary(() => writeFile(tmpPath, serialized, {
+			encoding: "utf8",
+			signal
+		}), "write-temp-file", signal));
+		yield* ensureLocalResolutionPinWriteNotAborted(signal);
+		yield* Result.await(writeLocalResolutionPinBoundary(() => rename(tmpPath, pinPath), "rename-temp-file", signal));
+		return Result.ok(void 0);
 	});
-	signal?.throwIfAborted();
-	await rename(tmpPath, pinPath);
 }
 async function ensureLocalResolutionPinGitignore(cwd, signal) {
 	const gitignorePath = path.join(cwd, ".gitignore");
 	let existing = null;
-	signal?.throwIfAborted();
-	try {
-		existing = await readFile(gitignorePath, {
+	const notAborted = ensureLocalResolutionPinGitignoreUpdateNotAborted(signal);
+	if (notAborted.isErr()) return Result.err(notAborted.error);
+	const existingResult = await Result.tryPromise({
+		try: () => readFile(gitignorePath, {
 			encoding: "utf8",
 			signal
-		});
-	} catch (error) {
-		if (error.code !== "ENOENT") throw error;
-	}
-	if (existing === null) {
-		await writeFile(gitignorePath, ".prisma/\n", {
+		}),
+		catch: (cause) => signal?.aborted ? new LocalResolutionPinGitignoreUpdateAbortedError(cause) : new LocalResolutionPinGitignoreUpdateFailedError("read", cause)
+	});
+	if (existingResult.isErr()) if (existingResult.error instanceof LocalResolutionPinGitignoreUpdateFailedError && existingResult.error.cause.code === "ENOENT") existing = null;
+	else return Result.err(existingResult.error);
+	else existing = existingResult.value;
+	if (existing === null) return writeLocalResolutionPinGitignore(gitignorePath, ".prisma/\n", signal);
+	if (existing.split(/\r?\n/).map((line) => line.trim()).some((line) => line === ".prisma/" || line === ".prisma/local.json")) return Result.ok(void 0);
+	return writeLocalResolutionPinGitignore(gitignorePath, existing.endsWith("\n") ? `${existing}.prisma/\n` : `${existing}\n.prisma/\n`, signal);
+}
+function ensureLocalResolutionPinWriteNotAborted(signal) {
+	return Result.try({
+		try: () => signal?.throwIfAborted(),
+		catch: (cause) => new LocalResolutionPinWriteAbortedError(cause)
+	});
+}
+function serializeLocalResolutionPin(pin) {
+	return Result.try({
+		try: () => `${JSON.stringify(pin, null, 2)}\n`,
+		catch: (cause) => new LocalResolutionPinSerializationError(cause)
+	});
+}
+function writeLocalResolutionPinBoundary(run, operation, signal) {
+	return Result.tryPromise({
+		try: async () => {
+			await run();
+		},
+		catch: (cause) => signal?.aborted ? new LocalResolutionPinWriteAbortedError(cause) : new LocalResolutionPinWriteFailedError(operation, cause)
+	});
+}
+function ensureLocalResolutionPinGitignoreUpdateNotAborted(signal) {
+	return Result.try({
+		try: () => signal?.throwIfAborted(),
+		catch: (cause) => new LocalResolutionPinGitignoreUpdateAbortedError(cause)
+	});
+}
+function writeLocalResolutionPinGitignore(gitignorePath, contents, signal) {
+	return Result.tryPromise({
+		try: () => writeFile(gitignorePath, contents, {
 			encoding: "utf8",
 			signal
-		});
-		return;
-	}
-	if (existing.split(/\r?\n/).map((line) => line.trim()).some((line) => line === ".prisma/" || line === ".prisma/local.json")) return;
-	await writeFile(gitignorePath, existing.endsWith("\n") ? `${existing}.prisma/\n` : `${existing}\n.prisma/\n`, {
-		encoding: "utf8",
-		signal
+		}),
+		catch: (cause) => signal?.aborted ? new LocalResolutionPinGitignoreUpdateAbortedError(cause) : new LocalResolutionPinGitignoreUpdateFailedError("write", cause)
 	});
 }
 function isLocalResolutionPin(value) {

package/dist/lib/project/setup.js

@@ -2,6 +2,7 @@ import { CliError, usageError } from "../../shell/errors.js";
 import "../../shell/command-arguments.js";
 import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, ensureLocalResolutionPinGitignore, writeLocalResolutionPin } from "./local-pin.js";
 import { projectAmbiguousError, projectNotFoundError } from "./resolution.js";
+import { Result, matchError } from "better-result";
 //#region src/lib/project/setup.ts
 function isValidProjectSetupName(projectName) {
 	return projectName.trim().length > 0;
@@ -17,21 +18,63 @@ function resolveProjectForSetup(projectRef, projects, workspace) {
 	throw projectNotFoundError(projectRef, workspace);
 }
 async function bindProjectToDirectory(context, workspace, project, action) {
-	await writeLocalResolutionPin(context.runtime.cwd, {
-		workspaceId: workspace.id,
-		projectId: project.id
-	}, context.runtime.signal);
-	await ensureLocalResolutionPinGitignore(context.runtime.cwd, context.runtime.signal);
-	return {
-		workspace,
-		project,
-		directory: formatSetupDirectory(context.runtime.cwd),
-		localPin: {
-			path: LOCAL_RESOLUTION_PIN_RELATIVE_PATH,
-			written: true
+	return Result.gen(async function* () {
+		yield* Result.await(writeLocalResolutionPin(context.runtime.cwd, {
+			workspaceId: workspace.id,
+			projectId: project.id
+		}, context.runtime.signal));
+		yield* Result.await(ensureLocalResolutionPinGitignore(context.runtime.cwd, context.runtime.signal));
+		return Result.ok({
+			workspace,
+			project,
+			directory: formatSetupDirectory(context.runtime.cwd),
+			localPin: {
+				path: LOCAL_RESOLUTION_PIN_RELATIVE_PATH,
+				written: true
+			},
+			action
+		});
+	});
+}
+function projectDirectoryBindingErrorToCliError(error) {
+	return matchError(error, {
+		LocalResolutionPinSerializationError: (error) => {
+			throw error;
 		},
-		action
-	};
+		LocalResolutionPinWriteAbortedError: (error) => {
+			throw error;
+		},
+		LocalResolutionPinWriteFailedError: (error) => localStateWriteFailedError(error, {
+			why: `The CLI could not write ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH}.`,
+			meta: {
+				pinPath: error.pinPath,
+				operation: error.operation
+			}
+		}),
+		LocalResolutionPinGitignoreUpdateAbortedError: (error) => {
+			throw error;
+		},
+		LocalResolutionPinGitignoreUpdateFailedError: (error) => localStateWriteFailedError(error, {
+			why: "The CLI could not update .gitignore to keep local Project binding state out of git.",
+			meta: {
+				gitignorePath: error.gitignorePath,
+				operation: error.operation
+			}
+		})
+	});
+}
+function localStateWriteFailedError(error, options) {
+	return new CliError({
+		code: "LOCAL_STATE_WRITE_FAILED",
+		domain: "project",
+		summary: "Could not save local Project binding",
+		why: options.why,
+		fix: "Check that this directory is writable and that .prisma/local.json and .gitignore are not blocked by directories or permissions, then retry.",
+		debug: formatDebugDetails(error.cause),
+		meta: options.meta,
+		exitCode: 1,
+		nextSteps: ["prisma-cli project link <id-or-name>", "prisma-cli app deploy --project <id-or-name>"]
+	});
 }
 function toProjectSummary(project) {
 	return {
@@ -86,4 +129,4 @@ function formatDebugDetails(error) {
 	return typeof error === "string" ? error : null;
 }
 //#endregion
-export { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary, validateProjectSetupNameText };
+export { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectDirectoryBindingErrorToCliError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary, validateProjectSetupNameText };

package/package.json

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