2.0.0

Author: bddjr

.github/workflows/npm-publish.yml

@@ -16,7 +16,7 @@ jobs:
 
       - uses: actions/setup-node@v6
         with:
-          node-version: "26"
+          node-version: "latest"
           check-latest: true
 
       - name: Setup pnpm

.github/workflows/test.yml

@@ -11,17 +11,14 @@ on:
 
 jobs:
   test:
-    strategy:
-      matrix:
-        node-version: ["26", "22.0.0"]
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v6
 
       - uses: actions/setup-node@v6
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: "latest"
           check-latest: true
 
       - name: Setup pnpm
@@ -30,4 +27,11 @@ jobs:
           version: "11"
 
       - run: pnpm i
-      - run: pnpm test
+
+      - run: npm test
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: "12.0.0"
+
+      - run: npm run test-only-node12

README.md

@@ -10,57 +10,75 @@ npm i @bddjr/base64
 import base64 from "@bddjr/base64"
 
 // Encode string to base64
-var enc = base64.encode("Hello world!")
+var enc = base64.encode("👋Hello!")
 console.log(enc)
 
 // Decode base64 to string
-var dec = base64.decodeToString("SGVsbG8gd29ybGQh")
+var dec = base64.decodeToString("8J+Ri0hlbGxvIQ==")
 console.log(dec)
 
 // Encode Uint8Array to base64
 var enc = base64.encode(new Uint8Array(16))
 console.log(enc)
 
 // Decode base64 to Uint8Array
-var dec = base64.decode("nszai3rv7QBp+Co0SgB93g==")
+var dec = base64.decode("nszai3rv7QBp+/o0SgB93g==")
 console.log(dec)
 
 
+
 // Encode string to base64url
-var enc = base64.encodeurl("Hello world!")
+var enc = base64.encodeurl("👋你好")
 console.log(enc)
 
 // Decode base64url to string
-var dec = base64.decodeurlToString("SGVsbG8gd29ybGQh")
+var dec = base64.decodeurlToString("8J-Ri-S9oOWlvQ==")
 console.log(dec)
 
 // Encode Uint8Array to base64url
 var enc = base64.encodeurl(new Uint8Array(16))
 console.log(enc)
 
 // Decode base64url to Uint8Array
-var dec = base64.decodeurl("dBZ7uNJ0D6_EbZwZnQcEBA==")
+var dec = base64.decodeurl("dBZ7uNJ0D-_EbZwZnQcEBA==")
 console.log(dec)
+
+
+
+// Encode to base64 omit padding characters (=)
+var enc = base64.encode("omit", true)
+console.log(enc) // b21pdA
+
+// Encode to base64url omit padding characters (=)
+var enc = base64.encodeurl("omit", true)
+console.log(enc)
 ```
 
 You can also use `@bddjr/base64/make` to create an encoder/decoder with a custom alphabet:
 
-```js
+```ts
 import {
     make_bytesToBase64,
-    make_base64ToBytes,
     make_encode,
     make_decode,
     make_decodeToString,
 } from "@bddjr/base64/make"
 
 // base64-no-upper-case
-const alphabet = "!#$%&()*,-.:;<>?@[]^_`{|}~abcdefghijklmnopqrstuvwxyz0123456789+/"
-
-const _bytesToBase64 = make_bytesToBase64(alphabet)
-const encode = make_encode(_bytesToBase64)
-
-const _base64ToBytes = make_base64ToBytes(alphabet)
-const decode = make_decode(_base64ToBytes)
-const decodeToString = make_decodeToString(decode)
+export const alphabet = "!#$%&()*,-.:;<>?@[]^_`{|}~abcdefghijklmnopqrstuvwxyz0123456789+/"
+
+export const _bytesToBase64 = /*@__PURE__*/ make_bytesToBase64(alphabet)
+export const encode = /*@__PURE__*/ make_encode(_bytesToBase64)
+
+export const decode = /*@__PURE__*/ make_decode(alphabet)
+export const decodeToString = /*@__PURE__*/ make_decodeToString(decode)
+
+const base64custom = {
+    alphabet: alphabet as typeof alphabet, // TypeScript
+    _bytesToBase64,
+    encode,
+    decode,
+    decodeToString,
+}
+export default base64custom
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bddjr/base64",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "A high-performance Base64 and Base64url library, featuring automatic native API acceleration, and support for custom alphabets.",
   "type": "module",
   "main": "./dist/main.js",
@@ -12,19 +12,20 @@
     "./make": {
       "types": "./dist/make.d.ts",
       "default": "./dist/make.js"
-    },
-    "./type": {
-      "types": "./type.d.ts"
     }
   },
