feat: rework some interfaces and upgrade fuz_util

ryanatkn · ryanatkn · commit 5398f746035a · 2026-04-20T11:15:59.000-04:00
diff --git a/.changeset/sunny-olives-attack.md b/.changeset/sunny-olives-attack.md
@@ -0,0 +1,5 @@
+---
+'@fuzdev/fuz_gitops': minor
+---
+
+feat: rework some interfaces and upgrade fuz_util
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
   "peerDependencies": {
     "@fuzdev/fuz_css": ">=0.56.0",
     "@fuzdev/fuz_ui": ">=0.190.0",
-    "@fuzdev/fuz_util": ">=0.54.0",
+    "@fuzdev/fuz_util": ">=0.57.0",
     "@fuzdev/gro": ">=0.197.0",
     "@sveltejs/kit": "^2",
     "svelte": "^5",
@@ -42,8 +42,8 @@
     "@fuzdev/fuz_code": "^0.45.1",
     "@fuzdev/fuz_css": "^0.58.0",
     "@fuzdev/fuz_ui": "^0.191.4",
-    "@fuzdev/fuz_util": "^0.56.0",
-    "@fuzdev/gro": "^0.197.3",
+    "@fuzdev/fuz_util": "^0.57.0",
+    "@fuzdev/gro": "^0.198.0",
     "@jridgewell/trace-mapping": "^0.3.31",
     "@ryanatkn/eslint-config": "^0.11.0",
     "@sveltejs/acorn-typescript": "^1.0.9",
diff --git a/src/lib/changeset_reader.ts b/src/lib/changeset_reader.ts
@@ -118,7 +118,7 @@ export const read_changesets = async (
 
 		for (const file of changeset_files) {
 			const filepath = join(changesets_dir, file);
-			const changeset = await parse_changeset_file(filepath, log);  
+			const changeset = await parse_changeset_file(filepath, log);
 			if (changeset) {
 				changesets.push(changeset);
 			}
diff --git a/src/lib/dependency_updater.ts b/src/lib/dependency_updater.ts
@@ -226,7 +226,7 @@ export const update_all_repos = async (
 		if (updates.size === 0) continue;
 
 		try {
-			await update_package_json(repo, updates, {strategy, log, git_ops, fs_ops});  
+			await update_package_json(repo, updates, {strategy, log, git_ops, fs_ops});
 			updated_count++;
 			log?.info(`    Updated ${updates.size} dependencies in ${repo.library.name}`);
 		} catch (error) {
diff --git a/src/lib/fetch_repo_data.ts b/src/lib/fetch_repo_data.ts
@@ -6,8 +6,6 @@ import {fetch_github_check_runs, fetch_github_pull_requests} from './github.js';
 import type {RepoJson} from './repo.svelte.js';
 import type {LocalRepo} from './local_repo.js';
 
- 
-
 /**
  * Fetches GitHub metadata (CI status, PRs) for all repos.
  *
diff --git a/src/lib/git_operations.ts b/src/lib/git_operations.ts
@@ -1,4 +1,4 @@
-import {spawn_out} from '@fuzdev/fuz_util/process.js';
+import {spawn_out, spawn_result_to_message} from '@fuzdev/fuz_util/process.js';
 import type {SpawnOptions} from 'node:child_process';
 import {
 	git_check_clean_workspace as gro_git_check_clean_workspace,
@@ -20,7 +20,9 @@ export const git_add = async (
 	const file_list = Array.isArray(files) ? files : [files];
 	const {result, stderr} = await spawn_out('git', ['add', ...file_list], options);
 	if (!result.ok) {
-		throw Error(`git_add failed with code ${result.code}${stderr ? ': ' + stderr.trim() : ''}`);
+		throw Error(
+			`git_add failed with ${spawn_result_to_message(result)}${stderr ? ': ' + stderr.trim() : ''}`,
+		);
 	}
 };
 
@@ -30,7 +32,9 @@ export const git_add = async (
 export const git_commit = async (message: string, options?: SpawnOptions): Promise<void> => {
 	const {result, stderr} = await spawn_out('git', ['commit', '-m', message], options);
 	if (!result.ok) {
-		throw Error(`git_commit failed with code ${result.code}${stderr ? ': ' + stderr.trim() : ''}`);
+		throw Error(
+			`git_commit failed with ${spawn_result_to_message(result)}${stderr ? ': ' + stderr.trim() : ''}`,
+		);
 	}
 };
 
@@ -59,7 +63,7 @@ export const git_tag = async (
 	const {result, stderr} = await spawn_out('git', args, options);
 	if (!result.ok) {
 		throw Error(
-			`git_tag failed for tag '${tag_name}' with code ${result.code}${stderr ? ': ' + stderr.trim() : ''}`,
+			`git_tag failed for tag '${tag_name}' with ${spawn_result_to_message(result)}${stderr ? ': ' + stderr.trim() : ''}`,
 		);
 	}
 };
@@ -75,7 +79,7 @@ export const git_push_tag = async (
 	const {result, stderr} = await spawn_out('git', ['push', origin, tag_name], options);
 	if (!result.ok) {
 		throw Error(
-			`git_push_tag failed for tag '${tag_name}' with code ${result.code}${stderr ? ': ' + stderr.trim() : ''}`,
+			`git_push_tag failed for tag '${tag_name}' with ${spawn_result_to_message(result)}${stderr ? ': ' + stderr.trim() : ''}`,
 		);
 	}
 };
@@ -122,7 +126,9 @@ export const git_stash = async (message?: string, options?: SpawnOptions): Promi
 
 	const {result, stderr} = await spawn_out('git', args, options);
 	if (!result.ok) {
-		throw Error(`git_stash failed with code ${result.code}${stderr ? ': ' + stderr.trim() : ''}`);
+		throw Error(
+			`git_stash failed with ${spawn_result_to_message(result)}${stderr ? ': ' + stderr.trim() : ''}`,
+		);
 	}
 };
 
@@ -133,7 +139,7 @@ export const git_stash_pop = async (options?: SpawnOptions): Promise<void> => {
 	const {result, stderr} = await spawn_out('git', ['stash', 'pop'], options);
 	if (!result.ok) {
 		throw Error(
-			`git_stash_pop failed with code ${result.code}${stderr ? ': ' + stderr.trim() : ''}`,
+			`git_stash_pop failed with ${spawn_result_to_message(result)}${stderr ? ': ' + stderr.trim() : ''}`,
 		);
 	}
 };
diff --git a/src/lib/gitops_run.task.ts b/src/lib/gitops_run.task.ts
@@ -75,7 +75,7 @@ export const task: Task<Args> = {
 					repo_name,
 					repo_dir,
 					status: success ? 'success' : 'failure',
-					exit_code: spawned.result.code ?? 0,
+					exit_code: spawned.result.kind === 'exited' ? spawned.result.code : 0,
 					stdout: spawned.stdout || '',
 					stderr: spawned.stderr || '',
 					duration_ms,
diff --git a/src/lib/local_repo.ts b/src/lib/local_repo.ts
@@ -296,7 +296,7 @@ export const local_repos_load = async ({
 		// Sequential loading (original behavior)
 		const loaded: Array<LocalRepo> = [];
 		for (const local_repo_path of local_repo_paths) {
-			loaded.push(await local_repo_load({local_repo_path, log, git_ops, npm_ops}));  
+			loaded.push(await local_repo_load({local_repo_path, log, git_ops, npm_ops}));
 		}
 		return loaded;
 	}
@@ -383,7 +383,7 @@ const download_repos = async ({
 	const resolved: Array<LocalRepoPath> = [];
 	for (const {repo_config, repo_git_ssh_url} of local_repos_missing) {
 		log?.info(`cloning repo ${repo_git_ssh_url} to ${repos_dir}`);
-		const clone_result = await spawn_out('git', ['clone', repo_git_ssh_url], {cwd: repos_dir});  
+		const clone_result = await spawn_out('git', ['clone', repo_git_ssh_url], {cwd: repos_dir});
 		if (!clone_result.result.ok) {
 			throw new TaskError(
 				`Failed to clone repo ${repo_git_ssh_url} to ${repos_dir}${clone_result.stderr ? ': ' + clone_result.stderr.trim() : ''}`,
@@ -397,7 +397,7 @@ const download_repos = async ({
 		}
 		// Always install dependencies after cloning
 		log?.info(`installing dependencies for newly cloned repo ${local_repo.repo_dir}`);
-		const install_result = await npm_ops.install({cwd: local_repo.repo_dir});  
+		const install_result = await npm_ops.install({cwd: local_repo.repo_dir});
 		if (!install_result.ok) {
 			throw new TaskError(
 				`Failed to install dependencies in ${local_repo.repo_dir}: ${install_result.message}${install_result.stderr ? `\n${install_result.stderr}` : ''}`,
diff --git a/src/lib/multi_repo_publisher.ts b/src/lib/multi_repo_publisher.ts
@@ -16,8 +16,6 @@ import {
 } from './gitops_constants.js';
 import {install_with_cache_healing} from './npm_install_helpers.js';
 
- 
-
 export interface PublishingOptions {
 	wetrun: boolean;
 	update_deps: boolean;
diff --git a/src/lib/npm_registry.ts b/src/lib/npm_registry.ts
@@ -80,7 +80,7 @@ export const wait_for_package = async (
 		}
 
 		// Check if package is available
-		 
+
 		if (await check_package_available(pkg, version, {log})) {
 			log?.info(st('green', `    ✓ ${pkg}@${version} is now available on NPM`));
 			return;
@@ -94,7 +94,7 @@ export const wait_for_package = async (
 		// Wait with exponential backoff + jitter
 		const jitter = Math.random() * delay * 0.1; // 10% jitter
 		const actual_delay = Math.min(delay + jitter, max_delay);
-		await wait(actual_delay);  
+		await wait(actual_delay);
 
 		// Exponential backoff
 		delay = Math.min(delay * 1.5, max_delay);
diff --git a/src/lib/operations.ts b/src/lib/operations.ts
@@ -35,6 +35,7 @@
  */
 
 import type {Result} from '@fuzdev/fuz_util/result.js';
+import type {FsError} from '@fuzdev/fuz_util/fs.js';
 import type {Logger} from '@fuzdev/fuz_util/log.js';
 import type {LocalRepo} from './local_repo.js';
 import type {ChangesetInfo} from './changeset_reader.js';
@@ -305,6 +306,10 @@ export interface PreflightOperations {
 
 /**
  * File system operations for reading and writing files.
+ *
+ * Errors are typed via `FsError` (`not_found | permission_denied |
+ * already_exists | io_error`) so callers can branch on `kind` instead of
+ * regex-matching `message`. See `@fuzdev/fuz_util/fs.js`.
  */
 export interface FsOperations {
 	/**
@@ -313,23 +318,17 @@ export interface FsOperations {
 	readFile: (options: {
 		path: string;
 		encoding: BufferEncoding;
-	}) => Promise<Result<{value: string}, {message: string}>>;
+	}) => Promise<Result<{value: string}, FsError>>;
 
 	/**
 	 * Writes a file to the file system.
 	 */
-	writeFile: (options: {
-		path: string;
-		content: string;
-	}) => Promise<Result<object, {message: string}>>;
+	writeFile: (options: {path: string; content: string}) => Promise<Result<object, FsError>>;
 
 	/**
 	 * Creates a directory, optionally with recursive creation.
 	 */
-	mkdir: (options: {
-		path: string;
-		recursive?: boolean;
-	}) => Promise<Result<object, {message: string}>>;
+	mkdir: (options: {path: string; recursive?: boolean}) => Promise<Result<object, FsError>>;
 
 	/**
 	 * Checks if a path exists on the file system.
diff --git a/src/lib/operations_defaults.ts b/src/lib/operations_defaults.ts
@@ -10,6 +10,7 @@
 import {spawn_out} from '@fuzdev/fuz_util/process.js';
 import {readFile, writeFile, mkdir, stat} from 'node:fs/promises';
 import {git_checkout, type GitBranch, type GitOrigin} from '@fuzdev/fuz_util/git.js';
+import {fs_classify_error} from '@fuzdev/fuz_util/fs.js';
 import {EMPTY_OBJECT} from '@fuzdev/fuz_util/object.js';
 
 import {has_changesets, read_changesets, predict_next_version} from './changeset_reader.js';
@@ -304,17 +305,32 @@ export const default_preflight_operations: PreflightOperations = {
 export const default_fs_operations: FsOperations = {
 	readFile: async (options) => {
 		const {path, encoding} = options;
-		return wrap_with_value(() => readFile(path, encoding));
+		try {
+			const value = await readFile(path, encoding);
+			return {ok: true, value};
+		} catch (error) {
+			return {ok: false, ...fs_classify_error(error)};
+		}
 	},
 
 	writeFile: async (options) => {
 		const {path, content} = options;
-		return wrap_void(() => writeFile(path, content));
+		try {
+			await writeFile(path, content);
+			return {ok: true};
+		} catch (error) {
+			return {ok: false, ...fs_classify_error(error)};
+		}
 	},
 
 	mkdir: async (options) => {
 		const {path, recursive} = options;
-		return wrap_void(() => mkdir(path, {recursive}));
+		try {
+			await mkdir(path, {recursive});
+			return {ok: true};
+		} catch (error) {
+			return {ok: false, ...fs_classify_error(error)};
+		}
 	},
 
 	exists: async (options) => {
diff --git a/src/lib/preflight_checks.ts b/src/lib/preflight_checks.ts
@@ -91,15 +91,15 @@ export const run_preflight_checks = async ({
 	// 1. Check clean workspaces - must be 100% clean before publishing
 	log?.info('  Checking workspace cleanliness...');
 	for (const repo of repos) {
-		const clean_result = await git_ops.check_clean_workspace({cwd: repo.repo_dir});  
+		const clean_result = await git_ops.check_clean_workspace({cwd: repo.repo_dir});
 		if (!clean_result.ok) {
 			errors.push(`${repo.library.name} failed workspace check: ${clean_result.message}`);
 			continue;
 		}
 
 		if (!clean_result.value) {
 			// Get list of changed files for better error message
-			const files_result = await git_ops.list_uncommitted_files({cwd: repo.repo_dir});  
+			const files_result = await git_ops.list_uncommitted_files({cwd: repo.repo_dir});
 			if (files_result.ok) {
 				// No filtering - workspace must be 100% clean
 				const unexpected_files = files_result.value;
@@ -118,7 +118,7 @@ export const run_preflight_checks = async ({
 	// 2. Check correct branch
 	log?.info(`  Checking branches (expecting ${required_branch})...`);
 	for (const repo of repos) {
-		const branch_result = await git_ops.current_branch_name({cwd: repo.repo_dir});  
+		const branch_result = await git_ops.current_branch_name({cwd: repo.repo_dir});
 		if (!branch_result.ok) {
 			errors.push(`${repo.library.name} failed branch check: ${branch_result.message}`);
 			continue;
@@ -135,7 +135,7 @@ export const run_preflight_checks = async ({
 	if (!skip_changesets) {
 		log?.info('  Checking for changesets...');
 		for (const repo of repos) {
-			const has_result = await changeset_ops.has_changesets({repo});  
+			const has_result = await changeset_ops.has_changesets({repo});
 			if (!has_result.ok) {
 				errors.push(`${repo.library.name} failed changeset check: ${has_result.message}`);
 				continue;
@@ -164,7 +164,7 @@ export const run_preflight_checks = async ({
 			log?.info(
 				st('dim', `    [${i + 1}/${repos_to_build.length}] Building ${repo.library.name}...`),
 			);
-			const build_result = await build_ops.build_package({repo, log});  
+			const build_result = await build_ops.build_package({repo, log});
 			if (!build_result.ok) {
 				errors.push(
 					`${repo.library.name} failed to build: ${build_result.output || build_result.message || 'unknown error'}`,
diff --git a/src/lib/publishing_plan.ts b/src/lib/publishing_plan.ts
diff --git a/src/lib/repo_ops.ts b/src/lib/repo_ops.ts
diff --git a/src/routes/library.json b/src/routes/library.json
diff --git a/src/test/test_helpers.ts b/src/test/test_helpers.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@fuzdev/fuz_gitops': minor
 +---
++
 +feat: rework some interfaces and upgrade fuz_util
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ export const read_changesets = async (`
`118`	`118`
`119`	`119`	`for (const file of changeset_files) {`
`120`	`120`	`const filepath = join(changesets_dir, file);`
`121`		`- const changeset = await parse_changeset_file(filepath, log);`
	`121`	`+ const changeset = await parse_changeset_file(filepath, log);`
`122`	`122`	`if (changeset) {`
`123`	`123`	`changesets.push(changeset);`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ import {fetch_github_check_runs, fetch_github_pull_requests} from './github.js';`
`6`	`6`	`import type {RepoJson} from './repo.svelte.js';`
`7`	`7`	`import type {LocalRepo} from './local_repo.js';`
`8`	`8`
`9`		`-`
`10`		`-`
`11`	`9`	`/**`
`12`	`10`	`* Fetches GitHub metadata (CI status, PRs) for all repos.`
`13`	`11`	`*`