@e280/stz 0.2.35 → 0.3.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@e280/stz",
-	"version": "0.2.35",
+	"version": "0.3.0-next.0",
 	"description": "everyday ts fns for everything",
 	"license": "MIT",
 	"author": "Chase Moskal <chasemoskal@gmail.com>",
@@ -23,7 +23,7 @@
 	},
 	"devDependencies": {
 		"@e280/science": "^0.1.11",
-		"@types/node": "^25.6.0",
+		"@types/node": "^25.7.0",
 		"typescript": "^6.0.3"
 	},
 	"keywords": [

package/s/count.ts

@@ -14,9 +14,3 @@ export function range(n: number) {
 	return [...count(n)]
 }
 
-/** @deprecated renamed to `count` */
-export const loop = count
-
-/** @deprecated renamed to `count2d` */
-export const loop2d = count2d
-

package/s/cycle.ts

@@ -23,6 +23,3 @@ export function cycle(fn: (stop: () => void) => unknown | Promise<unknown>) {
 	return stop
 }
 
-/** @deprecated renamed to `cycle` */
-export const repeat = cycle
-

package/s/data/bytename/bytename.ts

@@ -88,6 +88,3 @@ export const bytename = {
 	},
 }
 
-/** @deprecated renamed to `bytename` */
-export const Bytename = bytename
-

package/s/data/bytename/thumbprint.ts

@@ -14,12 +14,6 @@ export type ThumbprintData = {
 	preview: string
 	bulk: string
 	sigil: string
-
-	/** @deprecated renamed to `raw` */
-	readonly bytes: Uint8Array
-
-	/** @deprecated renamed to `full` */
-	readonly thumbprint: string
 }
 
 /**
@@ -89,9 +83,6 @@ export const thumbprint = {
 				preview,
 				bulk,
 				sigil,
-
-				bytes: raw,
-				thumbprint: full,
 			}
 		},
 
@@ -124,6 +115,3 @@ export const thumbprint = {
 	},
 }
 
-/** @deprecated renamed to `thumbprint` */
-export const Thumbprint = thumbprint
-

package/s/data/bytes.ts

@@ -12,6 +12,3 @@ export const bytes = Object.freeze({
 	},
 })
 
-/** @deprecated renamed to `bytes` */
-export const Bytes = bytes
-

package/s/data/txt.ts

@@ -8,12 +8,3 @@ export function txt(bytes: Uint8Array) {
 txt.fromBytes = fromBytes
 txt.toBytes = toBytes
 
-/** @deprecated renamed to `fromBytes` */
-txt.string = txt.fromBytes
-
-/** @deprecated renamed to `toBytes` */
-txt.bytes = txt.toBytes
-
-/** @deprecated renamed to `txt` */
-export const Txt = txt
-

package/s/index.ts

@@ -1,10 +1,6 @@
 
 export * from "./data/bytename/bytename.js"
 export * from "./data/bytename/thumbprint.js"
-export * from "./data/legacy/base58.js"
-export * from "./data/legacy/base64.js"
-export * from "./data/legacy/base64url.js"
-export * from "./data/legacy/hex.js"
 export * from "./data/base-x-codecs.js"
 export * from "./data/base-x.js"
 export * from "./data/bytes.js"
@@ -17,17 +13,16 @@ export * from "./debounce/types.js"
 export * from "./deep/index.js"
 export * from "./dig/dig.js"
 
-export * from "./g/map.js"
-export * from "./g/pool.js"
-export * from "./g/set.js"
-export * from "./g/weak-map.js"
-
 export * from "./queue/queue.js"
 
 export * from "./ok/index.js"
 export * from "./toq/index.js"
 export * from "./maybe/index.js"
 
+export * from "./utensils/got.js"
+export * from "./utensils/map.js"
+export * from "./utensils/set.js"
+
 export * from "./all.js"
 export * from "./assert.js"
 export * from "./coalesce.js"
@@ -42,11 +37,9 @@ export * from "./dedupe.js"
 export * from "./defer.js"
 export * from "./dispenser.js"
 export * from "./disposer.js"
-export * from "./drill.js"
 export * from "./error-string.js"
 export * from "./escape-regex.js"
 export * from "./ev.js"
-export * from "./hat.js"
 export * from "./id-counter.js"
 export * from "./is.js"
 export * from "./nap.js"

package/s/maybe/validators/validator.ts

@@ -22,6 +22,3 @@ export function validator<X>(...validators: Validator<X>[]): Validator<X> {
 	}
 }
 
