version bump 1.14.0: Buffer.from node 4.x fix

Author: SheetJSDev

codepage.md

@@ -448,11 +448,28 @@ while the input format is automatically determined.
 
 # Tests
 
-The tests include JS validity tests (requiring or evaluating code):
-
 ```>test.js
 var fs = require('fs'), assert = require('assert'), vm = require('vm');
 var cptable, sbcs;
+
+```
+
+Due to a bug in `Buffer.from` in node `4.0 - 4.4`, a special check is needed:
+
+```>test.js
+var Buffer_from = function(){};
+
+if(typeof Buffer !== 'undefined') {
+  var nbfs = !Buffer.from;
+  if(!nbfs) try { Buffer.from("foo", "utf8"); } catch(e) { nbfs = true; }
+  Buffer_from = nbfs ? function(buf, enc) { return (enc) ? new Buffer(buf, enc) : new Buffer(buf); } : Buffer.from.bind(Buffer);
+}
+
+```
+
+The tests include JS validity tests (requiring or evaluating code):
+
+```>test.js
 describe('source', function() {
   it('should load node', function() { cptable = require('./'); });
   it('should load sbcs', function() { sbcs = require('./sbcs'); });
@@ -565,7 +582,7 @@ describe('entry conditions', function() {
       var arr = cptable.utils.encode(cp,i.split(""),e);
       assert.deepEqual(str,arr);
       if(typeof Buffer === 'undefined') return;
-      var buf = cptable.utils.encode(cp,Buffer.from(i),e);
+      var buf = cptable.utils.encode(cp,Buffer_from(i),e);
       assert.deepEqual(str,buf);
     };
     cptable.utils.cache.encache();
@@ -593,7 +610,7 @@ describe('entry conditions', function() {
       var arr = cptable.utils.decode(cp,s.join?s.join(""):s);
       assert.deepEqual(str,arr);
       if(typeof Buffer === 'undefined') return;
-      var buf = cptable.utils.decode(cp,Buffer.from(i));
+      var buf = cptable.utils.decode(cp,Buffer_from(i));
       assert.deepEqual(str,buf);
     };
     cptable.utils.cache.encache();
@@ -603,7 +620,7 @@ describe('entry conditions', function() {
   };
   describe('decode', function() {
     it('CP  1252 : sbcs', function() { chkde(1252,[0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72]); }); /* "foobar" */
-    if(typeof Buffer !== 'undefined') it('CP   708 : sbcs', function() { chkde(708, Buffer.from([0xca, 0x20, 0x61, 0x6e, 0x64, 0x20, 0xcb, 0x20, 0x73, 0x6d, 0x69, 0x6c, 0x65, 0x79, 0x20, 0x66, 0x61, 0x63, 0x65, 0x73])); }); /* ("ت and ث smiley faces") */
+    if(typeof Buffer !== 'undefined') it('CP   708 : sbcs', function() { chkde(708, Buffer_from([0xca, 0x20, 0x61, 0x6e, 0x64, 0x20, 0xcb, 0x20, 0x73, 0x6d, 0x69, 0x6c, 0x65, 0x79, 0x20, 0x66, 0x61, 0x63, 0x65, 0x73])); }); /* ("ت and ث smiley faces") */
     it('CP   936 : dbcs', function() { chkde(936, [0xd5, 0xe2, 0xca, 0xc7, 0xd6, 0xd0, 0xce, 0xc4, 0xd7, 0xd6, 0xb7, 0xfb, 0xb2, 0xe2, 0xca, 0xd4]);}); /* "这是中文字符测试" */
   });
 });
@@ -754,7 +771,7 @@ describe('failures', function() {
 ```json>package.json
 {
   "name": "codepage",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "author": "SheetJS",
   "description": "pure-JS library to handle codepages",
   "keywords": [ "codepage", "iconv", "convert", "strings" ],
@@ -807,6 +824,7 @@ describe('failures', function() {
     "LICENSE",
     "README.md",
     "bin",
+    "bits/*.js",
     "types/index.d.ts",
     "types/*.json",
     "cptable.js",
@@ -825,10 +843,12 @@ describe('failures', function() {
 ```
 
 ```>.gitignore
+node_modules
+package-lock.json
+*.tgz
 .gitignore
 codepages/
 .vocrc
-node_modules/
 make.sh
 make.njs
 misc/coverage.html

cpexcel.js

@@ -47,9 +47,11 @@ type DecoderMap = {[id:CPIndex]:Decoder};
   var cca = function cca(x/*:string*/)/*:number*/ { return x.charCodeAt(0); };
 
   var has_buf/*:boolean*/ = (typeof Buffer !== 'undefined');
+  var Buffer_from = function(){};
   if(has_buf) {
-    // $FlowIgnore
-    if(!Buffer.from) Buffer.from = function(buf, enc) { return (enc) ? new Buffer(buf, enc) : new Buffer(buf); };
+    var nbfs = !Buffer.from;
+    if(!nbfs) try { Buffer.from("foo", "utf8"); } catch(e) { nbfs = true; }
+    Buffer_from = nbfs ? function(buf, enc) { return (enc) ? new Buffer(buf, enc) : new Buffer(buf); } : Buffer.from.bind(Buffer);
     // $FlowIgnore
     if(!Buffer.allocUnsafe) Buffer.allocUnsafe = function(n) { return new Buffer(n); };
 
@@ -330,7 +332,7 @@ type DecoderMap = {[id:CPIndex]:Decoder};
     }
     else if((M=magic[cp])) switch(M) {
       case "utf8":
-        if(has_buf && isstr/*:: && typeof data == 'string' */) { out = Buffer.from(data, M); j = out.length; break; }
+        if(has_buf && isstr/*:: && typeof data == 'string' */) { out = Buffer_from(data, M); j = out.length; break; }
         for(i = 0; i < len; ++i, ++j) {
           w = isstr/*:: && typeof data == 'string' */ ? data.charCodeAt(i) : data[i].charCodeAt(0);
           if(w <= 0x007F) out[j] = w;
@@ -352,15 +354,15 @@ type DecoderMap = {[id:CPIndex]:Decoder};
         }
         break;
       case "ascii":
-        if(has_buf && typeof data === "string") { out = Buffer.from(data, M); j = out.length; break; }
+        if(has_buf && typeof data === "string") { out = Buffer_from(data, M); j = out.length; break; }
         for(i = 0; i < len; ++i, ++j) {
           w = isstr/*:: && typeof data == 'string' */ ? data.charCodeAt(i) : data[i].charCodeAt(0);
           if(w <= 0x007F) out[j] = w;
           else throw new Error("bad ascii " + w);
         }
         break;
       case "utf16le":
-        if(has_buf && typeof data === "string") { out = Buffer.from(data, M); j = out.length; break; }
+        if(has_buf && typeof data === "string") { out = Buffer_from(data, M); j = out.length; break; }
         for(i = 0; i < len; ++i) {
           w = isstr/*:: && typeof data == 'string' */ ? data.charCodeAt(i) : data[i].charCodeAt(0);
           out[j++] = w&255;

cptable.js

@@ -40,9 +40,11 @@
   var cca = function cca(x) { return x.charCodeAt(0); };
 
   var has_buf = (typeof Buffer !== 'undefined');
+  var Buffer_from = function(){};
   if(has_buf) {
-    // $FlowIgnore
-    if(!Buffer.from) Buffer.from = function(buf, enc) { return (enc) ? new Buffer(buf, enc) : new Buffer(buf); };
+    var nbfs = !Buffer.from;
+    if(!nbfs) try { Buffer.from("foo", "utf8"); } catch(e) { nbfs = true; }
+    Buffer_from = nbfs ? function(buf, enc) { return (enc) ? new Buffer(buf, enc) : new Buffer(buf); } : Buffer.from.bind(Buffer);
     // $FlowIgnore
     if(!Buffer.allocUnsafe) Buffer.allocUnsafe = function(n) { return new Buffer(n); };
 
@@ -315,7 +317,7 @@
     }
     else if((M=magic[cp])) switch(M) {
       case "utf8":
-        if(has_buf && isstr) { out = Buffer.from(data, M); j = out.length; break; }
+        if(has_buf && isstr) { out = Buffer_from(data, M); j = out.length; break; }
         for(i = 0; i < len; ++i, ++j) {
           w = isstr ? data.charCodeAt(i) : data[i].charCodeAt(0);
           if(w <= 0x007F) out[j] = w;
@@ -337,15 +339,15 @@
         }
         break;
       case "ascii":
-        if(has_buf && typeof data === "string") { out = Buffer.from(data, M); j = out.length; break; }
+        if(has_buf && typeof data === "string") { out = Buffer_from(data, M); j = out.length; break; }
         for(i = 0; i < len; ++i, ++j) {
           w = isstr ? data.charCodeAt(i) : data[i].charCodeAt(0);
           if(w <= 0x007F) out[j] = w;
           else throw new Error("bad ascii " + w);
         }
         break;
       case "utf16le":
-        if(has_buf && typeof data === "string") { out = Buffer.from(data, M); j = out.length; break; }
+        if(has_buf && typeof data === "string") { out = Buffer_from(data, M); j = out.length; break; }
         for(i = 0; i < len; ++i) {
           w = isstr ? data.charCodeAt(i) : data[i].charCodeAt(0);
           out[j++] = w&255;