create-prisma 0.4.2-pr.34.115.1 → 0.4.2-pr.34.117.1

package/dist/cli.mjs

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

package/dist/{create-C6wQ1yYn.mjs → create-yihruvVK.mjs}

@@ -127,7 +127,7 @@ const CommonCommandOptionsSchema = z.object({
 const PrismaSetupOptionsSchema = z.object({
 	provider: DatabaseProviderSchema.optional().describe("Database provider"),
 	packageManager: PackageManagerSchema.optional().describe("Package manager used for dependency installation"),
-	prismaPostgres: z.boolean().optional().describe("Provision Prisma Postgres with create-db when provider is postgresql"),
+	prismaPostgres: z.boolean().optional().describe("Use Prisma Postgres when provider is postgresql"),
 	databaseUrl: DatabaseUrlSchema.optional().describe("DATABASE_URL value"),
 	install: z.boolean().optional().describe("Install dependencies with selected package manager"),
 	generate: z.boolean().optional().describe("Generate Prisma Client after scaffolding"),
@@ -819,7 +819,7 @@ function getCommandErrorMessage(error) {
 	}
 	return error instanceof Error ? error.message : String(error);
 }
-async function collectPrismaSetupContext(input, options = {}) {
+async function collectPrismaSetupInitialContext(input, options = {}) {
 	const projectDir = path.resolve(options.projectDir ?? process.cwd());
 	const useDefaults = input.yes === true;
 	const verbose = input.verbose === true;
@@ -828,19 +828,11 @@ async function collectPrismaSetupContext(input, options = {}) {
 	if (!databaseProvider) return;
 	const schemaPreset = input.schemaPreset ?? options.defaultSchemaPreset ?? DEFAULT_SCHEMA_PRESET$1;
 	const databaseUrl = input.databaseUrl;
-	let shouldUsePrismaPostgres = false;
-	if (databaseProvider === "postgresql" && !databaseUrl) {
-		const prismaPostgresChoice = input.prismaPostgres ?? (useDefaults ? DEFAULT_PRISMA_POSTGRES : await promptForPrismaPostgres());
-		if (prismaPostgresChoice === void 0) return;
-		shouldUsePrismaPostgres = prismaPostgresChoice;
-	}
 	const detectedPackageManager = await detectPackageManager(projectDir);
 	const packageManager = input.packageManager ?? (useDefaults ? detectedPackageManager : await promptForPackageManager(detectedPackageManager));
 	if (!packageManager) return;
 	const shouldInstall = input.install ?? (useDefaults ? DEFAULT_INSTALL : await promptForDependencyInstall(packageManager));
 	if (shouldInstall === void 0) return;
-	const shouldMigrateAndSeed = !(shouldInstall && shouldGenerate) ? false : input.migrateAndSeed ?? (useDefaults ? DEFAULT_MIGRATE_AND_SEED : await promptForMigrateAndSeed());
-	if (shouldMigrateAndSeed === void 0) return;
 	return {
 		projectDir,
 		verbose,
@@ -848,9 +840,24 @@ async function collectPrismaSetupContext(input, options = {}) {
 		databaseProvider,
 		schemaPreset,
 		databaseUrl,
-		shouldUsePrismaPostgres,
 		packageManager,
-		shouldInstall,
+		shouldInstall
+	};
+}
+async function completePrismaSetupContext(input, context, options = {}) {
+	const useDefaults = input.yes === true;
+	let shouldUsePrismaPostgres = false;
+	const shouldUseComputePostgres = context.databaseProvider === "postgresql" && !context.databaseUrl && options.useComputePostgres === true;
+	if (context.databaseProvider === "postgresql" && !context.databaseUrl && !shouldUseComputePostgres) {
+		const prismaPostgresChoice = input.prismaPostgres ?? (useDefaults ? DEFAULT_PRISMA_POSTGRES : await promptForPrismaPostgres());
+		if (prismaPostgresChoice === void 0) return;
+		shouldUsePrismaPostgres = prismaPostgresChoice;
+	}
+	const shouldMigrateAndSeed = !(context.shouldInstall && context.shouldGenerate && !(shouldUseComputePostgres && options.skipMigrateAndSeedPrompt)) ? false : input.migrateAndSeed ?? (useDefaults ? DEFAULT_MIGRATE_AND_SEED : await promptForMigrateAndSeed());
+	if (shouldMigrateAndSeed === void 0) return;
+	return {
+		...context,
+		shouldUsePrismaPostgres,
 		shouldMigrateAndSeed
 	};
 }
@@ -1078,8 +1085,8 @@ function buildNextStepsForContext(opts) {
 	const nextSteps = [...options.prependNextSteps ?? []];
 	if (!context.shouldInstall) nextSteps.push(`- ${getInstallCommand(context.packageManager)}`);
 	if (!didGenerateClient || !context.shouldGenerate) nextSteps.push(`- ${getRunScriptCommand(context.packageManager, "db:generate")}`);
-	if (!didMigrate) nextSteps.push(`- ${getRunScriptCommand(context.packageManager, "db:migrate")}`);
-	if (!didSeed) nextSteps.push(`- ${getRunScriptCommand(context.packageManager, "db:seed")}`);
+	if (options.includeMigrationAndSeedNextSteps !== false && !didMigrate) nextSteps.push(`- ${getRunScriptCommand(context.packageManager, "db:migrate")}`);
+	if (options.includeMigrationAndSeedNextSteps !== false && !didSeed) nextSteps.push(`- ${getRunScriptCommand(context.packageManager, "db:seed")}`);
 	if (options.includeDevNextStep) nextSteps.push(`- ${getRunScriptCommand(context.packageManager, "dev")}`);
 	return nextSteps;
 }
@@ -1733,10 +1740,7 @@ function getPrismaCliAppDeployCommand(packageManager) {
 function getComputeDeployScriptMap(context) {
 	const deployArgs = ["--prod", ...getComputeDeployRuntimeArgs(context)];
 	const deployCommand = [getPrismaCliAppDeployCommand(context.packageManager), ...deployArgs].join(" ");
-	return {
-		"compute:deploy": deployCommand,
-		"compute:deploy:ci": `${deployCommand} --yes`
-	};
+	return { "compute:deploy": deployCommand };
 }
 function getComputeDeployRuntimeArgs(context) {
 	return [...context.requiresExplicitFramework ? ["--framework", context.framework] : [], ...context.httpPort ? ["--http-port", String(context.httpPort)] : []];
@@ -1852,7 +1856,8 @@ function toComputeDeployResult(data) {
 		deploymentId: data.result.deployment.id,
 		projectId: data.result.project.id,
 		projectName: data.result.project.name,
-		branchName: data.result.branch.name
+		branchName: data.result.branch.name,
+		database: data.result.branchDatabase?.database
 	};
 }
 async function executeComputeDeployContext(params) {
@@ -1867,9 +1872,9 @@ async function executeComputeDeployContext(params) {
 		params.context.createProjectName,
 		...getComputeDeployRuntimeArgs(params.context)
 	];
+	if (params.databaseSetup === "compute-postgres") args.push("--db");
 	try {
 		for (const [key, value] of Object.entries(params.envVars ?? {})) args.push("--env", `${key}=${value}`);
-		if (params.context.httpPort) args.push("--http-port", String(params.context.httpPort));
 		const { stdout, exitCode } = await runPrismaCli(params.context.packageManager, args, {
 			cwd: params.projectDir,
 			reject: false,
@@ -1959,7 +1964,7 @@ async function getAnonymousId() {
 }
 function getCommonProperties() {
 	return {
-		"cli-version": "0.4.2-pr.34.115.1",
+		"cli-version": "0.4.2-pr.34.117.1",
 		"node-version": process.version,
 		platform: process.platform,
 		arch: process.arch
@@ -2235,25 +2240,31 @@ async function collectCreateContext(input) {
 		cancel(`Target directory ${formatPathForDisplay(targetDirectory)} is not empty. Use --force to continue.`);
 		return;
 	}
-	const prismaSetupContext = await collectPrismaSetupContext(input, {
+	const prismaSetupInitialContext = await collectPrismaSetupInitialContext(input, {
 		projectDir: targetDirectory,
 		defaultSchemaPreset: DEFAULT_SCHEMA_PRESET
 	});
-	if (!prismaSetupContext) return;
-	const addonSetupContext = await collectCreateAddonSetupContext(input, {
-		useDefaults,
-		provider: prismaSetupContext.databaseProvider,
-		shouldUsePrismaPostgres: prismaSetupContext.shouldUsePrismaPostgres
-	});
-	if (addonSetupContext === void 0) return;
+	if (!prismaSetupInitialContext) return;
 	const projectPackageName = toPackageName(path.basename(targetDirectory));
 	const computeDeployContext = await collectComputeDeployContext(input, {
 		template,
-		packageManager: prismaSetupContext.packageManager,
+		packageManager: prismaSetupInitialContext.packageManager,
 		useDefaults,
 		defaultServiceName: projectPackageName
 	});
 	if (computeDeployContext === void 0) return;
+	const useComputeDatabase = Boolean(computeDeployContext && prismaSetupInitialContext.databaseProvider === "postgresql" && !prismaSetupInitialContext.databaseUrl && input.prismaPostgres !== false);
+	const prismaSetupContext = await completePrismaSetupContext(input, prismaSetupInitialContext, {
+		useComputePostgres: useComputeDatabase,
+		skipMigrateAndSeedPrompt: useComputeDatabase
+	});
+	if (!prismaSetupContext) return;
+	const addonSetupContext = await collectCreateAddonSetupContext(input, {
+		useDefaults,
+		provider: prismaSetupContext.databaseProvider,
+		shouldUsePrismaPostgres: prismaSetupContext.shouldUsePrismaPostgres
+	});
+	if (addonSetupContext === void 0) return;
 	return {
 		targetDirectory,
 		targetPathState,
@@ -2262,7 +2273,8 @@ async function collectCreateContext(input) {
 		projectPackageName,
 		prismaSetupContext,
 		addonSetupContext: addonSetupContext ?? void 0,
-		computeDeployContext: computeDeployContext ?? void 0
+		computeDeployContext: computeDeployContext ?? void 0,
+		useComputeDatabase
 	};
 }
 async function executeCreateContext(context) {
@@ -2321,12 +2333,18 @@ async function executeCreateContext(context) {
 			error
 		};
 	}
+	const prismaSetupContext = context.useComputeDatabase ? {
+		...context.prismaSetupContext,
+		shouldUsePrismaPostgres: false,
+		shouldMigrateAndSeed: false
+	} : context.prismaSetupContext;
 	let prismaResult;
 	try {
-		prismaResult = await executePrismaSetupContext(context.prismaSetupContext, {
+		prismaResult = await executePrismaSetupContext(prismaSetupContext, {
 			prependNextSteps: nextSteps,
 			projectDir: context.targetDirectory,
-			includeDevNextStep: true
+			includeDevNextStep: !context.useComputeDatabase,
+			includeMigrationAndSeedNextSteps: !context.useComputeDatabase
 		});
 		if (!prismaResult.ok) return {
 			ok: false,
@@ -2344,7 +2362,8 @@ async function executeCreateContext(context) {
 		const result = await executeComputeDeployContext({
 			context: context.computeDeployContext,
 			projectDir: context.targetDirectory,
-			envVars: prismaResult.databaseUrl ? { DATABASE_URL: prismaResult.databaseUrl } : void 0
+			envVars: prismaResult.databaseUrl ? { DATABASE_URL: prismaResult.databaseUrl } : void 0,
+			databaseSetup: context.useComputeDatabase ? "compute-postgres" : void 0
 		});
 		if (!result.ok && !result.cancelled) return {
 			ok: false,
@@ -2364,7 +2383,7 @@ async function executeCreateContext(context) {
 	}
 	const summaryLines = [];
 	summaryLines.push(`Setup complete.${prismaResult.warningSection}`);
-	if (deployResult) summaryLines.push("", "Deployed to Prisma Compute:", ...deployResult.appUrl ? [`- App URL: ${deployResult.appUrl}`] : [], `- App: ${deployResult.appName} (${deployResult.appId})`, `- Deployment: ${deployResult.deploymentId}`);
+	if (deployResult) summaryLines.push("", "Deployed to Prisma Compute:", ...deployResult.appUrl ? [`- App URL: ${deployResult.appUrl}`] : [], `- App: ${deployResult.appName} (${deployResult.appId})`, `- Deployment: ${deployResult.deploymentId}`, ...deployResult.database ? [`- Database: ${deployResult.database.name} (${deployResult.database.id})`] : []);
 	summaryLines.push("", "Next steps:", prismaResult.nextSteps.join("\n"));
 	outro(summaryLines.join("\n"));
 	return { ok: true };

package/dist/index.mjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { a as DatabaseUrlSchema, i as DatabaseProviderSchema, n as CreateCommandInputSchema, o as PackageManagerSchema, r as CreateTemplateSchema, s as SchemaPresetSchema, t as runCreateCommand } from "./create-C6wQ1yYn.mjs";
+import { a as DatabaseUrlSchema, i as DatabaseProviderSchema, n as CreateCommandInputSchema, o as PackageManagerSchema, r as CreateTemplateSchema, s as SchemaPresetSchema, t as runCreateCommand } from "./create-yihruvVK.mjs";
 import { os } from "@orpc/server";
 import { createCli } from "trpc-cli";
 
 //#region src/index.ts
-const CLI_VERSION = "0.4.2-pr.34.115.1";
+const CLI_VERSION = "0.4.2-pr.34.117.1";
 const router = os.router({ create: os.meta({
 	description: "Create a new project with Prisma setup",
 	default: true,

package/package.json

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