@ryanatkn/gro 0.163.0 → 0.164.1

package/dist/run_gen.js

@@ -4,7 +4,7 @@ import { to_gen_result, } from "./gen.js";
 import { print_path, to_root_path } from "./paths.js";
 import { default_svelte_config } from "./svelte_config.js";
 export const GEN_NO_PROD_MESSAGE = 'gen runs only during development';
-export const run_gen = async (gen_modules, config, log, timings, format_file) => {
+export const run_gen = async (gen_modules, config, filer, log, timings, invoke_task, format_file) => {
     let input_count = 0;
     let output_count = 0;
     const timing_for_run_gen = timings.start('run_gen');
@@ -16,9 +16,12 @@ export const run_gen = async (gen_modules, config, log, timings, format_file) =>
         const gen_ctx = {
             config,
             svelte_config: default_svelte_config,
+            filer,
+            log,
+            timings,
+            invoke_task,
             origin_id: id,
             origin_path: to_root_path(id),
-            log,
         };
         let raw_gen_result;
         try {

package/dist/task.d.ts

@@ -22,8 +22,9 @@ export interface Task_Context<T_Args = object> {
     filer: Filer;
     log: Logger;
     timings: Timings;
-    invoke_task: (task_name: string, args?: Args, config?: Gro_Config) => Promise<void>;
+    invoke_task: Invoke_Task;
 }
+export type Invoke_Task = (task_name: string, args?: Args, config?: Gro_Config) => Promise<void>;
 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[];

package/dist/task.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.163.0",
+  "version": "0.164.1",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
@@ -77,7 +77,7 @@
     }
   },
   "optionalDependencies": {
-    "@ryanatkn/moss": ">=0.31.0",
+    "@ryanatkn/moss": ">=0.33.0",
     "vitest": "^3"
   },
   "devDependencies": {
@@ -85,7 +85,7 @@
     "@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",

package/src/lib/filer.ts

@@ -2,7 +2,6 @@ import {EMPTY_OBJECT} from '@ryanatkn/belt/object.js';
 import {existsSync, readFileSync, statSync} from 'node:fs';
 import {dirname, resolve} from 'node:path';
 import type {Omit_Strict} from '@ryanatkn/belt/types.js';
-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';
@@ -27,9 +26,7 @@ import type {Disknode} from './disknode.ts';
 
 const aliases = Object.entries(default_svelte_config.alias);
 
-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;
@@ -41,6 +38,7 @@ export interface Filer_Options {
 export class Filer {
 	readonly root_dir: Path_Id;
 
+	// TODO rename everything to `disknode`
 	readonly files: Map<Path_Id, Disknode> = new Map();
 
 	#watch_dir: typeof watch_dir;
@@ -48,6 +46,11 @@ export class Filer {
 
 	#log?: Logger;
 
+	#listeners: Set<On_Filer_Change> = new Set();
+	#watching: Watch_Node_Fs | undefined;
+	#initing: Promise<void> | undefined;
+	#closing: Promise<void> | undefined;
+
 	constructor(options: Filer_Options = EMPTY_OBJECT) {
 		this.#watch_dir = options.watch_dir ?? watch_dir;
 		this.#watch_dir_options = options.watch_dir_options ?? EMPTY_OBJECT;
@@ -58,11 +61,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: Watch_Node_Fs | undefined;
-	#listeners: Set<On_Filer_Change> = new Set();
-
-	#ready = false;
+	get inited(): boolean {
+		return this.#watching !== undefined;
+	}
 
 	get_by_id = (id: Path_Id): Disknode | undefined => {
 		return this.files.get(id);
@@ -88,6 +89,121 @@ 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(): Promise<void> {
+		// 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(): Promise<void> {
+		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: On_Filer_Change): Promise<() => void> {
+		await this.#add_listener(listener);
+		return () => {
+			this.#remove_listener(listener);
+		};
+	}
+
+	/**
+	 * Internal cleanup of all state - can be called safely from anywhere
+	 */
+	#cleanup(): void {
+		this.#listeners.clear();
+		this.files.clear();
+		this.#watching = undefined;
+		// #initing is handled in finally block of init()
+	}
+
+	close(): Promise<void> {
+		// 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(): Promise<void> {
+		// 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: Path_Id): Disknode | null {
 		const file = this.get_or_create(id);
 
@@ -153,93 +269,73 @@ export class Filer {
 
 		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;
-			}
+		file.dependencies.clear();
+
+		// keep the file in memory if other files still depend on it
+		if (file.dependents.size === 0) {
+			this.files.delete(id);
 		}
-		if (!found) this.files.delete(id);
 
 		return file;
 	}
 
 	#sync_listener_with_files(listener: On_Filer_Change): void {
-		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: Watcher_Change, source_file: Disknode): void {
-		if (!this.#ready) return;
+	#notify_change(change: Watcher_Change, disknode: Disknode): void {
 		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: On_Filer_Change): Promise<void> {
 		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: On_Filer_Change): Promise<void> {
+	#remove_listener(listener: On_Filer_Change): void {
 		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: Watcher_Change_Callback = (change) => {
+		if (this.#closing) return; // ignore changes during close
 		if (change.is_directory) return; // TODO manage directories?
-		let source_file: Disknode | null;
+		let disknode: Disknode | null;
 		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: On_Filer_Change): Promise<Cleanup_Watch> {
-		await this.#add_listener(listener);
-		return () => this.#remove_listener(listener);
-	}
-
-	async close(): Promise<void> {
-		this.#ready = false;
-		this.#listeners.clear();
-		if (this.#watching) {
-			await this.#watching.close();
-			this.#watching = undefined;
-		}
-	}
-
 	#is_external(id: string): boolean {
 		const {filter} = this.#watch_dir_options;
 		return !id.startsWith(this.root_dir + '/') || (!!filter && !filter(id, false));
@@ -248,28 +344,28 @@ export class Filer {
 
 // TODO maybe `Disknode` class?
 export const filter_dependents = (
-	source_file: Disknode,
+	disknode: Disknode,
 	get_by_id: (id: Path_Id) => Disknode | undefined,
 	filter?: File_Filter,
 	results: Set<string> = new Set(),
 	searched: Set<string> = new Set(),
 	log?: Logger,
 ): Set<string> => {
-	const {dependents} = source_file;
+	const {dependents} = disknode;
 	for (const dependent_id of dependents.keys()) {
 		if (searched.has(dependent_id)) continue;
 		searched.add(dependent_id);
 		if (!filter || filter(dependent_id)) {
 			results.add(dependent_id);
 		}
-		const dependent_source_file = get_by_id(dependent_id);
-		if (!dependent_source_file) {
+		const dependent_disknode = get_by_id(dependent_id);
+		if (!dependent_disknode) {
 			log?.warn(
-				`[filer.filter_dependents] dependent source file ${dependent_id} not found for ${source_file.id}`,
+				`[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/src/lib/gen.task.ts

@@ -35,12 +35,10 @@ export const Args = z.strictObject({
 });
 export type Args = z.infer<typeof Args>;
 
-// TODO test - especially making sure nothing gets genned
-// if there's any validation or import errors
 export const task: Task<Args> = {
 	summary: 'run code generation scripts',
 	Args,
-	run: async ({args, log, timings, config}): Promise<void> => {
+	run: async ({args, filer, log, timings, config, invoke_task}): Promise<void> => {
 		const {_: raw_input_paths, root_dirs, check} = args;
 
 		const input_paths = to_input_paths(raw_input_paths);
@@ -71,7 +69,15 @@ export const task: Task<Args> = {
 
 		// 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;
@@ -96,6 +102,20 @@ export const task: Task<Args> = {
 							)} ${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(

package/src/lib/gen.ts

@@ -19,6 +19,8 @@ import {
 	type Resolved_Input_Path,
 } from './input_path.ts';
 import {search_fs} from './search_fs.ts';
+import type {Filer} from './filer.ts';
+import type {Invoke_Task} from './task.ts';
 
 export const GEN_FILE_PATTERN_TEXT = 'gen';
 export const GEN_FILE_PATTERN = '.' + GEN_FILE_PATTERN_TEXT + '.';
@@ -40,6 +42,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.
 	 */
@@ -48,8 +54,8 @@ export interface Gen_Context {
 	 * The `origin_id` relative to the root dir.
 	 */
 	origin_path: string;
-	log: Logger;
 }
+
 // TODO consider other return data - metadata? effects? non-file build artifacts?
 export type Raw_Gen_Result = string | Raw_Gen_File | null | Array<Raw_Gen_Result>;
 export interface Raw_Gen_File {

package/src/lib/gro.config.default.ts

@@ -1,13 +1,10 @@
-import {resolve} from 'node:path';
-
 import type {Create_Gro_Config} from './gro_config.ts';
 import {gro_plugin_sveltekit_library} from './gro_plugin_sveltekit_library.ts';
 import {has_server, gro_plugin_server} from './gro_plugin_server.ts';
 import {gro_plugin_sveltekit_app} from './gro_plugin_sveltekit_app.ts';
 import {has_sveltekit_app, has_sveltekit_library} from './sveltekit_helpers.ts';
 import {gro_plugin_gen} from './gro_plugin_gen.ts';
-import {has_dep, load_package_json} from './package_json.ts';
-import {find_first_existing_file} from './search_fs.ts';
+import {load_package_json} from './package_json.ts';
 
 // TODO hacky, maybe extract utils?
 
@@ -23,29 +20,16 @@ import {find_first_existing_file} from './search_fs.ts';
 const config: Create_Gro_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] =
+	const [has_server_result, has_sveltekit_library_result, has_sveltekit_app_result] =
 		await Promise.all([
-			has_dep('@ryanatkn/moss', package_json),
 			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 () =>
+	cfg.plugins = () =>
 		[
-			// TODO probably belongs in the gen system
-			local_moss_plugin_path
-				? (await import(resolve(local_moss_plugin_path))).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
 			gro_plugin_gen(),
 			has_server_result.ok ? gro_plugin_server() : null,
 			has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,

package/src/lib/gro_plugin_gen.ts

@@ -7,7 +7,7 @@ import type {Args} from './args.ts';
 import {paths} from './paths.ts';
 import {find_genfiles, is_gen_path} from './gen.ts';
 import {spawn_cli} from './cli.ts';
-import {filter_dependents, type Cleanup_Watch} from './filer.ts';
+import {filter_dependents} from './filer.ts';
 
 const FLUSH_DEBOUNCE_DELAY = 500;
 
@@ -49,7 +49,7 @@ export const gro_plugin_gen = ({
 	// TODO do this in-process - will it cause caching issues with the current impl?
 	const gen = (files: Array<string> = []) => spawn_cli('gro', ['gen', ...files]);
 
-	let cleanup_watch: Cleanup_Watch | undefined;
+	let cleanup_watch: (() => void) | undefined;
 
 	return {
 		name: 'gro_plugin_gen',
@@ -105,9 +105,9 @@ export const gro_plugin_gen = ({
 				}
 			});
 		},
-		teardown: async () => {
+		teardown: () => {
 			if (cleanup_watch) {
-				await cleanup_watch();
+				cleanup_watch();
 				cleanup_watch = undefined;
 			}
 		},

package/src/lib/invoke_task.ts

@@ -44,13 +44,21 @@ export const invoke_task = async (
 	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())}`);
 	};
@@ -59,7 +67,7 @@ export const invoke_task = async (
 	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;
 	}
 
@@ -91,7 +99,7 @@ export const invoke_task = async (
 	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;
 	}
 
@@ -119,5 +127,5 @@ export const invoke_task = async (
 	}
 	log.info(`✓ ${st('cyan', task.name)}`);
 
-	finish();
+	await finish();
 };

package/src/lib/package.ts

@@ -5,7 +5,7 @@ import type {Src_Json} from '@ryanatkn/belt/src_json.js';
 
 export const package_json: 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: '🌰',
@@ -64,13 +64,13 @@ export const package_json: 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',
@@ -272,7 +272,7 @@ export const package_json: Package_Json = {
 
 export const src_json: Src_Json = {
 	name: '@ryanatkn/gro',
-	version: '0.163.0',
+	version: '0.164.1',
 	modules: {
 		'.': {
 			path: 'index.ts',
@@ -495,7 +495,6 @@ export const src_json: 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'},
@@ -981,6 +980,7 @@ export const src_json: 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/src/lib/package_json.ts

@@ -115,6 +115,9 @@ export const update_package_json = async (
 
 const is_index = (path: string): boolean => 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: Array<string>): Package_Json_Exports => {
 	const sorted = paths
 		.slice()