@ryanatkn/gro 0.120.1 → 0.121.0

package/dist/config.js

@@ -20,7 +20,7 @@ export const create_empty_config = () => ({
  * Customize via `search_filters` in the `Gro_Config`.
  * See the test cases for the exact behavior.
  */
-export const DEFAULT_SEARCH_EXCLUDER = new RegExp(`((^|/)\\.[^/]+|/?${NODE_MODULES_DIRNAME}|(^|/)${SVELTEKIT_BUILD_DIRNAME}|(?<!(^|/)gro/)${SVELTEKIT_DIST_DIRNAME}|(^|/)${SERVER_DIST_PATH})($|/)`, 'u');
+export const DEFAULT_SEARCH_EXCLUDER = new RegExp(`(${['\\.[^/]+', NODE_MODULES_DIRNAME, SVELTEKIT_BUILD_DIRNAME, `(?<!(^|/)gro/)${SVELTEKIT_DIST_DIRNAME}`, SERVER_DIST_PATH].map((p) => '(^|/)' + p).join('|')})($|/)`, 'u');
 const default_map_package_json = async (package_json) => {
     if (package_json.exports) {
         package_json.exports = Object.fromEntries(Object.entries(package_json.exports).filter(([k]) => !DEFAULT_EXPORTS_EXCLUDER.test(k)));

package/dist/config.test.js

@@ -6,52 +6,56 @@ test('load_config', async () => {
     assert.ok(config);
 });
 test('DEFAULT_SEARCH_EXCLUDER', () => {
-    const assert_excludes = (dirname) => {
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`a/${dirname}/c`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`a/${dirname}/c/d.js`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`a/${dirname}/`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`a/${dirname}`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`/a/${dirname}/c`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`/a/${dirname}/c/d.js`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`/a/${dirname}/`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`/a/${dirname}`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`/${dirname}/a`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`/${dirname}/a/b.js`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`/${dirname}/`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`/${dirname}`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`./${dirname}/a`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`./${dirname}/a/b.js`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`./${dirname}/`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`./${dirname}`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`${dirname}/a`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`${dirname}/a/b.js`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`${dirname}/`), 'should exclude: ' + dirname);
-        assert.ok(DEFAULT_SEARCH_EXCLUDER.test(`${dirname}`), 'should exclude: ' + dirname);
+    const assert_includes = (path, exclude) => {
+        const m = `should ${exclude ? 'exclude' : 'include '}: ${path}`;
+        const b = (v) => (exclude ? !v : v);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`a/${path}/c`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`a/${path}/c/d.js`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`a/${path}/c/d.e.js`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`a/${path}/`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`a/${path}`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`/a/${path}/c`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`/a/${path}/c/d.js`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`/a/${path}/c/d.e.js`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`/a/${path}/`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`/a/${path}`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`/${path}/a`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`/${path}/a/b.js`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`/${path}/a/b.e.js`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`/${path}/`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`/${path}`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`./${path}/a`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`./${path}/a/b.js`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`./${path}/a/b.c.js`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`./${path}/`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`./${path}`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`${path}/a`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`${path}/a/b.js`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`${path}/a/b.c.js`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(`${path}/`)), m);
+        assert.ok(b(DEFAULT_SEARCH_EXCLUDER.test(path)), m);
     };
-    assert_excludes('node_modules');
-    assert_excludes('dist');
-    assert_excludes('build');
-    assert_excludes('.git');
-    assert_excludes('.gro');
-    assert_excludes('.svelte-kit');
-    assert.ok(!DEFAULT_SEARCH_EXCLUDER.test('nodemodules'));
-    assert.ok(!DEFAULT_SEARCH_EXCLUDER.test('a/b/c'));
-    assert.ok(!DEFAULT_SEARCH_EXCLUDER.test('/a/b/c'));
-    assert.ok(!DEFAULT_SEARCH_EXCLUDER.test('/a/b/c.js'));
-    assert.ok(!DEFAULT_SEARCH_EXCLUDER.test('/a/b/c.d.js'));
-    assert.ok(!DEFAULT_SEARCH_EXCLUDER.test('./a/b/c'));
-    assert.ok(!DEFAULT_SEARCH_EXCLUDER.test('./a/b/c.d.js'));
-    // Special exception for `gro/dist/`:
-    assert.ok(DEFAULT_SEARCH_EXCLUDER.test('/home/not_gro/dist/a.task.js'));
-    assert.ok(DEFAULT_SEARCH_EXCLUDER.test('/home/grodist/a.task.js'));
-    assert.ok(DEFAULT_SEARCH_EXCLUDER.test('not_gro/dist/a.task.js'));
-    assert.ok(DEFAULT_SEARCH_EXCLUDER.test('not_dist/a.task.js'));
-    assert.ok(DEFAULT_SEARCH_EXCLUDER.test('grodist/a.task.js'));
-    assert.ok(!DEFAULT_SEARCH_EXCLUDER.test('/home/gro/dist/a.task.js'));
-    assert.ok(!DEFAULT_SEARCH_EXCLUDER.test('gro/dist/a.task.js'));
-    assert.ok(!DEFAULT_SEARCH_EXCLUDER.test('./gro/dist/a.task.js'));
-    // But not `gro/build/` and others because they're not usecases:
-    assert.ok(DEFAULT_SEARCH_EXCLUDER.test('/home/gro/build/a.task.js'));
-    assert.ok(DEFAULT_SEARCH_EXCLUDER.test('/home/gro/node_modules/a.task.js'));
+    assert_includes('node_modules', false);
+    assert_includes('dist', false);
+    assert_includes('build', false);
+    assert_includes('.git', false);
+    assert_includes('.gro', false);
+    assert_includes('.svelte-kit', false);
+    assert_includes('a', true);
+    assert_includes('nodemodules', true);
+    // Special exception for `gro/dist/`, but not `gro/build/` etc because they're not usecases.
+    assert_includes('gro/build', false);
+    assert_includes('gro/buildE', true);
+    assert_includes('groE/build', false);
+    assert_includes('gro/dist', true);
+    assert_includes('gro/distE', true);
+    assert_includes('groE/dist', false);
+    assert_includes('Egro/dist', false);
+    assert_includes('Ebuild', true);
+    assert_includes('buildE', true);
+    assert_includes('grobuild', true);
+    assert_includes('distE', true);
+    assert_includes('Edist', true);
+    assert_includes('grodist', true);
 });
 test.run();

package/dist/docs/README.gen.md.js

@@ -22,7 +22,7 @@ export const gen = async ({ origin_id }) => {
     const output_file_name = to_output_file_name(origin_base);
     // TODO this is GitHub-specific
     const root_link = `[${root_path}](/../..)`;
-    const doc_files = await search_fs(origin_dir);
+    const doc_files = search_fs(origin_dir);
     const doc_paths = [];
     for (const { path } of doc_files) {
         if (path === output_file_name || !path.endsWith('.md')) {

package/dist/docs/tasks.gen.md.js

@@ -15,7 +15,7 @@ import { find_tasks, load_tasks, Task_Error } from '../task.js';
 // TODO needs some cleanup and better APIs - paths are confusing and verbose!
 // TODO add backlinks to every document that links to this one
 export const gen = async ({ origin_id, log, config }) => {
-    const found = await find_tasks(['.'], [paths.lib], config);
+    const found = find_tasks(['.'], [paths.lib], config);
     if (!found.ok) {
         log_error_reasons(log, found.reasons);
         throw new Task_Error(`Failed to generate task docs: ${found.type}`);

package/dist/gen.js

@@ -136,7 +136,7 @@ export const find_genfiles = async (input_paths, root_dirs, config, timings) =>
     const extensions = [GEN_FILE_PATTERN];
     // 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, resolved_input_paths_by_input_path, unmapped_input_paths } = await resolve_input_paths(input_paths, root_dirs, extensions);
+    const { resolved_input_paths, resolved_input_paths_by_input_path, unmapped_input_paths } = resolve_input_paths(input_paths, root_dirs, extensions);
     timing_to_resolve_input_paths?.();
     // Error if any input path could not be mapped.
     if (unmapped_input_paths.length) {
@@ -151,7 +151,7 @@ export const find_genfiles = async (input_paths, root_dirs, config, timings) =>
     }
     // Find all of the files for any directories.
     const timing_to_search_fs = timings?.start('find files');
-    const { resolved_input_files, resolved_input_files_by_input_path, resolved_input_files_by_root_dir, input_directories_with_no_files, } = await resolve_input_files(resolved_input_paths, (id, options) => search_fs(id, {
+    const { resolved_input_files, resolved_input_files_by_input_path, resolved_input_files_by_root_dir, input_directories_with_no_files, } = resolve_input_files(resolved_input_paths, (id, options) => search_fs(id, {
         ...options,
         filter: config.search_filters,
         file_filter: (p) => extensions.some((e) => p.includes(e)),

package/dist/input_path.d.ts

@@ -51,7 +51,7 @@ export interface Resolved_Input_Paths {
  * and stopping at the first existing file or falling back to the first existing directory.
  * If none is found for an input path, it's added to `unmapped_input_paths`.
  */
-export declare const resolve_input_paths: (input_paths: Input_Path[], root_dirs: Path_Id[], extensions: string[]) => Promise<Resolved_Input_Paths>;
+export declare const resolve_input_paths: (input_paths: Input_Path[], root_dirs: Path_Id[], extensions: string[]) => Resolved_Input_Paths;
 export interface Resolved_Input_Files {
     resolved_input_files: Resolved_Input_File[];
     resolved_input_files_by_input_path: Map<Input_Path, Resolved_Input_File[]>;
@@ -62,4 +62,4 @@ export interface Resolved_Input_Files {
  * Finds all of the matching files for the given input paths.
  * De-dupes source ids.
  */
-export declare const resolve_input_files: (resolved_input_paths: Resolved_Input_Path[], custom_search_fs?: (dir: string, options?: import("./search_fs.js").Search_Fs_Options) => Promise<import("./path.js").Resolved_Path[]>) => Promise<Resolved_Input_Files>;
+export declare const resolve_input_files: (resolved_input_paths: Resolved_Input_Path[], custom_search_fs?: (dir: string, options?: import("./search_fs.js").Search_Fs_Options) => import("./path.js").Resolved_Path[]) => Resolved_Input_Files;

package/dist/input_path.js

@@ -75,7 +75,7 @@ export const get_possible_paths = (input_path, root_dirs, extensions) => {
  * and stopping at the first existing file or falling back to the first existing directory.
  * If none is found for an input path, it's added to `unmapped_input_paths`.
  */
-export const resolve_input_paths = async (input_paths, root_dirs, extensions) => {
+export const resolve_input_paths = (input_paths, root_dirs, extensions) => {
     const resolved_input_paths = [];
     const possible_paths_by_input_path = new Map();
     const unmapped_input_paths = [];
@@ -139,7 +139,7 @@ export const resolve_input_paths = async (input_paths, root_dirs, extensions) =>
  * Finds all of the matching files for the given input paths.
  * De-dupes source ids.
  */
-export const resolve_input_files = async (resolved_input_paths, custom_search_fs = search_fs) => {
+export const resolve_input_files = (resolved_input_paths, custom_search_fs = search_fs) => {
     const resolved_input_files = [];
     const resolved_input_files_by_input_path = new Map();
     const input_directories_with_no_files = [];
@@ -148,7 +148,7 @@ export const resolve_input_files = async (resolved_input_paths, custom_search_fs
     for (const resolved_input_path of resolved_input_paths) {
         const { input_path, id, is_directory } = resolved_input_path;
         if (is_directory) {
-            const files = await custom_search_fs(id, { include_directories: true }); // eslint-disable-line no-await-in-loop
+            const files = custom_search_fs(id, { include_directories: true });
             if (files.length) {
                 const path_ids = [];
                 let has_files = false;

package/dist/input_path.test.js

@@ -148,7 +148,7 @@ test('resolve_input_files', async () => {
         input_path: 'fake/nomatches',
         root_dir: process.cwd(),
     };
-    const result = await resolve_input_files([a, b, c, d, e, f], async (id) => test_files[id]);
+    const result = resolve_input_files([a, b, c, d, e, f], (id) => test_files[id]);
     const resolved_input_files = [
         { id: a.id, input_path: a.input_path, resolved_input_path: a },
         { id: b.id, input_path: b.input_path, resolved_input_path: b },

package/dist/invoke_task.js

@@ -45,7 +45,7 @@ export const invoke_task = async (task_name, args, config, timings = new Timings
     const { task_root_dirs } = config;
     // Find the task or directory specified by the `input_path`.
     // Fall back to searching the Gro directory as well.
-    const found = await find_tasks([input_path], task_root_dirs, config);
+    const found = find_tasks([input_path], task_root_dirs, config);
     if (!found.ok) {
         log_error_reasons(log, found.reasons);
         process.exit(1);

package/dist/package.js

@@ -1,7 +1,7 @@
 // generated by src/lib/package.gen.ts
 export const package_json = {
     name: '@ryanatkn/gro',
-    version: '0.120.1',
+    version: '0.121.0',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     icon: '🌰',
@@ -256,7 +256,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.120.1',
+    version: '0.121.0',
     modules: {
         '.': {
             path: 'index.ts',

package/dist/package_json.js

@@ -109,7 +109,7 @@ export const load_package_json = async (dir = IS_THIS_GRO ? gro_paths.root : pat
     return package_json;
 };
 export const sync_package_json = async (map_package_json, log, check = false, dir = paths.root, exports_dir = paths.lib) => {
-    const exported_files = await search_fs(exports_dir);
+    const exported_files = search_fs(exports_dir);
     const exported_paths = exported_files.map((f) => f.path);
     const updated = await update_package_json(dir, async (package_json) => {
         if ((await has_sveltekit_library(package_json)).ok) {

package/dist/resolve.task.js

@@ -16,7 +16,7 @@ export const task = {
         log.info('input paths:', input_paths);
         const { task_root_dirs } = config;
         log.info('task root paths:', task_root_dirs);
-        const { resolved_input_paths, possible_paths_by_input_path, unmapped_input_paths } = await resolve_input_paths(input_paths, task_root_dirs, TASK_FILE_SUFFIXES);
+        const { resolved_input_paths, possible_paths_by_input_path, unmapped_input_paths } = resolve_input_paths(input_paths, task_root_dirs, TASK_FILE_SUFFIXES);
         log.info('resolved_input_paths:', resolved_input_paths);
         log.info('possible_paths_by_input_path:', possible_paths_by_input_path);
         log.info('unmapped_input_paths:', unmapped_input_paths);

package/dist/search_fs.d.ts

@@ -7,7 +7,7 @@ export interface Search_Fs_Options {
     /**
      * An array of file suffixes to include.
      */
-    file_filter?: File_Filter | File_Filter[];
+    file_filter?: File_Filter | File_Filter[] | null;
     /**
      * Pass `null` or `false` to speed things up at the cost of volatile ordering.
      */
@@ -21,4 +21,4 @@ export interface Search_Fs_Options {
      */
     cwd?: string | null;
 }
-export declare const search_fs: (dir: string, options?: Search_Fs_Options) => Promise<Resolved_Path[]>;
+export declare const search_fs: (dir: string, options?: Search_Fs_Options) => Resolved_Path[];

package/dist/search_fs.js

@@ -3,7 +3,7 @@ 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 = async (dir, options = EMPTY_OBJECT) => {
+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);

package/dist/search_fs.test.js

@@ -2,10 +2,10 @@ import { test } from 'uvu';
 import * as assert from 'uvu/assert';
 import { resolve } from 'node:path';
 import { search_fs } from './search_fs.js';
-test('search_fs basic behavior', async () => {
+test('search_fs basic behavior', () => {
     const ignored_path = 'test1.foo.ts';
     let has_ignored_path = false;
-    const result = await search_fs('./src/fixtures', {
+    const result = search_fs('./src/fixtures', {
         filter: (path) => {
             if (!has_ignored_path)
                 has_ignored_path = path.endsWith(ignored_path);

package/dist/task.d.ts

@@ -74,7 +74,7 @@ export type Find_Modules_Failure = {
 /**
  * Finds modules from input paths. (see `src/lib/input_path.ts` for more)
  */
-export declare const find_tasks: (input_paths: Input_Path[], task_root_dirs: Path_Id[], config: Gro_Config, timings?: any) => Promise<Find_Tasks_Result>;
+export declare const find_tasks: (input_paths: Input_Path[], task_root_dirs: Path_Id[], config: Gro_Config, timings?: any) => Find_Tasks_Result;
 export interface Loaded_Tasks {
     modules: Task_Module_Meta[];
     found_tasks: Found_Tasks;

package/dist/task.js

@@ -27,10 +27,10 @@ export class Task_Error extends Error {
 /**
  * Finds modules from input paths. (see `src/lib/input_path.ts` for more)
  */
-export const find_tasks = async (input_paths, task_root_dirs, config, timings) => {
+export const find_tasks = (input_paths, task_root_dirs, config, timings) => {
     // 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, resolved_input_paths_by_input_path, unmapped_input_paths } = await resolve_input_paths(input_paths, task_root_dirs, TASK_FILE_SUFFIXES);
+    const { resolved_input_paths, resolved_input_paths_by_input_path, unmapped_input_paths } = resolve_input_paths(input_paths, task_root_dirs, TASK_FILE_SUFFIXES);
     timing_to_resolve_input_paths?.();
     // Error if any input path could not be mapped.
     if (unmapped_input_paths.length) {
@@ -47,7 +47,7 @@ export const find_tasks = async (input_paths, task_root_dirs, config, timings) =
     }
     // 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_input_path, resolved_input_files_by_root_dir, input_directories_with_no_files, } = await resolve_input_files(resolved_input_paths, (id, options) => search_fs(id, {
+    const { resolved_input_files, resolved_input_files_by_input_path, resolved_input_files_by_root_dir, input_directories_with_no_files, } = resolve_input_files(resolved_input_paths, (id, options) => search_fs(id, {
         ...options,
         filter: config.search_filters,
         file_filter: (p) => TASK_FILE_SUFFIXES.some((s) => p.endsWith(s)),

package/dist/task.test.js

@@ -28,7 +28,7 @@ test('validate_task_module basic behavior', () => {
     assert.ok(!validate_task_module({ task: { run: {} } }));
 });
 test('load_tasks basic behavior', async () => {
-    const found = await find_tasks([resolve('src/lib/test'), resolve('src/lib/test.task.ts')], [resolve('src/lib')], create_empty_config());
+    const found = find_tasks([resolve('src/lib/test'), resolve('src/lib/test.task.ts')], [resolve('src/lib')], create_empty_config());
     assert.ok(found.ok);
     const result = await load_tasks(found.value);
     assert.ok(result.ok);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.120.1",
+  "version": "0.121.0",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "icon": "🌰",