@prisma/cli 3.0.0-dev.93.1 → 3.0.0-dev.95.1

package/dist/commands/auth/index.js

@@ -1,7 +1,7 @@
 import { attachCommandDescriptor } from "../../shell/command-meta.js";
 import { addCompactGlobalFlags, addGlobalFlags } from "../../shell/global-flags.js";
 import { configureRuntimeCommand } from "../../shell/runtime.js";
-import { runAuthLogin, runAuthLogout, runAuthWhoAmI, runAuthWorkspaceList, runAuthWorkspaceLogout, runAuthWorkspaceSelect, runAuthWorkspaceUse } from "../../controllers/auth.js";
+import { runAuthLogin, runAuthLogout, runAuthWhoAmI, runAuthWorkspaceList, runAuthWorkspaceLogout, runAuthWorkspaceUse } from "../../controllers/auth.js";
 import { runCommand } from "../../shell/command-runner.js";
 import { renderAuthSuccess, renderAuthWorkspaceList, renderAuthWorkspaceLogout, renderAuthWorkspaceUse, serializeAuthWorkspaceList, serializeAuthWorkspaceLogout, serializeAuthWorkspaceUse } from "../../presenters/auth.js";
 import { Command, Option } from "commander";
@@ -54,7 +54,6 @@ function createAuthWorkspaceCommand(runtime) {
 	addCompactGlobalFlags(workspace);
 	workspace.addCommand(createAuthWorkspaceListCommand(runtime));
 	workspace.addCommand(createAuthWorkspaceUseCommand(runtime));
-	workspace.addCommand(createAuthWorkspaceSelectCommand(runtime));
 	workspace.addCommand(createAuthWorkspaceLogoutCommand(runtime));
 	return workspace;
 }
@@ -69,17 +68,6 @@ function createAuthWorkspaceListCommand(runtime) {
 	});
 	return command;
 }
