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

@@ -5,7 +5,7 @@ import { FileSystem } from "effect"; · 4 unmodified lines
5	5	import { join } from "node:path";
6	6
7	7	import { ExecutorFileConfig } from "./schema";
8		−import { loadConfig } from "./load";
	8	+import { ConfigParseError, loadConfig } from "./load";
9	9	import {
10	10	addSourceToConfig,
11	11	removeSourceFromConfig,
@@ -128,8 +128,10 @@ describe("loadConfig", () => { · 116 unmodified lines
128	128	const path = join(dir, "executor.jsonc");
129	129	yield* fs.writeFileString(path, "{ invalid json }");
130	130
131		− const result = yield* loadConfig(path).pipe(Effect.flip);
132		− expect(result._tag).toBe("ConfigParseError");
	131	+ const result = yield* loadConfig(path).pipe(
	132	+ Effect.catchTag("ConfigParseError", (error) => Effect.succeed(error)),
	133	+ );
	134	+ expect(result).toBeInstanceOf(ConfigParseError);
133	135	}),
134	136	),
135	137	);

@@ -4,6 +4,14 @@ import type { PlatformError } from "effect/PlatformError"; · 3 unmodified lines
4	4	import * as jsonc from "jsonc-parser";
5	5	import type { SourceConfig, ExecutorFileConfig } from "./schema";
6	6
	7	+export class ConfigWriteError {
	8	+ readonly _tag = "ConfigWriteError";
	9	+ constructor(
	10	+ readonly path: string,
	11	+ readonly cause: unknown,
	12	+ ) {}
	13	+}
	14	+
7	15	const FORMATTING: jsonc.FormattingOptions = {
8	16	tabSize: 2,
9	17	insertSpaces: true,
@@ -118,13 +126,13 @@ export const removeSourceFromConfig = ( · 108 unmodified lines
118	126	export const writeConfig = (
119	127	path: string,
120	128	config: ExecutorFileConfig,
121		−): Effect.Effect<void, PlatformError, FileSystem.FileSystem> =>
	129	+): Effect.Effect<void, ConfigWriteError \| PlatformError, FileSystem.FileSystem> =>
122	130	Effect.gen(function* () {
123	131	const fs = yield* FileSystem.FileSystem;
124	132	const text = yield* Effect.try({
125	133	try: () => JSON.stringify(config, null, 2) + "\n",
126		− catch: (cause) => cause,
127		− }).pipe(Effect.orDie);
	134	+ catch: (cause) => new ConfigWriteError(path, cause),
	135	+ });
128	136	yield* fs.writeFileString(path, text);
129	137	});
130	138