@nakanoaas/uuid58 1.2.2 → 1.2.3

package/README.md

@@ -280,7 +280,7 @@ This project uses [Vite+](https://viteplus.dev/) (`vp`) and pnpm.
 pnpm install
 pnpm check   # format, lint and type check
 pnpm test    # run tests
-pnpm bench   # run benchmarks
+pnpm bench   # build and benchmark (see bench/README.md)
 pnpm build   # build the npm package into dist/
 ```
 

package/dist/index.cjs

@@ -17,12 +17,6 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 * ```
 */
 const UUID58_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
-/**
-* @internal
-* The length of the Base58 alphabet as BigInt for encoding/decoding operations.
-* This is exported for internal use but not part of the public API.
-*/
-const UUID58_LENGTH = BigInt(58);
 // check.ts
 const MAX_UUID58 = "YcVfxkQb6JRzqk5kF2tNLv";
 /**
@@ -70,6 +64,35 @@ function isUuid58(uuid58) {
 const MAX_PREVIEW_LENGTH = 40;
 /**
 * @internal
+* 58^9, the largest power of 58 below 2^53. A 9-digit Base58 chunk therefore
+* fits in a Number, so most digit arithmetic can avoid slow BigInt division.
+*/
+const BASE58_CHUNK = 7427658739644928n;
+/** Appends `digits` Base58 digits of `value` (most significant first). */
+function appendDigits(out, value, digits) {
+	let chunk = "";
+	for (let i = 0; i < digits; i++) {
+		const quotient = Math.floor(value / 58);
+		chunk = UUID58_ALPHABET[value - quotient * 58] + chunk;
+		value = quotient;
+	}
+	return out + chunk;
+}
+/**
+* @internal
+* Encodes an unsigned 128-bit integer as a 22-character Base58 string.
+*
+* The value is split into 4 + 9 + 9 digit chunks with two BigInt divisions,
+* instead of 22 BigInt divisions (one per digit).
+*/
+function encodeUint128(num) {
+	const low = Number(num % BASE58_CHUNK);
+	num /= BASE58_CHUNK;
+	const mid = Number(num % BASE58_CHUNK);
+	return appendDigits(appendDigits(appendDigits("", Number(num / BASE58_CHUNK), 4), mid, 9), low, 9);
+}
+/**
+* @internal
 * Formats untrusted input for inclusion in an error message.
 *
 * The input is truncated so huge strings do not bloat error messages or logs,
@@ -81,8 +104,8 @@ function previewInput(input) {
 }
 // decode.ts
 var _Uuid58DecodeError;
-const BASE58_MAP = {};
-for (let i = 0; i < 58; i++) BASE58_MAP[UUID58_ALPHABET[i]] = BigInt(i);
+const BASE58_INDEX = (/* @__PURE__ */ new Int8Array(128)).fill(-1);
+for (let i = 0; i < 58; i++) BASE58_INDEX[UUID58_ALPHABET.charCodeAt(i)] = i;
 /**
 * Error thrown when an invalid Base58 string is provided for decoding.
 * This includes strings containing characters not in the Base58 alphabet.
@@ -109,10 +132,20 @@ _Uuid58DecodeError.prototype.name = "Uuid58DecodeError";
 function uuid58DecodeSafe(uuid58) {
 	if (uuid58.length !== 22) return new Uuid58DecodeError(`Expected Base58 string of length 22, but received string of length ${uuid58.length}: ${previewInput(uuid58)}`);
 	let num = 0n;
-	for (const char of uuid58) {
-		const index = BASE58_MAP[char];
-		if (index === void 0) return new Uuid58DecodeError(`Invalid Base58 character ${JSON.stringify(char)} found in input: ${previewInput(uuid58)}`);
-		num = num * UUID58_LENGTH + index;
+	for (let start = 0; start < 22;) {
+		const end = start === 0 ? 4 : start + 9;
+		let chunk = 0;
+		for (let i = start; i < end; i++) {
+			const code = uuid58.charCodeAt(i);
+			const index = code < 128 ? BASE58_INDEX[code] : -1;
+			if (index < 0) {
+				const char = String.fromCodePoint(uuid58.codePointAt(i));
+				return new Uuid58DecodeError(`Invalid Base58 character ${JSON.stringify(char)} found in input: ${previewInput(uuid58)}`);
+			}
+			chunk = chunk * 58 + index;
+		}
+		num = num * BASE58_CHUNK + BigInt(chunk);
+		start = end;
 	}
 	const hex = num.toString(16).padStart(32, "0");
 	if (hex.length !== 32) return new Uuid58DecodeError(`Decoded value exceeds 128 bits of UUID: ${previewInput(uuid58)}`);
@@ -170,13 +203,7 @@ function uuid58EncodeSafe(uuid) {
 	const hex = uuid.replace(/-/g, "");
 	if (hex.length !== 32) return new Uuid58EncodeError(`Invalid UUID length: expected 32 characters (excluding hyphens), got ${hex.length} characters in ${previewInput(uuid)}`);
 	if (!HEX32_REGEX.test(hex)) return new Uuid58EncodeError(`Invalid UUID format: ${previewInput(uuid)} contains non-hexadecimal characters`);
-	let num = BigInt("0x" + hex);
-	let encoded = "";
-	do {
-		encoded = UUID58_ALPHABET[Number(num % UUID58_LENGTH)] + encoded;
-		num /= UUID58_LENGTH;
-	} while (num > 0n);
-	return encoded.padStart(22, UUID58_ALPHABET[0]);
+	return encodeUint128(BigInt("0x" + hex));
 }
 /**
 * Converts a standard UUID string to a 22-character Base58-encoded format.
@@ -203,6 +230,7 @@ function uuid58Encode(uuid) {
 	return result;
 }
 // generate.ts
+const random = /* @__PURE__ */ new BigUint64Array(2);
 /**
 * Generates a new Base58-encoded UUID (always 22 characters).
 *
@@ -217,16 +245,10 @@ function uuid58Encode(uuid) {
 * ```
 */
 function uuid58() {
-	const bytes = crypto.getRandomValues(/* @__PURE__ */ new BigUint64Array(2));
-	bytes[0] = bytes[0] & 18446744073709490175n | 16384n;
-	bytes[1] = bytes[1] & 4611686018427387903n | 9223372036854775808n;
-	let num = bytes[0] << 64n | bytes[1];
-	let encoded = "";
-	do {
-		encoded = UUID58_ALPHABET[Number(num % UUID58_LENGTH)] + encoded;
-		num /= UUID58_LENGTH;
-	} while (num > 0n);
-	return encoded.padStart(22, UUID58_ALPHABET[0]);
+	crypto.getRandomValues(random);
+	const high = random[0] & 18446744073709490175n | 16384n;
+	const low = random[1] & 4611686018427387903n | 9223372036854775808n;
+	return encodeUint128(high << 64n | low);
 }
 exports.UUID58_ALPHABET = UUID58_ALPHABET;
 exports.UUID58_REGEX = UUID58_REGEX;

