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

package/dist/cli.mjs

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

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

@@ -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,20 +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;
-	const shouldUseComputePostgres = databaseProvider === "postgresql" && !databaseUrl && options.skipPrismaPostgresProvisioning === true;
-	if (databaseProvider === "postgresql" && !databaseUrl && !shouldUseComputePostgres) {
-		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 && !(shouldUseComputePostgres && options.skipMigrateAndSeedPrompt)) ? false : input.migrateAndSeed ?? (useDefaults ? DEFAULT_MIGRATE_AND_SEED : await promptForMigrateAndSeed());
-	if (shouldMigrateAndSeed === void 0) return;
 	return {
 		projectDir,
 		verbose,
@@ -849,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
 	};
 }
@@ -1772,26 +1778,11 @@ async function ensurePrismaCliAvailable(packageManager) {
 		return false;
 	}
 }
-async function collectComputeDeployIntent(input, options) {
-	if (!isComputeDeployableTemplate(options.template)) return null;
-	if (input.deploy === false) return null;
-	if (input.deploy === true) return true;
-	if (options.useDefaults) return null;
-	const confirmed = await confirm({
-		message: "Deploy to Prisma Compute now?",
-		initialValue: true
-	});
-	if (isCancel(confirmed)) {
-		cancel("Operation cancelled.");
-		return;
-	}
-	return confirmed;
-}
 async function collectComputeDeployContext(input, options) {
 	if (!isComputeDeployableTemplate(options.template)) return null;
-	if (options.wantsDeploy === false || options.wantsDeploy === null || input.deploy === false) return null;
+	if (input.deploy === false) return null;
 	let wantsDeploy;
-	if (options.wantsDeploy === true || input.deploy === true) wantsDeploy = true;
+	if (input.deploy === true) wantsDeploy = true;
 	else if (options.useDefaults) return null;
 	else {
 		const confirmed = await confirm({
@@ -1973,7 +1964,7 @@ async function getAnonymousId() {
 }
 function getCommonProperties() {
 	return {
-		"cli-version": "0.4.2-pr.34.116.1",
+		"cli-version": "0.4.2-pr.34.117.1",
 		"node-version": process.version,
 		platform: process.platform,
 		arch: process.arch
@@ -2249,16 +2240,23 @@ async function collectCreateContext(input) {
 		cancel(`Target directory ${formatPathForDisplay(targetDirectory)} is not empty. Use --force to continue.`);
 		return;
 	}
-	const computeDeployIntent = await collectComputeDeployIntent(input, {
+	const prismaSetupInitialContext = await collectPrismaSetupInitialContext(input, {
+		projectDir: targetDirectory,
+		defaultSchemaPreset: DEFAULT_SCHEMA_PRESET
+	});
+	if (!prismaSetupInitialContext) return;
+	const projectPackageName = toPackageName(path.basename(targetDirectory));
+	const computeDeployContext = await collectComputeDeployContext(input, {
 		template,
-		useDefaults
+		packageManager: prismaSetupInitialContext.packageManager,
+		useDefaults,
+		defaultServiceName: projectPackageName
 	});
-	if (computeDeployIntent === void 0) return;
-	const prismaSetupContext = await collectPrismaSetupContext(input, {
-		projectDir: targetDirectory,
-		defaultSchemaPreset: DEFAULT_SCHEMA_PRESET,
-		skipPrismaPostgresProvisioning: computeDeployIntent === true && input.prismaPostgres !== false,
-		skipMigrateAndSeedPrompt: computeDeployIntent === true && input.prismaPostgres !== false
+	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, {
@@ -2267,16 +2265,6 @@ async function collectCreateContext(input) {
 		shouldUsePrismaPostgres: prismaSetupContext.shouldUsePrismaPostgres
 	});
 	if (addonSetupContext === void 0) return;
-	const projectPackageName = toPackageName(path.basename(targetDirectory));
-	const computeDeployContext = await collectComputeDeployContext(input, {
-		template,
-		packageManager: prismaSetupContext.packageManager,
-		useDefaults,
-		defaultServiceName: projectPackageName,
-		wantsDeploy: computeDeployIntent
-	});
-	if (computeDeployContext === void 0) return;
-	const useComputeDatabase = Boolean(computeDeployContext && prismaSetupContext.databaseProvider === "postgresql" && !prismaSetupContext.databaseUrl && input.prismaPostgres !== false);
 	return {
 		targetDirectory,
 		targetPathState,

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-DRZe4NlG.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.116.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.116.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",