@ryanatkn/gro 0.129.1 → 0.129.2

package/dist/package.js

@@ -1,7 +1,7 @@
 // generated by src/lib/package.gen.ts
 export const package_json = {
     name: '@ryanatkn/gro',
-    version: '0.129.1',
+    version: '0.129.2',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     glyph: '🌰',
@@ -56,7 +56,7 @@ export const package_json = {
         '@changesets/changelog-git': '^0.2.0',
         '@changesets/types': '^6.0.0',
         '@ryanatkn/eslint-config': '^0.4.0',
-        '@ryanatkn/fuz': '^0.108.2',
+        '@ryanatkn/fuz': '^0.108.3',
         '@ryanatkn/moss': '^0.7.0',
         '@sveltejs/adapter-static': '^3.0.2',
         '@sveltejs/kit': '^2.5.18',
@@ -266,7 +266,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.129.1',
+    version: '0.129.2',
     modules: {
         '.': {
             path: 'index.ts',

package/dist/resolve.task.d.ts

@@ -2,10 +2,13 @@ import { z } from 'zod';
 import { type Task } from './task.js';
 export declare const Args: z.ZodObject<{
     _: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
+    verbose: z.ZodDefault<z.ZodBoolean>;
 }, "strict", z.ZodTypeAny, {
     _: string[];
+    verbose: boolean;
 }, {
     _?: string[] | undefined;
+    verbose?: boolean | undefined;
 }>;
 export type Args = z.infer<typeof Args>;
 export declare const task: Task<Args>;

package/dist/resolve.task.js

@@ -1,24 +1,38 @@
 import { z } from 'zod';
+import { green, yellow } from '@ryanatkn/belt/styletext.js';
 import { TASK_FILE_SUFFIXES } from './task.js';
 import { resolve_input_paths, to_input_paths } from './input_path.js';
 export const Args = z
     .object({
     _: z.array(z.string(), { description: 'the input paths to resolve' }).default(['']),
+    verbose: z.boolean({ description: 'log diagnostics' }).default(false),
 })
     .strict();
 export const task = {
     summary: 'diagnostic that logs resolved filesystem info for the given input paths',
     Args,
     run: ({ args, config, log }) => {
-        const { _ } = args;
-        log.info('raw input paths:', _);
+        const { _, verbose } = args;
+        if (verbose)
+            log.info('raw input paths:', _);
         const input_paths = to_input_paths(_);
-        log.info('input paths:', input_paths);
+        if (verbose)
+            log.info('input paths:', input_paths);
         const { task_root_dirs } = config;
-        log.info('task root paths:', task_root_dirs);
+        if (verbose)
+            log.info('task root paths:', task_root_dirs);
         const { resolved_input_paths, possible_paths_by_input_path, unmapped_input_paths } = resolve_input_paths(input_paths, task_root_dirs, TASK_FILE_SUFFIXES);
-        log.info('resolved_input_paths:', resolved_input_paths);
-        log.info('possible_paths_by_input_path:', possible_paths_by_input_path);
-        log.info('unmapped_input_paths:', unmapped_input_paths);
+        if (verbose)
+            log.info('resolved_input_paths:', resolved_input_paths);
+        if (verbose)
+            log.info('possible_paths_by_input_path:', possible_paths_by_input_path);
+        if (verbose)
+            log.info('unmapped_input_paths:', unmapped_input_paths);
+        for (const p of resolved_input_paths) {
+            log.info('resolved:', green(p.id));
+        }
+        if (!resolved_input_paths.length) {
+            log.warn(yellow('no input paths were resolved'));
+        }
     },
 };

package/dist/task.js

@@ -17,7 +17,12 @@ export const to_task_name = (id, task_root_dir, input_path, root_path) => {
         task_name = strip_end(task_name, suffix);
     }
     if (isAbsolute(input_path)) {
-        return relative(root_path, join(input_path, task_name));
+        // is a bit hacky, but does what we want
+        const relative_to_root = relative(root_path, join(task_root_dir, task_name));
+        if (relative_to_root.startsWith('node_modules/')) {
+            return task_name;
+        }
+        return relative_to_root;
     }
     return task_name;
 };

package/dist/task.test.js

@@ -20,6 +20,11 @@ test('to_task_name basic behavior', () => {
     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('/a/b/d/foo.task.js', '/a/b/d', '/a/b/d/foo', '/a/c'), '../b/d/foo');
+    assert.is(to_task_name('/a/node_modules/b/c/foo.task.js', '/a/node_modules/b/c', '/a/node_modules/b/c/foo', '/a'), 'foo');
+    assert.is(to_task_name('/a/node_modules/b/c/foo.task.js', '/a/node_modules/b/c/', // compared to the above, adds a trailing slash here
+    '/a/node_modules/b/c/foo', '/a'), 'foo');
+    assert.is(to_task_name('/a/node_modules/b/c/foo.task.js', '/a/node_modules/b/c', '/a/node_modules/b/c/foo', '/a/'), '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`

package/dist/upgrade.task.js

@@ -64,11 +64,17 @@ const to_deps = (package_json) => {
         : [];
     return prod_deps.concat(dev_deps);
 };
+const EXACT_VERSION_MATCHER = /^..*@.+/u;
+const CUSTOM_TAG_MATCHER = /^[\^~><=]*.+-(.+)/u;
 // TODO hacky and limited
 // TODO probably want to pass through exact deps as well, e.g. @foo/bar@1
 const to_upgrade_items = (deps) => deps.map((dep) => {
-    if (dep.key.endsWith('@next') || dep.key.endsWith('@latest')) {
+    if (EXACT_VERSION_MATCHER.test(dep.key)) {
         return dep.key;
     }
-    return dep.key + (dep.value.includes('-next.') ? '@next' : '@latest');
+    const custom_tag_matches = CUSTOM_TAG_MATCHER.exec(dep.value);
+    if (custom_tag_matches) {
+        return dep.key + '@' + custom_tag_matches[1].split('.')[0]; // I tried adding `\.?` to the end but doesn't work and I'm being lazy so I'm just splitting
+    }
+    return dep.key + '@latest';
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.129.1",
+  "version": "0.129.2",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
@@ -69,7 +69,7 @@
     "@changesets/changelog-git": "^0.2.0",
     "@changesets/types": "^6.0.0",
     "@ryanatkn/eslint-config": "^0.4.0",
-    "@ryanatkn/fuz": "^0.108.2",
+    "@ryanatkn/fuz": "^0.108.3",
     "@ryanatkn/moss": "^0.7.0",
     "@sveltejs/adapter-static": "^3.0.2",
     "@sveltejs/kit": "^2.5.18",