js-base64 2.2.0 → 2.3.2

package/README.md

@@ -63,6 +63,18 @@ TypeScript 2.0 type definition was added to the [DefinitelyTyped repository](htt
 $ npm install --save @types/js-base64
 ```
 
+## `.decode()` vs `.atob` (and `.encode()` vs `btoa()`)
+
+Suppose you have:
+
+```
+var pngBase64 = 
+  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=";
+```
+
+Which is a Base64-encoded 1x1 transparent PNG, **DO NOT USE** `Base64.decode(pngBase64)`.  Use `Base64.atob(pngBase64)` instead.  `Base64.decode()` decodes to UTF-8 string while `Base64.atob()` decodes to bytes, which is compatible to browser built-in `atob()` (Which is absent in node.js).  The same rule applies to the opposite direction.
+
+
 ## SEE ALSO
 
 + http://en.wikipedia.org/wiki/Base64

package/base64.js

@@ -12,7 +12,7 @@
     'use strict';
     // existing version for noConflict()
     var _Base64 = global.Base64;
-    var version = "2.2.0";
+    var version = "2.3.2";
     // if node.js, we use Buffer
     var buffer;
     if (typeof module !== 'undefined' && module.exports) {
@@ -72,7 +72,7 @@
         return b.replace(/[\s\S]{1,3}/g, cb_encode);
     };
     var _encode = buffer ?
-        buffer.from ? function (u) {
+        buffer.from && buffer.from !== Uint8Array.from ? function (u) {
             return (u.constructor === buffer.constructor ? u : buffer.from(u))
                 .toString('base64')
         }
@@ -143,7 +143,7 @@
         return a.replace(/[\s\S]{1,4}/g, cb_decode);
     };
     var _decode = buffer ?
-        buffer.from ? function(a) {
+        buffer.from && buffer.from !== Uint8Array.from ? function(a) {
             return (a.constructor === buffer.constructor
                     ? a : buffer.from(a, 'base64')).toString();
         }
@@ -197,19 +197,24 @@
                 }));
         };
     }
-    // that's it!
-    if (global['Meteor']) {
-        Base64 = global.Base64; // for normal export in Meteor.js
+    //
+    // export Base64 to the namespace
+    //
+    if (global['Meteor']) { // Meteor.js
+        Base64 = global.Base64;
     }
+    // module.exports and AMD are mutually exclusive.
+    // module.exports has precedence.
     if (typeof module !== 'undefined' && module.exports) {
         module.exports.Base64 = global.Base64;
     }
-    if (typeof define === 'function' && define.amd) {
-        // AMD. Register as an anonymous module.
+    else if (typeof define === 'function' && define.amd) {		
+        // AMD. Register as an anonymous module.	
         define([], function(){ return global.Base64 });
     }
-})(typeof self !== 'undefined' ? self
- : typeof window !== 'undefined' ? window
- : typeof global !== 'undefined' ? global
- : this
+    // that's it!
+})(   typeof self   !== 'undefined' ? self
+    : typeof window !== 'undefined' ? window
+    : typeof global !== 'undefined' ? global
+    : this
 );

package/base64.min.js

@@ -1 +1 @@
-(function(global){"use strict";var _Base64=global.Base64;var version="2.2.0";var buffer;if(typeof module!=="undefined"&&module.exports){try{buffer=require("buffer").Buffer}catch(err){}}var b64chars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";var b64tab=function(bin){var t={};for(var i=0,l=bin.length;i<l;i++)t[bin.charAt(i)]=i;return t}(b64chars);var fromCharCode=String.fromCharCode;var cb_utob=function(c){if(c.length<2){var cc=c.charCodeAt(0);return cc<128?c:cc<2048?fromCharCode(192|cc>>>6)+fromCharCode(128|cc&63):fromCharCode(224|cc>>>12&15)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}else{var cc=65536+(c.charCodeAt(0)-55296)*1024+(c.charCodeAt(1)-56320);return fromCharCode(240|cc>>>18&7)+fromCharCode(128|cc>>>12&63)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}};var re_utob=/[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;var utob=function(u){return u.replace(re_utob,cb_utob)};var cb_encode=function(ccc){var padlen=[0,2,1][ccc.length%3],ord=ccc.charCodeAt(0)<<16|(ccc.length>1?ccc.charCodeAt(1):0)<<8|(ccc.length>2?ccc.charCodeAt(2):0),chars=[b64chars.charAt(ord>>>18),b64chars.charAt(ord>>>12&63),padlen>=2?"=":b64chars.charAt(ord>>>6&63),padlen>=1?"=":b64chars.charAt(ord&63)];return chars.join("")};var btoa=global.btoa?function(b){return global.btoa(b)}:function(b){return b.replace(/[\s\S]{1,3}/g,cb_encode)};var _encode=buffer?buffer.from?function(u){return(u.constructor===buffer.constructor?u:buffer.from(u)).toString("base64")}:function(u){return(u.constructor===buffer.constructor?u:new buffer(u)).toString("base64")}:function(u){return btoa(utob(u))};var encode=function(u,urisafe){return!urisafe?_encode(String(u)):_encode(String(u)).replace(/[+\/]/g,function(m0){return m0=="+"?"-":"_"}).replace(/=/g,"")};var encodeURI=function(u){return encode(u,true)};var re_btou=new RegExp(["[À-ß][€-¿]","[à-ï][€-¿]{2}","[ð-÷][€-¿]{3}"].join("|"),"g");var cb_btou=function(cccc){switch(cccc.length){case 4:var cp=(7&cccc.charCodeAt(0))<<18|(63&cccc.charCodeAt(1))<<12|(63&cccc.charCodeAt(2))<<6|63&cccc.charCodeAt(3),offset=cp-65536;return fromCharCode((offset>>>10)+55296)+fromCharCode((offset&1023)+56320);case 3:return fromCharCode((15&cccc.charCodeAt(0))<<12|(63&cccc.charCodeAt(1))<<6|63&cccc.charCodeAt(2));default:return fromCharCode((31&cccc.charCodeAt(0))<<6|63&cccc.charCodeAt(1))}};var btou=function(b){return b.replace(re_btou,cb_btou)};var cb_decode=function(cccc){var len=cccc.length,padlen=len%4,n=(len>0?b64tab[cccc.charAt(0)]<<18:0)|(len>1?b64tab[cccc.charAt(1)]<<12:0)|(len>2?b64tab[cccc.charAt(2)]<<6:0)|(len>3?b64tab[cccc.charAt(3)]:0),chars=[fromCharCode(n>>>16),fromCharCode(n>>>8&255),fromCharCode(n&255)];chars.length-=[0,0,2,1][padlen];return chars.join("")};var atob=global.atob?function(a){return global.atob(a)}:function(a){return a.replace(/[\s\S]{1,4}/g,cb_decode)};var _decode=buffer?buffer.from?function(a){return(a.constructor===buffer.constructor?a:buffer.from(a,"base64")).toString()}:function(a){return(a.constructor===buffer.constructor?a:new buffer(a,"base64")).toString()}: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,""))};var noConflict=function(){var Base64=global.Base64;global.Base64=_Base64;return Base64};global.Base64={VERSION:version,atob:atob,btoa:btoa,fromBase64:decode,toBase64:encode,utob:utob,encode:encode,encodeURI:encodeURI,btou:btou,decode:decode,noConflict:noConflict};if(typeof Object.defineProperty==="function"){var noEnum=function(v){return{value:v,enumerable:false,writable:true,configurable:true}};global.Base64.extendString=function(){Object.defineProperty(String.prototype,"fromBase64",noEnum(function(){return decode(this)}));Object.defineProperty(String.prototype,"toBase64",noEnum(function(urisafe){return encode(this,urisafe)}));Object.defineProperty(String.prototype,"toBase64URI",noEnum(function(){return encode(this,true)}))}}if(global["Meteor"]){Base64=global.Base64}if(typeof module!=="undefined"&&module.exports){module.exports.Base64=global.Base64}if(typeof define==="function"&&define.amd){define([],function(){return global.Base64})}})(typeof self!=="undefined"?self:typeof window!=="undefined"?window:typeof global!=="undefined"?global:this);
+(function(global){"use strict";var _Base64=global.Base64;var version="2.3.2";var buffer;if(typeof module!=="undefined"&&module.exports){try{buffer=require("buffer").Buffer}catch(err){}}var b64chars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";var b64tab=function(bin){var t={};for(var i=0,l=bin.length;i<l;i++)t[bin.charAt(i)]=i;return t}(b64chars);var fromCharCode=String.fromCharCode;var cb_utob=function(c){if(c.length<2){var cc=c.charCodeAt(0);return cc<128?c:cc<2048?fromCharCode(192|cc>>>6)+fromCharCode(128|cc&63):fromCharCode(224|cc>>>12&15)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}else{var cc=65536+(c.charCodeAt(0)-55296)*1024+(c.charCodeAt(1)-56320);return fromCharCode(240|cc>>>18&7)+fromCharCode(128|cc>>>12&63)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}};var re_utob=/[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;var utob=function(u){return u.replace(re_utob,cb_utob)};var cb_encode=function(ccc){var padlen=[0,2,1][ccc.length%3],ord=ccc.charCodeAt(0)<<16|(ccc.length>1?ccc.charCodeAt(1):0)<<8|(ccc.length>2?ccc.charCodeAt(2):0),chars=[b64chars.charAt(ord>>>18),b64chars.charAt(ord>>>12&63),padlen>=2?"=":b64chars.charAt(ord>>>6&63),padlen>=1?"=":b64chars.charAt(ord&63)];return chars.join("")};var btoa=global.btoa?function(b){return global.btoa(b)}:function(b){return b.replace(/[\s\S]{1,3}/g,cb_encode)};var _encode=buffer?buffer.from&&buffer.from!==Uint8Array.from?function(u){return(u.constructor===buffer.constructor?u:buffer.from(u)).toString("base64")}:function(u){return(u.constructor===buffer.constructor?u:new buffer(u)).toString("base64")}:function(u){return btoa(utob(u))};var encode=function(u,urisafe){return!urisafe?_encode(String(u)):_encode(String(u)).replace(/[+\/]/g,function(m0){return m0=="+"?"-":"_"}).replace(/=/g,"")};var encodeURI=function(u){return encode(u,true)};var re_btou=new RegExp(["[À-ß][€-¿]","[à-ï][€-¿]{2}","[ð-÷][€-¿]{3}"].join("|"),"g");var cb_btou=function(cccc){switch(cccc.length){case 4:var cp=(7&cccc.charCodeAt(0))<<18|(63&cccc.charCodeAt(1))<<12|(63&cccc.charCodeAt(2))<<6|63&cccc.charCodeAt(3),offset=cp-65536;return fromCharCode((offset>>>10)+55296)+fromCharCode((offset&1023)+56320);case 3:return fromCharCode((15&cccc.charCodeAt(0))<<12|(63&cccc.charCodeAt(1))<<6|63&cccc.charCodeAt(2));default:return fromCharCode((31&cccc.charCodeAt(0))<<6|63&cccc.charCodeAt(1))}};var btou=function(b){return b.replace(re_btou,cb_btou)};var cb_decode=function(cccc){var len=cccc.length,padlen=len%4,n=(len>0?b64tab[cccc.charAt(0)]<<18:0)|(len>1?b64tab[cccc.charAt(1)]<<12:0)|(len>2?b64tab[cccc.charAt(2)]<<6:0)|(len>3?b64tab[cccc.charAt(3)]:0),chars=[fromCharCode(n>>>16),fromCharCode(n>>>8&255),fromCharCode(n&255)];chars.length-=[0,0,2,1][padlen];return chars.join("")};var atob=global.atob?function(a){return global.atob(a)}:function(a){return a.replace(/[\s\S]{1,4}/g,cb_decode)};var _decode=buffer?buffer.from&&buffer.from!==Uint8Array.from?function(a){return(a.constructor===buffer.constructor?a:buffer.from(a,"base64")).toString()}:function(a){return(a.constructor===buffer.constructor?a:new buffer(a,"base64")).toString()}: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,""))};var noConflict=function(){var Base64=global.Base64;global.Base64=_Base64;return Base64};global.Base64={VERSION:version,atob:atob,btoa:btoa,fromBase64:decode,toBase64:encode,utob:utob,encode:encode,encodeURI:encodeURI,btou:btou,decode:decode,noConflict:noConflict};if(typeof Object.defineProperty==="function"){var noEnum=function(v){return{value:v,enumerable:false,writable:true,configurable:true}};global.Base64.extendString=function(){Object.defineProperty(String.prototype,"fromBase64",noEnum(function(){return decode(this)}));Object.defineProperty(String.prototype,"toBase64",noEnum(function(urisafe){return encode(this,urisafe)}));Object.defineProperty(String.prototype,"toBase64URI",noEnum(function(){return encode(this,true)}))}}if(global["Meteor"]){Base64=global.Base64}if(typeof module!=="undefined"&&module.exports){module.exports.Base64=global.Base64}else if(typeof define==="function"&&define.amd){define([],function(){return global.Base64})}})(typeof self!=="undefined"?self:typeof window!=="undefined"?window:typeof global!=="undefined"?global:this);

package/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "js-base64",
-  "version": "2.2.0",
-  "license": "BSD 3-Clause",
+  "version": "2.3.2",
+  "license": "BSD-3-Clause",
   "main": [
     "./base64.js"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-base64",
-  "version": "2.2.0",
+  "version": "2.3.2",
   "description": "Yet another Base64 transcoder in pure-JS",
   "main": "base64.js",
   "directories": {
@@ -20,7 +20,7 @@
     "base64"
   ],
   "author": "Dan Kogai",
-  "license": "BSD 3-Clause",
+  "license": "BSD-3-Clause",
   "readmeFilename": "README.md",
   "gitHead": "8bfa436f733bec60c95c720e1d720c28b43ae0b2"
 }

package/.npmignore

@@ -1,4 +0,0 @@
-*,v
-attic/**/*
-node_modules/**/*
-tmp/**/*

package/test/dankogai.js

@@ -1,47 +0,0 @@
-/*
- * $Id: dankogai.js,v 0.4 2012/08/24 05:23:18 dankogai Exp dankogai $
- *
- * use mocha to test me
- * http://visionmedia.github.com/mocha/
- */
-var assert, Base64;
-if (this['window'] !== this) {
-    assert = require("assert");
-    Base64 = require('../base64.js').Base64;
-}
-var is = function (a, e, m) {
-    return function () {
-        assert.equal(a, e, m)
-    }
-};
-
-describe('basic', function () {
-    it('d',    is(Base64.encode('d'),    'ZA=='));
-    it('da',   is(Base64.encode('da'),   'ZGE='));
-    it('dan',  is(Base64.encode('dan'),  'ZGFu'));
-    it('ZA==', is(Base64.decode('ZA=='), 'd'   ));
-    it('ZGE=', is(Base64.decode('ZGE='), 'da'  ));
-    it('ZGFu', is(Base64.decode('ZGFu'), 'dan' ));
-});
-
-describe('whitespace', function () {
-    it('Z A==', is(Base64.decode('ZA =='), 'd'   ));
-    it('ZG E=', is(Base64.decode('ZG E='), 'da'  ));
-    it('ZGF u', is(Base64.decode('ZGF u'), 'dan' ));
-});
-
-describe('null', function () {
-    it('\\0',       is(Base64.encode('\0'),     'AA=='));
-    it('\\0\\0',    is(Base64.encode('\0\0'),   'AAA='));
-    it('\\0\\0\\0', is(Base64.encode('\0\0\0'), 'AAAA'));
-    it('AA==',      is(Base64.decode('AA=='), '\0'    ));
-    it('AAA=',      is(Base64.decode('AAA='), '\0\0'  ));
-    it('AAAA',      is(Base64.decode('AAAA'), '\0\0\0'));
-});
-
-describe('Base64', function () {
-    it('.encode', is(Base64.encode('小飼弾'), '5bCP6aO85by+'));
-    it('.encodeURI', is(Base64.encodeURI('小飼弾'), '5bCP6aO85by-'));
-    it('.decode', is(Base64.decode('5bCP6aO85by+'), '小飼弾'));
-    it('.decode', is(Base64.decode('5bCP6aO85by-'), '小飼弾'));
-});

package/test/es5.js

@@ -1,27 +0,0 @@
-/*
- * $Id: es5.js,v 0.1 2012/08/23 19:43:17 dankogai Exp dankogai $
- *
- * use mocha to test me
- * http://visionmedia.github.com/mocha/
- */
-var assert, Base64;
-if (this['window'] !== this) {
-    assert = require("assert");
-    Base64 = require('../base64.js').Base64;
-}
-var is = function (a, e, m) {
-    return function () {
-        assert.equal(a, e, m)
-    }
-};
-
-if ('extendString' in Base64){
-    Base64.extendString();
-    describe('String', function () {
-        it('.toBase64', is('小飼弾'.toBase64(), '5bCP6aO85by+'));
-        it('.toBase64', is('小飼弾'.toBase64(true), '5bCP6aO85by-'));
-        it('.toBase64URI', is('小飼弾'.toBase64URI(), '5bCP6aO85by-'));
-        it('.fromBase64', is('5bCP6aO85by+'.fromBase64(), '小飼弾'));
-        it('.fromBase64', is('5bCP6aO85by-'.fromBase64(), '小飼弾'));
-    });
-}

package/test/index.html

@@ -1,33 +0,0 @@
-<html>
-    <head>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="https://raw.github.com/visionmedia/mocha/master/mocha.css" />
-        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-        <script src="https://raw.github.com/visionmedia/mocha/master/mocha.js"></script>
-        <script>
-            mocha.setup('bdd');
-        </script>
-        <script src="../base64.js"></script>
-        <script>
-            var assert = function(expr, msg) {
-                if (!expr) throw new Error(msg || 'failed');
-            };      
-            assert.equal = function(a, b, msg) {
-                 if (a !== b) throw new Error(msg || ('failed : '+a+','+b));
-            };
-        </script>
-        <script src="./dankogai.js"></script>
-        <script src="./es5.js"></script>
-        <script src="./large.js"></script>
-        <script src="./yoshinoya.js"></script>
-        <script>
-            $(function() {
-                mocha.run();
-            });
-        </script>
-    </head>
-    <body>
-        $Id: browser.html,v 0.2 2012/08/23 19:44:32 dankogai Exp dankogai $
-        <div id="mocha"></div>
-    </body>
-</html>

package/test/large.js

@@ -1,28 +0,0 @@
-/*
- * $Id: large.js,v 0.3 2012/08/23 19:14:37 dankogai Exp dankogai $
- *
- * use mocha to test me
- *   http://visionmedia.github.com/mocha/
- */
-var assert, Base64;
-if (this['window'] !== this) {
-    assert = require("assert");
-    Base64 = require('../base64.js').Base64;
-}
-var is = function (a, e, m) {
-    return function () {
-        assert.equal(a, e, m)
-    }
-};
-var seed = function () {
-    var a, i;
-    for (a = [], i = 0; i < 256; i++) {
-        a.push(String.fromCharCode(i));
-    }
-    return a.join('');
-}();
-describe('Base64', function () {
-    for (var i = 0, str = seed; i < 16; str += str, i++) {
-        it(''+str.length, is(Base64.decode(Base64.encode(str)), str));
-    }
-});

package/test/yoshinoya.js

@@ -1,22 +0,0 @@
-/*
- * use mocha to test me
- * http://visionmedia.github.com/mocha/
- */
-var assert, Base64;
-if (this['window'] !== this) {
-    assert = require("assert");
-    Base64 = require('../base64.js').Base64;
-}
-var is = function (a, e, m) {
-    return function () {
-        assert.equal(a, e, m)
-    }
-};
-
-describe('Yoshinoya', function () {
-    it('.encode', is(Base64.encode('𠮷野家'), '8KCut+mHjuWutg=='));
-    it('.encodeURI', is(Base64.encodeURI('𠮷野家'), '8KCut-mHjuWutg'));
-    it('.decode', is(Base64.decode('8KCut+mHjuWutg=='), '𠮷野家'));
-    it('.decode', is(Base64.decode('8KCut-mHjuWutg'), '𠮷野家'));
-    /* it('.decode', is(Base64.decode('7aGC7b636YeO5a62'), '𠮷野家')); */
-});