@ryanatkn/gro 0.136.1 → 0.138.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.config.default.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gro.config.default.d.ts","sourceRoot":"../src/lib/","sources":["gro.config.default.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAOvD;;;;;;;;GAQG;AACH,QAAA,MAAM,MAAM,EAAE,iBAcb,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"gro.config.default.d.ts","sourceRoot":"../src/lib/","sources":["gro.config.default.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAOvD;;;;;;;;GAQG;AACH,QAAA,MAAM,MAAM,EAAE,iBAeb,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/gro.config.default.js

@@ -21,7 +21,7 @@ const config = async (cfg) => {
             ? gro_plugin_sveltekit_app({ host_target: has_server_result.ok ? 'node' : 'github_pages' })
             : null,
         gro_plugin_gen(),
-    ];
+    ].filter((v) => v !== null);
     return cfg;
 };
 export default config;

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.1',
+    version: '0.138.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.1',
+    version: '0.138.0',
     modules: {
         '.': {
             path: 'index.ts',

package/dist/plugin.d.ts

@@ -9,7 +9,7 @@ export interface Plugin<T_Plugin_Context extends Plugin_Context = Plugin_Context
     adapt?: (ctx: T_Plugin_Context) => void | Promise<void>;
     teardown?: (ctx: T_Plugin_Context) => void | Promise<void>;
 }
-export type Create_Config_Plugins<T_Plugin_Context extends Plugin_Context = Plugin_Context> = (ctx: T_Plugin_Context) => (Plugin<T_Plugin_Context> | null | Array<Plugin<T_Plugin_Context> | null>) | Promise<Plugin<T_Plugin_Context> | null | Array<Plugin<T_Plugin_Context> | null>>;
+export type Create_Config_Plugins<T_Plugin_Context extends Plugin_Context = Plugin_Context> = (ctx: T_Plugin_Context) => Array<Plugin<T_Plugin_Context>> | Promise<Array<Plugin<T_Plugin_Context>>>;
 export interface Plugin_Context<T_Args = object> extends Task_Context<T_Args> {
     dev: boolean;
     watch: boolean;
@@ -31,5 +31,5 @@ export declare class Plugins<T_Plugin_Context extends Plugin_Context> {
  * @param name - @default new_plugin.name
  * @returns `plugins` with `new_plugin` at the index of the plugin with `name`
  */
-export declare const replace_plugin: <T_Plugins extends T_Plugin | null | Array<T_Plugin | null>, T_Plugin extends Plugin>(plugins: T_Plugins, new_plugin: Plugin, name?: string) => T_Plugin[];
+export declare const replace_plugin: (plugins: Plugin[], new_plugin: Plugin, name?: string) => Plugin[];
 //# sourceMappingURL=plugin.d.ts.map

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"../src/lib/","sources":["plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,WAAW,CAAC;AAE5C;;;GAGG;AACH,MAAM,WAAW,MAAM,CAAC,gBAAgB,SAAS,cAAc,GAAG,cAAc;IAC/E,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D;AAED,MAAM,MAAM,qBAAqB,CAAC,gBAAgB,SAAS,cAAc,GAAG,cAAc,IAAI,CAC7F,GAAG,EAAE,gBAAgB,KAEnB,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,CAAC,GAC1E,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;AAErF,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,MAAM,CAAE,SAAQ,YAAY,CAAC,MAAM,CAAC;IAC5E,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CACf;AAED,qBAAa,OAAO,CAAC,gBAAgB,SAAS,cAAc;IAG1D,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,SAAS;gBADT,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,MAAM,EAAE;WAGf,MAAM,CAAC,gBAAgB,SAAS,cAAc,EAC1D,GAAG,EAAE,gBAAgB,GACnB,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAW/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAetB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAatB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAc/B;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,GAC1B,SAAS,SAAS,QAAQ,GAAG,IAAI,GAAG,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,EAC1D,QAAQ,SAAS,MAAM,WAEd,SAAS,cACN,MAAM,oBAEhB,QAAQ,EAOV,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"../src/lib/","sources":["plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,WAAW,CAAC;AAE5C;;;GAGG;AACH,MAAM,WAAW,MAAM,CAAC,gBAAgB,SAAS,cAAc,GAAG,cAAc;IAC/E,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D;AAED,MAAM,MAAM,qBAAqB,CAAC,gBAAgB,SAAS,cAAc,GAAG,cAAc,IAAI,CAC7F,GAAG,EAAE,gBAAgB,KACjB,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;AAEhF,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,MAAM,CAAE,SAAQ,YAAY,CAAC,MAAM,CAAC;IAC5E,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CACf;AAED,qBAAa,OAAO,CAAC,gBAAgB,SAAS,cAAc;IAG1D,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,SAAS;gBADT,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,MAAM,EAAE;WAGf,MAAM,CAAC,gBAAgB,SAAS,cAAc,EAC1D,GAAG,EAAE,gBAAgB,GACnB,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAS/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAetB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAatB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAc/B;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,YACjB,MAAM,EAAE,cACL,MAAM,oBAEhB,MAAM,EAMR,CAAC"}

package/dist/plugin.js

@@ -1,4 +1,3 @@
-import { to_array } from '@ryanatkn/belt/array.js';
 export class Plugins {
     ctx;
     instances;
@@ -10,7 +9,7 @@ export class Plugins {
     static async create(ctx) {
         const { timings } = ctx;
         const timing_to_create = timings.start('plugins.create');
-        const instances = to_array(await ctx.config.plugins(ctx)).filter((v) => v !== null); // TODO remove cast, should infer the type predicate? `Type '(Plugin<Plugin_Context<object>> | null)[]' is not assignable to type 'Plugin<Plugin_Context<object>>[]'.`
+        const instances = await ctx.config.plugins(ctx);
         const plugins = new Plugins(ctx, instances);
         timing_to_create();
         return plugins;
@@ -70,11 +69,10 @@ export class Plugins {
  * @returns `plugins` with `new_plugin` at the index of the plugin with `name`
  */
 export const replace_plugin = (plugins, new_plugin, name = new_plugin.name) => {
-    const array = to_array(plugins).filter((v) => v !== null);
-    const index = array.findIndex((p) => p.name === name);
+    const index = plugins.findIndex((p) => p.name === name);
     if (index === -1)
         throw Error('Failed to find plugin to replace: ' + name);
-    const replaced = array.slice();
+    const replaced = plugins.slice();
     replaced[index] = new_plugin;
     return replaced;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.136.1",
+  "version": "0.138.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.config.default.ts

@@ -18,14 +18,15 @@ const config: Create_Gro_Config = async (cfg) => {
 	const [has_sveltekit_library_result, has_server_result, has_sveltekit_app_result] =
 		await Promise.all([has_sveltekit_library(), has_server(), has_sveltekit_app()]);
 
-	cfg.plugins = () => [
-		has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,
-		has_server_result.ok ? gro_plugin_server() : null,
-		has_sveltekit_app_result.ok
-			? gro_plugin_sveltekit_app({host_target: has_server_result.ok ? 'node' : 'github_pages'})
-			: null,
-		gro_plugin_gen(),
-	];
+	cfg.plugins = () =>
+		[
+			has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,
+			has_server_result.ok ? gro_plugin_server() : null,
+			has_sveltekit_app_result.ok
+				? gro_plugin_sveltekit_app({host_target: has_server_result.ok ? 'node' : 'github_pages'})
+				: null,
+			gro_plugin_gen(),
+		].filter((v) => v !== null);
 
 	return cfg;
 };

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.1',
+	version: '0.138.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.1',
+	version: '0.138.0',
 	modules: {
 		'.': {
 			path: 'index.ts',

package/src/lib/plugin.ts

@@ -1,5 +1,3 @@
-import {to_array} from '@ryanatkn/belt/array.js';
-
 import type {Task_Context} from './task.js';
 
 /**
@@ -15,9 +13,7 @@ export interface Plugin<T_Plugin_Context extends Plugin_Context = Plugin_Context
 
 export type Create_Config_Plugins<T_Plugin_Context extends Plugin_Context = Plugin_Context> = (
 	ctx: T_Plugin_Context,
-) =>
-	| (Plugin<T_Plugin_Context> | null | Array<Plugin<T_Plugin_Context> | null>)
-	| Promise<Plugin<T_Plugin_Context> | null | Array<Plugin<T_Plugin_Context> | null>>;
+) => Array<Plugin<T_Plugin_Context>> | Promise<Array<Plugin<T_Plugin_Context>>>;
 
 export interface Plugin_Context<T_Args = object> extends Task_Context<T_Args> {
 	dev: boolean;
@@ -36,9 +32,7 @@ export class Plugins<T_Plugin_Context extends Plugin_Context> {
 	): Promise<Plugins<T_Plugin_Context>> {
 		const {timings} = ctx;
 		const timing_to_create = timings.start('plugins.create');
-		const instances: Plugin[] = to_array(await ctx.config.plugins(ctx)).filter(
-			(v) => v !== null,
-		) as Plugin[]; // TODO remove cast, should infer the type predicate? `Type '(Plugin<Plugin_Context<object>> | null)[]' is not assignable to type 'Plugin<Plugin_Context<object>>[]'.`
+		const instances: Plugin[] = await ctx.config.plugins(ctx);
 		const plugins = new Plugins(ctx, instances);
 		timing_to_create();
 		return plugins;
@@ -96,18 +90,14 @@ export class Plugins<T_Plugin_Context extends Plugin_Context> {
  * @param name - @default new_plugin.name
  * @returns `plugins` with `new_plugin` at the index of the plugin with `name`
  */
-export const replace_plugin = <
-	T_Plugins extends T_Plugin | null | Array<T_Plugin | null>,
-	T_Plugin extends Plugin,
->(
-	plugins: T_Plugins,
+export const replace_plugin = (
+	plugins: Plugin[],
 	new_plugin: Plugin,
 	name = new_plugin.name,
-): T_Plugin[] => {
-	const array = to_array(plugins).filter((v) => v !== null);
-	const index = array.findIndex((p) => p.name === name);
+): Plugin[] => {
+	const index = plugins.findIndex((p) => p.name === name);
 	if (index === -1) throw Error('Failed to find plugin to replace: ' + name);
-	const replaced = array.slice();
+	const replaced = plugins.slice();
 	replaced[index] = new_plugin;
-	return replaced as T_Plugin[];
+	return replaced;
 };