@ryanatkn/gro 0.163.0 → 0.164.1

package/dist/filer.d.ts

@@ -4,8 +4,7 @@ import type { Package_Json } from '@ryanatkn/belt/package_json.js';
 import type { File_Filter, Path_Id } from './path.ts';
 import { watch_dir, type Watcher_Change, type Watch_Dir_Options } from './watch_dir.ts';
 import type { Disknode } from './disknode.ts';
-export type Cleanup_Watch = () => Promise<void>;
-export type On_Filer_Change = (change: Watcher_Change, source_file: Disknode) => void;
+export type On_Filer_Change = (change: Watcher_Change, disknode: Disknode) => void;
 export interface Filer_Options {
     watch_dir?: typeof watch_dir;
     watch_dir_options?: Partial<Omit_Strict<Watch_Dir_Options, 'on_change'>>;
@@ -17,10 +16,17 @@ export declare class Filer {
     readonly root_dir: Path_Id;
     readonly files: Map<Path_Id, Disknode>;
     constructor(options?: Filer_Options);
+    get inited(): boolean;
     get_by_id: (id: Path_Id) => Disknode | undefined;
     get_or_create: (id: Path_Id) => Disknode;
-    watch(listener: On_Filer_Change): Promise<Cleanup_Watch>;
+    /**
+     * Initialize the filer to populate files without watching.
+     * Safe to call multiple times - subsequent calls are no-ops.
+     * Used by gen files to access the file graph.
+     */
+    init(): Promise<void>;
+    watch(listener: On_Filer_Change): Promise<() => void>;
     close(): Promise<void>;
 }
-export declare const filter_dependents: (source_file: Disknode, get_by_id: (id: Path_Id) => Disknode | undefined, filter?: File_Filter, results?: Set<string>, searched?: Set<string>, log?: Logger) => Set<string>;
+export declare const filter_dependents: (disknode: Disknode, get_by_id: (id: Path_Id) => Disknode | undefined, filter?: File_Filter, results?: Set<string>, searched?: Set<string>, log?: Logger) => Set<string>;
 //# sourceMappingURL=filer.d.ts.map

package/dist/filer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filer.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/filer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAKzD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAEjE,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EACN,SAAS,EAET,KAAK,cAAc,EACnB,KAAK,iBAAiB,EAEtB,MAAM,gBAAgB,CAAC;AAOxB,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAI5C,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,KAAK,IAAI,CAAC;AAEtF,MAAM,WAAW,aAAa;IAC7B,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;IACzE,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAClD,GAAG,CAAC,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,KAAK;;IACjB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAa;gBAOvC,OAAO,GAAE,aAA4B;IAgBjD,SAAS,GAAI,IAAI,OAAO,KAAG,QAAQ,GAAG,SAAS,CAE7C;IAEF,aAAa,GAAI,IAAI,OAAO,KAAG,QAAQ,CAkBrC;IA4II,KAAK,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAKxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAa5B;AAGD,eAAO,MAAM,iBAAiB,GAC7B,aAAa,QAAQ,EACrB,WAAW,CAAC,EAAE,EAAE,OAAO,KAAK,QAAQ,GAAG,SAAS,EAChD,SAAS,WAAW,EACpB,UAAS,GAAG,CAAC,MAAM,CAAa,EAChC,WAAU,GAAG,CAAC,MAAM,CAAa,EACjC,MAAM,MAAM,KACV,GAAG,CAAC,MAAM,CAkBZ,CAAC"}
+{"version":3,"file":"filer.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/filer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAIzD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAEjE,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EACN,SAAS,EAET,KAAK,cAAc,EACnB,KAAK,iBAAiB,EAEtB,MAAM,gBAAgB,CAAC;AAOxB,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAI5C,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;AAEnF,MAAM,WAAW,aAAa;IAC7B,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;IACzE,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAClD,GAAG,CAAC,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,KAAK;;IACjB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAG3B,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAa;gBAYvC,OAAO,GAAE,aAA4B;IAUjD,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,SAAS,GAAI,IAAI,OAAO,KAAG,QAAQ,GAAG,SAAS,CAE7C;IAEF,aAAa,GAAI,IAAI,OAAO,KAAG,QAAQ,CAkBrC;IAEF;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmDrB,KAAK,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC;IAiB3D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAkLtB;AAGD,eAAO,MAAM,iBAAiB,GAC7B,UAAU,QAAQ,EAClB,WAAW,CAAC,EAAE,EAAE,OAAO,KAAK,QAAQ,GAAG,SAAS,EAChD,SAAS,WAAW,EACpB,UAAS,GAAG,CAAC,MAAM,CAAa,EAChC,WAAU,GAAG,CAAC,MAAM,CAAa,EACjC,MAAM,MAAM,KACV,GAAG,CAAC,MAAM,CAkBZ,CAAC"}

package/dist/filer.js

@@ -1,7 +1,6 @@
 import { EMPTY_OBJECT } from '@ryanatkn/belt/object.js';
 import { existsSync, readFileSync, statSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
-import { wait } from '@ryanatkn/belt/async.js';
 import { isBuiltin } from 'node:module';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { Unreachable_Error } from '@ryanatkn/belt/error.js';
@@ -15,10 +14,15 @@ import { SVELTEKIT_GLOBAL_SPECIFIER } from "./constants.js";
 const aliases = Object.entries(default_svelte_config.alias);
 export class Filer {
     root_dir;
+    // TODO rename everything to `disknode`
     files = new Map();
     #watch_dir;
     #watch_dir_options;
     #log;
+    #listeners = new Set();
+    #watching;
+    #initing;
+    #closing;
     constructor(options = EMPTY_OBJECT) {
         this.#watch_dir = options.watch_dir ?? watch_dir;
         this.#watch_dir_options = options.watch_dir_options ?? EMPTY_OBJECT;
@@ -29,9 +33,9 @@ export class Filer {
         // package.json/gro.config.ts/tsconfig.json/svelte.config.js/vite.config.ts to invalidate everything
         this.#log = options.log;
     }
-    #watching;
-    #listeners = new Set();
-    #ready = false;
+    get inited() {
+        return this.#watching !== undefined;
+    }
     get_by_id = (id) => {
         return this.files.get(id);
     };
@@ -55,6 +59,111 @@ export class Filer {
         }
         return file;
     };
+    /**
+     * Initialize the filer to populate files without watching.
+     * Safe to call multiple times - subsequent calls are no-ops.
+     * Used by gen files to access the file graph.
+     */
+    async init() {
+        // if already initing, return the existing promise
+        if (this.#initing)
+            return this.#initing;
+        // if already initialized, just ensure ready
+        if (this.#watching) {
+            return this.#watching.init();
+        }
+        // start new initialization
+        this.#initing = this.#init();
+        try {
+            await this.#initing;
+        }
+        catch (err) {
+            // use shared cleanup logic
+            this.#cleanup();
+            throw err;
+        }
+        finally {
+            this.#initing = undefined;
+        }
+    }
+    async #init() {
+        const watcher = this.#watch_dir({
+            ...this.#watch_dir_options,
+            dir: this.root_dir,
+            on_change: this.#on_change,
+        });
+        try {
+            await watcher.init();
+            // check if close() was called during init
+            if (this.#closing) {
+                await watcher.close();
+                return;
+            }
+            // only set after successful init and not closing
+            this.#watching = watcher;
+        }
+        catch (err) {
+            // clean up watcher on error, but don't let close error mask init error
+            try {
+                await watcher.close();
+            }
+            catch {
+                // ignore close errors - init error is more important
+            }
+            throw err;
+        }
+    }
+    async watch(listener) {
+        await this.#add_listener(listener);
+        return () => {
+            this.#remove_listener(listener);
+        };
+    }
+    /**
+     * Internal cleanup of all state - can be called safely from anywhere
+     */
+    #cleanup() {
+        this.#listeners.clear();
+        this.files.clear();
+        this.#watching = undefined;
+        // #initing is handled in finally block of init()
+    }
+    close() {
+        // if already closing, return existing promise
+        if (this.#closing)
+            return this.#closing;
+        // if already closed and not initing, nothing to do
+        if (!this.#watching && !this.#initing)
+            return Promise.resolve();
+        // start new close operation
+        const closing = this.#close();
+        this.#closing = closing;
+        // Clean up after completion, but don't change the returned promise
+        // Use void to ensure we don't accidentally return the .then() promise
+        void closing.then(() => {
+            this.#closing = undefined;
+        }, () => {
+            this.#closing = undefined;
+        });
+        return this.#closing;
+    }
+    async #close() {
+        // wait for any pending initialization to complete
+        if (this.#initing) {
+            try {
+                await this.#initing;
+            }
+            catch {
+                // ignore errors during close
+            }
+        }
+        // close watcher if it exists
+        if (this.#watching) {
+            await this.#watching.close();
+        }
+        // clean up all state
+        this.#cleanup();
+    }
     #update(id) {
         const file = this.get_or_create(id);
         const stats = existsSync(id) ? statSync(id) : null;
@@ -112,96 +221,75 @@ export class Filer {
         if (!file)
             return null; // this is safe because the object would exist if any other file referenced it as a dependency or dependent
         file.contents = null; // clear contents in case it gets re-added later, we want the change to be detected
-        let found = false;
-        for (const d of this.files.values()) {
-            if (d.dependencies.has(file.id)) {
-                found = true;
-                break;
-            }
-        }
-        if (!found)
+        file.dependencies.clear();
+        // keep the file in memory if other files still depend on it
+        if (file.dependents.size === 0) {
             this.files.delete(id);
+        }
         return file;
     }
     #sync_listener_with_files(listener) {
-        if (!this.#ready)
-            return;
-        for (const source_file of this.files.values()) {
-            listener({ type: 'add', path: source_file.id, is_directory: false }, source_file);
+        for (const disknode of this.files.values()) {
+            try {
+                listener({ type: 'add', path: disknode.id, is_directory: false }, disknode);
+            }
+            catch (err) {
+                this.#log?.error('[filer] Listener error during sync:', err);
+            }
         }
     }
-    #notify_change(change, source_file) {
-        if (!this.#ready)
-            return;
+    #notify_change(change, disknode) {
         for (const listener of this.#listeners) {
-            listener(change, source_file);
+            try {
+                listener(change, disknode);
+            }
+            catch (err) {
+                this.#log?.error('[filer] Listener error during change notification:', err);
+            }
         }
     }
     async #add_listener(listener) {
         this.#listeners.add(listener);
-        if (this.#watching) {
-            // if already watching, call the listener for all existing files after init
-            await this.#watching.init();
-            await wait(); // wait a tick to ensure the `this.#ready` value is updated below first
-            this.#sync_listener_with_files(listener);
-            return;
-        }
-        this.#watching = this.#watch_dir({
-            ...this.#watch_dir_options,
-            dir: this.root_dir,
-            on_change: this.#on_change,
-        });
-        await this.#watching.init();
-        this.#ready = true;
+        // ensure initialized
+        await this.init();
+        // notify of existing files
         this.#sync_listener_with_files(listener);
     }
