refactor: make overall CLI act more expected and consistent, and add quiet flag (#78)

Author: crowlKats

auth.ts

@@ -15,7 +15,7 @@ import {
 } from "@trpc/client";
 import { observable } from "@trpc/server/observable";
 import { Spinner } from "@std/cli/unstable-spinner";
-import { error } from "./util.ts";
+import { error, requireInteractive } from "./util.ts";
 import { EventSourcePolyfill } from "event-source-polyfill";
 import type { GlobalContext } from "./main.ts";
 
@@ -180,15 +180,23 @@ export async function getAuth(
     return storedAuth;
   }
 
+  requireInteractive(
+    context,
+    "Set the DENO_DEPLOY_TOKEN environment variable or use --token.",
+  );
+
   const { code, exchangeToken, verifier } = await interactive(context);
 
   const authUrl = `${context.endpoint}/auth?code=${code}`;
 
   const spinner = new Spinner({
-    message: `Visit ${authUrl} to authorize deploying your project.`,
+    message: "",
     color: "yellow",
   });
-  spinner.start();
+  console.log(`Visit ${authUrl} to authorize deploying your project.`);
+  if (!quiet) {
+    spinner.start();
+  }
 
   await open(authUrl);
 
@@ -215,12 +223,11 @@ export async function interactive(context: GlobalContext): Promise<
   });
 
   if (!res.ok) {
-    console.error("An error occurred during authentication, exiting...");
-    if (context.debug) {
-      console.log(res);
-      console.log(await res.json());
-    }
-    Deno.exit(1);
+    error(
+      context,
+      "An error occurred during authentication, exiting...",
+      res,
+    );
   }
 
   const body = await res.json();

config.ts

@@ -1,6 +1,6 @@
 import { createTrpcClient, getAuth } from "./auth.ts";
 import type { GlobalContext } from "./main.ts";
-import { error } from "./util.ts";
+import { error, requireInteractive } from "./util.ts";
 import {
   type PromptEntry,
   promptSelect,
@@ -42,6 +42,10 @@ export async function getOrg(
     } else if (orgs.length === 1) {
       org = orgs[0].slug;
     } else {
+      requireInteractive(
+        context,
+        "Use --org to specify the organization.",
+      );
       const selectedOrg = promptSelect(
         "Select an organization:",
         orgs.map((org) => ({ label: `${org.name} (${org.slug})`, value: org })),
@@ -109,6 +113,10 @@ export async function getApp(
       name: string;
       slug: string;
     }>;
+    requireInteractive(
+      context,
+      "Use --app to specify the application.",
+    );
     const appStrings: PromptEntry<{ name: string; slug: string } | null>[] =
       apps.map((app) => ({ label: app.slug, value: app }));
     if (canCreate) {
@@ -118,8 +126,7 @@ export async function getApp(
       clear: true,
     });
     if (!selectedApp) {
-      console.error("No application was selected.");
-      Deno.exit(1);
+      error(context, "No application was selected.");
     }
 
     if (selectedApp.value === null) {

deno.lock

@@ -16,6 +16,7 @@ import {
 } from "@deno/framework-detect";
 import type { GlobalContext } from "../../main.ts";
 import type { CreateApp, Repo } from "./mod.ts";
+import { requireInteractive } from "../../util.ts";
 
 export const AVAILABLE_BUILD_TIMEOUTS = [5, 10, 15, 20, 25, 30];
 export const AVAILABLE_BUILD_MEMORY_LIMITS = [1024, 2048, 3072, 4096];
@@ -63,6 +64,10 @@ export async function createFlow(
   rootPath: string,
   preselectedOrg?: string,
 ): Promise<CreateApp> {
+  requireInteractive(
+    context,
+    "Use explicit flags (--org, --app, --source, etc.) to create an app non-interactively.",
+  );
   const trpcClient = createTrpcClient(context);
 
   let org;

deploy/create/flow.ts

@@ -21,6 +21,7 @@ import {
 import { publish, waitForRevision } from "../publish.ts";
 import { resolve } from "@std/path";
 import { error } from "../../util.ts";
+import { green } from "@std/fmt/colors";
 
 export const createCommand = new Command<GlobalContext>()
   .description(
@@ -238,7 +239,7 @@ export const createCommand = new Command<GlobalContext>()
         buildDirectory = member?.path ??
           required(options.appDirectory, "app-directory");
       } else {
-        buildDirectory = options.appDirectory || "/";
+        buildDirectory = options.appDirectory || "";
       }
 
       let buildConfig;
@@ -399,7 +400,9 @@ export async function createApp(
   });
 
   console.log(
-    `Created app, view it at ${context.endpoint}/${data.org}/${data.app}`,
+    `${
+      green("✔")
+    } Created app, view it at ${context.endpoint}/${data.org}/${data.app}`,
   );
 
   if (data.repo === undefined) {