create-prisma 0.9.2-pr.62.229.1 → 0.9.2-pr.63.231.1

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import "./create-V-NkNn-8.mjs";
+import "./create-B4dcx9oX.mjs";
 import { createCreatePrismaCli } from "./index.mjs";
 
 //#region src/cli.ts

package/dist/{create-V-NkNn-8.mjs → create-B4dcx9oX.mjs}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { z } from "zod";
-import { cancel, confirm, intro, isCancel, log, note, outro, select, spinner, text } from "@clack/prompts";
+import { cancel, confirm, intro, isCancel, log, note, outro, select, spinner, taskLog, text } from "@clack/prompts";
 import fs from "fs-extra";
 import path from "node:path";
 import { randomUUID } from "node:crypto";
@@ -10,6 +10,7 @@ import Handlebars from "handlebars";
 import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { execa } from "execa";
+import { createInterface } from "node:readline";
 import { styleText } from "node:util";
 
 //#region src/telemetry/client.ts
@@ -40,7 +41,7 @@ async function getAnonymousId() {
 }
 function getCommonProperties() {
 	return {
-		"cli-version": "0.9.2-pr.62.229.1",
+		"cli-version": "0.9.2-pr.63.231.1",
 		"node-version": process.version,
 		platform: process.platform,
 		arch: process.arch
@@ -694,12 +695,16 @@ async function runPrismaJsonCommand(options) {
 		"--json",
 		"--no-interactive"
 	]);
-	const result = await execa(invocation.command, invocation.args, {
+	const subprocess = execa(invocation.command, invocation.args, {
 		cwd: options.projectDir,
 		env: process.env,
 		reject: false
 	});
-	if (options.forwardStderr && result.stderr) process.stderr.write(result.stderr.endsWith("\n") ? result.stderr : `${result.stderr}\n`);
+	const stderrLines = options.onStderrLine && subprocess.stderr ? (async () => {
+		const lines = createInterface({ input: subprocess.stderr });
+		for await (const line of lines) if (line.trim()) options.onStderrLine?.(line);
+	})() : Promise.resolve();
+	const [result] = await Promise.all([subprocess, stderrLines]);
 	let envelope;
 	try {
 		envelope = parsePrismaCliEnvelope(result.stdout);
@@ -713,6 +718,19 @@ async function runPrismaJsonCommand(options) {
 	}
 	return envelope.result;
 }
+function findProjectNameCollisions(projects, appName) {
+	return projects.filter((project) => project.name === appName);
+}
+async function ensureProjectNameAvailable(options) {
+	const collisions = findProjectNameCollisions((await runPrismaJsonCommand({
+		packageManager: options.packageManager,
+		projectDir: options.projectDir,
+		args: ["project", "list"]
+	})).items, options.appName);
+	if (collisions.length === 0) return;
+	const projectIds = collisions.map((project) => project.id).join(", ");
+	throw new Error(`A Prisma project named "${options.appName}" already exists in workspace ${workspaceLabel(options.workspace)} (${options.workspace.id}). Choose a different project name or delete the existing project (${projectIds}) in Prisma Console, then retry.`);
+}
 async function ensureAuthentication(packageManager, projectDir, beforeInteractiveLogin) {
 	const whoami = () => runPrismaJsonCommand({
 		packageManager,
@@ -836,6 +854,7 @@ async function getProjectDetails(options) {
 }
 async function deployWithComposer(options) {
 	const progress = options.verbose ? void 0 : spinner();
+	let deploymentLog;
 	let progressRunning = false;
 	const showProgress = (message) => {
 		if (!progress) return;
@@ -866,6 +885,14 @@ async function deployWithComposer(options) {
 			...options.workspace ? { workspace: options.workspace } : {}
 		});
 		if (!selectedWorkspace) return;
+		showProgress("Checking Prisma project name...");
+		if (options.verbose) log.step("Checking Prisma project name.");
+		await ensureProjectNameAvailable({
+			appName: options.appName,
+			packageManager: options.packageManager,
+			projectDir: options.projectDir,
+			workspace: selectedWorkspace
+		});
 		showProgress("Building for deployment...");
 		if (options.verbose) log.step("Building for deployment.");
 		const build = getRunScriptArgs(options.packageManager, "build");
@@ -874,22 +901,40 @@ async function deployWithComposer(options) {
 			env: process.env,
 			stdio: options.verbose ? "inherit" : "pipe"
 		});
-		showProgress("Deploying to Prisma...");
-		if (options.verbose) log.step("Deploying to Prisma.");
+		clearProgress();
+		const deployCommand = getPackageExecutionCommand(options.packageManager, [
+			PRISMA_PLATFORM_CLI_PACKAGE,
+			"deploy",
+			"module.ts"
+		]);
+		if (options.verbose) log.step(`Deploying to Prisma with ${deployCommand}.`);
+		else {
+			deploymentLog = taskLog({
+				title: "Deploying to Prisma...",
+				limit: 10
+			});
+			deploymentLog.message(`$ ${deployCommand}`);
+		}
 		const deployment = parseComposerDeployResult(await runPrismaJsonCommand({
 			packageManager: options.packageManager,
 			projectDir: options.projectDir,
 			args: ["deploy", "module.ts"],
-			forwardStderr: options.verbose
+			onStderrLine: (line) => {
+				const redactedLine = redactSecrets(line);
+				if (options.verbose) process.stderr.write(`${redactedLine}\n`);
+				else deploymentLog?.message(redactedLine);
+			}
 		}));
 		const appName = deployment?.appName ?? options.appName;
-		showProgress("Loading deployment details...");
+		if (options.verbose) log.step("Loading deployment details.");
+		else deploymentLog?.message("Loading deployment details...");
 		const details = await getProjectDetails({
 			packageManager: options.packageManager,
 			projectDir: options.projectDir,
 			appName
 		});
-		progress?.stop("Deployed to Prisma.");
+		deploymentLog?.success("Deployed to Prisma.");
+		deploymentLog = void 0;
 		progressRunning = false;
 		if (options.verbose) log.success("Deployed to Prisma.");
 		const workspace = details?.workspace ?? selectedWorkspace;
@@ -900,7 +945,10 @@ async function deployWithComposer(options) {
 			project: details?.project ?? { name: appName }
 		};
 	} catch (error) {
-		progress?.error("Deployment failed.");
+		if (deploymentLog) {
+			deploymentLog.error("Deployment failed.");
+			deploymentLog = void 0;
+		} else 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-V-NkNn-8.mjs";
+import { a as DatabaseProviderSchema, i as CreateTemplateSchema, n as AuthoringStyleSchema, o as PackageManagerSchema, r as CreateCommandInputSchema, t as runCreateCommand } from "./create-B4dcx9oX.mjs";
 import { os } from "@orpc/server";
 import { createCli } from "trpc-cli";
 import { z } from "zod";
 
 //#region src/index.ts
-const CLI_VERSION = "0.9.2-pr.62.229.1";
+const CLI_VERSION = "0.9.2-pr.63.231.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.9.2-pr.62.229.1",
+  "version": "0.9.2-pr.63.231.1",
   "private": false,
   "description": "Create Prisma 8 projects with first-party templates and great DX.",
   "homepage": "https://github.com/prisma/create-prisma",