@ryanatkn/gro 0.141.1 → 0.143.0

package/src/lib/filer.ts

@@ -18,6 +18,8 @@ import {resolve_specifier} from './resolve_specifier.js';
 import {default_sveltekit_config} from './sveltekit_config.js';
 import {map_sveltekit_aliases} from './sveltekit_helpers.js';
 import {Unreachable_Error} from '@ryanatkn/belt/error.js';
+import {resolve_node_specifier} from './resolve_node_specifier.js';
+import type {Package_Json} from './package_json.js';
 // TODO see below
 // import {resolve_node_specifier} from './resolve_node_specifier.js';
 
@@ -31,6 +33,11 @@ export interface Source_File {
 	 * We create the file in memory to track its dependents regardless of its existence on disk.
 	 */
 	contents: string | null;
+	/**
+	 * Is the source file outside of the `root_dir` or excluded by `watch_dir_options.filter`?
+	 */
+	external: boolean;
+	ctime: number | null;
 	mtime: number | null;
 	dependents: Map<Path_Id, Source_File>;
 	dependencies: Map<Path_Id, Source_File>;
@@ -43,6 +50,7 @@ export type On_Filer_Change = (change: Watcher_Change, source_file: Source_File)
 export interface Options {
 	watch_dir?: typeof watch_dir;
 	watch_dir_options?: Partial<Omit_Strict<Watch_Dir_Options, 'on_change'>>;
+	package_json_cache?: Record<string, Package_Json>;
 }
 
 export class Filer {
@@ -53,10 +61,13 @@ export class Filer {
 	#watch_dir: typeof watch_dir;
 	#watch_dir_options: Partial<Watch_Dir_Options>;
 
+	#package_json_cache: Record<string, Package_Json>;
+
 	constructor(options: Options = EMPTY_OBJECT) {
 		this.#watch_dir = options.watch_dir ?? watch_dir;
 		this.#watch_dir_options = options.watch_dir_options ?? EMPTY_OBJECT;
 		this.root_dir = resolve(options.watch_dir_options?.dir ?? paths.source);
+		this.#package_json_cache = options.package_json_cache ?? {};
 	}
 
 	#watching: Watch_Node_Fs | undefined;
@@ -74,11 +85,17 @@ export class Filer {
 		const file: Source_File = {
 			id,
 			contents: null,
+			external: this.#is_external(id), // TODO maybe filter externals by default? the user needs to configure the filer then
+			ctime: null,
 			mtime: null,
 			dependents: new Map(),
 			dependencies: new Map(),
 		};
 		this.files.set(id, file);
+		// TODO this may need to be batched/deferred
+		if (file.external) {
+			this.#on_change({type: 'add', path: file.id, is_directory: false});
+		}
 		return file;
 	};
 
@@ -86,8 +103,7 @@ export class Filer {
 		const file = this.get_or_create(id);
 
 		const stats = existsSync(id) ? statSync(id) : null;
-		// const mtime_prev = file.mtime;
-		// const mtime_changed = mtime_prev !== (stats?.mtimeMs ?? null);
+		file.ctime = stats?.ctimeMs ?? null;
 		file.mtime = stats?.mtimeMs ?? null;
 
 		const new_contents = stats ? readFileSync(id, 'utf8') : null;
@@ -109,36 +125,25 @@ export class Filer {
 			const path = map_sveltekit_aliases(specifier, aliases);
 
 			// The specifier `path` has now been mapped to its final form, so we can inspect it.
-			if (path[0] === '.' || path[0] === '/') {
-				const {path_id} = resolve_specifier(path, dir);
-				dependencies_removed.delete(path_id);
-				if (!dependencies_before.has(path_id)) {
-					const d = this.get_or_create(path_id);
-					file.dependencies.set(d.id, d);
-					d.dependents.set(file.id, file);
-				}
+			const resolved =
+				path[0] === '.' || path[0] === '/'
+					? resolve_specifier(path, dir)
+					: resolve_node_specifier(path, undefined, file.id, this.#package_json_cache, false);
+			if (!resolved) continue; // ignore any missing imports like Node identifiers
+			const {path_id} = resolved;
+			dependencies_removed.delete(path_id);
+			if (!dependencies_before.has(path_id)) {
+				const d = this.get_or_create(path_id);
+				file.dependencies.set(d.id, d);
+				d.dependents.set(file.id, file);
 			}
-			// TODO this doesn't work
-			// const resolved =
-			// 	path[0] === '.' || path[0] === '/'
-			// 		? resolve_specifier(path, dir)
-			// 		: resolve_node_specifier(path, dir);
-			// const {path_id} = resolved;
-			// dependencies_removed.delete(path_id);
-			// if (!dependencies_before.has(path_id)) {
-			// 	const d = this.get_or_create(path_id);
-			// 	file.dependencies.set(d.id, d);
-			// 	d.dependents.set(file.id, file);
-			// }
 		}
 
 		// update any removed dependencies
 		for (const dependency_removed of dependencies_removed) {
-			const deleted1 = file.dependencies.delete(dependency_removed);
-			if (!deleted1) throw Error('expected to delete1 ' + file.id); // TODO @many delete if correct
+			file.dependencies.delete(dependency_removed);
 			const dependency_removed_file = this.get_or_create(dependency_removed);
-			const deleted2 = dependency_removed_file.dependents.delete(file.id);
-			if (!deleted2) throw Error('expected to delete2 ' + file.id); // TODO @many delete if correct
+			dependency_removed_file.dependents.delete(file.id);
 		}
 
 		return file;
@@ -203,7 +208,7 @@ export class Filer {
 	}
 
 	#on_change: Watcher_Change_Callback = (change) => {
-		if (change.is_directory) return;
+		if (change.is_directory) return; // TODO manage directories?
 		let source_file: Source_File | null;
 		switch (change.type) {
 			case 'add':
@@ -236,4 +241,9 @@ export class Filer {
 			this.#watching = undefined;
 		}
 	}
+
+	#is_external(id: string): boolean {
+		const {filter} = this.#watch_dir_options;
+		return !id.startsWith(this.root_dir + '/') || (!!filter && !filter(id, false));
+	}
 }

package/src/lib/format.task.ts

@@ -17,10 +17,18 @@ export type Args = z.infer<typeof Args>;
 export const task: Task<Args> = {
 	summary: 'format source files',
 	Args,
-	run: async ({args, log}) => {
+	run: async ({args, log, config}) => {
 		const {check} = args;
 		// TODO forward prettier args
-		const format_result = await format_directory(log, paths.source, check);
+		const format_result = await format_directory(
+			log,
+			paths.source,
+			check,
+			undefined,
+			undefined,
+			undefined,
+			config.pm_cli,
+		);
 		if (!format_result.ok) {
 			throw new Task_Error(
 				`Failed ${check ? 'formatting check' : 'to format'}. ${print_spawn_result(format_result)}`,

package/src/lib/format_directory.ts

@@ -9,14 +9,14 @@ import {
 	VITE_CONFIG_FILENAME,
 	TSCONFIG_FILENAME,
 	GRO_CONFIG_PATH,
-} from './path_constants.js';
+	PM_CLI_DEFAULT,
+	PRETTIER_CLI_DEFAULT,
+} from './constants.js';
 import {serialize_args, to_forwarded_args} from './args.js';
 import {spawn_cli, to_cli_name, type Cli} from './cli.js';
 
-const PRETTIER_CLI = 'prettier';
-
-const DEFAULT_EXTENSIONS = 'ts,js,json,svelte,html,css,md,yml';
-const DEFAULT_ROOT_PATHS = `${[
+const EXTENSIONS_DEFAULT = 'ts,js,json,svelte,html,css,md,yml';
+const ROOT_PATHS_DEFAULT = `${[
 	README_FILENAME,
 	GRO_CONFIG_PATH,
 	SVELTEKIT_CONFIG_FILENAME,
@@ -35,9 +35,10 @@ export const format_directory = async (
 	log: Logger,
 	dir: string,
 	check = false,
-	extensions = DEFAULT_EXTENSIONS,
-	root_paths = DEFAULT_ROOT_PATHS,
-	prettier_cli: string | Cli = PRETTIER_CLI,
+	extensions = EXTENSIONS_DEFAULT,
+	root_paths = ROOT_PATHS_DEFAULT,
+	prettier_cli: string | Cli = PRETTIER_CLI_DEFAULT,
+	pm_cli: string = PM_CLI_DEFAULT,
 ): Promise<Spawn_Result> => {
 	const forwarded_args = to_forwarded_args(to_cli_name(prettier_cli));
 	forwarded_args[check ? 'check' : 'write'] = true;
@@ -49,7 +50,7 @@ export const format_directory = async (
 	const spawned = await spawn_cli(prettier_cli, serialized_args, log);
 	if (!spawned)
 		throw new Error(
-			`failed to find \`${to_cli_name(prettier_cli)}\` CLI locally or globally, do you need to run \`npm i\`?`,
+			`failed to find \`${to_cli_name(prettier_cli)}\` CLI locally or globally, do you need to run \`${pm_cli} install\`?`,
 		);
 	return spawned;
 };

package/src/lib/gen.task.ts

@@ -10,7 +10,7 @@ import {format_file} from './format_file.js';
 import {print_path} from './paths.js';
 import {log_error_reasons} from './task_logging.js';
 import {write_gen_results, analyze_gen_results, find_genfiles, load_genfiles} from './gen.js';
-import {SOURCE_DIRNAME} from './path_constants.js';
+import {SOURCE_DIRNAME} from './constants.js';
 
 export const Args = z
 	.object({

package/src/lib/gro_config.ts

@@ -4,11 +4,13 @@ import {existsSync} from 'node:fs';
 import {GRO_DIST_DIR, IS_THIS_GRO, paths} from './paths.js';
 import {
 	GRO_CONFIG_PATH,
+	JS_CLI_DEFAULT,
 	NODE_MODULES_DIRNAME,
+	PM_CLI_DEFAULT,
 	SERVER_DIST_PATH,
 	SVELTEKIT_BUILD_DIRNAME,
 	SVELTEKIT_DIST_DIRNAME,
-} from './path_constants.js';
+} from './constants.js';
 import create_default_config from './gro.config.default.js';
 import type {Create_Config_Plugins} from './plugin.js';
 import type {Map_Package_Json} from './package_json.js';
@@ -40,6 +42,14 @@ export interface Gro_Config {
 	 * directories and files are included if they pass all of these filters.
 	 */
 	search_filters: Path_Filter[];
+	/**
+	 * The CLI to use that's compatible with `node`.
+	 */
+	js_cli: string;
+	/**
+	 * The CLI to use that's compatible with `npm install` and `npm link`. Defaults to `'npm'`.
+	 */
+	pm_cli: string;
 }
 
 /**
@@ -52,6 +62,8 @@ export interface Raw_Gro_Config {
 	map_package_json?: Map_Package_Json | null;
 	task_root_dirs?: string[];
 	search_filters?: Path_Filter | Path_Filter[] | null;
+	js_cli?: string;
+	pm_cli?: string;
 }
 
 export type Create_Gro_Config = (
@@ -67,7 +79,9 @@ export const create_empty_gro_config = (): Gro_Config => ({
 		IS_THIS_GRO ? null : paths.root,
 		IS_THIS_GRO ? null : GRO_DIST_DIR,
 	].filter((v) => v !== null),
-	search_filters: [(id) => !DEFAULT_SEARCH_EXCLUDER.test(id)],
+	search_filters: [(id) => !SEARCH_EXCLUDER_DEFAULT.test(id)],
+	js_cli: JS_CLI_DEFAULT,
+	pm_cli: PM_CLI_DEFAULT,
 });
 
 /**
@@ -76,7 +90,7 @@ export const create_empty_gro_config = (): Gro_Config => ({
  * Customize via `search_filters` in the `Gro_Config`.
  * See the test cases for the exact behavior.
  */
-export const DEFAULT_SEARCH_EXCLUDER = new RegExp(
+export const SEARCH_EXCLUDER_DEFAULT = new RegExp(
 	`(${
 		'(^|/)\\.[^/]+' + // exclude all `.`-prefixed directories
 		// TODO probably change to `pkg.name` instead of this catch-all (also `gro` below)
@@ -91,13 +105,13 @@ export const DEFAULT_SEARCH_EXCLUDER = new RegExp(
 const default_map_package_json: Map_Package_Json = (package_json) => {
 	if (package_json.exports) {
 		package_json.exports = Object.fromEntries(
-			Object.entries(package_json.exports).filter(([k]) => !DEFAULT_EXPORTS_EXCLUDER.test(k)),
+			Object.entries(package_json.exports).filter(([k]) => !EXPORTS_EXCLUDER_DEFAULT.test(k)),
 		);
 	}
 	return package_json;
 };
 
-export const DEFAULT_EXPORTS_EXCLUDER = /(\.md|\.(test|ignore)\.|\/(test|fixtures|ignore)\/)/;
+export const EXPORTS_EXCLUDER_DEFAULT = /(\.md|\.(test|ignore)\.|\/(test|fixtures|ignore)\/)/;
 
 /**
  * Transforms a `Raw_Gro_Config` to the more strict `Gro_Config`.
@@ -112,6 +126,8 @@ export const normalize_gro_config = (raw_config: Raw_Gro_Config): Gro_Config =>
 		map_package_json = empty_config.map_package_json,
 		task_root_dirs = empty_config.task_root_dirs,
 		search_filters = empty_config.search_filters,
+		js_cli = empty_config.js_cli,
+		pm_cli = empty_config.pm_cli,
 	} = raw_config;
 	return {
 		plugins,
@@ -122,6 +138,8 @@ export const normalize_gro_config = (raw_config: Raw_Gro_Config): Gro_Config =>
 			: search_filters
 				? [search_filters]
 				: [],
+		js_cli,
+		pm_cli,
 	};
 };
 

package/src/lib/gro_helpers.ts

@@ -3,7 +3,7 @@ import {join, resolve} from 'node:path';
 import {fileURLToPath} from 'node:url';
 import {spawn, type Spawn_Result} from '@ryanatkn/belt/process.js';
 
-import {NODE_MODULES_DIRNAME, SVELTEKIT_DIST_DIRNAME} from './path_constants.js';
+import {JS_CLI_DEFAULT, NODE_MODULES_DIRNAME, SVELTEKIT_DIST_DIRNAME} from './constants.js';
 
 /*
 
@@ -84,6 +84,7 @@ export const spawn_with_loader = (
 	loader_path: string,
 	invoke_path: string,
 	argv: string[],
+	js_cli = JS_CLI_DEFAULT, // TODO source from config when possible
 ): Promise<Spawn_Result> => {
 	const args = [
 		'--import',
@@ -99,5 +100,5 @@ export const spawn_with_loader = (
 		args.push('-C', 'development'); // same as `--conditions`
 	}
 	args.push(invoke_path, ...argv);
-	return spawn('node', args);
+	return spawn(js_cli, args);
 };

package/src/lib/gro_plugin_server.ts

@@ -11,7 +11,7 @@ import {throttle} from '@ryanatkn/belt/throttle.js';
 import type {Plugin} from './plugin.js';
 import {base_path_to_path_id, LIB_DIRNAME, paths} from './paths.js';
 import type {Path_Id} from './path.js';
-import {GRO_DEV_DIRNAME, SERVER_DIST_PATH} from './path_constants.js';
+import {GRO_DEV_DIRNAME, SERVER_DIST_PATH} from './constants.js';
 import {watch_dir, type Watch_Node_Fs} from './watch_dir.js';
 import {init_sveltekit_config, default_sveltekit_config} from './sveltekit_config.js';
 import {esbuild_plugin_sveltekit_shim_app} from './esbuild_plugin_sveltekit_shim_app.js';
@@ -119,7 +119,7 @@ export const gro_plugin_server = ({
 	target = 'esnext',
 	esbuild_build_options = identity,
 	rebuild_throttle_delay = 1000,
-	cli_command = 'node',
+	cli_command,
 	run, // `dev` default is not available in this scope
 }: Options = {}): Plugin => {
 	let build_ctx: esbuild.BuildContext | null = null;
@@ -129,7 +129,7 @@ export const gro_plugin_server = ({
 
 	return {
 		name: 'gro_plugin_server',
-		setup: async ({dev, watch, timings, log}) => {
+		setup: async ({dev, watch, timings, log, config}) => {
 			const parsed_sveltekit_config =
 				!sveltekit_config && strip_end(dir, '/') === process.cwd()
 					? default_sveltekit_config
@@ -256,7 +256,7 @@ export const gro_plugin_server = ({
 					cli_args.push('-C', 'development'); // same as `--conditions`
 				}
 				cli_args.push(server_outpath);
-				server_process = spawn_restartable_process(cli_command, cli_args);
+				server_process = spawn_restartable_process(cli_command ?? config.js_cli, cli_args);
 			}
 		},
 		teardown: async () => {

package/src/lib/gro_plugin_sveltekit_app.ts

@@ -8,9 +8,9 @@ import {serialize_package_json, type Map_Package_Json, load_package_json} from '
 import {Task_Error} from './task.js';
 import {find_cli, spawn_cli, spawn_cli_process} from './cli.js';
 import {type Map_Src_Json, serialize_src_json, create_src_json} from './src_json.js';
-import {DEFAULT_EXPORTS_EXCLUDER} from './gro_config.js';
+import {EXPORTS_EXCLUDER_DEFAULT} from './gro_config.js';
 import {default_sveltekit_config} from './sveltekit_config.js';
-import {SOURCE_DIRNAME} from './path_constants.js';
+import {SOURCE_DIRNAME} from './constants.js';
 import {VITE_CLI} from './sveltekit_helpers.js';
 
 export interface Options {
@@ -57,10 +57,12 @@ export const gro_plugin_sveltekit_app = ({
 	let sveltekit_process: Spawned_Process | undefined = undefined;
 	return {
 		name: 'gro_plugin_sveltekit_app',
-		setup: async ({dev, watch, log}) => {
+		setup: async ({dev, watch, log, config}) => {
 			const found_vite_cli = find_cli(vite_cli);
 			if (!found_vite_cli)
-				throw new Error(`Failed to find Vite CLI \`${vite_cli}\`, do you need to run \`npm i\`?`);
+				throw new Error(
+					`Failed to find Vite CLI \`${vite_cli}\`, do you need to run \`${config.pm_cli} i\`?`,
+				);
 			if (dev) {
 				// `vite dev` in development mode
 				if (watch) {
@@ -123,7 +125,7 @@ export const gro_plugin_sveltekit_app = ({
 								assets_path,
 								'.well-known',
 								well_known_src_files === true
-									? (file_path) => !DEFAULT_EXPORTS_EXCLUDER.test(file_path)
+									? (file_path) => !EXPORTS_EXCLUDER_DEFAULT.test(file_path)
 									: well_known_src_files,
 							)
 						: null,

package/src/lib/gro_plugin_sveltekit_library.ts

@@ -28,17 +28,17 @@ export const gro_plugin_sveltekit_library = ({
 }: Options = {}): Plugin => {
 	return {
 		name: 'gro_plugin_sveltekit_library',
-		setup: async ({dev, log}) => {
+		setup: async ({dev, log, config}) => {
 			if (!dev) {
-				await run_svelte_package(svelte_package_options, svelte_package_cli, log);
+				await run_svelte_package(svelte_package_options, svelte_package_cli, log, config.pm_cli);
 			}
 		},
-		adapt: async ({log, timings}) => {
+		adapt: async ({log, timings, config}) => {
 			const package_json = load_package_json();
 
-			// `npm link`
+			// link the CLI binaries if they exist
 			if (package_json.bin) {
-				const timing_to_npm_link = timings.start('npm link');
+				const timing_to_link = timings.start(`${config.pm_cli} link`);
 				await Promise.all(
 					Object.values(package_json.bin).map(async (bin_path) => {
 						const chmod_result = await spawn('chmod', ['+x', bin_path]);
@@ -47,11 +47,11 @@ export const gro_plugin_sveltekit_library = ({
 					}),
 				);
 				log.info(`linking`);
-				const link_result = await spawn('npm', ['link', '-f']); // TODO don't use `-f` unless necessary or at all?
+				const link_result = await spawn(config.pm_cli, ['link', '-f']); // TODO don't use `-f` unless necessary or at all?
 				if (!link_result.ok) {
 					throw new Task_Error(`Failed to link. ${print_spawn_result(link_result)}`);
 				}
-				timing_to_npm_link();
+				timing_to_link();
 			}
 		},
 	};

package/src/lib/loader.ts

@@ -16,8 +16,8 @@ import {
 } from './sveltekit_shim_app.js';
 import {default_sveltekit_config} from './sveltekit_config.js';
 import {SVELTE_MATCHER, SVELTE_RUNES_MATCHER} from './svelte_helpers.js';
-import {paths} from './paths.js';
-import {JSON_MATCHER, NODE_MODULES_DIRNAME, TS_MATCHER} from './path_constants.js';
+import {IS_THIS_GRO, paths} from './paths.js';
+import {JSON_MATCHER, NODE_MODULES_DIRNAME, TS_MATCHER} from './constants.js';
 import {to_define_import_meta_env, default_ts_transform_options} from './esbuild_helpers.js';
 import {resolve_specifier} from './resolve_specifier.js';
 import {resolve_node_specifier} from './resolve_node_specifier.js';
@@ -173,51 +173,59 @@ export const load: LoadHook = async (url, context, nextLoad) => {
 };
 
 export const resolve: ResolveHook = async (specifier, context, nextResolve) => {
+	let s = specifier;
+
+	// Support SvelteKit `$env` imports
 	if (
-		specifier === '$env/static/public' ||
-		specifier === '$env/static/private' ||
-		specifier === '$env/dynamic/public' ||
-		specifier === '$env/dynamic/private'
+		s === '$env/static/public' ||
+		s === '$env/static/private' ||
+		s === '$env/dynamic/public' ||
+		s === '$env/dynamic/private'
 	) {
 		// The returned `url` is validated before `load` is called,
 		// so we need a slightly roundabout strategy to pass through the specifier for virtual files.
 		return {
-			url: pathToFileURL(join(dir, 'src/lib', specifier)).href,
+			url: pathToFileURL(join(dir, 'src/lib', s)).href,
 			format: 'module',
 			shortCircuit: true,
 		};
 	}
 
+	// Special case for Gro's dependencies that import into Gro.
+	// Without this, we'd need to add a dev dep to Gro for Gro, which causes problems.
+	if (IS_THIS_GRO && s.startsWith('@ryanatkn/gro')) {
+		s = join(dir, 'dist', s.substring(13));
+	}
+
 	const parent_url = context.parentURL;
 	if (!parent_url || NODE_MODULES_MATCHER.test(parent_url)) {
-		return nextResolve(specifier, context);
+		return nextResolve(s, context);
 	}
 
-	const shimmed = sveltekit_shim_app_specifiers.get(specifier);
+	const shimmed = sveltekit_shim_app_specifiers.get(s);
 	if (shimmed !== undefined) {
 		return nextResolve(shimmed, context);
 	}
 
-	const path = map_sveltekit_aliases(specifier, aliases);
+	s = map_sveltekit_aliases(s, aliases);
 
-	// The specifier `path` has now been mapped to its final form, so we can inspect it.
-	if (path[0] !== '.' && path[0] !== '/') {
+	// The specifier has now been mapped to its final form, so we can inspect it.
+	if (s[0] !== '.' && s[0] !== '/') {
 		// Resolve to `node_modules`.
-		if (SVELTE_MATCHER.test(path) || JSON_MATCHER.test(path)) {
+		if (SVELTE_MATCHER.test(s) || JSON_MATCHER.test(s)) {
 			// Match the behavior of Vite and esbuild for Svelte and JSON imports.
-			// TODO `.ts` too
-			const resolved = resolve_node_specifier(path, dir, parent_url, package_json_cache);
+			const resolved = resolve_node_specifier(s, dir, parent_url, package_json_cache)!; // `node:` specifiers shouldn't reach this point, so the assertion is safe
 			return {
 				url: pathToFileURL(resolved.path_id_with_querystring).href,
 				format: 'module',
 				shortCircuit: true,
 			};
 		} else {
-			return nextResolve(path, context);
+			return nextResolve(s, context);
 		}
 	}
 
-	const resolved = resolve_specifier(path, dirname(fileURLToPath(parent_url)));
+	const resolved = resolve_specifier(s, dirname(fileURLToPath(parent_url)));
 
 	return {
 		url: pathToFileURL(resolved.path_id_with_querystring).href,

package/src/lib/module.ts

@@ -1,5 +1,5 @@
 import {LIB_DIRNAME} from './paths.js';
-import {SOURCE_DIR, SOURCE_DIRNAME} from './path_constants.js';
+import {SOURCE_DIR, SOURCE_DIRNAME} from './constants.js';
 
 export const MODULE_PATH_SRC_PREFIX = SOURCE_DIR;
 export const MODULE_PATH_LIB_PREFIX = `$${LIB_DIRNAME}/`;

package/src/lib/moss_helpers.ts

@@ -3,6 +3,7 @@ import {existsSync} from 'node:fs';
 import {resolve} from 'node:path';
 
 import {has_dep, type Package_Json} from './package_json.js';
+import {NODE_MODULES_DIRNAME, PM_CLI_DEFAULT} from './constants.js';
 
 export const MOSS_PACKAGE_DEP_NAME = '@ryanatkn/moss';
 
@@ -10,13 +11,14 @@ export const MOSS_PACKAGE_DEP_NAME = '@ryanatkn/moss';
 export const load_moss_plugin = async (
 	package_json?: Package_Json,
 	dep_name = MOSS_PACKAGE_DEP_NAME,
-	plugin_path = `node_modules/${dep_name}/dist/gro_plugin_moss.js`, // TODO maybe lookup from its `package_json.exports`? kinda unnecessary
+	plugin_path = `${NODE_MODULES_DIRNAME}/${dep_name}/dist/gro_plugin_moss.js`, // TODO maybe lookup from its `package_json.exports`? kinda unnecessary
 	local_plugin_path = 'src/lib/gro_plugin_moss.ts',
+	pm_cli = PM_CLI_DEFAULT, // TODO source from config when possible, is just needed for error messages
 ): Promise<Result<{gro_plugin_moss: any}, {message: string}>> => {
 	if (!has_dep(dep_name, package_json)) {
 		return {
 			ok: false,
-			message: `no dependency found in package.json for ${dep_name}, install it with \`npm i -D ${dep_name}\``,
+			message: `no dependency found in package.json for ${dep_name}, install it with \`${pm_cli} install -D ${dep_name}\``,
 		};
 	}