@e280/stz 0.2.10 → 0.2.12

package/s/g/weak-map.ts

@@ -0,0 +1,32 @@
+
+/** extended weak map with handy methods like `require` and `guarantee` */
+export class GWeakMap<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) as V
+		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 GWeakMap.require(this, key)
+	}
+
+	guarantee(key: K, make: () => V) {
+		return GWeakMap.guarantee(this, key, make)
+	}
+}
+
+/** @deprecated renamed to `GWeakMap` */
+export const WeakMapG = GWeakMap
+

package/s/index.ts

@@ -1,20 +1,29 @@
 
-export * from "./data/bytename/index.js"
+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/base58.js"
-export * from "./data/base64.js"
-export * from "./data/base64url.js"
 export * from "./data/bytes.js"
-export * from "./data/hex.js"
 export * from "./data/txt.js"
 
 export * from "./debounce/debounce.js"
 export * from "./debounce/types.js"
 
-export * from "./deep/deep.js"
+export * from "./deep/index.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 "./toq/index.js"
+
 export * from "./coalesce.js"
 export * from "./collect.js"
 export * from "./concurrent.js"
@@ -32,7 +41,6 @@ export * from "./ev.js"
 export * from "./hat.js"
 export * from "./id-counter.js"
 export * from "./is.js"
-export * from "./map-g.js"
 export * from "./nap.js"
 export * from "./ob.js"
 export * from "./once.js"
@@ -40,7 +48,6 @@ export * from "./pipe.js"
 export * from "./provide.js"
 export * from "./pubsub.js"
 export * from "./scope.js"
-export * from "./set-g.js"
 export * from "./templating.js"
 export * from "./time.js"
 export * from "./trash.js"

package/s/pubsub.ts