-/** @deprecated renamed to `validator` */
-export const all = validator
-

package/s/ok/fns/get.ts

@@ -15,6 +15,3 @@ export function getErr<E = unknown>(result: Result<unknown, E>): E | undefined {
 		: result.error
 }
 
-/** @deprecated renamed to `getOk` */
-export const grab = getOk
-

package/s/ok/fns/need.ts

@@ -24,6 +24,3 @@ export function needErr<E>(result: Result<unknown, E>): E {
 	return result.error
 }
 
-/** @deprecated renamed to `needOk` */
-export const need = needOk
-

package/s/time.ts

@@ -20,6 +20,3 @@ export const time = {
 	},
 }
 
-/** @deprecated renamed to `time` */
-export const Time = time
-

package/s/utensils/got.ts

@@ -0,0 +1,6 @@
+
+export function got<X>(thing: X | undefined | null): X {
+	if (thing === undefined || thing === null) throw new Error(`got failed`)
+	return thing
+}
+

package/s/utensils/map.ts

@@ -0,0 +1,30 @@
+
+type MapLike<K, V> = {
+	has(key: K): boolean
+	get(key: K): V | undefined
+	set(key: K, value: V): unknown
+}
+
+export function need<K, V>(map: MapLike<K, V>, key: K) {
+	if (map.has(key))
+		return map.get(key) as V
+	else
+		throw new Error("needed key not found")
+}
+
+export function guarantee<K, V>(map: MapLike<K, V>, key: K, make: () => V) {
+	if (map.has(key))
+		return map.get(key)!
+	else {
+		const value = make()
+		map.set(key, value)
+		return value
+	}
+}
+
+export function inserts<K, V, M extends MapLike<K, V>>(map: M, entries: Iterable<[K, V]>) {
+	for (const [key, value] of entries)
+		map.set(key, value)
+	return map
+}
+

package/s/utensils/set.ts

@@ -0,0 +1,19 @@
+
+type SetLike<V> = {
+	has(value: V): boolean
+	add(value: V): void
+	delete(value: V): void
+}
+
+export function adds<V, S extends SetLike<V>>(set: S, values: Iterable<V>) {
+	for (const value of values)
+		set.add(value)
+	return set
+}
+
+export function deletes<V, S extends SetLike<V>>(set: S, values: Iterable<V>) {
+	for (const value of values)
+		set.delete(value)
+	return set
+}
+

package/x/count.d.ts

@@ -1,7 +1,3 @@
 export declare function count(n: number): Generator<number, void, unknown>;
 export declare function count2d([columns, rows]: [number, number]): Generator<[number, number], void, unknown>;
 export declare function range(n: number): number[];
-/** @deprecated renamed to `count` */
-export declare const loop: typeof count;
-/** @deprecated renamed to `count2d` */
-export declare const loop2d: typeof count2d;

package/x/count.js

