@ryanatkn/gro 0.117.0 → 0.119.0

package/dist/task.test.js

@@ -1,22 +1,18 @@
-import { suite } from 'uvu';
+import { test } from 'uvu';
 import * as assert from 'uvu/assert';
 import { is_task_path, to_task_name } from './task.js';
-/* test__is_task_path */
-const test__is_task_path = suite('is_task_path');
-test__is_task_path('basic behavior', () => {
+test('is_task_path basic behavior', () => {
     assert.ok(is_task_path('foo.task.ts'));
     assert.ok(is_task_path('foo.task.js'));
     assert.ok(!is_task_path('foo.ts'));
     assert.ok(is_task_path('bar/baz/foo.task.ts'));
     assert.ok(!is_task_path('bar/baz/foo.ts'));
 });
-test__is_task_path.run();
-/* test__is_task_path */
-/* test__to_task_name */
-const test__to_task_name = suite('to_task_name');
-test__to_task_name('basic behavior', () => {
-    assert.is(to_task_name('foo.task.ts'), 'foo');
-    assert.is(to_task_name('bar/baz/foo.task.ts'), 'bar/baz/foo');
+test('to_task_name basic behavior', () => {
+    assert.is(to_task_name('foo.task.ts', []), 'foo');
+    assert.is(to_task_name('bar/baz/foo.task.ts', []), 'bar/baz/foo');
+    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');
 });
-test__to_task_name.run();
-/* test__to_task_name */
+test.run();

package/dist/task_logging.d.ts

@@ -2,7 +2,7 @@ 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_tasks: (log: Logger, dir_label: string, source_ids_by_input_path: Map<Input_Path, Source_Id[]>, task_root_paths: string[], log_intro?: boolean) => Promise<void>;
+export declare const log_gro_package_tasks: (input_path: Flavored<string, "Input_Path">, task_root_paths: string[], 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/task_logging.js

@@ -8,11 +8,11 @@ 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) => {
+export const log_tasks = async (log, dir_label, source_ids_by_input_path, task_root_paths, 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 log their summary, and args for the `--help` flag.
-        const load_modules_result = await load_modules(source_ids_by_input_path, load_task_module);
+        const load_modules_result = await load_modules(source_ids_by_input_path, (id) => load_task_module(id, task_root_paths));
         if (!load_modules_result.ok) {
             log_error_reasons(log, load_modules_result.reasons);
             process.exit(1);
@@ -33,13 +33,13 @@ export const log_tasks = async (log, dir_label, source_ids_by_input_path, log_in
         log.info(`No tasks found in ${dir_label}.`);
     }
 };
-export const log_gro_package_tasks = async (input_path, log) => {
+export const log_gro_package_tasks = async (input_path, task_root_paths, 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);
+        await log_tasks(log, print_path_or_gro_path(gro_path_data.id), gro_dir_find_modules_result.source_ids_by_input_path, task_root_paths);
     }
     return gro_dir_find_modules_result;
 };
@@ -111,11 +111,9 @@ 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 ('type' in _def) {
-                return to_args_schema_type(_def.type);
-            }
-            else if ('innerType' in _def) {
-                return to_args_schema_type(_def.innerType);
+            const subschema = to_subschema(_def);
+            if (subschema) {
+                return to_args_schema_type(subschema);
             }
             else {
                 throw Error('Unknown zod type ' + t);
@@ -124,18 +122,34 @@ const to_args_schema_type = ({ _def }) => {
     }
 };
 const to_args_schema_description = ({ _def }) => {
-    if (_def.description)
+    if (_def.description) {
         return _def.description;
-    if ('innerType' in _def) {
-        return to_args_schema_description(_def.innerType);
+    }
+    const subschema = to_subschema(_def);
+    if (subschema) {
+        return to_args_schema_description(subschema);
     }
     return '';
 };
 const to_args_schema_default = ({ _def }) => {
-    if (_def.defaultValue)
+    if (_def.defaultValue) {
         return _def.defaultValue();
-    if ('innerType' in _def) {
-        return to_args_schema_default(_def.innerType);
+    }
+    const subschema = to_subschema(_def);
+    if (subschema) {
+        return to_args_schema_default(subschema);
+    }
+    return undefined;
+};
+const to_subschema = (_def) => {
+    if ('type' in _def) {
+        return _def.type;
+    }
+    else if ('innerType' in _def) {
+        return _def.innerType;
+    }
+    else if ('schema' in _def) {
+        return _def.schema;
     }
     return undefined;
 };

package/dist/task_module.d.ts

@@ -8,8 +8,8 @@ export interface Task_Module_Meta extends Module_Meta<Task_Module> {
     name: string;
 }
 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: 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>> | ({
+export declare const load_task_module: (id: string, task_root_paths: string[]) => Promise<Load_Module_Result<Task_Module_Meta>>;
+export declare const find_task_modules: (input_paths: Input_Path[], task_root_paths: string[]) => Promise<ReturnType<typeof find_modules>>;
+export declare const load_task_modules: (input_paths: Input_Path[], task_root_paths: string[]) => Promise<ReturnType<typeof load_modules<Task_Module, Task_Module_Meta>> | ({
     ok: false;
 } & Find_Modules_Failure)>;

package/dist/task_module.js

@@ -3,16 +3,16 @@ import { to_task_name, is_task_path, TASK_FILE_SUFFIX_TS, TASK_FILE_SUFFIX_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) => {
+export const load_task_module = async (id, task_root_paths) => {
     const result = await load_module(id, validate_task_module);
     if (!result.ok)
         return result;
-    return { ...result, mod: { ...result.mod, name: to_task_name(id) } }; // TODO this task name needs to use task root paths or cwd
+    return { ...result, mod: { ...result.mod, name: to_task_name(id, task_root_paths) } }; // TODO this task name needs to use task root paths or cwd
 };
-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);
+export const find_task_modules = async (input_paths, task_root_paths) => 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], task_root_paths));
+export const load_task_modules = async (input_paths, task_root_paths) => {
+    const find_modules_result = await find_task_modules(input_paths, task_root_paths);
     if (!find_modules_result.ok)
         return find_modules_result;
-    return load_modules(find_modules_result.source_ids_by_input_path, load_task_module);
+    return load_modules(find_modules_result.source_ids_by_input_path, (id) => load_task_module(id, task_root_paths));
 };

package/dist/task_module.test.js

@@ -21,7 +21,7 @@ const test__load_task_module = suite('load_task_module');
 test__load_task_module('basic behavior', async () => {
     const name = 'fixtures/test_task_module.task_fixture.js';
     const id = resolve('src/' + name);
-    const result = await load_task_module(id);
+    const result = await load_task_module(id, []);
     assert.ok(result.ok);
     assert.is(result.mod.id, id);
     assert.is(result.mod.id, id);
@@ -30,7 +30,7 @@ test__load_task_module('basic behavior', async () => {
 });
 test__load_task_module('invalid module', async () => {
     const id = resolve('src/fixtures/test_invalid_task_module.js');
-    const result = await load_task_module(id);
+    const result = await load_task_module(id, []);
     assert.ok(!result.ok);
     if (result.type === 'invalid') {
         assert.is(result.id, id);
@@ -43,7 +43,7 @@ test__load_task_module('invalid module', async () => {
 });
 test__load_task_module('failing module', async () => {
     const id = resolve('src/fixtures/test_failing_task_module.js');
-    const result = await load_task_module(id);
+    const result = await load_task_module(id, []);
     assert.ok(!result.ok);
     if (result.type === 'importFailed') {
         assert.is(result.id, id);
@@ -58,10 +58,7 @@ test__load_task_module.run();
 /* test__load_task_modules */
 const test__load_task_modules = suite('load_task_modules');
 test__load_task_modules('basic behavior', async () => {
-    const result = await load_task_modules([
-        resolve('src/lib/test'),
-        resolve('src/lib/test.task.ts'),
-    ]);
+    const result = await load_task_modules([resolve('src/lib/test'), resolve('src/lib/test.task.ts')], [resolve('src/lib')]);
     assert.ok(result.ok);
     assert.is(result.modules.length, 1);
     assert.is(result.modules[0].mod, actual_test_task_module);

package/dist/typecheck.task.js

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { Task_Error } from './task.js';
 import { print_command_args, serialize_args, to_forwarded_args } from './args.js';
 import { find_cli, spawn_cli } from './cli.js';
-import { sveltekit_sync } from './sync.task.js';
+import { sveltekit_sync } from './sveltekit_helpers.js';
 export const Args = z.object({}).strict();
 export const task = {
     summary: 'run tsc on the project without emitting any files',

package/dist/upgrade.task.d.ts

@@ -1,7 +1,8 @@
 import { z } from 'zod';
-import type { Task } from './task.js';
+import { type Task } from './task.js';
 export declare const Args: z.ZodObject<{
     _: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
+    only: z.ZodEffects<z.ZodDefault<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>, string[], string | string[] | undefined>;
     origin: z.ZodDefault<z.ZodBranded<z.ZodString, "Git_Origin">>;
     force: z.ZodDefault<z.ZodBoolean>;
     pull: z.ZodDefault<z.ZodBoolean>;
@@ -14,6 +15,7 @@ export declare const Args: z.ZodObject<{
     dry: boolean;
     force: boolean;
     'no-pull': boolean;
+    only: string[];
 }, {
     _?: string[] | undefined;
     origin?: string | undefined;
@@ -21,6 +23,7 @@ export declare const Args: z.ZodObject<{
     dry?: boolean | undefined;
     force?: boolean | undefined;
     'no-pull'?: boolean | undefined;
+    only?: string | string[] | undefined;
 }>;
 export type Args = z.infer<typeof Args>;
 export declare const task: Task<Args>;

package/dist/upgrade.task.js

@@ -1,10 +1,18 @@
 import { spawn } from '@ryanatkn/belt/process.js';
 import { z } from 'zod';
+import { Task_Error } from './task.js';
 import { load_package_json } from './package_json.js';
 import { Git_Origin, git_pull } from './git.js';
+import { spawn_cli } from './cli.js';
 export const Args = z
     .object({
     _: z.array(z.string(), { description: 'names of deps to exclude from the upgrade' }).default([]),
+    only: z
+        .union([z.string(), z.array(z.string())], {
+        description: 'names of deps to include in the upgrade',
+    })
+        .default([])
+        .transform((v) => (Array.isArray(v) ? v : [v])),
     origin: Git_Origin.describe('git origin to deploy to').default('origin'),
     force: z.boolean({ description: 'if true, print out the planned upgrades' }).default(false),
     pull: z.boolean({ description: 'dual of no-pull' }).default(true),
@@ -15,14 +23,23 @@ export const Args = z
 export const task = {
     summary: 'upgrade deps',
     Args,
-    run: async ({ args, log, invoke_task }) => {
-        const { _, origin, force, pull, dry } = args;
+    run: async ({ args, log }) => {
+        const { _, only, origin, force, pull, dry } = args;
+        if (_.length && only.length) {
+            throw new Task_Error('Cannot call `gro upgrade` with both rest args and --only.');
+        }
         // TODO maybe a different task that pulls and does other things, like `gro ready`
         if (pull) {
             await git_pull(origin);
         }
         const package_json = await load_package_json();
-        const deps = to_deps(package_json).filter((d) => !_.includes(d.key));
+        const all_deps = to_deps(package_json);
+        const deps = only.length
+            ? all_deps.filter((d) => only.includes(d.key))
+            : all_deps.filter((d) => !_.includes(d.key));
+        if (only.length && only.length !== deps.length) {
+            throw new Task_Error(`Some deps to upgrade were not found: ${only.filter((o) => !deps.find((d) => d.key === o)).join(', ')}`);
+        }
         const upgrade_items = to_upgrade_items(deps);
         log.info(`upgrading:`, upgrade_items.join(' '));
         const install_args = ['install'].concat(upgrade_items);
@@ -34,7 +51,8 @@ export const task = {
             install_args.push('--force');
         }
         await spawn('npm', install_args);
-        await invoke_task('sync');
+        // Sync in a new process to pick up any changes after installing, avoiding some errors.
+        await spawn_cli('gro', ['sync']);
     },
 };
 const to_deps = (package_json) => {
@@ -46,4 +64,11 @@ const to_deps = (package_json) => {
         : [];
     return prod_deps.concat(dev_deps);
 };
-const to_upgrade_items = (deps) => deps.map((dep) => dep.key + (dep.value.includes('-next.') ? '@next' : '@latest'));
+// 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')) {
+        return dep.key;
+    }
+    return dep.key + (dep.value.includes('-next.') ? '@next' : '@latest');
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.117.0",
+  "version": "0.119.0",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "icon": "🌰",
@@ -69,7 +69,7 @@
     "@ryanatkn/fuz": "^0.102.1",
     "@ryanatkn/moss": "^0.4.0",
     "@sveltejs/adapter-static": "^3.0.2",
-    "@sveltejs/kit": "^2.5.13",
+    "@sveltejs/kit": "^2.5.16",
     "@sveltejs/package": "^2.3.2",
     "@sveltejs/vite-plugin-svelte": "^3.1.1",
     "@types/fs-extra": "^11.0.4",
@@ -78,7 +78,7 @@
     "@typescript-eslint/parser": "^7.13.0",
     "esbuild": "^0.20.2",
     "eslint": "^8.57.0",
-    "eslint-plugin-svelte": "^2.39.3",
+    "eslint-plugin-svelte": "^2.39.4",
     "svelte": "^5.0.0-next.155",
     "svelte-check": "^3.8.0",
     "typescript": "^5.4.5",
@@ -306,6 +306,10 @@
       "default": "./dist/package.js",
       "types": "./dist/package.d.ts"
     },
+    "./path_constants.js": {
+      "default": "./dist/path_constants.js",
+      "types": "./dist/path_constants.d.ts"
+    },
     "./path.js": {
       "default": "./dist/path.js",
       "types": "./dist/path.d.ts"
@@ -322,6 +326,14 @@
       "default": "./dist/publish.task.js",
       "types": "./dist/publish.task.d.ts"
     },
+    "./register.js": {
+      "default": "./dist/register.js",
+      "types": "./dist/register.d.ts"
+    },
+    "./reinstall.task.js": {
+      "default": "./dist/reinstall.task.js",
+      "types": "./dist/reinstall.task.d.ts"
+    },
     "./release.task.js": {
       "default": "./dist/release.task.js",
       "types": "./dist/release.task.d.ts"
@@ -358,10 +370,18 @@
       "default": "./dist/svelte_helpers.js",
       "types": "./dist/svelte_helpers.d.ts"
     },
+    "./sveltekit_config_global.js": {
+      "default": "./dist/sveltekit_config_global.js",
+      "types": "./dist/sveltekit_config_global.d.ts"
+    },
     "./sveltekit_config.js": {
       "default": "./dist/sveltekit_config.js",
       "types": "./dist/sveltekit_config.d.ts"
     },
+    "./sveltekit_helpers.js": {
+      "default": "./dist/sveltekit_helpers.js",
+      "types": "./dist/sveltekit_helpers.d.ts"
+    },
     "./sveltekit_shim_app_environment.js": {
       "default": "./dist/sveltekit_shim_app_environment.js",
       "types": "./dist/sveltekit_shim_app_environment.d.ts"