@@ -24,7 +24,7 @@ export interface Xub<A extends any[] = []> {
 	on(fn: Listener<A>): () => void
 
 	/** wait for the next published value */
-	next(): Promise<A>
+	next(fn?: Listener<A>): Promise<A>
 
 	/** wipe all listeners attached to this. */
 	clear(): void

package/s/tests.test.ts

@@ -1,21 +1,17 @@
 
 import {Science} from "@e280/science"
 
-import clone from "./clone/clone.test.js"
-import thumbprint from "./data/bytename/thumbprint.test.js"
-import debounce from "./debounce/debounce.test.js"
-import bytename from "./data/bytename/bytename.test.js"
-import deep from "./deep/deep.test.js"
 import data from "./data/data.test.js"
+import debounce from "./debounce/debounce.test.js"
+import deep from "./deep/index.test.js"
 import queue from "./queue/queue.test.js"
+import toq from "./toq/toq.test.js"
 
 await Science.run({
-	clone,
-	bytename,
-	thumbprint,
+	data,
 	debounce,
 	deep,
-	data,
 	queue,
+	toq,
 })
 

package/s/time.ts

@@ -1,22 +1,25 @@
 
-export const Time = {
+export const time = {
 	seconds: (n: number) => (n * 1000),
-	minutes: (n: number) => (n * Time.seconds(60)),
-	hours: (n: number) => (n * Time.minutes(60)),
-	days: (n: number) => (n * Time.hours(24)),
+	minutes: (n: number) => (n * time.seconds(60)),
+	hours: (n: number) => (n * time.minutes(60)),
+	days: (n: number) => (n * time.hours(24)),
 
 	future: {
-		seconds: (n: number) => (Date.now() + Time.seconds(n)),
-		minutes: (n: number) => (Date.now() + Time.minutes(n)),
-		hours: (n: number) => (Date.now() + Time.hours(n)),
-		days: (n: number) => (Date.now() + Time.days(n)),
+		seconds: (n: number) => (Date.now() + time.seconds(n)),
+		minutes: (n: number) => (Date.now() + time.minutes(n)),
+		hours: (n: number) => (Date.now() + time.hours(n)),
+		days: (n: number) => (Date.now() + time.days(n)),
 	},
 
 	past: {
-		seconds: (n: number) => (Date.now() - Time.seconds(n)),
-		minutes: (n: number) => (Date.now() - Time.minutes(n)),
-		hours: (n: number) => (Date.now() - Time.hours(n)),
-		days: (n: number) => (Date.now() - Time.days(n)),
+		seconds: (n: number) => (Date.now() - time.seconds(n)),
+		minutes: (n: number) => (Date.now() - time.minutes(n)),
+		hours: (n: number) => (Date.now() - time.hours(n)),
+		days: (n: number) => (Date.now() - time.days(n)),
 	},
 }
 
+/** @deprecated renamed to `time` */
+export const Time = time
+

package/s/toq/index.ts

@@ -0,0 +1,3 @@
+
+export * as toq from "./toq.js"
+

package/s/toq/toq.test.ts

@@ -0,0 +1,46 @@
+
+import {expect, Science, test} from "@e280/science"
+import {toq} from "./index.js"
+import {txt} from "../data/txt.js"
+import {deep} from "../deep/index.js"
+
+export default Science.suite({
+	"roundtrip one file": test(async() => {
+		const a: toq.Entry[] = [["hello.txt", txt.toBytes("hello world")]]
+		const b = [...toq.unpack(toq.pack(a))]
+		expect(deep.equal(a, b)).ok()
+	}),
+
+	"roundtrip two files": test(async() => {
+		const a: toq.Entry[] = [
+			["hello.txt", txt.toBytes("hello world")],
+			["data.binary", new Uint8Array([0xDE, 0xAD, 0xBE, 0xEF])],
+		]
+		const b = [...toq.unpack(toq.pack(a))]
+		expect(deep.equal(a, b)).ok()
+	}),
+
+	"wrong magic bytes cause failure": test(async() => {
+		const good = toq.pack([["hello.txt", txt.toBytes("hello world")]])
+		const bad = new Uint8Array([...good])
+		bad.set([0xDE, 0xAD, 0xBE, 0xEF], 0)
+		expect(toq.is(good)).is(true)
+		expect(toq.is(bad)).is(false)
+		expect(() => [...toq.unpack(bad)]).throws()
+	}),
+
+	"from map": test(async() => {
+		const files = new Map<string, Uint8Array>()
+		files.set("hello.txt", txt.toBytes("hello world"))
+		files.set("deadbeef.data", new Uint8Array([0xDE, 0xAD, 0xBE, 0xEF]))
+		const archive = toq.pack(files)
+		expect(toq.is(archive)).ok()
+	}),
+
+	"to map": test(async() => {
+		const archive = toq.pack([["hello.txt", txt.toBytes("hello world")]])
+		const files = new Map(toq.unpack(archive))
+		expect(files.has("hello.txt")).ok()
+	}),
+})
+

package/s/toq/toq.ts

@@ -0,0 +1,62 @@
+
+import {txt} from "../data/txt.js"
+import {bytes} from "../data/bytes.js"
+
+export type Entry = [name: string, data: Uint8Array]
+
+const u32len = 4
+const magic = txt.toBytes("TOQ\x01")
+
+function u32(n: number) {
+	const view = new DataView(new ArrayBuffer(u32len))
+	view.setUint32(0, n, true)
+	return new Uint8Array(view.buffer)
+}
+
+export function pack(items: Iterable<Entry>) {
+	return new Uint8Array([
+		...magic,
+		...[...items].flatMap(([name, data]) => {
+			const nameBytes = new TextEncoder().encode(name)
+			if (nameBytes.length > 255) throw new Error("name cannot exceed 255 bytes")
+			return [
+				nameBytes.length,
+				...nameBytes,
+				...u32(data.length),
+				...data,
+			]
+		})
+	])
+}
+
+export function* unpack(file: Uint8Array) {
+	if (!is(file)) throw new Error("file is not a toq archive")
+
+	const view = new DataView(file.buffer, file.byteOffset, file.byteLength)
+	let cursor = magic.length
+
+	while (cursor < file.length) {
+		const nameLen = file[cursor]
+		cursor += 1
+
+		const name = txt.fromBytes(file.slice(cursor, cursor + nameLen))
+		cursor += nameLen
+
+		const dataLen = view.getUint32(cursor, true)
+		cursor += u32len
+
+		if ((cursor + dataLen) > file.length) throw new Error("corrupt toq archive")
+		const data = file.slice(cursor, cursor + dataLen)
+		cursor += dataLen
+
+		yield [name, data] as Entry
+	}
+}
+
+export function is(file: Uint8Array) {
+	return bytes.eq(
+		file.slice(0, magic.length),
+		magic,
+	)
+}
+

package/x/data/base-x-codecs.d.ts

@@ -0,0 +1,8 @@
+import { BaseX } from "./base-x.js";
+export declare const hex: BaseX;
+export declare const base2: BaseX;
+export declare const base36: BaseX;
+export declare const base58: BaseX;
+export declare const base62: BaseX;
+export declare const base64: BaseX;
+export declare const base64url: BaseX;

package/x/data/base-x-codecs.js

@@ -0,0 +1,9 @@
+import { BaseX } from "./base-x.js";
+export const hex = new BaseX(BaseX.lexicons.hex);
+export const base2 = new BaseX(BaseX.lexicons.base2);
+export const base36 = new BaseX(BaseX.lexicons.base36);
+export const base58 = new BaseX(BaseX.lexicons.base58);
+export const base62 = new BaseX(BaseX.lexicons.base62);
+export const base64 = new BaseX(BaseX.lexicons.base64);
+export const base64url = new BaseX(BaseX.lexicons.base64url);
+//# sourceMappingURL=base-x-codecs.js.map

package/x/data/base-x-codecs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-x-codecs.js","sourceRoot":"","sources":["../../s/data/base-x-codecs.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AAEjC,MAAM,CAAC,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AAChD,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AACpD,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AACtD,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AACtD,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AACtD,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AACtD,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA"}

package/x/data/base-x.js

@@ -1,4 +1,4 @@
-import { Bytes } from "./bytes.js";
+import { bytes } from "./bytes.js";
 export class BaseX {
     lexicon;
     static lexicons = Object.freeze({
@@ -141,7 +141,7 @@ export class BaseX {
         return negative ? `${this.negativePrefix}${out}` : out;
     }
     random(count = 32) {
-        return this.fromBytes(Bytes.random(count));
+        return this.fromBytes(bytes.random(count));
     }
 }
 //# sourceMappingURL=base-x.js.map

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

@@ -9,11 +9,20 @@ export type BytenameOptions = {
  *  - each byte maps to a three-letter triplet
  *  - all delimiters are just sugar, parser doesn't care
  */
+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;
+};
+/** @deprecated renamed to `bytename` */
 export declare const Bytename: {
     defaults: BytenameOptions;
     random(byteCount: number, options?: Partial<BytenameOptions>): string;
-    fromBytes(bytes: Uint8Array, options?: Partial<BytenameOptions>): string;
-    toBytes(bytename: string): Uint8Array<ArrayBuffer>;
-    toHex(bytename: string): string;
-    fromHex(hex: string, 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

@@ -1,5 +1,5 @@
-import { Hex } from "../hex.js";
-import { Bytes } from "../bytes.js";
+import { bytes } from "../bytes.js";
+import { hex } from "../base-x-codecs.js";
 import { prefixes } from "./utils/prefixes.js";
 import { suffixes } from "./utils/suffixes.js";
 /**
@@ -8,21 +8,21 @@ import { suffixes } from "./utils/suffixes.js";
  *  - each byte maps to a three-letter triplet
  *  - all delimiters are just sugar, parser doesn't care
  */
-export const Bytename = {
+export const bytename = {
     defaults: {
         groupSize: 4,
         wordSeparator: ".",
         groupSeparator: " ",
     },
     random(byteCount, options) {
-        const bytes = Bytes.random(byteCount);
-        return this.fromBytes(bytes, options);
+        const b = bytes.random(byteCount);
+        return this.fromBytes(b, options);
     },
-    fromBytes(bytes, options = {}) {
-        const { groupSize = Bytename.defaults.groupSize, wordSeparator = Bytename.defaults.wordSeparator, groupSeparator = Bytename.defaults.groupSeparator, } = options;
+    fromBytes(b, options = {}) {
+        const { groupSize = bytename.defaults.groupSize, wordSeparator = bytename.defaults.wordSeparator, groupSeparator = bytename.defaults.groupSeparator, } = options;
         const words = [];
         let currentWord = [];
-        bytes.forEach((byte, index) => {
+        b.forEach((byte, index) => {
             const source = ((index % 2) === 0) ? prefixes : suffixes;
             currentWord.push(source[byte]);
             if (currentWord.length === 2) {
@@ -37,8 +37,8 @@ export const Bytename = {
             grouped.push(words.slice(i, i + groupSize).join(wordSeparator));
         return grouped.join(groupSeparator);
     },
-    toBytes(bytename) {
-        const letters = bytename
+    toBytes(bname) {
+        const letters = bname
             .toLowerCase()
             .replace(/[^a-z]/g, ""); // strip everything except letters
         const count = letters.length / 3;
@@ -55,11 +55,13 @@ export const Bytename = {
             return number;
         }));
     },
-    toHex(bytename) {
-        return Hex.fromBytes(Bytename.toBytes(bytename));
+    toHex(bname) {
+        return hex.fromBytes(bytename.toBytes(bname));
     },
-    fromHex(hex, options) {
-        return Bytename.fromBytes(Hex.toBytes(hex), options);
+    fromHex(h, options) {
+        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":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,WAAW,CAAA;AAC7B,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AACjC,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,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACrC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IACtC,CAAC;IAED,SAAS,CAAC,KAAiB,EAAE,UAAoC,EAAE;QAClE,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,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC7B,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,QAAgB;QACvB,MAAM,OAAO,GAAG,QAAQ;aACtB,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,QAAgB;QACrB,OAAO,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,CAAC;IAED,OAAO,CAAC,GAAW,EAAE,OAAkC;QACtD,OAAO,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAA;IACrD,CAAC;CACD,CAAA"}
+{"version":3,"file":"bytename.js","sourceRoot":"","sources":["../../../s/data/bytename/bytename.ts"],"names":[],"mappings":"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"}

package/x/data/bytename/bytename.test.js

@@ -1,27 +1,27 @@
-import { Bytes } from "../bytes.js";
-import { Bytename } from "./bytename.js";
+import { bytes } from "../bytes.js";
+import { bytename } from "./bytename.js";
 import { Science, test, expect } from "@e280/science";
 const deadbeef = new Uint8Array([0xDE, 0xAD, 0xBE, 0xEF]);
-function good(bytes) {
-    expect(Bytes.eq(bytes, deadbeef)).ok();
+function good(b) {
+    expect(bytes.eq(b, deadbeef)).ok();
 }
 export default Science.suite({
     "bytes->string->bytes": test(async () => {
-        const text = Bytename.fromBytes(deadbeef);
+        const text = bytename.fromBytes(deadbeef);
         expect(text).is("ribmug.hilmun");
-        good(Bytename.toBytes(text));
+        good(bytename.toBytes(text));
     }),
     "zero bytes": test(async () => {
-        const text = Bytename.fromBytes(new Uint8Array([]));
+        const text = bytename.fromBytes(new Uint8Array([]));
         expect(text).is("");
     }),
     "one byte": test(async () => {
-        const text = Bytename.fromBytes(new Uint8Array([0x00]));
+        const text = bytename.fromBytes(new Uint8Array([0x00]));
         expect(text).is("doz");
     }),
     "groupings": test(async () => {
         const bytes = new Uint8Array([...deadbeef, ...deadbeef]);
-        const text = Bytename.fromBytes(bytes, {
+        const text = bytename.fromBytes(bytes, {
             groupSize: 2,
             groupSeparator: " ",
             wordSeparator: ".",
@@ -29,13 +29,13 @@ export default Science.suite({
         expect(text).is("ribmug.hilmun ribmug.hilmun");
     }),
     "wordsep": Science.suite({
-        "underscore": test(async () => good(Bytename.toBytes("ribmug_hilmun"))),
-        "uppercase": test(async () => good(Bytename.toBytes("RIBMUG_HILMUN"))),
-        "dots": test(async () => good(Bytename.toBytes("ribmug.hilmun"))),
-        "crushed": test(async () => good(Bytename.toBytes("ribmughilmun"))),
-        "space": test(async () => good(Bytename.toBytes("ribmug hilmun"))),
-        "spaces": test(async () => good(Bytename.toBytes("ribmug  hilmun"))),
-        "whitespace": test(async () => good(Bytename.toBytes("\n ribmug \n \t \n hilmun \n"))),
+        "underscore": test(async () => good(bytename.toBytes("ribmug_hilmun"))),
+        "uppercase": test(async () => good(bytename.toBytes("RIBMUG_HILMUN"))),
+        "dots": test(async () => good(bytename.toBytes("ribmug.hilmun"))),
+        "crushed": test(async () => good(bytename.toBytes("ribmughilmun"))),
+        "space": test(async () => good(bytename.toBytes("ribmug hilmun"))),
+        "spaces": test(async () => good(bytename.toBytes("ribmug  hilmun"))),
+        "whitespace": test(async () => good(bytename.toBytes("\n ribmug \n \t \n hilmun \n"))),
     }),
 });
 //# sourceMappingURL=bytename.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"bytename.test.js","sourceRoot":"","sources":["../../../s/data/bytename/bytename.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AACjC,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AACtC,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAC,MAAM,eAAe,CAAA;AAEnD,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;AAEzD,SAAS,IAAI,CAAC,KAAiB;IAC9B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;AACvC,CAAC;AAED,eAAe,OAAO,CAAC,KAAK,CAAC;IAC5B,sBAAsB,EAAE,IAAI,CAAC,KAAK,IAAG,EAAE;QACtC,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACzC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAA;QAChC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;IAC7B,CAAC,CAAC;IAEF,YAAY,EAAE,IAAI,CAAC,KAAK,IAAG,EAAE;QAC5B,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAA;QACnD,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;IACpB,CAAC,CAAC;IAEF,UAAU,EAAE,IAAI,CAAC,KAAK,IAAG,EAAE;QAC1B,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACvD,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC,CAAC;IAEF,WAAW,EAAE,IAAI,CAAC,KAAK,IAAG,EAAE;QAC3B,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAA;QACxD,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE;YACtC,SAAS,EAAE,CAAC;YACZ,cAAc,EAAE,GAAG;YACnB,aAAa,EAAE,GAAG;SAClB,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,6BAA6B,CAAC,CAAA;IAC/C,CAAC,CAAC;IAEF,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC;QACxB,YAAY,EAAE,IAAI,CAAC,KAAK,IAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QACtE,WAAW,EAAE,IAAI,CAAC,KAAK,IAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QACrE,MAAM,EAAE,IAAI,CAAC,KAAK,IAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QAChE,SAAS,EAAE,IAAI,CAAC,KAAK,IAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;QAClE,OAAO,EAAE,IAAI,CAAC,KAAK,IAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QACjE,QAAQ,EAAE,IAAI,CAAC,KAAK,IAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACnE,YAAY,EAAE,IAAI,CAAC,KAAK,IAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAC;KACrF,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"bytename.test.js","sourceRoot":"","sources":["../../../s/data/bytename/bytename.test.ts"],"names":[],"mappings":"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"}

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

@@ -4,11 +4,15 @@ export type ThumbprintOptions = {
     previewBytes: number;
 };
 export type ThumbprintData = {
-    bytes: Uint8Array;
-    thumbprint: string;
+    raw: Uint8Array;
+    full: string;
     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.
@@ -18,19 +22,36 @@ export type ThumbprintData = {
  *  - the sigil: "nodlyn.fasrep" (shorter part of the bytename)
  *  - originally designed to be a nice way to present 256-bit ids, but can actually represent any number of bytes
  */
+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;
+    };
+};
+/** @deprecated renamed to `thumbprint` */
 export declare const Thumbprint: {
     defaults: ThumbprintOptions;
-    toBytes(thumbprint: string): Uint8Array<ArrayBuffer>;
-    parse(thumbprint: string, options?: Partial<ThumbprintOptions>): ThumbprintData;
+    toBytes(tstring: string): Uint8Array<ArrayBuffer>;
+    parse(tstring: string, options?: Partial<ThumbprintOptions>): ThumbprintData;
     build: {
-        fromBytes(bytes: Uint8Array, options?: Partial<ThumbprintOptions>): ThumbprintData;
-        fromHex(hex: string, options?: Partial<ThumbprintOptions>): ThumbprintData;
+        fromBytes(raw: Uint8Array, options?: Partial<ThumbprintOptions>): ThumbprintData;
+        fromHex(hstring: string, options?: Partial<ThumbprintOptions>): ThumbprintData;
     };
-    toHex(thumbprint: string): string;
-    fromBytes(bytes: Uint8Array, options?: Partial<ThumbprintOptions>): string;
-    fromHex(hex: string, options?: Partial<ThumbprintOptions>): string;
+    toHex(tstring: string): string;
+    fromBytes(b: Uint8Array, options?: Partial<ThumbprintOptions>): string;
+    fromHex(h: string, options?: Partial<ThumbprintOptions>): string;
     sigil: {
-        fromHex(hex: string, options?: Partial<ThumbprintOptions>): string;
-        fromBytes(bytes: Uint8Array, options?: Partial<ThumbprintOptions>): string;
+        fromHex(h: string, options?: Partial<ThumbprintOptions>): string;
+        fromBytes(b: Uint8Array, options?: Partial<ThumbprintOptions>): string;
     };
 };