@ryanatkn/gro 0.140.4 → 0.140.6

package/README.md

@@ -9,7 +9,6 @@
 [Windows won't be supported](https://github.com/ryanatkn/gro/issues/319), I chose Bash instead.
 
 Feel free to open issues with anything you'd like to discuss or report.
-I also run [a Discord community](https://discord.gg/YU5tyeK72X) that includes channels for Gro.
 
 ## about
 

package/dist/filer.d.ts

@@ -19,7 +19,8 @@ export interface Options {
 }
 export declare class Filer {
     #private;
-    files: Map<Path_Id, Source_File>;
+    readonly root_dir: Path_Id;
+    readonly files: Map<Path_Id, Source_File>;
     constructor(options?: Options);
     get_by_id: (id: Path_Id) => Source_File | undefined;
     get_or_create: (id: Path_Id) => Source_File;

package/dist/filer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filer.d.ts","sourceRoot":"../src/lib/","sources":["filer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAGzD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AACvC,OAAO,EACN,SAAS,EAET,KAAK,cAAc,EACnB,KAAK,OAAO,IAAI,iBAAiB,EAEjC,MAAM,gBAAgB,CAAC;AAWxB,MAAM,WAAW,WAAW;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtC,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;CACxC;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;AAEzF,MAAM,WAAW,OAAO;IACvB,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;CACzE;AAED,qBAAa,KAAK;;IACjB,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAa;gBAKjC,OAAO,GAAE,OAAsB;IAU3C,SAAS,OAAQ,OAAO,KAAG,WAAW,GAAG,SAAS,CAEhD;IAEF,aAAa,OAAQ,OAAO,KAAG,WAAW,CAWxC;IAgII,KAAK,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAKxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ5B"}
+{"version":3,"file":"filer.d.ts","sourceRoot":"../src/lib/","sources":["filer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAGzD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AACvC,OAAO,EACN,SAAS,EAET,KAAK,cAAc,EACnB,KAAK,OAAO,IAAI,iBAAiB,EAEjC,MAAM,gBAAgB,CAAC;AAYxB,MAAM,WAAW,WAAW;IAC3B,EAAE,EAAE,OAAO,CAAC;IAEZ;;;OAGG;IACH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtC,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;CACxC;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;AAEzF,MAAM,WAAW,OAAO;IACvB,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;CACzE;AAED,qBAAa,KAAK;;IACjB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAa;gBAK1C,OAAO,GAAE,OAAsB;IAW3C,SAAS,OAAQ,OAAO,KAAG,WAAW,GAAG,SAAS,CAEhD;IAEF,aAAa,OAAQ,OAAO,KAAG,WAAW,CAWxC;IAyII,KAAK,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAKxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ5B"}

package/dist/filer.js

@@ -9,15 +9,18 @@ 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';
+// TODO see below
+// import {resolve_node_specifier} from './resolve_node_specifier.js';
 const aliases = Object.entries(default_sveltekit_config.alias);
 export class Filer {
+    root_dir;
     files = new Map();
     #watch_dir;
     #watch_dir_options;
     constructor(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);
     }
     #watching;
     #listeners = new Set();
@@ -53,16 +56,27 @@ export class Filer {
             // TODO logic is duplicated from loader
             const path = map_sveltekit_aliases(specifier, aliases);
             // The specifier `path` has now been mapped to its final form, so we can inspect it.
-            const resolved = path[0] === '.' || path[0] === '/'
-                ? resolve_specifier(path, dir)
-                : resolve_node_specifier(path);
-            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);
+            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);
+                }
             }
+            // 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) {
@@ -118,7 +132,7 @@ export class Filer {
         this.#watching = this.#watch_dir({
             filter: (path, is_directory) => (is_directory ? true : default_file_filter(path)),
             ...this.#watch_dir_options,
-            dir: resolve(this.#watch_dir_options.dir ?? paths.source),
+            dir: this.root_dir,
             on_change: this.#on_change,
         });
         await this.#watching.init();

package/dist/moss_helpers.d.ts

@@ -1,7 +1,7 @@
 import type { Result } from '@ryanatkn/belt/result.js';
 import { type Package_Json } from './package_json.js';
 export declare const MOSS_PACKAGE_DEP_NAME = "@ryanatkn/moss";
-export declare const load_moss_plugin: (package_json?: Package_Json, dep_name?: string, plugin_path?: string) => Promise<Result<{
+export declare const load_moss_plugin: (package_json?: Package_Json, dep_name?: string, plugin_path?: string, local_plugin_path?: string) => Promise<Result<{
     gro_plugin_moss: any;
 }, {
     message: string;

package/dist/moss_helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moss_helpers.d.ts","sourceRoot":"../src/lib/","sources":["moss_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAIrD,OAAO,EAAU,KAAK,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE7D,eAAO,MAAM,qBAAqB,mBAAmB,CAAC;AAGtD,eAAO,MAAM,gBAAgB,kBACb,YAAY,8CAGzB,OAAO,CAAC,MAAM,CAAC;IAAC,eAAe,EAAE,GAAG,CAAA;CAAC,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAAC,CAmB3D,CAAC"}
+{"version":3,"file":"moss_helpers.d.ts","sourceRoot":"../src/lib/","sources":["moss_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAIrD,OAAO,EAAU,KAAK,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE7D,eAAO,MAAM,qBAAqB,mBAAmB,CAAC;AAGtD,eAAO,MAAM,gBAAgB,kBACb,YAAY,0EAIzB,OAAO,CAAC,MAAM,CAAC;IAAC,eAAe,EAAE,GAAG,CAAA;CAAC,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAAC,CA4B3D,CAAC"}

package/dist/moss_helpers.js

@@ -3,20 +3,28 @@ import { resolve } from 'node:path';
 import { has_dep } from './package_json.js';
 export const MOSS_PACKAGE_DEP_NAME = '@ryanatkn/moss';
 // TODO plugin type?
-export const load_moss_plugin = async (package_json, dep_name = MOSS_PACKAGE_DEP_NAME, plugin_path = `node_modules/${dep_name}/dist/gro_plugin_moss.js`) => {
+export const load_moss_plugin = async (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
+local_plugin_path = 'src/lib/gro_plugin_moss.ts') => {
     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}\``,
         };
     }
-    const path = resolve(plugin_path);
-    if (!existsSync(path)) {
-        return {
-            ok: false,
-            // TODO warn?
-            message: `dependency on ${dep_name} detected but plugin not found at ${path}`,
-        };
+    let path = undefined;
+    const resolved_local_plugin_path = resolve(local_plugin_path);
+    if (existsSync(resolved_local_plugin_path)) {
+        path = resolved_local_plugin_path;
+    }
+    if (path === undefined) {
+        path = resolve(plugin_path);
+        if (!existsSync(path)) {
+            return {
+                ok: false,
+                // TODO warn?
+                message: `dependency on ${dep_name} detected but plugin not found at ${path}`,
+            };
+        }
     }
     const mod = await import(path);
     return { ok: true, gro_plugin_moss: mod.gro_plugin_moss };

package/dist/package.js

@@ -1,7 +1,7 @@
 // generated by src/lib/package.gen.ts
 export const package_json = {
     name: '@ryanatkn/gro',
-    version: '0.140.4',
+    version: '0.140.6',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     glyph: '🌰',
@@ -264,7 +264,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.140.4',
+    version: '0.140.6',
     modules: {
         '.': {
             path: 'index.ts',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.140.4",
+  "version": "0.140.6",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",

package/src/lib/filer.ts

@@ -18,12 +18,14 @@ 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';
+// TODO see below
+// import {resolve_node_specifier} from './resolve_node_specifier.js';
 
 const aliases = Object.entries(default_sveltekit_config.alias);
 
 export interface Source_File {
 	id: Path_Id;
+	// TODO add // mtime: number;
 	/**
 	 * `null` contents means it doesn't exist.
 	 * We create the file in memory to track its dependents regardless of its existence on disk.
@@ -43,7 +45,9 @@ export interface Options {
 }
 
 export class Filer {
-	files: Map<Path_Id, Source_File> = new Map();
+	readonly root_dir: Path_Id;
+
+	readonly files: Map<Path_Id, Source_File> = new Map();
 
 	#watch_dir: typeof watch_dir;
 	#watch_dir_options: Partial<Watch_Dir_Options>;
@@ -51,6 +55,7 @@ export class Filer {
 	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);
 	}
 
 	#watching: Watch_Node_Fs | undefined;
@@ -95,18 +100,27 @@ 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.
-			const resolved =
-				path[0] === '.' || path[0] === '/'
-					? resolve_specifier(path, dir)
-					: resolve_node_specifier(path);
-			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);
+			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);
+				}
 			}
+			// 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
@@ -165,7 +179,7 @@ export class Filer {
 		this.#watching = this.#watch_dir({
 			filter: (path, is_directory) => (is_directory ? true : default_file_filter(path)),
 			...this.#watch_dir_options,
-			dir: resolve(this.#watch_dir_options.dir ?? paths.source),
+			dir: this.root_dir,
 			on_change: this.#on_change,
 		});
 		await this.#watching.init();

package/src/lib/moss_helpers.ts

@@ -11,6 +11,7 @@ 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
+	local_plugin_path = 'src/lib/gro_plugin_moss.ts',
 ): Promise<Result<{gro_plugin_moss: any}, {message: string}>> => {
 	if (!has_dep(dep_name, package_json)) {
 		return {
@@ -19,13 +20,22 @@ export const load_moss_plugin = async (
 		};
 	}
 
-	const path = resolve(plugin_path);
-	if (!existsSync(path)) {
-		return {
-			ok: false,
-			// TODO warn?
-			message: `dependency on ${dep_name} detected but plugin not found at ${path}`,
-		};
+	let path: string | undefined = undefined;
+
+	const resolved_local_plugin_path = resolve(local_plugin_path);
+	if (existsSync(resolved_local_plugin_path)) {
+		path = resolved_local_plugin_path;
+	}
+
+	if (path === undefined) {
+		path = resolve(plugin_path);
+		if (!existsSync(path)) {
+			return {
+				ok: false,
+				// TODO warn?
+				message: `dependency on ${dep_name} detected but plugin not found at ${path}`,
+			};
+		}
 	}
 
 	const mod = await import(path);

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.140.4',
+	version: '0.140.6',
 	description: 'task runner and toolkit extending SvelteKit',
 	motto: 'generate, run, optimize',
 	glyph: '🌰',
@@ -270,7 +270,7 @@ export const package_json = {
 
 export const src_json = {
 	name: '@ryanatkn/gro',
-	version: '0.140.4',
+	version: '0.140.6',
 	modules: {
 		'.': {
 			path: 'index.ts',