@@ -10,8 +10,4 @@ export function* count2d([columns, rows]) {
 export function range(n) {
     return [...count(n)];
 }
-/** @deprecated renamed to `count` */
-export const loop = count;
-/** @deprecated renamed to `count2d` */
-export const loop2d = count2d;
 //# sourceMappingURL=count.js.map

package/x/count.js.map

@@ -1 +1 @@
-{"version":3,"file":"count.js","sourceRoot":"","sources":["../s/count.ts"],"names":[],"mappings":"AACA,MAAM,SAAS,CAAC,CAAC,KAAK,CAAC,CAAS;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACzB,MAAM,CAAC,CAAA;AACT,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,IAAI,CAAmB;IACzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE;QAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE;YAC/B,MAAM,CAAC,CAAC,EAAE,CAAC,CAAqB,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,CAAS;IAC9B,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACrB,CAAC;AAED,qCAAqC;AACrC,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,CAAA;AAEzB,uCAAuC;AACvC,MAAM,CAAC,MAAM,MAAM,GAAG,OAAO,CAAA"}
+{"version":3,"file":"count.js","sourceRoot":"","sources":["../s/count.ts"],"names":[],"mappings":"AACA,MAAM,SAAS,CAAC,CAAC,KAAK,CAAC,CAAS;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACzB,MAAM,CAAC,CAAA;AACT,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,IAAI,CAAmB;IACzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE;QAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE;YAC/B,MAAM,CAAC,CAAC,EAAE,CAAC,CAAqB,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,CAAS;IAC9B,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACrB,CAAC"}

package/x/cycle.d.ts

@@ -3,5 +3,3 @@
  *  - consider using `nap` in your fn to create a delay
  */
 export declare function cycle(fn: (stop: () => void) => unknown | Promise<unknown>): () => void;
-/** @deprecated renamed to `cycle` */
-export declare const repeat: typeof cycle;

package/x/cycle.js

@@ -20,6 +20,4 @@ export function cycle(fn) {
     tick();
     return stop;
 }
-/** @deprecated renamed to `cycle` */
-export const repeat = cycle;
 //# sourceMappingURL=cycle.js.map

package/x/cycle.js.map

@@ -1 +1 @@
-{"version":3,"file":"cycle.js","sourceRoot":"","sources":["../s/cycle.ts"],"names":[],"mappings":"AACA;;;GAGG;AACH,MAAM,UAAU,KAAK,CAAC,EAAoD;IACzE,IAAI,OAAY,CAAA;IAChB,IAAI,OAAO,GAAG,KAAK,CAAA;IAEnB,MAAM,IAAI,GAAG,GAAG,EAAE;QACjB,OAAO,GAAG,IAAI,CAAA;QACd,YAAY,CAAC,OAAO,CAAC,CAAA;IACtB,CAAC,CAAA;IAED,MAAM,IAAI,GAAG,KAAK,IAAG,EAAE;QACtB,IAAI,OAAO;YAAE,OAAM;QACnB,MAAM,EAAE,CAAC,IAAI,CAAC,CAAA;QACd,IAAI,OAAO;YAAE,OAAM;QACnB,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC9B,CAAC,CAAA;IAED,IAAI,EAAE,CAAA;IACN,OAAO,IAAI,CAAA;AACZ,CAAC;AAED,qCAAqC;AACrC,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,CAAA"}
+{"version":3,"file":"cycle.js","sourceRoot":"","sources":["../s/cycle.ts"],"names":[],"mappings":"AACA;;;GAGG;AACH,MAAM,UAAU,KAAK,CAAC,EAAoD;IACzE,IAAI,OAAY,CAAA;IAChB,IAAI,OAAO,GAAG,KAAK,CAAA;IAEnB,MAAM,IAAI,GAAG,GAAG,EAAE;QACjB,OAAO,GAAG,IAAI,CAAA;QACd,YAAY,CAAC,OAAO,CAAC,CAAA;IACtB,CAAC,CAAA;IAED,MAAM,IAAI,GAAG,KAAK,IAAG,EAAE;QACtB,IAAI,OAAO;YAAE,OAAM;QACnB,MAAM,EAAE,CAAC,IAAI,CAAC,CAAA;QACd,IAAI,OAAO;YAAE,OAAM;QACnB,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC9B,CAAC,CAAA;IAED,IAAI,EAAE,CAAA;IACN,OAAO,IAAI,CAAA;AACZ,CAAC"}

package/x/data/bytename/bytename.d.ts

@@ -17,12 +17,3 @@ export declare const bytename: {
     toHex(bname: string): string;
     fromHex(h: string, options?: Partial<BytenameOptions>): string;
 };
-/** @deprecated renamed to `bytename` */
-export declare const Bytename: {
-    defaults: BytenameOptions;
-    random(byteCount: number, options?: Partial<BytenameOptions>): string;
-    fromBytes(b: Uint8Array, options?: Partial<BytenameOptions>): string;
-    toBytes(bname: string): Uint8Array<ArrayBuffer>;
-    toHex(bname: string): string;
-    fromHex(h: string, options?: Partial<BytenameOptions>): string;
-};

package/x/data/bytename/bytename.js

@@ -62,6 +62,4 @@ export const bytename = {
         return bytename.fromBytes(hex.toBytes(h), options);
     },
 };
-/** @deprecated renamed to `bytename` */
-export const Bytename = bytename;
 //# sourceMappingURL=bytename.js.map

package/x/data/bytename/bytename.js.map

