@ryanatkn/gro 0.121.0 → 0.121.1

package/dist/config.js

@@ -20,7 +20,17 @@ 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].map((p) => '(^|/)' + p).join('|')})($|/)`, 'u');
+export const DEFAULT_SEARCH_EXCLUDER = new RegExp(`(${[
+    '\\.[^/]+',
+    // TODO probably change to `pkg.name` instead of this catch-all
+    `${NODE_MODULES_DIRNAME}(?!/(@[^/]+/)?gro/${SVELTEKIT_DIST_DIRNAME})`,
+    // `${NODE_MODULES_DIRNAME}(?!/(@.+?/)?gro/${SVELTEKIT_DIST_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

@@ -48,6 +48,9 @@ test('DEFAULT_SEARCH_EXCLUDER', () => {
     assert_includes('gro/buildE', true);
     assert_includes('groE/build', false);
     assert_includes('gro/dist', true);
+    assert_includes('node_modules/gro/dist', true);
+    assert_includes('node_modules/@someuser/gro/dist', true);
+    assert_includes('node_modules/@someuser/foo/gro/dist', false);
     assert_includes('gro/distE', true);
     assert_includes('groE/dist', false);
     assert_includes('Egro/dist', false);

package/dist/gen.js

@@ -151,8 +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, } = resolve_input_files(resolved_input_paths, (id, options) => search_fs(id, {
-        ...options,
+    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) => search_fs(id, {
         filter: config.search_filters,
         file_filter: (p) => extensions.some((e) => p.includes(e)),
     }));

package/dist/input_path.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import type { Flavored } from '@ryanatkn/belt/types.js';
-import type { Path_Id } from './path.js';
+import type { Path_Id, Resolved_Path } from './path.js';
 export declare const Input_Path: z.ZodString;
 export type Input_Path = Flavored<z.infer<typeof Input_Path>, 'Input_Path'>;
 export declare const Raw_Input_Path: z.ZodString;
@@ -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) => import("./path.js").Resolved_Path[]) => Resolved_Input_Files;
+export declare const resolve_input_files: (resolved_input_paths: Resolved_Input_Path[], custom_search_fs?: (dir: string) => Resolved_Path[]) => Resolved_Input_Files;

package/dist/input_path.js

@@ -148,7 +148,7 @@ export const resolve_input_files = (resolved_input_paths, custom_search_fs = sea
     for (const resolved_input_path of resolved_input_paths) {
         const { input_path, id, is_directory } = resolved_input_path;
         if (is_directory) {
-            const files = custom_search_fs(id, { include_directories: true });
+            const files = custom_search_fs(id);
             if (files.length) {
                 const path_ids = [];
                 let has_files = false;

package/dist/package.js

@@ -1,7 +1,7 @@
 // generated by src/lib/package.gen.ts
 export const package_json = {
     name: '@ryanatkn/gro',
-    version: '0.121.0',
+    version: '0.121.1',
     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.121.0',
+    version: '0.121.1',
     modules: {
         '.': {
             path: 'index.ts',

package/dist/task.js

@@ -47,8 +47,7 @@ export const find_tasks = (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, } = resolve_input_files(resolved_input_paths, (id, options) => search_fs(id, {
-        ...options,
+    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) => search_fs(id, {
         filter: config.search_filters,
         file_filter: (p) => TASK_FILE_SUFFIXES.some((s) => p.endsWith(s)),
     }));

package/package.json

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