refactor(cli): change spinner.message to property & document

denoland · May 22, 2024 · abdd318 · abdd318
1 parent 0248c18
commit abdd318
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 10 deletions.
diff --git a/cli/spinner.ts b/cli/spinner.ts
@@ -75,7 +75,7 @@ export interface SpinnerOptions {
 export class Spinner {
   #spinner: string[];
   /** The message to display next to the spinner. */
-  message: string;
+  #message: string = "";
   #interval: number;
   #color?: Color;
   #intervalId: number | undefined;
@@ -89,30 +89,78 @@ export class Spinner {
    * import { Spinner } from "@std/cli/spinner";
    *
    * const spinner = new Spinner({ message: "Loading..." });
+   * spinner.stop();
    * ```
    */
-  constructor(
-    {
-      spinner = DEFAULT_SPINNER,
-      message = "",
-      interval = DEFAULT_INTERVAL,
-      color,
-    }: SpinnerOptions = {},
-  ) {
+  constructor({
+    spinner = DEFAULT_SPINNER,
+    message = "",
+    interval = DEFAULT_INTERVAL,
+    color,
+  }: SpinnerOptions = {}) {
     this.#spinner = spinner;
     this.message = message;
     this.#interval = interval;
     this.color = color;
   }
 
+  /**
+   * Set the message of the spinner.
+   * This can be changed while the spinner is active.
+   *
+   * @example
+   * ```ts
+   * import { Spinner } from "@std/cli/spinner";
+   *
+   * const spinner = new Spinner({ message: "Working..." });
+   * spinner.start();
+   *
+   * for (let step = 0; step < 5; step++) {
+   *   // do some work
+   *   await new Promise((resolve) => setTimeout(resolve, 1000));
+   *
+   *   spinner.message = `Finished Step #${step}`;
+   * }
+   *
+   * spinner.stop();
+   * spinner.message = "Done!";
+   * ```
+   */
+  set message(message: string) {
+    this.#message = message;
+  }
+
+  /**
+   * Get the current message of the spinner.
+   */
+  get message(): string {
+    return this.#message;
+  }
+
   /**
    * Set the color of the spinner. This defaults to the default terminal color.
    * This can be changed while the spinner is active.
+   *
+   * @example
+   * ```ts
+   * import { Spinner } from "@std/cli/spinner";
+   *
+   * const spinner = new Spinner({ message: "Loading...", color: "yellow" });
+   * spinner.start();
+   *
+   * // do some work
+   * await new Promise((resolve) => setTimeout(resolve, 1000));
+   *
+   * spinner.color = "magenta";
+   * ```
    */
   set color(value: Color | undefined) {
     this.#color = value ? COLORS[value] : undefined;
   }
 
+  /**
+   * Get the current color of the spinner.
+   */
   get color(): Color | undefined {
     return this.#color;
   }
@@ -129,10 +177,14 @@ export class Spinner {
    * ```
    */
   start() {
-    if (this.#active || Deno.stdout.writable.locked) return;
+    if (this.#active || Deno.stdout.writable.locked) {
+      return;
+    }
+
     this.#active = true;
     let i = 0;
     const noColor = Deno.noColor;
+
     // Updates the spinner after the given interval.
     const updateFrame = () => {
       const color = this.#color ?? "";
@@ -145,8 +197,10 @@ export class Spinner {
       Deno.stdout.writeSync(frame);
       i = (i + 1) % this.#spinner.length;
     };
+
     this.#intervalId = setInterval(updateFrame, this.#interval);
   }
+
   /**
    * Stops the spinner.
    *

diff --git a/cli/spinner_test.ts b/cli/spinner_test.ts
@@ -191,3 +191,16 @@ Deno.test("Spinner.message can be updated", async () => {
   const expected = "⠋ ⠙ One dino 🦕⠹ Two dinos 🦕🦕⠸ Three dinos 🦕🦕🦕";
   assertEquals(actual, expected);
 });
+
+Deno.test("Spinner.message returns the current value when updated", () => {
+  const spinner = new Spinner();
+
+  spinner.message = "Step 1";
+  assertEquals(spinner.message, "Step 1");
+
+  spinner.message = "Step 2";
+  assertEquals(spinner.message, "Step 2");
+
+  spinner.message = "Step 3";
+  assertEquals(spinner.message, "Step 3");
+});