@prisma/cli 3.0.0-beta.3 → 3.0.0-beta.30

package/dist/lib/project/setup.js

@@ -1,7 +1,10 @@
-import { CliError, usageError } from "../../shell/errors.js";
 import "../../shell/command-arguments.js";
+import { CliError, usageError } from "../../shell/errors.js";
+import { shortenHomePath } from "../fs/home-path.js";
 import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, ensureLocalResolutionPinGitignore, writeLocalResolutionPin } from "./local-pin.js";
 import { projectAmbiguousError, projectNotFoundError } from "./resolution.js";
+import path from "node:path";
+import { Result, matchError } from "better-result";
 //#region src/lib/project/setup.ts
 function isValidProjectSetupName(projectName) {
 	return projectName.trim().length > 0;
@@ -16,28 +19,71 @@ function resolveProjectForSetup(projectRef, projects, workspace) {
 	if (matches.length > 1) throw projectAmbiguousError(projectRef, matches);
 	throw projectNotFoundError(projectRef, workspace);
 }
-async function bindProjectToDirectory(context, workspace, project, action) {
-	await writeLocalResolutionPin(context.runtime.cwd, {
-		workspaceId: workspace.id,
-		projectId: project.id
-	}, context.runtime.signal);
-	await ensureLocalResolutionPinGitignore(context.runtime.cwd, context.runtime.signal);
-	return {
-		workspace,
-		project,
-		directory: formatSetupDirectory(context.runtime.cwd),
-		localPin: {
-			path: LOCAL_RESOLUTION_PIN_RELATIVE_PATH,
-			written: true
+async function bindProjectToDirectory(context, workspace, project, action, directory = context.runtime.cwd) {
+	return Result.gen(async function* () {
+		yield* Result.await(writeLocalResolutionPin(directory, {
+			workspaceId: workspace.id,
+			projectId: project.id
+		}, context.runtime.signal));
+		yield* Result.await(ensureLocalResolutionPinGitignore(directory, context.runtime.signal));
+		return Result.ok({
+			workspace,
+			project,
+			directory: formatSetupDirectory(directory, context),
+			localPin: {
+				path: LOCAL_RESOLUTION_PIN_RELATIVE_PATH,
+				written: true
+			},
+			action
+		});
+	});
+}
+function projectDirectoryBindingErrorToCliError(error) {
+	return matchError(error, {
+		LocalResolutionPinSerializationError: (error) => {
+			throw error;
 		},
-		action
-	};
+		LocalResolutionPinWriteAbortedError: (error) => {
+			throw error;
+		},
+		LocalResolutionPinWriteFailedError: (error) => localStateWriteFailedError(error, {
+			why: `The CLI could not write ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH}.`,
+			meta: {
+				pinPath: error.pinPath,
+				operation: error.operation
+			}
+		}),
+		LocalResolutionPinGitignoreUpdateAbortedError: (error) => {
+			throw error;
+		},
+		LocalResolutionPinGitignoreUpdateFailedError: (error) => localStateWriteFailedError(error, {
+			why: "The CLI could not update .gitignore to keep local Project binding state out of git.",
+			meta: {
+				gitignorePath: error.gitignorePath,
+				operation: error.operation
+			}
+		})
+	});
+}
+function localStateWriteFailedError(error, options) {
+	return new CliError({
+		code: "LOCAL_STATE_WRITE_FAILED",
+		domain: "project",
+		summary: "Could not save local Project binding",
+		why: options.why,
+		fix: "Check that this directory is writable and that .prisma/local.json and .gitignore are not blocked by directories or permissions, then retry.",
+		debug: formatDebugDetails(error.cause),
+		meta: options.meta,
+		exitCode: 1,
+		nextSteps: ["prisma-cli project link <id-or-name>", "prisma-cli app deploy --project <id-or-name>"]
+	});
 }
 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) {
@@ -66,8 +112,9 @@ function projectCreateFailedError(error, projectName, workspace, options) {
 		nextSteps: options.nextSteps
 	});
 }
-function formatSetupDirectory(cwd) {
-	const basename = cwd.split(/[\\/]/).filter(Boolean).pop();
+function formatSetupDirectory(directory, context) {
+	if (path.resolve(directory) !== path.resolve(context.runtime.cwd)) return shortenHomePath(directory, context.runtime.env);
+	const basename = directory.split(/[\\/]/).filter(Boolean).pop();
 	return basename ? `./${basename}` : ".";
 }
 function extractHttpStatus(error) {
@@ -86,4 +133,4 @@ function formatDebugDetails(error) {
 	return typeof error === "string" ? error : null;
 }
 //#endregion
-export { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary, validateProjectSetupNameText };
+export { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectDirectoryBindingErrorToCliError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary, validateProjectSetupNameText };

package/dist/output/patterns.js

@@ -1,5 +1,5 @@
-import { maskValue, padDisplay, renderSummaryLine } from "../shell/ui.js";
 import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { maskValue, padDisplay, renderSummaryLine } from "../shell/ui.js";
 import stringWidth from "string-width";
 //#region src/output/patterns.ts
 function renderList(input, ui) {

package/dist/presenters/agent.js

@@ -0,0 +1,74 @@
+import { formatShellCommand } from "../shell/command-arguments.js";
+import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { renderSummaryLine } from "../shell/ui.js";
+//#region src/presenters/agent.ts
+function renderAgentInstall(context, descriptor, result) {
+	const ui = context.ui;
+	const rail = ui.dim("│");
+	return [
+		renderSummaryLine(ui, "success", `${formatDescriptorLabel(descriptor)} → ${operationSummary(result)} Prisma skills.`),
+		"",
+		`${rail}  ${ui.accent("skills:")}  ${result.skills.status.replace("-", " ")}`,
+		`${rail}  ${ui.dim(formatShellCommand(result.skills.command))}`
+	];
+}
+function renderAgentStatus(context, descriptor, result) {
+	const ui = context.ui;
+	const rail = ui.dim("│");
+	return [
+		`${ui.strong(formatDescriptorLabel(descriptor))} ${ui.dim("→")} ${ui.dim(`Checking ${result.statusScope} Prisma skills.`)}`,
+		"",
+		`${rail}  ${ui.accent("skills:")}  ${result.skillsInstalled ? "installed" : "not found"}`,
+		...renderInstalledSkills(context, result.skills),
+		`${rail}`,
+		`${rail}  ${ui.accent("source:")}  ${formatStatusSource(result)}`,
+		`${rail}  ${ui.dim(formatShellCommand(result.skillsListCommand))}`,
+		...renderProjectStatusDetails(context, result)
+	];
+}
+function serializeAgentInstall(result) {
+	return result;
+}
+function serializeAgentStatus(result) {
+	return result;
+}
+function formatSetupPromptStatus(result) {
+	if (result.skillsInstalled) return "not needed";
+	if (result.promptDismissedAt) return `dismissed ${result.promptDismissedAt}`;
+	return "active";
+}
+function formatStatusSource(result) {
+	if (result.statusSource === "skills-cli") return result.statusScope === "global" ? "skills list -g --json" : "skills list --json";
+	if (result.statusSource === "skills-lock") return result.skillsLockPath;
+	return "unavailable";
+}
+function renderProjectStatusDetails(context, result) {
+	if (result.statusScope !== "project") return [];
+	const ui = context.ui;
+	const rail = ui.dim("│");
+	return [
+		`${rail}`,
+		`${rail}  ${ui.accent("skills lock:")}  ${result.skillsLockInstalled ? "installed" : "not found"}`,
+		`${rail}  ${ui.dim(result.skillsLockPath)}`,
+		`${rail}`,
+		`${rail}  ${ui.accent("setup prompt:")}  ${formatSetupPromptStatus(result)}`
+	];
+}
+function renderInstalledSkills(context, skills) {
+	const ui = context.ui;
+	const rail = ui.dim("│");
+	if (skills.length === 0) return [`${rail}    ${ui.dim("No Prisma skills reported.")}`];
+	return skills.map((skill) => {
+		const agents = skill.agents.length > 0 ? skill.agents.join(", ") : "no agents reported";
+		return `${rail}    ${skill.name}  ${ui.dim(`${skill.scope}; ${agents}`)}`;
+	});
+}
+function operationSummary(result) {
+	if (result.skills.status === "would-install") return "Would install";
+	return operationLabel(result.operation);
+}
+function operationLabel(operation) {
+	return operation === "update" ? "Updated" : "Installed";
+}
+//#endregion
+export { renderAgentInstall, renderAgentStatus, serializeAgentInstall, serializeAgentStatus };

package/dist/presenters/app-env.js

@@ -1,11 +1,117 @@
+import { renderVerboseBlock } from "../shell/ui.js";
 import { renderList, renderShow, serializeList } from "../output/patterns.js";
+import { renderResolvedProjectContextBlock, stripVerboseContext } from "./verbose-context.js";
 //#region src/presenters/app-env.ts
 function scopeLabel(scope) {
 	if (scope.kind === "role") return scope.role ?? "unknown";
+	if (scope.kind === "overview") return "overview";
 	return `branch:${scope.branchName ?? scope.branchId ?? "unknown"}`;
 }
+function listTargetLabel(result) {
+	const target = result.target;
+	if (target.source === "overview") return "overview";
+	if (target.branchName) {
+		const suffix = target.branchExists === false ? " (not created yet)" : "";
+		return `branch:${target.branchName} -> ${target.envMap}${suffix}`;
+	}
+	return scopeLabel(result.scope);
+}
+function renderEnvVerboseBlocks(context, result) {
+	return [...renderEnvResolvedContextBlock(context, result.verboseContext), ...renderEnvTargetBlock(context, result)];
+}
+function renderEnvResolvedContextBlock(context, verboseContext) {
+	return renderResolvedProjectContextBlock(context.ui, verboseContext);
+}
+function renderEnvTargetBlock(context, result) {
+	return renderVerboseBlock(context.ui, envTargetRows(result), { title: "Env target" });
+}
+function envTargetRows(result) {
+	return [
+		{
+			key: "project id",
+			value: result.projectId,
+			tone: "dim"
+		},
+		{
+			key: "scope",
+			value: scopeLabel(result.scope)
+		},
+		...envListTargetRows(result),
+		...envFileRows(result),
+		{
+			key: "keys",
+			value: formatKeyNames(envResultKeys(result)),
+			tone: envResultKeys(result).length > 0 ? "default" : "dim"
+		}
+	];
+}
+function envListTargetRows(result) {
+	if (!("target" in result)) return [];
+	return [
+		{
+			key: "target source",
+			value: result.target.source
+		},
+		{
+			key: "env map",
+			value: result.target.envMap
+		},
+		...result.target.branchName ? [{
+			key: "branch",
+			value: result.target.branchName
+		}] : [],
+		...result.target.branchId ? [{
+			key: "branch id",
+			value: result.target.branchId,
+			tone: "dim"
+		}] : [],
+		...result.target.branchExists === false ? [{
+			key: "branch state",
+			value: "not created yet",
+			tone: "warning"
+		}] : []
+	];
+}
+function envFileRows(result) {
+	if (!("file" in result) || !result.file) return [];
+	return [{
+		key: "file",
+		value: result.file.path
+	}, {
+		key: "file count",
+		value: String(result.file.count)
+	}];
+}
+function envResultKeys(result) {
+	if ("variables" in result && result.variables) return result.variables.map((variable) => variable.key).sort((left, right) => left.localeCompare(right));
+	if ("variable" in result && result.variable) return [result.variable.key];
+	if ("key" in result) return [result.key];
+	return [];
+}
+function formatKeyNames(keys) {
+	return keys.length > 0 ? keys.join(", ") : "none";
+}
 function renderEnvAdd(context, descriptor, result) {
-	return renderShow({
+	if (result.variables !== void 0) {
+		const lines = renderList({
+			title: "Setting new environment variables from file.",
+			descriptor,
+			parentContext: {
+				key: "target",
+				value: `${scopeLabel(result.scope)} from ${result.file.path}`
+			},
+			items: result.variables.map((variable) => ({
+				noun: "variable",
+				label: `${variable.key} (${variable.source})`,
+				id: variable.id,
+				status: variable.isManagedBySystem ? "default" : null
+			})),
+			emptyMessage: "No environment variables imported."
+		}, context.ui);
+		lines.push(...renderEnvVerboseBlocks(context, result));
+		return lines;
+	}
+	const lines = renderShow({
 		title: "Setting a new environment variable.",
 		descriptor,
 		fields: [
@@ -33,12 +139,33 @@ function renderEnvAdd(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvAdd(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderEnvUpdate(context, descriptor, result) {
-	return renderShow({
+	if (result.variables !== void 0) {
+		const lines = renderList({
+			title: "Replacing environment variable values from file.",
+			descriptor,
+			parentContext: {
+				key: "target",
+				value: `${scopeLabel(result.scope)} from ${result.file.path}`
+			},
+			items: result.variables.map((variable) => ({
+				noun: "variable",
+				label: `${variable.key} (${variable.source})`,
+				id: variable.id,
+				status: variable.isManagedBySystem ? "default" : null
+			})),
+			emptyMessage: "No environment variables updated."
+		}, context.ui);
+		lines.push(...renderEnvVerboseBlocks(context, result));
+		return lines;
+	}
+	const lines = renderShow({
 		title: "Replacing the environment variable's value.",
 		descriptor,
 		fields: [
@@ -66,17 +193,19 @@ function renderEnvUpdate(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvUpdate(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderEnvList(context, descriptor, result) {
-	return renderList({
+	const lines = renderList({
 		title: "Listing environment variables for the selected scope.",
 		descriptor,
 		parentContext: {
-			key: "scope",
-			value: scopeLabel(result.scope)
+			key: "target",
+			value: listTargetLabel(result)
 		},
 		items: result.variables.map((variable) => ({
 			noun: "variable",
@@ -86,25 +215,29 @@ function renderEnvList(context, descriptor, result) {
 		})),
 		emptyMessage: "No environment variables defined in this scope."
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvList(result) {
+	const serializable = stripVerboseContext(result);
 	return {
-		projectId: result.projectId,
-		scope: result.scope,
+		projectId: serializable.projectId,
+		scope: serializable.scope,
+		target: serializable.target,
 		...serializeList({
-			context: { scope: scopeLabel(result.scope) },
-			items: result.variables.map((variable) => ({
+			context: { target: listTargetLabel(serializable) },
+			items: serializable.variables.map((variable) => ({
 				noun: "variable",
 				label: `${variable.key} (${variable.source})`,
 				id: variable.id,
 				status: variable.isManagedBySystem ? "default" : null
 			}))
 		}),
-		variables: result.variables
+		variables: serializable.variables
 	};
 }
 function renderEnvRm(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: "Removing the environment variable from the scope.",
 		descriptor,
 		fields: [
@@ -122,9 +255,11 @@ function renderEnvRm(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvRm(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 //#endregion
 export { renderEnvAdd, renderEnvList, renderEnvRm, renderEnvUpdate, serializeEnvAdd, serializeEnvList, serializeEnvRm, serializeEnvUpdate };