@ryanatkn/gro 0.116.1 → 0.117.0

package/dist/package.js

@@ -1,7 +1,7 @@
 // generated by src/lib/package.gen.ts
 export const package_json = {
     name: '@ryanatkn/gro',
-    version: '0.116.1',
+    version: '0.117.0',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     icon: '🌰',
@@ -39,11 +39,11 @@ export const package_json = {
         'es-module-lexer': '^1.5.3',
         kleur: '^4.1.5',
         mri: '^1.2.0',
-        prettier: '^3.2.5',
-        'prettier-plugin-svelte': '^3.2.3',
+        prettier: '^3.3.2',
+        'prettier-plugin-svelte': '^3.2.4',
         'tiny-glob': '^0.2.9',
         'ts-morph': '^22.0.0',
-        tslib: '^2.6.2',
+        tslib: '^2.6.3',
         zod: '^3.23.8',
     },
     peerDependencies: { esbuild: '^0.20', svelte: '^5.0.0-next.0' },
@@ -51,21 +51,21 @@ export const package_json = {
         '@changesets/changelog-git': '^0.2.0',
         '@changesets/types': '^6.0.0',
         '@ryanatkn/eslint-config': '^0.1.2',
-        '@ryanatkn/fuz': '^0.101.2',
-        '@ryanatkn/moss': '^0.3.0',
-        '@sveltejs/adapter-static': '^3.0.1',
-        '@sveltejs/kit': '^2.5.10',
-        '@sveltejs/package': '^2.3.1',
-        '@sveltejs/vite-plugin-svelte': '^3.1.0',
+        '@ryanatkn/fuz': '^0.102.1',
+        '@ryanatkn/moss': '^0.4.0',
+        '@sveltejs/adapter-static': '^3.0.2',
+        '@sveltejs/kit': '^2.5.13',
+        '@sveltejs/package': '^2.3.2',
+        '@sveltejs/vite-plugin-svelte': '^3.1.1',
         '@types/fs-extra': '^11.0.4',
-        '@types/node': '^20.12.12',
-        '@typescript-eslint/eslint-plugin': '^7.10.0',
-        '@typescript-eslint/parser': '^7.10.0',
+        '@types/node': '^20.14.2',
+        '@typescript-eslint/eslint-plugin': '^7.13.0',
+        '@typescript-eslint/parser': '^7.13.0',
         esbuild: '^0.20.2',
         eslint: '^8.57.0',
-        'eslint-plugin-svelte': '^2.39.0',
-        svelte: '^5.0.0-next.141',
-        'svelte-check': '^3.7.1',
+        'eslint-plugin-svelte': '^2.39.3',
+        svelte: '^5.0.0-next.155',
+        'svelte-check': '^3.8.0',
         typescript: '^5.4.5',
         uvu: '^0.5.6',
     },
@@ -174,7 +174,6 @@ export const package_json = {
         './path.js': { default: './dist/path.js', types: './dist/path.d.ts' },
         './paths.js': { default: './dist/paths.js', types: './dist/paths.d.ts' },
         './plugin.js': { default: './dist/plugin.js', types: './dist/plugin.d.ts' },
-        './print_task.js': { default: './dist/print_task.js', types: './dist/print_task.d.ts' },
         './publish.task.js': { default: './dist/publish.task.js', types: './dist/publish.task.d.ts' },
         './release.task.js': { default: './dist/release.task.js', types: './dist/release.task.d.ts' },
         './resolve_node_specifier.js': {
@@ -227,6 +226,7 @@ export const package_json = {
             types: './dist/sveltekit_shim_env.d.ts',
         },
         './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' },
@@ -241,7 +241,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.116.1',
+    version: '0.117.0',
     modules: {
         '.': {
             path: 'index.ts',
@@ -553,11 +553,14 @@ export const src_json = {
         './input_path.js': {
             path: 'input_path.ts',
             declarations: [
-                { name: 'resolve_input_path', kind: 'function' },
-                { name: 'resolve_input_paths', kind: 'function' },
+                { name: 'Input_Path', kind: 'variable' },
+                { 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' },
             ],
         },
         './invoke_task.js': {
@@ -635,11 +638,14 @@ export const src_json = {
         './path.js': {
             path: 'path.ts',
             declarations: [
-                { name: 'resolve_input_path', kind: 'function' },
-                { name: 'resolve_input_paths', kind: 'function' },
+                { name: 'Input_Path', kind: 'variable' },
+                { 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' },
             ],
         },
         './paths.js': {
@@ -670,28 +676,24 @@ export const src_json = {
                 { name: 'GIT_DIRNAME', kind: 'variable' },
                 { name: 'TSCONFIG_FILENAME', kind: 'variable' },
                 { name: 'Paths', kind: 'type' },
+                { name: 'Source_Id', kind: 'variable' },
                 { name: 'Url', kind: 'variable' },
                 { name: 'Email', kind: 'variable' },
-                { name: 'Source_Id', kind: 'variable' },
-                { name: 'Build_Id', kind: 'variable' },
                 { name: 'create_paths', kind: 'function' },
                 { name: 'paths_from_id', 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: 'lib_path_to_import_id', kind: 'function' },
                 { name: 'import_id_to_lib_path', kind: 'function' },
-                { name: 'to_gro_input_path', kind: 'function' },
-                { name: 'replace_root_dir', kind: 'function' },
                 { name: 'print_path', kind: 'function' },
                 { name: 'print_path_or_gro_path', kind: 'function' },
                 { name: 'replace_extension', kind: 'function' },
-                { name: 'gro_dir_basename', kind: 'variable' },
                 { name: 'paths', kind: 'variable' },
-                { name: 'is_this_project_gro', kind: 'variable' },
+                { name: 'GRO_PACKAGE_DIR', kind: 'variable' },
+                { name: 'IS_THIS_GRO', kind: 'variable' },
                 { name: 'gro_paths', kind: 'variable' },
-                { name: 'gro_sveltekit_dist_dir', kind: 'variable' },
+                { name: 'GRO_DIST_DIR', kind: 'variable' },
             ],
         },
         './plugin.js': {
@@ -704,14 +706,6 @@ export const src_json = {
                 { name: 'replace_plugin', kind: 'function' },
             ],
         },
-        './print_task.js': {
-            path: 'print_task.ts',
-            declarations: [
-                { name: 'log_available_tasks', kind: 'function' },
-                { name: 'log_error_reasons', kind: 'function' },
-                { name: 'print_task_help', kind: 'function' },
-            ],
-        },
         './publish.task.js': {
             path: 'publish.task.ts',
             declarations: [
@@ -867,6 +861,15 @@ export const src_json = {
                 { name: 'sveltekit_sync', kind: 'function' },
             ],
         },
+        './task_logging.js': {
+            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',

package/dist/package_json.js

@@ -3,7 +3,7 @@ import { join } from 'node:path';
 import { readFile, writeFile } from 'node:fs/promises';
 import { plural } from '@ryanatkn/belt/string.js';
 import { strip_end } from '@ryanatkn/belt/string.js';
-import { paths, gro_paths, is_this_project_gro, replace_extension, SVELTEKIT_DIST_DIRNAME, Url, Email, } from './paths.js';
+import { paths, gro_paths, IS_THIS_GRO, replace_extension, SVELTEKIT_DIST_DIRNAME, Url, Email, } from './paths.js';
 import { search_fs } from './search_fs.js';
 import { has_sveltekit_library } from './gro_plugin_sveltekit_library.js';
 // TODO move this where?
@@ -88,7 +88,7 @@ export const Package_Json = z.intersection(z.record(z.unknown()), z
 })
     .passthrough());
 export const EMPTY_PACKAGE_JSON = { name: '', version: '' };
-export const load_package_json = async (dir = is_this_project_gro ? gro_paths.root : paths.root, cache) => {
+export const load_package_json = async (dir = IS_THIS_GRO ? gro_paths.root : paths.root, cache) => {
     let package_json;
     if (cache && dir in cache) {
         return cache[dir];
@@ -97,7 +97,7 @@ export const load_package_json = async (dir = is_this_project_gro ? gro_paths.ro
         package_json = JSON.parse(await load_package_json_contents(dir));
     }
     catch (err) {
-        throw Error('failed to load package.json at ' + dir);
+        return EMPTY_PACKAGE_JSON;
     }
     if (cache)
         cache[dir] = package_json;

package/dist/paths.d.ts

@@ -32,29 +32,30 @@ 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 Url: z.ZodString;
 export type Url = Flavored<z.infer<typeof Url>, 'Url'>;
 export declare const Email: z.ZodString;
 export type Email = Flavored<z.infer<typeof Email>, 'Email'>;
-export declare const Source_Id: z.ZodString;
-export type Source_Id = Flavored<z.infer<typeof Source_Id>, 'Source_Id'>;
-export declare const Build_Id: z.ZodString;
-export type Build_Id = Flavored<z.infer<typeof Build_Id>, 'Build_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 lib_path_to_import_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 to_gro_input_path: (input_path: string) => string;
-export declare const replace_root_dir: (id: string, root_dir: 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 replace_extension: (path: string, new_extension: string) => string;
-export declare const gro_dir_basename: string;
+/**
+ * Paths for the user repo.
+ */
 export declare const paths: Paths;
-export declare const is_this_project_gro: boolean;
+export declare const GRO_PACKAGE_DIR = "gro/";
+export declare const IS_THIS_GRO: boolean;
+/**
+ * Paths for the Gro package being used by the user repo.
+ */
 export declare const gro_paths: Paths;
-export declare const gro_sveltekit_dist_dir: string;
+export declare const GRO_DIST_DIR: string;

package/dist/paths.js

@@ -1,4 +1,4 @@
-import { join, basename, extname, relative } from 'node:path';
+import { join, extname, relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { strip_end, strip_start } from '@ryanatkn/belt/string.js';
 import { gray } from 'kleur/colors';
@@ -6,15 +6,7 @@ import { z } from 'zod';
 /*
 
 A path `id` is an absolute path to the source/.gro/dist directory.
-It's the same nomenclature that Rollup uses.
-
-A `base_path` is the format used by `CheapWatch`.
-It's a bare relative path without a source or .gro directory,
-e.g. 'foo/bar.ts'.
-
-`CheapWatch` also uses an array of `path_parts`.
-For path './foo/bar/baz.ts',
-the `path_parts` are `['foo', 'foo/bar', 'foo/bar/baz.ts']`.
+It's the same name that Rollup uses.
 
 */
 // TODO pass these to `create_paths` and override from gro config
@@ -43,11 +35,12 @@ export const SVELTEKIT_VITE_CACHE_PATH = NODE_MODULES_DIRNAME + '/.vite';
 export const GITHUB_DIRNAME = '.github';
 export const GIT_DIRNAME = '.git';
 export const TSCONFIG_FILENAME = 'tsconfig.json';
-// TODO upstream to util, and probably add `Path`/`FilePath` and `FileUrl`
+// TODO Flavored doesn't work when used in schemas, use Zod brand instead? problem is ergonomics
+export const Source_Id = z.string();
+// TODO @multiple belongs elsewhere
 export const Url = z.string();
+// TODO @multiple belongs elsewhere
 export const Email = z.string();
-export const Source_Id = z.string();
-export const Build_Id = z.string();
 export const create_paths = (root_dir) => {
     // TODO remove reliance on trailing slash towards windows support
     const root = strip_end(root_dir, '/') + '/';
@@ -70,38 +63,21 @@ export const source_id_to_base_path = (source_id, p = paths) => relative(p.sourc
 // TODO base_path is an obsolete concept, it was a remnant from forcing `src/`
 // 'foo/bar/baz.ts' → '/home/me/app/src/foo/bar/baz.ts'
 export const base_path_to_source_id = (base_path, p = paths) => join(p.source, base_path);
-// To run Gro's tasks from its own project, we resolve from dist/ instead of src/.
-// 'foo/bar/baz.ts' → '/home/me/app/src/lib/foo/bar/baz.ts'
-// 'foo/bar/baz.ts' → '/home/me/app/dist/foo/bar/baz.ts'
-export const lib_path_to_import_id = (base_path, p = paths) => {
-    if (p.root === gro_paths.root) {
-        return p.root + 'dist/' + base_path;
-    }
-    else {
-        return base_path_to_source_id(LIB_DIRNAME + '/' + base_path, p);
-    }
-};
 // An `import_id` can be a source_id in a project,
 // or a Gro source_id when running inside Gro,
 // or a `gro/dist/` file id in node_modules when inside another project.
 export const import_id_to_lib_path = (import_id, p = paths_from_id(import_id)) => {
     if (p.root === gro_paths.root) {
-        const stripped = strip_start(strip_start(import_id, p.lib), gro_sveltekit_dist_dir); // TODO hacky, needs more work to clarify related things
-        const lib_path = is_this_project_gro ? stripped : replace_extension(stripped, '.ts');
+        const stripped = strip_start(strip_start(import_id, p.lib), GRO_DIST_DIR); // TODO hacky, needs more work to clarify related things
+        const lib_path = IS_THIS_GRO ? stripped : replace_extension(stripped, '.ts');
         return lib_path;
     }
     else {
         return strip_start(import_id, p.lib);
     }
 };
-export const to_gro_input_path = (input_path) => {
-    const base_path = input_path === paths.lib.slice(0, -1) ? '' : strip_start(input_path, paths.lib);
-    return gro_sveltekit_dist_dir + base_path;
-};
-// Can be used to map a source id from e.g. the cwd to gro's.
-export const replace_root_dir = (id, root_dir, p = paths) => join(root_dir, to_root_path(id, p));
 export const print_path = (path, p = paths, prefix = './') => {
-    const root_path = path === gro_sveltekit_dist_dir ? 'gro' : to_root_path(path, p);
+    const root_path = path === GRO_DIST_DIR ? 'gro' : to_root_path(path, p);
     return gray(`${prefix}${root_path}`);
 };
 export const print_path_or_gro_path = (path, from_paths = paths) => {
@@ -115,14 +91,22 @@ export const replace_extension = (path, new_extension) => {
     const { length } = extname(path);
     return (length === 0 ? path : path.substring(0, path.length - length)) + new_extension;
 };
+/**
+ * Paths for the user repo.
+ */
+export const paths = create_paths(process.cwd() + '/');
+export const GRO_PACKAGE_DIR = 'gro/';
+// TODO document these conditions with comments
+// TODO there's probably a more robust way to do this
 const filename = fileURLToPath(import.meta.url);
-const gro_dir = join(filename, filename.includes('/gro/src/lib/')
+const gro_package_dir_path = join(filename, filename.includes('/gro/src/lib/')
     ? '../../../'
     : filename.includes('/gro/dist/')
         ? '../../'
         : '../');
-export const gro_dir_basename = basename(gro_dir) + '/';
-export const paths = create_paths(process.cwd() + '/');
-export const is_this_project_gro = gro_dir === paths.root;
-export const gro_paths = is_this_project_gro ? paths : create_paths(gro_dir);
-export const gro_sveltekit_dist_dir = gro_paths.root + SVELTEKIT_DIST_DIRNAME + '/';
+export const IS_THIS_GRO = gro_package_dir_path === paths.root;
+/**
+ * Paths for the Gro package being used by the user repo.
+ */
+export const gro_paths = IS_THIS_GRO ? paths : create_paths(gro_package_dir_path);
+export const GRO_DIST_DIR = gro_paths.root + SVELTEKIT_DIST_DIRNAME + '/';

package/dist/publish.task.js

@@ -5,7 +5,7 @@ import { Task_Error } from './task.js';
 import { load_package_json, parse_repo_url } from './package_json.js';
 import { find_cli, spawn_cli } from './cli.js';
 import { exists } from './fs.js';
-import { is_this_project_gro } from './paths.js';
+import { IS_THIS_GRO } from './paths.js';
 import { has_sveltekit_library } from './gro_plugin_sveltekit_library.js';
 import { update_changelog } from './changelog.js';
 import { load_from_env } from './env.js';
@@ -55,7 +55,7 @@ export const task = {
             throw new Task_Error('gro publish failed to detect a library, run `npm i -D @sveltejs/package` to enable it');
         }
         // TODO hacky, ensures Gro bootstraps itself
-        if (is_this_project_gro) {
+        if (IS_THIS_GRO) {
             await spawn('npm', ['run', 'build']);
         }
         const changelog_exists = await exists(changelog);

package/dist/run_task.js

@@ -1,13 +1,13 @@
 import { cyan, red } from 'kleur/colors';
 import { print_log_label, System_Logger } from '@ryanatkn/belt/log.js';
 import { parse_args } from './args.js';
-import { print_task_help } from './print_task.js';
+import { log_task_help } from './task_logging.js';
 import { Task_Error } from './task.js';
 export const run_task = async (task_meta, unparsed_args, invoke_task, config, timings) => {
     const { task } = task_meta.mod;
     const log = new System_Logger(print_log_label(task_meta.name));
     if (unparsed_args.help) {
-        print_task_help(log, task_meta);
+        log_task_help(log, task_meta);
         return { ok: true, output: null };
     }
     // Parse and validate args.

package/dist/task.js

@@ -3,6 +3,7 @@ import { import_id_to_lib_path } from './paths.js';
 export const TASK_FILE_SUFFIX_TS = '.task.ts';
 export const TASK_FILE_SUFFIX_JS = '.task.js';
 export const is_task_path = (path) => path.endsWith(TASK_FILE_SUFFIX_TS) || path.endsWith(TASK_FILE_SUFFIX_JS);
+// TODO use task root paths? what's the right behavior?
 export const to_task_name = (id) => {
     const lib_path = import_id_to_lib_path(id);
     const name = strip_end(strip_end(lib_path, TASK_FILE_SUFFIX_TS), TASK_FILE_SUFFIX_JS);

package/dist/task_logging.d.ts

@@ -0,0 +1,8 @@
+import { type Find_Modules_Result } from './modules.js';
+import { type Task_Module_Meta } from './task_module.js';
+import { type Input_Path } from './input_path.js';
+import { type Source_Id } from './paths.js';
+export declare const log_tasks: (log: Logger, dir_label: string, source_ids_by_input_path: Map<Input_Path, Source_Id[]>, log_intro?: boolean) => Promise<void>;
+export declare const log_gro_package_tasks: (input_path: Flavored<string, "Input_Path">, log: Logger) => Promise<Find_Modules_Result>;
+export declare const log_error_reasons: (log: Logger, reasons: string[]) => void;
+export declare const log_task_help: (log: Logger, meta: Task_Module_Meta) => void;

package/dist/{print_task.js → task_logging.js}

@@ -2,43 +2,57 @@ import { cyan, gray, green, red } from 'kleur/colors';
 import { plural } from '@ryanatkn/belt/string.js';
 import { print_value } from '@ryanatkn/belt/print.js';
 import { ZodFirstPartyTypeKind } from 'zod';
-import { load_modules } from './modules.js';
+import { find_modules, load_modules } from './modules.js';
 import { load_task_module } from './task_module.js';
-export const log_available_tasks = async (log, dir_label, source_ids_by_input_path, print_intro = true) => {
+import { to_gro_input_path } from './input_path.js';
+import { print_path_or_gro_path } from './paths.js';
+import { is_task_path } from './task.js';
+import { search_fs } from './search_fs.js';
+export const log_tasks = async (log, dir_label, source_ids_by_input_path, log_intro = true) => {
     const source_ids = Array.from(source_ids_by_input_path.values()).flat();
     if (source_ids.length) {
-        // Load all of the tasks so we can print their summary, and args for the `--help` flag.
+        // Load all of the tasks so we can log their summary, and args for the `--help` flag.
         const load_modules_result = await load_modules(source_ids_by_input_path, load_task_module);
         if (!load_modules_result.ok) {
             log_error_reasons(log, load_modules_result.reasons);
             process.exit(1);
         }
-        const printed = [
-            `${print_intro ? '\n\n' : ''}${source_ids.length} task${plural(source_ids.length)} in ${dir_label}:\n`,
+        const logged = [
+            `${log_intro ? '\n\n' : ''}${source_ids.length} task${plural(source_ids.length)} in ${dir_label}:\n`,
         ];
-        if (print_intro) {
-            printed.unshift(`\n\n${gray('Run a task:')} gro [name]`, `\n${gray('View help:')}  gro [name] --help`);
+        if (log_intro) {
+            logged.unshift(`\n\n${gray('Run a task:')} gro [name]`, `\n${gray('View help:')}  gro [name] --help`);
         }
         const longest_task_name = to_max_length(load_modules_result.modules, (m) => m.name);
         for (const meta of load_modules_result.modules) {
-            printed.push('\n' + cyan(pad(meta.name, longest_task_name)), '  ', meta.mod.task.summary || '');
+            logged.push('\n' + cyan(pad(meta.name, longest_task_name)), '  ', meta.mod.task.summary || '');
         }
-        log[print_intro ? 'info' : 'plain'](printed.join('') + '\n');
+        log[log_intro ? 'info' : 'plain'](logged.join('') + '\n');
     }
     else {
         log.info(`No tasks found in ${dir_label}.`);
     }
 };
+export const log_gro_package_tasks = async (input_path, log) => {
+    const gro_dir_input_path = to_gro_input_path(input_path);
+    const gro_dir_find_modules_result = await find_modules([gro_dir_input_path], (id) => search_fs(id, { filter: (path) => is_task_path(path) }));
+    if (gro_dir_find_modules_result.ok) {
+        const gro_path_data = gro_dir_find_modules_result.source_id_path_data_by_input_path.get(gro_dir_input_path);
+        // Log the Gro matches.
+        await log_tasks(log, print_path_or_gro_path(gro_path_data.id), gro_dir_find_modules_result.source_ids_by_input_path);
+    }
+    return gro_dir_find_modules_result;
+};
 export const log_error_reasons = (log, reasons) => {
     for (const reason of reasons) {
         log.error(red(reason));
     }
 };
 const ARGS_PROPERTY_NAME = '[...args]';
-export const print_task_help = (log, meta) => {
+export const log_task_help = (log, meta) => {
     const { name, mod: { task }, } = meta;
-    const printed = [];
-    printed.push(cyan(name), 'help', cyan(`\n\ngro ${name}`) + `: ${task.summary || '(no summary available)'}\n`);
+    const logged = [];
+    logged.push(cyan(name), 'help', cyan(`\n\ngro ${name}`) + `: ${task.summary || '(no summary available)'}\n`);
     if (task.Args) {
         const properties = to_arg_properties(task.Args._def, meta);
         // TODO hacky padding for some quick and dirty tables
@@ -47,13 +61,13 @@ export const print_task_help = (log, meta) => {
         const longest_default = to_max_length(properties, (p) => print_value(p.schema.default));
         for (const property of properties) {
             const name = property.name === '_' ? ARGS_PROPERTY_NAME : property.name;
-            printed.push(`\n${green(pad(name, longest_task_name))} `, gray(pad(property.schema.type, longest_type)) + ' ', pad(print_value(property.schema.default), longest_default) + ' ', property.schema.description || '(no description available)');
+            logged.push(`\n${green(pad(name, longest_task_name))} `, gray(pad(property.schema.type, longest_type)) + ' ', pad(print_value(property.schema.default), longest_default) + ' ', property.schema.description || '(no description available)');
         }
         if (!properties.length) {
-            printed.push('\n' + gray('this task has no args'));
+            logged.push('\n' + gray('this task has no args'));
         }
     }
-    log.info(...printed, '\n');
+    log.info(...logged, '\n');
 };
 const to_arg_properties = (def, meta) => {
     const type_name = to_type_name(def);
@@ -97,7 +111,10 @@ const to_args_schema_type = ({ _def }) => {
         case ZodFirstPartyTypeKind.ZodUnion:
             return 'string | string[]'; // TODO support unions of arbitrary types, or more hardcoded ones as needed
         default: {
-            if ('innerType' in _def) {
+            if ('type' in _def) {
+                return to_args_schema_type(_def.type);
+            }
+            else if ('innerType' in _def) {
                 return to_args_schema_type(_def.innerType);
             }
             else {

package/dist/task_module.d.ts

@@ -1,5 +1,6 @@
 import { load_modules, find_modules, type Module_Meta, type Load_Module_Result, type Find_Modules_Failure } from './modules.js';
 import { type Task } from './task.js';
+import { Input_Path } from './input_path.js';
 export interface Task_Module {
     task: Task;
 }
@@ -8,7 +9,7 @@ export interface Task_Module_Meta extends Module_Meta<Task_Module> {
 }
 export declare const validate_task_module: (mod: Record<string, any>) => mod is Task_Module;
 export declare const load_task_module: (id: string) => Promise<Load_Module_Result<Task_Module_Meta>>;
-export declare const find_task_modules: (input_paths?: string[], extensions?: string[], root_dirs?: string[]) => Promise<ReturnType<typeof find_modules>>;
-export declare const load_task_modules: (input_paths?: string[], extensions?: string[], root_dirs?: string[]) => Promise<ReturnType<typeof load_modules<Task_Module, Task_Module_Meta>> | ({
+export declare const find_task_modules: (input_paths: Input_Path[], root_dirs?: string[]) => Promise<ReturnType<typeof find_modules>>;
+export declare const load_task_modules: (input_paths: Input_Path[], root_dirs?: string[]) => Promise<ReturnType<typeof load_modules<Task_Module, Task_Module_Meta>> | ({
     ok: false;
 } & Find_Modules_Failure)>;

package/dist/task_module.js

@@ -1,18 +1,17 @@
-import { paths } from './paths.js';
 import { load_module, load_modules, find_modules, } from './modules.js';
 import { to_task_name, is_task_path, TASK_FILE_SUFFIX_TS, TASK_FILE_SUFFIX_JS, } from './task.js';
-import { get_possible_source_ids } from './input_path.js';
+import { Input_Path, get_possible_source_ids } from './input_path.js';
 import { search_fs } from './search_fs.js';
 export const validate_task_module = (mod) => !!mod.task && typeof mod.task.run === 'function';
 export const load_task_module = async (id) => {
     const result = await load_module(id, validate_task_module);
     if (!result.ok)
         return result;
-    return { ...result, mod: { ...result.mod, name: to_task_name(id) } };
+    return { ...result, mod: { ...result.mod, name: to_task_name(id) } }; // TODO this task name needs to use task root paths or cwd
 };
-export const find_task_modules = async (input_paths = [paths.lib], extensions = [TASK_FILE_SUFFIX_TS, TASK_FILE_SUFFIX_JS], root_dirs) => find_modules(input_paths, (id) => search_fs(id, { filter: (path) => is_task_path(path) }), (input_path) => get_possible_source_ids(input_path, extensions, root_dirs));
-export const load_task_modules = async (input_paths, extensions, root_dirs) => {
-    const find_modules_result = await find_task_modules(input_paths, extensions, root_dirs);
+export const find_task_modules = async (input_paths, root_dirs) => find_modules(input_paths, (id) => search_fs(id, { filter: (path) => is_task_path(path) }), (input_path) => get_possible_source_ids(input_path, [TASK_FILE_SUFFIX_TS, TASK_FILE_SUFFIX_JS], root_dirs));
+export const load_task_modules = async (input_paths, root_dirs) => {
+    const find_modules_result = await find_task_modules(input_paths, root_dirs);
     if (!find_modules_result.ok)
         return find_modules_result;
     return load_modules(find_modules_result.source_ids_by_input_path, load_task_module);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.116.1",
+  "version": "0.117.0",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "icon": "🌰",
@@ -51,11 +51,11 @@
     "es-module-lexer": "^1.5.3",
     "kleur": "^4.1.5",
     "mri": "^1.2.0",
-    "prettier": "^3.2.5",
-    "prettier-plugin-svelte": "^3.2.3",
+    "prettier": "^3.3.2",
+    "prettier-plugin-svelte": "^3.2.4",
     "tiny-glob": "^0.2.9",
     "ts-morph": "^22.0.0",
-    "tslib": "^2.6.2",
+    "tslib": "^2.6.3",
     "zod": "^3.23.8"
   },
   "peerDependencies": {
@@ -66,21 +66,21 @@
     "@changesets/changelog-git": "^0.2.0",
     "@changesets/types": "^6.0.0",
     "@ryanatkn/eslint-config": "^0.1.2",
-    "@ryanatkn/fuz": "^0.101.2",
-    "@ryanatkn/moss": "^0.3.0",
-    "@sveltejs/adapter-static": "^3.0.1",
-    "@sveltejs/kit": "^2.5.10",
-    "@sveltejs/package": "^2.3.1",
-    "@sveltejs/vite-plugin-svelte": "^3.1.0",
+    "@ryanatkn/fuz": "^0.102.1",
+    "@ryanatkn/moss": "^0.4.0",
+    "@sveltejs/adapter-static": "^3.0.2",
+    "@sveltejs/kit": "^2.5.13",
+    "@sveltejs/package": "^2.3.2",
+    "@sveltejs/vite-plugin-svelte": "^3.1.1",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.12.12",
-    "@typescript-eslint/eslint-plugin": "^7.10.0",
-    "@typescript-eslint/parser": "^7.10.0",
+    "@types/node": "^20.14.2",
+    "@typescript-eslint/eslint-plugin": "^7.13.0",
+    "@typescript-eslint/parser": "^7.13.0",
     "esbuild": "^0.20.2",
     "eslint": "^8.57.0",
-    "eslint-plugin-svelte": "^2.39.0",
-    "svelte": "^5.0.0-next.141",
-    "svelte-check": "^3.7.1",
+    "eslint-plugin-svelte": "^2.39.3",
+    "svelte": "^5.0.0-next.155",
+    "svelte-check": "^3.8.0",
     "typescript": "^5.4.5",
     "uvu": "^0.5.6"
   },
@@ -318,10 +318,6 @@
       "default": "./dist/plugin.js",
       "types": "./dist/plugin.d.ts"
     },
-    "./print_task.js": {
-      "default": "./dist/print_task.js",
-      "types": "./dist/print_task.d.ts"
-    },
     "./publish.task.js": {
       "default": "./dist/publish.task.js",
       "types": "./dist/publish.task.d.ts"
@@ -398,6 +394,10 @@
       "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"

package/dist/print_task.d.ts

@@ -1,4 +0,0 @@
-import { type Task_Module_Meta } from './task_module.js';
-export declare const log_available_tasks: (log: Logger, dir_label: string, source_ids_by_input_path: Map<string, string[]>, print_intro?: boolean) => Promise<void>;
-export declare const log_error_reasons: (log: Logger, reasons: string[]) => void;
-export declare const print_task_help: (log: Logger, meta: Task_Module_Meta) => void;