js-base64 3.4.4 → 3.5.2

package/README.md

@@ -6,9 +6,9 @@ Yet another [Base64] transcoder.
 
 [Base64]: http://en.wikipedia.org/wiki/Base64
 
-## HEADS UP: switch to TypeScript since version 3.3
+## HEADS UP
 
-In version 3.0 `js-base64` switch to ES2015 module.  That made it easy to switch to TypeScript(just renaming `base64.mjs` to `base64.ts` was almost enough).  Now `base64.mjs` is compiled from `base64.ts` then `base64.js` is generated from `base64.mjs`.
+In version 3.0 `js-base64` switch to ES2015 module so it is no longer compatible with legacy browsers like IE (see below).  And since version 3.3 it is written in TypeScript.  Now `base64.mjs` is compiled from `base64.ts` then `base64.js` is generated from `base64.mjs`.
 
 ## Install
 
@@ -29,7 +29,7 @@ Locally…
 … or Directly from CDN.  In which case you don't even need to install.
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/js-base64@3.4.4/base64.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/js-base64@3.5.2/base64.min.js"></script>
 ```
 
 This good old way loads `Base64` in the global context (`window`).  Though `Base64.noConflict()` is made available, you should consider using ES6 Module to avoid tainting `window`.
@@ -52,14 +52,14 @@ or even remotely.
 ```html
 <script type="module">
 // note jsdelivr.net does not automatically minify .mjs
-import { Base64 } from 'https://cdn.jsdelivr.net/npm/js-base64@3.4.4/base64.mjs';
+import { Base64 } from 'https://cdn.jsdelivr.net/npm/js-base64@3.5.2/base64.mjs';
 </script>
 ```
 
 ```html
 <script type="module">
 // or if you prefer no Base64 namespace
-import { encode, decode } from 'https://cdn.jsdelivr.net/npm/js-base64@3.4.4/base64.mjs';
+import { encode, decode } from 'https://cdn.jsdelivr.net/npm/js-base64@3.5.2/base64.mjs';
 </script>
 ```
 
@@ -80,7 +80,6 @@ require=require('esm')(module);
 import {Base64} from 'js-base64';
 ```
 
