@prisma/cli 3.0.0-dev.127.1 → 3.0.0-dev.129.1

package/dist/commands/project/index.js

@@ -67,10 +67,11 @@ function createProjectTransferCommand(runtime) {
 }
 function createProjectCreateCommand(runtime) {
 	const command = attachCommandDescriptor(configureRuntimeCommand(new Command("create"), runtime), "project.create");
-	command.argument("<name>", "Project name");
+	command.argument("<name>", "Project name").addOption(new Option("--region <region>", "Prisma Compute region id"));
 	addGlobalFlags(command);
 	command.action(async (name, options) => {
-		await runCommand(runtime, "project.create", options, (context) => runProjectCreate(context, String(name)), {
+		const region = options.region;
+		await runCommand(runtime, "project.create", options, (context) => runProjectCreate(context, String(name), { region }), {
 			renderHuman: (context, descriptor, result) => renderProjectSetup(context, descriptor, result),
 			renderJson: (result) => serializeProjectSetup(result)
 		});

package/dist/controllers/app.js

@@ -5,12 +5,11 @@ import { canPrompt } from "../shell/runtime.js";
 import { writeJsonEvent } from "../shell/output.js";
 import { SERVICE_TOKEN_ENV_VAR, getApiBaseUrl } from "../lib/auth/client.js";
 import { FileTokenStorage } from "../adapters/token-storage.js";
-import { confirmPrompt, selectPrompt, textPrompt } from "../shell/prompt.js";
-import "../lib/app/app-interaction.js";
 import { PRISMA_APP_CONFIG_FILENAME, detectLegacyBuildSettings, resolveConfiguredAppBuildSettings, resolveInferredAppBuildSettings } from "../lib/app/build-settings.js";
 import { APP_BUILD_TYPES, APP_BUILD_TYPE_LABELS, RESOLVED_APP_BUILD_TYPES, executeAppBuild } from "../lib/app/build.js";
 import { envVarNames, parseEnvInputs } from "../lib/app/env-vars.js";
 import { DomainApiError, createAppProvider } from "../lib/app/app-provider.js";
+import { confirmPrompt, selectPrompt, textPrompt } from "../shell/prompt.js";
 import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, readLocalResolutionPin } from "../lib/project/local-pin.js";
 import { buildProjectSetupNextActions, inferTargetName, localProjectWorkspaceMismatchError, projectNotFoundError, projectResolutionErrorToCliError, resolveDurablePlatformMapping, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
 import { bindProjectToDirectory, projectCreateFailedError, projectDirectoryBindingErrorToCliError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.js";
@@ -281,6 +280,7 @@ async function runSingleAppDeploy(context, appName, options, preloadedConfig) {
 	const { provider, target, projectId } = await requireProviderAndDeployProjectContext(context, options?.projectRef, {
 		branch,
 		createProjectName: options?.createProjectName,
+		createProjectRegion: deployRegion?.value,
 		envProjectId,
 		localPin
 	});
@@ -416,6 +416,7 @@ async function runSingleAppDeploy(context, appName, options, preloadedConfig) {
 				entrypoint: entrypoint ?? buildSettingsResolution.settings.entrypoint ?? null,
 				httpPort: runtime.port,
 				region: deployResult.app.region ?? selectedApp.region ?? null,
+				regionSource: deployRegion?.annotation ?? null,
 				envVars: envVarNames(envVars)
 			},
 			durationMs: deployDurationMs,
@@ -1424,7 +1425,7 @@ async function resolveAmbiguousDeployApp(context, matches, targetName, requested
 	});
 }
 function deployNewAppRegion(configRegion) {
-	return configRegion?.value ?? "eu-central-1";
+	return configRegion?.value;
 }
 async function resolveExistingAppSelection(context, projectId, apps, explicitAppName) {
 	if (explicitAppName) {
@@ -1654,7 +1655,7 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 		if (!projectName) throw projectSetupNameRequiredError("app deploy --create-project");
 		return withRemoteDeployBranch(provider, {
 			workspace,
-			project: toProjectSummary(await createProjectForDeploySetup(provider, projectName, workspace, context.runtime.signal)),
+			project: toProjectSummary(await createProjectForDeploySetup(provider, projectName, workspace, context.runtime.signal, options.createProjectRegion)),
 			resolution: {
 				projectSource: "created",
 				targetName: projectName,
@@ -1705,14 +1706,14 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 			targetNameSource: "platform-mapping"
 		}
 	}, branch, context.runtime.signal);
-	if (canPrompt(context) && !context.flags.yes) return withRemoteDeployBranch(provider, await resolveInteractiveDeployProjectSetup(context, provider, workspace, projects), branch, context.runtime.signal);
+	if (canPrompt(context) && !context.flags.yes) return withRemoteDeployBranch(provider, await resolveInteractiveDeployProjectSetup(context, provider, workspace, projects, options.createProjectRegion), branch, context.runtime.signal);
 	throw projectSetupRequiredError(projects, await inferTargetName(context.runtime.cwd, context.runtime.signal));
 }
-async function resolveInteractiveDeployProjectSetup(context, provider, workspace, projects) {
+async function resolveInteractiveDeployProjectSetup(context, provider, workspace, projects, createProjectRegion) {
 	const setup = await promptForProjectSetupChoice({
 		context,
 		projects,
-		createProject: (projectName) => createProjectForDeploySetup(provider, projectName, workspace, context.runtime.signal),
+		createProject: (projectName) => createProjectForDeploySetup(provider, projectName, workspace, context.runtime.signal, createProjectRegion),
 		cancel: {
 			why: "Deploy needs a Project before it can continue.",
 			fix: "Choose an existing Project or create a new one, then rerun deploy.",
@@ -1730,9 +1731,10 @@ async function resolveInteractiveDeployProjectSetup(context, provider, workspace
 		localPinAction: setup.action
 	};
 }
-async function createProjectForDeploySetup(provider, projectName, workspace, signal) {
+async function createProjectForDeploySetup(provider, projectName, workspace, signal, region) {
 	const created = await provider.createProject({
 		name: projectName,
+		region,
 		signal
 	}).catch((error) => {
 		throw projectCreateFailedError(error, projectName, workspace, {
@@ -1748,6 +1750,7 @@ async function createProjectForDeploySetup(provider, projectName, workspace, sig
 	return {
 		id: created.id,
 		name: created.name,
+		...created.defaultRegion != null ? { defaultRegion: created.defaultRegion } : {},
 		workspace
 	};
 }

package/dist/controllers/project.js

@@ -104,7 +104,7 @@ async function runProjectShow(context, explicitProject) {
 		}) : []
 	};
 }
-async function runProjectCreate(context, projectName) {
+async function runProjectCreate(context, projectName, options) {
 	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
 	if (!workspace) throw workspaceRequiredError();
 	if (!isValidProjectSetupName(projectName)) throw projectSetupNameRequiredError("project create");
@@ -115,6 +115,7 @@ async function runProjectCreate(context, projectName) {
 	const name = projectName.trim();
 	const created = await provider.createProject({
 		name,
+		region: options?.region,
 		signal: context.runtime.signal
 	}).catch((error) => {
 		throw projectCreateFailedError(error, name, workspace, {
@@ -125,7 +126,8 @@ async function runProjectCreate(context, projectName) {
 	});
 	const bindResult = await bindProjectToDirectory(context, workspace, {
 		id: created.id,
-		name: created.name
+		name: created.name,
+		...created.defaultRegion != null ? { defaultRegion: created.defaultRegion } : {}
 	}, "created");
 	if (bindResult.isErr()) throw projectDirectoryBindingErrorToCliError(bindResult.error);
 	return {
@@ -704,6 +706,7 @@ async function listRealWorkspaceProjects(client, workspace, signal) {
 		id: project.id,
 		name: project.name,
 		..."url" in project && typeof project.url === "string" ? { url: project.url } : {},
+		..."defaultRegion" in project ? { defaultRegion: project.defaultRegion } : {},
 		slug: "slug" in project && typeof project.slug === "string" ? project.slug : null,
 		workspace: {
 			id: project.workspace.id,

package/dist/lib/app/app-provider.js

@@ -22,12 +22,14 @@ function createAppProvider(client, options) {
 		async createProject(options) {
 			const projectResult = await sdk.createProject({
 				name: options.name,
+				region: options.region,
 				signal: options.signal
 			});
 			if (projectResult.isErr()) throw new Error(projectResult.error.message);
 			return {
 				id: projectResult.value.id,
-				name: projectResult.value.name
+				name: projectResult.value.name,
+				defaultRegion: projectResult.value.defaultRegion
 			};
 		},
 		async listApps(projectId, options) {

package/dist/lib/project/resolution.js

@@ -379,7 +379,8 @@ function toProjectSummary(project) {
 	return {
 		id: project.id,
 		name: project.name,
-		...project.url ? { url: project.url } : {}
+		...project.url ? { url: project.url } : {},
+		...project.defaultRegion != null ? { defaultRegion: project.defaultRegion } : {}
 	};
 }
 //#endregion

package/dist/lib/project/setup.js

@@ -82,7 +82,8 @@ function toProjectSummary(project) {
 	return {
 		id: project.id,
 		name: project.name,
-		...project.url ? { url: project.url } : {}
+		...project.url ? { url: project.url } : {},
+		...project.defaultRegion != null ? { defaultRegion: project.defaultRegion } : {}
 	};
 }
 function projectSetupNameRequiredError(command) {

package/dist/presenters/app.js

@@ -48,6 +48,11 @@ function renderAppDeploy(context, descriptor, result, options) {
 				label: "Logs",
 				value: logsCommand
 			},
+			...result.deploySettings.region && result.deploySettings.regionSource === null ? [{
+				label: "Region",
+				value: result.deploySettings.region,
+				origin: result.project.defaultRegion != null ? "project default" : "platform default — pass --region to choose"
+			}] : [],
 			...deployUsedComputeConfig(result) ? [] : [{
 				label: "Config",
 				value: resolvePrismaCliPackageCommandSync(context.runtime.cwd, ["init"])

package/dist/presenters/project.js

@@ -17,9 +17,13 @@ function renderProjectList(context, descriptor, result) {
 		return lines;
 	}
 	const nameWidth = Math.max(4, ...result.projects.map((project) => stringWidth(project.name)));
+	const idWidth = Math.max(2, ...result.projects.map((project) => project.id.length));
 	lines.push(rail);
-	lines.push(`${rail}  ${ui.accent(padDisplay("name", nameWidth))}  ${ui.accent("id")}`);
-	for (const project of result.projects) lines.push(`${rail}  ${padDisplay(project.name, nameWidth)}  ${project.id}`);
+	lines.push(`${rail}  ${ui.accent(padDisplay("name", nameWidth))}  ${ui.accent(padDisplay("id", idWidth))}  ${ui.accent("region")}`);
+	for (const project of result.projects) {
+		const region = project.defaultRegion ? project.defaultRegion : ui.dim("none");
+		lines.push(`${rail}  ${padDisplay(project.name, nameWidth)}  ${padDisplay(project.id, idWidth)}  ${region}`);
+	}
 	if (result.localBinding?.status === "not-linked" || result.localBinding?.status === "invalid") lines.push(...renderNextSteps(["Link an existing Project you choose: prisma-cli project link <id-or-name>", "Create a new Project: prisma-cli project create <name>"]));
 	return lines;
 }
@@ -241,6 +245,7 @@ function renderBoundProjectShow(context, descriptor, result) {
 		lines.push(rail);
 		lines.push(`${rail}  ${ui.dim("→")} ${ui.link(result.project.url)}`);
 	}
+	if (result.project.defaultRegion) lines.push(`${rail}  ${ui.accent(padDisplay("region", keyWidth))}  ${ui.dim(result.project.defaultRegion)}`);
 	lines.push(...renderResolvedProjectContextBlock(context.ui, {
 		workspace: result.workspace,
 		project: result.project,

package/dist/use-cases/project.js

@@ -23,7 +23,8 @@ function toProjectSummary(project) {
 	return {
 		id: project.id,
 		name: project.name,
-		...project.url ? { url: project.url } : {}
+		...project.url ? { url: project.url } : {},
+		...project.defaultRegion != null ? { defaultRegion: project.defaultRegion } : {}
 	};
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-dev.127.1",
+  "version": "3.0.0-dev.129.1",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {

package/dist/lib/app/app-interaction.js

@@ -1,5 +0,0 @@
-import "../../shell/prompt.js";
-//#region src/lib/app/app-interaction.ts
-const DEFAULT_REGION = "eu-central-1";
-//#endregion
-export { DEFAULT_REGION };