create-prisma 0.4.2-pr.55.209.1 → 0.4.2-pr.55.210.1

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import "./create-D-eNQ-nG.mjs";
+import "./create-B-_G4ZQ9.mjs";
 import { createCreatePrismaCli } from "./index.mjs";
 
 //#region src/cli.ts

package/dist/{create-D-eNQ-nG.mjs → create-B-_G4ZQ9.mjs}

@@ -40,7 +40,7 @@ async function getAnonymousId() {
 }
 function getCommonProperties() {
 	return {
-		"cli-version": "0.4.2-pr.55.209.1",
+		"cli-version": "0.4.2-pr.55.210.1",
 		"node-version": process.version,
 		platform: process.platform,
 		arch: process.arch
@@ -651,7 +651,7 @@ async function runPrismaJsonCommand(options) {
 	}
 	return envelope.result;
 }
-async function ensureAuthentication(packageManager, projectDir) {
+async function ensureAuthentication(packageManager, projectDir, beforeInteractiveLogin) {
 	const whoami = () => runPrismaJsonCommand({
 		packageManager,
 		projectDir,
@@ -665,6 +665,7 @@ async function ensureAuthentication(packageManager, projectDir) {
 		"login"
 	]);
 	if (process.stdin.isTTY !== true) throw new Error(`Sign in first with ${loginCommand}, then run ${getRunScriptCommand(packageManager, "deploy")}.`);
+	beforeInteractiveLogin?.();
 	log.info("Sign in to Prisma to deploy.");
 	const login = getPrismaCliArgs(packageManager, ["auth", "login"]);
 	await execa(login.command, login.args, {
@@ -680,7 +681,7 @@ function workspaceLabel(workspace) {
 	return workspace.name ?? workspace.id;
 }
 async function useWorkspace(options) {
-	const result = await runPrismaJsonCommand({
+	return (await runPrismaJsonCommand({
 		packageManager: options.packageManager,
 		projectDir: options.projectDir,
 		args: [
@@ -689,9 +690,7 @@ async function useWorkspace(options) {
 			"use",
 			options.workspace
 		]
-	});
-	if (result.workspace.id !== options.activeWorkspace.id) log.info(`Prisma CLI workspace switched to ${workspaceLabel(result.workspace)}.`);
-	return result.workspace;
+	})).workspace;
 }
 async function selectDeploymentWorkspace(options) {
 	const activeWorkspace = options.authState.workspace;
@@ -704,8 +703,7 @@ async function selectDeploymentWorkspace(options) {
 		return useWorkspace({
 			packageManager: options.packageManager,
 			projectDir: options.projectDir,
-			workspace: options.workspace,
-			activeWorkspace
+			workspace: options.workspace
 		});
 	}
 	if (!options.shouldPrompt || process.stdin.isTTY !== true) return activeWorkspace;
@@ -719,6 +717,7 @@ async function selectDeploymentWorkspace(options) {
 		]
 	});
 	if (available.items.length <= 1) return activeWorkspace;
+	options.beforePrompt?.();
 	const selectedWorkspaceId = await select({
 		message: "Select Prisma workspace for deployment",
 		initialValue: activeWorkspace.id,
@@ -732,12 +731,12 @@ async function selectDeploymentWorkspace(options) {
 		cancel("Operation cancelled.");
 		return;
 	}
+	options.afterPrompt?.();
 	if (selectedWorkspaceId === activeWorkspace.id) return activeWorkspace;
 	return useWorkspace({
 		packageManager: options.packageManager,
 		projectDir: options.projectDir,
-		workspace: selectedWorkspaceId,
-		activeWorkspace
+		workspace: selectedWorkspaceId
 	});
 }
 function parseComposerDeployResult(result) {
@@ -776,17 +775,37 @@ async function getProjectDetails(options) {
 }
 async function deployWithComposer(options) {
 	const progress = options.verbose ? void 0 : spinner();
+	let progressRunning = false;
+	const showProgress = (message) => {
+		if (!progress) return;
+		if (progressRunning) progress.message(message);
+		else {
+			progress.start(message);
+			progressRunning = true;
+		}
+	};
+	const clearProgress = () => {
+		if (!progress || !progressRunning) return;
+		progress.clear();
+		progressRunning = false;
+	};
 	try {
-		const authState = await ensureAuthentication(options.packageManager, options.projectDir);
+		showProgress("Checking Prisma account...");
+		if (options.verbose) log.step("Checking Prisma account.");
+		const authState = await ensureAuthentication(options.packageManager, options.projectDir, clearProgress);
+		showProgress("Checking Prisma workspace...");
+		if (options.verbose) log.step("Checking Prisma workspace.");
 		const selectedWorkspace = await selectDeploymentWorkspace({
 			packageManager: options.packageManager,
 			projectDir: options.projectDir,
 			shouldPrompt: options.shouldPromptForWorkspace,
 			authState,
+			beforePrompt: clearProgress,
+			afterPrompt: () => showProgress("Selecting Prisma workspace..."),
 			...options.workspace ? { workspace: options.workspace } : {}
 		});
 		if (!selectedWorkspace) return;
-		progress?.start("Building for deployment...");
+		showProgress("Building for deployment...");
 		if (options.verbose) log.step("Building for deployment.");
 		const build = getRunScriptArgs(options.packageManager, "build");
 		await execa(build.command, build.args, {
@@ -794,7 +813,7 @@ async function deployWithComposer(options) {
 			env: process.env,
 			stdio: options.verbose ? "inherit" : "pipe"
 		});
-		progress?.message("Deploying to Prisma...");
+		showProgress("Deploying to Prisma...");
 		if (options.verbose) log.step("Deploying to Prisma.");
 		const deployment = parseComposerDeployResult(await runPrismaJsonCommand({
 			packageManager: options.packageManager,
@@ -807,13 +826,14 @@ async function deployWithComposer(options) {
 			forwardStderr: options.verbose
 		}));
 		const appName = deployment?.appName ?? options.appName;
-		progress?.message("Loading deployment details...");
+		showProgress("Loading deployment details...");
 		const details = await getProjectDetails({
 			packageManager: options.packageManager,
 			projectDir: options.projectDir,
 			appName
 		});
 		progress?.stop("Deployed to Prisma.");
+		progressRunning = false;
 		if (options.verbose) log.success("Deployed to Prisma.");
 		const workspace = details?.workspace ?? selectedWorkspace;
 		return {
@@ -824,6 +844,7 @@ async function deployWithComposer(options) {
 		};
 	} catch (error) {
 		progress?.error("Deployment failed.");
+		progressRunning = false;
 		log.error(`Deploy failed: ${getErrorMessage(error)}`);
 		return;
 	}

package/dist/index.mjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { a as DatabaseProviderSchema, i as CreateTemplateSchema, n as AuthoringStyleSchema, o as PackageManagerSchema, r as CreateCommandInputSchema, t as runCreateCommand } from "./create-D-eNQ-nG.mjs";
+import { a as DatabaseProviderSchema, i as CreateTemplateSchema, n as AuthoringStyleSchema, o as PackageManagerSchema, r as CreateCommandInputSchema, t as runCreateCommand } from "./create-B-_G4ZQ9.mjs";
 import { os } from "@orpc/server";
 import { createCli } from "trpc-cli";
 import { z } from "zod";
 
 //#region src/index.ts
-const CLI_VERSION = "0.4.2-pr.55.209.1";
+const CLI_VERSION = "0.4.2-pr.55.210.1";
 const CreateCliInputSchema = z.tuple([z.string().trim().min(1, "Please enter a valid project name").optional().describe("Project name / directory"), CreateCommandInputSchema]);
 function normalizeCreateCliInput(input) {
 	const [projectName, options] = input;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-prisma",
-  "version": "0.4.2-pr.55.209.1",
+  "version": "0.4.2-pr.55.210.1",
   "private": false,
   "description": "Create Prisma 8 projects with first-party templates and great DX.",
   "homepage": "https://github.com/prisma/create-prisma",