@e280/stz 0.0.0-37 → 0.0.0-39

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@e280/stz",
-	"version": "0.0.0-37",
+	"version": "0.0.0-39",
 	"description": "everyday ts fns for everything",
 	"license": "MIT",
 	"author": "Chase Moskal <chasemoskal@gmail.com>",

package/s/constructor.ts

@@ -1,3 +1,15 @@
 
 export type Constructor<T extends {} = {}> = new(...args: any[]) => T
 
+export type Ctor<
+	Params extends any[] = any[],
+	Instance extends {} = {},
+> = new(...params: Params) => Instance
+
+export function denew<
+		Params extends any[] = any[],
+		Instance extends {} = {},
+	>(C: Ctor<Params, Instance>) {
+	return (...p: Params) => new C(...p)
+}
+

package/s/scope.ts

@@ -1,4 +1,6 @@
 
+import {Constructor} from "./constructor.js"
+
 export type Scoped<Item> = [item: Item, dispose: () => void]
 export type Disposable = {dispose(): void}
 
@@ -6,71 +8,97 @@ export function scoped<Item>(item: Item, dispose: () => void) {
 	return [item, dispose] as Scoped<Item>
 }
 
-export class Scope {
+/**
+ * a trashcan you can fill with garbage, then call `scope.dispose()` to dump it all
+ *  - `add/stow/scoped` methods are for dealing with disposer fns
+ *  - `keep` methods are for dealing with disposable objects (with a dispose method)
+ *  - `sub` for creating nested sub-scopes
+ */
+export class Scope implements Disposable {
 	#disposers: (() => void)[] = []
 
-	/** add a dispose fn */
+	/** add disposer fn */
 	add(dispose: () => void) {
 		this.#disposers.push(dispose)
+		return this
 	}
 
-	/** add a dispose fn, and return the item */
-	reg<Item>(item: Item, dispose: () => void) {
+	/** add disposer, return item */
+	stow<Item>(item: Item, dispose: () => void) {
 		this.add(dispose)
 		return item
 	}
 
-	/** add a scoped item's disposer, and return the item */
-	register<Item>([item, dispose]: Scoped<Item>) {
+	/** add scoped disposer, return item */
+	scoped<Item>([item, dispose]: Scoped<Item>) {
 		this.add(dispose)
 		return item
 	}
 
-	/** register and return disposable item */
-	registerDisposable<Item extends Disposable>(item: Item) {
-		this.#disposers.push(() => item.dispose)
-		return item
+	/** add and return a disposable object */
+	keep<D extends Disposable>(disposable: D) {
+		this.add(() => disposable.dispose())
+		return disposable
 	}
 
-	/** augment a fn to register its returned scoped item */
-	fn<Params extends any[], Item>(fn: (...params: Params) => Scoped<Item>) {
+	/** wrap a fn, auto-add returned disposers */
+	scopedFn<Params extends any[], Item>(
+			fn: (...params: Params) => Scoped<Item>
+		) {
 		return (...a: Params) => {
 			const scoped = fn(...a)
-			return this.register(scoped)
+			return this.scoped(scoped)
 		}
 	}
 
-	/** augment an async fn to register its returned scoped item */
-	fnAsync<Params extends any[], Item>(fn: (...params: Params) => Promise<Scoped<Item>>) {
+	/** wrap an async fn, auto-add returned disposers */
+	scopedFnAsync<Params extends any[], Item>(
+			fn: (...params: Params) => Promise<Scoped<Item>>
+		) {
 		return async(...a: Params) => {
 			const scoped = await fn(...a)
-			return this.register(scoped)
+			return this.scoped(scoped)
 		}
 	}
 
-	/** augment a fn to register its returned disposable item */
-	fnDisposable<Params extends any[], Item extends Disposable>(fn: (...params: Params) => Item) {
+	/** wrap a fn, auto-add returned disposables */
+	keepFn<Params extends any[], D extends Disposable>(
+			fn: (...params: Params) => D
+		) {
 		return (...a: Params) => {
-			const scoped = fn(...a)
-			return this.registerDisposable(scoped)
+			const disposable = fn(...a)
+			return this.keep(disposable)
 		}
 	}
 
-	/** augment an async fn to register its returned disposable item */
-	fnAsyncDisposable<Params extends any[], Item extends Disposable>(fn: (...params: Params) => Promise<Item>) {
+	/** wrap an async fn, auto-add returned disposables */
+	keepFnAsync<Params extends any[], D extends Disposable>(
+			fn: (...params: Params) => Promise<D>
+		) {
 		return async(...a: Params) => {
-			const scoped = await fn(...a)
-			return this.registerDisposable(scoped)
+			const disposable = await fn(...a)
+			return this.keep(disposable)
 		}
 	}
 
-	/** create a subscope that is registered, so disposing the parent will dispose the children */
+	/** wrap a constructor, auto-add returned disposables */
+	keepConstructor<C extends Constructor<Disposable>>(Ctor: C) {
+		const scope = this
+		return class extends Ctor {
+			constructor(...p: any[]) {
+				super(...p)
+				scope.keep(this)
+			}
+		} as C
+	}
+
+	/** create a subscope, child gets disposed when parent does */
 	sub() {
-		const scope = new Scope()
-		return this.reg(scope, () => scope.dispose())
+		const subscope = new Scope()
+		return this.stow(subscope, () => subscope.dispose())
 	}
 
-	/** dispose all the disposers added to this scope */
+	/** dispose everything in this scope, in reverse order */
 	dispose() {
 		for (const fn of this.#disposers.reverse())
 			fn()

package/x/constructor.d.ts

@@ -1 +1,3 @@
 export type Constructor<T extends {} = {}> = new (...args: any[]) => T;
+export type Ctor<Params extends any[] = any[], Instance extends {} = {}> = new (...params: Params) => Instance;
+export declare function denew<Params extends any[] = any[], Instance extends {} = {}>(C: Ctor<Params, Instance>): (...p: Params) => Instance;

package/x/constructor.js

@@ -1,2 +1,4 @@
-export {};
+export function denew(C) {
+    return (...p) => new C(...p);
+}
 //# sourceMappingURL=constructor.js.map

package/x/constructor.js.map

@@ -1 +1 @@
-{"version":3,"file":"constructor.js","sourceRoot":"","sources":["../s/constructor.ts"],"names":[],"mappings":""}
+{"version":3,"file":"constructor.js","sourceRoot":"","sources":["../s/constructor.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,KAAK,CAGlB,CAAyB;IAC3B,OAAO,CAAC,GAAG,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;AACrC,CAAC"}

package/x/scope.d.ts

@@ -1,28 +1,37 @@
+import { Constructor } from "./constructor.js";
 export type Scoped<Item> = [item: Item, dispose: () => void];
 export type Disposable = {
     dispose(): void;
 };
 export declare function scoped<Item>(item: Item, dispose: () => void): Scoped<Item>;
-export declare class Scope {
+/**
+ * a trashcan you can fill with garbage, then call `scope.dispose()` to dump it all
+ *  - `add/stow/scoped` methods are for dealing with disposer fns
+ *  - `keep` methods are for dealing with disposable objects (with a dispose method)
+ *  - `sub` for creating nested sub-scopes
+ */
+export declare class Scope implements Disposable {
     #private;
-    /** add a dispose fn */
-    add(dispose: () => void): void;
-    /** add a dispose fn, and return the item */
-    reg<Item>(item: Item, dispose: () => void): Item;
-    /** add a scoped item's disposer, and return the item */
-    register<Item>([item, dispose]: Scoped<Item>): Item;
-    /** register and return disposable item */
-    registerDisposable<Item extends Disposable>(item: Item): Item;
-    /** augment a fn to register its returned scoped item */
-    fn<Params extends any[], Item>(fn: (...params: Params) => Scoped<Item>): (...a: Params) => Item;
-    /** augment an async fn to register its returned scoped item */
-    fnAsync<Params extends any[], Item>(fn: (...params: Params) => Promise<Scoped<Item>>): (...a: Params) => Promise<Item>;
-    /** augment a fn to register its returned disposable item */
-    fnDisposable<Params extends any[], Item extends Disposable>(fn: (...params: Params) => Item): (...a: Params) => Item;
-    /** augment an async fn to register its returned disposable item */
-    fnAsyncDisposable<Params extends any[], Item extends Disposable>(fn: (...params: Params) => Promise<Item>): (...a: Params) => Promise<Item>;
-    /** create a subscope that is registered, so disposing the parent will dispose the children */
+    /** add disposer fn */
+    add(dispose: () => void): this;
+    /** add disposer, return item */
+    stow<Item>(item: Item, dispose: () => void): Item;
+    /** add scoped disposer, return item */
+    scoped<Item>([item, dispose]: Scoped<Item>): Item;
+    /** add and return a disposable object */
+    keep<D extends Disposable>(disposable: D): D;
+    /** wrap a fn, auto-add returned disposers */
+    scopedFn<Params extends any[], Item>(fn: (...params: Params) => Scoped<Item>): (...a: Params) => Item;
+    /** wrap an async fn, auto-add returned disposers */
+    scopedFnAsync<Params extends any[], Item>(fn: (...params: Params) => Promise<Scoped<Item>>): (...a: Params) => Promise<Item>;
+    /** wrap a fn, auto-add returned disposables */
+    keepFn<Params extends any[], D extends Disposable>(fn: (...params: Params) => D): (...a: Params) => D;
+    /** wrap an async fn, auto-add returned disposables */
+    keepFnAsync<Params extends any[], D extends Disposable>(fn: (...params: Params) => Promise<D>): (...a: Params) => Promise<D>;
+    /** wrap a constructor, auto-add returned disposables */
+    keepConstructor<C extends Constructor<Disposable>>(Ctor: C): C;
+    /** create a subscope, child gets disposed when parent does */
     sub(): Scope;
-    /** dispose all the disposers added to this scope */
+    /** dispose everything in this scope, in reverse order */
     dispose(): void;
 }

package/x/scope.js

@@ -1,61 +1,78 @@
 export function scoped(item, dispose) {
     return [item, dispose];
 }
+/**
+ * a trashcan you can fill with garbage, then call `scope.dispose()` to dump it all
+ *  - `add/stow/scoped` methods are for dealing with disposer fns
+ *  - `keep` methods are for dealing with disposable objects (with a dispose method)
+ *  - `sub` for creating nested sub-scopes
+ */
 export class Scope {
     #disposers = [];
-    /** add a dispose fn */
+    /** add disposer fn */
     add(dispose) {
         this.#disposers.push(dispose);
+        return this;
     }
-    /** add a dispose fn, and return the item */
-    reg(item, dispose) {
+    /** add disposer, return item */
+    stow(item, dispose) {
         this.add(dispose);
         return item;
     }
-    /** add a scoped item's disposer, and return the item */
-    register([item, dispose]) {
+    /** add scoped disposer, return item */
+    scoped([item, dispose]) {
         this.add(dispose);
         return item;
     }
-    /** register and return disposable item */
-    registerDisposable(item) {
-        this.#disposers.push(() => item.dispose);
-        return item;
+    /** add and return a disposable object */
+    keep(disposable) {
+        this.add(() => disposable.dispose());
+        return disposable;
     }
-    /** augment a fn to register its returned scoped item */
-    fn(fn) {
+    /** wrap a fn, auto-add returned disposers */
+    scopedFn(fn) {
         return (...a) => {
             const scoped = fn(...a);
-            return this.register(scoped);
+            return this.scoped(scoped);
         };
     }
-    /** augment an async fn to register its returned scoped item */
-    fnAsync(fn) {
+    /** wrap an async fn, auto-add returned disposers */
+    scopedFnAsync(fn) {
         return async (...a) => {
             const scoped = await fn(...a);
-            return this.register(scoped);
+            return this.scoped(scoped);
         };
     }
-    /** augment a fn to register its returned disposable item */
-    fnDisposable(fn) {
+    /** wrap a fn, auto-add returned disposables */
+    keepFn(fn) {
         return (...a) => {
-            const scoped = fn(...a);
-            return this.registerDisposable(scoped);
+            const disposable = fn(...a);
+            return this.keep(disposable);
         };
     }
-    /** augment an async fn to register its returned disposable item */
-    fnAsyncDisposable(fn) {
+    /** wrap an async fn, auto-add returned disposables */
+    keepFnAsync(fn) {
         return async (...a) => {
-            const scoped = await fn(...a);
-            return this.registerDisposable(scoped);
+            const disposable = await fn(...a);
+            return this.keep(disposable);
+        };
+    }
+    /** wrap a constructor, auto-add returned disposables */
+    keepConstructor(Ctor) {
+        const scope = this;
+        return class extends Ctor {
+            constructor(...p) {
+                super(...p);
+                scope.keep(this);
+            }
         };
     }
-    /** create a subscope that is registered, so disposing the parent will dispose the children */
+    /** create a subscope, child gets disposed when parent does */
     sub() {
-        const scope = new Scope();
-        return this.reg(scope, () => scope.dispose());
+        const subscope = new Scope();
+        return this.stow(subscope, () => subscope.dispose());
     }
-    /** dispose all the disposers added to this scope */
+    /** dispose everything in this scope, in reverse order */
     dispose() {
         for (const fn of this.#disposers.reverse())
             fn();

package/x/scope.js.map

@@ -1 +1 @@
-{"version":3,"file":"scope.js","sourceRoot":"","sources":["../s/scope.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,MAAM,CAAO,IAAU,EAAE,OAAmB;IAC3D,OAAO,CAAC,IAAI,EAAE,OAAO,CAAiB,CAAA;AACvC,CAAC;AAED,MAAM,OAAO,KAAK;IACjB,UAAU,GAAmB,EAAE,CAAA;IAE/B,uBAAuB;IACvB,GAAG,CAAC,OAAmB;QACtB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC9B,CAAC;IAED,4CAA4C;IAC5C,GAAG,CAAO,IAAU,EAAE,OAAmB;QACxC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACjB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,wDAAwD;IACxD,QAAQ,CAAO,CAAC,IAAI,EAAE,OAAO,CAAe;QAC3C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACjB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,0CAA0C;IAC1C,kBAAkB,CAA0B,IAAU;QACrD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACxC,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,wDAAwD;IACxD,EAAE,CAA6B,EAAuC;QACrE,OAAO,CAAC,GAAG,CAAS,EAAE,EAAE;YACvB,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAC7B,CAAC,CAAA;IACF,CAAC;IAED,+DAA+D;IAC/D,OAAO,CAA6B,EAAgD;QACnF,OAAO,KAAK,EAAC,GAAG,CAAS,EAAE,EAAE;YAC5B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YAC7B,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAC7B,CAAC,CAAA;IACF,CAAC;IAED,4DAA4D;IAC5D,YAAY,CAAgD,EAA+B;QAC1F,OAAO,CAAC,GAAG,CAAS,EAAE,EAAE;YACvB,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;QACvC,CAAC,CAAA;IACF,CAAC;IAED,mEAAmE;IACnE,iBAAiB,CAAgD,EAAwC;QACxG,OAAO,KAAK,EAAC,GAAG,CAAS,EAAE,EAAE;YAC5B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YAC7B,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;QACvC,CAAC,CAAA;IACF,CAAC;IAED,8FAA8F;IAC9F,GAAG;QACF,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAA;QACzB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9C,CAAC;IAED,oDAAoD;IACpD,OAAO;QACN,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;YACzC,EAAE,EAAE,CAAA;QACL,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;IACrB,CAAC;CACD"}
+{"version":3,"file":"scope.js","sourceRoot":"","sources":["../s/scope.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,MAAM,CAAO,IAAU,EAAE,OAAmB;IAC3D,OAAO,CAAC,IAAI,EAAE,OAAO,CAAiB,CAAA;AACvC,CAAC;AAED;;;;;GAKG;AACH,MAAM,OAAO,KAAK;IACjB,UAAU,GAAmB,EAAE,CAAA;IAE/B,sBAAsB;IACtB,GAAG,CAAC,OAAmB;QACtB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,gCAAgC;IAChC,IAAI,CAAO,IAAU,EAAE,OAAmB;QACzC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACjB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,uCAAuC;IACvC,MAAM,CAAO,CAAC,IAAI,EAAE,OAAO,CAAe;QACzC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACjB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,yCAAyC;IACzC,IAAI,CAAuB,UAAa;QACvC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;QACpC,OAAO,UAAU,CAAA;IAClB,CAAC;IAED,6CAA6C;IAC7C,QAAQ,CACN,EAAuC;QAExC,OAAO,CAAC,GAAG,CAAS,EAAE,EAAE;YACvB,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YACvB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC3B,CAAC,CAAA;IACF,CAAC;IAED,oDAAoD;IACpD,aAAa,CACX,EAAgD;QAEjD,OAAO,KAAK,EAAC,GAAG,CAAS,EAAE,EAAE;YAC5B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC3B,CAAC,CAAA;IACF,CAAC;IAED,+CAA+C;IAC/C,MAAM,CACJ,EAA4B;QAE7B,OAAO,CAAC,GAAG,CAAS,EAAE,EAAE;YACvB,MAAM,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC7B,CAAC,CAAA;IACF,CAAC;IAED,sDAAsD;IACtD,WAAW,CACT,EAAqC;QAEtC,OAAO,KAAK,EAAC,GAAG,CAAS,EAAE,EAAE;YAC5B,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YACjC,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC7B,CAAC,CAAA;IACF,CAAC;IAED,wDAAwD;IACxD,eAAe,CAAoC,IAAO;QACzD,MAAM,KAAK,GAAG,IAAI,CAAA;QAClB,OAAO,KAAM,SAAQ,IAAI;YACxB,YAAY,GAAG,CAAQ;gBACtB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;gBACX,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACjB,CAAC;SACI,CAAA;IACP,CAAC;IAED,8DAA8D;IAC9D,GAAG;QACF,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAE,CAAA;QAC5B,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IACrD,CAAC;IAED,yDAAyD;IACzD,OAAO;QACN,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;YACzC,EAAE,EAAE,CAAA;QACL,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;IACrB,CAAC;CACD"}