version bump 0.12.13: sylk niggles

- sylk column-major order support - third-party extensions in SST - `string` type codepage
SheetJS · May 20, 2018 · 233102d · 233102d
1 parent c0b4895
commit 233102d
Show file tree

Hide file tree

Showing 21 changed files with 193 additions and 101 deletions.
diff --git a/bits/01_version.js b/bits/01_version.js
@@ -1 +1 @@
-XLSX.version = '0.12.12';
+XLSX.version = '0.12.13';
diff --git a/bits/22_xmlutils.js b/bits/22_xmlutils.js
@@ -152,7 +152,6 @@ if(has_buf) {
 	};
 	var corpus = "foo bar baz\u00e2\u0098\u0083\u00f0\u009f\u008d\u00a3";
 	if(utf8read(corpus) == utf8readb(corpus)) utf8read = utf8readb;
-	// $FlowIgnore
 	var utf8readc = function utf8readc(data) { return Buffer.from(data, 'binary').toString('utf8'); };
 	if(utf8read(corpus) == utf8readc(corpus)) utf8read = utf8readc;
 

diff --git a/bits/29_xlsenum.js b/bits/29_xlsenum.js
@@ -105,8 +105,8 @@ var SpecialProperties = {
 	DocSummaryPIDDSI[y] = SummaryPIDSI[y] = SpecialProperties[y];
 })();
 