package/dist/index.js

@@ -16,12 +16,6 @@
 * ```
 */
 const UUID58_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
-/**
-* @internal
-* The length of the Base58 alphabet as BigInt for encoding/decoding operations.
-* This is exported for internal use but not part of the public API.
-*/
-const UUID58_LENGTH = BigInt(58);
 // check.ts
 const MAX_UUID58 = "YcVfxkQb6JRzqk5kF2tNLv";
 /**
@@ -69,6 +63,35 @@ function isUuid58(uuid58) {
 const MAX_PREVIEW_LENGTH = 40;
 /**
 * @internal
+* 58^9, the largest power of 58 below 2^53. A 9-digit Base58 chunk therefore
+* fits in a Number, so most digit arithmetic can avoid slow BigInt division.
+*/
+const BASE58_CHUNK = 7427658739644928n;
+/** Appends `digits` Base58 digits of `value` (most significant first). */
+function appendDigits(out, value, digits) {
+	let chunk = "";
+	for (let i = 0; i < digits; i++) {
+		const quotient = Math.floor(value / 58);
+		chunk = UUID58_ALPHABET[value - quotient * 58] + chunk;
+		value = quotient;
+	}
+	return out + chunk;
+}
+/**
+* @internal
+* Encodes an unsigned 128-bit integer as a 22-character Base58 string.
+*
+* The value is split into 4 + 9 + 9 digit chunks with two BigInt divisions,
+* instead of 22 BigInt divisions (one per digit).
+*/
+function encodeUint128(num) {
+	const low = Number(num % BASE58_CHUNK);
+	num /= BASE58_CHUNK;
+	const mid = Number(num % BASE58_CHUNK);
+	return appendDigits(appendDigits(appendDigits("", Number(num / BASE58_CHUNK), 4), mid, 9), low, 9);
+}
+/**
+* @internal
 * Formats untrusted input for inclusion in an error message.
 *
 * The input is truncated so huge strings do not bloat error messages or logs,
@@ -80,8 +103,8 @@ function previewInput(input) {
 }
 // decode.ts
 var _Uuid58DecodeError;
-const BASE58_MAP = {};
-for (let i = 0; i < 58; i++) BASE58_MAP[UUID58_ALPHABET[i]] = BigInt(i);
+const BASE58_INDEX = (/* @__PURE__ */ new Int8Array(128)).fill(-1);
+for (let i = 0; i < 58; i++) BASE58_INDEX[UUID58_ALPHABET.charCodeAt(i)] = i;
 /**
 * Error thrown when an invalid Base58 string is provided for decoding.
 * This includes strings containing characters not in the Base58 alphabet.
@@ -108,10 +131,20 @@ _Uuid58DecodeError.prototype.name = "Uuid58DecodeError";
 function uuid58DecodeSafe(uuid58) {
 	if (uuid58.length !== 22) return new Uuid58DecodeError(`Expected Base58 string of length 22, but received string of length ${uuid58.length}: ${previewInput(uuid58)}`);
 	let num = 0n;
-	for (const char of uuid58) {
-		const index = BASE58_MAP[char];
-		if (index === void 0) return new Uuid58DecodeError(`Invalid Base58 character ${JSON.stringify(char)} found in input: ${previewInput(uuid58)}`);
-		num = num * UUID58_LENGTH + index;
+	for (let start = 0; start < 22;) {
+		const end = start === 0 ? 4 : start + 9;
+		let chunk = 0;
+		for (let i = start; i < end; i++) {
+			const code = uuid58.charCodeAt(i);
+			const index = code < 128 ? BASE58_INDEX[code] : -1;
+			if (index < 0) {
+				const char = String.fromCodePoint(uuid58.codePointAt(i));
+				return new Uuid58DecodeError(`Invalid Base58 character ${JSON.stringify(char)} found in input: ${previewInput(uuid58)}`);
+			}
+			chunk = chunk * 58 + index;
+		}
+		num = num * BASE58_CHUNK + BigInt(chunk);
+		start = end;
 	}
 	const hex = num.toString(16).padStart(32, "0");
 	if (hex.length !== 32) return new Uuid58DecodeError(`Decoded value exceeds 128 bits of UUID: ${previewInput(uuid58)}`);
@@ -169,13 +202,7 @@ function uuid58EncodeSafe(uuid) {
 	const hex = uuid.replace(/-/g, "");
 	if (hex.length !== 32) return new Uuid58EncodeError(`Invalid UUID length: expected 32 characters (excluding hyphens), got ${hex.length} characters in ${previewInput(uuid)}`);
 	if (!HEX32_REGEX.test(hex)) return new Uuid58EncodeError(`Invalid UUID format: ${previewInput(uuid)} contains non-hexadecimal characters`);
-	let num = BigInt("0x" + hex);
-	let encoded = "";
-	do {
-		encoded = UUID58_ALPHABET[Number(num % UUID58_LENGTH)] + encoded;
-		num /= UUID58_LENGTH;
-	} while (num > 0n);
-	return encoded.padStart(22, UUID58_ALPHABET[0]);
+	return encodeUint128(BigInt("0x" + hex));
 }
 /**
 * Converts a standard UUID string to a 22-character Base58-encoded format.
@@ -202,6 +229,7 @@ function uuid58Encode(uuid) {
 	return result;
 }
 // generate.ts
+const random = /* @__PURE__ */ new BigUint64Array(2);
 /**
 * Generates a new Base58-encoded UUID (always 22 characters).
 *
@@ -216,15 +244,9 @@ function uuid58Encode(uuid) {
 * ```
 */
 function uuid58() {
-	const bytes = crypto.getRandomValues(/* @__PURE__ */ new BigUint64Array(2));
-	bytes[0] = bytes[0] & 18446744073709490175n | 16384n;
-	bytes[1] = bytes[1] & 4611686018427387903n | 9223372036854775808n;
-	let num = bytes[0] << 64n | bytes[1];
-	let encoded = "";
-	do {
-		encoded = UUID58_ALPHABET[Number(num % UUID58_LENGTH)] + encoded;
-		num /= UUID58_LENGTH;
-	} while (num > 0n);
-	return encoded.padStart(22, UUID58_ALPHABET[0]);
+	crypto.getRandomValues(random);
+	const high = random[0] & 18446744073709490175n | 16384n;
+	const low = random[1] & 4611686018427387903n | 9223372036854775808n;
+	return encodeUint128(high << 64n | low);
 }
 export { UUID58_ALPHABET, UUID58_REGEX, Uuid58DecodeError, Uuid58EncodeError, isUuid58, uuid58, uuid58Decode, uuid58DecodeSafe, uuid58Encode, uuid58EncodeSafe };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nakanoaas/uuid58",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A tiny, zero-dependency library for generating and converting UUIDs to Base58-encoded strings.",
   "bugs": {
     "url": "https://github.com/nakanoasaservice/uuid58/issues"
@@ -35,7 +35,8 @@
     "build": "vp pack",
     "check": "vp check",
     "test": "vp test run",
-    "bench": "vp test bench --run",
+    "bench": "vp pack && vp test bench --run --reporter=default",
+    "bench:baseline": "sh bench/save-baseline.sh",
     "jsr:dry-run": "vp pack && jsr publish --dry-run"
   },
   "devDependencies": {