@prisma/cli 8.0.0-rc.19 → 8.0.0-rc.19-dev.138

package/dist/cli.js

@@ -62,8 +62,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 * unified binary's name.
 */
 const CLI_NAME = "prisma";
-/** The unified CLI's docs section (also the update-check fallback
-*  instruction URL). */
+/** The unified CLI's docs section. */
 const CLI_DOCS_URL = "https://www.prisma.io/docs/cli";
 /**
 * Base URL for structured-error documentation links. The engine composes
@@ -1221,7 +1220,10 @@ async function readPastedCallbackUrl(rl, options) {
 	try {
 		answer = await rl.question("Paste the callback URL here: ", { signal: options.signal });
 	} catch (error) {
-		if (error?.name === "AbortError") return null;
+		if (error?.name === "AbortError") {
+			if (options.signal.aborted) return null;
+			throw new CliStructuredError("CLI.PROMPT_CANCELLED", "Sign-in was cancelled before it completed.");
+		}
 		throw error;
 	}
 	const trimmed = answer.trim().replace(/^["']|["']$/g, "");
@@ -3518,34 +3520,18 @@ const SIGN_IN$1 = {
 };
 function presentationsFor$1(result, environmentInForce) {
 	const summary = result.endedCount === 0 ? "No workspace sessions to end." : `Ended ${result.endedCount} workspace ${result.endedCount === 1 ? "session" : "sessions"}.`;
-	const rows = [{
-		label: "ended",
-		value: String(result.endedCount)
-	}];
 	return {
 		json: () => result,
-		human: () => [
-			{
-				kind: "summary",
-				status: "info",
-				text: "Clearing your stored workspace sessions."
-			},
-			{
-				kind: "fields",
-				rows
-			},
-			{
-				kind: "summary",
-				status: "ok",
-				text: summary
-			},
-			...environmentInForce ? [{
-				kind: "summary",
-				status: "info",
-				text: ENVIRONMENT_CREDENTIAL_NOTICE
-			}] : []
-		],
-		stdout: () => rows.map((row) => `${row.label}: ${row.value}`),
+		human: () => [{
+			kind: "summary",
+			status: "ok",
+			text: summary
+		}, ...environmentInForce ? [{
+			kind: "summary",
+			status: "info",
+			text: ENVIRONMENT_CREDENTIAL_NOTICE
+		}] : []],
+		stdout: () => [],
 		next: () => [SIGN_IN$1]
 	};
 }
@@ -14930,9 +14916,10 @@ function configPathFromArgv(argv) {
 //#endregion
 //#region src/update-check.ts
 const UPDATE_CHECK_FILE_NAME = "update-check.json";
-const FALLBACK_INSTALL_DOCS_URL = CLI_DOCS_URL;
+const PACKAGE_NAME = "prisma";
+const FALLBACK_INSTALL_DOCS_URL = "https://www.prisma.io/docs/orm/release-status#what-you-get-when-you-install-today";
 const NOTIFICATION_INTERVAL_MS = 1440 * 60 * 1e3;
-const REGISTRY_URL = "https://registry.npmjs.org/@prisma%2fcli";
+const REGISTRY_URL = "https://registry.npmjs.org/prisma";
 const REGISTRY_TIMEOUT_MS = 3e3;
 var UpdateCheckStore = class {
 	filePath;
@@ -14960,13 +14947,14 @@ async function maybeWriteCachedUpdateNotification(runtime) {
 	try {
 		const cacheDir = resolveUpdateCheckCacheDir(runtime);
 		const store = new UpdateCheckStore(cacheDir);
-		const state = await store.read();
+		const cached = await store.read();
+		const state = cached?.packageName === PACKAGE_NAME ? cached : null;
 		const latestVersion = state?.latestVersion;
 		if (latestVersion && isInstalledVersionStale(getCliVersion(), latestVersion) && shouldNotify(state)) {
 			runtime.stderr.write(renderUpdateNotification(latestVersion, selectUpdateInstruction(runtime.env)));
 			await store.write({
 				...state,
-				packageName: "@prisma/cli",
+				packageName: PACKAGE_NAME,
 				installedVersion: getCliVersion(),
 				notifiedAt: (/* @__PURE__ */ new Date()).toISOString()
 			});
