effect 4.0.6 → 4.1.0

package/src/encoding/Base64.ts

@@ -148,6 +148,16 @@ export const decode = (str: string): Result.Result<Uint8Array, EncodingError> =>
 export const decodeString = (str: string) => Result.map(decode(str), (_) => decoder.decode(_))
 
 const encodeBytes = (bytes: Uint8Array): string => {
+  const length = bytes.length
+  // Looked up on the prototype at call time, so own or subclass overrides are ignored.
+  const toBase64 = (Uint8Array.prototype as { readonly toBase64?: (this: Uint8Array) => string }).toBase64
+  // The size guard also keeps detached buffers (length 0) away from native `toBase64`, which throws on them.
+  if (length >= 32 && typeof toBase64 === "function") return toBase64.call(bytes)
+  // Below ~128 bytes, appending to a string beats filling a byte array and decoding it once.
+  return length < 128 ? encodeShort(bytes) : encodeLong(bytes)
+}
+
+const encodeShort = (bytes: Uint8Array): string => {
   const length = bytes.length
   let result = ""
   let i: number
@@ -171,10 +181,38 @@ const encodeBytes = (bytes: Uint8Array): string => {
   return result
 }
 
+const encodeLong = (bytes: Uint8Array): string => {
+  const length = bytes.length
+  const result = new Uint8Array(Math.ceil(length / 3) * 4)
+  let i: number
+  let j = 0
+  for (i = 2; i < length; i += 3, j += 4) {
+    result[j] = alphabetCodes[bytes[i - 2] >> 2]
+    result[j + 1] = alphabetCodes[((bytes[i - 2] & 0x03) << 4) | (bytes[i - 1] >> 4)]
+    result[j + 2] = alphabetCodes[((bytes[i - 1] & 0x0f) << 2) | (bytes[i] >> 6)]
+    result[j + 3] = alphabetCodes[bytes[i] & 0x3f]
+  }
+  if (i === length + 1) {
+    result[j] = alphabetCodes[bytes[i - 2] >> 2]
+    result[j + 1] = alphabetCodes[(bytes[i - 2] & 0x03) << 4]
+    result[j + 2] = paddingCode
+    result[j + 3] = paddingCode
+  }
+  if (i === length) {
+    result[j] = alphabetCodes[bytes[i - 2] >> 2]
+    result[j + 1] = alphabetCodes[((bytes[i - 2] & 0x03) << 4) | (bytes[i - 1] >> 4)]
+    result[j + 2] = alphabetCodes[(bytes[i - 1] & 0x0f) << 2]
+    result[j + 3] = paddingCode
+  }
+  return decoder.decode(result)
+}
+
 const encoder = new TextEncoder()
 const decoder = new TextDecoder()
 const stripCrlf = (str: string) => str.replace(/[\n\r]/g, "")
 const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+const alphabetCodes = encoder.encode(alphabet)
+const paddingCode = "=".charCodeAt(0)
 const codes = new Uint8Array(123).fill(255)
 for (let i = 0; i < alphabet.length; i++) codes[alphabet.charCodeAt(i)] = i
 codes["=".charCodeAt(0)] = 0

package/src/encoding/Base64Url.ts

@@ -102,13 +102,16 @@ export const encodePadded: (input: Uint8Array | string) => string = (input) =>
 export const decode = (str: string): Result.Result<Uint8Array, EncodingError> => {
   const stripped = str.replace(/[\n\r]/g, "")
   const length = stripped.length
-  if (length % 4 === 1) {
+  const padded = stripped.endsWith("=")
+  if (padded ? length % 4 !== 0 : length % 4 === 1) {
     return Result.fail(
       new EncodingError({
         module: "Base64Url",
         kind: "Decode",
         input: stripped,
-        message: `Length should be a multiple of 4, but is ${length}`
+        message: padded
+          ? `Padded length should be a multiple of 4, but is ${length}`
+          : `Unpadded length should not be 1 more than a multiple of 4, but is ${length}`
       })
     )
   }