@ryanatkn/gro 0.119.1 → 0.120.1

package/dist/modules.test.js

@@ -1,36 +1,30 @@
-import { suite } from 'uvu';
+import { test } from 'uvu';
 import * as assert from 'uvu/assert';
-import { resolve, join } from 'node:path';
-import { find_modules, load_modules, load_module } from './modules.js';
-import { get_possible_source_ids } from './input_path.js';
-import { search_fs } from './search_fs.js';
+import { resolve } from 'node:path';
+import { load_module } from './modules.js';
 // TODO if we import directly, svelte-package generates types in `src/fixtures`
 /* eslint-disable no-useless-concat */
-const modTest1 = await import('../fixtures/' + 'test1.foo.js');
-const modTestBaz1 = await import('../fixtures/' + 'baz1/test1.baz.js');
-const modTestBaz2 = await import('../fixtures/' + 'baz2/test2.baz.js');
-/* test__load_module */
-const test__load_module = suite('load_module');
-test__load_module('basic behavior', async () => {
+const mod_test1 = await import('../fixtures/' + 'test1.foo.js');
+test('load_module basic behavior', async () => {
     const id = resolve('src/fixtures/test1.foo.js');
     let validated_mod;
-    const result = await load_module(id, ((mod) => {
+    const result = await load_module(id, (mod) => {
         validated_mod = mod;
         return true;
-    }));
+    });
     assert.ok(result.ok);
-    assert.is(result.mod.id, id);
-    assert.is(result.mod.mod, validated_mod);
-    assert.is(result.mod.mod, modTest1);
+    assert.is(result.id, id);
+    assert.is(result.mod, validated_mod);
+    assert.is(result.mod, mod_test1);
 });
-test__load_module('without validation', async () => {
+test('load_module without validation', async () => {
     const id = resolve('src/fixtures/test1.foo.js');
     const result = await load_module(id);
     assert.ok(result.ok);
-    assert.is(result.mod.id, id);
-    assert.is(result.mod.mod, modTest1);
+    assert.is(result.id, id);
+    assert.is(result.mod, mod_test1);
 });
-test__load_module('fails validation', async () => {
+test('load_module fails validation', async () => {
     const id = resolve('src/fixtures/test1.foo.js');
     let validated_mod;
     const test_validation = (mod) => {
@@ -39,21 +33,21 @@ test__load_module('fails validation', async () => {
     };
     const result = await load_module(id, test_validation);
     assert.ok(!result.ok);
-    if (result.type === 'invalid') {
+    if (result.type === 'failed_validation') {
         assert.is(result.validation, test_validation.name);
         assert.is(result.id, id);
         assert.is(result.mod, validated_mod);
-        assert.is(result.mod, modTest1);
+        assert.is(result.mod, mod_test1);
     }
     else {
         throw Error('Should be invalid');
     }
 });
-test__load_module('fails to import', async () => {
+test('load_module fails to import', async () => {
     const id = resolve('foo/test/failure');
     const result = await load_module(id);
     assert.ok(!result.ok);
-    if (result.type === 'importFailed') {
+    if (result.type === 'failed_import') {
         assert.is(result.id, id);
         assert.ok(result.error instanceof Error);
     }
@@ -61,122 +55,4 @@ test__load_module('fails to import', async () => {
         throw Error('Should fail to import');
     }
 });
-test__load_module.run();
-/* test__load_module */
-/* test__find_modules */
-const test__find_modules = suite('find_modules');
-test__find_modules('with and without extension', async () => {
-    const path1 = resolve('src/fixtures/test1');
-    const id1 = resolve('src/fixtures/test1.foo.ts');
-    const id2 = resolve('src/fixtures/test2.foo.ts');
-    const result = await find_modules([path1, id2], (id) => search_fs(id, { files_only: false }), (input_path) => get_possible_source_ids(input_path, ['.foo.ts'], []));
-    assert.ok(result.ok);
-    assert.equal(result.source_ids_by_input_path, new Map([
-        [path1, [id1]],
-        [id2, [id2]],
-    ]));
-    assert.equal(result.source_id_path_data_by_input_path, new Map([
-        [path1, { id: id1, isDirectory: false }],
-        [id2, { id: id2, isDirectory: false }],
-    ]));
-});
-test__find_modules('directory', async () => {
-    const id = resolve('src/fixtures/');
-    const result = await find_modules([id], (id) => search_fs(id, { filter: (path) => path.includes('.foo.') }));
-    assert.ok(result.ok);
-    assert.equal(result.source_ids_by_input_path, new Map([[id, [join(id, 'test1.foo.ts'), join(id, 'test2.foo.ts')]]]));
-    assert.equal(result.source_id_path_data_by_input_path, new Map([[id, { id, isDirectory: true }]]));
-});
-test__find_modules('fail with unmapped_input_paths', async () => {
-    const result = await find_modules([
-        resolve('src/fixtures/bar1'),
-        resolve('src/fixtures/failme1'),
-        resolve('src/fixtures/bar2'),
-        resolve('src/fixtures/failme2'),
-    ], (id) => search_fs(id, { files_only: false }), (input_path) => get_possible_source_ids(input_path, ['.foo.ts'], []));
-    assert.ok(!result.ok);
-    assert.ok(result.reasons.length);
-    if (result.type === 'unmapped_input_paths') {
-        assert.equal(result.unmapped_input_paths, [
-            resolve('src/fixtures/failme1'),
-            resolve('src/fixtures/failme2'),
-        ]);
-    }
-    else {
-        throw Error('Expected to fail with unmapped_input_paths');
-    }
-});
-test__find_modules('fail with input_directories_with_no_files', async () => {
-    const result = await find_modules([
-        resolve('src/fixtures/baz1'),
-        resolve('src/fixtures/bar1'),
-        resolve('src/fixtures/bar2'),
-        resolve('src/fixtures/baz2'),
-    ], (id) => search_fs(id, { filter: (path) => !path.includes('.bar.'), files_only: false }));
-    assert.ok(!result.ok);
-    assert.ok(result.reasons.length);
-    if (result.type === 'input_directories_with_no_files') {
-        assert.equal(result.input_directories_with_no_files, [
-            resolve('src/fixtures/bar1'),
-            resolve('src/fixtures/bar2'),
-        ]);
-    }
-    else {
-        throw Error('Expected to fail with input_directories_with_no_files');
-    }
-});
-test__find_modules.run();
-/* test__find_modules */
-/* test__load_modules */
-const test__load_modules = suite('load_modules');
-test__load_modules('fail with load_module_failures', async () => {
-    const path_bar1 = resolve('src/fixtures/bar1');
-    const path_bar2 = resolve('src/fixtures/bar2');
-    const path_baz1 = resolve('src/fixtures/baz1');
-    const path_baz2 = resolve('src/fixtures/baz2');
-    const id_bar1 = join(path_bar1, 'test1.bar.ts');
-    const id_bar2 = join(path_bar2, 'test2.bar.ts');
-    const id_baz1 = join(path_baz1, 'test1.baz.ts');
-    const id_baz2 = join(path_baz2, 'test2.baz.ts');
-    const test_validation = ((mod) => mod.bar !== 1);
-    let error;
-    const result = await load_modules(new Map([
-        [path_bar1, [id_bar1, id_bar2]],
-        [path_baz1, [id_baz1, id_baz2]],
-    ]), async (id) => {
-        if (id === id_bar2) {
-            return {
-                ok: false,
-                type: 'importFailed',
-                id,
-                error: (error = new Error('Test failed import')),
-            };
-        }
-        return load_module(id, test_validation);
-    });
-    assert.ok(!result.ok);
-    assert.ok(result.reasons.length);
-    if (result.type !== 'load_module_failures') {
-        throw Error('Expected to fail with load_module_failures');
-    }
-    assert.is(result.load_module_failures.length, 2);
-    const [failure1, failure2] = result.load_module_failures;
-    if (failure1.type !== 'invalid') {
-        throw Error('Expected to fail with invalid');
-    }
-    assert.is(failure1.id, id_bar1);
-    assert.ok(failure1.mod);
-    assert.is(failure1.validation, test_validation.name);
-    if (failure2.type !== 'importFailed') {
-        throw Error('Expected to fail with importFailed');
-    }
-    assert.is(failure2.id, id_bar2);
-    assert.is(failure2.error, error);
-    assert.is(result.modules.length, 2);
-    assert.is(result.modules[0].id, id_baz1);
-    assert.is(result.modules[0].mod, modTestBaz1);
-    assert.is(result.modules[1].id, id_baz2);
-    assert.is(result.modules[1].mod, modTestBaz2);
-});
-test__load_modules.run();
-/* test__load_modules */
+test.run();

package/dist/package.d.ts

@@ -41,7 +41,6 @@ export declare const package_json: {
         mri: string;
         prettier: string;
         'prettier-plugin-svelte': string;
-        'tiny-glob': string;
         'ts-morph': string;
         tslib: string;
         zod: string;
@@ -194,10 +193,6 @@ export declare const package_json: {
             default: string;
             types: string;
         };
-        './gen_module.js': {
-            default: string;
-            types: string;
-        };
         './gen.task.js': {
             default: string;
             types: string;
@@ -330,6 +325,10 @@ export declare const package_json: {
             default: string;
             types: string;
         };
+        './resolve.task.js': {
+            default: string;
+            types: string;
+        };
         './run_gen.js': {
             default: string;
             types: string;
@@ -402,10 +401,6 @@ export declare const package_json: {
             default: string;
             types: string;
         };
-        './task_module.js': {
-            default: string;
-            types: string;
-        };
         './task.js': {
             default: string;
             types: string;
@@ -615,13 +610,6 @@ export declare const src_json: {
                 kind: string;
             }[];
         };
-        './gen_module.js': {
-            path: string;
-            declarations: {
-                name: string;
-                kind: string;
-            }[];
-        };
         './gen.task.js': {
             path: string;
             declarations: {
@@ -841,6 +829,13 @@ export declare const src_json: {
                 kind: string;
             }[];
         };
+        './resolve.task.js': {
+            path: string;
+            declarations: {
+                name: string;
+                kind: string;
+            }[];
+        };
         './run_gen.js': {
             path: string;
             declarations: {
@@ -967,10 +962,6 @@ export declare const src_json: {
                 kind: string;
             }[];
         };
-        './task_module.js': {
-            path: string;
-            declarations: never[];
-        };
         './task.js': {
             path: string;
             declarations: {

package/dist/package.js

@@ -1,7 +1,7 @@
 // generated by src/lib/package.gen.ts
 export const package_json = {
     name: '@ryanatkn/gro',
-    version: '0.119.1',
+    version: '0.120.1',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     icon: '🌰',
@@ -14,7 +14,7 @@ export const package_json = {
     bugs: 'https://github.com/ryanatkn/gro/issues',
     funding: 'https://www.ryanatkn.com/funding',
     type: 'module',
-    engines: { node: '>=20.10' },
+    engines: { node: '>=22.3' },
     scripts: {
         build: 'rm -rf .gro dist && svelte-kit sync && svelte-package && chmod +x ./dist/gro.js && npm link -f',
         start: 'gro dev',
@@ -40,9 +40,8 @@ export const package_json = {
         kleur: '^4.1.5',
         mri: '^1.2.0',
         prettier: '^3.3.2',
-        'prettier-plugin-svelte': '^3.2.4',
-        'tiny-glob': '^0.2.9',
-        'ts-morph': '^22.0.0',
+        'prettier-plugin-svelte': '^3.2.5',
+        'ts-morph': '^23.0.0',
         tslib: '^2.6.3',
         zod: '^3.23.8',
     },
@@ -50,23 +49,23 @@ export const package_json = {
     devDependencies: {
         '@changesets/changelog-git': '^0.2.0',
         '@changesets/types': '^6.0.0',
-        '@ryanatkn/eslint-config': '^0.1.2',
-        '@ryanatkn/fuz': '^0.102.1',
+        '@ryanatkn/eslint-config': '^0.1.3',
+        '@ryanatkn/fuz': '^0.103.0',
         '@ryanatkn/moss': '^0.4.0',
         '@sveltejs/adapter-static': '^3.0.2',
-        '@sveltejs/kit': '^2.5.16',
+        '@sveltejs/kit': '^2.5.17',
         '@sveltejs/package': '^2.3.2',
         '@sveltejs/vite-plugin-svelte': '^3.1.1',
         '@types/fs-extra': '^11.0.4',
-        '@types/node': '^20.14.2',
-        '@typescript-eslint/eslint-plugin': '^7.13.0',
-        '@typescript-eslint/parser': '^7.13.0',
+        '@types/node': '^20.14.8',
+        '@typescript-eslint/eslint-plugin': '^7.13.1',
+        '@typescript-eslint/parser': '^7.13.1',
         esbuild: '^0.20.2',
         eslint: '^8.57.0',
-        'eslint-plugin-svelte': '^2.39.4',
-        svelte: '^5.0.0-next.155',
-        'svelte-check': '^3.8.0',
-        typescript: '^5.4.5',
+        'eslint-plugin-svelte': '^2.40.0',
+        svelte: '^5.0.0-next.164',
+        'svelte-check': '^3.8.1',
+        typescript: '^5.5.2',
         uvu: '^0.5.6',
     },
     eslintConfig: { root: true, extends: '@ryanatkn', rules: { 'no-console': 1 } },
@@ -132,7 +131,6 @@ export const package_json = {
         './format_file.js': { default: './dist/format_file.js', types: './dist/format_file.d.ts' },
         './format.task.js': { default: './dist/format.task.js', types: './dist/format.task.d.ts' },
         './fs.js': { default: './dist/fs.js', types: './dist/fs.d.ts' },
-        './gen_module.js': { default: './dist/gen_module.js', types: './dist/gen_module.d.ts' },
         './gen.task.js': { default: './dist/gen.task.js', types: './dist/gen.task.d.ts' },
         './gen.js': { default: './dist/gen.js', types: './dist/gen.d.ts' },
         './git.js': { default: './dist/git.js', types: './dist/git.d.ts' },
@@ -193,6 +191,7 @@ export const package_json = {
             default: './dist/resolve_specifier.js',
             types: './dist/resolve_specifier.d.ts',
         },
+        './resolve.task.js': { default: './dist/resolve.task.js', types: './dist/resolve.task.d.ts' },
         './run_gen.js': { default: './dist/run_gen.js', types: './dist/run_gen.d.ts' },
         './run_task.js': { default: './dist/run_task.js', types: './dist/run_task.d.ts' },
         './run.task.js': { default: './dist/run.task.js', types: './dist/run.task.d.ts' },
@@ -244,7 +243,6 @@ export const package_json = {
         },
         './sync.task.js': { default: './dist/sync.task.js', types: './dist/sync.task.d.ts' },
         './task_logging.js': { default: './dist/task_logging.js', types: './dist/task_logging.d.ts' },
-        './task_module.js': { default: './dist/task_module.js', types: './dist/task_module.d.ts' },
         './task.js': { default: './dist/task.js', types: './dist/task.d.ts' },
         './test.task.js': { default: './dist/test.task.js', types: './dist/test.task.d.ts' },
         './throttle.js': { default: './dist/throttle.js', types: './dist/throttle.d.ts' },
@@ -258,7 +256,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.119.1',
+    version: '0.120.1',
     modules: {
         '.': {
             path: 'index.ts',
@@ -344,6 +342,7 @@ export const src_json = {
                 { name: 'Gro_Config', kind: 'type' },
                 { name: 'Create_Gro_Config', kind: 'type' },
                 { name: 'create_empty_config', kind: 'function' },
+                { name: 'DEFAULT_SEARCH_EXCLUDER', kind: 'variable' },
                 { name: 'DEFAULT_EXPORTS_EXCLUDER', kind: 'variable' },
                 { name: 'Gro_Config_Module', kind: 'type' },
                 { name: 'load_config', kind: 'function' },
@@ -438,29 +437,6 @@ export const src_json = {
             ],
         },
         './fs.js': { path: 'fs.ts', declarations: [{ name: 'clean_fs', kind: 'function' }] },
-        './gen_module.js': {
-            path: 'gen_module.ts',
-            declarations: [
-                { name: 'GEN_FILE_PATTERN_TEXT', kind: 'variable' },
-                { name: 'GEN_FILE_PATTERN', kind: 'variable' },
-                { name: 'is_gen_path', kind: 'function' },
-                { name: 'GEN_SCHEMA_FILE_PATTERN_TEXT', kind: 'variable' },
-                { name: 'GEN_SCHEMA_FILE_PATTERN', kind: 'variable' },
-                { name: 'GEN_SCHEMA_PATH_SUFFIX', kind: 'variable' },
-                { name: 'GEN_SCHEMA_IDENTIFIER_SUFFIX', kind: 'variable' },
-                { name: 'Gen_Module_Type', kind: 'type' },
-                { name: 'Gen_Module', kind: 'type' },
-                { name: 'Basic_Gen_Module', kind: 'type' },
-                { name: 'Schema_Gen_Module', kind: 'type' },
-                { name: 'to_gen_module_type', kind: 'function' },
-                { name: 'gen_module_meta', kind: 'variable' },
-                { name: 'validate_gen_module', kind: 'variable' },
-                { name: 'Gen_Module_Meta', kind: 'type' },
-                { name: 'Basic_Gen_Module_Meta', kind: 'type' },
-                { name: 'load_gen_module', kind: 'function' },
-                { name: 'find_gen_modules', kind: 'function' },
-            ],
-        },
         './gen.task.js': {
             path: 'gen.task.ts',
             declarations: [
@@ -471,6 +447,9 @@ export const src_json = {
         './gen.js': {
             path: 'gen.ts',
             declarations: [
+                { name: 'GEN_FILE_PATTERN_TEXT', kind: 'variable' },
+                { name: 'GEN_FILE_PATTERN', kind: 'variable' },
+                { name: 'is_gen_path', kind: 'function' },
                 { name: 'Gen_Result', kind: 'type' },
                 { name: 'Gen_File', kind: 'type' },
                 { name: 'Gen', kind: 'type' },
@@ -479,15 +458,26 @@ export const src_json = {
                 { name: 'Raw_Gen_File', kind: 'type' },
                 { name: 'Gen_Config', kind: 'variable' },
                 { name: 'Gen_Results', kind: 'type' },
-                { name: 'Gen_Module_Result', kind: 'type' },
-                { name: 'Gen_Module_Result_Success', kind: 'type' },
-                { name: 'Gen_Module_Result_Failure', kind: 'type' },
+                { name: 'Genfile_Module_Result', kind: 'type' },
+                { name: 'Genfile_Module_Result_Success', kind: 'type' },
+                { name: 'Genfile_Module_Result_Failure', kind: 'type' },
                 { name: 'to_gen_result', kind: 'function' },
                 { name: 'to_output_file_name', kind: 'function' },
                 { name: 'Analyzed_Gen_Result', kind: 'type' },
                 { name: 'analyze_gen_results', kind: 'function' },
                 { name: 'analyze_gen_result', kind: 'function' },
                 { name: 'write_gen_results', kind: 'function' },
+                { name: 'Found_Genfiles', kind: 'type' },
+                { name: 'Find_Genfiles_Result', kind: 'type' },
+                { name: 'Find_Genfiles_Failure', kind: 'type' },
+                { name: 'find_genfiles', kind: 'function' },
+                { name: 'Genfile_Module', kind: 'type' },
+                { name: 'Genfile_Module_Meta', kind: 'type' },
+                { name: 'Loaded_Genfiles', kind: 'type' },
+                { name: 'Load_Genfiles_Result', kind: 'type' },
+                { name: 'Load_Genfiles_Failure', kind: 'type' },
+                { name: 'load_genfiles', kind: 'function' },
+                { name: 'validate_gen_module', kind: 'function' },
             ],
         },
         './git.js': {
@@ -572,10 +562,14 @@ export const src_json = {
                 { name: 'Raw_Input_Path', kind: 'variable' },
                 { name: 'to_input_path', kind: 'function' },
                 { name: 'to_input_paths', kind: 'function' },
-                { name: 'get_possible_source_ids', kind: 'function' },
-                { name: 'load_source_path_data_by_input_path', kind: 'function' },
-                { name: 'load_source_ids_by_input_path', kind: 'function' },
-                { name: 'to_gro_input_path', kind: 'function' },
+                { name: 'Possible_Path', kind: 'type' },
+                { name: 'get_possible_paths', kind: 'function' },
+                { name: 'Resolved_Input_Path', kind: 'type' },
+                { name: 'Resolved_Input_File', kind: 'type' },
+                { name: 'Resolved_Input_Paths', kind: 'type' },
+                { name: 'resolve_input_paths', kind: 'function' },
+                { name: 'Resolved_Input_Files', kind: 'type' },
+                { name: 'resolve_input_files', kind: 'function' },
             ],
         },
         './invoke_task.js': {
@@ -605,10 +599,8 @@ export const src_json = {
                 { name: 'Load_Module_Result', kind: 'type' },
                 { name: 'Load_Module_Failure', kind: 'type' },
                 { name: 'load_module', kind: 'function' },
-                { name: 'Find_Modules_Result', kind: 'type' },
-                { name: 'Find_Modules_Failure', kind: 'type' },
+                { name: 'Load_Modules_Failure', kind: 'type' },
                 { name: 'Load_Modules_Result', kind: 'type' },
-                { name: 'find_modules', kind: 'function' },
                 { name: 'load_modules', kind: 'function' },
             ],
         },
@@ -685,10 +677,14 @@ export const src_json = {
                 { name: 'Raw_Input_Path', kind: 'variable' },
                 { name: 'to_input_path', kind: 'function' },
                 { name: 'to_input_paths', kind: 'function' },
-                { name: 'get_possible_source_ids', kind: 'function' },
-                { name: 'load_source_path_data_by_input_path', kind: 'function' },
-                { name: 'load_source_ids_by_input_path', kind: 'function' },
-                { name: 'to_gro_input_path', kind: 'function' },
+                { name: 'Possible_Path', kind: 'type' },
+                { name: 'get_possible_paths', kind: 'function' },
+                { name: 'Resolved_Input_Path', kind: 'type' },
+                { name: 'Resolved_Input_File', kind: 'type' },
+                { name: 'Resolved_Input_Paths', kind: 'type' },
+                { name: 'resolve_input_paths', kind: 'function' },
+                { name: 'Resolved_Input_Files', kind: 'type' },
+                { name: 'resolve_input_files', kind: 'function' },
             ],
         },
         './paths.js': {
@@ -699,16 +695,13 @@ export const src_json = {
                 { name: 'LIB_DIR', kind: 'variable' },
                 { name: 'ROUTES_DIRNAME', kind: 'variable' },
                 { name: 'Paths', kind: 'type' },
-                { name: 'Source_Id', kind: 'variable' },
                 { name: 'create_paths', kind: 'function' },
-                { name: 'paths_from_id', kind: 'function' },
+                { name: 'infer_paths', kind: 'function' },
                 { name: 'is_gro_id', kind: 'function' },
                 { name: 'to_root_path', kind: 'function' },
-                { name: 'source_id_to_base_path', kind: 'function' },
-                { name: 'base_path_to_source_id', kind: 'function' },
-                { name: 'import_id_to_lib_path', kind: 'function' },
+                { name: 'path_id_to_base_path', kind: 'function' },
+                { name: 'base_path_to_path_id', kind: 'function' },
                 { name: 'print_path', kind: 'function' },
-                { name: 'print_path_or_gro_path', kind: 'function' },
                 { name: 'replace_extension', kind: 'function' },
                 { name: 'paths', kind: 'variable' },
                 { name: 'GRO_PACKAGE_DIR', kind: 'variable' },
@@ -764,12 +757,18 @@ export const src_json = {
                 { name: 'resolve_specifier', kind: 'function' },
             ],
         },
+        './resolve.task.js': {
+            path: 'resolve.task.ts',
+            declarations: [
+                { name: 'Args', kind: 'variable' },
+                { name: 'task', kind: 'variable' },
+            ],
+        },
         './run_gen.js': {
             path: 'run_gen.ts',
             declarations: [
                 { name: 'GEN_NO_PROD_MESSAGE', kind: 'variable' },
                 { name: 'run_gen', kind: 'function' },
-                { name: 'to_gen_import_path', kind: 'function' },
             ],
         },
         './run_task.js': {
@@ -909,12 +908,10 @@ export const src_json = {
             path: 'task_logging.ts',
             declarations: [
                 { name: 'log_tasks', kind: 'function' },
-                { name: 'log_gro_package_tasks', kind: 'function' },
                 { name: 'log_error_reasons', kind: 'function' },
                 { name: 'log_task_help', kind: 'function' },
             ],
         },
-        './task_module.js': { path: 'task_module.ts', declarations: [] },
         './task.js': {
             path: 'task.ts',
             declarations: [

package/dist/package_json.d.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import type { Logger } from '@ryanatkn/belt/log.js';
 import type { Flavored } from '@ryanatkn/belt/types.js';
 export declare const Url: z.ZodString;
 export type Url = Flavored<z.infer<typeof Url>, 'Url'>;

package/dist/package_json.js

@@ -110,7 +110,7 @@ export const load_package_json = async (dir = IS_THIS_GRO ? gro_paths.root : pat
 };
 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_paths = Array.from(exported_files.keys());
+    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) {
             const exports = to_package_exports(exported_paths);

package/dist/package_meta.d.ts

@@ -16,6 +16,6 @@ export interface Package_Meta {
     changelog_url: Url | null;
     published: boolean;
 }
-export declare const parse_package_meta: (url: Flavored<string, "Url">, package_json: Package_Json, src_json: Src_Json) => Package_Meta;
+export declare const parse_package_meta: (url: Url, package_json: Package_Json, src_json: Src_Json) => Package_Meta;
 export declare const parse_repo_name: (name: string) => string;
 export declare const parse_org_url: (pkg: Package_Meta) => string | null;

package/dist/path.d.ts

@@ -1,12 +1,16 @@
-export declare const to_file_path: (path_or_url: string | URL) => string;
-export interface Path_Data {
-    id: string;
-    isDirectory: boolean;
+import type { Flavored } from '@ryanatkn/belt/types.js';
+export type Path_Id = Flavored<string, 'Path_Id'>;
+export interface Path_Info {
+    id: Path_Id;
+    is_directory: boolean;
 }
-export declare const to_path_data: (id: string, stats: Path_Stats) => Path_Data;
-export interface Path_Stats {
-    isDirectory: () => boolean;
+export interface Resolved_Path extends Path_Info {
+    path: string;
 }
 export interface Path_Filter {
-    (path: string, stats: Path_Stats): boolean;
+    (path: string, is_directory: boolean): boolean;
+}
+export interface File_Filter {
+    (path: string): boolean;
 }
+export declare const to_file_path: (path_or_url: string | URL) => string;

package/dist/path.js

@@ -1,8 +1,2 @@
 import { fileURLToPath } from 'node:url';
 export const to_file_path = (path_or_url) => typeof path_or_url === 'string' ? path_or_url : fileURLToPath(path_or_url.href);
-export const to_path_data = (id, stats) => {
-    return {
-        id,
-        isDirectory: stats.isDirectory(),
-    };
-};

package/dist/paths.d.ts

@@ -1,5 +1,4 @@
-import type { Flavored } from '@ryanatkn/belt/types.js';
-import { z } from 'zod';
+import type { Path_Id } from './path.js';
 export declare const LIB_DIRNAME: string;
 export declare const LIB_PATH: string;
 export declare const LIB_DIR: string;
@@ -12,17 +11,13 @@ export interface Paths {
     build_dev: string;
     config: string;
 }
-export declare const Source_Id: z.ZodString;
-export type Source_Id = Flavored<z.infer<typeof Source_Id>, 'Source_Id'>;
 export declare const create_paths: (root_dir: string) => Paths;
-export declare const paths_from_id: (id: string) => Paths;
-export declare const is_gro_id: (id: string) => boolean;
-export declare const to_root_path: (id: string, p?: Paths) => string;
-export declare const source_id_to_base_path: (source_id: Flavored<string, "Source_Id">, p?: Paths) => string;
-export declare const base_path_to_source_id: (base_path: string, p?: Paths) => Flavored<string, "Source_Id">;
-export declare const import_id_to_lib_path: (import_id: string, p?: Paths) => string;
-export declare const print_path: (path: string, p?: Paths, prefix?: string) => string;
-export declare const print_path_or_gro_path: (path: string, from_paths?: Paths) => string;
+export declare const infer_paths: (id: Path_Id) => Paths;
+export declare const is_gro_id: (id: Path_Id) => boolean;
+export declare const to_root_path: (id: Path_Id, p?: Paths) => string;
+export declare const path_id_to_base_path: (path_id: Path_Id, p?: Paths) => string;
+export declare const base_path_to_path_id: (base_path: string, p?: Paths) => Path_Id;
+export declare const print_path: (path: string, p?: Paths) => string;
 export declare const replace_extension: (path: string, new_extension: string) => string;
 /**
  * Paths for the user repo.