@ryanatkn/gro 0.137.0 → 0.138.1

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.137.0',
+    version: '0.138.1',
     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.137.0',
+    version: '0.138.1',
     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/dist/throttle.d.ts

@@ -7,11 +7,13 @@
  * In other words, all calls and their args are discarded
  * during the pending window except for the most recent.
  * Unlike debouncing, this calls the throttled callback
- * both on the leading and trailing edges of the delay window.
+ * both on the leading and trailing edges of the delay window,
+ * and this can be customized by setting `leading` to `false`.
  * It also differs from a queue where every call to the throttled callback eventually runs.
  * @param cb - any function that returns a void promise
  * @param delay - delay this many milliseconds between the pending call finishing and the next starting
+ * @param leading - if `true`, the default, the callback is called immediately
  * @returns same as `cb`
  */
-export declare const throttle: <T extends (...args: any[]) => Promise<void>>(cb: T, delay?: number) => T;
+export declare const throttle: <T extends (...args: any[]) => Promise<void>>(cb: T, delay?: number, leading?: boolean) => T;
 //# sourceMappingURL=throttle.d.ts.map

package/dist/throttle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"throttle.d.ts","sourceRoot":"../src/lib/","sources":["throttle.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAc,CA2CxF,CAAC"}
+{"version":3,"file":"throttle.d.ts","sourceRoot":"../src/lib/","sources":["throttle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,MAC/D,CAAC,wCAGH,CA0CF,CAAC"}

package/dist/throttle.js

@@ -1,5 +1,3 @@
-import { wait } from '@ryanatkn/belt/async.js';
-// TODO maybe support non-promise return values?
 /**
  * Throttles calls to a callback that returns a void promise.
  * Immediately invokes the callback on the first call.
@@ -9,13 +7,15 @@ import { wait } from '@ryanatkn/belt/async.js';
  * In other words, all calls and their args are discarded
  * during the pending window except for the most recent.
  * Unlike debouncing, this calls the throttled callback
- * both on the leading and trailing edges of the delay window.
+ * both on the leading and trailing edges of the delay window,
+ * and this can be customized by setting `leading` to `false`.
  * It also differs from a queue where every call to the throttled callback eventually runs.
  * @param cb - any function that returns a void promise
  * @param delay - delay this many milliseconds between the pending call finishing and the next starting
+ * @param leading - if `true`, the default, the callback is called immediately
  * @returns same as `cb`
  */
-export const throttle = (cb, delay = 0) => {
+export const throttle = (cb, delay = 0, leading = true) => {
     let pending_promise = null;
     let next_args = null;
     let next_promise = null;
@@ -26,6 +26,7 @@ export const throttle = (cb, delay = 0) => {
             next_promise = new Promise((resolve) => {
                 next_promise_resolve = resolve;
             });
+            setTimeout(flush, delay);
         }
         return next_promise;
     };
@@ -41,15 +42,13 @@ export const throttle = (cb, delay = 0) => {
     };
     const call = (args) => {
         pending_promise = cb(...args);
-        void pending_promise.then(async () => {
-            await wait(delay);
+        void pending_promise.then(() => {
             pending_promise = null;
-            await flush();
         });
         return pending_promise;
     };
     return ((...args) => {
-        if (pending_promise) {
+        if (pending_promise || !leading) {
             return defer(args);
         }
         else {

package/package.json

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

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.137.0',
+	version: '0.138.1',
 	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.137.0',
+	version: '0.138.1',
 	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;
 };

package/src/lib/throttle.ts

@@ -1,7 +1,3 @@
-import {wait} from '@ryanatkn/belt/async.js';
-
-// TODO maybe support non-promise return values?
-
 /**
  * Throttles calls to a callback that returns a void promise.
  * Immediately invokes the callback on the first call.
@@ -11,13 +7,19 @@ import {wait} from '@ryanatkn/belt/async.js';
  * In other words, all calls and their args are discarded
  * during the pending window except for the most recent.
  * Unlike debouncing, this calls the throttled callback
- * both on the leading and trailing edges of the delay window.
+ * both on the leading and trailing edges of the delay window,
+ * and this can be customized by setting `leading` to `false`.
  * It also differs from a queue where every call to the throttled callback eventually runs.
  * @param cb - any function that returns a void promise
  * @param delay - delay this many milliseconds between the pending call finishing and the next starting
+ * @param leading - if `true`, the default, the callback is called immediately
  * @returns same as `cb`
  */
-export const throttle = <T extends (...args: any[]) => Promise<void>>(cb: T, delay = 0): T => {
+export const throttle = <T extends (...args: any[]) => Promise<void>>(
+	cb: T,
+	delay = 0,
+	leading = true,
+): T => {
 	let pending_promise: Promise<void> | null = null;
 	let next_args: any[] | null = null;
 	let next_promise: Promise<void> | null = null;
@@ -29,6 +31,7 @@ export const throttle = <T extends (...args: any[]) => Promise<void>>(cb: T, del
 			next_promise = new Promise((resolve) => {
 				next_promise_resolve = resolve;
 			});
+			setTimeout(flush, delay);
 		}
 		return next_promise;
 	};
@@ -45,16 +48,14 @@ export const throttle = <T extends (...args: any[]) => Promise<void>>(cb: T, del
 
 	const call = (args: any[]): Promise<any> => {
 		pending_promise = cb(...args);
-		void pending_promise.then(async () => {
-			await wait(delay);
+		void pending_promise.then(() => {
 			pending_promise = null;
-			await flush();
 		});
 		return pending_promise;
 	};
 
 	return ((...args) => {
-		if (pending_promise) {
+		if (pending_promise || !leading) {
 			return defer(args);
 		} else {
 			return call(args);