@e280/stz 0.1.3 → 0.2.0-1

package/package.json

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

package/s/map-g.ts

@@ -31,6 +31,34 @@ export class MapG<K, V> extends Map<K, V> {
 	}
 }
 
+/** extended weak map with handy methods like `require` and `guarantee` */
+export class WeakMapG<K extends WeakKey, V> extends WeakMap<K, V> {
+	static require<K extends WeakKey, V>(map: WeakMap<K, V>, key: K) {
+		if (map.has(key))
+			return map.get(key)!
+		else
+			throw new Error(`required key not found`)
+	}
+
+	static guarantee<K extends WeakKey, V>(map: WeakMap<K, V>, key: K, make: () => V) {
+		if (map.has(key))
+			return map.get(key)!
+		else {
+			const value = make()
+			map.set(key, value)
+			return value
+		}
+	}
+
+	require(key: K) {
+		return WeakMapG.require(this, key)
+	}
+
+	guarantee(key: K, make: () => V) {
+		return WeakMapG.guarantee(this, key, make)
+	}
+}
+
 export type Identifiable<Id = any> = {id: Id}
 
 /** js map but for things that have an `id` field */

package/s/pubsub.ts

@@ -6,14 +6,20 @@ export type Listener<A extends any[]> = (...a: A) => (void | Promise<void>)
 export interface Xub<A extends any[] = []> {
 
 	/** publish to all subscribed listeners. */
-	pub(...a: A): Promise<void>
+	publish(...a: A): Promise<void>
 
 	/** subscribe a listener function. */
-	sub(fn: Listener<A>): () => void
+	subscribe(fn: Listener<A>): () => void
+
+	/** publish to all subscribed listeners, with pubsub facilities. */
+	pub: Pub<A>
+
+	/** subscribe a listener function, with pubsub facilities. */
+	sub: Sub<A>
 
 	/**
 	 * subscribe a listener function.
-	 * @alias sub
+	 * @alias subscribe
 	 */
 	on(fn: Listener<A>): () => void
 
@@ -34,16 +40,25 @@ export interface Pub<A extends any[] = []> extends Xub<A> {
 	(...a: A): Promise<void>
 }
 
+/** make pubsub facilities */
 export function xub<A extends any[] = []>() {
 	const set = new Set<Listener<A>>()
 
-	function sub(fn: Listener<A>) {
+	async function publish(...a: A) {
+		await Promise.all([...set].map(fn => fn(...a)))
+	}
+
+	function subscribe(fn: Listener<A>) {
 		set.add(fn)
 		return () => { set.delete(fn) }
 	}
 
 	async function pub(...a: A) {
-		await Promise.all([...set].map(fn => fn(...a)))
+		return publish(...a)
+	}
+
+	function sub(fn: Listener<A>) {
+		return subscribe(fn)
 	}
 
 	async function next() {
@@ -59,34 +74,32 @@ export function xub<A extends any[] = []>() {
 		set.clear()
 	}
 
-	sub.pub = pub
-	sub.sub = sub
-	sub.on = sub
-	sub.next = next
-	sub.clear = clear
-
-	pub.pub = pub
-	pub.sub = sub
-	pub.on = sub
-	pub.next = next
-	pub.clear = clear
-
-	return [pub, sub] as [Pub<A>, Sub<A>]
+	const x = {
+		pub,
+		sub,
+		publish,
+		subscribe,
+		on: subscribe,
+		next,
+		clear,
+	} as Xub<A>
+
+	Object.assign(sub, x)
+	Object.assign(pub, x)
+	return x
 }
 
-/** create a subscriber fn that can be published to */
+/** create a subscriber fn that also has pubsub facilities */
 export function sub<A extends any[] = []>(listener?: Listener<A>): Sub<A> {
-	const fn = xub<A>()[1]
-	if (listener)
-		fn.sub(listener)
-	return fn
+	const x = xub<A>()
+	if (listener) x.sub(listener)
+	return x.sub
 }
 
-/** create a publisher fn that can be subscribed to */
+/** create a publisher fn that also has pubsub facilities */
 export function pub<A extends any[] = []>(listener?: Listener<A>): Pub<A> {
-	const fn = xub<A>()[0]
-	if (listener)
-		fn.sub(listener)
-	return fn
+	const x = xub<A>()
+	if (listener) x.sub(listener)
+	return x.pub
 }
 

package/x/map-g.d.ts

@@ -6,6 +6,13 @@ export declare class MapG<K, V> extends Map<K, V> {
     require(key: K): NonNullable<V>;
     guarantee(key: K, make: () => V): V;
 }
+/** extended weak map with handy methods like `require` and `guarantee` */
+export declare class WeakMapG<K extends WeakKey, V> extends WeakMap<K, V> {
+    static require<K extends WeakKey, V>(map: WeakMap<K, V>, key: K): NonNullable<V>;
+    static guarantee<K extends WeakKey, V>(map: WeakMap<K, V>, key: K, make: () => V): V;
+    require(key: K): NonNullable<V>;
+    guarantee(key: K, make: () => V): V;
+}
 export type Identifiable<Id = any> = {
     id: Id;
 };

package/x/map-g.js

@@ -25,6 +25,30 @@ export class MapG extends Map {
         return MapG.guarantee(this, key, make);
     }
 }
+/** extended weak map with handy methods like `require` and `guarantee` */
+export class WeakMapG extends WeakMap {
+    static require(map, key) {
+        if (map.has(key))
+            return map.get(key);
+        else
+            throw new Error(`required key not found`);
+    }
+    static guarantee(map, key, make) {
+        if (map.has(key))
+            return map.get(key);
+        else {
+            const value = make();
+            map.set(key, value);
+            return value;
+        }
+    }
+    require(key) {
+        return WeakMapG.require(this, key);
+    }
+    guarantee(key, make) {
+        return WeakMapG.guarantee(this, key, make);
+    }
+}
 /** js map but for things that have an `id` field */
 export class PoolG extends MapG {
     got(value) {

package/x/map-g.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-g.js","sourceRoot":"","sources":["../s/map-g.ts"],"names":[],"mappings":"AACA,wEAAwE;AACxE,MAAM,OAAO,IAAW,SAAQ,GAAS;IACxC,MAAM,CAAC,OAAO,CAAO,GAAc,EAAE,GAAM;QAC1C,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;YACf,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAE,CAAA;;YAEpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,GAAG,CAAC,CAAA;IACrD,CAAC;IAED,MAAM,CAAC,SAAS,CAAO,GAAc,EAAE,GAAM,EAAE,IAAa;QAC3D,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;YACf,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAE,CAAA;aAChB,CAAC;YACL,MAAM,KAAK,GAAG,IAAI,EAAE,CAAA;YACpB,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YACnB,OAAO,KAAK,CAAA;QACb,CAAC;IACF,CAAC;IAED,KAAK;QACJ,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;IACjB,CAAC;IAED,OAAO,CAAC,GAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC/B,CAAC;IAED,SAAS,CAAC,GAAM,EAAE,IAAa;QAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IACvC,CAAC;CACD;AAID,oDAAoD;AACpD,MAAM,OAAO,KAA8B,SAAQ,IAAgB;IAClE,GAAG,CAAC,KAAQ;QACX,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,GAAG,CAAC,KAAQ;QACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QACzB,OAAO,KAAK,CAAA;IACb,CAAC;IAED,MAAM,CAAC,KAAQ;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;CACD"}
+{"version":3,"file":"map-g.js","sourceRoot":"","sources":["../s/map-g.ts"],"names":[],"mappings":"AACA,wEAAwE;AACxE,MAAM,OAAO,IAAW,SAAQ,GAAS;IACxC,MAAM,CAAC,OAAO,CAAO,GAAc,EAAE,GAAM;QAC1C,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;YACf,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAE,CAAA;;YAEpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,GAAG,CAAC,CAAA;IACrD,CAAC;IAED,MAAM,CAAC,SAAS,CAAO,GAAc,EAAE,GAAM,EAAE,IAAa;QAC3D,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;YACf,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAE,CAAA;aAChB,CAAC;YACL,MAAM,KAAK,GAAG,IAAI,EAAE,CAAA;YACpB,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YACnB,OAAO,KAAK,CAAA;QACb,CAAC;IACF,CAAC;IAED,KAAK;QACJ,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;IACjB,CAAC;IAED,OAAO,CAAC,GAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC/B,CAAC;IAED,SAAS,CAAC,GAAM,EAAE,IAAa;QAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IACvC,CAAC;CACD;AAED,0EAA0E;AAC1E,MAAM,OAAO,QAA+B,SAAQ,OAAa;IAChE,MAAM,CAAC,OAAO,CAAuB,GAAkB,EAAE,GAAM;QAC9D,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;YACf,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAE,CAAA;;YAEpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAC3C,CAAC;IAED,MAAM,CAAC,SAAS,CAAuB,GAAkB,EAAE,GAAM,EAAE,IAAa;QAC/E,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;YACf,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAE,CAAA;aAChB,CAAC;YACL,MAAM,KAAK,GAAG,IAAI,EAAE,CAAA;YACpB,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YACnB,OAAO,KAAK,CAAA;QACb,CAAC;IACF,CAAC;IAED,OAAO,CAAC,GAAM;QACb,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IACnC,CAAC;IAED,SAAS,CAAC,GAAM,EAAE,IAAa;QAC9B,OAAO,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IAC3C,CAAC;CACD;AAID,oDAAoD;AACpD,MAAM,OAAO,KAA8B,SAAQ,IAAgB;IAClE,GAAG,CAAC,KAAQ;QACX,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,GAAG,CAAC,KAAQ;QACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QACzB,OAAO,KAAK,CAAA;IACb,CAAC;IAED,MAAM,CAAC,KAAQ;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC7B,CAAC;CACD"}

package/x/pubsub.d.ts

@@ -1,12 +1,16 @@
 export type Listener<A extends any[]> = (...a: A) => (void | Promise<void>);
 export interface Xub<A extends any[] = []> {
     /** publish to all subscribed listeners. */
-    pub(...a: A): Promise<void>;
+    publish(...a: A): Promise<void>;
     /** subscribe a listener function. */
-    sub(fn: Listener<A>): () => void;
+    subscribe(fn: Listener<A>): () => void;
+    /** publish to all subscribed listeners, with pubsub facilities. */
+    pub: Pub<A>;
+    /** subscribe a listener function, with pubsub facilities. */
+    sub: Sub<A>;
     /**
      * subscribe a listener function.
-     * @alias sub
+     * @alias subscribe
      */
     on(fn: Listener<A>): () => void;
     /** wait for the next published value */
@@ -22,8 +26,9 @@ export interface Sub<A extends any[] = []> extends Xub<A> {
 export interface Pub<A extends any[] = []> extends Xub<A> {
     (...a: A): Promise<void>;
 }
-export declare function xub<A extends any[] = []>(): [Pub<A>, Sub<A>];
-/** create a subscriber fn that can be published to */
+/** make pubsub facilities */
+export declare function xub<A extends any[] = []>(): Xub<A>;
+/** create a subscriber fn that also has pubsub facilities */
 export declare function sub<A extends any[] = []>(listener?: Listener<A>): Sub<A>;
-/** create a publisher fn that can be subscribed to */
+/** create a publisher fn that also has pubsub facilities */
 export declare function pub<A extends any[] = []>(listener?: Listener<A>): Pub<A>;

package/x/pubsub.js

@@ -1,12 +1,19 @@
 import { defer } from "./defer.js";
+/** make pubsub facilities */
 export function xub() {
     const set = new Set();
-    function sub(fn) {
+    async function publish(...a) {
+        await Promise.all([...set].map(fn => fn(...a)));
+    }
+    function subscribe(fn) {
         set.add(fn);
         return () => { set.delete(fn); };
     }
     async function pub(...a) {
-        await Promise.all([...set].map(fn => fn(...a)));
+        return publish(...a);
+    }
+    function sub(fn) {
+        return subscribe(fn);
     }
     async function next() {
         const { promise, resolve } = defer();
@@ -19,30 +26,31 @@ export function xub() {
     function clear() {
         set.clear();
     }
-    sub.pub = pub;
-    sub.sub = sub;
-    sub.on = sub;
-    sub.next = next;
-    sub.clear = clear;
-    pub.pub = pub;
-    pub.sub = sub;
-    pub.on = sub;
-    pub.next = next;
-    pub.clear = clear;
-    return [pub, sub];
+    const x = {
+        pub,
+        sub,
+        publish,
+        subscribe,
+        on: subscribe,
+        next,
+        clear,
+    };
+    Object.assign(sub, x);
+    Object.assign(pub, x);
+    return x;
 }
-/** create a subscriber fn that can be published to */
+/** create a subscriber fn that also has pubsub facilities */
 export function sub(listener) {
-    const fn = xub()[1];
+    const x = xub();
     if (listener)
-        fn.sub(listener);
-    return fn;
+        x.sub(listener);
+    return x.sub;
 }
-/** create a publisher fn that can be subscribed to */
+/** create a publisher fn that also has pubsub facilities */
 export function pub(listener) {
-    const fn = xub()[0];
+    const x = xub();
     if (listener)
-        fn.sub(listener);
-    return fn;
+        x.sub(listener);
+    return x.pub;
 }
 //# sourceMappingURL=pubsub.js.map

package/x/pubsub.js.map

@@ -1 +1 @@
-{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../s/pubsub.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAA;AAmChC,MAAM,UAAU,GAAG;IAClB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAe,CAAA;IAElC,SAAS,GAAG,CAAC,EAAe;QAC3B,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACX,OAAO,GAAG,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA;IAChC,CAAC;IAED,KAAK,UAAU,GAAG,CAAC,GAAG,CAAI;QACzB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC;IAED,KAAK,UAAU,IAAI;QAClB,MAAM,EAAC,OAAO,EAAE,OAAO,EAAC,GAAG,KAAK,EAAK,CAAA;QACrC,MAAM,WAAW,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE;YAChC,OAAO,CAAC,CAAC,CAAC,CAAA;YACV,WAAW,EAAE,CAAA;QACd,CAAC,CAAC,CAAA;QACF,OAAO,OAAO,CAAA;IACf,CAAC;IAED,SAAS,KAAK;QACb,GAAG,CAAC,KAAK,EAAE,CAAA;IACZ,CAAC;IAED,GAAG,CAAC,GAAG,GAAG,GAAG,CAAA;IACb,GAAG,CAAC,GAAG,GAAG,GAAG,CAAA;IACb,GAAG,CAAC,EAAE,GAAG,GAAG,CAAA;IACZ,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;IACf,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;IAEjB,GAAG,CAAC,GAAG,GAAG,GAAG,CAAA;IACb,GAAG,CAAC,GAAG,GAAG,GAAG,CAAA;IACb,GAAG,CAAC,EAAE,GAAG,GAAG,CAAA;IACZ,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;IACf,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;IAEjB,OAAO,CAAC,GAAG,EAAE,GAAG,CAAqB,CAAA;AACtC,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,GAAG,CAAuB,QAAsB;IAC/D,MAAM,EAAE,GAAG,GAAG,EAAK,CAAC,CAAC,CAAC,CAAA;IACtB,IAAI,QAAQ;QACX,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACjB,OAAO,EAAE,CAAA;AACV,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,GAAG,CAAuB,QAAsB;IAC/D,MAAM,EAAE,GAAG,GAAG,EAAK,CAAC,CAAC,CAAC,CAAA;IACtB,IAAI,QAAQ;QACX,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACjB,OAAO,EAAE,CAAA;AACV,CAAC"}
+{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../s/pubsub.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAA;AAyChC,6BAA6B;AAC7B,MAAM,UAAU,GAAG;IAClB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAe,CAAA;IAElC,KAAK,UAAU,OAAO,CAAC,GAAG,CAAI;QAC7B,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC;IAED,SAAS,SAAS,CAAC,EAAe;QACjC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACX,OAAO,GAAG,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA;IAChC,CAAC;IAED,KAAK,UAAU,GAAG,CAAC,GAAG,CAAI;QACzB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;IACrB,CAAC;IAED,SAAS,GAAG,CAAC,EAAe;QAC3B,OAAO,SAAS,CAAC,EAAE,CAAC,CAAA;IACrB,CAAC;IAED,KAAK,UAAU,IAAI;QAClB,MAAM,EAAC,OAAO,EAAE,OAAO,EAAC,GAAG,KAAK,EAAK,CAAA;QACrC,MAAM,WAAW,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE;YAChC,OAAO,CAAC,CAAC,CAAC,CAAA;YACV,WAAW,EAAE,CAAA;QACd,CAAC,CAAC,CAAA;QACF,OAAO,OAAO,CAAA;IACf,CAAC;IAED,SAAS,KAAK;QACb,GAAG,CAAC,KAAK,EAAE,CAAA;IACZ,CAAC;IAED,MAAM,CAAC,GAAG;QACT,GAAG;QACH,GAAG;QACH,OAAO;QACP,SAAS;QACT,EAAE,EAAE,SAAS;QACb,IAAI;QACJ,KAAK;KACK,CAAA;IAEX,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACrB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACrB,OAAO,CAAC,CAAA;AACT,CAAC;AAED,6DAA6D;AAC7D,MAAM,UAAU,GAAG,CAAuB,QAAsB;IAC/D,MAAM,CAAC,GAAG,GAAG,EAAK,CAAA;IAClB,IAAI,QAAQ;QAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAC7B,OAAO,CAAC,CAAC,GAAG,CAAA;AACb,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,GAAG,CAAuB,QAAsB;IAC/D,MAAM,CAAC,GAAG,GAAG,EAAK,CAAA;IAClB,IAAI,QAAQ;QAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAC7B,OAAO,CAAC,CAAC,GAAG,CAAA;AACb,CAAC"}