@ryanatkn/gro 0.136.0 → 0.137.0

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;AAUxB,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;IA4HI,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;AAUxB,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;IA6HI,KAAK,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAKxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ5B"}

package/dist/filer.js

@@ -40,44 +40,44 @@ export class Filer {
     #update(id) {
         const file = this.get_or_create(id);
         const new_contents = existsSync(id) ? readFileSync(id, 'utf8') : null;
-        const contents_changed = file.contents !== new_contents;
+        if (file.contents === new_contents) {
+            return null;
+        }
         file.contents = new_contents;
-        if (contents_changed) {
-            const dir = dirname(file.id);
-            const dependencies_before = new Set(file.dependencies.keys());
-            const dependencies_removed = new Set(dependencies_before);
-            const imported = file.contents ? parse_imports(file.id, file.contents) : [];
-            for (const specifier of imported) {
-                // 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.
-                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 dir = dirname(file.id);
+        const dependencies_before = new Set(file.dependencies.keys());
+        const dependencies_removed = new Set(dependencies_before);
+        const imported = file.contents ? parse_imports(file.id, file.contents) : [];
+        for (const specifier of imported) {
+            // 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.
+            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);
                 }
             }
-            // 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
-                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
-            }
+        }
+        // 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
+            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
         }
         return file;
     }
     #remove(id) {
         const file = this.get_by_id(id);
         if (!file)