-
 ## SYNOPSIS
 
 ```javascript

package/base64.d.ts

@@ -9,11 +9,11 @@
  *
  * @author Dan Kogai (https://github.com/dankogai)
  */
-declare const version = "3.4.4";
+declare const version = "3.5.2";
 /**
  * @deprecated use lowercase `version`.
  */
-declare const VERSION = "3.4.4";
+declare const VERSION = "3.5.2";
 /**
  * polyfill version of `btoa`
  */
@@ -35,7 +35,7 @@ declare const fromUint8Array: (u8a: Uint8Array, urlsafe?: boolean) => string;
  * @param {string} src UTF-8 string
  * @returns {string} UTF-16 string
  */
-declare const utob: (src: string) => string;
+declare const utob: (u: string) => string;
 /**
  * converts a UTF-8-encoded string to a Base64 string.
  * @param {boolean} [urlsafe] if `true` make the result URL-safe
@@ -52,7 +52,7 @@ declare const encodeURI: (src: string) => string;
  * @param {string} src UTF-16 string
  * @returns {string} UTF-8 string
  */
-declare const btou: (src: string) => string;
+declare const btou: (b: string) => string;
 /**
  * polyfill version of `atob`
  */
@@ -63,16 +63,16 @@ declare const atobPolyfill: (asc: string) => string;
  * @returns {string} binary string
  */
 declare const _atob: (asc: string) => string;
+/**
+ * converts a Base64 string to a Uint8Array.
+ */
+declare const toUint8Array: (a: string) => Uint8Array;
 /**
  * converts a Base64 string to a UTF-8 string.
  * @param {String} src Base64 string.  Both normal and URL-safe are supported
  * @returns {string} UTF-8 string
  */
 declare const decode: (src: string) => string;
-/**
- * converts a Base64 string to a Uint8Array.
- */
-declare const toUint8Array: (a: string) => any;
 /**
  * extend String.prototype with relevant methods
  */
@@ -97,11 +97,11 @@ declare const gBase64: {
     encode: (src: string, urlsafe?: boolean) => string;
     encodeURI: (src: string) => string;
     encodeURL: (src: string) => string;
-    utob: (src: string) => string;
-    btou: (src: string) => string;
+    utob: (u: string) => string;
+    btou: (b: string) => string;
     decode: (src: string) => string;
     fromUint8Array: (u8a: Uint8Array, urlsafe?: boolean) => string;
-    toUint8Array: (a: string) => any;
+    toUint8Array: (a: string) => Uint8Array;
     extendString: () => void;
     extendUint8Array: () => void;
     extendBuiltins: () => void;

package/base64.js

@@ -40,7 +40,7 @@
  *
  * @author Dan Kogai (https://github.com/dankogai)
  */
-const version = '3.4.4';
+const version = '3.5.2';
 /**
  * @deprecated use lowercase `version`.
  */
@@ -48,6 +48,8 @@ const VERSION = version;
 const _hasatob = typeof atob === 'function';
 const _hasbtoa = typeof btoa === 'function';
 const _hasBuffer = typeof Buffer === 'function';
+const _TD = typeof TextDecoder === 'function' ? new TextDecoder() : undefined;
+const _TE = typeof TextEncoder === 'function' ? new TextEncoder() : undefined;
 const b64ch = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 const b64chs = [...b64ch];
 const b64tab = ((a) => {
@@ -101,7 +103,7 @@ const _fromUint8Array = _hasBuffer
         for (let i = 0, l = u8a.length; i < l; i += maxargs) {
             strs.push(_fromCC.apply(null, u8a.subarray(i, i + maxargs)));
         }
-        return btoa(strs.join(''));
+        return _btoa(strs.join(''));
     };
 /**
  * converts a Uint8Array to a Base64 string.
@@ -109,16 +111,42 @@ const _fromUint8Array = _hasBuffer
  * @returns {string} Base64 string
  */
 const fromUint8Array = (u8a, urlsafe = false) => urlsafe ? _mkUriSafe(_fromUint8Array(u8a)) : _fromUint8Array(u8a);
+// This trick is found broken https://github.com/dankogai/js-base64/issues/130
+// const utob = (src: string) => unescape(encodeURIComponent(src));
+// reverting good old fationed regexp
+const cb_utob = (c) => {
+    if (c.length < 2) {
+        var cc = c.charCodeAt(0);
+        return cc < 0x80 ? c
+            : cc < 0x800 ? (_fromCC(0xc0 | (cc >>> 6))
+                + _fromCC(0x80 | (cc & 0x3f)))
+                : (_fromCC(0xe0 | ((cc >>> 12) & 0x0f))
+                    + _fromCC(0x80 | ((cc >>> 6) & 0x3f))
+                    + _fromCC(0x80 | (cc & 0x3f)));
+    }
+    else {
+        var cc = 0x10000
+            + (c.charCodeAt(0) - 0xD800) * 0x400
+            + (c.charCodeAt(1) - 0xDC00);
+        return (_fromCC(0xf0 | ((cc >>> 18) & 0x07))
+            + _fromCC(0x80 | ((cc >>> 12) & 0x3f))
+            + _fromCC(0x80 | ((cc >>> 6) & 0x3f))
+            + _fromCC(0x80 | (cc & 0x3f)));
+    }
+};
+const re_utob = /[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;
 /**
  * @deprecated should have been internal use only.
  * @param {string} src UTF-8 string
  * @returns {string} UTF-16 string
  */
-const utob = (src) => unescape(encodeURIComponent(src));
+const utob = (u) => u.replace(re_utob, cb_utob);
 //
 const _encode = _hasBuffer
     ? (s) => Buffer.from(s, 'utf8').toString('base64')
-    : (s) => _btoa(utob(s));
+    : _TE
+        ? (s) => _fromUint8Array(_TE.encode(s))
+        : (s) => _btoa(utob(s));
 /**
  * converts a UTF-8-encoded string to a Base64 string.
  * @param {boolean} [urlsafe] if `true` make the result URL-safe
@@ -132,12 +160,34 @@ const encode = (src, urlsafe = false) => urlsafe
  * @returns {string} Base64 string
  */
 const encodeURI = (src) => encode(src, true);
+// This trick is found broken https://github.com/dankogai/js-base64/issues/130
+// const btou = (src: string) => decodeURIComponent(escape(src));
+// reverting good old fationed regexp
+const re_btou = /[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3}/g;
+const cb_btou = (cccc) => {
+    switch (cccc.length) {
+        case 4:
+            var cp = ((0x07 & cccc.charCodeAt(0)) << 18)
+                | ((0x3f & cccc.charCodeAt(1)) << 12)
+                | ((0x3f & cccc.charCodeAt(2)) << 6)
+                | (0x3f & cccc.charCodeAt(3)), offset = cp - 0x10000;
+            return (_fromCC((offset >>> 10) + 0xD800)
+                + _fromCC((offset & 0x3FF) + 0xDC00));
+        case 3:
+            return _fromCC(((0x0f & cccc.charCodeAt(0)) << 12)
+                | ((0x3f & cccc.charCodeAt(1)) << 6)
+                | (0x3f & cccc.charCodeAt(2)));
+        default:
+            return _fromCC(((0x1f & cccc.charCodeAt(0)) << 6)
+                | (0x3f & cccc.charCodeAt(1)));
+    }
+};
 /**
  * @deprecated should have been internal use only.
  * @param {string} src UTF-16 string
  * @returns {string} UTF-8 string
  */
-const btou = (src) => decodeURIComponent(escape(src));
+const btou = (b) => b.replace(re_btou, cb_btou);
 /**
  * polyfill version of `atob`
  */
@@ -167,9 +217,20 @@ const atobPolyfill = (asc) => {
 const _atob = _hasatob ? (asc) => atob(_tidyB64(asc))
     : _hasBuffer ? (asc) => Buffer.from(asc, 'base64').toString('binary')
         : atobPolyfill;
+//
+const _toUint8Array = _hasBuffer
+    ? (a) => _U8Afrom(Buffer.from(a, 'base64'))
+    : (a) => _U8Afrom(_atob(a), c => c.charCodeAt(0));
+/**
+ * converts a Base64 string to a Uint8Array.
+ */
+const toUint8Array = (a) => _toUint8Array(_unURI(a));
+//
 const _decode = _hasBuffer
     ? (a) => Buffer.from(a, 'base64').toString('utf8')
-    : (a) => btou(_atob(a));
+    : _TD
+        ? (a) => _TD.decode(_toUint8Array(a))
+        : (a) => btou(_atob(a));
 const _unURI = (a) => _tidyB64(a.replace(/[-_]/g, (m0) => m0 == '-' ? '+' : '/'));
 /**
  * converts a Base64 string to a UTF-8 string.
@@ -177,12 +238,7 @@ const _unURI = (a) => _tidyB64(a.replace(/[-_]/g, (m0) => m0 == '-' ? '+' : '/')
  * @returns {string} UTF-8 string
  */
 const decode = (src) => _decode(_unURI(src));
-/**
- * converts a Base64 string to a Uint8Array.
- */
-const toUint8Array = _hasBuffer
-    ? (a) => _U8Afrom(Buffer.from(_unURI(a), 'base64'))
-    : (a) => _U8Afrom(_atob(_unURI(a)), c => c.charCodeAt(0));
+//
 const _noEnum = (v) => {
     return {
         value: v, enumerable: false, writable: true, configurable: true

package/base64.mjs

@@ -9,7 +9,7 @@
  *
  * @author Dan Kogai (https://github.com/dankogai)
  */
-const version = '3.4.4';
+const version = '3.5.2';
 /**
  * @deprecated use lowercase `version`.
  */
@@ -17,6 +17,8 @@ const VERSION = version;
 const _hasatob = typeof atob === 'function';
 const _hasbtoa = typeof btoa === 'function';
 const _hasBuffer = typeof Buffer === 'function';
+const _TD = typeof TextDecoder === 'function' ? new TextDecoder() : undefined;
+const _TE = typeof TextEncoder === 'function' ? new TextEncoder() : undefined;
 const b64ch = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 const b64chs = [...b64ch];
 const b64tab = ((a) => {
@@ -70,7 +72,7 @@ const _fromUint8Array = _hasBuffer
         for (let i = 0, l = u8a.length; i < l; i += maxargs) {
             strs.push(_fromCC.apply(null, u8a.subarray(i, i + maxargs)));
         }
-        return btoa(strs.join(''));
+        return _btoa(strs.join(''));
     };
 /**
  * converts a Uint8Array to a Base64 string.
@@ -78,16 +80,42 @@ const _fromUint8Array = _hasBuffer
  * @returns {string} Base64 string
  */
 const fromUint8Array = (u8a, urlsafe = false) => urlsafe ? _mkUriSafe(_fromUint8Array(u8a)) : _fromUint8Array(u8a);
+// This trick is found broken https://github.com/dankogai/js-base64/issues/130
+// const utob = (src: string) => unescape(encodeURIComponent(src));
+// reverting good old fationed regexp
+const cb_utob = (c) => {
+    if (c.length < 2) {
+        var cc = c.charCodeAt(0);
+        return cc < 0x80 ? c
+            : cc < 0x800 ? (_fromCC(0xc0 | (cc >>> 6))
+                + _fromCC(0x80 | (cc & 0x3f)))
+                : (_fromCC(0xe0 | ((cc >>> 12) & 0x0f))
+                    + _fromCC(0x80 | ((cc >>> 6) & 0x3f))
+                    + _fromCC(0x80 | (cc & 0x3f)));
+    }
+    else {
+        var cc = 0x10000
+            + (c.charCodeAt(0) - 0xD800) * 0x400
+            + (c.charCodeAt(1) - 0xDC00);
+        return (_fromCC(0xf0 | ((cc >>> 18) & 0x07))
+            + _fromCC(0x80 | ((cc >>> 12) & 0x3f))
+            + _fromCC(0x80 | ((cc >>> 6) & 0x3f))
+            + _fromCC(0x80 | (cc & 0x3f)));
+    }
+};
+const re_utob = /[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;
 /**
  * @deprecated should have been internal use only.
  * @param {string} src UTF-8 string
  * @returns {string} UTF-16 string
  */
-const utob = (src) => unescape(encodeURIComponent(src));
+const utob = (u) => u.replace(re_utob, cb_utob);
 //
 const _encode = _hasBuffer
     ? (s) => Buffer.from(s, 'utf8').toString('base64')
-    : (s) => _btoa(utob(s));
+    : _TE
+        ? (s) => _fromUint8Array(_TE.encode(s))
+        : (s) => _btoa(utob(s));
 /**
  * converts a UTF-8-encoded string to a Base64 string.
  * @param {boolean} [urlsafe] if `true` make the result URL-safe
@@ -101,12 +129,34 @@ const encode = (src, urlsafe = false) => urlsafe
  * @returns {string} Base64 string
  */
 const encodeURI = (src) => encode(src, true);
+// This trick is found broken https://github.com/dankogai/js-base64/issues/130
+// const btou = (src: string) => decodeURIComponent(escape(src));
+// reverting good old fationed regexp
+const re_btou = /[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3}/g;
+const cb_btou = (cccc) => {
+    switch (cccc.length) {
+        case 4:
+            var cp = ((0x07 & cccc.charCodeAt(0)) << 18)
+                | ((0x3f & cccc.charCodeAt(1)) << 12)
+                | ((0x3f & cccc.charCodeAt(2)) << 6)
+                | (0x3f & cccc.charCodeAt(3)), offset = cp - 0x10000;
+            return (_fromCC((offset >>> 10) + 0xD800)
+                + _fromCC((offset & 0x3FF) + 0xDC00));
+        case 3:
+            return _fromCC(((0x0f & cccc.charCodeAt(0)) << 12)
+                | ((0x3f & cccc.charCodeAt(1)) << 6)
+                | (0x3f & cccc.charCodeAt(2)));
+        default:
+            return _fromCC(((0x1f & cccc.charCodeAt(0)) << 6)
+                | (0x3f & cccc.charCodeAt(1)));
+    }
+};
 /**
  * @deprecated should have been internal use only.
  * @param {string} src UTF-16 string
  * @returns {string} UTF-8 string
  */
-const btou = (src) => decodeURIComponent(escape(src));
+const btou = (b) => b.replace(re_btou, cb_btou);
 /**
  * polyfill version of `atob`
  */
@@ -136,9 +186,20 @@ const atobPolyfill = (asc) => {
 const _atob = _hasatob ? (asc) => atob(_tidyB64(asc))
     : _hasBuffer ? (asc) => Buffer.from(asc, 'base64').toString('binary')
         : atobPolyfill;
+//
+const _toUint8Array = _hasBuffer
+    ? (a) => _U8Afrom(Buffer.from(a, 'base64'))
+    : (a) => _U8Afrom(_atob(a), c => c.charCodeAt(0));
+/**
+ * converts a Base64 string to a Uint8Array.
+ */
+const toUint8Array = (a) => _toUint8Array(_unURI(a));
+//
 const _decode = _hasBuffer
     ? (a) => Buffer.from(a, 'base64').toString('utf8')
-    : (a) => btou(_atob(a));
+    : _TD
+        ? (a) => _TD.decode(_toUint8Array(a))
+        : (a) => btou(_atob(a));
 const _unURI = (a) => _tidyB64(a.replace(/[-_]/g, (m0) => m0 == '-' ? '+' : '/'));
 /**
  * converts a Base64 string to a UTF-8 string.
@@ -146,12 +207,7 @@ const _unURI = (a) => _tidyB64(a.replace(/[-_]/g, (m0) => m0 == '-' ? '+' : '/')
  * @returns {string} UTF-8 string
  */
 const decode = (src) => _decode(_unURI(src));
-/**
- * converts a Base64 string to a Uint8Array.
- */
-const toUint8Array = _hasBuffer
-    ? (a) => _U8Afrom(Buffer.from(_unURI(a), 'base64'))
-    : (a) => _U8Afrom(_atob(_unURI(a)), c => c.charCodeAt(0));
+//
 const _noEnum = (v) => {
     return {
         value: v, enumerable: false, writable: true, configurable: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-base64",
-  "version": "3.4.4",
+  "version": "3.5.2",
   "description": "Yet another Base64 transcoder in pure-JS",
   "main": "base64.js",
   "module": "base64.mjs",