@ryanatkn/gro 0.179.0 → 0.181.0

package/src/lib/deploy.task.ts

@@ -1,10 +1,10 @@
-import {spawn} from '@ryanatkn/belt/process.js';
-import {print_error} from '@ryanatkn/belt/print.js';
+import {spawn} from '@fuzdev/fuz_util/process.js';
+import {print_error} from '@fuzdev/fuz_util/print.js';
 import {styleText as st} from 'node:util';
 import {z} from 'zod';
-import {cp, mkdir, rm} from 'node:fs/promises';
+import {cp, mkdir, readdir, rm} from 'node:fs/promises';
 import {join, resolve} from 'node:path';
-import {existsSync, readdirSync} from 'node:fs';
+import {fs_exists, fs_empty_dir} from '@fuzdev/fuz_util/fs.js';
 import {
 	git_check_clean_workspace,
 	git_checkout,
@@ -20,8 +20,7 @@ import {
 	git_check_setting_pull_rebase,
 	git_clone_locally,
 	git_current_branch_name,
-} from '@ryanatkn/belt/git.js';
-import {fs_empty_dir} from '@ryanatkn/belt/fs.js';
+} from '@fuzdev/fuz_util/git.js';
 
 import {TaskError, type Task} from './task.ts';
 import {print_path} from './paths.ts';
@@ -72,6 +71,19 @@ export const Args = z.strictObject({
 		.default(false),
 	build: z.boolean().meta({description: 'dual of no-build'}).default(true),
 	'no-build': z.boolean().meta({description: 'opt out of building'}).default(false),
+	sync: z.boolean().meta({description: 'dual of no-sync'}).default(true),
+	'no-sync': z.boolean().meta({description: 'opt out of gro sync in build'}).default(false),
+	gen: z.boolean().meta({description: 'dual of no-gen'}).default(true),
+	'no-gen': z.boolean().meta({description: 'opt out of gro gen in build'}).default(false),
+	install: z.boolean().meta({description: 'dual of no-install'}).default(true),
+	'no-install': z
+		.boolean()
+		.meta({description: 'opt out of installing packages before building'})
+		.default(false),
+	force_build: z
+		.boolean()
+		.meta({description: 'force a fresh build, ignoring the cache'})
+		.default(false),
 	pull: z.boolean().meta({description: 'dual of no-pull'}).default(true),
 	'no-pull': z.boolean().meta({description: 'opt out of git pull'}).default(false),
 });
@@ -93,6 +105,10 @@ export const task: Task<Args> = {
 			dangerous,
 			reset,
 			build,
+			sync,
+			gen,
+			install,
+			force_build,
 			pull,
 		} = args;
 
