@ryanatkn/gro 0.122.0 → 0.123.0

package/README.md

@@ -122,7 +122,7 @@ lint       run eslint
 publish    bump version, publish to npm, and git push
 reinstall  refreshes package-lock.json with the latest and cleanest deps
 release    publish and deploy
-resolve    run `gro gen`, update `package.json`, and optionally `npm i` to sync up
+resolve    diagnostic that logs resolved filesystem info for the given input paths
 run        execute a file with the loader, like `node` but works for TypeScript
 sync       run `gro gen`, update `package.json`, and optionally `npm i` to sync up
 test       run tests with uvu

package/dist/docs/tasks.md

@@ -19,7 +19,7 @@ What is a `Task`? See [`task.md`](./task.md).
 - [publish](../publish.task.ts) - bump version, publish to npm, and git push
 - [reinstall](../reinstall.task.ts) - refreshes package-lock.json with the latest and cleanest deps
 - [release](../release.task.ts) - publish and deploy
-- [resolve](../resolve.task.ts) - diagnostic that logs the info resolved from the filesystem for the given input paths
+- [resolve](../resolve.task.ts) - diagnostic that logs resolved filesystem info for the given input paths
 - [run](../run.task.ts) - execute a file with the loader, like `node` but works for TypeScript
 - [sync](../sync.task.ts) - run `gro gen`, update `package.json`, and optionally `npm i` to sync up
 - [test](../test.task.ts) - run tests with uvu

package/dist/input_path.js

@@ -134,6 +134,10 @@ export const resolve_input_files = (resolved_input_paths, search = search_fs) =>
     const resolved_input_files = [];
     // Add all input paths initially, and remove each when resolved to a file.
     const existing_path_ids = new Set();
+    let remaining = resolved_input_paths.slice();
+    const handle_found = (input_path, id) => {
+        remaining = remaining.filter((r) => !(r.id === id || r.input_path === input_path || r.input_path === id));
+    };
     // TODO parallelize but would need to de-dupe and retain order
     for (const resolved_input_path of resolved_input_paths) {
         const { input_path, id, is_directory } = resolved_input_path;
@@ -151,6 +155,7 @@ export const resolve_input_files = (resolved_input_paths, search = search_fs) =>
                     existing_path_ids.add(path_id);
                     path_ids.push(path_id);
                 }
+                handle_found(input_path, path_id);
             }
             if (!path_ids.length)
                 continue;
@@ -165,11 +170,14 @@ export const resolve_input_files = (resolved_input_paths, search = search_fs) =>
                 resolved_input_files_for_input_path.push(resolved_input_file);
             }
         }
-        else if (!existing_path_ids.has(id)) {
-            // Handle input paths that resolve to files.
-            existing_path_ids.add(id);
-            const resolved_input_file = { id, input_path, resolved_input_path };
-            resolved_input_files.push(resolved_input_file);
+        else {
+            if (!existing_path_ids.has(id)) {
+                // Handle input paths that resolve to files.
+                existing_path_ids.add(id);
+                const resolved_input_file = { id, input_path, resolved_input_path };
+                resolved_input_files.push(resolved_input_file);
+            }
+            handle_found(input_path, id);
         }
     }
     return {
@@ -184,6 +192,6 @@ export const resolve_input_files = (resolved_input_paths, search = search_fs) =>
             }
             return map;
         }, new Map()),
-        input_directories_with_no_files: Array.from(new Set(resolved_input_paths.map((p) => p.input_path)).difference(new Set(resolved_input_files.map((f) => [f.input_path, f.id]).flat()))),
+        input_directories_with_no_files: remaining.map((r) => r.input_path),
     };
 };

package/dist/input_path.test.js

