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

package/dist/adapters/token-storage.js

@@ -1,5 +1,8 @@
 import { getAuthFilePath } from "../lib/auth/client.js";
+import fs from "node:fs/promises";
+import path from "node:path";
 import { CredentialsStore } from "@prisma/credentials-store";
+import { randomUUID } from "node:crypto";
 //#region src/adapters/token-storage.ts
 function findLatestValidTokens(allCredentials) {
 	for (let i = allCredentials.length - 1; i >= 0; i -= 1) {
@@ -14,10 +17,19 @@ function findLatestValidTokens(allCredentials) {
 	}
 	return null;
 }
+function tokensEqual(a, b) {
+	return a?.workspaceId === b?.workspaceId && a?.accessToken === b?.accessToken && a?.refreshToken === b?.refreshToken;
+}
+function sleep(ms) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
 var FileTokenStorage = class {
 	credentialsStore;
+	lockFilePath;
 	constructor(env = process.env) {
-		this.credentialsStore = new CredentialsStore(getAuthFilePath(env));
+		const authFilePath = getAuthFilePath(env);
+		this.credentialsStore = new CredentialsStore(authFilePath);
+		this.lockFilePath = `${authFilePath}.lock`;
 	}
 	async getTokens() {
 		try {
@@ -38,6 +50,50 @@ var FileTokenStorage = class {
 		if (!tokens) return;
 		await this.credentialsStore.deleteCredentials(tokens.workspaceId);
 	}
+	async clearTokensIfCurrent(tokens) {
+		if (!tokensEqual(await this.getTokens(), tokens)) return;
+		await this.clearTokens();
+	}
+	async withRefreshLock(fn) {
+		const lockId = await this.acquireRefreshLock();
+		try {
+			return await fn();
+		} finally {
+			await this.releaseRefreshLock(lockId);
+		}
+	}
+	async acquireRefreshLock() {
+		const lockId = randomUUID();
+		await fs.mkdir(path.dirname(this.lockFilePath), { recursive: true });
+		while (true) try {
+			const handle = await fs.open(this.lockFilePath, "wx");
+			try {
+				await handle.writeFile(lockId, "utf8");
+			} finally {
+				await handle.close();
+			}
+			return lockId;
+		} catch (error) {
+			if (error.code !== "EEXIST") throw error;
+			const staleLockId = await this.getStaleRefreshLockId();
+			if (staleLockId) {
+				await this.releaseRefreshLock(staleLockId);
+				continue;
+			}
+			await sleep(100);
+		}
+	}
+	async getStaleRefreshLockId() {
+		const lockId = await fs.readFile(this.lockFilePath, "utf8").catch(() => null);
+		if (lockId === null) return null;
+		const stats = await fs.stat(this.lockFilePath).catch(() => null);
+		if (!stats) return null;
+		return Date.now() - stats.mtimeMs > 3e4 ? lockId : null;
+	}
+	async releaseRefreshLock(lockId) {
+		if (await fs.readFile(this.lockFilePath, "utf8").catch(() => null) !== lockId) return;
+		await fs.unlink(this.lockFilePath).catch(() => {});
+	}
 };
 //#endregion
 export { FileTokenStorage };

package/dist/lib/app/preview-build.js

@@ -46,7 +46,7 @@ async function executePreviewBuild(options) {
 	});
 	const artifact = await strategy.execute();
 	try {
-		if (buildType === "nextjs") await restageNextjsArtifact(artifact.directory, options.appPath);
+		if (buildType === "nextjs") await restageNextjsArtifact(artifact, options.appPath);
 		await normalizeArtifactSymlinks(artifact.directory, options.appPath);
 		return {
 			artifact,
@@ -116,7 +116,8 @@ async function stageNextjsStandaloneArtifact(options) {
 	});
 	await hoistPnpmDependencies(path.join(artifactRoot, "node_modules"));
 }
-async function restageNextjsArtifact(artifactDir, appPath) {
+async function restageNextjsArtifact(artifact, appPath) {
+	const artifactDir = artifact.directory;
 	const standaloneDir = path.join(appPath, ".next", "standalone");
 	await rm(artifactDir, {
 		recursive: true,
@@ -127,17 +128,23 @@ async function restageNextjsArtifact(artifactDir, appPath) {
 		artifactDir,
 		appPath
 	});
+	const serverSubpath = nextjsServerSubpath(artifact.entrypoint);
+	const serverDir = serverSubpath ? path.join(artifactDir, serverSubpath) : artifactDir;
 	const publicDir = path.join(appPath, "public");
-	if (await directoryExists(publicDir)) await cp(publicDir, path.join(artifactDir, "public"), {
+	if (await directoryExists(publicDir)) await cp(publicDir, path.join(serverDir, "public"), {
 		recursive: true,
 		verbatimSymlinks: true
 	});
 	const staticDir = path.join(appPath, ".next", "static");
-	if (await directoryExists(staticDir)) await cp(staticDir, path.join(artifactDir, ".next", "static"), {
+	if (await directoryExists(staticDir)) await cp(staticDir, path.join(serverDir, ".next", "static"), {
 		recursive: true,
 		verbatimSymlinks: true
 	});
 }
+function nextjsServerSubpath(entrypoint) {
+	const dir = path.posix.dirname(entrypoint);
+	return dir === "." ? "" : dir;
+}
 async function hoistPnpmDependencies(nodeModulesDir) {
 	const pnpmNodeModulesDir = path.join(nodeModulesDir, ".pnpm", "node_modules");
 	if (!await directoryExists(pnpmNodeModulesDir)) return;

package/dist/shell/command-runner.js

@@ -1,9 +1,15 @@
-import { CliError } from "./errors.js";
+import { CliError, authRequiredError } from "./errors.js";
 import { cliErrorToJson, writeHumanError, writeHumanLines, writeJsonError, writeJsonEvent, writeJsonSuccess } from "./output.js";
 import { getCommandDescriptor } from "./command-meta.js";
 import { resolveGlobalFlags } from "./global-flags.js";
 import { createCommandContext } from "./runtime.js";
+import { AuthError } from "@prisma/management-api-sdk";
 //#region src/shell/command-runner.ts
+function toCliError(error) {
+	if (error instanceof CliError) return error;
+	if (error instanceof AuthError) return authRequiredError(["prisma-cli auth login"], { debug: error.message });
+	return null;
+}
 async function runCommand(runtime, commandName, options, handler, presenter) {
 	const flags = resolveGlobalFlags(runtime.argv, options);
 	const context = await createCommandContext(runtime, flags);
@@ -20,10 +26,11 @@ async function runCommand(runtime, commandName, options, handler, presenter) {
 		if (flags.quiet) return;
 		writeHumanLines(context.output, presenter.renderHuman(context, descriptor, success.result));
 	} catch (error) {
-		if (error instanceof CliError) {
-			if (flags.json) writeJsonError(context.output, commandName, error);
-			else writeHumanError(context.output, context.ui, error, { trace: flags.trace });
-			process.exitCode = error.exitCode;
+		const cliError = toCliError(error);
+		if (cliError) {
+			if (flags.json) writeJsonError(context.output, commandName, cliError);
+			else writeHumanError(context.output, context.ui, cliError, { trace: flags.trace });
+			process.exitCode = cliError.exitCode;
 			return;
 		}
 		throw error;
@@ -43,17 +50,18 @@ async function runStreamingCommand(runtime, commandName, options, handler) {
 			nextSteps: []
 		});
 	} catch (error) {
-		if (error instanceof CliError) {
+		const cliError = toCliError(error);
+		if (cliError) {
 			if (flags.json) writeJsonEvent(context.output, {
 				type: "error",
 				command: commandName,
 				timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-				error: cliErrorToJson(error),
+				error: cliErrorToJson(cliError),
 				warnings: [],
-				nextSteps: error.nextSteps
+				nextSteps: cliError.nextSteps
 			});
-			else writeHumanError(context.output, context.ui, error, { trace: flags.trace });
-			process.exitCode = error.exitCode;
+			else writeHumanError(context.output, context.ui, cliError, { trace: flags.trace });
+			process.exitCode = cliError.exitCode;
 			return;
 		}
 		throw error;

package/dist/shell/errors.js

@@ -42,13 +42,14 @@ function usageError(summary, why, fix, nextSteps = [], domain = "cli") {
 		nextSteps
 	});
 }
-function authRequiredError(nextSteps = ["prisma-cli auth login"]) {
+function authRequiredError(nextSteps = ["prisma-cli auth login"], options = {}) {
 	return new CliError({
 		code: "AUTH_REQUIRED",
 		domain: "auth",
 		summary: "Authentication required",
 		why: "This command needs an authenticated session.",
 		fix: "Run prisma-cli auth login, or rerun the command in a TTY to sign in interactively.",
+		debug: options.debug,
 		exitCode: 1,
 		nextSteps
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-alpha.10",
+  "version": "3.0.0-alpha.12",
   "description": "Preview of the unified Prisma CLI.",
   "type": "module",
   "bin": {
@@ -39,7 +39,7 @@
     "@prisma/compute-sdk": "^0.18.0",
     "c12": "4.0.0-beta.4",
     "@prisma/credentials-store": "^7.7.0",
-    "@prisma/management-api-sdk": "^1.27.0",
+    "@prisma/management-api-sdk": "^1.32.1",
     "colorette": "^2.0.20",
     "commander": "^12.1.0",
     "magicast": "^0.3.5",