-    async #remove_listener(listener) {
+    #remove_listener(listener) {
         this.#listeners.delete(listener);
-        if (this.#listeners.size === 0) {
-            await this.close(); // TODO is this right? should `watch` be async?
-        }
+        // keep watching active even with no listeners, only close() tears down
     }
     #on_change = (change) => {
+        if (this.#closing)
+            return; // ignore changes during close
         if (change.is_directory)
             return; // TODO manage directories?
-        let source_file;
+        let disknode;
         switch (change.type) {
             case 'add':
             case 'update': {
-                source_file = this.#update(change.path);
+                disknode = this.#update(change.path);
                 break;
             }
             case 'delete': {
-                source_file = this.#remove(change.path);
+                disknode = this.#remove(change.path);
                 break;
             }
             default:
                 throw new Unreachable_Error(change.type);
         }
-        if (source_file) {
-            this.#notify_change(change, source_file);
+        if (disknode && this.#listeners.size > 0) {
+            this.#notify_change(change, disknode);
         }
     };
-    async watch(listener) {
-        await this.#add_listener(listener);
-        return () => this.#remove_listener(listener);
-    }
-    async close() {
-        this.#ready = false;
-        this.#listeners.clear();
-        if (this.#watching) {
-            await this.#watching.close();
-            this.#watching = undefined;
-        }
-    }
     #is_external(id) {
         const { filter } = this.#watch_dir_options;
         return !id.startsWith(this.root_dir + '/') || (!!filter && !filter(id, false));
     }
 }
 // TODO maybe `Disknode` class?
