version bump 0.4.1: more XLSB + cleanup

- updated ssf to 0.5.4 - cleaned up CSV string output - added CSV tests (from test_files) - passes lint - inlineStr actually parses <is> block - more XLSB bits
SheetJS · Jan 29, 2014 · 6990e66 · 6990e66
1 parent 32d835a
commit 6990e66
Show file tree

Hide file tree

Showing 18 changed files with 78 additions and 68 deletions.
diff --git a/bits/10_ssf.js b/bits/10_ssf.js
@@ -6,7 +6,7 @@ var _strrev = function(x) { return String(x).split("").reverse().join("");};
 function fill(c,l) { return new Array(l+1).join(c); }
 function pad(v,d,c){var t=String(v);return t.length>=d?t:(fill(c||0,d-t.length)+t);}
 function rpad(v,d,c){var t=String(v);return t.length>=d?t:(t+fill(c||0,d-t.length));}
-SSF.version = '0.5.3';
+SSF.version = '0.5.4';
 /* Options */
 var opts_fmt = {};
 function fixopts(o){for(var y in opts_fmt) if(o[y]===undefined) o[y]=opts_fmt[y];}
@@ -236,11 +236,11 @@ var write_num = function(type, fmt, val) {
 	}
 	if(fmt.match(/^00+$/)) return (val<0?"-":"")+pad(Math.round(aval),fmt.length);
 	if(fmt.match(/^[#?]+$/)) return String(Math.round(val)).replace(/^0$/,"");
-	if(r = fmt.match(/^#*0+\.(0+)/)) {
+	if((r = fmt.match(/^#*0+\.(0+)/))) {
 		o = Math.round(val * Math.pow(10,r[1].length));
 		return String(o/Math.pow(10,r[1].length)).replace(/^([^\.]+)$/,"$1."+r[1]).replace(/\.$/,"."+r[1]).replace(/\.([0-9]*)$/,function($$, $1) { return "." + $1 + fill("0", r[1].length-$1.length); });
 	}
-	if(r = fmt.match(/^# ([?]+)([ ]?)\/([ ]?)([?]+)/)) {
+	if((r = fmt.match(/^# ([?]+)([ ]?)\/([ ]?)([?]+)/))) {
 		var rr = Math.min(Math.max(r[1].length, r[4].length),7);
 		ff = frac(aval, Math.pow(10,rr)-1, true);
 		return sign + (ff[0]||(ff[1] ? "" : "0")) + " " + (ff[1] ? pad(ff[1],rr," ") + r[2] + "/" + r[3] + rpad(ff[2],rr," "): fill(" ", 2*rr+1 + r[2].length + r[3].length));
@@ -403,6 +403,7 @@ var format = function format(fmt,v,o) {
 	var f = choose_fmt(fmt, v, o);
 	if(f[1].toLowerCase() === "general") return general_fmt(v,o);
 	if(v === true) v = "TRUE"; if(v === false) v = "FALSE";
+	if(v === "" || typeof v === "undefined") return "";
 	return eval_fmt(f[1], v, o, f[0]);
 };
 

diff --git a/bits/31_version.js b/bits/31_version.js
@@ -1 +1 @@
-XLSX.version = '0.4.0';
+XLSX.version = '0.4.1';
diff --git a/bits/32_codepage.js b/bits/32_codepage.js
@@ -1,6 +1,7 @@
+var current_codepage, current_cptable, cptable;
 if(typeof module !== "undefined" && typeof require !== 'undefined') {
-	if(typeof cptable === 'undefined') var cptable = require('codepage');
-	var current_codepage = 1252, current_cptable = cptable[1252];
+	if(typeof cptable === 'undefined') cptable = require('codepage');
+	current_codepage = 1252; current_cptable = cptable[1252];
 }
 function reset_cp() {
 	current_codepage = 1252; if(typeof cptable !== 'undefined') current_cptable = cptable[1252];

diff --git a/bits/36_xlsxutils.js b/bits/36_xlsxutils.js
@@ -7,7 +7,7 @@ function parsexmltag(tag) {
 	return z;
 }
 
-function evert(obj) { 
+function evert(obj) {
 	var o = {};
 	Object.keys(obj).forEach(function(k) { if(obj.hasOwnProperty(k)) o[obj[k]] = k; });
 	return o;
@@ -20,9 +20,9 @@ var encodings = {
 	'&lt;': '<',
 	'&amp;': '&'
 };
-var rencoding = evert(encodings); 
+var rencoding = evert(encodings);
 var rencstr = "&<>'\"".split("");
- 
+
 // TODO: CP remap (need to read file version to determine OS)
 function unescapexml(text){
 	var s = text + '';

diff --git a/bits/38_recordhopper.js b/bits/38_recordhopper.js
@@ -1,13 +1,13 @@
 /* [MS-XLSB] 2.1.4 Record */
 var recordhopper = function(data, cb) {
-	var tmpbyte, cntbyte;
+	var tmpbyte, cntbyte, length;
 	prep_blob(data, data.l || 0);
 	while(data.l < data.length) {
 		var RT = data.read_shift(1);
 		if(RT & 0x80) RT = (RT & 0x7F) + ((data.read_shift(1) & 0x7F)<<7);
 		var R = RecordEnum[RT] || RecordEnum[0xFFFF];
 
-		var length = tmpbyte = data.read_shift(1);
+		length = tmpbyte = data.read_shift(1);
 		for(cntbyte = 1; cntbyte <4 && (tmpbyte & 0x80); ++cntbyte) length += ((tmpbyte = data.read_shift(1)) & 0x7F)<<(7*cntbyte);
 		var d = R.f(data, length);
 		if(cb(d, R)) return;

diff --git a/bits/39_parsestructs.js b/bits/39_parsestructs.js
@@ -4,11 +4,11 @@ var parse_RichStr = function(data, length) {
 	var flags = data.read_shift(1);
 	var fRichStr = flags & 1, fExtStr = flags & 2;
 	var str = parse_XLWideString(data);
-	z = {
+	var z = {
 		t: str,
 		raw:"<t>" + escapexml(str) + "</t>",
 		r: str
-	}
+	};
 	if(fRichStr) {
 		/* TODO: formatted string */
 		var dwSizeStrRun = data.read_shift(4);
@@ -53,7 +53,7 @@ var parse_UncheckedRfX = function(data) {
 	cell.s.c = data.read_shift(4);
 	cell.e.c = data.read_shift(4);
 	return cell;
-}
+};
 
 /* [MS-XLSB] 2.5.166 */
 var parse_XLNullableWideString = function(data) {

diff --git a/bits/52_sstxml.js b/bits/52_sstxml.js
@@ -107,7 +107,7 @@ var parse_si = function(x) {
 	var y;
 	/* 18.4.12 t ST_Xstring (Plaintext String) */
 	if(x[1] === 't') {
-		z.t = utf8read(unescapexml(x.replace(/<[^>]*>/g,"")));
+		z.t = utf8read(unescapexml(x.substr(x.indexOf(">")+1).split(/<\/t>/)[0]));
 		z.raw = x;
 		z.r = z.t;
 	}

diff --git a/bits/53_sstbin.js b/bits/53_sstbin.js
@@ -1,7 +1,7 @@
 /* [MS-XLSB] 2.4.219 BrtBeginSst */
 var parse_BrtBeginSst = function(data, length) {
 	return [data.read_shift(4), data.read_shift(4)];
-}
+};
 
 /* [MS-XLSB] 2.1.7.45 Shared Strings */
 var parse_sst_bin = function(data) {
@@ -13,6 +13,6 @@ var parse_sst_bin = function(data) {
 			case 'BrtEndSst': return true;
 			default: throw new Error("Unexpected record " + R.n);
 		}
-	});	
+	});
 	return s;
 };
diff --git a/bits/60_xlsx.js b/bits/60_xlsx.js
@@ -129,7 +129,7 @@ function parseRels(data, currentFilePath) {
 			}
 		}
 		return toksFrom.join('/');
-	}
+	};
 
 	data.match(/<[^>]*>/g).forEach(function(x) {
 		var y = parsexmltag(x);

diff --git a/bits/65_comments.js b/bits/65_comments.js
@@ -40,7 +40,7 @@ function parseCommentsAddToSheets(zip, dirComments, sheets, sheetRels) {
 				}
 			}
 		}
-	}	
+	}
 }
 
 function insertCommentsIntoSheet(sheetName, sheet, comments) {

diff --git a/bits/72_wsxml.js b/bits/72_wsxml.js
@@ -22,10 +22,10 @@ function parse_worksheet(data) {
 		if(refguess.e.r < row.r - 1) refguess.e.r = row.r - 1;
 
 		/* 18.3.1.4 c CT_Cell */
-		var cells = x.substr(x.indexOf('>')+1).split(/<c/);
+		var cells = x.substr(x.indexOf('>')+1).split(/<c /);
 		cells.forEach(function(c, idx) { if(c === "" || c.trim() === "") return;
 			var cref = c.match(/r="([^"]*)"/);
-			c = "<c" + c;
+			c = "<c " + c;
 			if(cref && cref.length == 2) {
 				var cref_cell = decode_cell(cref[1]);
 				idx = cref_cell.c;
@@ -47,9 +47,11 @@ function parse_worksheet(data) {
 					p.v = strs[sidx].t;
 					p.r = strs[sidx].r;
 				} break;
-				case 'str': if(p.v) p.v = utf8read(p.v); break; // normal string
+				case 'str': if(p.v) p.v = utf8read(p.v); break;
 				case 'inlineStr':
-					p.t = 'str'; p.v = unescapexml((d.match(matchtag('t'))||["",""])[1]);
+					var is = d.match(/<is>(.*)<\/is>/);
+					is = is ? parse_si(is[1]) : {t:"",r:""};
+					p.t = 'str'; p.v = is.t;
 					break; // inline string
 				case 'b':
 					switch(p.v) {

diff --git a/bits/73_wsbin.js b/bits/73_wsbin.js
@@ -60,10 +60,11 @@ var parse_BrtCellSt = function(data, length) {
 	return [cell, value, 'str'];
 };
 
-/* [MS-XLSB] 2.4.648 BrtCellError */
-var parse_BrtCellError = function(data, length) {
+/* [MS-XLSB] 2.4.648 BrtFmlaError */
+var parse_BrtFmlaError = function(data, length) {
 	var cell = parse_Cell(data);
 	var fBool = data.read_shift(1);
+	data.l += length-9;
 	return [cell, fBool, 'e'];
 };
 
@@ -76,7 +77,6 @@ var parse_BrtFmlaNum = function(data, length) {
 };
 
 var parse_BrtCellBlank = parsenoop;
-var parse_BrtFmlaError = parsenoop;
 var parse_BrtFmlaBool = parsenoop;
 var parse_BrtFmlaString = parsenoop;
 

diff --git a/bits/78_wbbin.js b/bits/78_wbbin.js
@@ -11,7 +11,7 @@ var parse_BrtBundleSh = function(data, length) {
 /* [MS-XLSB] 2.1.7.60 Workbook */
 var parse_wb_bin = function(data) {
 	var wb = { AppVersion:{}, WBProps:{}, WBView:[], Sheets:[], CalcPr:{}, xmlns: "" };
-	var pass = false;
+	var pass = false, z;
 
 	recordhopper(data, function(val, R) {
 		switch(R.n) {
@@ -50,4 +50,4 @@ var parse_wb_bin = function(data) {
 	_ssfopts.date1904 = parsexmlbool(wb.WBProps.date1904, 'date1904');
 
 	return wb;
-}
+};
diff --git a/bits/85_parsezip.js b/bits/85_parsezip.js
@@ -23,6 +23,7 @@ function parseZip(zip) {
 	if(dir.calcchain) deps=parseDeps(getdata(getzipfile(zip, dir.calcchain.replace(/^\//,''))));
 	var sheets = {}, i=0;
 	var sheetRels = {};
+	var path, relsPath;
 	if(!props.Worksheets) {
 		/* Google Docs doesn't generate the appropriate metadata, so we impute: */
 		var wbsheets = wb.Sheets;
@@ -33,8 +34,8 @@ function parseZip(zip) {
 		}
 		for(i = 0; i != props.Worksheets; ++i) {
 			try { /* TODO: remove these guards */
-				var path = 'xl/worksheets/sheet' + (i+1) + (xlsb?'.bin':'.xml');
-				var relsPath = path.replace(/^(.*)(\/)([^\/]*)$/, "$1/_rels/$3.rels");
+				path = 'xl/worksheets/sheet' + (i+1) + (xlsb?'.bin':'.xml');
+				relsPath = path.replace(/^(.*)(\/)([^\/]*)$/, "$1/_rels/$3.rels");
 				sheets[props.SheetNames[i]]=parse_ws(getdata(getzipfile(zip, path)),path);
 				sheetRels[props.SheetNames[i]]=parseRels(getdata(getzipfile(zip, relsPath)), path);
 			} catch(e) {}
@@ -43,8 +44,8 @@ function parseZip(zip) {
 		for(i = 0; i != props.Worksheets; ++i) {
 			try {
 				//var path = dir.sheets[i].replace(/^\//,'');
-				var path = 'xl/worksheets/sheet' + (i+1) + (xlsb?'.bin':'.xml');
-				var relsPath = path.replace(/^(.*)(\/)([^\/]*)$/, "$1/_rels/$3.rels");
+				path = 'xl/worksheets/sheet' + (i+1) + (xlsb?'.bin':'.xml');
+				relsPath = path.replace(/^(.*)(\/)([^\/]*)$/, "$1/_rels/$3.rels");
 				sheets[props.SheetNames[i]]=parse_ws(getdata(getzipfile(zip, path)),path);
 				sheetRels[props.SheetNames[i]]=parseRels(getdata(getzipfile(zip, relsPath)), path);
 			} catch(e) {/*console.error(e);*/}

diff --git a/bits/90_utils.js b/bits/90_utils.js
@@ -57,7 +57,7 @@ function sheet_to_csv(sheet, opts) {
 			case 'n': return String(val.v);
 			case 's': case 'str':
 				if(typeof val.v === 'undefined') return "";
-				return JSON.stringify(val.v);
+				return '"' + val.v.replace(/"/,'""') + '"';
 			case 'b': return val.v ? "TRUE" : "FALSE";
 			case 'e': return val.v; /* throw out value in case of error */
 			default: throw 'unrecognized type ' + val.t;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xlsx",
-	"version": "0.4.0",
+	"version": "0.4.1",
 	"author": "sheetjs",
 	"description": "XLSB / XLSX / XLSM parser",
 	"keywords": [ "xlsx", "xlsb", "xlsm", "office", "excel", "spreadsheet" ],

diff --git a/tests/files b/tests/files