-var DocSummaryRE = evert_key(DocSummaryPIDDSI, "n");
-var SummaryRE = evert_key(SummaryPIDSI, "n");
+var DocSummaryRE/*:{[key:string]:string}*/ = evert_key(DocSummaryPIDDSI, "n");
+var SummaryRE/*:{[key:string]:string}*/ = evert_key(SummaryPIDSI, "n");
 
 /* [MS-XLS] 2.4.63 Country/Region codes */
 var CountryEnum = {

diff --git a/bits/38_xlstypes.js b/bits/38_xlstypes.js
@@ -138,9 +138,10 @@ function write_TypedPropertyValue(type/*:number*/, value) {
 		case 0x03 /*VT_I4*/: p.write_shift(-4, value); break;
 		case 0x05 /*VT_I4*/: p = new_buf(8); p.write_shift(8, value, 'f'); break;
 		case 0x0B /*VT_BOOL*/: p.write_shift(4, value ? 0x01 : 0x00); break;
-		case 0x40 /*VT_FILETIME*/: p = write_FILETIME(value); break;
+		case 0x40 /*VT_FILETIME*/: /*:: if(typeof value !== "string" && !(value instanceof Date)) throw "unreachable"; */ p = write_FILETIME(value); break;
 		case 0x1F /*VT_LPWSTR*/:
 		case 0x50 /*VT_STRING*/:
+			/*:: if(typeof value !== "string") throw "unreachable"; */
 			p = new_buf(4 + 2 * (value.length + 1) + (value.length % 2 ? 0 : 2));
 			p.write_shift(4, value.length + 1);
 			p.write_shift(0, value, "dbcs");
@@ -291,8 +292,12 @@ function write_PropertySet(entries, RE, PIDSI) {
 		var val = entries[i][1], idx = 0;
 		if(RE) {
 			idx = +RE[entries[i][0]];
-			var pinfo = PIDSI[idx];
-			if(pinfo.p == "version" && typeof val == "string") val = (+((val = val.split("."))[0])<<16) + (+val[1]||0);
+			var pinfo = (PIDSI/*:: || {}*/)[idx]/*:: || {} */;
+			if(pinfo.p == "version" && typeof val == "string") {
+				/*:: if(typeof val !== "string") throw "unreachable"; */
+				var arr = val.split(".");
+				val = ((+arr[0])<<16) + ((+arr[1])||0);
+			}
 			pr = write_TypedPropertyValue(pinfo.t, val);
 		} else {
 			var T = guess_property_type(val);
@@ -350,7 +355,7 @@ function parse_PropertySetStream(file, PIDSI, clsid) {
 	rval.FMTID = [FMTID0, FMTID1]; // TODO: verify FMTID0/1
 	return rval;
 }
-function write_PropertySetStream(entries, clsid, RE, PIDSI, entries2/*:?any*/, clsid2/*:?any*/) {
+function write_PropertySetStream(entries, clsid, RE, PIDSI/*:{[key:string|number]:any}*/, entries2/*:?any*/, clsid2/*:?any*/) {
 	var hdr = new_buf(entries2 ? 68 : 48);
 	var bufs = [hdr];
 	hdr.write_shift(2, 0xFFFE);

diff --git a/bits/40_harb.js b/bits/40_harb.js
@@ -330,11 +330,11 @@ var SYLK = (function() {
 					formats.push(rstr.slice(3).replace(/;;/g, ";"));
 				break;
 			case 'C':
-			var C_seen_K = false;
+			var C_seen_K = false, C_seen_X = false;
 			for(rj=1; rj<record.length; ++rj) switch(record[rj].charAt(0)) {
-				case 'X': C = parseInt(record[rj].slice(1))-1; break;
+				case 'X': C = parseInt(record[rj].slice(1))-1; C_seen_X = true; break;
 				case 'Y':
-					R = parseInt(record[rj].slice(1))-1; C = 0;
+					R = parseInt(record[rj].slice(1))-1; if(!C_seen_X) C = 0;
 					for(j = arr.length; j <= R; ++j) arr[j] = [];
 					break;
 				case 'K':
@@ -348,6 +348,7 @@ var SYLK = (function() {
 					} else if(!isNaN(fuzzydate(val).getDate())) {
 						val = parseDate(val);
 					}
+					if(typeof cptable !== 'undefined' && typeof val == "string" && ((opts||{}).type != "string") && (opts||{}).codepage) val = cptable.utils.decode(opts.codepage, val);
 					C_seen_K = true;
 					break;
 				case 'E':

diff --git a/bits/42_sstxml.js b/bits/42_sstxml.js
@@ -4,6 +4,7 @@ var parse_rs = (function parse_rs_factory() {
 	/* 18.4.7 rPr CT_RPrElt */
 	var parse_rpr = function parse_rpr(rpr, intro, outro) {
 		var font = {}, cp = 65001, align = "";
+		var pass = false;
 		var m = rpr.match(tagregex), i = 0;
 		if(m) for(;i!=m.length; ++i) {
 			var y = parsexmltag(m[i]);
@@ -94,8 +95,12 @@ var parse_rs = (function parse_rs_factory() {
 				/* 18.8.35 scheme CT_FontScheme TODO */
 				case '<scheme': break;
 
+				/* 18.2.10 extLst CT_ExtensionList ? */
+				case '<extLst': case '<extLst>': case '</extLst>': break;
+				case '<ext': pass = true; break;
+				case '</ext>': pass = false; break;
 				default:
-					if(y[0].charCodeAt(1) !== 47) throw 'Unrecognized rich format ' + y[0];
+					if(y[0].charCodeAt(1) !== 47 && !pass) throw new Error('Unrecognized rich format ' + y[0]);
 			}
 		}
 		var style/*:Array<string>*/ = [];

diff --git a/bits/76_xls.js b/bits/76_xls.js
@@ -873,11 +873,13 @@ function write_xls_props(wb/*:Workbook*/, cfb/*:CFBContainer*/) {
 	var i = 0, Keys;
 	if(wb.Props) {
 		Keys = keys(wb.Props);
+		// $FlowIgnore
 		for(i = 0; i < Keys.length; ++i) (DocSummaryRE.hasOwnProperty(Keys[i]) ? DSEntries : SummaryRE.hasOwnProperty(Keys[i]) ? SEntries : CEntries).push([Keys[i], wb.Props[Keys[i]]]);
 	}
 	if(wb.Custprops) {
 		Keys = keys(wb.Custprops);
-		for(i = 0; i < Keys.length; ++i) if(!wb.Props.hasOwnProperty(Keys[i])) (DocSummaryRE.hasOwnProperty(Keys[i]) ? DSEntries : SummaryRE.hasOwnProperty(Keys[i]) ? SEntries : CEntries).push([Keys[i], wb.Custprops[Keys[i]]]);
+		// $FlowIgnore
+		for(i = 0; i < Keys.length; ++i) if(!(wb.Props||{}).hasOwnProperty(Keys[i])) (DocSummaryRE.hasOwnProperty(Keys[i]) ? DSEntries : SummaryRE.hasOwnProperty(Keys[i]) ? SEntries : CEntries).push([Keys[i], wb.Custprops[Keys[i]]]);
 	}
 	var CEntries2 = [];
 	for(i = 0; i < CEntries.length; ++i) {

diff --git a/bits/87_read.js b/bits/87_read.js
@@ -78,7 +78,7 @@ function readSync(data/*:RawData*/, opts/*:?ParseOpts*/)/*:Workbook*/ {
 	if(o.dateNF) _ssfopts.dateNF = o.dateNF;
 	if(!o.type) o.type = (has_buf && Buffer.isBuffer(data)) ? "buffer" : "base64";
 	if(o.type == "file") { o.type = has_buf ? "buffer" : "binary"; d = read_binary(data); }
-	if(o.type == "string") { str = true; o.type = "binary"; d = bstrify(data); }
+	if(o.type == "string") { str = true; o.type = "binary"; o.codepage = 65001; d = bstrify(data); }
 	if(o.type == 'array' && typeof Uint8Array !== 'undefined' && data instanceof Uint8Array && typeof ArrayBuffer !== 'undefined') {
 		// $FlowIgnore
 		var ab=new ArrayBuffer(3), vu=new Uint8Array(ab); vu.foo="bar";

diff --git a/dist/xlsx.core.min.js b/dist/xlsx.core.min.js
diff --git a/dist/xlsx.core.min.map b/dist/xlsx.core.min.map
diff --git a/dist/xlsx.extendscript.js b/dist/xlsx.extendscript.js
diff --git a/dist/xlsx.full.min.js b/dist/xlsx.full.min.js
diff --git a/dist/xlsx.full.min.map b/dist/xlsx.full.min.map
diff --git a/dist/xlsx.js b/dist/xlsx.js
diff --git a/dist/xlsx.min.js b/dist/xlsx.min.js
diff --git a/dist/xlsx.min.map b/dist/xlsx.min.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xlsx",
-	"version": "0.12.12",
+	"version": "0.12.13",
 	"author": "sheetjs",
 	"description": "SheetJS Spreadsheet data parser and writer",
 	"keywords": [

diff --git a/test.js b/test.js
@@ -1983,6 +1983,25 @@ describe('CSV', function() {
 	});
 });
 
+describe('sylk', function() {
+	var cpavail = true;
+	var bef = (function() {
+		if(typeof cptable == 'undefined') cpavail = false;
+	});
+	if(typeof before != 'undefined') before(bef);
+	describe('input', function(){
+		it('codepage', cpavail ? function() {
+			var str = "ID;PWXL;N;E\r\nC;X1;Y1;K\"a – b\"\r\nE", A1 =  "a – b";
+			assert.equal(get_cell(X.read(str, {type:"string"}).Sheets.Sheet1, "A1").v, A1);
+			assert.equal(get_cell(X.read(str.replace(/–/, "\x96"), {type:"binary", codepage:1252}).Sheets.Sheet1, "A1").v, A1);
+			if(typeof Buffer !== 'undefined' && !browser) {
+				assert.equal(get_cell(X.read(Buffer.from(str), {type:"buffer", codepage:65001}).Sheets.Sheet1, "A1").v, A1);
+				assert.equal(get_cell(X.read(Buffer.from(str.replace(/–/, "\x96"), "binary"), {type:"buffer", codepage:1252}).Sheets.Sheet1, "A1").v, A1);
+			}
+		} : null);
+	});
+});
+
 if(fs.existsSync(dir + 'dbf/d11.dbf')) describe('dbf', function() {
 	var wbs/*:Array<any>*/ = ([
 		['d11',  dir + 'dbf/d11.dbf'],