@@ -154,7 +170,7 @@ export const task: Task<Args> = {
 			// First, check if the deploy dir exists, and if so, attempt to sync it.
 			// If anything goes wrong, delete the directory and we'll initialize it
 			// using the same code path as if it didn't exist in the first place.
-			if (existsSync(resolved_deploy_dir)) {
+			if (await fs_exists(resolved_deploy_dir)) {
 				if (target !== (await git_current_branch_name(target_spawn_options))) {
 					// We're in a bad state because the target branch has changed,
 					// so delete the directory and continue as if it wasn't there.
@@ -175,7 +191,7 @@ export const task: Task<Args> = {
 
 			// Second, initialize the deploy dir if needed.
 			// It may not exist, or it may have been deleted after failing to sync above.
-			if (!existsSync(resolved_deploy_dir)) {
+			if (!(await fs_exists(resolved_deploy_dir))) {
 				const local_deploy_branch_exists = await git_local_branch_exists(target);
 				await git_fetch(origin, ('+' + target + ':' + target) as GitBranch); // fetch+merge and allow non-fastforward updates with the +
 				await git_clone_locally(origin, target, dir, resolved_deploy_dir);
@@ -193,7 +209,7 @@ export const task: Task<Args> = {
 			// Remote target branch does not exist, so start from scratch
 
 			// Delete the deploy dir and recreate it
-			if (existsSync(resolved_deploy_dir)) {
+			if (await fs_exists(resolved_deploy_dir)) {
 				await rm(resolved_deploy_dir, {recursive: true});
 				await mkdir(resolved_deploy_dir, {recursive: true});
 			}
@@ -222,14 +238,14 @@ export const task: Task<Args> = {
 		// Build
 		try {
 			if (build) {
-				await invoke_task('build');
+				await invoke_task('build', {sync, gen, install, force_build});
 			}
-		} catch (err) {
+		} catch (error) {
 			log.error(
 				st('red', 'build failed'),
 				'but',
 				st('green', 'no changes were made to git'),
-				print_error(err),
+				print_error(error),
 			);
 			if (dry) {
 				log.info(st('red', 'dry deploy failed'));
@@ -238,13 +254,14 @@ export const task: Task<Args> = {
 		}
 
 		// Verify build output exists
-		if (!existsSync(build_dir)) {
+		if (!(await fs_exists(build_dir))) {
 			throw new TaskError(`Directory to deploy does not exist after building: ${build_dir}`);
 		}
 
 		// Copy the build
+		const build_entries = await readdir(build_dir);
 		await Promise.all(
-			readdirSync(build_dir).map((path) =>
+			build_entries.map((path) =>
 				cp(join(build_dir, path), join(resolved_deploy_dir, path), {recursive: true}),
 			),
 		);
@@ -260,8 +277,8 @@ export const task: Task<Args> = {
 			await spawn('git', ['add', '.', '-f'], target_spawn_options);
 			await spawn('git', ['commit', '-m', 'deployment'], target_spawn_options);
 			await spawn('git', ['push', origin, target, '-f'], target_spawn_options); // force push because we may be resetting the branch, see the checks above to make this safer
-		} catch (err) {
-			log.error(st('red', 'updating git failed:'), print_error(err));
+		} catch (error) {
+			log.error(st('red', 'updating git failed:'), print_error(error));
 			throw new TaskError(`Deploy failed in a bad state: built but not pushed, see error above.`);
 		}
 

package/src/lib/disknode.ts

@@ -1,4 +1,4 @@
-import type {PathId} from '@ryanatkn/belt/path.js';
+import type {PathId} from '@fuzdev/fuz_util/path.js';
 
 // TODO extract more here from Filer
 

package/src/lib/esbuild_helpers.ts

@@ -1,5 +1,5 @@
 import {styleText as st} from 'node:util';
-import type {Logger} from '@ryanatkn/belt/log.js';
+import type {Logger} from '@fuzdev/fuz_util/log.js';
 import type * as esbuild from 'esbuild';
 
 import type {ParsedSvelteConfig} from './svelte_config.ts';

package/src/lib/esbuild_plugin_external_worker.ts

@@ -1,8 +1,8 @@
 import * as esbuild from 'esbuild';
-import type {Logger} from '@ryanatkn/belt/log.js';
+import type {Logger} from '@fuzdev/fuz_util/log.js';
 import {basename} from 'node:path';
 import type {CompileOptions, ModuleCompileOptions, PreprocessorGroup} from 'svelte/compiler';
-import type {PathId} from '@ryanatkn/belt/path.js';
+import type {PathId} from '@fuzdev/fuz_util/path.js';
 
 import {print_build_result, to_define_import_meta_env} from './esbuild_helpers.ts';
 import {resolve_specifier} from './resolve_specifier.ts';
@@ -84,7 +84,7 @@ export const esbuild_plugin_external_worker = ({
 		};
 
 		build.onResolve({filter: /\.worker(|\.js|\.ts)$/}, async ({path, resolveDir}) => {
-			const parsed = resolve_specifier(path, resolveDir);
+			const parsed = await resolve_specifier(path, resolveDir);
 			const {specifier, path_id, namespace} = parsed;
 			const build_result = await build_worker(path_id);
 			if (log) print_build_result(log, build_result);

package/src/lib/esbuild_plugin_svelte.ts

@@ -71,8 +71,8 @@ export const esbuild_plugin_svelte = (options: EsbuildPluginSvelteOptions): esbu
 						contents,
 						warnings: warnings.map((w) => convert_svelte_message_to_esbuild(filename, source, w)),
 					};
-				} catch (err) {
-					return {errors: [convert_svelte_message_to_esbuild(path, source, err)]};
+				} catch (error) {
+					return {errors: [convert_svelte_message_to_esbuild(path, source, error)]};
 				}
 			});
 
@@ -90,8 +90,8 @@ export const esbuild_plugin_svelte = (options: EsbuildPluginSvelteOptions): esbu
 						contents,
 						warnings: warnings.map((w) => convert_svelte_message_to_esbuild(filename, source, w)),
 					};
-				} catch (err) {
-					return {errors: [convert_svelte_message_to_esbuild(path, source, err)]};
+				} catch (error) {
+					return {errors: [convert_svelte_message_to_esbuild(path, source, error)]};
 				}
 			});
 		},

package/src/lib/esbuild_plugin_sveltekit_local_imports.ts

@@ -13,10 +13,10 @@ import {EVERYTHING_MATCHER} from './constants.ts';
 export const esbuild_plugin_sveltekit_local_imports = (): esbuild.Plugin => ({
 	name: 'sveltekit_local_imports',
 	setup: (build) => {
-		build.onResolve({filter: /^(\/|\.)/}, (args) => {
+		build.onResolve({filter: /^(\/|\.)/}, async (args) => {
 			const {path, importer} = args;
 			if (!importer) return {path};
-			const {path_id, namespace} = resolve_specifier(path, dirname(importer));
+			const {path_id, namespace} = await resolve_specifier(path, dirname(importer));
 			return {path: path_id, namespace}; // `namespace` may be `undefined`, but esbuild needs the absolute path for json etc
 		});
 		build.onLoad(

package/src/lib/esbuild_plugin_sveltekit_shim_alias.ts

@@ -1,5 +1,5 @@
 import type * as esbuild from 'esbuild';
-import {escape_regexp} from '@ryanatkn/belt/regexp.js';
+import {escape_regexp} from '@fuzdev/fuz_util/regexp.js';
 import {join} from 'node:path';
 
 export interface EsbuildPluginSveltekitShimAliasOptions {

package/src/lib/filer.ts

@@ -1,13 +1,13 @@
-import {EMPTY_OBJECT} from '@ryanatkn/belt/object.js';
-import {readFileSync, statSync} from 'node:fs';
+import {EMPTY_OBJECT} from '@fuzdev/fuz_util/object.js';
+import {readFile, stat} from 'node:fs/promises';
 import {dirname, resolve} from 'node:path';
-import type {OmitStrict} from '@ryanatkn/belt/types.js';
+import type {OmitStrict} from '@fuzdev/fuz_util/types.js';
 import {isBuiltin} from 'node:module';
 import {fileURLToPath, pathToFileURL} from 'node:url';
-import {UnreachableError} from '@ryanatkn/belt/error.js';
-import type {Logger} from '@ryanatkn/belt/log.js';
-import type {PackageJson} from '@ryanatkn/belt/package_json.js';
-import type {FileFilter, PathId} from '@ryanatkn/belt/path.js';
+import {UnreachableError} from '@fuzdev/fuz_util/error.js';
+import type {Logger} from '@fuzdev/fuz_util/log.js';
+import type {PackageJson} from '@fuzdev/fuz_util/package_json.js';
+import type {FileFilter, PathId} from '@fuzdev/fuz_util/path.js';
 
 import {
 	watch_dir,
@@ -51,6 +51,9 @@ export class Filer {
 	#initing: Promise<void> | undefined;
 	#closing: Promise<void> | undefined;
 
+	#change_queue: Array<WatcherChange> = [];
+	#processing_promise: Promise<void> | null = null;
+
 	constructor(options: FilerOptions = EMPTY_OBJECT) {
 		this.#watch_dir = options.watch_dir ?? watch_dir;
 		this.#watch_dir_options = options.watch_dir_options ?? EMPTY_OBJECT;
@@ -82,9 +85,11 @@ export class Filer {
 			dependencies: new Map(),
 		};
 		this.files.set(id, file);
-		// TODO this may need to be batched/deferred
+		// Defer external file change notification to avoid reentrancy during queue processing
 		if (file.external) {
-			this.#on_change({type: 'add', path: file.id, is_directory: false});
+			queueMicrotask(() => {
+				this.#on_change({type: 'add', path: file.id, is_directory: false});
+			});
 		}
 		return file;
 	};
@@ -117,10 +122,10 @@ export class Filer {
 		this.#initing = this.#init();
 		try {
 			await this.#initing;
-		} catch (err) {
+		} catch (error) {
 			// use shared cleanup logic
 			this.#cleanup();
-			throw err;
+			throw error;
 		} finally {
 			this.#initing = undefined;
 		}
@@ -136,6 +141,9 @@ export class Filer {
 		try {
 			await watcher.init();
 
+			// Wait for any queued changes from init to be processed
+			await this.#drain_queue();
+
 			// check if close() was called during init
 			if (this.#closing) {
 				await watcher.close();
@@ -144,14 +152,14 @@ export class Filer {
 
 			// only set after successful init and not closing
 			this.#watching = watcher;
-		} catch (err) {
+		} catch (error) {
 			// clean up watcher on error, but don't let close error mask init error
 			try {
 				await watcher.close();
 			} catch {
 				// ignore close errors - init error is more important
 			}
-			throw err;
+			throw error;
 		}
 	}
 
@@ -169,6 +177,8 @@ export class Filer {
 		this.#listeners.clear();
 		this.files.clear();
 		this.#watching = undefined;
+		this.#change_queue = [];
+		this.#processing_promise = null;
 		// #initing is handled in finally block of init()
 	}
 
@@ -214,20 +224,22 @@ export class Filer {
 		this.#cleanup();
 	}
 
-	#update(id: PathId): Disknode | null {
+	async #update(id: PathId): Promise<Disknode | null> {
 		const file = this.get_or_create(id);
 
-		let stats: ReturnType<typeof statSync> | null = null;
+		let stats: Awaited<ReturnType<typeof stat>> | null = null;
 		let new_contents: string | null = null; // TODO need to lazily load contents, probably turn `Disknode` into a class
 
 		try {
-			stats = statSync(id);
-			new_contents = readFileSync(id, 'utf8');
-		} catch (err) {
-			if ((err as NodeJS.ErrnoException).code !== 'ENOENT') {
-				throw err;
+			[stats, new_contents] = await Promise.all([stat(id), readFile(id, 'utf8')]);
+		} catch (error) {
+			const code = (error as NodeJS.ErrnoException).code;
+			// Treat file as deleted/inaccessible for common error codes
+			if (code === 'ENOENT' || code === 'EACCES' || code === 'EPERM') {
+				// File doesn't exist or is inaccessible, treat as deleted
+			} else {
+				throw error;
 			}
-			// ENOENT: file doesn't exist, treat as deleted
 		}
 
 		const old_mtime = file.mtime;
@@ -245,7 +257,14 @@ export class Filer {
 		const dependencies_before = new Set(file.dependencies.keys());
 		const dependencies_removed = new Set(dependencies_before);
 
-		const imported = file.contents ? parse_imports(file.id, file.contents) : [];
+		let imported: Array<string> = [];
+		if (file.contents) {
+			try {
+				imported = parse_imports(file.id, file.contents);
+			} catch (error) {
+				this.#log?.error('[filer] Failed to parse imports', file.id, error);
+			}
+		}
 		for (const specifier of imported) {
 			if (SVELTEKIT_GLOBAL_SPECIFIER.test(specifier)) continue;
 			const path = map_sveltekit_aliases(specifier, aliases);
@@ -253,7 +272,7 @@ export class Filer {
 			let path_id;
 			// TODO can we replace `resolve_specifier` with `import.meta.resolve` completely now outside of esbuild plugins?
 			if (path[0] === '.' || path[0] === '/') {
-				const resolved = resolve_specifier(path, dir);
+				const resolved = await resolve_specifier(path, dir); // eslint-disable-line no-await-in-loop
 				path_id = resolved.path_id;
 			} else {
 				if (isBuiltin(path)) continue;
@@ -304,8 +323,8 @@ export class Filer {
 		for (const disknode of this.files.values()) {
 			try {
 				listener({type: 'add', path: disknode.id, is_directory: false}, disknode);
-			} catch (err) {
-				this.#log?.error('[filer] Listener error during sync:', err);
+			} catch (error) {
+				this.#log?.error('[filer] Listener error during sync:', error);
 			}
 		}
 	}
@@ -314,8 +333,8 @@ export class Filer {
 		for (const listener of this.#listeners) {
 			try {
 				listener(change, disknode);
-			} catch (err) {
-				this.#log?.error('[filer] Listener error during change notification:', err);
+			} catch (error) {
+				this.#log?.error('[filer] Listener error during change notification:', error);
 			}
 		}
 	}
@@ -335,26 +354,61 @@ export class Filer {
 		// keep watching active even with no listeners, only close() tears down
 	}
 
-	#on_change: WatcherChangeCallback = (change) => {
-		if (this.#closing) return; // ignore changes during close
-		if (change.is_directory) return; // TODO manage directories?
-		let disknode: Disknode | null;
-		switch (change.type) {
-			case 'add':
-			case 'update': {
-				disknode = this.#update(change.path);
-				break;
+	async #drain_queue(): Promise<void> {
+		// Wait for queue to be empty and no active processing
+		while (this.#change_queue.length > 0 || this.#processing_promise) {
+			await this.#process_queue(); // eslint-disable-line no-await-in-loop
+		}
+	}
+
+	async #process_queue(): Promise<void> {
+		// If already processing, return the existing promise
+		if (this.#processing_promise) return this.#processing_promise;
+
+		// Create and track the processing promise
+		this.#processing_promise = this.#do_process_queue();
+
+		try {
+			await this.#processing_promise;
+		} finally {
+			this.#processing_promise = null;
+		}
+	}
+
+	async #do_process_queue(): Promise<void> {
+		while (this.#change_queue.length > 0) {
+			const change = this.#change_queue.shift()!;
+
+			if (this.#closing) continue; // ignore changes during close
+			if (change.is_directory) continue; // TODO manage directories?
+
+			let disknode: Disknode | null;
+			switch (change.type) {
+				case 'add':
+				case 'update': {
+					disknode = await this.#update(change.path); // eslint-disable-line no-await-in-loop
+					break;
+				}
+				case 'delete': {
+					disknode = this.#remove(change.path);
+					break;
+				}
+				default:
+					throw new UnreachableError(change.type);
 			}
-			case 'delete': {
-				disknode = this.#remove(change.path);
-				break;
+
+			if (disknode && this.#listeners.size > 0) {
+				this.#notify_change(change, disknode);
 			}
-			default:
-				throw new UnreachableError(change.type);
-		}
-		if (disknode && this.#listeners.size > 0) {
-			this.#notify_change(change, disknode);
 		}
+	}
+
+	#on_change: WatcherChangeCallback = (change) => {
+		// Enqueue the change (sync callback from chokidar)
+		this.#change_queue.push(change);
+
+		// Start processing if not already running
+		void this.#process_queue();
 	};
 
 	#is_external(id: PathId): boolean {
@@ -372,21 +426,26 @@ export const filter_dependents = (
 	searched: Set<PathId> = new Set(),
 	log?: Logger,
 ): Set<PathId> => {
-	const {dependents} = disknode;
-	for (const dependent_id of dependents.keys()) {
-		if (searched.has(dependent_id)) continue;
-		searched.add(dependent_id);
-		if (!filter || filter(dependent_id)) {
-			results.add(dependent_id);
-		}
-		const dependent_disknode = get_by_id(dependent_id);
-		if (!dependent_disknode) {
-			log?.warn(
-				`[filer.filter_dependents] dependent source file ${dependent_id} not found for ${disknode.id}`,
-			);
-			continue;
+	// Use iterative approach to avoid stack overflow on deep dependency trees
+	const stack = [disknode];
+
+	while (stack.length > 0) {
+		const current = stack.pop()!;
+		for (const dependent_id of current.dependents.keys()) {
+			if (searched.has(dependent_id)) continue;
+			searched.add(dependent_id);
+			if (!filter || filter(dependent_id)) {
+				results.add(dependent_id);
+			}
+			const dependent_disknode = get_by_id(dependent_id);
+			if (!dependent_disknode) {
+				log?.warn(
+					`[filer.filter_dependents] dependent source file ${dependent_id} not found for ${current.id}`,
+				);
+				continue;
+			}
+			stack.push(dependent_disknode);
 		}
-		filter_dependents(dependent_disknode, get_by_id, filter, results, searched);
 	}
 	return results;
 };

package/src/lib/format.task.ts

@@ -1,4 +1,4 @@
-import {print_spawn_result} from '@ryanatkn/belt/process.js';
+import {print_spawn_result} from '@fuzdev/fuz_util/process.js';
 import {z} from 'zod';
 
 import {TaskError, type Task} from './task.ts';

package/src/lib/format_directory.ts

@@ -1,5 +1,5 @@
-import type {SpawnResult} from '@ryanatkn/belt/process.js';
-import type {Logger} from '@ryanatkn/belt/log.js';
+import type {SpawnResult} from '@fuzdev/fuz_util/process.js';
+import type {Logger} from '@fuzdev/fuz_util/log.js';
 
 import {paths} from './paths.ts';
 import {

package/src/lib/format_file.ts

@@ -19,7 +19,7 @@ export const format_file = async (
 	const final_base_options =
 		base_options !== undefined
 			? base_options
-			: (cached_base_options = load_package_json().prettier as any);
+			: (cached_base_options = (await load_package_json()).prettier as any);
 	let final_options = options;
 	if (options.filepath && !options.parser) {
 		const {filepath, ...rest} = options;

package/src/lib/gen.task.ts

@@ -1,6 +1,6 @@
 import {styleText as st} from 'node:util';
-import {print_ms, print_error} from '@ryanatkn/belt/print.js';
-import {plural} from '@ryanatkn/belt/string.js';
+import {print_ms, print_error} from '@fuzdev/fuz_util/print.js';
+import {plural} from '@fuzdev/fuz_util/string.js';
 import {z} from 'zod';
 
 import {TaskError, type Task} from './task.ts';
@@ -43,7 +43,7 @@ export const task: Task<Args> = {
 		const input_paths = to_input_paths(raw_input_paths);
 
 		// load all of the gen modules
-		const found = find_genfiles(input_paths, root_dirs, config, timings);
+		const found = await find_genfiles(input_paths, root_dirs, config, timings);
 		if (!found.ok) {
 			if (found.type === 'input_directories_with_no_files') {
 				// TODO maybe let this error like the normal case, but only call `gro gen` if we find gen files? problem is the args would need to be hoisted to callers like `gro sync`