@ryanatkn/gro 0.135.1 → 0.135.3

package/src/lib/package.ts

@@ -5,7 +5,7 @@ import type {Src_Json} from './src_json.js';
 
 export const package_json = {
 	name: '@ryanatkn/gro',
-	version: '0.135.1',
+	version: '0.135.3',
 	description: 'task runner and toolkit extending SvelteKit',
 	motto: 'generate, run, optimize',
 	glyph: '🌰',
@@ -51,7 +51,7 @@ export const package_json = {
 		'esm-env': '^1.0.0',
 		mri: '^1.2.0',
 		prettier: '^3.3.3',
-		'prettier-plugin-svelte': '^3.2.6',
+		'prettier-plugin-svelte': '^3.2.7',
 		'ts-morph': '^23.0.0',
 		tslib: '^2.7.0',
 		zod: '^3.23.8',
@@ -60,22 +60,22 @@ export const package_json = {
 	devDependencies: {
 		'@changesets/changelog-git': '^0.2.0',
 		'@changesets/types': '^6.0.0',
-		'@ryanatkn/eslint-config': '^0.5.3',
-		'@ryanatkn/fuz': '^0.124.4',
+		'@ryanatkn/eslint-config': '^0.5.4',
+		'@ryanatkn/fuz': '^0.129.0',
 		'@ryanatkn/moss': '^0.16.1',
 		'@sveltejs/adapter-static': '^3.0.5',
-		'@sveltejs/kit': '^2.5.28',
+		'@sveltejs/kit': '^2.6.1',
 		'@sveltejs/package': '^2.3.5',
 		'@sveltejs/vite-plugin-svelte': '^3.1.2',
 		'@types/fs-extra': '^11.0.4',
-		'@types/node': '^22.5.5',
+		'@types/node': '^22.7.4',
 		esbuild: '^0.21.5',
-		eslint: '^9.11.0',
-		'eslint-plugin-svelte': '^2.44.0',
-		svelte: '^5.0.0-next.257',
-		'svelte-check': '^4.0.2',
+		eslint: '^9.11.1',
+		'eslint-plugin-svelte': '^2.44.1',
+		svelte: '^5.0.0-next.260',
+		'svelte-check': '^4.0.4',
 		typescript: '^5.6.2',
-		'typescript-eslint': '^8.6.0',
+		'typescript-eslint': '^8.7.0',
 		uvu: '^0.5.6',
 	},
 	prettier: {
@@ -138,6 +138,7 @@ export const package_json = {
 			types: './dist/esbuild_plugin_sveltekit_shim_env.d.ts',
 			default: './dist/esbuild_plugin_sveltekit_shim_env.js',
 		},
+		'./filer.js': {types: './dist/filer.d.ts', default: './dist/filer.js'},
 		'./format_directory.js': {
 			types: './dist/format_directory.d.ts',
 			default: './dist/format_directory.js',
@@ -184,6 +185,7 @@ export const package_json = {
 		'./package_meta.js': {types: './dist/package_meta.d.ts', default: './dist/package_meta.js'},
 		'./package.gen.js': {types: './dist/package.gen.d.ts', default: './dist/package.gen.js'},
 		'./package.js': {types: './dist/package.d.ts', default: './dist/package.js'},
+		'./parse_imports.js': {types: './dist/parse_imports.d.ts', default: './dist/parse_imports.js'},
 		'./path_constants.js': {
 			types: './dist/path_constants.d.ts',
 			default: './dist/path_constants.js',
@@ -268,7 +270,7 @@ export const package_json = {
 
 export const src_json = {
 	name: '@ryanatkn/gro',
-	version: '0.135.1',
+	version: '0.135.3',
 	modules: {
 		'.': {
 			path: 'index.ts',
@@ -435,6 +437,16 @@ export const src_json = {
 				{name: 'esbuild_plugin_sveltekit_shim_env', kind: 'function'},
 			],
 		},
+		'./filer.js': {
+			path: 'filer.ts',
+			declarations: [
+				{name: 'Source_File', kind: 'type'},
+				{name: 'Cleanup_Watch', kind: 'type'},
+				{name: 'On_Filer_Change', kind: 'type'},
+				{name: 'Options', kind: 'type'},
+				{name: 'Filer', kind: 'class'},
+			],
+		},
 		'./format_directory.js': {
 			path: 'format_directory.ts',
 			declarations: [{name: 'format_directory', kind: 'function'}],
@@ -552,7 +564,9 @@ export const src_json = {
 			path: 'gro_plugin_gen.ts',
 			declarations: [
 				{name: 'Task_Args', kind: 'type'},
-				{name: 'plugin', kind: 'function'},
+				{name: 'Options', kind: 'type'},
+				{name: 'gro_plugin_gen', kind: 'function'},
+				{name: 'filter_dependents', kind: 'function'},
 			],
 		},
 		'./gro_plugin_server.js': {
@@ -684,6 +698,14 @@ export const src_json = {
 				{name: 'src_json', kind: 'variable'},
 			],
 		},
+		'./parse_imports.js': {
+			path: 'parse_imports.ts',
+			declarations: [
+				{name: 'init_lexer', kind: 'function'},
+				{name: 'Import_Specifier', kind: 'type'},
+				{name: 'parse_imports', kind: 'function'},
+			],
+		},
 		'./path_constants.js': {
 			path: 'path_constants.ts',
 			declarations: [
@@ -709,6 +731,7 @@ export const src_json = {
 				{name: 'GIT_DIRNAME', kind: 'variable'},
 				{name: 'TSCONFIG_FILENAME', kind: 'variable'},
 				{name: 'TS_MATCHER', kind: 'variable'},
+				{name: 'JS_MATCHER', kind: 'variable'},
 				{name: 'JSON_MATCHER', kind: 'variable'},
 				{name: 'EVERYTHING_MATCHER', kind: 'variable'},
 			],
@@ -745,6 +768,7 @@ export const src_json = {
 				{name: 'IS_THIS_GRO', kind: 'variable'},
 				{name: 'gro_paths', kind: 'variable'},
 				{name: 'GRO_DIST_DIR', kind: 'variable'},
+				{name: 'default_file_filter', kind: 'function'},
 			],
 		},
 		'./plugin.js': {
@@ -870,6 +894,8 @@ export const src_json = {
 				{name: 'sveltekit_sync_if_available', kind: 'function'},
 				{name: 'sveltekit_sync_if_obviously_needed', kind: 'function'},
 				{name: 'Svelte_Package_Options', kind: 'type'},
+				{name: 'run_svelte_package', kind: 'function'},
+				{name: 'map_sveltekit_aliases', kind: 'function'},
 			],
 		},
 		'./sveltekit_shim_app_environment.js': {

package/src/lib/parse_imports.ts

@@ -0,0 +1,42 @@
+import {init, parse} from 'es-module-lexer';
+import type {Flavored} from '@ryanatkn/belt/types.js';
+
+import type {Path_Id} from './path.js';
+
+export const init_lexer = (): Promise<void> => init;
+
+export type Import_Specifier = Flavored<string, 'Import_Specifier'>;
+
+const script_matcher = /<script.*?>(.*?)<\/script>/gimsu;
+
+export const parse_imports = (
+	id: Path_Id,
+	contents: string,
+	ignore_types = true,
+): Import_Specifier[] => {
+	const specifiers: string[] = [];
+
+	const parse_from = (s: string): void => {
+		const parsed = parse(s);
+		for (const p of parsed[0]) {
+			if (ignore_types) {
+				const import_statement = s.slice(p.ss, p.se);
+				if (import_statement.startsWith('import type')) {
+					continue;
+				}
+			}
+			if (p.n) specifiers.push(p.n);
+		}
+	};
+
+	if (id.endsWith('.svelte')) {
+		const matches = contents.matchAll(script_matcher);
+		for (const m of matches) {
+			parse_from(m[1]);
+		}
+	} else {
+		parse_from(contents);
+	}
+
+	return specifiers;
+};

package/src/lib/path_constants.ts

@@ -30,5 +30,6 @@ export const GIT_DIRNAME = '.git';
 export const TSCONFIG_FILENAME = 'tsconfig.json';
 
 export const TS_MATCHER = /\.(ts|tsx|mts|cts)$/;
+export const JS_MATCHER = /\.(js|jsx|mjs|cjs)$/;
 export const JSON_MATCHER = /\.(json)$/;
 export const EVERYTHING_MATCHER = /.*/;

package/src/lib/paths.ts

@@ -7,11 +7,15 @@ import {
 	GRO_CONFIG_PATH,
 	GRO_DEV_DIR,
 	GRO_DIR,
+	JS_MATCHER,
+	JSON_MATCHER,
 	SOURCE_DIR,
 	SVELTEKIT_DIST_DIRNAME,
+	TS_MATCHER,
 } from './path_constants.js';
 import {default_sveltekit_config} from './sveltekit_config.js';
-import type {Path_Id} from './path.js';
+import type {File_Filter, Path_Id} from './path.js';
+import {SVELTE_MATCHER} from './svelte_helpers.js';
 
 /*
 
@@ -99,3 +103,6 @@ export const IS_THIS_GRO = gro_package_dir_path === paths.root;
  */
 export const gro_paths = IS_THIS_GRO ? paths : create_paths(gro_package_dir_path);
 export const GRO_DIST_DIR = gro_paths.root + SVELTEKIT_DIST_DIRNAME + '/';
+
+export const default_file_filter: File_Filter = (p) =>
+	SVELTE_MATCHER.test(p) || JS_MATCHER.test(p) || TS_MATCHER.test(p) || JSON_MATCHER.test(p);

package/src/lib/run_task.ts

@@ -9,6 +9,7 @@ import {log_task_help} from './task_logging.js';
 import type {Gro_Config} from './gro_config.js';
 import {Task_Error, type Task_Module_Meta} from './task.js';
 import {default_sveltekit_config} from './sveltekit_config.js';
+import type {Filer} from './filer.js';
 
 export type Run_Task_Result =
 	| {
@@ -26,6 +27,7 @@ export const run_task = async (
 	unparsed_args: Args,
 	invoke_task: typeof base_invoke_task,
 	config: Gro_Config,
+	filer: Filer,
 	timings: Timings,
 ): Promise<Run_Task_Result> => {
 	const {task} = task_meta.mod;
@@ -48,16 +50,17 @@ export const run_task = async (
 	}
 
 	// Run the task.
-	let output: unknown;
+	let output: unknown; // TODO generic
 	try {
 		output = await task.run({
 			args,
 			config,
 			sveltekit_config: default_sveltekit_config,
+			filer,
 			log,
 			timings,
 			invoke_task: (invoked_task_name, invoked_args, invoked_config) =>
-				invoke_task(invoked_task_name, invoked_args, invoked_config ?? config, timings),
+				invoke_task(invoked_task_name, invoked_args, invoked_config ?? config, filer, timings),
 		});
 	} catch (err) {
 		return {

package/src/lib/search_fs.ts

@@ -12,7 +12,7 @@ export interface Search_Fs_Options {
 	 */
 	filter?: Path_Filter | Path_Filter[];
 	/**
-	 * An array of file suffixes to include.
+	 * One or more file filter functions. Every filter must pass for a file to be included.
 	 */
 	file_filter?: File_Filter | File_Filter[];
 	/**
@@ -20,7 +20,7 @@ export interface Search_Fs_Options {
 	 */
 	sort?: boolean | null | ((a: Resolved_Path, b: Resolved_Path) => number);
 	/**
-	 * Set to `false` to include directories.
+	 * Set to `true` to include directories. Defaults to `false`.
 	 */
 	include_directories?: boolean;
 	/**
@@ -76,17 +76,16 @@ const crawl = (
 		const is_directory = dirent.isDirectory();
 		const id = parentPath + name;
 		const include = !filters || filters.every((f) => f(id, is_directory));
-		if (include) {
-			const path = base_dir === null ? name : base_dir + '/' + name;
-			if (is_directory) {
-				const dir_id = id + '/';
-				if (include_directories) {
-					paths.push({path, id: dir_id, is_directory: true});
-				}
-				crawl(dir_id, paths, filters, file_filter, include_directories, path);
-			} else if (!file_filter || file_filter.every((f) => f(id))) {
-				paths.push({path, id, is_directory: false});
+		if (!include) continue;
+		const path = base_dir === null ? name : base_dir + '/' + name;
+		if (is_directory) {
+			const dir_id = id + '/';
+			if (include_directories) {
+				paths.push({path, id: dir_id, is_directory: true});
 			}
+			crawl(dir_id, paths, filters, file_filter, include_directories, path);
+		} else if (!file_filter || file_filter.every((f) => f(id))) {
+			paths.push({path, id, is_directory: false});
 		}
 	}
 	return paths;

package/src/lib/sveltekit_config.ts

@@ -35,7 +35,7 @@ export const load_sveltekit_config = async (
 export interface Parsed_Sveltekit_Config {
 	// TODO probably fill these out with defaults
 	sveltekit_config: SveltekitConfig | null;
-	alias: Record<string, string> | undefined;
+	alias: Record<string, string>;
 	base_url: '' | `/${string}` | undefined;
 	assets_url: '' | `http://${string}` | `https://${string}` | undefined;
 
@@ -74,7 +74,7 @@ export const init_sveltekit_config = async (
 		typeof dir_or_config === 'string' ? await load_sveltekit_config(dir_or_config) : dir_or_config;
 	const kit = sveltekit_config?.kit;
 
-	const alias = kit?.alias;
+	const alias = {$lib: 'src/lib', ...kit?.alias};
 
 	const base_url = kit?.paths?.base;
 	const assets_url = kit?.paths?.assets;

package/src/lib/sveltekit_helpers.ts

@@ -1,11 +1,14 @@
 import type {Result} from '@ryanatkn/belt/result.js';
 import {existsSync} from 'node:fs';
+import type {Logger} from '@ryanatkn/belt/log.js';
+import {join} from 'node:path';
 
 import {Package_Json, load_package_json} from './package_json.js';
 import {default_sveltekit_config, type Parsed_Sveltekit_Config} from './sveltekit_config.js';
 import {SVELTEKIT_CONFIG_FILENAME, SVELTEKIT_DEV_DIRNAME} from './path_constants.js';
 import {find_cli, spawn_cli, to_cli_name, type Cli} from './cli.js';
 import {Task_Error} from './task.js';
+import {serialize_args, to_forwarded_args} from './args.js';
 
 export const SVELTEKIT_CLI = 'svelte-kit';
 
@@ -145,3 +148,46 @@ export interface Svelte_Package_Options {
 	 */
 	tsconfig?: string;
 }
+
+export const run_svelte_package = async (
+	options: Svelte_Package_Options | undefined,
+	cli: string | Cli,
+	log: Logger,
+): Promise<void> => {
+	const has_sveltekit_library_result = has_sveltekit_library();
+	if (!has_sveltekit_library_result.ok) {
+		throw new Task_Error(
+			'Failed to find SvelteKit library: ' + has_sveltekit_library_result.message,
+		);
+	}
+	const cli_name = typeof cli === 'string' ? cli : cli.name;
+	const found_svelte_package_cli = cli === cli_name ? find_cli(cli) : (cli as Cli);
+	if (found_svelte_package_cli?.kind !== 'local') {
+		throw new Task_Error(
+			`Failed to find SvelteKit packaging CLI \`${cli_name}\`, do you need to run \`npm i\`?`,
+		);
+	}
+	const serialized_args = serialize_args({
+		...options,
+		...to_forwarded_args(cli_name),
+	});
+	await spawn_cli(found_svelte_package_cli, serialized_args, log);
+};
+
+//
+/**
+ * Map an import specifier with the SvelteKit aliases.
+ */
+export const map_sveltekit_aliases = (
+	specifier: string,
+	aliases: Array<[string, string]>,
+): string => {
+	let path = specifier;
+	for (const [from, to] of aliases) {
+		if (path.startsWith(from)) {
+			path = join(process.cwd(), to, path.substring(from.length));
+			break;
+		}
+	}
+	return path;
+};

package/src/lib/task.ts

@@ -20,6 +20,7 @@ import {
 import {GRO_DIST_DIR, print_path} from './paths.js';
 import {search_fs} from './search_fs.js';
 import {load_modules, type Load_Modules_Failure, type Module_Meta} from './modules.js';
+import type {Filer} from './filer.js';
 
 export interface Task<
 	T_Args = Args, // same as `z.infer<typeof Args>`
@@ -35,6 +36,7 @@ export interface Task_Context<T_Args = object> {
 	args: T_Args;
 	config: Gro_Config;
 	sveltekit_config: Parsed_Sveltekit_Config;
+	filer: Filer;
 	// TODO should this go here or on `config` for convenience?
 	// sveltekit_config: Parsed_Sveltekit_Config;
 	log: Logger;

package/src/lib/watch_dir.ts

@@ -1,8 +1,8 @@
 import {watch, type ChokidarOptions, type FSWatcher} from 'chokidar';
 import {relative} from 'node:path';
+import {statSync} from 'node:fs';
 
 import type {Path_Filter} from './path.js';
-import {statSync} from 'node:fs';
 
 // TODO pretty hacky
 
@@ -16,7 +16,7 @@ export interface Watcher_Change {
 	path: string;
 	is_directory: boolean;
 }
-export type Watcher_Change_Type = 'create' | 'update' | 'delete';
+export type Watcher_Change_Type = 'add' | 'update' | 'delete';
 export type Watcher_Change_Callback = (change: Watcher_Change) => void;
 
 export interface Options {
@@ -42,21 +42,23 @@ export const watch_dir = ({
 	chokidar,
 }: Options): Watch_Node_Fs => {
 	let watcher: FSWatcher | undefined;
+	let initing: Promise<void> | undefined;
 
 	return {
 		init: async () => {
-			watcher = watch(dir, chokidar);
-			watcher.on('add', (path, s) => {
-				const stats = s ?? statSync(path);
+			if (initing) return initing;
+			let resolve: any;
+			initing = new Promise((r) => (resolve = r)); // TODO `create_deferred`?// cwd: chokidar?.cwd ?? process.cwd()
+			watcher = watch(dir, {...chokidar});
+			watcher.on('add', (path) => {
 				const final_path = absolute ? path : relative(dir, path);
-				if (filter && !filter(final_path, stats.isDirectory())) return;
-				on_change({type: 'create', path: final_path, is_directory: stats.isDirectory()});
+				if (filter && !filter(final_path, false)) return;
+				on_change({type: 'add', path: final_path, is_directory: false});
 			});
-			watcher.on('addDir', (path, s) => {
-				const stats = s ?? statSync(path);
+			watcher.on('addDir', (path) => {
 				const final_path = absolute ? path : relative(dir, path);
-				if (filter && !filter(final_path, stats.isDirectory())) return;
-				on_change({type: 'create', path: final_path, is_directory: stats.isDirectory()});
+				if (filter && !filter(final_path, true)) return;
+				on_change({type: 'add', path: final_path, is_directory: true});
 			});
 			watcher.on('change', (path, s) => {
 				const stats = s ?? statSync(path);
@@ -75,12 +77,11 @@ export const watch_dir = ({
 				on_change({type: 'delete', path: final_path, is_directory: true});
 			});
 			// wait until ready
-			let resolve: any;
-			const promise = new Promise((r) => (resolve = r));
 			watcher.once('ready', () => resolve());
-			await promise;
+			await initing;
 		},
 		close: async () => {
+			initing = undefined;
 			if (!watcher) return;
 			await watcher.close();
 		},