-            return; // this is safe because the object would exist if any other file referenced it as a dependency or dependent
+            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()) {

package/dist/gro_plugin_gen.d.ts

@@ -6,9 +6,10 @@ export interface Task_Args extends Args {
     watch?: boolean;
 }
 export interface Options {
+    input_paths?: string[];
     root_dirs?: string[];
     flush_debounce_delay?: number;
 }
-export declare const gro_plugin_gen: ({ root_dirs, flush_debounce_delay, }?: Options) => Plugin;
+export declare const gro_plugin_gen: ({ input_paths, root_dirs, flush_debounce_delay, }?: Options) => Plugin;
 export declare const filter_dependents: (source_file: Source_File, get_by_id: (id: Path_Id) => Source_File | undefined, filter?: File_Filter, results?: Set<string>, searched?: Set<string>) => Set<string>;
 //# sourceMappingURL=gro_plugin_gen.d.ts.map

package/dist/gro_plugin_gen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gro_plugin_gen.d.ts","sourceRoot":"../src/lib/","sources":["gro_plugin_gen.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAKpC,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,KAAK,EAAgB,WAAW,EAAC,MAAM,YAAY,CAAC;AAK3D,MAAM,WAAW,SAAU,SAAQ,IAAI;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,OAAO;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,cAAc,0CAGxB,OAAO,KAAkB,MA+F3B,CAAC;AAEF,eAAO,MAAM,iBAAiB,gBAChB,WAAW,aACb,CAAC,EAAE,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,WAC1C,WAAW,YACX,GAAG,CAAC,MAAM,CAAC,aACV,GAAG,CAAC,MAAM,CAAC,KACnB,GAAG,CAAC,MAAM,CAYZ,CAAC"}
+{"version":3,"file":"gro_plugin_gen.d.ts","sourceRoot":"../src/lib/","sources":["gro_plugin_gen.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAKpC,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,KAAK,EAAgB,WAAW,EAAC,MAAM,YAAY,CAAC;AAK3D,MAAM,WAAW,SAAU,SAAQ,IAAI;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,OAAO;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,cAAc,uDAIxB,OAAO,KAAkB,MA2F3B,CAAC;AAEF,eAAO,MAAM,iBAAiB,gBAChB,WAAW,aACb,CAAC,EAAE,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,WAC1C,WAAW,YACX,GAAG,CAAC,MAAM,CAAC,aACV,GAAG,CAAC,MAAM,CAAC,KACnB,GAAG,CAAC,MAAM,CAYZ,CAAC"}

package/dist/gro_plugin_gen.js

@@ -5,8 +5,7 @@ import { throttle } from './throttle.js';
 import { spawn_cli } from './cli.js';
 import { Unreachable_Error } from '@ryanatkn/belt/error.js';
 const FLUSH_DEBOUNCE_DELAY = 500;
-export const gro_plugin_gen = ({ root_dirs = [paths.source], flush_debounce_delay = FLUSH_DEBOUNCE_DELAY, } = EMPTY_OBJECT) => {
-    const input_path = paths.source; // TODO option?
+export const gro_plugin_gen = ({ input_paths = [paths.source], root_dirs = [paths.source], flush_debounce_delay = FLUSH_DEBOUNCE_DELAY, } = EMPTY_OBJECT) => {
     let generating = false;
     let regen = false;
     let flushing_timeout;
@@ -46,14 +45,13 @@ export const gro_plugin_gen = ({ root_dirs = [paths.source], flush_debounce_dela
             if (!dev)
                 return;
             // Do we need to just generate everything once and exit?
-            // TODO could we have an esbuild context here? problem is watching the right files, maybe a plugin that tracks deps
             if (!watch) {
                 log.info('generating and exiting early');
                 // Run `gen`, first checking if there are any modules to avoid a console error.
                 // Some parts of the build may have already happened,
                 // making us miss `build` events for gen dependencies,
                 // so we run `gen` here even if it's usually wasteful.
-                const found = find_genfiles([input_path], root_dirs, config);
+                const found = find_genfiles(input_paths, root_dirs, config);
                 if (found.ok && found.value.resolved_input_files.length > 0) {
                     await gen();
                 }
@@ -65,8 +63,6 @@ export const gro_plugin_gen = ({ root_dirs = [paths.source], flush_debounce_dela
                 switch (change.type) {
                     case 'add':
                     case 'update': {
-                        // TODO how to handle this now? the loader traces deps for us with `parentPath`,
-                        // but we probably want to make this an esbuild plugin instead
                         if (is_gen_path(source_file.id)) {
                             queue_gen(source_file.id);
                         }

package/dist/package.js

@@ -1,7 +1,7 @@
 // generated by src/lib/package.gen.ts
 export const package_json = {
     name: '@ryanatkn/gro',
-    version: '0.136.0',
+    version: '0.137.0',
     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.136.0',
+    version: '0.137.0',
     modules: {
         '.': {
             path: 'index.ts',

package/package.json

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

package/src/lib/filer.ts

@@ -74,51 +74,52 @@ export class Filer {
 		return file;
 	};
 
-	#update(id: Path_Id): Source_File {
+	#update(id: Path_Id): Source_File | null {
 		const file = this.get_or_create(id);
 		const new_contents = existsSync(id) ? readFileSync(id, 'utf8') : null;
-		const contents_changed = file.contents !== new_contents;
+		if (file.contents === new_contents) {
+			return null;
+		}
+
 		file.contents = new_contents;
 
-		if (contents_changed) {
-			const dir = dirname(file.id);
-
-			const dependencies_before = new Set(file.dependencies.keys());
-			const dependencies_removed = new Set(dependencies_before);
-
-			const imported = file.contents ? parse_imports(file.id, file.contents) : [];
-			for (const specifier of imported) {
-				// 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.
-				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 dir = dirname(file.id);
+
+		const dependencies_before = new Set(file.dependencies.keys());
+		const dependencies_removed = new Set(dependencies_before);
+
+		const imported = file.contents ? parse_imports(file.id, file.contents) : [];
+		for (const specifier of imported) {
+			// 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.
+			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);
 				}
 			}
+		}
 
-			// 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
-				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
-			}
+		// 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
+			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
 		}
 
 		return file;
 	}
 
-	#remove(id: Path_Id): Source_File | undefined {
+	#remove(id: Path_Id): Source_File | null {
 		const file = this.get_by_id(id);
-		if (!file) return; // this is safe because the object would exist if any other file referenced it as a dependency or dependent
+		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
 
@@ -177,7 +178,7 @@ export class Filer {
 
 	#on_change: Watcher_Change_Callback = (change) => {
 		if (change.is_directory) return;
-		let source_file: Source_File | undefined;
+		let source_file: Source_File | null;
 		switch (change.type) {
 			case 'add':
 			case 'update': {

package/src/lib/gro_plugin_gen.ts

@@ -17,15 +17,16 @@ export interface Task_Args extends Args {
 }
 
 export interface Options {
+	input_paths?: string[];
 	root_dirs?: string[];
 	flush_debounce_delay?: number;
 }
 
 export const gro_plugin_gen = ({
+	input_paths = [paths.source],
 	root_dirs = [paths.source],
 	flush_debounce_delay = FLUSH_DEBOUNCE_DELAY,
 }: Options = EMPTY_OBJECT): Plugin => {
-	const input_path = paths.source; // TODO option?
 	let generating = false;
 	let regen = false;
 	let flushing_timeout: NodeJS.Timeout | undefined;
@@ -67,7 +68,6 @@ export const gro_plugin_gen = ({
 			if (!dev) return;
 
 			// Do we need to just generate everything once and exit?
-			// TODO could we have an esbuild context here? problem is watching the right files, maybe a plugin that tracks deps
 			if (!watch) {
 				log.info('generating and exiting early');
 
@@ -75,7 +75,7 @@ export const gro_plugin_gen = ({
 				// Some parts of the build may have already happened,
 				// making us miss `build` events for gen dependencies,
 				// so we run `gen` here even if it's usually wasteful.
-				const found = find_genfiles([input_path], root_dirs, config);
+				const found = find_genfiles(input_paths, root_dirs, config);
 				if (found.ok && found.value.resolved_input_files.length > 0) {
 					await gen();
 				}
@@ -88,8 +88,6 @@ export const gro_plugin_gen = ({
 				switch (change.type) {
 					case 'add':
 					case 'update': {
-						// TODO how to handle this now? the loader traces deps for us with `parentPath`,
-						// but we probably want to make this an esbuild plugin instead
 						if (is_gen_path(source_file.id)) {
 							queue_gen(source_file.id);
 						}

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.136.0',
+	version: '0.137.0',
 	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.136.0',
+	version: '0.137.0',
 	modules: {
 		'.': {
 			path: 'index.ts',