@@ -1 +1 @@
-{"version":3,"file":"bytename.js","sourceRoot":"","sources":["../../../s/data/bytename/bytename.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bytename.js","sourceRoot":"","sources":["../../../s/data/bytename/bytename.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AACjC,OAAO,EAAC,GAAG,EAAC,MAAM,qBAAqB,CAAA;AACvC,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAA;AAQ5C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG;IACvB,QAAQ,EAAoB;QAC3B,SAAS,EAAE,CAAC;QACZ,aAAa,EAAE,GAAG;QAClB,cAAc,EAAE,GAAG;KAClB;IAEF,MAAM,CAAC,SAAiB,EAAE,OAAkC;QAC3D,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;IAClC,CAAC;IAED,SAAS,CAAC,CAAa,EAAE,UAAoC,EAAE;QAC9D,MAAM,EACL,SAAS,GAAG,QAAQ,CAAC,QAAQ,CAAC,SAAS,EACvC,aAAa,GAAG,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAC/C,cAAc,GAAG,QAAQ,CAAC,QAAQ,CAAC,cAAc,GACjD,GAAG,OAAO,CAAA;QAEX,MAAM,KAAK,GAAa,EAAE,CAAA;QAC1B,IAAI,WAAW,GAAa,EAAE,CAAA;QAE9B,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACzB,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;YACxD,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC,CAAA;YAC/B,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;gBAChC,WAAW,GAAG,EAAE,CAAA;YACjB,CAAC;QACF,CAAC,CAAC,CAAA;QAEF,IAAI,WAAW,CAAC,MAAM;YACrB,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;QAEjC,MAAM,OAAO,GAAG,EAAE,CAAA;QAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS;YAC/C,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAA;QAEhE,OAAO,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IACpC,CAAC;IAED,OAAO,CAAC,KAAa;QACpB,MAAM,OAAO,GAAG,KAAK;aACnB,WAAW,EAAE;aACb,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA,CAAC,kCAAkC;QAE3D,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;QAChC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,CAAC,MAAM,gCAAgC,CAAC,CAAA;QAE1F,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC;YACzC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QAEvC,OAAO,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YACrD,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;YACxD,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAA;YACnD,IAAI,MAAM,KAAK,CAAC,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAA;YAC9C,OAAO,MAAM,CAAA;QACd,CAAC,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,KAAa;QAClB,OAAO,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,CAAC;IAED,OAAO,CAAC,CAAS,EAAE,OAAkC;QACpD,OAAO,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;IACnD,CAAC;CACD,CAAA"}

package/x/data/bytename/thumbprint.d.ts

@@ -9,10 +9,6 @@ export type ThumbprintData = {
     preview: string;
     bulk: string;
     sigil: string;
-    /** @deprecated renamed to `raw` */
-    readonly bytes: Uint8Array;
-    /** @deprecated renamed to `full` */
-    readonly thumbprint: string;
 };
 /**
  * Thumbprint is a friendly presentation format for arbitrary binary data.
@@ -38,20 +34,3 @@ export declare const thumbprint: {
         fromBytes(b: Uint8Array, options?: Partial<ThumbprintOptions>): string;
     };
 };
-/** @deprecated renamed to `thumbprint` */
-export declare const Thumbprint: {
-    defaults: ThumbprintOptions;
-    toBytes(tstring: string): Uint8Array<ArrayBuffer>;
-    parse(tstring: string, options?: Partial<ThumbprintOptions>): ThumbprintData;
-    build: {
-        fromBytes(raw: Uint8Array, options?: Partial<ThumbprintOptions>): ThumbprintData;
-        fromHex(hstring: string, options?: Partial<ThumbprintOptions>): ThumbprintData;
-    };
-    toHex(tstring: string): string;
-    fromBytes(b: Uint8Array, options?: Partial<ThumbprintOptions>): string;
-    fromHex(h: string, options?: Partial<ThumbprintOptions>): string;
-    sigil: {
-        fromHex(h: string, options?: Partial<ThumbprintOptions>): string;
-        fromBytes(b: Uint8Array, options?: Partial<ThumbprintOptions>): string;
-    };
-};

package/x/data/bytename/thumbprint.js

@@ -55,8 +55,6 @@ export const thumbprint = {
                 preview,
                 bulk,
                 sigil,
-                bytes: raw,
-                thumbprint: full,
             };
         },
         fromHex(hstring, options) {
@@ -83,6 +81,4 @@ export const thumbprint = {
         },
     },
 };
-/** @deprecated renamed to `thumbprint` */
-export const Thumbprint = thumbprint;
 //# sourceMappingURL=thumbprint.js.map