@@ -92,25 +92,30 @@ test('get_possible_paths implied to be a directory by trailing slash', () => {
 });
 test('resolve_input_files', async () => {
     const test_files = {
-        'fake/test1.ext.ts': [{ id: '', path: 'fake/test1.ext.ts', is_directory: false }],
-        'fake/test2.ext.ts': [{ id: '', path: 'fake/test2.ext.ts', is_directory: false }],
+        'fake/test1.ext.ts': [
+            { id: 'fake/test1.ext.ts', path: 'fake/test1.ext.ts', is_directory: false },
+        ],
+        'fake/test2.ext.ts': [
+            { id: 'fake/test2.ext.ts', path: 'fake/test2.ext.ts', is_directory: false },
+        ],
         'fake/test3': [
-            { id: '', path: 'fake/test3', is_directory: true },
-            { id: '', path: 'a.ts', is_directory: false },
-            { id: '', path: 'b.ts', is_directory: false },
+            { id: 'fake/test3', path: 'fake/test3', is_directory: true },
+            { id: 'a.ts', path: 'a.ts', is_directory: false },
+            { id: 'b.ts', path: 'b.ts', is_directory: false },
         ],
         // duplicate
         'fake/': [
-            { id: '', path: 'fake/test3', is_directory: true },
-            { id: '', path: 'test3/a.ts', is_directory: false },
+            { id: 'fake/test3', path: 'fake/test3', is_directory: true },
+            { id: 'test3/a.ts', path: 'test3/a.ts', is_directory: false },
         ],
         // duplicate and not
         fake: [
-            { id: '', path: 'fake/test3', is_directory: true },
-            { id: '', path: 'test3/a.ts', is_directory: false },
-            { id: '', path: 'test3/c.ts', is_directory: false },
+            { id: 'fake/test3', path: 'fake/test3', is_directory: true },
+            { id: 'test3/a.ts', path: 'test3/a.ts', is_directory: false },
+            { id: 'test3/c.ts', path: 'test3/c.ts', is_directory: false },
         ],
-        'fake/nomatches': [{ id: '', path: 'fake/nomatches', is_directory: true }],
+        'fake/nomatches': [{ id: 'fake/nomatches', path: 'fake/nomatches', is_directory: true }],
+        fake2: [{ id: 'test.ext.ts', path: 'test.ext.ts', is_directory: false }],
     };
     const a = {
         id: 'fake/test1.ext.ts',
@@ -142,13 +147,41 @@ test('resolve_input_files', async () => {
         input_path: 'fake/nomatches',
         root_dir: process.cwd(),
     };
-    const result = resolve_input_files([a, b, c, d, e], (id) => test_files[id]);
+    // These two have the same id from different directory input paths.
+    const f = {
+        id: 'fake2',
+        is_directory: true,
+        input_path: 'fake2',
+        root_dir: process.cwd(),
+    };
+    const g = {
+        id: 'fake2',
+        is_directory: true,
+        input_path: './fake2/',
+        root_dir: process.cwd(),
+    };
+    // These two have the same id from different file input paths.
+    const h = {
+        id: 'fake3/test.ext.ts',
+        is_directory: false,
+        input_path: 'fake3/test.ext.ts',
+        root_dir: process.cwd(),
+    };
+    const i = {
+        id: 'fake3/test.ext.ts',
+        is_directory: false,
+        input_path: 'fake3/test',
+        root_dir: process.cwd(),
+    };
+    const result = resolve_input_files([a, b, c, d, e, f, g, h, i], (dir) => test_files[dir]);
     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 },
         { id: 'fake/test3/a.ts', input_path: c.input_path, resolved_input_path: c },
         { id: 'fake/test3/b.ts', input_path: c.input_path, resolved_input_path: c },
         { id: 'fake/test3/c.ts', input_path: d.input_path, resolved_input_path: d },
+        { id: 'fake2/test.ext.ts', input_path: f.input_path, resolved_input_path: f },
+        { id: 'fake3/test.ext.ts', input_path: h.input_path, resolved_input_path: h },
     ];
     assert.equal(result, {
         resolved_input_files,
@@ -156,11 +189,13 @@ test('resolve_input_files', async () => {
             [
                 process.cwd(),
                 [
-                    { id: 'fake/test1.ext.ts', input_path: 'fake/test1.ext.ts', resolved_input_path: a },
-                    { id: 'fake/test2.ext.ts', input_path: 'fake/test2', resolved_input_path: b },
-                    { id: 'fake/test3/a.ts', input_path: 'fake/test3', resolved_input_path: c },
-                    { id: 'fake/test3/b.ts', input_path: 'fake/test3', resolved_input_path: c },
-                    { id: 'fake/test3/c.ts', input_path: 'fake', resolved_input_path: d },
+                    { id: 'fake/test1.ext.ts', input_path: a.input_path, resolved_input_path: a },
+                    { id: 'fake/test2.ext.ts', input_path: b.input_path, resolved_input_path: b },
+                    { id: 'fake/test3/a.ts', input_path: c.input_path, resolved_input_path: c },
+                    { id: 'fake/test3/b.ts', input_path: c.input_path, resolved_input_path: c },
+                    { id: 'fake/test3/c.ts', input_path: d.input_path, resolved_input_path: d },
+                    { id: 'fake2/test.ext.ts', input_path: f.input_path, resolved_input_path: f },
+                    { id: 'fake3/test.ext.ts', input_path: h.input_path, resolved_input_path: h },
                 ],
             ],
         ]),

package/dist/package.js

@@ -1,7 +1,7 @@
 // generated by src/lib/package.gen.ts
 export const package_json = {
     name: '@ryanatkn/gro',
-    version: '0.122.0',
+    version: '0.123.0',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     icon: '🌰',
@@ -58,8 +58,8 @@ export const package_json = {
         '@sveltejs/vite-plugin-svelte': '^3.1.1',
         '@types/fs-extra': '^11.0.4',
         '@types/node': '^20.14.8',
-        '@typescript-eslint/eslint-plugin': '^7.13.1',
-        '@typescript-eslint/parser': '^7.13.1',
+        '@typescript-eslint/eslint-plugin': '^7.14.1',
+        '@typescript-eslint/parser': '^7.14.1',
         esbuild: '^0.20.2',
         eslint: '^8.57.0',
         'eslint-plugin-svelte': '^2.41.0',
@@ -256,7 +256,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.122.0',
+    version: '0.123.0',
     modules: {
         '.': {
             path: 'index.ts',

package/dist/resolve.task.js

@@ -7,7 +7,7 @@ export const Args = z
 })
     .strict();
 export const task = {
-    summary: 'diagnostic that logs the info resolved from the filesystem for the given input paths',
+    summary: 'diagnostic that logs resolved filesystem info for the given input paths',
     Args,
     run: async ({ args, config, log }) => {
         const { _ } = args;

package/dist/task.d.ts

@@ -26,7 +26,7 @@ export declare const TASK_FILE_SUFFIX_TS = ".task.ts";
 export declare const TASK_FILE_SUFFIX_JS = ".task.js";
 export declare const TASK_FILE_SUFFIXES: string[];
 export declare const is_task_path: (path: string) => boolean;
-export declare const to_task_name: (id: Path_Id, task_root_dir: Path_Id) => string;
+export declare const to_task_name: (id: Path_Id, task_root_dir: Path_Id, input_path: Input_Path, root_path: Path_Id) => string;
 /**
  * This is used by tasks to signal a known failure.
  * It's useful for cleaning up logging because
@@ -84,5 +84,5 @@ export type Load_Tasks_Result = Result<{
     value: Loaded_Tasks;
 }, Load_Tasks_Failure>;
 export type Load_Tasks_Failure = Load_Modules_Failure<Task_Module_Meta>;
-export declare const load_tasks: (found_tasks: Found_Tasks) => Promise<Load_Tasks_Result>;
+export declare const load_tasks: (found_tasks: Found_Tasks, root_path?: Path_Id) => Promise<Load_Tasks_Result>;
 export declare const validate_task_module: (mod: Record<string, any>) => mod is Task_Module;

package/dist/task.js

@@ -1,5 +1,6 @@
 import { strip_end, strip_start } from '@ryanatkn/belt/string.js';
 import { red } from 'kleur/colors';
+import { isAbsolute, join, relative } from 'node:path';
 import { resolve_input_files, resolve_input_paths, } from './input_path.js';
 import { print_path } from './paths.js';
 import { search_fs } from './search_fs.js';
@@ -8,13 +9,16 @@ export const TASK_FILE_SUFFIX_TS = '.task.ts';
 export const TASK_FILE_SUFFIX_JS = '.task.js';
 export const TASK_FILE_SUFFIXES = [TASK_FILE_SUFFIX_TS, TASK_FILE_SUFFIX_JS]; // TODO from `Gro_Config`, but needs to be used everywhere the constants are
 export const is_task_path = (path) => path.endsWith(TASK_FILE_SUFFIX_TS) || path.endsWith(TASK_FILE_SUFFIX_JS);
-export const to_task_name = (id, task_root_dir) => {
+export const to_task_name = (id, task_root_dir, input_path, root_path) => {
     let task_name = id.startsWith(task_root_dir)
         ? strip_start(strip_start(id, task_root_dir), '/')
         : id;
     for (const suffix of TASK_FILE_SUFFIXES) {
         task_name = strip_end(task_name, suffix);
     }
+    if (isAbsolute(input_path)) {
+        return relative(root_path, join(input_path, task_name));
+    }
     return task_name;
 };
 /**
@@ -76,11 +80,11 @@ export const find_tasks = (input_paths, task_root_dirs, config, timings) => {
         },
     };
 };
-export const load_tasks = async (found_tasks) => {
+export const load_tasks = async (found_tasks, root_path = process.cwd()) => {
     const loaded_modules = await load_modules(found_tasks.resolved_input_files, validate_task_module, (resolved_input_file, mod) => ({
         id: resolved_input_file.id,
         mod,
-        name: to_task_name(resolved_input_file.id, resolved_input_file.resolved_input_path.root_dir),
+        name: to_task_name(resolved_input_file.id, resolved_input_file.resolved_input_path.root_dir, resolved_input_file.resolved_input_path.input_path, root_path),
     }));
     if (!loaded_modules.ok) {
         return loaded_modules;

package/dist/task.test.js

@@ -12,12 +12,15 @@ test('is_task_path basic behavior', () => {
     assert.ok(!is_task_path('bar/baz/foo.ts'));
 });
 test('to_task_name basic behavior', () => {
-    assert.is(to_task_name('foo.task.ts', process.cwd()), 'foo');
-    assert.is(to_task_name('bar/baz/foo.task.ts', process.cwd()), 'bar/baz/foo');
-    assert.is(to_task_name('a/b/c/foo.task.ts', 'a/b/c'), 'foo');
-    assert.is(to_task_name('a/b/c/foo.task.ts', 'a'), 'b/c/foo');
-    assert.is(to_task_name('a/b/c/foo.task.ts', 'a/b'), 'c/foo');
-    assert.is(to_task_name(resolve('a/b'), resolve('b')), resolve('a/b'), 'falls back to the id when unresolved');
+    assert.is(to_task_name('foo.task.ts', process.cwd(), '', ''), 'foo');
+    assert.is(to_task_name('bar/baz/foo.task.ts', process.cwd(), '', ''), 'bar/baz/foo');
+    assert.is(to_task_name('a/b/c/foo.task.ts', 'a/b/c', '', ''), 'foo');
+    assert.is(to_task_name('a/b/c/foo.task.ts', 'a', '', ''), 'b/c/foo');
+    assert.is(to_task_name('a/b/c/foo.task.ts', 'a/b', '', ''), 'c/foo');
+    assert.is(to_task_name('/a/b/c/foo.task.ts', '/a/b', '/a/b', '/a/b/d'), '../c/foo');
+    assert.is(to_task_name('/a/b/c/foo.task.ts', '/a/b', '/a/b', '/a/b'), 'c/foo');
+    assert.is(to_task_name('/a/b/c/foo.task.ts', '/a/b', '/a/b', '/a/b/c'), 'foo');
+    assert.is(to_task_name(resolve('a/b'), resolve('b'), '', ''), resolve('a/b'), 'falls back to the id when unresolved');
 });
 // TODO if we import directly, svelte-package generates types in `src/fixtures`
 const test_task_module = await import('../fixtures/' + 'test_task_module.task_fixture'); // eslint-disable-line no-useless-concat

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.122.0",
+  "version": "0.123.0",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "icon": "🌰",
@@ -73,8 +73,8 @@
     "@sveltejs/vite-plugin-svelte": "^3.1.1",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.14.8",
-    "@typescript-eslint/eslint-plugin": "^7.13.1",
-    "@typescript-eslint/parser": "^7.13.1",
+    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/parser": "^7.14.1",
     "esbuild": "^0.20.2",
     "eslint": "^8.57.0",
     "eslint-plugin-svelte": "^2.41.0",