fix: address review feedback

Author: rvagg

package.json

@@ -83,7 +83,8 @@
     },
     "./bases/base45": {
       "types": "./dist/src/bases/base45.d.ts",
-      "import": "./dist/src/bases/base45.js"
+      "import": "./dist/src/bases/base45.js",
+      "module-sync": "./dist/src/bases/base45.js"
     },
     "./bases/base58": {
       "types": "./dist/src/bases/base58.d.ts",

src/bases/base45.ts

@@ -1,13 +1,25 @@
 import { from } from './base.ts'
 
 const alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:'
+const INVALID = 0xff
+const decodeTable = (() => {
+  const table = new Uint8Array(256).fill(INVALID)
+  for (let i = 0; i < alphabet.length; i++) {
+    const code = alphabet.charCodeAt(i)
+    table[code] = i
+    if (code >= 0x41 && code <= 0x5a) {
+      table[code + 0x20] = i
+    }
+  }
+  return table
+})()
 
-function indexOf (char: string): number {
-  const index = alphabet.indexOf(char)
-  if (index === -1) {
-    throw new Error(`Non-base45 character: ${char}`)
+function decodeChar (input: string, i: number): number {
+  const v = decodeTable[input.charCodeAt(i)]
+  if (v === INVALID) {
+    throw new Error(`Non-base45 character: ${input[i]}`)
   }
-  return index
+  return v
 }
 
 export const base45 = from({
@@ -18,33 +30,35 @@ export const base45 = from({
     for (let i = 0; i < input.length; i += 2) {
       if (i + 1 === input.length) {
         const v = input[i]
-        const a = v / 45 | 0
-        const b = v % 45 | 0
-        ret += alphabet[b] + alphabet[a]
+        ret += alphabet[v % 45] + alphabet[(v / 45) | 0]
         break
       }
-      const v = input[i] << 8 | input[i + 1]
-      const a = v / 45 ** 2 | 0
-      const b = v / 45 % 45 | 0
-      const c = v % 45
-      ret += alphabet[c] + alphabet[b] + alphabet[a]
+      const v = (input[i] << 8) | input[i + 1]
+      ret += alphabet[v % 45] + alphabet[((v / 45) | 0) % 45] + alphabet[(v / 2025) | 0]
     }
     return ret
   },
   decode: (input: string): Uint8Array<ArrayBuffer> => {
     if ((input.length * 2) % 3 === 2) {
       throw new Error('Unexpected end of data')
     }
-    const out = new Uint8Array(Math.floor(input.length * 2 / 3))
+    const out = new Uint8Array(((input.length * 2) / 3) | 0)
+    let o = 0
     for (let i = 0; i < input.length; i += 3) {
       if (i + 2 === input.length) {
-        const v = indexOf(input[i]) + indexOf(input[i + 1]) * 45
-        out[i / 3 * 2] = v
+        const v = decodeChar(input, i) + decodeChar(input, i + 1) * 45
+        if (v > 0xff) {
+          throw new Error('Invalid base45 encoding: trailing chunk out of range')
+        }
+        out[o++] = v
         break
       }
-      const v = indexOf(input[i]) + indexOf(input[i + 1]) * 45 + indexOf(input[i + 2]) * 45 ** 2
-      out[i / 3 * 2] = v >> 8
-      out[i / 3 * 2 + 1] = v & 0xff
+      const v = decodeChar(input, i) + decodeChar(input, i + 1) * 45 + decodeChar(input, i + 2) * 2025
+      if (v > 0xffff) {
+        throw new Error('Invalid base45 encoding: chunk out of range')
+      }
+      out[o++] = v >> 8
+      out[o++] = v & 0xff
     }
     return out
   }

test/test-multibase-spec.spec.ts

@@ -194,4 +194,16 @@ describe('spec test', () => {
     // not enough input chars, should be multiple of 3 or multiple of 3 + 2
     assert.throws(() => bases.base45.decode('R%69 VD92EX'), 'Unexpected end of data')
   })
+
+  // RFC9285 section 6: encoded chunks must lie within the byte ranges they
+  // represent; 3-char chunks decode to a 16-bit value, 2-char trailers to 8-bit.
+  for (const input of ['RGGW', 'R:::', 'R000V5', 'R000::']) {
+    it(`base45 should fail with out-of-range encoding [${input}]`, () => {
+      assert.throws(() => bases.base45.decode(input), 'Invalid base45 encoding')
+    })
+  }
+
+  it('base45 should decode case-insensitively', () => {
+    assert.deepStrictEqual(bases.base45.decode('R+8d vd82ek4f.kea2'), fromString('hello world'))
+  })
 })