js-base64 2.6.1 → 2.6.2

package/README.md

@@ -47,6 +47,9 @@ Base64.btoa(  'dankogai'); // ZGFua29nYWk=
 Base64.fromUint8Array(     // ZGFua29nYWk=
     new Uint8Array([100,97,110,107,111,103,97,105])
 );
+Base64.fromUint8Array(     // ZGFua29nYW which is URI safe
+    new Uint8Array([100,97,110,107,111,103,97,105]), true
+);
 Base64.encode(   '小飼弾'); // 5bCP6aO85by+
 Base64.encodeURI('小飼弾'); // 5bCP6aO85by- which equals to Base64.encode('小飼弾', true)
 Base64.btoa(     '小飼弾'); // raises exception 

package/base64.js

@@ -22,7 +22,7 @@
     // existing version for noConflict()
     global = global || {};
     var _Base64 = global.Base64;
-    var version = "2.6.1";
+    var version = "2.6.2";
     // constants
     var b64chars
         = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
@@ -79,18 +79,30 @@
     var _encode = function(u) {
         return btoa(utob(String(u)));
     };
+    var mkUriSafe = function (b64) {
+        return b64.replace(/[+\/]/g, function(m0) {
+            return m0 == '+' ? '-' : '_';
+        }).replace(/=/g, '');
+    };
     var encode = function(u, urisafe) {
-        return !urisafe
-            ? _encode(String(u))
-            : _encode(String(u)).replace(/[+\/]/g, function(m0) {
-                return m0 == '+' ? '-' : '_';
-            }).replace(/=/g, '');
+        return urisafe ? mkUriSafe(_encode(u)) : _encode(u);
     };
     var encodeURI = function(u) { return encode(u, true) };
-    var fromUint8Array = function(a) {
-        return btoa(Array.from(a, function(c) {
-            return String.fromCharCode(c)
-        }).join(''));
+    var fromUint8Array;
+    if (global.Uint8Array) fromUint8Array = function(a, urisafe) {
+        // return btoa(fromCharCode.apply(null, a));
+        var b64 = '';
+        for (var i = 0, l = a.length; i < l; i += 3) {
+            var a0 = a[i], a1 = a[i+1], a2 = a[i+2];
+            var ord = a0 << 16 | a1 << 8 | a2;
+            b64 +=    b64chars.charAt( ord >>> 18)
+                +     b64chars.charAt((ord >>> 12) & 63)
+                + ( typeof a1 != 'undefined'
+                    ? b64chars.charAt((ord >>>  6) & 63) : '=')
+                + ( typeof a2 != 'undefined'
+                    ? b64chars.charAt( ord         & 63) : '=');
+        }
+        return urisafe ? mkUriSafe(b64) : b64;
     };
     // decoder stuff
     var re_btou = /[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3}/g;
@@ -150,7 +162,8 @@
             }).replace(/[^A-Za-z0-9\+\/]/g, '')
         );
     };
-    var toUint8Array = function(a) {
+    var toUint8Array;
+    if (global.Uint8Array) toUint8Array = function(a) {
         return Uint8Array.from(atob(a), function(c) {
             return c.charCodeAt(0);
         });

package/bower.json

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

package/package.json

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

package/test/dankogai.js

@@ -42,3 +42,27 @@ describe('Base64', function () {
     it('.decode', is(Base64.decode('5bCP6aO85by+'), '小飼弾'));
     it('.decode', is(Base64.decode('5bCP6aO85by-'), '小飼弾'));
 });
+
+if (typeof Uint8Array === 'function') describe('fromBase64', function() {
+    it('dankogai', is(Base64.fromUint8Array(new Uint8Array([100,97,110,107,111,103,97,105])), Base64.encode('dankogai')));
+    it('dankoga', is(Base64.fromUint8Array(new Uint8Array([100,97,110,107,111,103,97])), Base64.encode('dankoga')));
+    it('dankog', is(Base64.fromUint8Array(new Uint8Array([100,97,110,107,111,103])), Base64.encode('dankog')));
+    it('danko', is(Base64.fromUint8Array(new Uint8Array([100,97,110,107,111])), Base64.encode('danko')));
+    it('dank', is(Base64.fromUint8Array(new Uint8Array([100,97,110,107])), Base64.encode('dank')));
+    it('dan', is(Base64.fromUint8Array(new Uint8Array([100,97,110])), Base64.encode('dan')));
+    it('da', is(Base64.fromUint8Array(new Uint8Array([100,97])), Base64.encode('da')));
+    it('d', is(Base64.fromUint8Array(new Uint8Array([100])), Base64.encode('d')));
+    it('', is(Base64.fromUint8Array(new Uint8Array([])), Base64.encode('')));
+});
+
+if (typeof Uint8Array === 'function') describe('toBase64', function() {
+    it('ZGFua29nYWk=', is(Base64.toUint8Array('ZGFua29nYWk=').toString(), '100,97,110,107,111,103,97,105'));
+    it('ZGFua29nYQ==', is(Base64.toUint8Array('ZGFua29nYQ==').toString(), '100,97,110,107,111,103,97'));
+    it('ZGFua29n', is(Base64.toUint8Array('ZGFua29n').toString(), '100,97,110,107,111,103'));
+    it('ZGFua28=', is(Base64.toUint8Array('ZGFua28=').toString(), '100,97,110,107,111'));
+    it('ZGFuaw==', is(Base64.toUint8Array('ZGFuaw==').toString(), '100,97,110,107'));
+    it('ZGFu', is(Base64.toUint8Array('ZGFu').toString(), '100,97,110'));
+    it('ZGE=', is(Base64.toUint8Array('ZGE=').toString(), '100,97'));
+    it('ZA==', is(Base64.toUint8Array('ZA==').toString(), '100'));
+    it('', is(Base64.toUint8Array('').toString(), ''));
+});