package/x/data/bytename/thumbprint.js.map

@@ -1 +1 @@
-{"version":3,"file":"thumbprint.js","sourceRoot":"","sources":["../../../s/data/bytename/thumbprint.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"thumbprint.js","sourceRoot":"","sources":["../../../s/data/bytename/thumbprint.ts"],"names":[],"mappings":"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"}

package/x/data/bytes.d.ts

@@ -2,8 +2,3 @@ export declare const bytes: Readonly<{
     eq(a: Uint8Array, b: Uint8Array): boolean;
     random(count: number): Uint8Array<ArrayBuffer>;
 }>;
-/** @deprecated renamed to `bytes` */
-export declare const Bytes: Readonly<{
-    eq(a: Uint8Array, b: Uint8Array): boolean;
-    random(count: number): Uint8Array<ArrayBuffer>;
-}>;

package/x/data/bytes.js

@@ -11,6 +11,4 @@ export const bytes = Object.freeze({
         return crypto.getRandomValues(new Uint8Array(count));
     },
 });
-/** @deprecated renamed to `bytes` */
-export const Bytes = bytes;
 //# sourceMappingURL=bytes.js.map

package/x/data/bytes.js.map

@@ -1 +1 @@
-{"version":3,"file":"bytes.js","sourceRoot":"","sources":["../../s/data/bytes.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;IAClC,EAAE,CAAC,CAAa,EAAE,CAAa;QAC9B,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QACvC,IAAI,IAAI,GAAG,CAAC,CAAA;QACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE;YAAE,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACtD,OAAO,IAAI,KAAK,CAAC,CAAA;IAClB,CAAC;IAED,MAAM,CAAC,KAAa;QACnB,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;IACrD,CAAC;CACD,CAAC,CAAA;AAEF,qCAAqC;AACrC,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAA"}
+{"version":3,"file":"bytes.js","sourceRoot":"","sources":["../../s/data/bytes.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;IAClC,EAAE,CAAC,CAAa,EAAE,CAAa;QAC9B,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QACvC,IAAI,IAAI,GAAG,CAAC,CAAA;QACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE;YAAE,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACtD,OAAO,IAAI,KAAK,CAAC,CAAA;IAClB,CAAC;IAED,MAAM,CAAC,KAAa;QACnB,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;IACrD,CAAC;CACD,CAAC,CAAA"}

package/x/data/txt.d.ts

@@ -2,8 +2,4 @@ export declare function txt(bytes: Uint8Array): string;
 export declare namespace txt {
     var fromBytes: (bytes: Uint8Array) => string;
     var toBytes: (string: string) => Uint8Array;
-    var string: (bytes: Uint8Array) => string;
-    var bytes: (string: string) => Uint8Array;
 }
-/** @deprecated renamed to `txt` */
-export declare const Txt: typeof txt;

package/x/data/txt.js

@@ -5,10 +5,4 @@ export function txt(bytes) {
 }
 txt.fromBytes = fromBytes;
 txt.toBytes = toBytes;
-/** @deprecated renamed to `fromBytes` */
-txt.string = txt.fromBytes;
-/** @deprecated renamed to `toBytes` */
-txt.bytes = txt.toBytes;
-/** @deprecated renamed to `txt` */
-export const Txt = txt;
 //# sourceMappingURL=txt.js.map

package/x/data/txt.js.map

@@ -1 +1 @@
-{"version":3,"file":"txt.js","sourceRoot":"","sources":["../../s/data/txt.ts"],"names":[],"mappings":"AACA,MAAM,SAAS,GAAG,CAAC,KAAiB,EAAE,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AACxE,MAAM,OAAO,GAAG,CAAC,MAAc,EAAc,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AAEhF,MAAM,UAAU,GAAG,CAAC,KAAiB;IACpC,OAAO,SAAS,CAAC,KAAK,CAAC,CAAA;AACxB,CAAC;AACD,GAAG,CAAC,SAAS,GAAG,SAAS,CAAA;AACzB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAA;AAErB,yCAAyC;AACzC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAA;AAE1B,uCAAuC;AACvC,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,OAAO,CAAA;AAEvB,mCAAmC;AACnC,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,CAAA"}
+{"version":3,"file":"txt.js","sourceRoot":"","sources":["../../s/data/txt.ts"],"names":[],"mappings":"AACA,MAAM,SAAS,GAAG,CAAC,KAAiB,EAAE,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AACxE,MAAM,OAAO,GAAG,CAAC,MAAc,EAAc,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AAEhF,MAAM,UAAU,GAAG,CAAC,KAAiB;IACpC,OAAO,SAAS,CAAC,KAAK,CAAC,CAAA;AACxB,CAAC;AACD,GAAG,CAAC,SAAS,GAAG,SAAS,CAAA;AACzB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAA"}

package/x/index.d.ts

@@ -1,9 +1,5 @@
 export * from "./data/bytename/bytename.js";
 export * from "./data/bytename/thumbprint.js";
-export * from "./data/legacy/base58.js";
-export * from "./data/legacy/base64.js";
-export * from "./data/legacy/base64url.js";
-export * from "./data/legacy/hex.js";
 export * from "./data/base-x-codecs.js";
 export * from "./data/base-x.js";
 export * from "./data/bytes.js";
@@ -13,14 +9,13 @@ export * from "./debounce/microbounce.js";
 export * from "./debounce/types.js";
 export * from "./deep/index.js";
 export * from "./dig/dig.js";
-export * from "./g/map.js";
-export * from "./g/pool.js";
-export * from "./g/set.js";
-export * from "./g/weak-map.js";
 export * from "./queue/queue.js";
 export * from "./ok/index.js";
 export * from "./toq/index.js";
 export * from "./maybe/index.js";
+export * from "./utensils/got.js";
+export * from "./utensils/map.js";
+export * from "./utensils/set.js";
 export * from "./all.js";
 export * from "./assert.js";
 export * from "./coalesce.js";
@@ -35,11 +30,9 @@ export * from "./dedupe.js";
 export * from "./defer.js";
 export * from "./dispenser.js";
 export * from "./disposer.js";
-export * from "./drill.js";
 export * from "./error-string.js";
 export * from "./escape-regex.js";
 export * from "./ev.js";
-export * from "./hat.js";
 export * from "./id-counter.js";
 export * from "./is.js";
 export * from "./nap.js";

package/x/index.js

@@ -1,9 +1,5 @@
 export * from "./data/bytename/bytename.js";
 export * from "./data/bytename/thumbprint.js";
-export * from "./data/legacy/base58.js";
-export * from "./data/legacy/base64.js";
-export * from "./data/legacy/base64url.js";
-export * from "./data/legacy/hex.js";
 export * from "./data/base-x-codecs.js";
 export * from "./data/base-x.js";
 export * from "./data/bytes.js";
@@ -13,14 +9,13 @@ export * from "./debounce/microbounce.js";
 export * from "./debounce/types.js";
 export * from "./deep/index.js";
 export * from "./dig/dig.js";
-export * from "./g/map.js";
-export * from "./g/pool.js";
-export * from "./g/set.js";
-export * from "./g/weak-map.js";
 export * from "./queue/queue.js";
 export * from "./ok/index.js";
 export * from "./toq/index.js";
 export * from "./maybe/index.js";
+export * from "./utensils/got.js";
+export * from "./utensils/map.js";
+export * from "./utensils/set.js";
 export * from "./all.js";
 export * from "./assert.js";
 export * from "./coalesce.js";
@@ -35,11 +30,9 @@ export * from "./dedupe.js";
 export * from "./defer.js";
 export * from "./dispenser.js";
 export * from "./disposer.js";
-export * from "./drill.js";
 export * from "./error-string.js";
 export * from "./escape-regex.js";
 export * from "./ev.js";
-export * from "./hat.js";
 export * from "./id-counter.js";
 export * from "./is.js";
 export * from "./nap.js";

package/x/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../s/index.ts"],"names":[],"mappings":"AACA,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,yBAAyB,CAAA;AACvC,cAAc,yBAAyB,CAAA;AACvC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAE7B,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,qBAAqB,CAAA;AAEnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAE5B,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAE/B,cAAc,kBAAkB,CAAA;AAEhC,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAEhC,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,qBAAqB,CAAA;AACnC,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../s/index.ts"],"names":[],"mappings":"AACA,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,yBAAyB,CAAA;AACvC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAE7B,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,qBAAqB,CAAA;AAEnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAE5B,cAAc,kBAAkB,CAAA;AAEhC,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAEhC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AAEjC,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,qBAAqB,CAAA;AACnC,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,SAAS,CAAA;AACvB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA"}

package/x/maybe/validators/validator.d.ts

@@ -1,4 +1,2 @@
 import { Validator } from "../types.js";
 export declare function validator<X>(...validators: Validator<X>[]): Validator<X>;
-/** @deprecated renamed to `validator` */
-export declare const all: typeof validator;

package/x/maybe/validators/validator.js

@@ -16,6 +16,4 @@ export function validator(...validators) {
             : yay(x);
     };
 }
-/** @deprecated renamed to `validator` */
-export const all = validator;
 //# sourceMappingURL=validator.js.map

package/x/maybe/validators/validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../s/maybe/validators/validator.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAA;AACjC,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAA;AAGjC,MAAM,UAAU,SAAS,CAAI,GAAG,UAA0B;IACzD,OAAO,CAAC,CAAC,EAAE;QACV,IAAI,QAAQ,GAAG,CAAC,CAAA;QAChB,MAAM,KAAK,GAAa,EAAE,CAAA;QAE1B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;YAC1B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;gBAChB,QAAQ,EAAE,CAAA;gBACV,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAA;YAC9B,CAAC;QACF,CAAC;QAED,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACpB,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACf,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACV,CAAC,CAAA;AACF,CAAC;AAED,yCAAyC;AACzC,MAAM,CAAC,MAAM,GAAG,GAAG,SAAS,CAAA"}
+{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../s/maybe/validators/validator.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAA;AACjC,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAA;AAGjC,MAAM,UAAU,SAAS,CAAI,GAAG,UAA0B;IACzD,OAAO,CAAC,CAAC,EAAE;QACV,IAAI,QAAQ,GAAG,CAAC,CAAA;QAChB,MAAM,KAAK,GAAa,EAAE,CAAA;QAE1B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;YAC1B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;gBAChB,QAAQ,EAAE,CAAA;gBACV,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAA;YAC9B,CAAC;QACF,CAAC;QAED,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACpB,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACf,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACV,CAAC,CAAA;AACF,CAAC"}

package/x/ok/fns/get.d.ts

@@ -3,5 +3,3 @@ import type { Result } from "../types/result.js";
 export declare function getOk<Value>(result: Result<Value, unknown>): Value | undefined;
 /** get error or undefined */
 export declare function getErr<E = unknown>(result: Result<unknown, E>): E | undefined;
-/** @deprecated renamed to `getOk` */
-export declare const grab: typeof getOk;

package/x/ok/fns/get.js

@@ -10,6 +10,4 @@ export function getErr(result) {
         ? undefined
         : result.error;
 }
-/** @deprecated renamed to `getOk` */
-export const grab = getOk;
 //# sourceMappingURL=get.js.map

package/x/ok/fns/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../s/ok/fns/get.ts"],"names":[],"mappings":"AAGA,6BAA6B;AAC7B,MAAM,UAAU,KAAK,CAAQ,MAA8B;IAC1D,OAAO,MAAM,CAAC,EAAE;QACf,CAAC,CAAC,MAAM,CAAC,KAAK;QACd,CAAC,CAAC,SAAS,CAAA;AACb,CAAC;AAED,6BAA6B;AAC7B,MAAM,UAAU,MAAM,CAAc,MAA0B;IAC7D,OAAO,MAAM,CAAC,EAAE;QACf,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,CAAC,KAAK,CAAA;AAChB,CAAC;AAED,qCAAqC;AACrC,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,CAAA"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../s/ok/fns/get.ts"],"names":[],"mappings":"AAGA,6BAA6B;AAC7B,MAAM,UAAU,KAAK,CAAQ,MAA8B;IAC1D,OAAO,MAAM,CAAC,EAAE;QACf,CAAC,CAAC,MAAM,CAAC,KAAK;QACd,CAAC,CAAC,SAAS,CAAA;AACb,CAAC;AAED,6BAA6B;AAC7B,MAAM,UAAU,MAAM,CAAc,MAA0B;IAC7D,OAAO,MAAM,CAAC,EAAE;QACf,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,MAAM,CAAC,KAAK,CAAA;AAChB,CAAC"}

package/x/ok/fns/need.d.ts

@@ -3,5 +3,3 @@ import type { Result } from "../types/result.js";
 export declare function needOk<Value, E>(result: Result<Value, E>): Value;
 /** return error, otherwise throw error */
 export declare function needErr<E>(result: Result<unknown, E>): E;
-/** @deprecated renamed to `needOk` */
-export declare const need: typeof needOk;

package/x/ok/fns/need.js

@@ -16,6 +16,4 @@ export function needErr(result) {
         throw new Error("didn't get needed error");
     return result.error;
 }
-/** @deprecated renamed to `needOk` */
-export const need = needOk;
 //# sourceMappingURL=need.js.map

package/x/ok/fns/need.js.map

@@ -1 +1 @@
-{"version":3,"file":"need.js","sourceRoot":"","sources":["../../../s/ok/fns/need.ts"],"names":[],"mappings":"AAGA,6CAA6C;AAC7C,MAAM,UAAU,MAAM,CAAW,MAAwB;IACxD,IAAI,MAAM,CAAC,EAAE;QACZ,OAAO,MAAM,CAAC,KAAK,CAAA;IAEpB,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,CAAA;IAEtB,IAAI,KAAK,YAAY,KAAK;QACzB,MAAM,KAAK,CAAA;SAEP,IAAI,OAAO,KAAK,KAAK,QAAQ;QACjC,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAA;;QAGtB,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;AAC5B,CAAC;AAED,0CAA0C;AAC1C,MAAM,UAAU,OAAO,CAAI,MAA0B;IACpD,IAAI,MAAM,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IACzD,OAAO,MAAM,CAAC,KAAK,CAAA;AACpB,CAAC;AAED,sCAAsC;AACtC,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAA"}
+{"version":3,"file":"need.js","sourceRoot":"","sources":["../../../s/ok/fns/need.ts"],"names":[],"mappings":"AAGA,6CAA6C;AAC7C,MAAM,UAAU,MAAM,CAAW,MAAwB;IACxD,IAAI,MAAM,CAAC,EAAE;QACZ,OAAO,MAAM,CAAC,KAAK,CAAA;IAEpB,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,CAAA;IAEtB,IAAI,KAAK,YAAY,KAAK;QACzB,MAAM,KAAK,CAAA;SAEP,IAAI,OAAO,KAAK,KAAK,QAAQ;QACjC,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAA;;QAGtB,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;AAC5B,CAAC;AAED,0CAA0C;AAC1C,MAAM,UAAU,OAAO,CAAI,MAA0B;IACpD,IAAI,MAAM,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IACzD,OAAO,MAAM,CAAC,KAAK,CAAA;AACpB,CAAC"}

package/x/time.d.ts

@@ -16,22 +16,3 @@ export declare const time: {
         days: (n: number) => number;
     };
 };
