version bump 0.12.5: ancillary utility update

- add BOM to `stream.to_csv` (fixes #1024 h/t @hr5959)
- `utils.format_cell` type (h/t @victorj2307)
- duktape niggles
- demo cleanup

.spelling

@@ -106,6 +106,7 @@ ui-grid
 angular-cli
 
  - demos/database/README.md
+Knex
 LowDB
 MariaDB
 MySQL

README.md

@@ -162,6 +162,7 @@ In the browser, just add a script tag:
 |    `unpkg` | <https://unpkg.com/xlsx/>                |
 | `jsDelivr` | <https://jsdelivr.com/package/npm/xlsx>  |
 |    `CDNjs` | <http://cdnjs.com/libraries/xlsx>        |
+|    `packd` | <https://bundle.run/xlsx?name=XLSX>      |
 
 `unpkg` makes the latest version available at:
 

bits/01_version.js

@@ -1 +1 @@
-XLSX.version = '0.12.4';
+XLSX.version = '0.12.5';

bits/55_vml.js

@@ -14,7 +14,8 @@ function write_comments_vml(rId, comments) {
 	];
 	while(_shapeid < rId * 1000) _shapeid += 1000;
 
-	comments.map(function(x) { return decode_cell(x[0]); }).forEach(function(c) { o = o.concat([
+	comments.forEach(function(x) { var c = decode_cell(x[0]);
+	o = o.concat([
 	'<v:shape' + wxt_helper({
 		id:'_x0000_s' + (++_shapeid),
 		type:"#_x0000_t202",

bits/57_cmntxml.js

@@ -36,13 +36,11 @@ function write_comments_xml(data/*::, opts*/) {
 
 	var iauthor/*:Array<string>*/ = [];
 	o.push("<authors>");
-	data.map(function(x) { return x[1]; }).forEach(function(comment) {
-		comment.map(function(x) { return escapexml(x.a); }).forEach(function(a) {
-			if(iauthor.indexOf(a) > -1) return;
-			iauthor.push(a);
-			o.push("<author>" + a + "</author>");
-		});
-	});
+	data.forEach(function(x) { x[1].forEach(function(w) { var a = escapexml(w.a);
+		if(iauthor.indexOf(a) > -1) return;
+		iauthor.push(a);
+		o.push("<author>" + a + "</author>");
+	}); });
 	o.push("</authors>");
 	o.push("<commentList>");
 	data.forEach(function(d) {

bits/75_xlml.js

@@ -163,6 +163,8 @@ function xlml_clean_comment(comment/*:any*/) {
 function xlml_normalize(d)/*:string*/ {
 	if(has_buf &&/*::typeof Buffer !== "undefined" && d != null && d instanceof Buffer &&*/ Buffer.isBuffer(d)) return d.toString('utf8');
 	if(typeof d === 'string') return d;
+	/* duktape */
+	if(typeof Uint8Array !== 'undefined' && d instanceof Uint8Array) return utf8read(a2s(ab2a(d)));
 	throw new Error("Bad input format: expected Buffer or string");
 }
 

bits/97_node.js

@@ -15,7 +15,9 @@ if(has_buf && typeof require != 'undefined') (function() {
 		var rowinfo/*:Array<RowInfo>*/ = o.skipHidden && sheet["!rows"] || [];
 		for(var C = r.s.c; C <= r.e.c; ++C) if (!((colinfo[C]||{}).hidden)) cols[C] = encode_col(C);
 		var R = r.s.r;
+		var BOM = false;
 		stream._read = function() {
+			if(!BOM) { BOM = true; return stream.push("\uFEFF"); }
 			if(R > r.e.r) return stream.push(null);
 			while(R <= r.e.r) {
 				++R;

demos/altjs/.gitignore

@@ -4,5 +4,6 @@ duk*
 *.class
 *.jar
 rhino
+shim.min.js
 xlsx.*.js
 payload.js

demos/altjs/Makefile

@@ -5,12 +5,16 @@ all: duktape nashorn rhinojs swift
 base:
 	if [ ! -e sheetjs.xlsx ]; then node ../../tests/write.js; fi
 	if [ ! -e xlsx.full.min.js ]; then cp ../../dist/xlsx.full.min.js .; fi
+	if [ ! -e shim.min.js ]; then cp ../../dist/shim.min.js .; fi
 
-.PHONY: duktape
-duktape: base ## duktape demo
+.PHONY: duk
+duk: base
 	bash ./duktape.sh
 	gcc -std=c99 -Wall -osheetjs.duk sheetjs.duk.c duktape.c -lm
-	./sheetjs.duk
+
+.PHONY: duktape
+duktape: duk ## duktape demo
+	for ext in xlsx xlsb biff8.xls xml.xls; do ./sheetjs.duk sheetjs.$$ext; done
 
 .PHONY: nashorn
 nashorn: base ## nashorn demo

demos/altjs/SheetJSCore.swift

@@ -2,95 +2,95 @@
 import JavaScriptCore;
 
 enum SJSError: Error {
-	case badJSContext;
-	case badJSWorkbook;
-	case badJSWorksheet;
+  case badJSContext;
+  case badJSWorkbook;
+  case badJSWorksheet;
 };
 
 class SJSWorksheet {
-	var context: JSContext!;
-	var wb: JSValue!; var ws: JSValue!;
-	var idx: Int32;
+  var context: JSContext!;
+  var wb: JSValue!; var ws: JSValue!;
+  var idx: Int32;
 
-	func toCSV() throws -> String {
-		let XLSX: JSValue! = context.objectForKeyedSubscript("XLSX");
-		let utils: JSValue! = XLSX.objectForKeyedSubscript("utils");
-		let sheet_to_csv: JSValue! = utils.objectForKeyedSubscript("sheet_to_csv");
-		return sheet_to_csv.call(withArguments: [ws]).toString();
-	}
+  func toCSV() throws -> String {
+    let XLSX: JSValue! = context.objectForKeyedSubscript("XLSX");
+    let utils: JSValue! = XLSX.objectForKeyedSubscript("utils");
+    let sheet_to_csv: JSValue! = utils.objectForKeyedSubscript("sheet_to_csv");
+    return sheet_to_csv.call(withArguments: [ws]).toString();
+  }
 
-	init(ctx: JSContext, workbook: JSValue, worksheet: JSValue, idx: Int32) throws {
-		self.context = ctx; self.wb = workbook; self.ws = worksheet; self.idx = idx;
-	}
+  init(ctx: JSContext, workbook: JSValue, worksheet: JSValue, idx: Int32) throws {
+    self.context = ctx; self.wb = workbook; self.ws = worksheet; self.idx = idx;
+  }
 }
 
 class SJSWorkbook {
-	var context: JSContext!;
-	var wb: JSValue!; var SheetNames: JSValue!; var Sheets: JSValue!;
+  var context: JSContext!;
+  var wb: JSValue!; var SheetNames: JSValue!; var Sheets: JSValue!;
 
-	func getSheetAtIndex(idx: Int32) throws -> SJSWorksheet {
-		let SheetName: String = SheetNames.atIndex(Int(idx)).toString();
-		let ws: JSValue! = Sheets.objectForKeyedSubscript(SheetName);
-		return try SJSWorksheet(ctx: context, workbook: wb, worksheet: ws, idx: idx);
-	}
+  func getSheetAtIndex(idx: Int32) throws -> SJSWorksheet {
+    let SheetName: String = SheetNames.atIndex(Int(idx)).toString();
+    let ws: JSValue! = Sheets.objectForKeyedSubscript(SheetName);
+    return try SJSWorksheet(ctx: context, workbook: wb, worksheet: ws, idx: idx);
+  }
 
-	func writeBStr(bookType: String = "xlsx") throws -> String {
-		let XLSX: JSValue! = context.objectForKeyedSubscript("XLSX");
-		context.evaluateScript(String(format: "var writeopts = {type:'binary', bookType:'%@'}", bookType));
-		let writeopts: JSValue! = context.objectForKeyedSubscript("writeopts");
-		let writefunc: JSValue! = XLSX.objectForKeyedSubscript("write");
-		return writefunc.call(withArguments: [wb, writeopts]).toString();
-	}
+  func writeBStr(bookType: String = "xlsx") throws -> String {
+    let XLSX: JSValue! = context.objectForKeyedSubscript("XLSX");
+    context.evaluateScript(String(format: "var writeopts = {type:'binary', bookType:'%@'}", bookType));
+    let writeopts: JSValue! = context.objectForKeyedSubscript("writeopts");
+    let writefunc: JSValue! = XLSX.objectForKeyedSubscript("write");
+    return writefunc.call(withArguments: [wb, writeopts]).toString();
+  }
 
-	init(ctx: JSContext, wb: JSValue) throws {
-		self.context = ctx;
-		self.wb = wb;
-		self.SheetNames = wb.objectForKeyedSubscript("SheetNames");
-		self.Sheets = wb.objectForKeyedSubscript("Sheets");
-	}
+  init(ctx: JSContext, wb: JSValue) throws {
+    self.context = ctx;
+    self.wb = wb;
+    self.SheetNames = wb.objectForKeyedSubscript("SheetNames");
+    self.Sheets = wb.objectForKeyedSubscript("Sheets");
+  }
 }
 
 class SheetJSCore {
-	var context: JSContext!;
-	var XLSX: JSValue!;
+  var context: JSContext!;
+  var XLSX: JSValue!;
 
-	func init_context() throws -> JSContext {
-		var context: JSContext!
-		do {
-			context = JSContext();
-			context.exceptionHandler = { ctx, X in if let e = X { print(e.toString()); }; };
-			context.evaluateScript("var global = (function(){ return this; }).call(null);");
-			context.evaluateScript("if(typeof wbs == 'undefined') wbs = [];");
-			let src = try String(contentsOfFile: "xlsx.full.min.js");
-			context.evaluateScript(src);
-			if context != nil { return context!; }
-		} catch { print(error.localizedDescription); }
-		throw SJSError.badJSContext;
-	}
+  func init_context() throws -> JSContext {
+    var context: JSContext!
+    do {
+      context = JSContext();
+      context.exceptionHandler = { ctx, X in if let e = X { print(e.toString()); }; };
+      context.evaluateScript("var global = (function(){ return this; }).call(null);");
+      context.evaluateScript("if(typeof wbs == 'undefined') wbs = [];");
+      let src = try String(contentsOfFile: "xlsx.full.min.js");
+      context.evaluateScript(src);
+      if context != nil { return context!; }
+    } catch { print(error.localizedDescription); }
+    throw SJSError.badJSContext;
+  }
 
-	func version() throws -> String {
-		if let version = XLSX.objectForKeyedSubscript("version") { return version.toString(); }
-		throw SJSError.badJSContext;
-	}
+  func version() throws -> String {
+    if let version = XLSX.objectForKeyedSubscript("version") { return version.toString(); }
+    throw SJSError.badJSContext;
+  }
 
-	func readFile(file: String) throws -> SJSWorkbook {
-		let data: String! = try String(contentsOfFile: file, encoding: String.Encoding.isoLatin1);
-		return try readBStr(data: data);
-	}
+  func readFile(file: String) throws -> SJSWorkbook {
+    let data: String! = try String(contentsOfFile: file, encoding: String.Encoding.isoLatin1);
+    return try readBStr(data: data);
+  }
 
-	func readBStr(data: String) throws -> SJSWorkbook {
-		context.setObject(data, forKeyedSubscript: "payload" as (NSCopying & NSObjectProtocol)!);
-		context.evaluateScript("var wb = XLSX.read(payload, {type:'binary'});");
-		let wb: JSValue! = context.objectForKeyedSubscript("wb");
-		if wb == nil { throw SJSError.badJSWorkbook; }
-		return try SJSWorkbook(ctx: context, wb: wb);
-	}
+  func readBStr(data: String) throws -> SJSWorkbook {
+    context.setObject(data, forKeyedSubscript: "payload" as (NSCopying & NSObjectProtocol)!);
+    context.evaluateScript("var wb = XLSX.read(payload, {type:'binary'});");
+    let wb: JSValue! = context.objectForKeyedSubscript("wb");
+    if wb == nil { throw SJSError.badJSWorkbook; }
+    return try SJSWorkbook(ctx: context, wb: wb);
+  }
 
-	init() throws {
-		do {
-			self.context = try init_context();
-			self.XLSX = self.context.objectForKeyedSubscript("XLSX");
-			if self.XLSX == nil { throw SJSError.badJSContext; }
-		} catch { print(error.localizedDescription); }
-	}
+  init() throws {
+    do {
+      self.context = try init_context();
+      self.XLSX = self.context.objectForKeyedSubscript("XLSX");
+      if self.XLSX == nil { throw SJSError.badJSContext; }
+    } catch { print(error.localizedDescription); }
+  }
 }

demos/altjs/SheetJSRhino.java

@@ -5,27 +5,27 @@
 import com.sheetjs.SheetJSSheet;
 
 public class SheetJSRhino {
-	public static void main(String args[]) throws Exception {
-		try {
-			SheetJS sjs = new SheetJS();
+  public static void main(String args[]) throws Exception {
+    try {
+      SheetJS sjs = new SheetJS();
 
-			/* open file */
-			SheetJSFile xl = sjs.read_file(args[0]);
+      /* open file */
+      SheetJSFile xl = sjs.read_file(args[0]);
 
-			/* get sheetnames */
-			String[] sheetnames = xl.get_sheet_names();
-			System.err.println(sheetnames[0]);
+      /* get sheetnames */
+      String[] sheetnames = xl.get_sheet_names();
+      System.err.println(sheetnames[0]);
 
-			/* convert to CSV */
-			SheetJSSheet sheet = xl.get_sheet(0);
-			String csv = sheet.get_csv();
+      /* convert to CSV */
+      SheetJSSheet sheet = xl.get_sheet(0);
+      String csv = sheet.get_csv();
 
-			System.out.println(csv);
+      System.out.println(csv);
 
-		} catch(Exception e) {
-			throw e;
-		} finally {
-			SheetJS.close();
-		}
-	}	
+    } catch(Exception e) {
+      throw e;
+    } finally {
+      SheetJS.close();
+    }
+  }
 }

demos/altjs/com/sheetjs/JSHelper.java

@@ -13,39 +13,39 @@
 import org.mozilla.javascript.Scriptable;
 
 public class JSHelper {
-	static String read_file(String file) throws IOException {
-		byte[] b = Files.readAllBytes(Paths.get(file));
-		System.out.println(b.length);
-		StringBuilder sb = new StringBuilder();
-		for(int i = 0; i < b.length; ++i) sb.append(Character.toString((char)(b[i] < 0 ? b[i] + 256 : b[i])));
-		return sb.toString();
-	}
+  static String read_file(String file) throws IOException {
+    byte[] b = Files.readAllBytes(Paths.get(file));
+    System.out.println(b.length);
+    StringBuilder sb = new StringBuilder();
+    for(int i = 0; i < b.length; ++i) sb.append(Character.toString((char)(b[i] < 0 ? b[i] + 256 : b[i])));
+    return sb.toString();
+  }
 
-	static Object get_object(String path, Object base) throws ObjectNotFoundException {
-		int idx = path.indexOf(".");
-		Scriptable b = (Scriptable)base;
-		if(idx == -1) return b.get(path, b);
-		Object o = b.get(path.substring(0,idx), b);
-		if(o == Scriptable.NOT_FOUND) throw new ObjectNotFoundException("not found: |" + path.substring(0,idx) + "|" + Integer.toString(idx));
-		return get_object(path.substring(idx+1), (NativeObject)o);
-	}
+  static Object get_object(String path, Object base) throws ObjectNotFoundException {
+    int idx = path.indexOf(".");
+    Scriptable b = (Scriptable)base;
+    if(idx == -1) return b.get(path, b);
+    Object o = b.get(path.substring(0,idx), b);
+    if(o == Scriptable.NOT_FOUND) throw new ObjectNotFoundException("not found: |" + path.substring(0,idx) + "|" + Integer.toString(idx));
+    return get_object(path.substring(idx+1), (NativeObject)o);
+  }
 
-	static Object[] get_array(String path, Object base) throws ObjectNotFoundException {
-		NativeArray arr = (NativeArray)get_object(path, base);
-		Object[] out = new Object[(int)arr.getLength()];
-		int idx;
-		for(Object o : arr.getIds()) out[idx = (Integer)o] = arr.get(idx, arr); 
-		return out;
-	}
+  static Object[] get_array(String path, Object base) throws ObjectNotFoundException {
+    NativeArray arr = (NativeArray)get_object(path, base);
+    Object[] out = new Object[(int)arr.getLength()];
+    int idx;
+    for(Object o : arr.getIds()) out[idx = (Integer)o] = arr.get(idx, arr);
+    return out;
+  }
 
-	static String[] get_string_array(String path, Object base) throws ObjectNotFoundException {
-		NativeArray arr = (NativeArray)get_object(path, base);
-		String[] out = new String[(int)arr.getLength()];
-		int idx;
-		for(Object o : arr.getIds()) out[idx = (Integer)o] = arr.get(idx, arr).toString(); 
-		return out;
-	}
-	
-	public static void close() { Context.exit(); }
+  static String[] get_string_array(String path, Object base) throws ObjectNotFoundException {
+    NativeArray arr = (NativeArray)get_object(path, base);
+    String[] out = new String[(int)arr.getLength()];
+    int idx;
+    for(Object o : arr.getIds()) out[idx = (Integer)o] = arr.get(idx, arr).toString();
+    return out;
+  }
+
+  public static void close() { Context.exit(); }
 
 }

demos/altjs/com/sheetjs/ObjectNotFoundException.java

@@ -5,6 +5,6 @@
 import java.lang.Exception;
 
 public class ObjectNotFoundException extends Exception {
-	public ObjectNotFoundException() {}
-	public ObjectNotFoundException(String message) { super(message); }
+  public ObjectNotFoundException() {}
+  public ObjectNotFoundException(String message) { super(message); }
 }