Merge remote-tracking branch 'origin/codex/batch19-config-write-errors' into codex/effect-lint-integration

Rhys Sullivan committed 6 months ago

Commit bac06dd2 parents 5c899cc 71332e72 files · +16 −6Browse files

Unified · Split

2 files

 import { join } from "node:path";
 import { ExecutorFileConfig } from "./schema";
-import { loadConfig } from "./load";
+import { ConfigParseError, loadConfig } from "./load";
 import {
   addSourceToConfig,
   removeSourceFromConfig,
         const path = join(dir, "executor.jsonc");
         yield* fs.writeFileString(path, "{ invalid json }");
-        const result = yield* loadConfig(path).pipe(Effect.flip);
+        const result = yield* loadConfig(path).pipe(
-        expect(result._tag).toBe("ConfigParseError");
+          Effect.catchTag("ConfigParseError", (error) => Effect.succeed(error)),
+        );
+        expect(result).toBeInstanceOf(ConfigParseError);
       }),
     ),
   );

 import * as jsonc from "jsonc-parser";
 import type { SourceConfig, ExecutorFileConfig } from "./schema";
+export class ConfigWriteError {
+  readonly _tag = "ConfigWriteError";
+  constructor(
+    readonly path: string,
+    readonly cause: unknown,
+  ) {}
+}
 const FORMATTING: jsonc.FormattingOptions = {
   tabSize: 2,
   insertSpaces: true,
 export const writeConfig = (
   path: string,
   config: ExecutorFileConfig,
-): Effect.Effect<void, PlatformError, FileSystem.FileSystem> =>
+): Effect.Effect<void, ConfigWriteError | PlatformError, FileSystem.FileSystem> =>
   Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const text = yield* Effect.try({
       try: () => JSON.stringify(config, null, 2) + "\n",
-      catch: (cause) => cause,
+      catch: (cause) => new ConfigWriteError(path, cause),
-    }).pipe(Effect.orDie);
+    });
     yield* fs.writeFileString(path, text);
   });