-/** @deprecated renamed to `time` */
-export declare const Time: {
-    seconds: (n: number) => number;
-    minutes: (n: number) => number;
-    hours: (n: number) => number;
-    days: (n: number) => number;
-    future: {
-        seconds: (n: number) => number;
-        minutes: (n: number) => number;
-        hours: (n: number) => number;
-        days: (n: number) => number;
-    };
-    past: {
-        seconds: (n: number) => number;
-        minutes: (n: number) => number;
-        hours: (n: number) => number;
-        days: (n: number) => number;
-    };
-};

package/x/time.js

@@ -16,6 +16,4 @@ export const time = {
         days: (n) => (Date.now() - time.days(n)),
     },
 };
-/** @deprecated renamed to `time` */
-export const Time = time;
 //# sourceMappingURL=time.js.map

package/x/time.js.map

@@ -1 +1 @@
-{"version":3,"file":"time.js","sourceRoot":"","sources":["../s/time.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,IAAI,GAAG;IACnB,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC9C,KAAK,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5C,IAAI,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEzC,MAAM,EAAE;QACP,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtD,KAAK,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClD,IAAI,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChD;IAED,IAAI,EAAE;QACL,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtD,KAAK,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClD,IAAI,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChD;CACD,CAAA;AAED,oCAAoC;AACpC,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,CAAA"}
+{"version":3,"file":"time.js","sourceRoot":"","sources":["../s/time.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,IAAI,GAAG;IACnB,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC9C,KAAK,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5C,IAAI,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEzC,MAAM,EAAE;QACP,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtD,KAAK,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClD,IAAI,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChD;IAED,IAAI,EAAE;QACL,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtD,KAAK,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClD,IAAI,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChD;CACD,CAAA"}