@ryanatkn/gro 0.119.0 → 0.119.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.119.0',
+    version: '0.119.1',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     icon: '🌰',
@@ -258,7 +258,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.119.0',
+    version: '0.119.1',
     modules: {
         '.': {
             path: 'index.ts',

package/dist/task.js

@@ -3,15 +3,19 @@ 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);
 export const to_task_name = (id, task_root_paths) => {
-    let base_path = id;
-    // If the id is in any of the task root paths, use the first match and strip it.
-    for (const task_root_path of task_root_paths) {
-        if (id.startsWith(task_root_path)) {
-            base_path = strip_start(strip_start(id, task_root_path), '/');
-            break;
+    // If the id is in any of the task root paths, use the longest available match and strip it.
+    // This is convoluted because we're not tracking which root path was resolved against the id.
+    // TODO improve the data flow of id from task root path so this is unnecessary
+    let longest_matching_path = '';
+    for (const path of task_root_paths) {
+        if (id.startsWith(path) && path.length > longest_matching_path.length) {
+            longest_matching_path = path;
         }
     }
-    return strip_end(strip_end(base_path, TASK_FILE_SUFFIX_TS), TASK_FILE_SUFFIX_JS);
+    const task_name = longest_matching_path
+        ? strip_start(strip_start(id, longest_matching_path), '/')
+        : id;
+    return strip_end(strip_end(task_name, TASK_FILE_SUFFIX_TS), TASK_FILE_SUFFIX_JS);
 };
 /**
  * This is used by tasks to signal a known failure.

package/dist/task.test.js

@@ -1,5 +1,6 @@
 import { test } from 'uvu';
 import * as assert from 'uvu/assert';
+import { resolve } from 'node:path';
 import { is_task_path, to_task_name } from './task.js';
 test('is_task_path basic behavior', () => {
     assert.ok(is_task_path('foo.task.ts'));
@@ -14,5 +15,10 @@ test('to_task_name basic behavior', () => {
     assert.is(to_task_name('a/b/c/foo.task.ts', ['a/b/c', 'a']), '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']), 'c/foo');
+    assert.is(to_task_name(resolve('node_modules/@ryanatkn/gro/dist/foo'), [
+        resolve('./'),
+        resolve('node_modules/@ryanatkn/gro/dist/'),
+    ]), 'foo', 'resolves to node_modules before the cwd');
+    assert.is(to_task_name(resolve('a/b'), [resolve('b')]), resolve('a/b'), 'falls back to the id when unresolved');
 });
 test.run();

package/package.json

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