Merge remote-tracking branch 'origin/codex/batch20-core-api-boundaries' into codex/effect-lint-integration

Rhys Sullivan committed 6 months ago

Commit 14237232 parents 33c2bd1 b953a1f2 files · +14 −9Browse files

Unified · Split

2 files

@@ -35,7 +35,7 @@ export const ToolsHandlers = HttpApiBuilder.group(ExecutorApi, "tools", (handler · 34 unmodified lines
35	const executor = yield* ExecutorService;	35	const executor = yield* ExecutorService;
36	const schema = yield* executor.tools.schema(path.toolId);	36	const schema = yield* executor.tools.schema(path.toolId);
37	if (schema === null) {	37	if (schema === null) {
38	return yield* Effect.fail(new ToolNotFoundError({ toolId: path.toolId }));	38	return yield* new ToolNotFoundError({ toolId: path.toolId });
39	}	39	}
40	return schema;	40	return schema;
41	})),	41	})),

 // ---------------------------------------------------------------------------
 import { describe, expect, it } from "@effect/vitest";
-import { Effect } from "effect";
+import { Data, Effect, Schema } from "effect";
 import {
   OAUTH_POPUP_MESSAGE_TYPE,
   });
   it("renders a failure popup when completeOAuth fails and uses toErrorMessage", async () => {
-    class DomainError {
+    class DomainError extends Data.TaggedError("DomainError")<{
-      readonly _tag = "DomainError";
+      readonly message: string;
-      constructor(readonly message: string) {}
+    }> {}
-    }
+    const isDomainError = Schema.is(Schema.Struct({
+      _tag: Schema.Literal("DomainError"),
+      message: Schema.String,
+    }));
     const html = await Effect.runPromise(
       runOAuthCallback<GoogleAuth, DomainError, never>({
-        complete: () => Effect.fail(new DomainError("Code expired")),
+        complete: () => Effect.fail(new DomainError({ message: "Code expired" })),
         urlParams: { state: "s1" },
-        toErrorMessage: (error) =>
+        toErrorMessage: (error) => {
-          error instanceof DomainError ? error.message : "unknown",
+          // oxlint-disable-next-line executor/no-unknown-error-message -- boundary: schema guard narrows the unknown popup callback error to the public test message
+          return isDomainError(error) ? error.message : "unknown";
+        },
         channelName: "c",
       }),
     );