js-base64 2.6.0 → 2.6.1

package/README.md

@@ -44,12 +44,20 @@ import { Base64 } from 'js-base64';
 ```javascript
 Base64.encode('dankogai'); // ZGFua29nYWk=
 Base64.btoa(  'dankogai'); // ZGFua29nYWk=
-Base64.encode('小飼弾');    // 5bCP6aO85by+
-Base64.encodeURI('小飼弾'); // 5bCP6aO85by-
-Base64.btoa(  '小飼弾');    // raises exception 
+Base64.fromUint8Array(     // ZGFua29nYWk=
+    new Uint8Array([100,97,110,107,111,103,97,105])
+);
+Base64.encode(   '小飼弾'); // 5bCP6aO85by+
+Base64.encodeURI('小飼弾'); // 5bCP6aO85by- which equals to Base64.encode('小飼弾', true)
+Base64.btoa(     '小飼弾'); // raises exception 
+```
 
+```javascript
 Base64.decode('ZGFua29nYWk=');  // dankogai
 Base64.atob(  'ZGFua29nYWk=');  // dankogai
+Base64.toUint8Array(            // new Uint8Array([100,97,110,107,111,103,97,105])
+    'ZGFua29nYWk='
+);
 Base64.decode('5bCP6aO85by+');  // 小飼弾
 // note .decodeURI() is unnecessary since it accepts both flavors
 Base64.decode('5bCP6aO85by-');  // 小飼弾

package/base64.js

@@ -22,7 +22,7 @@
     // existing version for noConflict()
     global = global || {};
     var _Base64 = global.Base64;
-    var version = "2.6.0";
+    var version = "2.6.1";
     // constants
     var b64chars
         = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
@@ -77,18 +77,21 @@
         return b.replace(/[\s\S]{1,3}/g, cb_encode);
     };
     var _encode = function(u) {
-        var isUint8Array = Object.prototype.toString.call(u) === '[object Uint8Array]';
-        return isUint8Array ? u.toString('base64')
-            : btoa(utob(String(u)));
-    }
+        return btoa(utob(String(u)));
+    };
     var encode = function(u, urisafe) {
         return !urisafe
-            ? _encode(u)
+            ? _encode(String(u))
             : _encode(String(u)).replace(/[+\/]/g, function(m0) {
                 return m0 == '+' ? '-' : '_';
             }).replace(/=/g, '');
     };
     var encodeURI = function(u) { return encode(u, true) };
+    var fromUint8Array = function(a) {
+        return btoa(Array.from(a, function(c) {
+            return String.fromCharCode(c)
+        }).join(''));
+    };
     // decoder stuff
     var re_btou = /[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3}/g;
     var cb_btou = function(cccc) {
@@ -142,10 +145,16 @@
     var _decode = function(a) { return btou(_atob(a)) };
     var decode = function(a){
         return _decode(
-            String(a).replace(/[-_]/g, function(m0) { return m0 == '-' ? '+' : '/' })
-                .replace(/[^A-Za-z0-9\+\/]/g, '')
+            String(a).replace(/[-_]/g, function(m0) {
+                return m0 == '-' ? '+' : '/'
+            }).replace(/[^A-Za-z0-9\+\/]/g, '')
         );
     };
+    var toUint8Array = function(a) {
+        return Uint8Array.from(atob(a), function(c) {
+            return c.charCodeAt(0);
+        });
+    };
     var noConflict = function() {
         var Base64 = global.Base64;
         global.Base64 = _Base64;
@@ -164,6 +173,8 @@
         btou: btou,
         decode: decode,
         noConflict: noConflict,
+        fromUint8Array: fromUint8Array,
+        toUint8Array: toUint8Array
     };
     // if ES5 is available, make Base64.extendString() available
     if (typeof Object.defineProperty === 'function') {
@@ -203,4 +214,3 @@
     // that's it!
     return {Base64: global.Base64}
 }));
-

package/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "js-base64",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "license": "BSD-3-Clause",
   "main": [
     "./base64.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-base64",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Yet another Base64 transcoder in pure-JS",
   "main": "base64.js",
   "directories": {