@ryanatkn/gro 0.178.0 → 0.180.0

package/src/lib/run_gen.ts

@@ -2,6 +2,7 @@ import {styleText as st} from 'node:util';
 import {print_error} from '@ryanatkn/belt/print.js';
 import type {Timings} from '@ryanatkn/belt/timings.js';
 import type {Logger} from '@ryanatkn/belt/log.js';
+import {map_concurrent} from '@ryanatkn/belt/async.js';
 
 import {
 	type GenResults,
@@ -33,8 +34,9 @@ export const run_gen = async (
 	let input_count = 0;
 	let output_count = 0;
 	const timing_for_run_gen = timings.start('run_gen');
-	const results = await Promise.all(
-		gen_modules.map(async (module_meta): Promise<GenfileModuleResult> => {
+	const results = await map_concurrent(
+		gen_modules,
+		async (module_meta): Promise<GenfileModuleResult> => {
 			input_count++;
 			const {id} = module_meta;
 			const timing_for_module = timings.start(id);
@@ -54,11 +56,11 @@ export const run_gen = async (
 			let raw_gen_result: RawGenResult;
 			try {
 				raw_gen_result = await gen_config.generate(gen_ctx);
-			} catch (err) {
+			} catch (error) {
 				return {
 					ok: false,
 					id,
-					error: err,
+					error,
 					reason: st('red', `Error generating ${print_path(id)}`),
 					elapsed: timing_for_module(),
 				};
@@ -69,19 +71,21 @@ export const run_gen = async (
 
 			// Format the files if needed.
 			const files = format_file
-				? await Promise.all(
-						gen_result.files.map(async (file) => {
+				? await map_concurrent(
+						gen_result.files,
+						async (file) => {
 							if (!file.format) return file;
 							try {
 								return {...file, content: await format_file(file.content, {filepath: file.id})};
-							} catch (err) {
+							} catch (error) {
 								log.error(
 									st('red', `Error formatting ${print_path(file.id)} via ${print_path(id)}`),
-									print_error(err),
+									print_error(error),
 								);
 								return file;
 							}
-						}),
+						},
+						10,
 					)
 				: gen_result.files;
 
@@ -92,7 +96,8 @@ export const run_gen = async (
 				files,
 				elapsed: timing_for_module(),
 			};
-		}),
+		},
+		10,
 	);
 	return {
 		results,

package/src/lib/run_task.ts

@@ -63,19 +63,19 @@ export const run_task = async (
 			invoke_task: (invoked_task_name, invoked_args, invoked_config) =>
 				invoke_task(invoked_task_name, invoked_args, invoked_config ?? config, filer, timings, log),
 		});
-	} catch (err) {
+	} catch (error) {
 		return {
 			ok: false,
 			reason: st(
 				'red',
-				err?.constructor?.name === 'TaskError'
-					? (err.message as string)
+				error?.constructor?.name === 'TaskError'
+					? (error.message as string)
 					: `Unexpected error running task ${st(
 							'cyan',
 							task_meta.name,
 						)}. If this is unexpected try running \`${config.pm_cli} install\` and \`gro clean\`.`,
 			),
-			error: err,
+			error,
 		};
 	}
 	return {ok: true, output};

package/src/lib/source_json.ts

@@ -1,6 +1,6 @@
 import {join} from 'node:path';
 import {ensure_end, strip_start} from '@ryanatkn/belt/string.js';
-import {existsSync} from 'node:fs';
+import {fs_exists, fs_search} from '@ryanatkn/belt/fs.js';
 import ts from 'typescript';
 import type {PackageJson, PackageJsonExports} from '@ryanatkn/belt/package_json.js';
 import {SourceJson, type ModuleJson, type DeclarationKind} from '@ryanatkn/belt/source_json.js';
@@ -9,19 +9,20 @@ import type {Logger} from '@ryanatkn/belt/log.js';
 import {paths, replace_extension} from './paths.ts';
 import {parse_exports} from './parse_exports.ts';
 import {TS_MATCHER, SVELTE_MATCHER, JSON_MATCHER, CSS_MATCHER} from './constants.ts';
-import {search_fs} from './search_fs.ts';
 
-export type SourceJsonMapper = (source_json: SourceJson) => SourceJson | null | Promise<SourceJson | null>;
+export type SourceJsonMapper = (
+	source_json: SourceJson,
+) => SourceJson | null | Promise<SourceJson | null>;
 
-export const source_json_create = (
+export const source_json_create = async (
 	package_json: PackageJson,
 	lib_path?: string,
 	log?: Logger,
-): SourceJson =>
+): Promise<SourceJson> =>
 	SourceJson.parse({
 		name: package_json.name,
 		version: package_json.version,
-		modules: source_modules_create(package_json.exports, lib_path, log),
+		modules: await source_modules_create(package_json.exports, lib_path, log),
 	});
 
 export const source_json_serialize = (source_json: SourceJson): string => {
@@ -29,14 +30,14 @@ export const source_json_serialize = (source_json: SourceJson): string => {
 	return JSON.stringify(parsed, null, 2) + '\n';
 };
 
-export const source_modules_create = (
+export const source_modules_create = async (
 	exports: PackageJsonExports | undefined,
 	lib_path = paths.lib,
 	log?: Logger,
-): Array<ModuleJson> | undefined => {
+): Promise<Array<ModuleJson> | undefined> => {
 	if (!exports) return;
 
-	const file_paths = collect_file_paths(exports, lib_path);
+	const file_paths = await collect_file_paths(exports, lib_path);
 
 	// Create a TypeScript program for all TypeScript files
 	const ts_files = file_paths
@@ -83,15 +84,15 @@ export const source_modules_create = (
 	return result;
 };
 
-const collect_file_paths = (
+const collect_file_paths = async (
 	exports: PackageJsonExports,
 	lib_path: string,
-): Array<{export_key: string; file_path: string}> => {
+): Promise<Array<{export_key: string; file_path: string}>> => {
 	const file_paths: Array<{export_key: string; file_path: string}> = [];
 
 	// Handle string exports (single default export)
 	if (typeof exports === 'string') {
-		const source_file = infer_source_from_export(exports, lib_path);
+		const source_file = await infer_source_from_export(exports, lib_path);
 		if (source_file) {
 			file_paths.push({export_key: '.', file_path: source_file});
 		} else {
@@ -110,7 +111,8 @@ const collect_file_paths = (
 		// Check if this is a pattern export
 		if (k.includes('*')) {
 			// Handle pattern exports by finding matching files in lib
-			const matching_files = search_fs(lib_path, {
+			// eslint-disable-next-line no-await-in-loop
+			const matching_files = await fs_search(lib_path, {
 				file_filter: (path) => {
 					const p = path.replace(ensure_end(lib_path, '/'), '');
 					// Only match files in the root directory (no subdirectories)
@@ -142,7 +144,8 @@ const collect_file_paths = (
 			}
 		} else {
 			// Handle explicit exports (non-patterns)
-			const source_file = infer_source_from_export(k, lib_path);
+			// eslint-disable-next-line no-await-in-loop
+			const source_file = await infer_source_from_export(k, lib_path);
 			if (source_file) {
 				file_paths.push({export_key: k, file_path: source_file});
 			} else {
@@ -156,13 +159,16 @@ const collect_file_paths = (
 	return file_paths;
 };
 
-const infer_source_from_export = (export_path: string, lib_path: string): string | null => {
+const infer_source_from_export = async (
+	export_path: string,
+	lib_path: string,
+): Promise<string | null> => {
 	// Handle index specially
 	if (export_path === '.' || export_path === './') {
 		const index_ts = join(lib_path, 'index.ts');
-		if (existsSync(index_ts)) return index_ts;
+		if (await fs_exists(index_ts)) return index_ts;
 		const index_js = join(lib_path, 'index.js');
-		if (existsSync(index_js)) return index_js;
+		if (await fs_exists(index_js)) return index_js;
 		return null;
 	}
 
@@ -171,12 +177,12 @@ const infer_source_from_export = (export_path: string, lib_path: string): string
 	// For .js exports, try .ts first
 	if (clean_path.endsWith('.js')) {
 		const ts_path = join(lib_path, replace_extension(clean_path, '.ts'));
-		if (existsSync(ts_path)) return ts_path;
+		if (await fs_exists(ts_path)) return ts_path;
 	}
 
 	// Try the exact path
 	const exact_path = join(lib_path, clean_path);
-	if (existsSync(exact_path)) return exact_path;
+	if (await fs_exists(exact_path)) return exact_path;
 
 	return null;
 };

package/src/lib/sveltekit_helpers.ts

@@ -73,7 +73,7 @@ export const sveltekit_sync_if_available = async (
 	sveltekit_cli: string | Cli = SVELTEKIT_CLI,
 ): Promise<void> => {
 	const found_sveltekit_cli =
-		typeof sveltekit_cli === 'string' ? find_cli(sveltekit_cli) : sveltekit_cli;
+		typeof sveltekit_cli === 'string' ? await find_cli(sveltekit_cli) : sveltekit_cli;
 	if (found_sveltekit_cli) {
 		return sveltekit_sync(found_sveltekit_cli);
 	}
@@ -89,7 +89,7 @@ export const sveltekit_sync_if_obviously_needed = async (
 		return;
 	}
 	const found_sveltekit_cli =
-		typeof sveltekit_cli === 'string' ? find_cli(sveltekit_cli) : sveltekit_cli;
+		typeof sveltekit_cli === 'string' ? await find_cli(sveltekit_cli) : sveltekit_cli;
 	if (!found_sveltekit_cli) {
 		return;
 	}
@@ -160,7 +160,7 @@ export const run_svelte_package = async (
 		);
 	}
 	const cli_name = typeof cli === 'string' ? cli : cli.name;
-	const found_svelte_package_cli = cli === cli_name ? find_cli(cli) : (cli as Cli);
+	const found_svelte_package_cli = cli === cli_name ? await find_cli(cli) : (cli as Cli);
 	if (found_svelte_package_cli?.kind !== 'local') {
 		throw new TaskError(
 			`Failed to find SvelteKit packaging CLI \`${cli_name}\`, do you need to run \`${pm_cli} install\`?`,

package/src/lib/task.ts

@@ -6,6 +6,7 @@ import {styleText as st} from 'node:util';
 import type {Result} from '@ryanatkn/belt/result.js';
 import {isAbsolute, join, relative} from 'node:path';
 import type {PathId} from '@ryanatkn/belt/path.js';
+import {fs_search} from '@ryanatkn/belt/fs.js';
 
 import type {Args} from './args.ts';
 import type {GroConfig} from './gro_config.ts';
@@ -18,7 +19,6 @@ import {
 	type ResolvedInputPath,
 } from './input_path.ts';
 import {GRO_DIST_DIR, print_path} from './paths.ts';
-import {search_fs} from './search_fs.ts';
 import {load_modules, type LoadModulesFailure, type ModuleMeta} from './modules.ts';
 import type {Filer} from './filer.ts';
 
@@ -126,15 +126,15 @@ export type FindModulesFailure =
 /**
  * Finds modules from input paths. (see `src/lib/input_path.ts` for more)
  */
-export const find_tasks = (
+export const find_tasks = async (
 	input_paths: Array<InputPath>,
 	task_root_dirs: Array<PathId>,
 	config: GroConfig,
 	timings?: Timings,
-): FindTasksResult => {
+): Promise<FindTasksResult> => {
 	// Check which extension variation works - if it's a directory, prefer others first!
 	const timing_to_resolve_input_paths = timings?.start('resolve input paths');
-	const {resolved_input_paths, unmapped_input_paths} = resolve_input_paths(
+	const {resolved_input_paths, unmapped_input_paths} = await resolve_input_paths(
 		input_paths,
 		task_root_dirs,
 		TASK_FILE_SUFFIXES,
@@ -159,11 +159,13 @@ export const find_tasks = (
 	// Find all of the files for any directories.
 	const timing_to_resolve_input_files = timings?.start('resolve input files');
 	const {resolved_input_files, resolved_input_files_by_root_dir, input_directories_with_no_files} =
-		resolve_input_files(resolved_input_paths, (id) =>
-			search_fs(id, {
-				filter: config.search_filters,
-				file_filter: (p) => TASK_FILE_SUFFIXES.some((s) => p.endsWith(s)),
-			}),
+		await resolve_input_files(
+			resolved_input_paths,
+			async (id) =>
+				await fs_search(id, {
+					filter: config.search_filters,
+					file_filter: (p) => TASK_FILE_SUFFIXES.some((s) => p.endsWith(s)),
+				}),
 		);
 	timing_to_resolve_input_files?.();
 

package/src/lib/test.task.ts

@@ -3,7 +3,7 @@ import {spawn_cli} from '@ryanatkn/gro/cli.js';
 
 import {TaskError, type Task} from './task.ts';
 import {find_cli} from './cli.ts';
-import {has_dep} from './package_json.ts';
+import {has_dep, load_package_json} from './package_json.ts';
 import {serialize_args, to_implicit_forwarded_args} from './args.ts';
 import {VITEST_CLI} from './constants.ts';
 import {paths} from './paths.ts';
@@ -30,11 +30,12 @@ export const task: Task<Args> = {
 	run: async ({args}): Promise<void> => {
 		const {_: patterns, dir, fail_without_tests, t} = args;
 
-		if (!has_dep(VITEST_CLI)) {
+		const package_json = await load_package_json();
+		if (!has_dep(VITEST_CLI, package_json)) {
 			throw new TaskError('no test runner found, install vitest');
 		}
 
-		if (!find_cli(VITEST_CLI)) {
+		if (!(await find_cli(VITEST_CLI))) {
 			throw new TaskError('vitest is a dependency but not installed; run `npm i`?');
 		}
 

package/src/lib/typecheck.task.ts

@@ -37,10 +37,10 @@ export const task: Task<Args> = {
 		await sveltekit_sync_if_available();
 
 		// Prefer svelte-check if available.
-		const found_svelte_check_cli = find_cli(svelte_check_cli);
+		const found_svelte_check_cli = await find_cli(svelte_check_cli);
 		if (found_svelte_check_cli) {
 			const serialized = serialize_args(to_forwarded_args(svelte_check_cli));
-			const spawned = spawn_cli_process(found_svelte_check_cli, serialized, undefined, {
+			const spawned = await spawn_cli_process(found_svelte_check_cli, serialized, undefined, {
 				stdio: ['inherit', 'pipe', 'pipe'],
 				env: {...process.env, FORCE_COLOR: '1'}, // Needed for colors (maybe make an option)
 			});
@@ -61,7 +61,7 @@ export const task: Task<Args> = {
 		}
 
 		// Fall back to tsc.
-		const found_typescript_cli = find_cli(typescript_cli);
+		const found_typescript_cli = await find_cli(typescript_cli);
 		if (found_typescript_cli) {
 			const forwarded = to_forwarded_args(typescript_cli);
 			if (!forwarded.noEmit) forwarded.noEmit = true;

package/src/lib/upgrade.task.ts

@@ -1,6 +1,6 @@
 import {spawn} from '@ryanatkn/belt/process.js';
 import {z} from 'zod';
-import {rmSync} from 'node:fs';
+import {rm} from 'node:fs/promises';
 import {GitOrigin, git_pull} from '@ryanatkn/belt/git.js';
 
 import {TaskError, type Task} from './task.ts';
@@ -75,15 +75,15 @@ export const task: Task<Args> = {
 
 		if (delete_node_modules) {
 			log.info(`deleting node_modules at `, node_modules_path);
-			rmSync(node_modules_path, {recursive: true, force: true});
+			await rm(node_modules_path, {recursive: true, force: true});
 		}
 
 		if (delete_lockfile) {
 			log.info(`deleting lockfile at`, lockfile_path);
-			rmSync(lockfile_path, {force: true});
+			await rm(lockfile_path, {force: true});
 		}
 
-		const package_json = load_package_json();
+		const package_json = await load_package_json();
 
 		const all_deps = extract_deps(package_json);
 

package/dist/search_fs.d.ts

@@ -1,26 +0,0 @@
-import type { FileFilter, ResolvedPath, PathFilter } from '@ryanatkn/belt/path.js';
-export interface SearchFsOptions {
-    /**
-     * One or more filter functions, any of which can short-circuit the search by returning `false`.
-     */
-    filter?: PathFilter | Array<PathFilter>;
-    /**
-     * One or more file filter functions. Every filter must pass for a file to be included.
-     */
-    file_filter?: FileFilter | Array<FileFilter>;
-    /**
-     * Pass `null` or `false` to speed things up at the cost of volatile ordering.
-     */
-    sort?: boolean | null | ((a: ResolvedPath, b: ResolvedPath) => number);
-    /**
-     * Set to `true` to include directories. Defaults to `false`.
-     */
-    include_directories?: boolean;
-    /**
-     * Sets the cwd for `dir` unless it's an absolute path or `null`.
-     */
-    cwd?: string | null;
-}
-export declare const search_fs: (dir: string, options?: SearchFsOptions) => Array<ResolvedPath>;
-export declare const find_first_existing_file: (paths: Array<string>) => string | null;
-//# sourceMappingURL=search_fs.d.ts.map

package/dist/search_fs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"search_fs.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/search_fs.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,UAAU,EAAE,YAAY,EAAE,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAEjF,MAAM,WAAW,eAAe;IAC/B;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;IACxC;;OAEG;IACH,WAAW,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;IAC7C;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,KAAK,MAAM,CAAC,CAAC;IACvE;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,eAAO,MAAM,SAAS,GACrB,KAAK,MAAM,EACX,UAAS,eAA8B,KACrC,KAAK,CAAC,YAAY,CAwBpB,CAAC;AAmCF,eAAO,MAAM,wBAAwB,GAAI,OAAO,KAAK,CAAC,MAAM,CAAC,KAAG,MAAM,GAAG,IAOxE,CAAC"}

package/dist/search_fs.js

@@ -1,52 +0,0 @@
-import { EMPTY_OBJECT } from '@ryanatkn/belt/object.js';
-import { to_array } from '@ryanatkn/belt/array.js';
-import { ensure_end } from '@ryanatkn/belt/string.js';
-import { isAbsolute, join } from 'node:path';
-import { existsSync, readdirSync } from 'node:fs';
-export const search_fs = (dir, options = EMPTY_OBJECT) => {
-    const { filter, file_filter, sort = default_sort, include_directories = false, cwd = process.cwd(), } = options;
-    const final_dir = ensure_end(cwd && !isAbsolute(dir) ? join(cwd, dir) : dir, '/');
-    const filters = !filter || (Array.isArray(filter) && !filter.length) ? undefined : to_array(filter);
-    const file_filters = !file_filter || (Array.isArray(file_filter) && !file_filter.length)
-        ? undefined
-        : to_array(file_filter);
-    if (!existsSync(final_dir))
-        return [];
-    const paths = [];
-    crawl(final_dir, paths, filters, file_filters, include_directories, null);
-    return sort ? paths.sort(typeof sort === 'boolean' ? default_sort : sort) : paths;
-};
-const default_sort = (a, b) => a.path.localeCompare(b.path);
-const crawl = (dir, paths, filters, file_filter, include_directories, base_dir) => {
-    // This sync version is significantly faster than using the `fs/promises` version -
-    // it doesn't parallelize but that's not the common case in Gro.
-    const dirents = readdirSync(dir, { withFileTypes: true });
-    for (const dirent of dirents) {
-        const { name, parentPath } = dirent;
-        const is_directory = dirent.isDirectory();
-        const id = parentPath + name;
-        const include = !filters || filters.every((f) => f(id, is_directory));
-        if (!include)
-            continue;
-        const path = base_dir === null ? name : base_dir + '/' + name;
-        if (is_directory) {
-            const dir_id = id + '/';
-            if (include_directories) {
-                paths.push({ path, id: dir_id, is_directory: true });
-            }
-            crawl(dir_id, paths, filters, file_filter, include_directories, path);
-        }
-        else if (!file_filter || file_filter.every((f) => f(id))) {
-            paths.push({ path, id, is_directory: false });
-        }
-    }
-    return paths;
-};
-export const find_first_existing_file = (paths) => {
-    for (const path of paths) {
-        if (existsSync(path)) {
-            return path;
-        }
-    }
-    return null;
-};

package/src/lib/search_fs.ts

@@ -1,100 +0,0 @@
-import {EMPTY_OBJECT} from '@ryanatkn/belt/object.js';
-import {to_array} from '@ryanatkn/belt/array.js';
-import {ensure_end} from '@ryanatkn/belt/string.js';
-import {isAbsolute, join} from 'node:path';
-import {existsSync, readdirSync} from 'node:fs';
-import type {FileFilter, ResolvedPath, PathFilter} from '@ryanatkn/belt/path.js';
-
-export interface SearchFsOptions {
-	/**
-	 * One or more filter functions, any of which can short-circuit the search by returning `false`.
-	 */
-	filter?: PathFilter | Array<PathFilter>;
-	/**
-	 * One or more file filter functions. Every filter must pass for a file to be included.
-	 */
-	file_filter?: FileFilter | Array<FileFilter>;
-	/**
-	 * Pass `null` or `false` to speed things up at the cost of volatile ordering.
-	 */
-	sort?: boolean | null | ((a: ResolvedPath, b: ResolvedPath) => number);
-	/**
-	 * Set to `true` to include directories. Defaults to `false`.
-	 */
-	include_directories?: boolean;
-	/**
-	 * Sets the cwd for `dir` unless it's an absolute path or `null`.
-	 */
-	cwd?: string | null;
-}
-
-export const search_fs = (
-	dir: string,
-	options: SearchFsOptions = EMPTY_OBJECT,
-): Array<ResolvedPath> => {
-	const {
-		filter,
-		file_filter,
-		sort = default_sort,
-		include_directories = false,
-		cwd = process.cwd(),
-	} = options;
-
-	const final_dir = ensure_end(cwd && !isAbsolute(dir) ? join(cwd, dir) : dir, '/');
-
-	const filters =
-		!filter || (Array.isArray(filter) && !filter.length) ? undefined : to_array(filter);
-	const file_filters =
-		!file_filter || (Array.isArray(file_filter) && !file_filter.length)
-			? undefined
-			: to_array(file_filter);
-
-	if (!existsSync(final_dir)) return [];
-
-	const paths: Array<ResolvedPath> = [];
-	crawl(final_dir, paths, filters, file_filters, include_directories, null);
-
-	return sort ? paths.sort(typeof sort === 'boolean' ? default_sort : sort) : paths;
-};
-
-const default_sort = (a: ResolvedPath, b: ResolvedPath): number => a.path.localeCompare(b.path);
-
-const crawl = (
-	dir: string,
-	paths: Array<ResolvedPath>,
-	filters: Array<PathFilter> | undefined,
-	file_filter: Array<FileFilter> | undefined,
-	include_directories: boolean,
-	base_dir: string | null,
-): Array<ResolvedPath> => {
-	// This sync version is significantly faster than using the `fs/promises` version -
-	// it doesn't parallelize but that's not the common case in Gro.
-	const dirents = readdirSync(dir, {withFileTypes: true});
-	for (const dirent of dirents) {
-		const {name, parentPath} = dirent;
-		const is_directory = dirent.isDirectory();
-		const id = parentPath + name;
-		const include = !filters || filters.every((f) => f(id, is_directory));
-		if (!include) continue;
-		const path = base_dir === null ? name : base_dir + '/' + name;
-		if (is_directory) {
-			const dir_id = id + '/';
-			if (include_directories) {
-				paths.push({path, id: dir_id, is_directory: true});
-			}
-			crawl(dir_id, paths, filters, file_filter, include_directories, path);
-		} else if (!file_filter || file_filter.every((f) => f(id))) {
-			paths.push({path, id, is_directory: false});
-		}
-	}
-	return paths;
-};
-
-export const find_first_existing_file = (paths: Array<string>): string | null => {
-	for (const path of paths) {
-		if (existsSync(path)) {
-			return path;
-		}
-	}
-	return null;
-};