-export const filter_dependents = (source_file, get_by_id, filter, results = new Set(), searched = new Set(), log) => {
-    const { dependents } = source_file;
+export const filter_dependents = (disknode, get_by_id, filter, results = new Set(), searched = new Set(), log) => {
+    const { dependents } = disknode;
     for (const dependent_id of dependents.keys()) {
         if (searched.has(dependent_id))
             continue;
@@ -209,12 +297,12 @@ export const filter_dependents = (source_file, get_by_id, filter, results = new
         if (!filter || filter(dependent_id)) {
             results.add(dependent_id);
         }
-        const dependent_source_file = get_by_id(dependent_id);
-        if (!dependent_source_file) {
-            log?.warn(`[filer.filter_dependents] dependent source file ${dependent_id} not found for ${source_file.id}`);
+        const dependent_disknode = get_by_id(dependent_id);
+        if (!dependent_disknode) {
+            log?.warn(`[filer.filter_dependents] dependent source file ${dependent_id} not found for ${disknode.id}`);
             continue;
         }
-        filter_dependents(dependent_source_file, get_by_id, filter, results, searched);
+        filter_dependents(dependent_disknode, get_by_id, filter, results, searched);
     }
     return results;
 };

package/dist/gen.d.ts

@@ -6,6 +6,8 @@ import type { Gro_Config } from './gro_config.ts';
 import type { Parsed_Svelte_Config } from './svelte_config.ts';
 import { type Load_Modules_Failure, type Module_Meta } from './modules.ts';
 import { Input_Path, type Resolved_Input_File, type Resolved_Input_Path } from './input_path.ts';
+import type { Filer } from './filer.ts';
+import type { Invoke_Task } from './task.ts';
 export declare const GEN_FILE_PATTERN_TEXT = "gen";
 export declare const GEN_FILE_PATTERN: string;
 export declare const is_gen_path: (path: string) => boolean;
@@ -23,6 +25,10 @@ export type Gen = (ctx: Gen_Context) => Raw_Gen_Result | Promise<Raw_Gen_Result>
 export interface Gen_Context {
     config: Gro_Config;
     svelte_config: Parsed_Svelte_Config;
+    filer: Filer;
+    log: Logger;
+    timings: Timings;
+    invoke_task: Invoke_Task;
     /**
      * Same as `import.meta.url` but in path form.
      */
@@ -31,7 +37,6 @@ export interface Gen_Context {
      * The `origin_id` relative to the root dir.
      */
     origin_path: string;
-    log: Logger;
 }
 export type Raw_Gen_Result = string | Raw_Gen_File | null | Array<Raw_Gen_Result>;
 export interface Raw_Gen_File {

package/dist/gen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gen.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gen.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gen.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gen.ts"],"names":[],"mappings":"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"}

package/dist/gen.task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gen.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gen.task.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAgBhD,eAAO,MAAM,IAAI;;;;kBAaf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAIxC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA+F3B,CAAC"}
+{"version":3,"file":"gen.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gen.task.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAgBhD,eAAO,MAAM,IAAI;;;;kBAaf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CAqH3B,CAAC"}

package/dist/gen.task.js

@@ -24,12 +24,10 @@ export const Args = z.strictObject({
         .meta({ description: 'exit with a nonzero code if any files need to be generated' })
         .default(false),
 });
-// TODO test - especially making sure nothing gets genned
-// if there's any validation or import errors
 export const task = {
     summary: 'run code generation scripts',
     Args,
-    run: async ({ args, log, timings, config }) => {
+    run: async ({ args, filer, log, timings, config, invoke_task }) => {
         const { _: raw_input_paths, root_dirs, check } = args;
         const input_paths = to_input_paths(raw_input_paths);
         // load all of the gen modules
@@ -55,7 +53,7 @@ export const task = {
         const loaded_genfiles = loaded.value;
         // run `gen` on each of the modules
         const timing_to_generate_code = timings.start('generate code'); // TODO this ignores `gen_results.elapsed` - should it return `Timings` instead?
-        const gen_results = await run_gen(loaded_genfiles.modules, config, log, timings, format_file);
+        const gen_results = await run_gen(loaded_genfiles.modules, config, filer, log, timings, invoke_task, format_file);
         timing_to_generate_code();
         const fail_count = gen_results.failures.length;
         const analyzed_gen_results = await analyze_gen_results(gen_results);
@@ -72,6 +70,14 @@ export const task = {
                         continue;
                     has_unexpected_changes = true;
                     log.error(st('red', `Generated file ${print_path(analyzed.file.id)} via ${print_path(analyzed.file.origin_id)} ${analyzed.is_new ? 'is new' : 'has changed'}.`));
+                    // DEBUG HACK: Show current vs changed content
+                    if (!analyzed.is_new) {
+                        log.info(`\n=== CURRENT CONTENT (${print_path(analyzed.file.id)}) ===\n${analyzed.existing_content}\n=== END CURRENT ===`);
+                        log.info(`\n=== CHANGED CONTENT (${print_path(analyzed.file.id)}) ===\n${analyzed.file.content}\n=== END CHANGED ===`);
+                    }
+                    else {
+                        log.info(`\n=== NEW FILE CONTENT (${print_path(analyzed.file.id)}) ===\n${analyzed.file.content}\n=== END NEW ===`);
+                    }
                 }
                 if (has_unexpected_changes) {
                     throw new Task_Error('Failed gen check. Some generated files have unexpectedly changed.' +

package/dist/gro.config.default.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gro.config.default.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gro.config.default.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAWvD;;;;;;;;GAQG;AACH,QAAA,MAAM,MAAM,EAAE,iBAmCb,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"gro.config.default.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gro.config.default.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAUvD;;;;;;;;GAQG;AACH,QAAA,MAAM,MAAM,EAAE,iBAsBb,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/gro.config.default.js

@@ -1,19 +1,9 @@
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && /^\.\.?\//.test(path)) {
-        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
-            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
-        });
-    }
-    return path;
-};
-import { resolve } from 'node:path';
 import { gro_plugin_sveltekit_library } from "./gro_plugin_sveltekit_library.js";
 import { has_server, gro_plugin_server } from "./gro_plugin_server.js";
 import { gro_plugin_sveltekit_app } from "./gro_plugin_sveltekit_app.js";
 import { has_sveltekit_app, has_sveltekit_library } from "./sveltekit_helpers.js";
 import { gro_plugin_gen } from "./gro_plugin_gen.js";
-import { has_dep, load_package_json } from "./package_json.js";
-import { find_first_existing_file } from "./search_fs.js";
+import { load_package_json } from "./package_json.js";
 // TODO hacky, maybe extract utils?
 /**
  * This is the default config that's passed to `gro.config.ts`
@@ -26,25 +16,13 @@ import { find_first_existing_file } from "./search_fs.js";
  */
 const config = async (cfg, svelte_config) => {
     const package_json = load_package_json(); // TODO gets wastefully loaded by some plugins, maybe put in plugin/task context? how does that interact with `map_package_json`?
-    const [has_moss_dep, has_server_result, has_sveltekit_library_result, has_sveltekit_app_result] = await Promise.all([
-        has_dep('@ryanatkn/moss', package_json),
+    const [has_server_result, has_sveltekit_library_result, has_sveltekit_app_result] = await Promise.all([
         has_server(),
         has_sveltekit_library(package_json, svelte_config),
         has_sveltekit_app(),
     ]);
-    const local_moss_plugin_path = find_first_existing_file([
-        './src/lib/gro_plugin_moss.ts',
-        './src/gro_plugin_moss.ts',
-        './src/routes/gro_plugin_moss.ts', // TODO probably remove this
-    ]);
     // put things that generate files before SvelteKit so it can see them
-    cfg.plugins = async () => [
-        // TODO probably belongs in the gen system
-        local_moss_plugin_path
-            ? (await import(__rewriteRelativeImportExtension(resolve(local_moss_plugin_path), true))).gro_plugin_moss()
-            : has_moss_dep
-                ? (await import('@ryanatkn/moss/gro_plugin_moss.js')).gro_plugin_moss()
-                : null, // lazy load to avoid errors if it's not installed
+    cfg.plugins = () => [
         gro_plugin_gen(),
         has_server_result.ok ? gro_plugin_server() : null,
         has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,

package/dist/gro_plugin_gen.js

@@ -72,9 +72,9 @@ export const gro_plugin_gen = ({ input_paths = [paths.source], root_dirs = [path
                 }
             });
         },
-        teardown: async () => {
+        teardown: () => {
             if (cleanup_watch) {
-                await cleanup_watch();
+                cleanup_watch();
                 cleanup_watch = undefined;
             }
         },

package/dist/invoke_task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invoke_task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/invoke_task.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,OAAO,EAAC,MAAM,2BAA2B,CAAC;AAGpE,OAAO,EAAoB,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAEvD,OAAO,EAAgB,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAI9D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AAEjC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,WAAW,GACvB,WAAW,cAAc,EACzB,MAAM,IAAI,GAAG,SAAS,EACtB,QAAQ,UAAU,EAClB,gBAAgB,KAAK,EACrB,kBAAkB,OAAO,GAAG,IAAI,KAC9B,OAAO,CAAC,IAAI,CAgFd,CAAC"}
+{"version":3,"file":"invoke_task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/invoke_task.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,OAAO,EAAC,MAAM,2BAA2B,CAAC;AAGpE,OAAO,EAAoB,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAEvD,OAAO,EAAgB,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAI9D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AAEjC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,WAAW,GACvB,WAAW,cAAc,EACzB,MAAM,IAAI,GAAG,SAAS,EACtB,QAAQ,UAAU,EAClB,gBAAgB,KAAK,EACrB,kBAAkB,OAAO,GAAG,IAAI,KAC9B,OAAO,CAAC,IAAI,CAwFd,CAAC"}

package/dist/invoke_task.js

@@ -34,12 +34,19 @@ import { Filer } from "./filer.js";
 export const invoke_task = async (task_name, args, config, initial_filer, initial_timings) => {
     const log = new System_Logger(print_log_label(task_name || 'gro'));
     log.info('invoking', task_name ? st('cyan', task_name) : 'gro');
+    // track if we created the filer
+    const owns_filer = !initial_filer;
     const filer = initial_filer ?? new Filer({ log });
+    const owns_timings = !initial_timings;
     const timings = initial_timings ?? new Timings();
     const total_timing = create_stopwatch();
-    const finish = () => {
-        if (!initial_timings)
-            return; // print timings only for the top-level task
+    const finish = async () => {
+        // cleanup filer only if we created it and it was initialized
+        if (owns_filer && filer.inited) {
+            await filer.close();
+        }
+        if (owns_timings)
+            return; // kinda weird, print timings only for the top-level task
         print_timings(timings, log);
         log.info(`🕒 ${print_ms(total_timing())}`);
     };
@@ -47,7 +54,7 @@ export const invoke_task = async (task_name, args, config, initial_filer, initia
     if (!task_name && (args?.version || args?.v)) {
         const gro_package_json = load_gro_package_json();
         log.info(`${st('gray', 'v')}${st('cyan', gro_package_json.version)}`);
-        finish();
+        await finish();
         return;
     }
     // Resolve the input path for the provided task name.
@@ -73,7 +80,7 @@ export const invoke_task = async (task_name, args, config, initial_filer, initia
     if (resolved_input_files.length > 1 || resolved_input_files[0].resolved_input_path.is_directory) {
         // The input path matches a directory. Log the tasks but don't run them.
         log_tasks(log, loaded_tasks);
-        finish();
+        await finish();
         return;
     }
     // The input path matches a file that's presumable a task, so load and run it.
@@ -90,5 +97,5 @@ export const invoke_task = async (task_name, args, config, initial_filer, initia
         throw result.error;
     }
     log.info(`✓ ${st('cyan', task.name)}`);
-    finish();
+    await finish();
 };

package/dist/package.js

@@ -1,7 +1,7 @@
 // generated by src/lib/package.gen.ts
 export const package_json = {
     name: '@ryanatkn/gro',
-    version: '0.163.0',
+    version: '0.164.1',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     glyph: '🌰',
@@ -59,13 +59,13 @@ export const package_json = {
         vitest: '^3',
     },
     peerDependenciesMeta: { '@sveltejs/kit': { optional: true }, vitest: { optional: true } },
-    optionalDependencies: { '@ryanatkn/moss': '>=0.31.0', vitest: '^3' },
+    optionalDependencies: { '@ryanatkn/moss': '>=0.33.0', vitest: '^3' },
     devDependencies: {
         '@changesets/changelog-git': '^0.2.1',
         '@changesets/types': '^6.1.0',
         '@ryanatkn/eslint-config': '^0.8.0',
         '@ryanatkn/fuz': '^0.145.0',
-        '@ryanatkn/moss': '^0.32.0',
+        '@ryanatkn/moss': '^0.33.0',
         '@sveltejs/adapter-static': '^3.0.9',
         '@sveltejs/kit': '^2.37.1',
         '@sveltejs/package': '^2.5.0',
@@ -266,7 +266,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.163.0',
+    version: '0.164.1',
     modules: {
         '.': {
             path: 'index.ts',
@@ -489,7 +489,6 @@ export const src_json = {
         './filer.js': {
             path: 'filer.ts',
             declarations: [
-                { name: 'Cleanup_Watch', kind: 'type' },
                 { name: 'On_Filer_Change', kind: 'type' },
                 { name: 'Filer_Options', kind: 'type' },
                 { name: 'Filer', kind: 'class' },
@@ -975,6 +974,7 @@ export const src_json = {
             declarations: [
                 { name: 'Task', kind: 'type' },
                 { name: 'Task_Context', kind: 'type' },
+                { name: 'Invoke_Task', kind: 'type' },
                 { name: 'TASK_FILE_SUFFIX_TS', kind: 'variable' },
                 { name: 'TASK_FILE_SUFFIX_JS', kind: 'variable' },
                 { name: 'TASK_FILE_SUFFIXES', kind: 'variable' },

package/dist/package_json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package_json.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/package_json.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAC,YAAY,EAAE,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAQlF,MAAM,MAAM,gBAAgB,GAAG,CAC9B,YAAY,EAAE,YAAY,KACtB,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;AAExD,eAAO,MAAM,kBAAkB,EAAE,YAAsC,CAAC;AAExE,eAAO,MAAM,iBAAiB,GAC7B,YAA+C,EAC/C,QAAQ,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EACpC,eAAY,EAAE,iGAAiG;AAC/G,MAAM,MAAM,KACV,YAkBF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC7B,kBAAkB,gBAAgB,EAClC,KAAK,MAAM,EACX,eAAY,EACZ,YAAgB,EAChB,oBAAuB,KACrB,OAAO,CAAC;IAAC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAC,CA2B/D,CAAC;AAEF,eAAO,MAAM,qBAAqB,QAAO,YAAiD,CAAC;AAM3F,eAAO,MAAM,kBAAkB,GAAI,yBAAyB,MAAM,KAAG,IAEpE,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAI,cAAc,YAAY,KAAG,MACW,CAAC;AAEhF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC/B,QAAQ,CAAC,YAAY,EAAE,YAAY,KAAK,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,EAC1F,YAAgB,EAChB,eAAY,KACV,OAAO,CAAC;IAAC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAC,CAa/D,CAAC;AAIF,eAAO,MAAM,kBAAkB,GAAI,OAAO,KAAK,CAAC,MAAM,CAAC,KAAG,oBA6CzD,CAAC;AAIF,eAAO,MAAM,cAAc,GAC1B,cAAc,YAAY,KACxB;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,GAAG,SAgBlC,CAAC;AA8BF,eAAO,MAAM,OAAO,GACnB,UAAU,MAAM,EAChB,eAAc,YAAkC,KAC9C,OAGyC,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,YAAY,GAAI,cAAc,YAAY,KAAG,KAAK,CAAC,gBAAgB,CAe/E,CAAC"}
+{"version":3,"file":"package_json.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/package_json.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAC,YAAY,EAAE,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAQlF,MAAM,MAAM,gBAAgB,GAAG,CAC9B,YAAY,EAAE,YAAY,KACtB,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;AAExD,eAAO,MAAM,kBAAkB,EAAE,YAAsC,CAAC;AAExE,eAAO,MAAM,iBAAiB,GAC7B,YAA+C,EAC/C,QAAQ,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EACpC,eAAY,EAAE,iGAAiG;AAC/G,MAAM,MAAM,KACV,YAkBF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC7B,kBAAkB,gBAAgB,EAClC,KAAK,MAAM,EACX,eAAY,EACZ,YAAgB,EAChB,oBAAuB,KACrB,OAAO,CAAC;IAAC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAC,CA2B/D,CAAC;AAEF,eAAO,MAAM,qBAAqB,QAAO,YAAiD,CAAC;AAM3F,eAAO,MAAM,kBAAkB,GAAI,yBAAyB,MAAM,KAAG,IAEpE,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAI,cAAc,YAAY,KAAG,MACW,CAAC;AAEhF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC/B,QAAQ,CAAC,YAAY,EAAE,YAAY,KAAK,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,EAC1F,YAAgB,EAChB,eAAY,KACV,OAAO,CAAC;IAAC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAC,CAa/D,CAAC;AAOF,eAAO,MAAM,kBAAkB,GAAI,OAAO,KAAK,CAAC,MAAM,CAAC,KAAG,oBA6CzD,CAAC;AAIF,eAAO,MAAM,cAAc,GAC1B,cAAc,YAAY,KACxB;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,GAAG,SAgBlC,CAAC;AA8BF,eAAO,MAAM,OAAO,GACnB,UAAU,MAAM,EAChB,eAAc,YAAkC,KAC9C,OAGyC,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,YAAY,GAAI,cAAc,YAAY,KAAG,KAAK,CAAC,gBAAgB,CAe/E,CAAC"}

package/dist/package_json.js

@@ -76,6 +76,8 @@ export const update_package_json = async (update, dir = paths.root, write = true
     return { package_json: updated, changed: true };
 };
 const is_index = (path) => path === 'index.ts' || path === 'index.js';
+// TODO support subpath patterns as the main concise way to do things
+// https://nodejs.org/api/packages.html#subpath-patterns
 export const to_package_exports = (paths) => {
     const sorted = paths
         .slice()

package/dist/run_gen.d.ts

@@ -3,6 +3,8 @@ import type { Logger } from '@ryanatkn/belt/log.js';
 import { type Gen_Results, type Genfile_Module_Meta } from './gen.ts';
 import type { format_file as base_format_file } from './format_file.ts';
 import type { Gro_Config } from './gro_config.ts';
+import type { Filer } from './filer.ts';
+import type { Invoke_Task } from './task.ts';
 export declare const GEN_NO_PROD_MESSAGE = "gen runs only during development";
-export declare const run_gen: (gen_modules: Array<Genfile_Module_Meta>, config: Gro_Config, log: Logger, timings: Timings, format_file?: typeof base_format_file) => Promise<Gen_Results>;
+export declare const run_gen: (gen_modules: Array<Genfile_Module_Meta>, config: Gro_Config, filer: Filer, log: Logger, timings: Timings, invoke_task: Invoke_Task, format_file?: typeof base_format_file) => Promise<Gen_Results>;
 //# sourceMappingURL=run_gen.d.ts.map

package/dist/run_gen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run_gen.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/run_gen.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD,OAAO,EACN,KAAK,WAAW,EAGhB,KAAK,mBAAmB,EAGxB,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAC,WAAW,IAAI,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AACtE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAGhD,eAAO,MAAM,mBAAmB,qCAAqC,CAAC;AAEtE,eAAO,MAAM,OAAO,GACnB,aAAa,KAAK,CAAC,mBAAmB,CAAC,EACvC,QAAQ,UAAU,EAClB,KAAK,MAAM,EACX,SAAS,OAAO,EAChB,cAAc,OAAO,gBAAgB,KACnC,OAAO,CAAC,WAAW,CAqErB,CAAC"}
+{"version":3,"file":"run_gen.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/run_gen.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD,OAAO,EACN,KAAK,WAAW,EAGhB,KAAK,mBAAmB,EAGxB,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAC,WAAW,IAAI,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AACtE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAEhD,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAE3C,eAAO,MAAM,mBAAmB,qCAAqC,CAAC;AAEtE,eAAO,MAAM,OAAO,GACnB,aAAa,KAAK,CAAC,mBAAmB,CAAC,EACvC,QAAQ,UAAU,EAClB,OAAO,KAAK,EACZ,KAAK,MAAM,EACX,SAAS,OAAO,EAChB,aAAa,WAAW,EACxB,cAAc,OAAO,gBAAgB,KACnC,OAAO,CAAC,WAAW,CAwErB,CAAC"}