@prisma/cli 3.0.0-beta.0 → 3.0.0-beta.2

package/dist/controllers/project.js

@@ -1,8 +1,13 @@
-import { CliError, authRequiredError, usageError, workspaceRequiredError } from "../shell/errors.js";
+import { CliError, authRequiredError, featureUnavailableError, usageError, workspaceRequiredError } from "../shell/errors.js";
 import { renderSummaryLine } from "../shell/ui.js";
 import { canPrompt } from "../shell/runtime.js";
 import { requireComputeAuth } from "../lib/auth/guard.js";
-import { resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
+import { formatCommandArgument } from "../shell/command-arguments.js";
+import { readLocalResolutionPin } from "../lib/project/local-pin.js";
+import { buildProjectSetupNextActions, inferTargetName, inspectProjectBinding, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
+import { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.js";
+import { promptForProjectSetupChoice } from "../lib/project/interactive-setup.js";
+import { createPreviewAppProvider } from "../lib/app/preview-provider.js";
 import { createCliUseCaseGateways } from "../use-cases/create-cli-gateways.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
 import { parseGitHubRepositoryUrl, readGitOriginRemote } from "../adapters/git.js";
@@ -14,6 +19,12 @@ const GITHUB_INSTALL_POLL_TIMEOUT_MS = 12e4;
 function isRealMode(context) {
 	return !context.runtime.fixturePath && !context.runtime.env.PRISMA_CLI_MOCK_FIXTURE_PATH;
 }
+async function readProjectListLocalBinding(cwd, workspace, projects) {
+	const pin = await readLocalResolutionPin(cwd);
+	if (pin.kind === "present") return pin.pin.workspaceId === workspace.id && projects.some((project) => project.id === pin.pin.projectId) ? { status: "linked" } : { status: "invalid" };
+	if (pin.kind === "invalid") return { status: "invalid" };
+	return { status: "not-linked" };
+}
 async function runProjectList(context) {
 	const authState = await requireAuthenticatedAuthState(context);
 	const workspace = authState.workspace;
@@ -21,40 +32,171 @@ async function runProjectList(context) {
 	if (isRealMode(context)) {
 		const client = await requireComputeAuth(context.runtime.env);
 		if (!client) throw authRequiredError();
+		const projects = sortProjects(await listRealWorkspaceProjects(client, workspace));
+		const localBinding = await readProjectListLocalBinding(context.runtime.cwd, workspace, projects);
+		const nextActions = buildProjectListNextActions(localBinding);
 		return {
 			command: "project.list",
 			result: {
 				workspace,
-				projects: sortProjects(await listRealWorkspaceProjects(client, workspace)).map(toProjectSummary)
+				projects: projects.map(toProjectSummary),
+				localBinding
 			},
 			warnings: [],
-			nextSteps: []
+			nextSteps: [],
+			nextActions
 		};
 	}
+	const result = await createProjectUseCases(createCliUseCaseGateways(context)).list(authState);
+	const localBinding = await readProjectListLocalBinding(context.runtime.cwd, workspace, result.projects);
+	const nextActions = buildProjectListNextActions(localBinding);
 	return {
 		command: "project.list",
-		result: await createProjectUseCases(createCliUseCaseGateways(context)).list(authState),
+		result: {
+			...result,
+			localBinding
+		},
 		warnings: [],
-		nextSteps: []
+		nextSteps: [],
+		nextActions
 	};
 }
+function buildProjectListNextActions(localBinding) {
+	return localBinding?.status === "linked" ? [] : buildProjectSetupNextActions({
+		createCommand: "prisma-cli project create <name>",
+		reason: localBinding?.status === "invalid" ? "This directory has an invalid local Project binding. Ask the user which Prisma Project to link before running Project-scoped commands." : "This directory is not linked to a Prisma Project. Project list shows available Projects, but none is selected for this directory."
+	});
+}
 async function runProjectShow(context, explicitProject) {
 	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
 	if (!workspace) throw workspaceRequiredError();
+	const result = isRealMode(context) ? await resolveProjectShowInRealMode(context, workspace, explicitProject) : await resolveProjectShowInFixtureMode(context, workspace, explicitProject);
 	return {
 		command: "project.show",
-		result: isRealMode(context) ? await resolveProjectShowInRealMode(context, workspace, explicitProject) : await resolveProjectShowInFixtureMode(context, workspace, explicitProject),
+		result,
 		warnings: [],
-		nextSteps: []
+		nextSteps: [],
+		nextActions: result.project === null ? buildProjectSetupNextActions({
+			commandName: "project show",
+			suggestedProjectName: result.suggestedProjectName,
+			reason: "This directory is not linked to a Prisma Project. Package and directory names can suggest setup defaults, but they do not select a Project."
+		}) : []
+	};
+}
+async function runProjectCreate(context, projectName) {
+	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
+	if (!workspace) throw workspaceRequiredError();
+	if (!isValidProjectSetupName(projectName)) throw projectSetupNameRequiredError("project create");
+	if (!isRealMode(context)) throw featureUnavailableError("Project create is not available in fixture mode", "Creating Projects requires live platform integration.", "Rerun without fixture mode enabled to create a Project.", ["prisma-cli auth login"], "project");
+	const client = await requireComputeAuth(context.runtime.env);
+	if (!client) throw authRequiredError();
+	const provider = createPreviewAppProvider(client);
+	const name = projectName.trim();
+	const created = await provider.createProject({ name }).catch((error) => {
+		throw projectCreateFailedError(error, name, workspace, {
+			nextSteps: ["prisma-cli project list", "prisma-cli project link <id-or-name>"],
+			permissionFix: "Grant the token permission to create Projects in this workspace, or link an existing Project.",
+			fallbackFix: "Retry the command, or choose an existing Project with prisma-cli project link <id-or-name>."
+		});
+	});
+	return {
+		command: "project.create",
+		result: await bindProjectToDirectory(context, workspace, {
+			id: created.id,
+			name: created.name
+		}, "created"),
+		warnings: [],
+		nextSteps: ["prisma-cli app deploy"]
+	};
+}
+async function runProjectLink(context, projectRef) {
+	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
+	if (!workspace) throw workspaceRequiredError();
+	let provider = null;
+	let projects;
+	if (isRealMode(context)) {
+		const client = await requireComputeAuth(context.runtime.env);
+		if (!client) throw authRequiredError();
+		provider = createPreviewAppProvider(client);
+		projects = await listRealWorkspaceProjects(client, workspace);
+	} else projects = listFixtureWorkspaceProjects(context, workspace);
+	let result;
+	if (projectRef?.trim()) result = await bindProjectToDirectory(context, workspace, toProjectSummary(resolveProjectForSetup(projectRef.trim(), projects, workspace)), "linked");
+	else if (canPrompt(context) && !context.flags.yes) result = await resolveInteractiveProjectLinkSetup(context, workspace, projects, provider);
+	else throw await projectLinkTargetRequiredError(context, projects);
+	return {
+		command: "project.link",
+		result,
+		warnings: [],
+		nextSteps: ["prisma-cli app deploy"]
+	};
+}
+async function resolveInteractiveProjectLinkSetup(context, workspace, projects, provider) {
+	const setup = await promptForProjectSetupChoice({
+		context,
+		projects,
+		createProject: (projectName) => {
+			if (!provider) throw featureUnavailableError("Project create is not available in fixture mode", "Creating Projects requires live platform integration.", "Rerun without fixture mode enabled to create a Project.", ["prisma-cli auth login"], "project");
+			return createProjectForLinkSetup(provider, projectName, workspace);
+		},
+		cancel: {
+			why: "Project link needs a Project before it can continue.",
+			fix: "Choose an existing Project or create a new one, then rerun project link.",
+			nextSteps: ["prisma-cli project link <id-or-name>", "prisma-cli project create <name>"]
+		}
+	});
+	return bindProjectToDirectory(context, workspace, setup.project, setup.action);
+}
+async function createProjectForLinkSetup(provider, projectName, workspace) {
+	const created = await provider.createProject({ name: projectName }).catch((error) => {
+		throw projectCreateFailedError(error, projectName, workspace, {
+			nextSteps: [
+				"prisma-cli project list",
+				"prisma-cli project link <id-or-name>",
+				`prisma-cli project create ${formatCommandArgument(projectName)}`
+			],
+			permissionFix: "Grant the token permission to create Projects in this workspace, or link an existing Project.",
+			fallbackFix: "Retry the command, or choose an existing Project with prisma-cli project link <id-or-name>."
+		});
+	});
+	return {
+		id: created.id,
+		name: created.name,
+		workspace
 	};
 }
+async function projectLinkTargetRequiredError(context, projects) {
+	const suggestedName = await inferTargetName(context.runtime.cwd);
+	const createCommand = `prisma-cli project create ${formatCommandArgument(suggestedName.name)}`;
+	const recoveryCommands = ["prisma-cli project link <id-or-name>", createCommand];
+	return new CliError({
+		code: "PROJECT_LINK_TARGET_REQUIRED",
+		domain: "project",
+		summary: "Choose a Project to link this directory",
+		why: "This directory is not linked to a Prisma Project. Existing Projects are candidates until the user chooses one, and package or directory names are suggestions only.",
+		fix: "Run prisma-cli project link in a TTY to choose from the setup list, pass a Project id or name, or create a new Project.",
+		meta: {
+			suggestedProjectName: suggestedName.name,
+			suggestedProjectNameSource: suggestedName.source,
+			candidates: sortProjects(projects).map(toProjectSummary),
+			recoveryCommands
+		},
+		exitCode: 2,
+		nextSteps: ["prisma-cli project list", ...recoveryCommands],
+		nextActions: buildProjectSetupNextActions({
+			suggestedProjectName: suggestedName.name,
+			createCommand,
+			reason: "Project link needs the user to choose an existing Project or create a new one. Existing Projects, package names, and directory names are candidates only, not selections."
+		})
+	});
+}
 async function runGitConnect(context, gitUrl, options = {}) {
 	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
 	if (!workspace) throw workspaceRequiredError();
 	if (isRealMode(context)) {
 		const client = await requireComputeAuth(context.runtime.env);
 		if (!client) throw authRequiredError();
-		const target = await resolveProjectShowInRealMode(context, workspace, options.project);
+		const target = await resolveRequiredProjectInRealMode(context, workspace, options.project, "git connect");
 		const repository = await resolveRepositoryForConnect(context, gitUrl);
 		const api = client;
 		const existing = await readFirstSourceRepository(api, target.project.id);
@@ -89,7 +231,7 @@ async function runGitConnect(context, gitUrl, options = {}) {
 			nextSteps: []
 		};
 	}
-	const target = await resolveProjectShowInFixtureMode(context, workspace, options.project);
+	const target = await resolveRequiredProjectInFixtureMode(context, workspace, options.project, "git connect");
 	const repository = await resolveRepositoryForConnect(context, gitUrl);
 	const existingConnection = await context.stateStore.readRepositoryConnection(target.project.id);
 	if (existingConnection) {
@@ -122,7 +264,7 @@ async function runGitDisconnect(context, options = {}) {
 	if (isRealMode(context)) {
 		const client = await requireComputeAuth(context.runtime.env);
 		if (!client) throw authRequiredError();
-		const target = await resolveProjectShowInRealMode(context, workspace, options.project);
+		const target = await resolveRequiredProjectInRealMode(context, workspace, options.project, "git disconnect");
 		const api = client;
 		const existing = await readFirstSourceRepository(api, target.project.id);
 		if (!existing) throw repoNotConnectedError();
@@ -138,7 +280,7 @@ async function runGitDisconnect(context, options = {}) {
 			nextSteps: []
 		};
 	}
-	const target = await resolveProjectShowInFixtureMode(context, workspace, options.project);
+	const target = await resolveRequiredProjectInFixtureMode(context, workspace, options.project, "git disconnect");
 	const existingConnection = await context.stateStore.readRepositoryConnection(target.project.id);
 	if (!existingConnection) throw repoNotConnectedError();
 	await context.stateStore.clearRepositoryConnection(target.project.id);
@@ -153,6 +295,17 @@ async function runGitDisconnect(context, options = {}) {
 	};
 }
 async function resolveProjectShowInRealMode(context, workspace, explicitProject) {
+	const client = await requireComputeAuth(context.runtime.env);
+	if (!client) throw authRequiredError();
+	return inspectProjectBinding({
+		context,
+		workspace,
+		explicitProject,
+		listProjects: () => listRealWorkspaceProjects(client, workspace),
+		commandName: "project show"
+	});
+}
+async function resolveRequiredProjectInRealMode(context, workspace, explicitProject, commandName) {
 	const client = await requireComputeAuth(context.runtime.env);
 	if (!client) throw authRequiredError();
 	return resolveProjectTarget({
@@ -160,16 +313,25 @@ async function resolveProjectShowInRealMode(context, workspace, explicitProject)
 		workspace,
 		explicitProject,
 		listProjects: () => listRealWorkspaceProjects(client, workspace),
-		remember: false
+		commandName
 	});
 }
 async function resolveProjectShowInFixtureMode(context, workspace, explicitProject) {
+	return inspectProjectBinding({
+		context,
+		workspace,
+		explicitProject,
+		listProjects: async () => listFixtureWorkspaceProjects(context, workspace),
+		commandName: "project show"
+	});
+}
+async function resolveRequiredProjectInFixtureMode(context, workspace, explicitProject, commandName) {
 	return resolveProjectTarget({
 		context,
 		workspace,
 		explicitProject,
 		listProjects: async () => listFixtureWorkspaceProjects(context, workspace),
-		remember: false
+		commandName
 	});
 }
 async function listRealWorkspaceProjects(client, workspace) {
@@ -177,6 +339,7 @@ async function listRealWorkspaceProjects(client, workspace) {
 	return sortProjects((data?.data ?? []).filter((project) => project.workspace.id === workspace.id).map((project) => ({
 		id: project.id,
 		name: project.name,
+		..."url" in project && typeof project.url === "string" ? { url: project.url } : {},
 		slug: "slug" in project && typeof project.slug === "string" ? project.slug : null,
 		workspace: {
 			id: project.workspace.id,
@@ -188,6 +351,7 @@ function listFixtureWorkspaceProjects(context, workspace) {
 	return sortProjects(context.api.listProjectsForWorkspace(workspace.id).map((project) => ({
 		id: project.id,
 		name: project.name,
+		...project.url ? { url: project.url } : {},
 		slug: project.slug,
 		workspace
 	})));
@@ -494,11 +658,5 @@ function repoConnectionFixForStatus(status) {
 	if (status === 422) return "Make sure the GitHub App installation has access to this repository.";
 	return "Re-run with --trace for the underlying API response details.";
 }
-function toProjectSummary(project) {
-	return {
-		id: project.id,
-		name: project.name
-	};
-}
 //#endregion
-export { listRealWorkspaceProjects, runGitConnect, runGitDisconnect, runProjectList, runProjectShow };
+export { listRealWorkspaceProjects, runGitConnect, runGitDisconnect, runProjectCreate, runProjectLink, runProjectList, runProjectShow };

package/dist/lib/app/deploy-output.js

@@ -2,6 +2,7 @@ import { padDisplay } from "../../shell/ui.js";
 //#region src/lib/app/deploy-output.ts
 const DEPLOY_OUTPUT_MIN_LABEL_WIDTH = 9;
 const DEPLOY_OUTPUT_MIN_VALUE_WIDTH = 9;
+const DEPLOY_SETTINGS_MIN_KEY_WIDTH = 10;
 function renderDeployOutputRows(ui, rows) {
 	if (rows.length === 0) return [];
 	const labelWidth = Math.max(DEPLOY_OUTPUT_MIN_LABEL_WIDTH, ...rows.map((row) => row.label.length));
@@ -11,5 +12,13 @@ function renderDeployOutputRows(ui, rows) {
 		return `  ${padDisplay(row.label, labelWidth)}  ${padDisplay(ui.strong(row.value), valueWidth)}${row.origin ? `  ${ui.dim(`· ${row.origin}`)}` : ""}`.trimEnd();
 	});
 }
+function renderDeploySettingsPreview(ui, rows) {
+	if (rows.length === 0) return [];
+	const keyWidth = Math.max(DEPLOY_SETTINGS_MIN_KEY_WIDTH, ...rows.map((row) => `${row.key}:`.length));
+	const rail = ui.dim("│");
+	return rows.map((row) => {
+		return `${rail}  ${ui.accent(padDisplay(`${row.key}:`, keyWidth))}  ${ui.strong(row.value)}`;
+	});
+}
 //#endregion
-export { renderDeployOutputRows };
+export { renderDeployOutputRows, renderDeploySettingsPreview };

package/dist/lib/auth/auth-ops.js

@@ -42,41 +42,52 @@ async function readAuthState(env) {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null
+		workspace: null,
+		credential: null
 	};
+	const client = await requireComputeAuth(env);
+	const currentPrincipal = await readCurrentPrincipalAuthState(client);
+	if (currentPrincipal) return currentPrincipal;
 	const claims = decodeJwtPayload(tokens.accessToken);
 	return buildAuthState({
 		workspaceIdFromCredential: tokens.workspaceId,
 		claims,
-		env
+		env,
+		client
 	});
 }
 async function readServiceTokenAuthState(token, env) {
+	const client = await requireComputeAuth(env);
+	const currentPrincipal = await readCurrentPrincipalAuthState(client);
+	if (currentPrincipal) return currentPrincipal;
 	const claims = decodeJwtPayload(token);
 	const workspaceId = workspaceIdFromClaims(claims);
 	if (!workspaceId) return {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null
+		workspace: null,
+		credential: null
 	};
 	return buildAuthState({
 		workspaceIdFromCredential: workspaceId,
 		claims,
-		env
+		env,
+		client
 	});
 }
-async function buildAuthState({ workspaceIdFromCredential, claims, env }) {
+async function buildAuthState({ workspaceIdFromCredential, claims, env, client }) {
 	let workspaceId = workspaceIdFromCredential;
 	let workspaceName = workspaceIdFromCredential;
-	const client = await requireComputeAuth(env);
+	client ??= await requireComputeAuth(env);
 	if (client) try {
 		const { data, response } = await client.GET("/v1/workspaces/{id}", { params: { path: { id: workspaceIdFromCredential } } });
 		if (response?.status === 401) return {
 			authenticated: false,
 			provider: null,
 			user: null,
-			workspace: null
+			workspace: null,
+			credential: null
 		};
 		if (data?.data?.id) {
 			workspaceId = data.data.id;
@@ -92,9 +103,39 @@ async function buildAuthState({ workspaceIdFromCredential, claims, env }) {
 		workspace: {
 			id: workspaceId,
 			name: workspaceName
-		}
+		},
+		credential: null
 	};
 }
+async function readCurrentPrincipalAuthState(client) {
+	if (!client) return null;
+	try {
+		const { data, response } = await client.GET("/v1/me");
+		if (response?.status === 401) return {
+			authenticated: false,
+			provider: null,
+			user: null,
+			workspace: null,
+			credential: null
+		};
+		const principal = data?.data;
+		if (!principal) return null;
+		if (!principal.credential) return null;
+		return {
+			authenticated: true,
+			provider: null,
+			user: principal.user ? {
+				id: principal.user.id,
+				email: principal.user.email,
+				name: principal.user.name
+			} : null,
+			workspace: principal.workspace,
+			credential: principal.credential
+		};
+	} catch {
+		return null;
+	}
+}
 async function performLogout(env) {
 	await new FileTokenStorage(env).clearTokens();
 }

package/dist/lib/project/interactive-setup.js

@@ -0,0 +1,56 @@
+import { usageError } from "../../shell/errors.js";
+import { selectPrompt, textPrompt } from "../../shell/prompt.js";
+import { inferTargetName, sortProjects } from "./resolution.js";
+import { toProjectSummary, validateProjectSetupNameText } from "./setup.js";
+//#region src/lib/project/interactive-setup.ts
+async function promptForProjectSetupChoice(options) {
+	const sortedProjects = sortProjects(options.projects);
+	const projectNames = sortedProjects.map((project) => project.name);
+	const duplicateNames = new Set(projectNames.filter((name, index) => projectNames.indexOf(name) !== index));
+	const choice = await selectPrompt({
+		input: options.context.runtime.stdin,
+		output: options.context.runtime.stderr,
+		message: "Which Project should this directory use?",
+		choices: [
+			...sortedProjects.map((project) => ({
+				label: duplicateNames.has(project.name) ? `${project.name} (${project.id})` : project.name,
+				value: {
+					kind: "project",
+					project
+				}
+			})),
+			{
+				label: "Create a new Project",
+				value: { kind: "create" }
+			},
+			{
+				label: "Cancel",
+				value: { kind: "cancel" }
+			}
+		]
+	});
+	if (choice.kind === "cancel") throw usageError("Project setup canceled", options.cancel.why, options.cancel.fix, options.cancel.nextSteps, "project");
+	if (choice.kind === "project") return {
+		project: toProjectSummary(choice.project),
+		action: "linked",
+		targetName: choice.project.name,
+		targetNameSource: "prompt"
+	};
+	const suggestedName = await inferTargetName(options.context.runtime.cwd);
+	const rawName = await textPrompt({
+		input: options.context.runtime.stdin,
+		output: options.context.runtime.stderr,
+		message: "Project name",
+		placeholder: suggestedName.name,
+		validate: (value) => validateProjectSetupNameText(value, suggestedName.name)
+	});
+	const projectName = rawName.trim() || suggestedName.name;
+	return {
+		project: toProjectSummary(await options.createProject(projectName)),
+		action: "created",
+		targetName: projectName,
+		targetNameSource: rawName.trim() ? "prompt" : suggestedName.source
+	};
+}
+//#endregion
+export { promptForProjectSetupChoice };