+  "engines": {
+    "node": ">=12.0.0"
+  },
   "scripts": {
     "build": "rimraf dist && tsc",
-    "test": "node --run build && node scripts/test.mjs && node scripts/test-buffer.mjs && node scripts/test-fallback.mjs",
-    "prepublishOnly": "node --run test"
+    "test": "npm run build && npm run test-only",
+    "test-only": "node scripts/test.mjs && node scripts/test-buffer.mjs && node scripts/test-fallback.mjs",
+    "test-only-node12":"node --experimental-modules scripts/test.mjs && node --experimental-modules scripts/test-fallback.mjs",
+    "prepublishOnly": "npm test"
   },
   "files": [
-    "dist",
-    "type.d.ts"
+    "dist"
   ],
   "repository": {
     "type": "git",
@@ -51,7 +52,7 @@
   },
   "devDependencies": {
     "@bddjr/rimraf": "^0.1.1",
-    "@types/node": "^24.12.2",
+    "@types/node": "^20.0.0",
     "typescript": "^6.0.3"
   }
-}
+}

pnpm-lock.yaml

@@ -1,6 +1,9 @@
-if (Uint8Array.fromBase64) {
-    console.log('test-buffer')
-    delete Uint8Array.fromBase64
-    delete Uint8Array.prototype.toBase64
-    await import('./test.mjs')
-}
+console.log('test-buffer')
+if (!Uint8Array.fromBase64) {
+    console.log('skip')
+    console.log()
+    process.exit()
+}
+delete Uint8Array.fromBase64
+delete Uint8Array.prototype.toBase64
+import('./test.mjs')

scripts/test-buffer.mjs

@@ -2,4 +2,4 @@ console.log('test-fallback')
 delete global.Buffer
 delete Uint8Array.fromBase64
 delete Uint8Array.prototype.toBase64
-await import('./test.mjs')
+import('./test.mjs')

scripts/test-fallback.mjs

@@ -2,6 +2,17 @@ import base64 from '../dist/main.js'
 
 let allSuccess = true
 
+/**
+ * @param {number} length 
+ */
+function randBytes(length) {
+    const b = new Uint8Array(length)
+    for (let i = b.length; i;) {
+        b[--i] = Math.random() * 256
+    }
+    return b
+}
+
 /**
  * @param {{
  *  encode: typeof base64.encode
@@ -16,10 +27,15 @@ function test(base64, omitPadding) {
      */
     function test2(v) {
         console.log('------------------')
+        console.log('omitPadding:', omitPadding)
         console.log(v)
         const enc = base64.encode(v, omitPadding)
         console.log(enc)
-        if (omitPadding && enc.endsWith('=')) process.exit(1);
+        if (omitPadding || v.length % 3 === 0) {
+            if (enc.endsWith('=')) process.exit(1)
+        } else if (!enc.endsWith('='.repeat(3 - (v.length % 3)))) {
+            process.exit(1)
+        }
         var isEqual = false
         if (typeof v == 'string') {
             const dec = base64.decodeToString(enc)
@@ -36,20 +52,29 @@ function test(base64, omitPadding) {
                 return true
             })()
         }
-        allSuccess &&= isEqual
+        if (!isEqual) allSuccess = false;
         console.log('equal:', isEqual)
         isEqual || process.exit(1)
     }
 
     test2("Hello world!")
+    test2("👋Hello!")
+    test2("👋你好")
+    test2("")
+    test2("1")
+    test2("12")
+    test2("123")
+    test2("1234")
+    test2("12345")
     test2("123456")
     test2("1234567")
     test2("12345678")
-    test2(crypto.getRandomValues(new Uint8Array(12)))
-    test2(crypto.getRandomValues(new Uint8Array(13)))
-    test2(crypto.getRandomValues(new Uint8Array(14)))
-    test2(crypto.getRandomValues(new Uint8Array(15)))
-    test2(crypto.getRandomValues(new Uint8Array(16)))
+    test2("12345678 ")
+    test2(randBytes(12))
+    test2(randBytes(13))
+    test2(randBytes(14))
+    test2(randBytes(15))
+    test2(randBytes(16))
 }
 
 for (const omitPadding of [false, true]) {
@@ -61,6 +86,21 @@ for (const omitPadding of [false, true]) {
     }, omitPadding);
 }
 
+console.log('------------------')
+console.log(base64.decode('x\t\n\f\r x'))
+console.log(base64.decode('xx\t\n\f\r '))
+
+for (const str of ['x', 'x===', '?', 'vvvvX', 'xx==x', 'xx==xx', 'xx=']) {
+    console.log('------------------')
+    console.log(`decode invalid base64: ${str}`)
+    try {
+        const v = base64.decode(str)
+        console.log(v)
+        process.exit(1)
+    } catch (e) {
+        console.log(e)
+    }
+}
 
 console.log('------------------')
 console.log('allSuccess:', allSuccess)