@@ -14981,10 +14969,11 @@ async function runUpdateDiscovery(options) {
 		const latestVersion = await fetchLatestVersion(options.registryUrl ?? REGISTRY_URL, options.fetchImpl ?? fetch);
 		if (!latestVersion) return;
 		const store = new UpdateCheckStore(options.cacheDir);
-		const previousState = await store.read();
+		const cached = await store.read();
+		const previousState = cached?.packageName === PACKAGE_NAME ? cached : null;
 		await store.write({
 			...previousState,
-			packageName: "@prisma/cli",
+			packageName: PACKAGE_NAME,
 			installedVersion: options.installedVersion,
 			latestVersion,
 			checkedAt: (options.now ?? /* @__PURE__ */ new Date()).toISOString()
@@ -15024,7 +15013,7 @@ async function scheduleRemoteDiscovery(runtime, store, state, cacheDir) {
 	const checkedAt = (/* @__PURE__ */ new Date()).toISOString();
 	await store.write({
 		...state,
-		packageName: "@prisma/cli",
+		packageName: PACKAGE_NAME,
 		installedVersion: getCliVersion(),
 		checkedAt
 	});
@@ -15047,12 +15036,12 @@ function selectUpdateInstruction(env, processArgv = process.argv) {
 	const entrypoint = (processArgv[1] ?? "").replace(/\\/g, "/").toLowerCase();
 	const userAgent = env.npm_config_user_agent?.toLowerCase() ?? "";
 	if (isEphemeralInvocation(entrypoint, env.npm_lifecycle_event?.toLowerCase() ?? "")) return docsInstruction();
-	if (entrypoint.includes("/node_modules/.bin/")) {
-		if (userAgent.startsWith("pnpm")) return commandInstruction("pnpm add -D @prisma/cli@latest");
-		if (userAgent.startsWith("bun")) return commandInstruction("bun add -d @prisma/cli@latest");
-		if (userAgent.startsWith("npm")) return commandInstruction("npm install --save-dev @prisma/cli@latest");
+	if (env.npm_config_global === "true" || isLikelyGlobalNpmEntrypoint(entrypoint)) return commandInstruction("npm install --global prisma@latest");
+	if (entrypoint.includes("/node_modules/")) {
+		if (userAgent.startsWith("pnpm")) return commandInstruction("pnpm add -D prisma@latest");
+		if (userAgent.startsWith("bun")) return commandInstruction("bun add -d prisma@latest");
+		if (userAgent.startsWith("npm")) return commandInstruction("npm install --save-dev prisma@latest");
 	}
-	if (env.npm_config_global === "true" || isLikelyGlobalNpmEntrypoint(entrypoint)) return commandInstruction("npm install --global @prisma/cli@latest");
 	return docsInstruction();
 }
 function renderUpdateNotification(latestVersion, instruction) {
@@ -15064,13 +15053,13 @@ function renderUpdateNotification(latestVersion, instruction) {
 }
 function renderUpdateInstruction(instruction) {
 	if (instruction.type === "command") return `Run ${instruction.value} to update.`;
-	return `See ${instruction.value} for update instructions.`;
+	return `See ${instruction.value} for installation commands.`;
 }
 function isEphemeralInvocation(entrypoint, lifecycle) {
-	return lifecycle === "npx" || lifecycle === "pnpx" || entrypoint.includes("/_npx/") || entrypoint.includes("/.bun/");
+	return lifecycle === "npx" || lifecycle === "pnpx" || entrypoint.includes("/_npx/") || entrypoint.includes("/.bun/install/cache/");
 }
 function isLikelyGlobalNpmEntrypoint(entrypoint) {
-	return /\/npm\/prisma-cli(\.cmd|\.exe)?$/.test(entrypoint) || /\/npm-global\/bin\/prisma-cli$/.test(entrypoint);
+	return /\/npm\/prisma(\.cmd|\.exe)?$/.test(entrypoint) || /\/npm-global\/bin\/prisma$/.test(entrypoint);
 }
 function commandInstruction(value) {
 	return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "8.0.0-rc.19",
+  "version": "8.0.0-rc.19-dev.138",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {
@@ -41,10 +41,10 @@
   "dependencies": {
     "@manypkg/tools": "^2.1.2",
     "@prisma/cli-engine": "0.6.2",
-    "@prisma/composer-cli": "0.25.0",
+    "@prisma/composer-cli": "0.25.0-dev.5",
     "@prisma/compute-sdk": "0.43.0",
     "@prisma/management-api-sdk": "1.80.0",
-    "@prisma/orm-toolchain": "8.0.0-rc.13",
+    "@prisma/orm-toolchain": "8.0.0-rc.14-dev.20",
     "@vercel/detect-agent": "^1.2.3",
     "better-result": "^2.9.2",
     "cross-spawn": "^7.0.6",
@@ -53,11 +53,11 @@
     "open": "^11.0.0"
   },
   "devDependencies": {
-    "@prisma/composer": "0.25.0",
+    "@prisma/composer": "0.25.0-dev.5",
     "@prisma/credentials-store": "^7.8.0",
-    "@repo/cli-conformance": "8.0.0-rc.19",
-    "@repo/cli-telemetry": "8.0.0-rc.19",
-    "@repo/tsconfig": "8.0.0-rc.19",
+    "@repo/cli-conformance": "8.0.0-rc.19-dev.138",
+    "@repo/cli-telemetry": "8.0.0-rc.19-dev.138",
+    "@repo/tsconfig": "8.0.0-rc.19-dev.138",
     "@types/node": "^22.19.19",
     "@types/cross-spawn": "^6.0.6",
     "tsdown": "^0.21.10",