@markjaquith/agency 1.9.1 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Manages personal agents files",
   "keywords": [
     "agents",

package/src/utils/spinner.test.ts

@@ -0,0 +1,45 @@
+import { describe, expect, test } from "bun:test"
+import { Effect } from "effect"
+import { withSpinner } from "./spinner"
+
+describe("withSpinner", () => {
+	test("clears and stops the spinner when an Effect failure has no fail text", async () => {
+		const originalNodeEnv = process.env.NODE_ENV
+		const originalBunEnv = process.env.BUN_ENV
+		delete process.env.NODE_ENV
+		delete process.env.BUN_ENV
+
+		const calls: string[] = []
+		const error = new Error("boom")
+
+		try {
+			await expect(
+				Effect.runPromise(
+					withSpinner(Effect.fail(error), {
+						text: "Working",
+						createSpinner: () => ({
+							succeed: () => calls.push("succeed"),
+							fail: () => calls.push("fail"),
+							clear: () => calls.push("clear"),
+							stop: () => calls.push("stop"),
+						}),
+					}),
+				),
+			).rejects.toThrow("boom")
+
+			expect(calls).toEqual(["clear", "stop"])
+		} finally {
+			if (originalNodeEnv === undefined) {
+				delete process.env.NODE_ENV
+			} else {
+				process.env.NODE_ENV = originalNodeEnv
+			}
+
+			if (originalBunEnv === undefined) {
+				delete process.env.BUN_ENV
+			} else {
+				process.env.BUN_ENV = originalBunEnv
+			}
+		}
+	})
+})

package/src/utils/spinner.ts

@@ -1,5 +1,12 @@
 import ora from "ora"
-import { Effect } from "effect"
+import { Effect, Exit } from "effect"
+
+interface Spinner {
+	succeed: (text?: string) => unknown
+	fail: (text?: string) => unknown
+	clear: () => unknown
+	stop: () => unknown
+}
 
 /**
  * Check if we're running in a test environment
@@ -20,6 +27,8 @@ interface SpinnerConfig {
 	failText?: string
 	/** Whether the spinner is enabled (defaults to true) */
 	enabled?: boolean
+	/** Creates the spinner instance. Intended for tests. */
+	createSpinner?: (text: string) => Spinner
 }
 
 /**
@@ -53,31 +62,35 @@ export const withSpinner = <A, E, R>(
 		return effect
 	}
 
-	return Effect.gen(function* () {
-		const spinner = ora({
-			text,
-			spinner: "dots",
-			color: "cyan",
-		}).start()
-
-		try {
-			const result = yield* effect
+	const createSpinner =
+		config.createSpinner ??
+		((text: string) =>
+			ora({
+				text,
+				spinner: "dots",
+				color: "cyan",
+			}).start())
 
-			if (successText) {
-				spinner.succeed(successText)
-			} else {
-				spinner.stop()
-			}
+	return Effect.acquireUseRelease(
+		Effect.sync(() => createSpinner(text)),
+		() => effect,
+		(spinner, exit) =>
+			Effect.sync(() => {
+				if (Exit.isSuccess(exit)) {
+					if (successText) {
+						spinner.succeed(successText)
+					} else {
+						spinner.stop()
+					}
+					return
+				}
 
-			return result
-		} catch (error) {
-			if (failText) {
-				spinner.fail(failText)
-			} else {
-				spinner.clear()
-				spinner.stop()
-			}
-			throw error
-		}
-	})
+				if (failText) {
+					spinner.fail(failText)
+				} else {
+					spinner.clear()
+					spinner.stop()
+				}
+			}),
+	)
 }