improve tests and upgrade fuz_util peer dep

Author: ryanatkn

.changeset/quick-jeans-matter.md

@@ -0,0 +1,5 @@
+---
+'@fuzdev/gro': minor
+---
+
+upgrade fuz_util peer dep

package-lock.json

@@ -60,7 +60,7 @@
   },
   "peerDependencies": {
     "@fuzdev/blake3_wasm": "^0.1.0",
-    "@fuzdev/fuz_util": ">=0.52.1",
+    "@fuzdev/fuz_util": ">=0.53.0",
     "@sveltejs/kit": "^2",
     "esbuild": "^0.27.0",
     "svelte": "^5",
@@ -87,7 +87,7 @@
     "@fuzdev/fuz_ui": "^0.185.2",
     "@fuzdev/fuz_util": "^0.53.0",
     "@jridgewell/trace-mapping": "^0.3.31",
-    "@ryanatkn/eslint-config": "^0.9.0",
+    "@ryanatkn/eslint-config": "^0.10.0",
     "@sveltejs/adapter-static": "^3.0.10",
     "@sveltejs/kit": "^2.53.0",
     "@sveltejs/package": "^2.5.7",

package.json

@@ -23,7 +23,7 @@ export const BuildOutputEntry = z.strictObject({
 	path: z
 		.string()
 		.meta({description: "relative path from project root (e.g., 'build/index.html')."}),
-	hash: z.string().meta({description: 'SHA-256 hash of file contents'}),
+	hash: z.string().meta({description: 'BLAKE3 hash of file contents'}),
 	size: z.number().meta({description: 'file size in bytes'}),
 	mtime: z.number().meta({description: 'modification time in milliseconds since epoch'}),
 	ctime: z.number().meta({

src/lib/build_cache.ts

@@ -71,7 +71,7 @@
 		},
 		"peerDependencies": {
 			"@fuzdev/blake3_wasm": "^0.1.0",
-			"@fuzdev/fuz_util": ">=0.52.1",
+			"@fuzdev/fuz_util": ">=0.53.0",
 			"@sveltejs/kit": "^2",
 			"esbuild": "^0.27.0",
 			"svelte": "^5",
@@ -98,7 +98,7 @@
 			"@fuzdev/fuz_ui": "^0.185.2",
 			"@fuzdev/fuz_util": "^0.53.0",
 			"@jridgewell/trace-mapping": "^0.3.31",
-			"@ryanatkn/eslint-config": "^0.9.0",
+			"@ryanatkn/eslint-config": "^0.10.0",
 			"@sveltejs/adapter-static": "^3.0.10",
 			"@sveltejs/kit": "^2.53.0",
 			"@sveltejs/package": "^2.5.7",

src/routes/library.json

@@ -108,6 +108,30 @@ describe('is_build_cache_valid', () => {
 		expect(log.debug).toHaveBeenCalledWith('Build cache invalid: git commit changed');
 	});
 
+	test('uses pre-computed git_commit and skips git_current_commit_hash', async () => {
+		const {git_current_commit_hash} = await import('@fuzdev/fuz_util/git.js');
+		const {fs_exists} = vi.mocked(await import('@fuzdev/fuz_util/fs.js'));
+		const {readFile} = vi.mocked(await import('node:fs/promises'));
+		const {hash_blake3} = await import('@fuzdev/fuz_util/hash_blake3.js');
+
+		const metadata = create_mock_build_cache_metadata({
+			git_commit: 'precomputed_abc',
+			build_cache_config_hash: 'jkl012',
+		});
+
+		vi.mocked(fs_exists).mockResolvedValue(true);
+		vi.mocked(readFile).mockResolvedValue(JSON.stringify(metadata));
+		vi.mocked(hash_blake3).mockReturnValue('jkl012');
+
+		const config = await create_mock_config();
+		const log = create_mock_logger();
+
+		const result = await is_build_cache_valid(config, log, 'precomputed_abc');
+
+		expect(result).toBe(true);
+		expect(git_current_commit_hash).not.toHaveBeenCalled();
+	});
+
 	test('returns false when build_cache_config hash differs', async () => {
 		const {git_current_commit_hash} = await import('@fuzdev/fuz_util/git.js');
 		const {fs_exists} = vi.mocked(await import('@fuzdev/fuz_util/fs.js'));

src/test/build_cache.cache_validation.test.ts

@@ -52,7 +52,11 @@ describe('race condition: cache file modification during validation', () => {
 		const {git_current_commit_hash} = await import('@fuzdev/fuz_util/git.js');
 		const {hash_blake3} = await import('@fuzdev/fuz_util/hash_blake3.js');
 
-		const initial_metadata = create_mock_build_cache_metadata({git_commit: 'abc123'});
+		// hash_blake3 mock returns 'hash123', so config's build_cache_config_hash will be 'hash123'
+		const initial_metadata = create_mock_build_cache_metadata({
+			git_commit: 'abc123',
+			build_cache_config_hash: 'hash123',
+		});
 		const modified_metadata = create_mock_build_cache_metadata({git_commit: 'def456'});
 
 		// Simulate cache file being modified during validation
@@ -72,12 +76,12 @@ describe('race condition: cache file modification during validation', () => {
 		const config = await create_mock_config();
 		const log = create_mock_logger();
 
-		// This represents a very unlikely race condition, but system should handle gracefully
+		// Metadata is loaded once and used throughout validation,
+		// so later file modifications don't affect the result
 		const result = await is_build_cache_valid(config, log);
 
-		// Cache validation should happen with the initially loaded metadata
-		// The result depends on when the validation happens vs when file is modified
-		expect(typeof result).toBe('boolean');
+		// initial metadata matches current git commit, so cache is valid
+		expect(result).toBe(true);
 	});
 
 	test('handles concurrent cache writes', async () => {
@@ -86,19 +90,14 @@ describe('race condition: cache file modification during validation', () => {
 		const metadata1 = create_mock_build_cache_metadata({git_commit: 'commit1'});
 		const metadata2 = create_mock_build_cache_metadata({git_commit: 'commit2'});
 
-		let write_count = 0;
-		vi.mocked(writeFile).mockImplementation(() => {
-			write_count++;
-			// Simulate concurrent writes - not expected in practice but should not crash
-			return Promise.resolve();
-		});
+		vi.mocked(mkdir).mockResolvedValue(undefined);
+		vi.mocked(writeFile).mockResolvedValue(undefined);
 
-		// Try to save two different cache states
-		await save_build_cache_metadata(metadata1);
-		await save_build_cache_metadata(metadata2);
+		// actually concurrent writes via Promise.all
+		await Promise.all([save_build_cache_metadata(metadata1), save_build_cache_metadata(metadata2)]);
 
-		// Both should complete without throwing
-		expect(write_count).toBe(2);
+		// both should complete without throwing
+		expect(writeFile).toHaveBeenCalledTimes(2);
 		expect(mkdir).toHaveBeenCalledTimes(2);
 	});
 
@@ -108,7 +107,11 @@ describe('race condition: cache file modification during validation', () => {
 		const {git_current_commit_hash} = await import('@fuzdev/fuz_util/git.js');
 		const {hash_blake3} = await import('@fuzdev/fuz_util/hash_blake3.js');
 
-		const metadata = create_mock_build_cache_metadata({git_commit: 'abc123'});
+		// hash_blake3 mock returns 'hash123', so config's build_cache_config_hash will be 'hash123'
+		const metadata = create_mock_build_cache_metadata({
+			git_commit: 'abc123',
+			build_cache_config_hash: 'hash123',
+		});
 
 		vi.mocked(fs_exists).mockResolvedValue(true);
 		vi.mocked(readFile).mockResolvedValue(JSON.stringify(metadata));
@@ -118,19 +121,15 @@ describe('race condition: cache file modification during validation', () => {
 		const config = await create_mock_config();
 		const log = create_mock_logger();
 
-		// Simulate multiple concurrent cache validation operations
-		// In practice this shouldn't happen, but system should handle gracefully
+		// multiple concurrent validations should all succeed
 		const validations = await Promise.all([
 			is_build_cache_valid(config, log),
 			is_build_cache_valid(config, log),
 			is_build_cache_valid(config, log),
 		]);
 
-		// All validations should complete without throwing
-		expect(validations).toHaveLength(3);
-		validations.forEach((result) => {
-			expect(typeof result).toBe('boolean');
-		});
+		// all validations should return true since metadata matches
+		expect(validations).toEqual([true, true, true]);
 	});
 
 	// Note: Git commit changing during build is tested at the integration level

src/test/build_cache.concurrency.test.ts

@@ -295,6 +295,35 @@ describe('create_build_cache_metadata', () => {
 		expect(log.warn).toHaveBeenCalledWith(expect.stringContaining('Not in a git repository'));
 	});
 
+	test('uses pre-passed build_dirs and skips discovery', async () => {
+		const {git_current_commit_hash} = await import('@fuzdev/fuz_util/git.js');
+		const {fs_exists} = vi.mocked(await import('@fuzdev/fuz_util/fs.js'));
+		const {readdir, stat, readFile} = vi.mocked(await import('node:fs/promises'));
+		const {hash_blake3} = await import('@fuzdev/fuz_util/hash_blake3.js');
+
+		vi.mocked(git_current_commit_hash).mockResolvedValue('abc123');
+		vi.mocked(fs_exists).mockResolvedValue(true);
+		vi.mocked(readdir).mockImplementation((path: any) => {
+			if (path === 'custom_out') {
+				return Promise.resolve([mock_file_entry('app.js')] as any);
+			}
+			return Promise.resolve([] as any);
+		});
+		vi.mocked(stat).mockResolvedValue(mock_file_stats());
+		vi.mocked(readFile).mockResolvedValue(Buffer.from('content'));
+		vi.mocked(hash_blake3).mockReturnValue('hash_val');
+
+		const config = await create_mock_config();
+		const log = create_mock_logger();
+
+		const result = await create_build_cache_metadata(config, log, 'abc123', ['custom_out']);
+
+		expect(result.outputs).toHaveLength(1);
+		expect(result.outputs[0]!.path).toBe('custom_out/app.js');
+		// readdir('.') is for discovery — should not be called when build_dirs is provided
+		expect(readdir).not.toHaveBeenCalledWith('.');
+	});
+
 	test('includes correct build_cache_config_hash', async () => {
 		const {git_current_commit_hash} = await import('@fuzdev/fuz_util/git.js');
 		const {fs_exists} = vi.mocked(await import('@fuzdev/fuz_util/fs.js'));

src/test/build_cache.creation.test.ts

@@ -133,6 +133,26 @@ describe('discover_build_output_dirs', () => {
 		expect(result).not.toContain('dist_config.json');
 	});
 
+	test('skips dist_ entry when stat fails during iteration', async () => {
+		const {fs_exists} = vi.mocked(await import('@fuzdev/fuz_util/fs.js'));
+		const {readdir, stat} = vi.mocked(await import('node:fs/promises'));
+
+		vi.mocked(fs_exists).mockResolvedValue(false);
+		vi.mocked(readdir).mockResolvedValue(['dist_vanished', 'dist_ok'] as any);
+		vi.mocked(stat).mockImplementation((path: any) => {
+			if (String(path) === 'dist_vanished') {
+				return Promise.reject(new Error('ENOENT: no such file or directory'));
+			}
+			return Promise.resolve({isDirectory: () => true} as any);
+		});
+
+		const result = await discover_build_output_dirs();
+
+		// vanished entry is skipped, surviving entry is included
+		expect(result).toContain('dist_ok');
+		expect(result).not.toContain('dist_vanished');
+	});
+
 	test('skips non-dist_ prefixed directories', async () => {
 		const {fs_exists} = vi.mocked(await import('@fuzdev/fuz_util/fs.js'));
 		const {readdir, stat} = vi.mocked(await import('node:fs/promises'));
@@ -160,6 +180,12 @@ describe('collect_build_outputs', () => {
 		vi.clearAllMocks();
 	});
 
+	test('returns empty array for empty dirs array', async () => {
+		const result = await collect_build_outputs([]);
+
+		expect(result).toEqual([]);
+	});
+
 	test('hashes all files in build directory', async () => {
 		const {fs_exists} = vi.mocked(await import('@fuzdev/fuz_util/fs.js'));
 		const {readdir, readFile, stat} = vi.mocked(await import('node:fs/promises'));

src/test/build_cache.discovery.test.ts

@@ -65,6 +65,8 @@ describe('validate_build_cache', () => {
 
 	test('returns false when output file is missing', async () => {
 		const {fs_exists} = vi.mocked(await import('@fuzdev/fuz_util/fs.js'));
+		const {stat, readFile} = vi.mocked(await import('node:fs/promises'));
+		const {hash_blake3} = await import('@fuzdev/fuz_util/hash_blake3.js');
 
 		const metadata = create_mock_build_cache_metadata({
 			outputs: [create_mock_output_entry('build/index.html')],
@@ -75,11 +77,16 @@ describe('validate_build_cache', () => {
 		const result = await validate_build_cache(metadata);
 
 		expect(result).toBe(false);
+		// should not attempt stat or hash for missing files
+		expect(stat).not.toHaveBeenCalled();
+		expect(readFile).not.toHaveBeenCalled();
+		expect(hash_blake3).not.toHaveBeenCalled();
 	});
 
 	test('returns false when output file size differs (fast path)', async () => {
 		const {fs_exists} = vi.mocked(await import('@fuzdev/fuz_util/fs.js'));
-		const {stat} = vi.mocked(await import('node:fs/promises'));
+		const {stat, readFile} = vi.mocked(await import('node:fs/promises'));
+		const {hash_blake3} = await import('@fuzdev/fuz_util/hash_blake3.js');
 
 		const metadata = create_mock_build_cache_metadata({
 			outputs: [create_mock_output_entry('build/index.html', {hash: 'expected_hash', size: 1024})],
@@ -91,6 +98,9 @@ describe('validate_build_cache', () => {
 		const result = await validate_build_cache(metadata);
 
 		expect(result).toBe(false);
+		// fast path: size mismatch skips expensive hashing
+		expect(readFile).not.toHaveBeenCalled();
+		expect(hash_blake3).not.toHaveBeenCalled();
 	});
 
 	test('returns false when output file hash does not match', async () => {
@@ -180,6 +190,14 @@ describe('validate_build_cache', () => {
 		expect(result).toBe(false);
 	});
 
+	test('returns true when metadata has no outputs', async () => {
+		const metadata = create_mock_build_cache_metadata({outputs: []});
+
+		const result = await validate_build_cache(metadata);
+
+		expect(result).toBe(true);
+	});
+
 	test('returns false when file becomes inaccessible during hash validation', async () => {
 		const {fs_exists} = vi.mocked(await import('@fuzdev/fuz_util/fs.js'));
 		const {readFile, stat} = vi.mocked(await import('node:fs/promises'));