-function createAuthWorkspaceSelectCommand(runtime) {
-	const command = attachCommandDescriptor(configureRuntimeCommand(new Command("select"), runtime), "auth.workspace.select");
-	addGlobalFlags(command);
-	command.action(async (options) => {
-		await runCommand(runtime, "auth.workspace.select", options, (context) => runAuthWorkspaceSelect(context), {
-			renderHuman: (context, descriptor, result) => renderAuthWorkspaceUse(context, descriptor, result),
-			renderJson: (result) => serializeAuthWorkspaceUse(result)
-		});
-	});
-	return command;
-}
 function createAuthWorkspaceLogoutCommand(runtime) {
 	const command = attachCommandDescriptor(configureRuntimeCommand(new Command("logout"), runtime), "auth.workspace.logout");
 	command.argument("<id-or-name>", "Workspace id or exact name");
@@ -94,7 +82,7 @@ function createAuthWorkspaceLogoutCommand(runtime) {
 }
 function createAuthWorkspaceUseCommand(runtime) {
 	const command = attachCommandDescriptor(configureRuntimeCommand(new Command("use"), runtime), "auth.workspace.use");
-	command.argument("<id-or-name>", "Workspace id or exact name");
+	command.argument("[id-or-name]", "Workspace id or exact name");
 	addGlobalFlags(command);
 	command.action(async (workspaceRef, options) => {
 		await runCommand(runtime, "auth.workspace.use", options, (context) => runAuthWorkspaceUse(context, typeof workspaceRef === "string" ? workspaceRef : void 0), {

package/dist/controllers/auth.js

@@ -42,20 +42,15 @@ async function runAuthWorkspaceList(context) {
 	};
 }
 async function runAuthWorkspaceUse(context, workspaceRef) {
-	if (!workspaceRef?.trim()) throw usageError("Workspace required", "auth workspace use needs a workspace id or cached workspace name.", "Pass a workspace from prisma-cli auth workspace list.", ["prisma-cli auth workspace list"], "auth");
+	const trimmedWorkspaceRef = workspaceRef?.trim();
+	const selectedWorkspaceRef = trimmedWorkspaceRef ? trimmedWorkspaceRef : await selectWorkspaceSession(context);
 	return {
 		command: "auth.workspace.use",
-		result: isRealMode(context) ? await useRealAuthWorkspace(context, workspaceRef) : await createAuthUseCases(createCliUseCaseGateways(context)).useWorkspace(workspaceRef),
+		result: isRealMode(context) ? await useRealAuthWorkspace(context, selectedWorkspaceRef) : await createAuthUseCases(createCliUseCaseGateways(context)).useWorkspace(selectedWorkspaceRef),
 		warnings: [],
 		nextSteps: ["prisma-cli auth whoami", "prisma-cli project list"]
 	};
 }
-async function runAuthWorkspaceSelect(context) {
-	return {
-		...await runAuthWorkspaceUse(context, await selectWorkspaceSession(context)),
-		command: "auth.workspace.select"
-	};
-}
 async function runAuthWorkspaceLogout(context, workspaceRef) {
 	if (!workspaceRef?.trim()) throw usageError("Workspace required", "auth workspace logout needs a workspace id or cached workspace name.", "Pass a workspace from prisma-cli auth workspace list.", ["prisma-cli auth workspace list"], "auth");
 	const result = isRealMode(context) ? await logoutRealAuthWorkspace(context, workspaceRef) : await createAuthUseCases(createCliUseCaseGateways(context)).logoutWorkspace(workspaceRef);
@@ -167,7 +162,7 @@ async function selectWorkspaceSession(context) {
 	const workspaces = (realMode ? await listRealAuthWorkspaces(context) : await createAuthUseCases(createCliUseCaseGateways(context)).listWorkspaces()).workspaces.filter((workspace) => workspace.switchable);
 	if (workspaces.length === 0) throw usageError("No authenticated workspaces", "There are no local OAuth workspace sessions to select.", "Run prisma-cli auth login and authorize a workspace.", ["prisma-cli auth login"], "auth");
 	if (workspaces.length === 1) return workspaces[0].id;
-	if (!canPrompt(context)) throw usageError("Interactive workspace selection unavailable", "auth workspace select needs an interactive terminal when more than one workspace is available.", "Run prisma-cli auth workspace use <id-or-name> with a workspace from prisma-cli auth workspace list.", ["prisma-cli auth workspace list"], "auth");
+	if (!canPrompt(context)) throw usageError("Interactive workspace selection unavailable", "auth workspace use needs an interactive terminal when no workspace is provided and more than one workspace is available.", "Run prisma-cli auth workspace use <id-or-name> with a workspace from prisma-cli auth workspace list.", ["prisma-cli auth workspace list"], "auth");
 	return (await createSelectPromptPort(context).select({
 		message: "Select a workspace",
 		choices: workspaces.map((workspace) => ({
@@ -242,4 +237,4 @@ function createAuthSuccess(command, result, nextSteps) {
 	};
 }
 //#endregion
-export { requireAuthenticatedAuthState, runAuthLogin, runAuthLogout, runAuthWhoAmI, runAuthWorkspaceList, runAuthWorkspaceLogout, runAuthWorkspaceSelect, runAuthWorkspaceUse };
+export { requireAuthenticatedAuthState, runAuthLogin, runAuthLogout, runAuthWhoAmI, runAuthWorkspaceList, runAuthWorkspaceLogout, runAuthWorkspaceUse };

package/dist/shell/command-meta.js

@@ -60,7 +60,7 @@ const DESCRIPTORS = [
 		description: "Manage local authenticated workspaces",
 		examples: [
 			"prisma-cli auth workspace list",
-			"prisma-cli auth workspace select",
+			"prisma-cli auth workspace use",
 			"prisma-cli auth workspace use wksp_123",
 			"prisma-cli auth workspace logout wksp_123"
 		]
@@ -85,18 +85,11 @@ const DESCRIPTORS = [
 			"use"
 		],
 		description: "Switch the local CLI workspace",
-		examples: ["prisma-cli auth workspace use wksp_123", "prisma-cli auth workspace use \"Acme Inc\""]
-	},
-	{
-		id: "auth.workspace.select",
-		path: [
-			"prisma",
-			"auth",
-			"workspace",
-			"select"
-		],
-		description: "Interactively select the local CLI workspace",
-		examples: ["prisma-cli auth workspace select"]
+		examples: [
+			"prisma-cli auth workspace use",
+			"prisma-cli auth workspace use wksp_123",
+			"prisma-cli auth workspace use \"Acme Inc\""
+		]
 	},
 	{
 		id: "auth.workspace.logout",

package/package.json

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