added test cases from #2560 's thread; fixed more rounding edge cases

fix rounding issue
See: #2560 - Improved rounding to account for minutes, hours, etc. - Added tests for rounding dates/times
2022-06-21 20:58:17 +00:00 · 2022-06-15 18:40:16 +00:00
459 changed files with 20767 additions and 21460 deletions
--- a/.eslintrc
+++ b/.eslintrc
@ -11,7 +11,6 @@
 		"comma-dangle": [ 2, "never" ],
 		"curly": 0,
 		"no-bitwise": 0,
-		"no-cond-assign": 1,
 		"no-console": 0,
 		"no-control-regex": 0,
 		"no-unused-vars": 1,
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,6 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-    - name: Issues and Questions
-      url: https://git.sheetjs.com/sheetjs/sheetjs/issues
-      about: Please report issues to the official code repository.
-
--- a/.github/workflows/bun.yml
+++ b/.github/workflows/bun.yml
@ -1,20 +0,0 @@
-name: 'Tests: Bun'
-
-on: [pull_request, push]
-
-jobs:
-  # misc test
-  misc:
-    name: 'misc (with codepage)'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: antongolub/action-setup-bun@v1
-      - uses: ljharb/actions/node/install@main
-        with:
-          node-version: '16.'
-      - run: sudo curl -Lo /usr/bin/rooster https://github.com/SheetJS/rooster/releases/download/v0.2.0/rooster-v0.2.0-linux-amd64
-      - run: sudo chmod a+x /usr/bin/rooster
-      - run: make init
-      - run: 'cd test_files; make all; cd -'
-      - run: 'env FMTS=misc bun hotcross.mjs'
--- a/.github/workflows/deno.yml
+++ b/.github/workflows/deno.yml
@ -3,9 +3,26 @@ name: 'Tests: deno 1.x'
 on: [pull_request, push]

 jobs:
+  # small test
+  misc:
+    runs-on: ubuntu-latest
+    env:
+      FMTS: misc
+    steps:
+      - uses: actions/checkout@v2
+      - uses: denoland/setup-deno@main
+        with:
+          deno-version: v1.x
+      - uses: ljharb/actions/node/install@main
+        with:
+          node-version: '16.'
+      - run: sudo curl -Lo /usr/bin/rooster https://github.com/SheetJS/rooster/releases/download/v0.2.0/rooster-v0.2.0-linux-amd64
+      - run: sudo chmod a+x /usr/bin/rooster
+      - run: make init
+      - run: 'cd test_files; make all; cd -'
+      - run: deno test --allow-env --allow-read --allow-write --config misc/test.deno.jsonc test.ts
  # full test
  full:
-    name: 'full (with codepage)'
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
@ -20,20 +37,3 @@ jobs:
      - run: make init
      - run: 'cd test_files; make all; cd -'
      - run: deno test --allow-env --allow-read --allow-write --config misc/test.deno.jsonc test.ts
-  # full test (no codepage)
-  fullnocp:
-    name: 'full (no codepage)'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: denoland/setup-deno@main
-        with:
-          deno-version: v1.x
-      - uses: ljharb/actions/node/install@main
-        with:
-          node-version: '16.'
-      - run: sudo curl -Lo /usr/bin/rooster https://github.com/SheetJS/rooster/releases/download/v0.2.0/rooster-v0.2.0-linux-amd64
-      - run: sudo chmod a+x /usr/bin/rooster
-      - run: make init
-      - run: 'cd test_files; make all; cd -'
-      - run: deno test --allow-env --allow-read --allow-write --config misc/test.deno.jsonc testnocp.ts
--- a/.gitignore
+++ b/.gitignore
@ -14,7 +14,6 @@ tmp
 *.[pP][mM][dD]*
 *.[pP][dD][fF]
 *.[sS][lL][kK]
-*.[sS][yY][lL][kK]
 *.socialcalc
 *.[xX][lL][sSwWcCaAtTmMrR]
 *.[xX][lL][sSaAtT][xXmMbB]
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,3 @@
 [submodule "test_files"]
 	path = test_files
 	url = https://github.com/SheetJS/test_files
-	ignore = dirty
--- a/.npmignore
+++ b/.npmignore
@ -60,9 +60,6 @@ shim.js
 test.js
 test.mjs
 test.ts
-test.mts
-testnocp.ts
-testbun.mjs
 .jscs.json
 .gitmodules
 .travis.yml
--- a/.spelling
+++ b/.spelling
@ -54,7 +54,6 @@ Rollup
 SessionStorage
 SQLite
 SystemJS
-Vite
 VueJS
 WebKit
 WebSQL
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,51 +4,6 @@ This log is intended to keep track of backwards-incompatible changes, including
 but not limited to API changes and file location changes.  Minor behavioral
 changes may not be included if they are not expected to break existing code.

-* Export `NaN` values to `#NUM!` and infinite values to `#DIV/0!`
-
-## v0.19.3
-
-* XLSX Ensure comment address is valid (h/t @slonser)
-* Enforce Excel worksheet name restrictions
-* Fixed "Prototype Pollution" vulnerability (CVE-2023-30533)
-
-## v0.19.2
-
-* XLSX proper decoding of hyperlinks (h/t @tw-yaxu)
-* XLSX ignore unexpected attributes in rich text (h/t @colin4)
-* `sheet_to_json` type fix (h/t @chsdwn)
-
-## v0.19.1
-
-* Fixed types issue in strict mode (h/t @younes-io)
-* Numbers 12.2 parsing skip ActivityStream.iwa
-
-## v0.19.0
-
-* XLSX export hyperlinks compatible with google sheets (h/t Evan Bovie)
-* NUMBERS export multiple sheets, full worksheet range
-* formalized `dense` mode
-
-## v0.18.12
-
-* `package.json` added types in `exports` structure
-* uncapped NUMBERS single-sheet single-table export
-* DBF export records using supported codepages
-
-## v0.18.11
-
-* Base64 input ignore data URI wrapper
-* Parse ZIP files that use ZIP64 extended information field
-* More precise handling of time-only values
-* Threaded Comment fallback text for older Excel
-
-## v0.18.10
-
-* `exports` field in package.json to satiate ViteJS and newer tooling
-* JSC (Safari / Bun) perf, see <https://bugs.webkit.org/show_bug.cgi?id=243148>
-* workbook `bookType` property to denote the origin format when parsed from file
-* XLSX force export of stub cells with number formats when `sheetStubs` is set
-
 ## v0.18.9

 * XLSX / ODS write defined names
@ -59,7 +14,7 @@ changes may not be included if they are not expected to break existing code.
 ## v0.18.8

 * Plaintext parsing of dateless meridien time values (`1:23:45 PM`)
-* Legacy format (SYLK / WK# / Multiplan) minutiae
+* Legacy format (SYLK / WK# / Multiplan) minutiae 

 ## v0.18.7

--- a/33
+++ b/33
@ -113,7 +113,6 @@ BYTEFILER=dist/xlsx.extendscript.js xlsx.mjs
 bytes: ## Display minified and gzipped file sizes
 	@for i in $(BYTEFILEC); do npx printj "%-30s %7d %10d" $$i $$(wc -c < $$i) $$(gzip --best --stdout $$i | wc -c); done
 	@for i in $(BYTEFILER); do npx printj "%-30s %7d" $$i $$(wc -c < $$i); done
-	@npx printj "%-30s         %10d" "treeshake" "$$(npx esbuild@0.14.14 --bundle misc/import.js | wc -c)"


 .PHONY: git
@ -138,9 +137,6 @@ pkg: bin/xlsx.njs xlsx.js ## Build pkg standalone executable
 test mocha: test.js ## Run test suite
 	mocha -R spec -t 30000

-#*                      To run tests for one format, make test_<fmt>
-#*                      To run the core test suite, make test_misc
-
 .PHONY: test-esm
 test-esm: test.mjs ## Run Node ESM test suite
 	npx -y mocha@9 -R spec -t 30000 $<
@ -148,18 +144,12 @@ test-esm: test.mjs ## Run Node ESM test suite
 test.ts: test.mts
 	node -pe 'var data = fs.readFileSync("'$<'", "utf8"); data.split("\n").map(function(l) { return l.replace(/^describe\((.*?)function\(\)/, "Deno.test($$1async function(t)").replace(/\b(?:it|describe)\((.*?)function\(\)/g, "await t.step($$1async function(t)").replace("assert.ok", "assert.assert"); }).join("\n")' > $@

-.PHONY: test-bun
-test-bun: testbun.mjs ## Run Bun test suite
-	bun $<
-
 .PHONY: test-deno
 test-deno: test.ts ## Run Deno test suite
-	deno test --check --allow-env --allow-read --allow-write --config misc/test.deno.jsonc $<
-
-.PHONY: test-denocp
-test-denocp: testnocp.ts ## Run Deno test suite (without codepage)
-	deno test --check --allow-env --allow-read --allow-write --config misc/test.deno.jsonc $<
+	deno test --allow-env --allow-read --allow-write --config misc/test.deno.jsonc $<

+#*                      To run tests for one format, make test_<fmt>
+#*                      To run the core test suite, make test_misc
 TESTFMT=$(patsubst %,test_%,$(FMT))
 .PHONY: $(TESTFMT)
 $(TESTFMT): test_%:
@ -171,20 +161,10 @@ $(TESTESMFMT): test-esm_%:
 	FMTS=$* make test-esm

 TESTDENOFMT=$(patsubst %,test-deno_%,$(FMT))
-.PHONY: $(TESTDENOFMT)
+.PHONY: $(TESTESMFMT)
 $(TESTDENOFMT): test-deno_%:
 	FMTS=$* make test-deno

-TESTDENOCPFMT=$(patsubst %,test-denocp_%,$(FMT))
-.PHONY: $(TESTDENOCPFMT)
-$(TESTDENOCPFMT): test-denocp_%:
-	FMTS=$* make test-denocp
-
-TESTBUNFMT=$(patsubst %,test-bun_%,$(FMT))
-.PHONY: $(TESTBUNFMT)
-$(TESTBUNFMT): test-bun_%:
-	FMTS=$* make test-bun
-
 .PHONY: travis
 travis: ## Run test suite with minimal output
 	mocha -R dot -t 30000
@ -195,7 +175,7 @@ ctest: ## Build browser test fixtures

 .PHONY: ctestserv
 ctestserv: ## Start a test server on port 8000
-	@cd tests && python -mSimpleHTTPServer || python3 -mhttp.server || npx -y http-server -p 8000 .
+	@cd tests && python -mSimpleHTTPServer

 ## Code Checking

@ -246,7 +226,8 @@ misc/coverage.html: $(TARGET) test.js
 coveralls: ## Coverage Test + Send to coveralls.io
 	mocha --require blanket --reporter mocha-lcov-reporter -t 30000 | node ./node_modules/coveralls/bin/coveralls.js

-MDLINT=README.md
+DEMOMDS=$(sort $(wildcard demos/*/README.md))
+MDLINT=$(DEMOMDS) README.md demos/README.md
 .PHONY: mdlint
 mdlint: $(MDLINT) ## Check markdown documents
 	./node_modules/.bin/alex $^
--- a/README.md
+++ b/README.md
@ -9,7 +9,13 @@ Edit complex templates with ease; let out your inner Picasso with styling; make
 custom sheets with images/graphs/PivotTables; evaluate formula expressions and
 port calculations to web apps; automate common spreadsheet tasks, and much more!

-[![Analytics](https://ga-beacon.appspot.com/UA-36810333-1/SheetJS/sheetjs?pixel)](https://git.sheetjs.com/SheetJS/sheetjs)
+![License](https://img.shields.io/github/license/SheetJS/sheetjs)
+[![Build Status](https://img.shields.io/github/workflow/status/sheetjs/sheetjs/Tests:%20node.js)](https://github.com/SheetJS/sheetjs/actions)
+[![Snyk Vulnerabilities](https://img.shields.io/snyk/vulnerabilities/github/SheetJS/sheetjs)](https://snyk.io/test/github/SheetJS/sheetjs)
+[![npm Downloads](https://img.shields.io/npm/dm/xlsx.svg)](https://cdn.sheetjs.com/)
+[![GitHub Repo stars](https://img.shields.io/github/stars/SheetJS/sheetjs?style=social)](https://github.com/SheetJS/sheetjs)
+
+[![Analytics](https://ga-beacon.appspot.com/UA-36810333-1/SheetJS/sheetjs?pixel)](https://github.com/SheetJS/sheetjs)

 [![Build Status](https://saucelabs.com/browser-matrix/sheetjs.svg)](https://saucelabs.com/u/sheetjs)

@ -29,9 +35,9 @@ port calculations to web apps; automate common spreadsheet tasks, and much more!

 - [`test_files`](https://github.com/SheetJS/test_files): Sample spreadsheets

- [`cfb`](https://git.sheetjs.com/SheetJS/js-cfb): Container (OLE/ZIP) format library
+- [`cfb`](https://github.com/SheetJS/js-cfb): Container (OLE/ZIP) format library

- [`codepage`](https://git.sheetjs.com/SheetJS/js-codepage): Legacy text encodings
+- [`codepage`](https://github.com/SheetJS/js-codepage): Legacy text encodings

 ## License

--- a/bits/01_version.js
+++ b/bits/01_version.js
@ -1 +1 @@
-XLSX.version = '0.19.3';
+XLSX.version = '0.18.9';
--- a/bits/02_codepage.js
+++ b/bits/02_codepage.js
@ -41,11 +41,6 @@ function utf16leread(data/*:string*/)/*:string*/ {
 	for(var i = 0; i < (data.length>>1); ++i) o[i] = String.fromCharCode(data.charCodeAt(2*i) + (data.charCodeAt(2*i+1)<<8));
 	return o.join("");
 }
-function utf16lereadu(data/*:Uint8Array*/)/*:string*/ {
-	var o/*:Array<string>*/ = [];
-	for(var i = 0; i < (data.length>>1); ++i) o[i] = String.fromCharCode(data[2*i] + (data[2*i+1]<<8));
-	return o.join("");
-}
 function utf16beread(data/*:string*/)/*:string*/ {
 	var o/*:Array<string>*/ = [];
 	for(var i = 0; i < (data.length>>1); ++i) o[i] = String.fromCharCode(data.charCodeAt(2*i+1) + (data.charCodeAt(2*i)<<8));
--- a/bits/04_base64.js
+++ b/bits/04_base64.js
@ -19,36 +19,10 @@ function Base64_encode(input) {
  }
  return o;
 }
-function Base64_encode_pass(input) {
-  var o = "";
-  var c1 = 0, c2 = 0, c3 = 0, e1 = 0, e2 = 0, e3 = 0, e4 = 0;
-  for (var i = 0; i < input.length; ) {
-    c1 = input.charCodeAt(i++);
-    if (c1 > 255)
-      c1 = 95;
-    e1 = c1 >> 2;
-    c2 = input.charCodeAt(i++);
-    if (c2 > 255)
-      c2 = 95;
-    e2 = (c1 & 3) << 4 | c2 >> 4;
-    c3 = input.charCodeAt(i++);
-    if (c3 > 255)
-      c3 = 95;
-    e3 = (c2 & 15) << 2 | c3 >> 6;
-    e4 = c3 & 63;
-    if (isNaN(c2)) {
-      e3 = e4 = 64;
-    } else if (isNaN(c3)) {
-      e4 = 64;
-    }
-    o += Base64_map.charAt(e1) + Base64_map.charAt(e2) + Base64_map.charAt(e3) + Base64_map.charAt(e4);
-  }
-  return o;
-}
 function Base64_decode(input) {
  var o = "";
  var c1 = 0, c2 = 0, c3 = 0, e1 = 0, e2 = 0, e3 = 0, e4 = 0;
-  input = input.replace(/^data:([^\/]+\/[^\/]+)?;base64\,/, "").replace(/[^\w\+\/\=]/g, "");
+  input = input.replace(/[^\w\+\/\=]/g, "");
  for (var i = 0; i < input.length; ) {
    e1 = Base64_map.indexOf(input.charAt(i++));
    e2 = Base64_map.indexOf(input.charAt(i++));
--- a/bits/05_buf.js
+++ b/bits/05_buf.js
@ -8,13 +8,6 @@ var Buffer_from = /*#__PURE__*/(function() {
 	}
 	return function() {};
 })();
-var buf_utf16le = /*#__PURE__*/(function() {
-	if(typeof Buffer === 'undefined') return false;
-	var x = Buffer_from([65,0]);
-	if(!x) return false;
-	var o = x.toString("utf16le");
-	return o.length == 1;
-})();


 function new_raw_buf(len/*:number*/) {
@ -71,7 +64,7 @@ var bconcat = has_buf ? function(bufs) { return Buffer.concat(bufs.map(function(
 		for(i = 0, maxlen = 0; i < bufs.length; maxlen += len, ++i) {
 			len = bufs[i].length;
 			if(bufs[i] instanceof Uint8Array) o.set(bufs[i], maxlen);
-			else if(typeof bufs[i] == "string") o.set(new Uint8Array(s2a(bufs[i])), maxlen);
+			else if(typeof bufs[i] == "string") { throw "wtf"; }
 			else o.set(new Uint8Array(bufs[i]), maxlen);
 		}
 		return o;
--- a/bits/18_cfb.js
+++ b/bits/18_cfb.js
@ -73,7 +73,7 @@ function slice_by_16_tables(T) {
 		for(c = 256 + n; c < 4096; c += 256) v = table[c] = (v >>> 8) ^ T[v & 0xFF];
 	}
 	var out = [];
-	for(n = 1; n != 16; ++n) out[n - 1] = typeof Int32Array !== 'undefined' && typeof table.subarray == "function" ? table.subarray(n * 256, n * 256 + 256) : table.slice(n * 256, n * 256 + 256);
+	for(n = 1; n != 16; ++n) out[n - 1] = typeof Int32Array !== 'undefined' ? table.subarray(n * 256, n * 256 + 256) : table.slice(n * 256, n * 256 + 256);
 	return out;
 }
 var TT = slice_by_16_tables(T0);
@ -211,15 +211,8 @@ function parse_extra_field(blob/*:CFBlob*/)/*:any*/ {
 					if(flags & 4) p.ctime = blob.read_shift(4);
 				}
 				if(p.mtime) p.mt = new Date(p.mtime*1000);
-			} break;
-			/* ZIP64 Extended Information Field */
-			case 0x0001: {
-				var sz1 = blob.read_shift(4), sz2 = blob.read_shift(4);
-				p.usz = (sz2 * Math.pow(2,32) + sz1);
-				sz1 = blob.read_shift(4); sz2 = blob.read_shift(4);
-				p.csz = (sz2 * Math.pow(2,32) + sz1);
-				// NOTE: volume fields are skipped
-			} break;
+			}
+			break;
 		}
 		blob.l = tgt;
 		o[type] = p;
@ -306,7 +299,7 @@ sleuth_fat(difat_start, difat_sec_cnt, sectors, ssz, fat_addrs);
 /** Chains */
 var sector_list/*:SectorList*/ = make_sector_list(sectors, dir_start, fat_addrs, ssz);

-if(dir_start < sector_list.length) sector_list[dir_start].name = "!Directory";
+sector_list[dir_start].name = "!Directory";
 if(nmfs > 0 && minifat_start !== ENDOFCHAIN) sector_list[minifat_start].name = "!MiniFAT";
 sector_list[fat_addrs[0]].name = "!FAT";
 sector_list.fat_addrs = fat_addrs;
@ -1408,11 +1401,6 @@ function parse_zip(file/*:RawBytes*/, options/*:CFBReadOpts*/)/*:CFBContainer*/

 		var L = blob.l;
 		blob.l = offset + 4;
-		/* ZIP64 lengths */
-		if(EF && EF[0x0001]) {
-			if((EF[0x0001]||{}).usz) usz = EF[0x0001].usz;
-			if((EF[0x0001]||{}).csz) csz = EF[0x0001].csz;
-		}
 		parse_local_file(blob, csz, usz, o, EF);
 		blob.l = L;
 	}
@ -1442,13 +1430,7 @@ function parse_local_file(blob/*:CFBlob*/, csz/*:number*/, usz/*:number*/, o/*:C
 	if(efsz) {
 		var ef = parse_extra_field(/*::(*/blob.slice(blob.l, blob.l + efsz)/*:: :any)*/);
 		if((ef[0x5455]||{}).mt) date = ef[0x5455].mt;
-		if((ef[0x0001]||{}).usz) _usz = ef[0x0001].usz;
-		if((ef[0x0001]||{}).csz) _csz = ef[0x0001].csz;
-		if(EF) {
-			if((EF[0x5455]||{}).mt) date = EF[0x5455].mt;
-			if((EF[0x0001]||{}).usz) _usz = ef[0x0001].usz;
-			if((EF[0x0001]||{}).csz) _csz = ef[0x0001].csz;
-		}
+		if(((EF||{})[0x5455]||{}).mt) date = EF[0x5455].mt;
 	}
 	blob.l += efsz;

@ -1500,9 +1482,9 @@ function write_zip(cfb/*:CFBContainer*/, options/*:CFBWriteOpts*/)/*:RawBytes*/
 		var namebuf = new_buf(fp.length);
 		for(j = 0; j < fp.length; ++j) namebuf.write_shift(1, fp.charCodeAt(j) & 0x7F);
 		namebuf = namebuf.slice(0, namebuf.l);
-		crcs[fcnt] = typeof fi.content == "string" ? CRC32.bstr(fi.content, 0) : CRC32.buf(/*::((*/fi.content/*::||[]):any)*/, 0);
+		crcs[fcnt] = CRC32.buf(/*::((*/fi.content/*::||[]):any)*/, 0);

-		var outbuf = typeof fi.content == "string" ? s2a(fi.content) : fi.content/*::||[]*/;
+		var outbuf = fi.content/*::||[]*/;
 		if(method == 8) outbuf = _deflateRawSync(outbuf);

 		/* local file header */
--- a/bits/20_jsutils.js
+++ b/bits/20_jsutils.js
@ -103,8 +103,7 @@ function parseDate(str/*:string|Date*/, fixdate/*:?number*/)/*:Date*/ {

 function cc2str(arr/*:Array<number>*/, debomit)/*:string*/ {
 	if(has_buf && Buffer.isBuffer(arr)) {
-		if(debomit && buf_utf16le) {
-			// TODO: temporary patch
+		if(debomit) {
 			if(arr[0] == 0xFF && arr[1] == 0xFE) return utf8write(arr.slice(2).toString("utf16le"));
 			if(arr[1] == 0xFE && arr[2] == 0xFF) return utf8write(utf16beread(arr.slice(2).toString("binary")));
 		}
@ -159,22 +158,22 @@ function fuzzynum(s/*:string*/)/*:number*/ {
 }

 /* NOTE: Chrome rejects bare times like 1:23 PM */
-var FDRE1 = /^(0?\d|1[0-2])(?:|:([0-5]?\d)(?:|(\.\d+)(?:|:([0-5]?\d))|:([0-5]?\d)(|\.\d+)))\s+([ap])m?$/;
+var FDRE1 = /^(0?\d|1[0-2])(?:|:([0-5]?\d)(?:|(\.\d+)(?:|:([0-5]?\d))|:([0-5]?\d)(|\.\d+)))([ap])m?/;

 function fuzzytime1(M) /*:Date*/ {
-    /* TODO: 1904 adjustment, keep in sync with base date */
-    if(!M[2]) return new Date(1899,11,30,(+M[1]%12) + (M[7] == "p" ? 12 : 0), 0, 0, 0);
+    /* TODO: 1904 adjustment */
+    if(!M[2]) return new Date(1900,0,0,(+M[1]%12) + (M[7] == "p" ? 12 : 0), 0, 0, 0);
    if(M[3]) {
-        if(M[4]) return new Date(1899,11,30,(+M[1]%12) + (M[7] == "p" ? 12 : 0), +M[2], +M[4], parseFloat(M[3])*1000);
-        else return new Date(1899,11,30,(M[7] == "p" ? 12 : 0), +M[1], +M[2], parseFloat(M[3])*1000);
+        if(M[4]) return new Date(1900,0,0,(+M[1]%12) + (M[7] == "p" ? 12 : 0), +M[2], +M[4], parseFloat(M[3])*1000);
+        else return new Date(1900,0,0,(M[7] == "p" ? 12 : 0), +M[1], +M[2], parseFloat(M[3])*1000);
    }
-    else if(M[5]) return new Date(1899,11,30, (+M[1]%12) + (M[7] == "p" ? 12 : 0), +M[2], +M[5], M[6] ? parseFloat(M[6]) * 1000 : 0);
-    else return new Date(1899,11,30,(+M[1]%12) + (M[7] == "p" ? 12 : 0), +M[2], 0, 0);
+    else if(M[5]) return new Date(1900, 0, 0, (+M[1]%12) + (M[7] == "p" ? 12 : 0), +M[2], +M[5], M[6] ? parseFloat(M[6]) * 1000 : 0);
+    else return new Date(1900,0,0,(+M[1]%12) + (M[7] == "p" ? 12 : 0), +M[2], 0, 0);
 }
 var lower_months = ['january', 'february', 'march', 'april', 'may', 'june', 'july', 'august', 'september', 'october', 'november', 'december'];
 function fuzzydate(s/*:string*/)/*:Date*/ {
 	var lower = s.toLowerCase();
-	var lnos = lower.replace(/\s+/g, " ").trim();
+	var lnos = lower.replace(/\s+/g, "");
 	var M = lnos.match(FDRE1);
 	if(M) return fuzzytime1(M);

@ -185,7 +184,9 @@ function fuzzydate(s/*:string*/)/*:Date*/ {
 		lower = lower.replace(/[^a-z]/g,"").replace(/([^a-z]|^)[ap]m?([^a-z]|$)/,"");
 		if(lower.length > 3 && lower_months.indexOf(lower) == -1) return n;
 	} else if(lower.replace(/[ap]m?/, "").match(/[a-z]/)) return n;
-	if(y < 0 || y > 8099 || s.match(/[^-0-9:,\/\\]/)) return n;
+	if(y < 0 || y > 8099) return n;
+	if((m > 0 || d > 1) && y != 101) return o;
+	if(s.match(/[^-0-9:,\/\\]/)) return n;
 	return o;
 }

--- a/bits/22_xmlutils.js
+++ b/bits/22_xmlutils.js
@ -246,7 +246,7 @@ function xlml_normalize(d)/*:string*/ {
 	throw new Error("Bad input format: expected Buffer or string");
 }
 /* UOS uses CJK in tags */
-var xlmlregex = /<(\/?)([^\s?><!\/:]*:|)([^\s?<>:\/]+)(?:[\s?:\/](?:[^>=]|="[^"]*?")*)?>/mg;
+var xlmlregex = /<(\/?)([^\s?><!\/:]*:|)([^\s?<>:\/]+)(?:[\s?:\/][^>]*)?>/mg;
 //var xlmlregex = /<(\/?)([a-z0-9]*:|)(\w+)[^>]*>/mg;

 var XMLNS = ({
--- a/bits/23_binutils.js
+++ b/bits/23_binutils.js
@ -29,7 +29,7 @@ var ___toBuffer = function(bufs/*:Array<Array<RawBytes> >*/)/*:RawBytes*/ { var
 var __toBuffer = has_buf ? function(bufs) { return (bufs[0].length > 0 && Buffer.isBuffer(bufs[0][0])) ? Buffer.concat(bufs[0].map(function(x) { return Buffer.isBuffer(x) ? x : Buffer_from(x); })) : ___toBuffer(bufs);} : ___toBuffer;

 var ___utf16le = function(b/*:RawBytes|CFBlob*/,s/*:number*/,e/*:number*/)/*:string*/ { var ss/*:Array<string>*/=[]; for(var i=s; i<e; i+=2) ss.push(String.fromCharCode(__readUInt16LE(b,i))); return ss.join("").replace(chr0,''); };
-var __utf16le = has_buf ? function(b/*:RawBytes|CFBlob*/,s/*:number*/,e/*:number*/)/*:string*/ { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/ || !buf_utf16le) return ___utf16le(b,s,e); return b.toString('utf16le',s,e).replace(chr0,'')/*.replace(chr1,'!')*/; } : ___utf16le;
+var __utf16le = has_buf ? function(b/*:RawBytes|CFBlob*/,s/*:number*/,e/*:number*/)/*:string*/ { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/) return ___utf16le(b,s,e); return b.toString('utf16le',s,e).replace(chr0,'')/*.replace(chr1,'!')*/; } : ___utf16le;

 var ___hexlify = function(b/*:RawBytes|CFBlob*/,s/*:number*/,l/*:number*/)/*:string*/ { var ss/*:Array<string>*/=[]; for(var i=s; i<s+l; ++i) ss.push(("0" + b[i].toString(16)).slice(-2)); return ss.join(""); };
 var __hexlify = has_buf ? function(b/*:RawBytes|CFBlob*/,s/*:number*/,l/*:number*/)/*:string*/ { return Buffer.isBuffer(b)/*:: && b instanceof Buffer*/ ? b.toString('hex',s,s+l) : ___hexlify(b,s,l); } : ___hexlify;
@ -60,8 +60,8 @@ var is_buf = function is_buf_a(a) { return Array.isArray(a) || (typeof Uint8Arra
 if(has_buf/*:: && typeof Buffer !== 'undefined'*/) {
 	__lpstr = function lpstr_b(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/) return ___lpstr(b, i); var len = b.readUInt32LE(i); return len > 0 ? b.toString('utf8',i+4,i+4+len-1) : "";};
 	__cpstr = function cpstr_b(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/) return ___cpstr(b, i); var len = b.readUInt32LE(i); return len > 0 ? b.toString('utf8',i+4,i+4+len-1) : "";};
-	__lpwstr = function lpwstr_b(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/ || !buf_utf16le) return ___lpwstr(b, i); var len = 2*b.readUInt32LE(i); return b.toString('utf16le',i+4,i+4+len-1);};
-	__lpp4 = function lpp4_b(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/ || !buf_utf16le) return ___lpp4(b, i); var len = b.readUInt32LE(i); return b.toString('utf16le',i+4,i+4+len);};
+	__lpwstr = function lpwstr_b(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/) return ___lpwstr(b, i); var len = 2*b.readUInt32LE(i); return b.toString('utf16le',i+4,i+4+len-1);};
+	__lpp4 = function lpp4_b(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/) return ___lpp4(b, i); var len = b.readUInt32LE(i); return b.toString('utf16le',i+4,i+4+len);};
 	__8lpp4 = function lpp4_8b(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/) return ___8lpp4(b, i); var len = b.readUInt32LE(i); return b.toString('utf8',i+4,i+4+len);};
 	__double = function double_(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(Buffer.isBuffer(b)/*::&& b instanceof Buffer*/) return b.readDoubleLE(i); return ___double(b,i); };
 	is_buf = function is_buf_b(a) { return Buffer.isBuffer(a) || Array.isArray(a) || (typeof Uint8Array !== "undefined" && a instanceof Uint8Array); };
@ -91,7 +91,7 @@ function ReadShift(size/*:number*/, t/*:?string*/)/*:number|string*/ {
 	switch(t) {
 		case 'dbcs':
 			loc = this.l;
-			if(has_buf && Buffer.isBuffer(this)  && buf_utf16le) o = this.slice(this.l, this.l+2*size).toString("utf16le");
+			if(has_buf && Buffer.isBuffer(this)) o = this.slice(this.l, this.l+2*size).toString("utf16le");
 			else for(i = 0; i < size; ++i) { o+=String.fromCharCode(__readUInt16LE(this, loc)); loc+=2; }
 			size *= 2;
 			break;
@ -181,29 +181,21 @@ function WriteShift(t/*:number*/, val/*:string|number*/, f/*:?string*/)/*:any*/
 		/*:: if(typeof val !== 'string') throw new Error("unreachable"); */
 		for(i = 0; i != val.length; ++i) __writeUInt16LE(this, val.charCodeAt(i), this.l + 2 * i);
 		size = 2 * val.length;
-	} else if(f === 'sbcs' || f == 'cpstr') {
+	} else if(f === 'sbcs') {
 		if(typeof $cptable !== 'undefined' && current_ansi == 874) {
 			/* TODO: use tables directly, don't encode */
 			/*:: if(typeof val !== "string") throw new Error("unreachable"); */
 			for(i = 0; i != val.length; ++i) {
-				var cpp = $cptable.utils.encode(current_ansi, val.charAt(i));
-				this[this.l + i] = cpp[0];
+				var cppayload = $cptable.utils.encode(current_ansi, val.charAt(i));
+				this[this.l + i] = cppayload[0];
 			}
-			size = val.length;
-		} else if(typeof $cptable !== 'undefined' && f == 'cpstr') {
-			cpp = $cptable.utils.encode(current_codepage, val);
-			/* replace null bytes with _ when relevant */
-      if(cpp.length == val.length) for(i = 0; i < val.length; ++i) if(cpp[i] == 0 && val.charCodeAt(i) != 0) cpp[i] = 0x5F;
-      if(cpp.length == 2 * val.length) for(i = 0; i < val.length; ++i) if(cpp[2*i] == 0 && cpp[2*i+1] == 0 && val.charCodeAt(i) != 0) cpp[2*i] = 0x5F;
-			for(i = 0; i < cpp.length; ++i) this[this.l + i] = cpp[i];
-			size = cpp.length;
 		} else {
 			/*:: if(typeof val !== 'string') throw new Error("unreachable"); */
 			val = val.replace(/[^\x00-\x7F]/g, "_");
 			/*:: if(typeof val !== 'string') throw new Error("unreachable"); */
 			for(i = 0; i != val.length; ++i) this[this.l + i] = (val.charCodeAt(i) & 0xFF);
-			size = val.length;
 		}
+		size = val.length;
 	} else if(f === 'hex') {
 		for(; i < t; ++i) {
 			/*:: if(typeof val !== "string") throw new Error("unreachable"); */
--- a/bits/24_hoppers.js
+++ b/bits/24_hoppers.js
@ -31,11 +31,8 @@ function buf_array()/*:BufArray*/ {

 	var endbuf = function ba_endbuf() {
 		if(!curbuf) return;
-		// workaround for new Buffer(3).slice(0,0) bug in bun 0.1.3
-		if(curbuf.l) {
-			if(curbuf.length > curbuf.l) { curbuf = curbuf.slice(0, curbuf.l); curbuf.l = curbuf.length; }
-			if(curbuf.length > 0) bufs.push(curbuf);
-		}
+		if(curbuf.length > curbuf.l) { curbuf = curbuf.slice(0, curbuf.l); curbuf.l = curbuf.length; }
+		if(curbuf.length > 0) bufs.push(curbuf);
 		curbuf = null;
 	};

--- a/bits/27_csfutils.js
+++ b/bits/27_csfutils.js
@ -9,6 +9,7 @@ function fix_col(cstr/*:string*/)/*:string*/ { return cstr.replace(/^([A-Z])/,"$
 function unfix_col(cstr/*:string*/)/*:string*/ { return cstr.replace(/^\$([A-Z])/,"$1"); }

 function split_cell(cstr/*:string*/)/*:Array<string>*/ { return cstr.replace(/(\$?[A-Z]*)(\$?\d*)/,"$1,$2").split(","); }
+//function decode_cell(cstr/*:string*/)/*:CellAddress*/ { var splt = split_cell(cstr); return { c:decode_col(splt[0]), r:decode_row(splt[1]) }; }
 function decode_cell(cstr/*:string*/)/*:CellAddress*/ {
 	var R = 0, C = 0;
 	for(var i = 0; i < cstr.length; ++i) {
@ -18,6 +19,7 @@ function decode_cell(cstr/*:string*/)/*:CellAddress*/ {
 	}
 	return { c: C - 1, r:R - 1 };
 }
+//function encode_cell(cell/*:CellAddress*/)/*:string*/ { return encode_col(cell.c) + encode_row(cell.r); }
 function encode_cell(cell/*:CellAddress*/)/*:string*/ {
 	var col = cell.c + 1;
 	var s="";
@ -110,10 +112,9 @@ function sheet_to_workbook(sheet/*:Worksheet*/, opts)/*:Workbook*/ {

 function sheet_add_aoa(_ws/*:?Worksheet*/, data/*:AOA*/, opts/*:?any*/)/*:Worksheet*/ {
 	var o = opts || {};
-	var dense = _ws ? (_ws["!data"] != null) : o.dense;
+	var dense = _ws ? Array.isArray(_ws) : o.dense;
 	if(DENSE != null && dense == null) dense = DENSE;
-	var ws/*:Worksheet*/ = _ws || ({}/*:any*/);
-	if(dense && !ws["!data"]) ws["!data"] = [];
+	var ws/*:Worksheet*/ = _ws || (dense ? ([]/*:any*/) : ({}/*:any*/));
 	var _R = 0, _C = 0;
 	if(ws && o.origin != null) {
 		if(typeof o.origin == 'number') _R = o.origin;
@ -132,19 +133,13 @@ function sheet_add_aoa(_ws/*:?Worksheet*/, data/*:AOA*/, opts/*:?any*/)/*:Worksh
 		range.e.r = Math.max(range.e.r, _range.e.r);
 		if(_R == -1) range.e.r = _R = _range.e.r + 1;
 	}
-	var row = [];
 	for(var R = 0; R != data.length; ++R) {
 		if(!data[R]) continue;
 		if(!Array.isArray(data[R])) throw new Error("aoa_to_sheet expects an array of arrays");
-		var __R = _R + R, __Rstr = "" + (__R + 1);
-		if(dense) {
-			if(!ws["!data"][__R]) ws["!data"][__R] = [];
-			row = ws["!data"][__R];
-		}
 		for(var C = 0; C != data[R].length; ++C) {
 			if(typeof data[R][C] === 'undefined') continue;
 			var cell/*:Cell*/ = ({v: data[R][C] }/*:any*/);
-			var __C = _C + C;
+			var __R = _R + R, __C = _C + C;
 			if(range.s.r > __R) range.s.r = __R;
 			if(range.s.c > __C) range.s.c = __C;
 			if(range.e.r < __R) range.e.r = __R;
@ -168,10 +163,11 @@ function sheet_add_aoa(_ws/*:?Worksheet*/, data/*:AOA*/, opts/*:?any*/)/*:Worksh
 				else cell.t = 's';
 			}
 			if(dense) {
-				if(row[__C] && row[__C].z) cell.z = row[__C].z;
-				row[__C] = cell;
+				if(!ws[__R]) ws[__R] = [];
+				if(ws[__R][__C] && ws[__R][__C].z) cell.z = ws[__R][__C].z;
+				ws[__R][__C] = cell;
 			} else {
-				var cell_ref = encode_col(__C) + __Rstr/*:any*/;
+				var cell_ref = encode_cell(({c:__C,r:__R}/*:any*/));
 				if(ws[cell_ref] && ws[cell_ref].z) cell.z = ws[cell_ref].z;
 				ws[cell_ref] = cell;
 			}
--- a/bits/31_rels.js
+++ b/bits/31_rels.js
@ -52,7 +52,7 @@ function parse_rels(data/*:?string*/, currentFilePath/*:string*/) {
 		var y = parsexmltag(x);
 		/* 9.3.2.2 OPC_Relationships */
 		if (y[0] === '<Relationship') {
-			var rel = {}; rel.Type = y.Type; rel.Target = unescapexml(y.Target); rel.Id = y.Id; if(y.TargetMode) rel.TargetMode = y.TargetMode;
+			var rel = {}; rel.Type = y.Type; rel.Target = y.Target; rel.Id = y.Id; if(y.TargetMode) rel.TargetMode = y.TargetMode;
 			var canonictarget = y.TargetMode === 'External' ? y.Target : resolve_path(y.Target, currentFilePath);
 			rels[canonictarget] = rel;
 			hash[y.Id] = rel;
--- a/bits/32_odmanrdf.js
+++ b/bits/32_odmanrdf.js
@ -1,61 +1,62 @@
+/* Open Document Format for Office Applications (OpenDocument) Version 1.2 */
+/* Part 3 Section 4 Manifest File */
 var CT_ODS = "application/vnd.oasis.opendocument.spreadsheet";
 function parse_manifest(d, opts) {
-  var str = xlml_normalize(d);
-  var Rn;
-  var FEtag;
-  while (Rn = xlmlregex.exec(str))
-    switch (Rn[3]) {
-      case "manifest":
-        break;
-      case "file-entry":
-        FEtag = parsexmltag(Rn[0], false);
-        if (FEtag.path == "/" && FEtag.type !== CT_ODS)
-          throw new Error("This OpenDocument is not a spreadsheet");
-        break;
-      case "encryption-data":
-      case "algorithm":
-      case "start-key-generation":
-      case "key-derivation":
-        throw new Error("Unsupported ODS Encryption");
-      default:
-        if (opts && opts.WTF)
-          throw Rn;
-    }
+	var str = xlml_normalize(d);
+	var Rn;
+	var FEtag;
+	while((Rn = xlmlregex.exec(str))) switch(Rn[3]) {
+		case 'manifest': break; // 4.2 <manifest:manifest>
+		case 'file-entry': // 4.3 <manifest:file-entry>
+			FEtag = parsexmltag(Rn[0], false);
+			if(FEtag.path == '/' && FEtag.type !== CT_ODS) throw new Error("This OpenDocument is not a spreadsheet");
+			break;
+		case 'encryption-data': // 4.4 <manifest:encryption-data>
+		case 'algorithm': // 4.5 <manifest:algorithm>
+		case 'start-key-generation': // 4.6 <manifest:start-key-generation>
+		case 'key-derivation': // 4.7 <manifest:key-derivation>
+			throw new Error("Unsupported ODS Encryption");
+		default: if(opts && opts.WTF) throw Rn;
+	}
 }
-function write_manifest(manifest) {
-  var o = [XML_HEADER];
-  o.push('<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.2">\n');
-  o.push('  <manifest:file-entry manifest:full-path="/" manifest:version="1.2" manifest:media-type="application/vnd.oasis.opendocument.spreadsheet"/>\n');
-  for (var i = 0; i < manifest.length; ++i)
-    o.push('  <manifest:file-entry manifest:full-path="' + manifest[i][0] + '" manifest:media-type="' + manifest[i][1] + '"/>\n');
-  o.push("</manifest:manifest>");
-  return o.join("");
+
+function write_manifest(manifest/*:Array<Array<string> >*/)/*:string*/ {
+	var o = [XML_HEADER];
+	o.push('<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.2">\n');
+	o.push('  <manifest:file-entry manifest:full-path="/" manifest:version="1.2" manifest:media-type="application/vnd.oasis.opendocument.spreadsheet"/>\n');
+	for(var i = 0; i < manifest.length; ++i) o.push('  <manifest:file-entry manifest:full-path="' + manifest[i][0] + '" manifest:media-type="' + manifest[i][1] + '"/>\n');
+	o.push('</manifest:manifest>');
+	return o.join("");
 }
-function write_rdf_type(file, res, tag) {
-  return [
-    '  <rdf:Description rdf:about="' + file + '">\n',
-    '    <rdf:type rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/' + (tag || "odf") + "#" + res + '"/>\n',
-    "  </rdf:Description>\n"
-  ].join("");
+
+/* Part 3 Section 6 Metadata Manifest File */
+function write_rdf_type(file/*:string*/, res/*:string*/, tag/*:?string*/) {
+	return [
+		'  <rdf:Description rdf:about="' + file + '">\n',
+		'    <rdf:type rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/' + (tag || "odf") + '#' + res + '"/>\n',
+		'  </rdf:Description>\n'
+	].join("");
 }
-function write_rdf_has(base, file) {
-  return [
-    '  <rdf:Description rdf:about="' + base + '">\n',
-    '    <ns0:hasPart xmlns:ns0="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#" rdf:resource="' + file + '"/>\n',
-    "  </rdf:Description>\n"
-  ].join("");
+function write_rdf_has(base/*:string*/, file/*:string*/) {
+	return [
+		'  <rdf:Description rdf:about="' + base + '">\n',
+		'    <ns0:hasPart xmlns:ns0="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#" rdf:resource="' + file + '"/>\n',
+		'  </rdf:Description>\n'
+	].join("");
 }
 function write_rdf(rdf) {
-  var o = [XML_HEADER];
-  o.push('<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">\n');
-  for (var i = 0; i != rdf.length; ++i) {
-    o.push(write_rdf_type(rdf[i][0], rdf[i][1]));
-    o.push(write_rdf_has("", rdf[i][0]));
-  }
-  o.push(write_rdf_type("", "Document", "pkg"));
-  o.push("</rdf:RDF>");
-  return o.join("");
+	var o = [XML_HEADER];
+	o.push('<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">\n');
+	for(var i = 0; i != rdf.length; ++i) {
+		o.push(write_rdf_type(rdf[i][0], rdf[i][1]));
+		o.push(write_rdf_has("",rdf[i][0]));
+	}
+	o.push(write_rdf_type("","Document", "pkg"));
+	o.push('</rdf:RDF>');
+	return o.join("");
 }
-function write_meta_ods(wb, opts) {
-  return '<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xlink="http://www.w3.org/1999/xlink" office:version="1.2"><office:meta><meta:generator>SheetJS ' + XLSX.version + "</meta:generator></office:meta></office:document-meta>";
+/* TODO: pull properties */
+function write_meta_ods(/*:: wb: Workbook, opts: any*/)/*:string*/ {
+	return '<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xlink="http://www.w3.org/1999/xlink" office:version="1.2"><office:meta><meta:generator>Sheet' + 'JS ' + XLSX.version + '</meta:generator></office:meta></office:document-meta>';
 }
+
--- a/bits/35_custprops.js
+++ b/bits/35_custprops.js
@ -5,7 +5,7 @@ function parse_cust_props(data/*:string*/, opts) {
 	var m = data.match(custregex);
 	if(m) for(var i = 0; i != m.length; ++i) {
 		var x = m[i], y = parsexmltag(x);
-		switch(strip_ns(y[0])) {
+		switch(y[0]) {
 			case '<?xml': break;
 			case '<Properties': break;
 			case '<property': name = unescapexml(y.name); break;
--- a/bits/39_xlsbiff.js
+++ b/bits/39_xlsbiff.js
@ -138,7 +138,7 @@ function parse_FtArray(blob, length/*::, ot*/) {
 		var ft = blob.read_shift(2);
 		blob.l-=2;
 		try {
-			fts[ft] = FtTab[ft](blob, tgt - blob.l);
+			fts.push(FtTab[ft](blob, tgt - blob.l));
 		} catch(e) { blob.l = tgt; return fts; }
 	}
 	if(blob.l != tgt) blob.l = tgt; //throw new Error("bad Object Ft-sequence");
@ -696,11 +696,9 @@ function parse_Lbl(blob, length, opts) {
 	};
 }

-/* [MS-XLS] 2.4.106 TODO: legacy record filename encoding */
+/* [MS-XLS] 2.4.106 TODO: verify filename encoding */
 function parse_ExternSheet(blob, length, opts) {
 	if(opts.biff < 8) return parse_BIFF5ExternSheet(blob, length, opts);
-	/* see issue 2907 */
-	if(!(opts.biff > 8) && (length == blob[blob.l] + (blob[blob.l+1] == 0x03 ? 1 : 0) + 1)) return parse_BIFF5ExternSheet(blob, length, opts);
 	var o = [], target = blob.l + length, len = blob.read_shift(opts.biff > 8 ? 4 : 2);
 	while(len-- !== 0) o.push(parse_XTI(blob, opts.biff > 8 ? 12 : 6, opts));
 		// [iSupBook, itabFirst, itabLast];
--- a/bits/40_harb.js
+++ b/bits/40_harb.js
@ -1,3 +1,4 @@
+/* from js-harb (C) 2014-present  SheetJS */
 var DBF_SUPPORTED_VERSIONS = [0x02, 0x03, 0x30, 0x31, 0x83, 0x8B, 0x8C, 0xF5];
 var DBF = /*#__PURE__*/(function() {
 var dbf_codepage_map = {
@ -118,7 +119,7 @@ function dbf_to_aoa(buf, opts)/*:AOA*/ {
 	var ww = l7 ? 32 : 11;
 	while(d.l < hend && d[d.l] != 0x0d) {
 		field = ({}/*:any*/);
-		field.name = (typeof $cptable !== "undefined" ? $cptable.utils.decode(current_cp, d.slice(d.l, d.l+ww)) : a2s(d.slice(d.l, d.l + ww))).replace(/[\u0000\r\n].*$/g,"");
+		field.name = $cptable.utils.decode(current_cp, d.slice(d.l, d.l+ww)).replace(/[\u0000\r\n].*$/g,"");
 		d.l += ww;
 		field.type = String.fromCharCode(d.read_shift(1));
 		if(ft != 0x02 && !l7) field.offset = d.read_shift(4);
@ -172,7 +173,7 @@ function dbf_to_aoa(buf, opts)/*:AOA*/ {
 		for(C = 0; C != fields.length; ++C) {
 			var dd = d.slice(d.l, d.l+fields[C].len); d.l+=fields[C].len;
 			prep_blob(dd, 0);
-			var s = typeof $cptable !== "undefined" ? $cptable.utils.decode(current_cp, dd) : a2s(dd);
+			var s = $cptable.utils.decode(current_cp, dd);
 			switch(fields[C].type) {
 				case 'C':
 					// NOTE: it is conventional to write '  /  /  ' for empty dates
@ -234,18 +235,14 @@ function dbf_to_sheet(buf, opts)/*:Worksheet*/ {
 }

 function dbf_to_workbook(buf, opts)/*:Workbook*/ {
-	try {
-		var o = sheet_to_workbook(dbf_to_sheet(buf, opts), opts);
-		o.bookType = "dbf";
-		return o;
-	} catch(e) { if(opts && opts.WTF) throw e; }
+	try { return sheet_to_workbook(dbf_to_sheet(buf, opts), opts); }
+	catch(e) { if(opts && opts.WTF) throw e; }
 	return ({SheetNames:[],Sheets:{}});
 }

 var _RLEN = { 'B': 8, 'C': 250, 'L': 1, 'D': 8, '?': 0, '': 0 };
 function sheet_to_dbf(ws/*:Worksheet*/, opts/*:WriteOpts*/) {
 	var o = opts || {};
-	var old_cp = current_codepage;
 	if(+o.codepage >= 0) set_cp(+o.codepage);
 	if(o.type == "string") throw new Error("Cannot write DBF to JS string");
 	var ba = buf_array();
@ -281,8 +278,7 @@ function sheet_to_dbf(ws/*:Worksheet*/, opts/*:WriteOpts*/) {
 				case 'object': _guess = col[j] instanceof Date ? 'D' : 'C'; break;
 				default: _guess = 'C';
 			}
-			/* TODO: cache the values instead of encoding twice */
-			maxlen = Math.max(maxlen, (typeof $cptable !== "undefined" && typeof col[j] == "string" ? $cptable.utils.encode(current_ansi, col[j]): String(col[j])).length);
+			maxlen = Math.max(maxlen, String(col[j]).length);
 			guess = guess && guess != _guess ? 'C' : _guess;
 			//if(guess == 'C') break;
 		}
@ -308,17 +304,11 @@ function sheet_to_dbf(ws/*:Worksheet*/, opts/*:WriteOpts*/) {
 	h.write_shift(2, 296 + 32 * hcnt);
 	h.write_shift(2, rlen);
 	for(i=0; i < 4; ++i) h.write_shift(4, 0);
-	var cp = +dbf_reverse_map[/*::String(*/current_codepage/*::)*/] || 0x03;
-	h.write_shift(4, 0x00000000 | (cp<<8));
-	if(dbf_codepage_map[cp] != +o.codepage) {
-		if(o.codepage) console.error("DBF Unsupported codepage " + current_codepage + ", using 1252");
-		current_codepage = 1252;
-	}
+	h.write_shift(4, 0x00000000 | ((+dbf_reverse_map[/*::String(*/current_ansi/*::)*/] || 0x03)<<8));

 	for(i = 0, j = 0; i < headers.length; ++i) {
 		if(headers[i] == null) continue;
 		var hf = ba.next(32);
-		/* TODO: test how applications handle non-ASCII field names */
 		var _f = (headers[i].slice(-10) + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00").slice(0, 11);
 		hf.write_shift(1, _f, "sbcs");
 		hf.write_shift(1, coltypes[i] == '?' ? 'C' : coltypes[i], "sbcs");
@ -347,7 +337,6 @@ function sheet_to_dbf(ws/*:Worksheet*/, opts/*:WriteOpts*/) {
 				case 'N':
 					var _n = "0";
 					if(typeof data[i][j] == "number") _n = data[i][j].toFixed(coldecimals[j]||0);
-					if(_n.length > colwidths[j]) _n = _n.slice(0, colwidths[j]); // addresses decimal > width
 					for(hcnt=0; hcnt < colwidths[j]-_n.length; ++hcnt) rout.write_shift(1, 0x20);
 					rout.write_shift(1, _n, "sbcs");
 					break;
@ -359,16 +348,13 @@ function sheet_to_dbf(ws/*:Worksheet*/, opts/*:WriteOpts*/) {
 						rout.write_shift(2, ("00"+data[i][j].getDate()).slice(-2), "sbcs");
 					} break;
 				case 'C':
-					var _l = rout.l;
 					var _s = String(data[i][j] != null ? data[i][j] : "").slice(0, colwidths[j]);
-					rout.write_shift(1, _s, "cpstr");
-					_l += colwidths[j] - rout.l;
-					for(hcnt=0; hcnt < _l; ++hcnt) rout.write_shift(1, 0x20); break;
+					rout.write_shift(1, _s, "sbcs");
+					for(hcnt=0; hcnt < colwidths[j]-_s.length; ++hcnt) rout.write_shift(1, 0x20); break;
 			}
 		}
 		// data
 	}
-	current_codepage = old_cp;
 	ba.next(1).write_shift(1, 0x1A);
 	return ba.end();
 }
@ -453,8 +439,6 @@ var SYLK = /*#__PURE__*/(function() {
 				}
 				wb.Workbook.Names.push(nn);
 			} break;
-			// case 'NE': // ??
-			// case 'NU': // ??
 			case 'C': /* cell */
 			var C_seen_K = false, C_seen_X = false, C_seen_S = false, C_seen_E = false, _R = -1, _C = -1, formula = "", cell_t = "z";
 			for(rj=1; rj<record.length; ++rj) switch(record[rj].charAt(0)) {
@ -488,8 +472,6 @@ var SYLK = /*#__PURE__*/(function() {
 				case 'G': break; // unknown
 				case 'R': _R = parseInt(record[rj].slice(1), 10)-1; break;
 				case 'C': _C = parseInt(record[rj].slice(1), 10)-1; break;
-				// case 'P': // ??
-				// case 'D': // ??
 				default: if(opts && opts.WTF) throw new Error("SYLK bad record " + rstr);
 			}
 			if(C_seen_K) {
@ -543,8 +525,6 @@ var SYLK = /*#__PURE__*/(function() {
 					if(Mval > 0) { rowinfo[R].hpt = Mval; rowinfo[R].hpx = pt2px(Mval); }
 					else if(Mval === 0) rowinfo[R].hidden = true;
 					break;
-				// case 'K': // ??
-				// case 'E': // ??
 				default: if(opts && opts.WTF) throw new Error("SYLK bad record " + rstr);
 			}
 			if(F_seen < 1) next_cell_format = null; break;
@ -566,7 +546,6 @@ var SYLK = /*#__PURE__*/(function() {
 		keys(ws).forEach(function(k) { o[k] = ws[k]; });
 		var outwb = sheet_to_workbook(o, opts);
 		keys(wb).forEach(function(k) { outwb[k] = wb[k]; });
-		outwb.bookType = "sylk";
 		return outwb;
 	}

@ -579,7 +558,7 @@ var SYLK = /*#__PURE__*/(function() {
 			case 'b': o += cell.v ? "TRUE" : "FALSE"; break;
 			case 'e': o += cell.w || cell.v; break;
 			case 'd': o += '"' + (cell.w || cell.v) + '"'; break;
-			case 's': o += '"' + (cell.v == null ? "" : String(cell.v)).replace(/"/g,"").replace(/;/g, ";;") + '"'; break;
+			case 's': o += '"' + cell.v.replace(/"/g,"").replace(/;/g, ";;") + '"'; break;
 		}
 		return o;
 	}
@ -608,10 +587,9 @@ var SYLK = /*#__PURE__*/(function() {
 	}

 	function sheet_to_sylk(ws/*:Worksheet*/, opts/*:?any*/, wb/*:?WorkBook*/)/*:string*/ {
-		/* TODO: codepage */
 		var preamble/*:Array<string>*/ = ["ID;PSheetJS;N;E"], o/*:Array<string>*/ = [];
 		var r = safe_decode_range(ws['!ref']), cell/*:Cell*/;
-		var dense = ws["!data"] != null;
+		var dense = Array.isArray(ws);
 		var RS = "\r\n";
 		var d1904 = (((wb||{}).Workbook||{}).WBProps||{}).date1904;

@ -623,14 +601,12 @@ var SYLK = /*#__PURE__*/(function() {
 		preamble.push("B;Y" + (r.e.r - r.s.r + 1) + ";X" + (r.e.c - r.s.c + 1) + ";D" + [r.s.c,r.s.r,r.e.c,r.e.r].join(" "));
 		preamble.push("O;L;D;B" + (d1904 ? ";V4" : "") + ";K47;G100 0.001");
 		for(var R = r.s.r; R <= r.e.r; ++R) {
-			if(dense && !ws["!data"][R]) continue;
-			var p = [];
 			for(var C = r.s.c; C <= r.e.c; ++C) {
-				cell = dense ? ws["!data"][R][C] : ws[encode_col(C) + encode_row(R)];
+				var coord = encode_cell({r:R,c:C});
+				cell = dense ? (ws[R]||[])[C]: ws[coord];
 				if(!cell || (cell.v == null && (!cell.f || cell.F))) continue;
-				p.push(write_ws_cell_sylk(cell, ws, R, C, opts)); // TODO: pass date1904 info
+				o.push(write_ws_cell_sylk(cell, ws, R, C, opts)); // TODO: pass date1904 info
 			}
-			o.push(p.join(RS));
 		}
 		return preamble.join(RS) + RS + o.join(RS) + RS + "E" + RS;
 	}
@ -688,61 +664,64 @@ var DIF = /*#__PURE__*/(function() {
 	}

 	function dif_to_sheet(str/*:string*/, opts)/*:Worksheet*/ { return aoa_to_sheet(dif_to_aoa(str, opts), opts); }
-	function dif_to_workbook(str/*:string*/, opts)/*:Workbook*/ {
-		var o = sheet_to_workbook(dif_to_sheet(str, opts), opts);
-		o.bookType = "dif";
-		return o;
-	}
+	function dif_to_workbook(str/*:string*/, opts)/*:Workbook*/ { return sheet_to_workbook(dif_to_sheet(str, opts), opts); }

-	function make_value(v/*:number*/, s/*:string*/)/*:string*/ { return "0," + String(v) + "\r\n" + s; }
-	function make_value_str(s/*:string*/)/*:string*/ { return "1,0\r\n\"" + s.replace(/"/g,'""') + '"'; }
-	function sheet_to_dif(ws/*:Worksheet*//*::, opts:?any*/)/*:string*/ {
-		var _DIF_XL = DIF_XL;
-		var r = safe_decode_range(ws['!ref']);
-		var dense = ws["!data"] != null;
-		var o/*:Array<string>*/ = [
-			"TABLE\r\n0,1\r\n\"sheetjs\"\r\n",
-			"VECTORS\r\n0," + (r.e.r - r.s.r + 1) + "\r\n\"\"\r\n",
-			"TUPLES\r\n0," + (r.e.c - r.s.c + 1) + "\r\n\"\"\r\n",
-			"DATA\r\n0,0\r\n\"\"\r\n"
-		];
-		for(var R = r.s.r; R <= r.e.r; ++R) {
-			var row = dense ? ws["!data"][R] : [];
-			var p = "-1,0\r\nBOT\r\n";
-			for(var C = r.s.c; C <= r.e.c; ++C) {
-				var cell/*:Cell*/ = dense ? (row && row[C]) : ws[encode_cell({r:R,c:C})];
-				if(cell == null) { p +=("1,0\r\n\"\"\r\n"); continue;}
-				switch(cell.t) {
-					case 'n':
-						if(_DIF_XL) {
-							if(cell.w != null) p +=("0," + cell.w + "\r\nV");
-							else if(cell.v != null) p +=(make_value(cell.v, "V")); // TODO: should this call SSF_format?
-							else if(cell.f != null && !cell.F) p +=(make_value_str("=" + cell.f));
-							else p +=("1,0\r\n\"\"");
-						} else {
-							if(cell.v == null) p +=("1,0\r\n\"\"");
-							else p +=(make_value(cell.v, "V"));
-						}
-						break;
-					case 'b':
-						p +=(cell.v ? make_value(1, "TRUE") : make_value(0, "FALSE"));
-						break;
-					case 's':
-						p +=(make_value_str((!_DIF_XL || isNaN(+cell.v)) ? cell.v : '="' + cell.v + '"'));
-						break;
-					case 'd':
-						if(!cell.w) cell.w = SSF_format(cell.z || table_fmt[14], datenum(parseDate(cell.v)));
-						if(_DIF_XL) p +=(make_value(cell.w, "V"));
-						else p +=(make_value_str(cell.w));
-						break;
-					default: p +=("1,0\r\n\"\"");
+	var sheet_to_dif = /*#__PURE__*/(function() {
+		var push_field = function pf(o/*:Array<string>*/, topic/*:string*/, v/*:number*/, n/*:number*/, s/*:string*/) {
+			o.push(topic);
+			o.push(v + "," + n);
+			o.push('"' + s.replace(/"/g,'""') + '"');
+		};
+		var push_value = function po(o/*:Array<string>*/, type/*:number*/, v/*:any*/, s/*:string*/) {
+			o.push(type + "," + v);
+			o.push(type == 1 ? '"' + s.replace(/"/g,'""') + '"' : s);
+		};
+		return function sheet_to_dif(ws/*:Worksheet*//*::, opts:?any*/)/*:string*/ {
+			var o/*:Array<string>*/ = [];
+			var r = safe_decode_range(ws['!ref']), cell/*:Cell*/;
+			var dense = Array.isArray(ws);
+			push_field(o, "TABLE", 0, 1, "sheetjs");
+			push_field(o, "VECTORS", 0, r.e.r - r.s.r + 1,"");
+			push_field(o, "TUPLES", 0, r.e.c - r.s.c + 1,"");
+			push_field(o, "DATA", 0, 0,"");
+			for(var R = r.s.r; R <= r.e.r; ++R) {
+				push_value(o, -1, 0, "BOT");
+				for(var C = r.s.c; C <= r.e.c; ++C) {
+					var coord = encode_cell({r:R,c:C});
+					cell = dense ? (ws[R]||[])[C] : ws[coord];
+					if(!cell) { push_value(o, 1, 0, ""); continue;}
+					switch(cell.t) {
+						case 'n':
+							var val = DIF_XL ? cell.w : cell.v;
+							if(!val && cell.v != null) val = cell.v;
+							if(val == null) {
+								if(DIF_XL && cell.f && !cell.F) push_value(o, 1, 0, "=" + cell.f);
+								else push_value(o, 1, 0, "");
+							}
+							else push_value(o, 0, val, "V");
+							break;
+						case 'b':
+							push_value(o, 0, cell.v ? 1 : 0, cell.v ? "TRUE" : "FALSE");
+							break;
+						case 's':
+							push_value(o, 1, 0, (!DIF_XL || isNaN(cell.v)) ? cell.v : '="' + cell.v + '"');
+							break;
+						case 'd':
+							if(!cell.w) cell.w = SSF_format(cell.z || table_fmt[14], datenum(parseDate(cell.v)));
+							if(DIF_XL) push_value(o, 0, cell.w, "V");
+							else push_value(o, 1, 0, cell.w);
+							break;
+						default: push_value(o, 1, 0, "");
+					}
 				}
-				p += "\r\n";
 			}
-			o.push(p);
-		}
-		return o.join("") + "-1,0\r\nEOD";
-	}
+			push_value(o, -1, 0, "EOD");
+			var RS = "\r\n";
+			var oo = o.join(RS);
+			//while((oo.length & 0x7F) != 0) oo += "\0";
+			return oo;
+		};
+	})();
 	return {
 		to_workbook: dif_to_workbook,
 		to_sheet: dif_to_sheet,
@ -805,11 +784,11 @@ var ETH = /*#__PURE__*/(function() {
 		if(!ws || !ws['!ref']) return "";
 		var o/*:Array<string>*/ = [], oo/*:Array<string>*/ = [], cell, coord = "";
 		var r = decode_range(ws['!ref']);
-		var dense = ws["!data"] != null;
+		var dense = Array.isArray(ws);
 		for(var R = r.s.r; R <= r.e.r; ++R) {
 			for(var C = r.s.c; C <= r.e.c; ++C) {
 				coord = encode_cell({r:R,c:C});
-				cell = dense ? (ws["!data"][R]||[])[C] : ws[coord];
+				cell = dense ? (ws[R]||[])[C] : ws[coord];
 				if(!cell || cell.v == null || cell.t === 'z') continue;
 				oo = ["cell", coord, 't'];
 				switch(cell.t) {
@ -931,8 +910,7 @@ var PRN = /*#__PURE__*/(function() {
 		var o = opts || {};
 		var sep = "";
 		if(DENSE != null && o.dense == null) o.dense = DENSE;
-		var ws/*:Worksheet*/ = ({}/*:any*/);
-		if(o.dense) ws["!data"] = [];
+		var ws/*:Worksheet*/ = o.dense ? ([]/*:any*/) : ({}/*:any*/);
 		var range/*:Range*/ = ({s: {c:0, r:0}, e: {c:0, r:0}}/*:any*/);

 		if(str.slice(0,4) == "sep=") {
@ -965,12 +943,12 @@ var PRN = /*#__PURE__*/(function() {
 			else if(s == "TRUE") { cell.t = 'b'; cell.v = true; }
 			else if(s == "FALSE") { cell.t = 'b'; cell.v = false; }
 			else if(!isNaN(v = fuzzynum(s))) { cell.t = 'n'; if(o.cellText !== false) cell.w = s; cell.v = v; }
-			else if(!isNaN((v = fuzzydate(s)).getDate()) || _re && s.match(_re)) {
+			else if(!isNaN(fuzzydate(s).getDate()) || _re && s.match(_re)) {
 				cell.z = o.dateNF || table_fmt[14];
 				var k = 0;
-				if(_re && s.match(_re)){ s=dateNF_fix(s, o.dateNF, (s.match(_re)||[])); k=1; v = parseDate(s, k); }
-				if(o.cellDates) { cell.t = 'd'; cell.v = v; }
-				else { cell.t = 'n'; cell.v = datenum(v); }
+				if(_re && s.match(_re)){ s=dateNF_fix(s, o.dateNF, (s.match(_re)||[])); k=1; }
+				if(o.cellDates) { cell.t = 'd'; cell.v = parseDate(s, k); }
+				else { cell.t = 'n'; cell.v = datenum(parseDate(s, k)); }
 				if(o.cellText !== false) cell.w = SSF_format(cell.z, cell.v instanceof Date ? datenum(cell.v):cell.v);
 				if(!o.cellNF) delete cell.z;
 			} else {
@ -978,7 +956,7 @@ var PRN = /*#__PURE__*/(function() {
 				cell.v = s;
 			}
 			if(cell.t == 'z'){}
-			else if(o.dense) { if(!ws["!data"][R]) ws["!data"][R] = []; ws["!data"][R][C] = cell; }
+			else if(o.dense) { if(!ws[R]) ws[R] = []; ws[R][C] = cell; }
 			else ws[encode_cell({c:C,r:R})] = cell;
 			start = end+1; startcc = str.charCodeAt(start);
 			if(range.e.c < C) range.e.c = C;
@ -1034,12 +1012,12 @@ var PRN = /*#__PURE__*/(function() {
 	function sheet_to_prn(ws/*:Worksheet*//*::, opts:?any*/)/*:string*/ {
 		var o/*:Array<string>*/ = [];
 		var r = safe_decode_range(ws['!ref']), cell/*:Cell*/;
-		var dense = ws["!data"] != null;
+		var dense = Array.isArray(ws);
 		for(var R = r.s.r; R <= r.e.r; ++R) {
 			var oo/*:Array<string>*/ = [];
 			for(var C = r.s.c; C <= r.e.c; ++C) {
 				var coord = encode_cell({r:R,c:C});
-				cell = dense ? (ws["!data"][R]||[])[C] : ws[coord];
+				cell = dense ? (ws[R]||[])[C] : ws[coord];
 				if(!cell || cell.v == null) { oo.push("          "); continue; }
 				var w = (cell.w || (format_cell(cell), cell.w) || "").slice(0,10);
 				while(w.length < 10) w += " ";
--- a/bits/41_lotus.js
+++ b/bits/41_lotus.js
@ -28,9 +28,8 @@ var WK_ = /*#__PURE__*/(function() {
 		if(!d) return d;
 		var o = opts || {};
 		if(DENSE != null && o.dense == null) o.dense = DENSE;
-		var s/*:Worksheet*/ = ({}/*:any*/), n = "Sheet1", next_n = "", sidx = 0;
-		var sheets = {}, snames = [], realnames = [], sdata = [];
-		if(o.dense) sdata = s["!data"] = [];
+		var s/*:Worksheet*/ = ((o.dense ? [] : {})/*:any*/), n = "Sheet1", next_n = "", sidx = 0;
+		var sheets = {}, snames = [], realnames = [];

 		var refguess = {s: {r:0, c:0}, e: {r:0, c:0} };
 		var sheetRows = o.sheetRows || 0;
@ -75,13 +74,13 @@ var WK_ = /*#__PURE__*/(function() {
 							s["!ref"] = encode_range(refguess);
 							sheets[n] = s;
 							snames.push(n);
-							s = ({}/*:any*/); if(o.dense) sdata = s["!data"] = [];
+							s = (o.dense ? [] : {});
 							refguess = {s: {r:0, c:0}, e: {r:0, c:0} };
 							sidx = val[3]; n = next_n || "Sheet" + (sidx + 1); next_n = "";
 						}
 					}

-					var tmpcell = o.dense ? (sdata[val[0].r]||[])[val[0].c] : s[encode_cell(val[0])];
+					var tmpcell = o.dense ? (s[val[0].r]||[])[val[0].c] : s[encode_cell(val[0])];
 					if(tmpcell) {
 						tmpcell.t = val[1].t; tmpcell.v = val[1].v;
 						if(val[1].z != null) tmpcell.z = val[1].z;
@ -89,8 +88,8 @@ var WK_ = /*#__PURE__*/(function() {
 						break;
 					}
 					if(o.dense) {
-						if(!sdata[val[0].r]) sdata[val[0].r] = [];
-						sdata[val[0].r][val[0].c] = val[1];
+						if(!s[val[0].r]) s[val[0].r] = [];
+						s[val[0].r][val[0].c] = val[1];
 					} else s[encode_cell(val[0])] = val[1];
 					break;
 				case 0x5405: o.works2 = true; break;
@ -116,14 +115,14 @@ var WK_ = /*#__PURE__*/(function() {
 						s["!ref"] = encode_range(refguess);
 						sheets[n] = s;
 						snames.push(n);
-						s = ({}/*:any*/); if(o.dense) sdata = s["!data"] = [];
+						s = (o.dense ? [] : {});
 						refguess = {s: {r:0, c:0}, e: {r:0, c:0} };
 						sidx = val[3]; n = "Sheet" + (sidx + 1);
 					}
 					if(sheetRows > 0 && val[0].r >= sheetRows) break;
 					if(o.dense) {
-						if(!sdata[val[0].r]) sdata[val[0].r] = [];
-						sdata[val[0].r][val[0].c] = val[1];
+						if(!s[val[0].r]) s[val[0].r] = [];
+						s[val[0].r][val[0].c] = val[1];
 					} else s[encode_cell(val[0])] = val[1];
 					if(refguess.e.c < val[0].c) refguess.e.c = val[0].c;
 					if(refguess.e.r < val[0].r) refguess.e.r = val[0].r;
@ -158,17 +157,18 @@ var WK_ = /*#__PURE__*/(function() {
 		if(o.type == "string") throw new Error("Cannot write WK1 to JS string");
 		var ba = buf_array();
 		var range = safe_decode_range(ws["!ref"]);
-		var dense = ws["!data"] != null;
+		var dense = Array.isArray(ws);
 		var cols = [];

 		write_biff_rec(ba, 0x00, write_BOF_WK1(0x0406));
 		write_biff_rec(ba, 0x06, write_RANGE(range));
 		var max_R = Math.min(range.e.r, 8191);
-		for(var C = range.s.c; C <= range.e.c; ++C) cols[C] = encode_col(C);
 		for(var R = range.s.r; R <= max_R; ++R) {
 			var rr = encode_row(R);
-			for(C = range.s.c; C <= range.e.c; ++C) {
-				var cell = dense ? (ws["!data"][R]||[])[C] : ws[cols[C] + rr];
+			for(var C = range.s.c; C <= range.e.c; ++C) {
+				if(R === range.s.r) cols[C] = encode_col(C);
+				var ref = cols[C] + rr;
+				var cell = dense ? (ws[R]||[])[C] : ws[ref];
 				if(!cell || cell.t == "z") continue;
 				/* TODO: formula records */
 				if(cell.t == "n") {
@ -200,7 +200,7 @@ var WK_ = /*#__PURE__*/(function() {
 			var ws = wb.Sheets[wb.SheetNames[i]];
 			if(!ws || !ws["!ref"]) continue;
 			var range = safe_decode_range(ws["!ref"]);
-			var dense = ws["!data"] != null;
+			var dense = Array.isArray(ws);
 			var cols = [];
 			var max_R = Math.min(range.e.r, 8191);
 			for(var R = range.s.r; R <= max_R; ++R) {
@ -208,7 +208,7 @@ var WK_ = /*#__PURE__*/(function() {
 				for(var C = range.s.c; C <= range.e.c; ++C) {
 					if(R === range.s.r) cols[C] = encode_col(C);
 					var ref = cols[C] + rr;
-					var cell = dense ? (ws["!data"][R]||[])[C] : ws[ref];
+					var cell = dense ? (ws[R]||[])[C] : ws[ref];
 					if(!cell || cell.t == "z") continue;
 					/* TODO: FORMULA19 NUMBER18 records */
 					if(cell.t == "n") {
@ -919,7 +919,7 @@ var WK_ = /*#__PURE__*/(function() {
 		prep_blob(d, 0);
 		var o = opts || {};
 		if(DENSE != null && o.dense == null) o.dense = DENSE;
-		var s/*:Worksheet*/ = ({}/*:any*/); if(o.dense) s["!data"] = [];
+		var s/*:Worksheet*/ = ((o.dense ? [] : {})/*:any*/);
 		var SST = [], sname = "", formulae = [];
 		var range = {s:{r:-1,c:-1}, e:{r:-1,c:-1}};
 		var cnt = 0, type = 0, C = 0, R = 0;
@ -956,7 +956,7 @@ var WK_ = /*#__PURE__*/(function() {

 				case 0x0601: { /* BOS */
 					var sidx = p.read_shift(2);
-					s = ({}/*:any*/); if(o.dense) s["!data"] = [];
+					s = ((o.dense ? [] : {})/*:any*/);
 					range.s.c = p.read_shift(2);
 					range.e.c = p.read_shift(2);
 					range.s.r = p.read_shift(4);
@ -993,7 +993,6 @@ var WK_ = /*#__PURE__*/(function() {
 					R = p.read_shift(4), cnt = p.read_shift(4);
 					if(range.s.r > R) range.s.r = R;
 					if(range.e.r < R + cnt - 1) range.e.r = R + cnt - 1;
-					var CC = encode_col(C);
 					while(p.l < p.length) {
 						var cell = { t: "z" };
 						var flags = p.read_shift(1);
@ -1016,10 +1015,10 @@ var WK_ = /*#__PURE__*/(function() {
 							default: throw "Unsupported delta for QPW cell type " + (flags & 0x1F);
 						}
 						if(!(!o.sheetStubs && cell.t == "z")) {
-							if(s["!data"] != null) {
-								if(!s["!data"][R]) s["!data"][R] = [];
-								s["!data"][R][C] = cell;
-							} else s[CC + encode_row(R)] = cell;
+							if(Array.isArray(s)) {
+								if(!s[R]) s[R] = [];
+								s[R][C] = cell;
+							} else s[encode_cell({r:R, c:C})] = cell;
 						}
 						++R; --cnt;
 						while(mul-- > 0 && cnt >= 0) {
@ -1035,10 +1034,10 @@ var WK_ = /*#__PURE__*/(function() {
 								default: throw "Cannot apply repeat for QPW cell type " + (flags & 0x1F);
 							}
 							if(!(!o.sheetStubs && cell.t == "z")) {
-								if(s["!data"] != null) {
-									if(!s["!data"][R]) s["!data"][R] = [];
-									s["!data"][R][C] = cell;
-								} else s[CC + encode_row(R)] = cell;
+								if(Array.isArray(s)) {
+									if(!s[R]) s[R] = [];
+									s[R][C] = cell;
+								} else s[encode_cell({r:R, c:C})] = cell;
 							}
 							++R; --cnt;
 						}
--- a/bits/42_sstxml.js
+++ b/bits/42_sstxml.js
@ -168,7 +168,7 @@ var rs_to_html = /*#__PURE__*/(function parse_rs_factory() {
 })();

 /* 18.4.8 si CT_Rst */
-var sitregex = /<(?:\w+:)?t[^>]*>([^<]*)<\/(?:\w+:)?t>/g, sirregex = /<(?:\w+:)?r\b[^>]*>/;
+var sitregex = /<(?:\w+:)?t[^>]*>([^<]*)<\/(?:\w+:)?t>/g, sirregex = /<(?:\w+:)?r>/;
 var sirphregex = /<(?:\w+:)?rPh.*?>([\s\S]*?)<\/(?:\w+:)?rPh>/g;
 function parse_si(x, opts) {
 	var html = opts ? opts.cellHTML : true;
@ -229,7 +229,6 @@ function write_sst_xml(sst/*:SST*/, opts)/*:string*/ {
 		else {
 			sitag += "<t";
 			if(!s.t) s.t = "";
-			if(typeof s.t !== "string") s.t = String(s.t);
 			if(s.t.match(straywsregex)) sitag += ' xml:space="preserve"';
 			sitag += ">" + escapexml(s.t) + "</t>";
 		}
--- a/bits/45_rtf.js
+++ b/bits/45_rtf.js
@ -1,103 +1,82 @@
-function rtf_to_sheet(d, opts) {
-  switch (opts.type) {
-    case "base64":
-      return rtf_to_sheet_str(Base64_decode(d), opts);
-    case "binary":
-      return rtf_to_sheet_str(d, opts);
-    case "buffer":
-      return rtf_to_sheet_str(has_buf && Buffer.isBuffer(d) ? d.toString("binary") : a2s(d), opts);
-    case "array":
-      return rtf_to_sheet_str(cc2str(d), opts);
-  }
-  throw new Error("Unrecognized type " + opts.type);
-}
-function rtf_to_sheet_str(str, opts) {
-  var o = opts || {};
-  var ws = {};
-  var dense = o.dense;
-  if (dense)
-    ws["!data"] = [];
-  var rows = str.match(/\\trowd[\s\S]*?\\row\b/g);
-  if (!rows)
-    throw new Error("RTF missing table");
-  var range = { s: { c: 0, r: 0 }, e: { c: 0, r: rows.length - 1 } };
-  var row = [];
-  rows.forEach(function(rowtf, R) {
-    if (dense)
-      row = ws["!data"][R] = [];
-    var rtfre = /\\[\w\-]+\b/g;
-    var last_index = 0;
-    var res;
-    var C = -1;
-    var payload = [];
-    while ((res = rtfre.exec(rowtf)) != null) {
-      var data = rowtf.slice(last_index, rtfre.lastIndex - res[0].length);
-      if (data.charCodeAt(0) == 32)
-        data = data.slice(1);
-      if (data.length)
-        payload.push(data);
-      switch (res[0]) {
-        case "\\cell":
-          ++C;
-          if (payload.length) {
-            var cell = { v: payload.join(""), t: "s" };
-            if (cell.v == "TRUE" || cell.v == "FALSE") {
-              cell.v = cell.v == "TRUE";
-              cell.t = "b";
-            } else if (!isNaN(fuzzynum(cell.v))) {
-              cell.t = "n";
-              if (o.cellText !== false)
-                cell.w = cell.v;
-              cell.v = fuzzynum(cell.v);
-            }
-            if (dense)
-              row[C] = cell;
-            else
-              ws[encode_cell({ r: R, c: C })] = cell;
-          }
-          payload = [];
-          break;
-        case "\\par":
-          payload.push("\n");
-          break;
-      }
-      last_index = rtfre.lastIndex;
-    }
-    if (C > range.e.c)
-      range.e.c = C;
-  });
-  ws["!ref"] = encode_range(range);
-  return ws;
-}
-function rtf_to_workbook(d, opts) {
-  var wb = sheet_to_workbook(rtf_to_sheet(d, opts), opts);
-  wb.bookType = "rtf";
-  return wb;
-}
-function sheet_to_rtf(ws, opts) {
-  var o = ["{\\rtf1\\ansi"];
-  if (!ws["!ref"])
-    return o[0] + "}";
-  var r = safe_decode_range(ws["!ref"]), cell;
-  var dense = ws["!data"] != null, row = [];
-  for (var R = r.s.r; R <= r.e.r; ++R) {
-    o.push("\\trowd\\trautofit1");
-    for (var C = r.s.c; C <= r.e.c; ++C)
-      o.push("\\cellx" + (C + 1));
-    o.push("\\pard\\intbl");
-    if (dense)
-      row = ws["!data"][R] || [];
-    for (C = r.s.c; C <= r.e.c; ++C) {
-      var coord = encode_cell({ r: R, c: C });
-      cell = dense ? row[C] : ws[coord];
-      if (!cell || cell.v == null && (!cell.f || cell.F)) {
-        o.push(" \\cell");
-        continue;
-      }
-      o.push(" " + (cell.w || (format_cell(cell), cell.w) || "").replace(/[\r\n]/g, "\\par "));
-      o.push("\\cell");
-    }
-    o.push("\\pard\\intbl\\row");
-  }
-  return o.join("") + "}";
-}
+var RTF = /*#__PURE__*/(function() {
+	function rtf_to_sheet(d/*:RawData*/, opts)/*:Worksheet*/ {
+		switch(opts.type) {
+			case 'base64': return rtf_to_sheet_str(Base64_decode(d), opts);
+			case 'binary': return rtf_to_sheet_str(d, opts);
+			case 'buffer': return rtf_to_sheet_str(has_buf && Buffer.isBuffer(d) ? d.toString('binary') : a2s(d), opts);
+			case 'array':  return rtf_to_sheet_str(cc2str(d), opts);
+		}
+		throw new Error("Unrecognized type " + opts.type);
+	}
+
+	/* TODO: this is a stub */
+	function rtf_to_sheet_str(str/*:string*/, opts)/*:Worksheet*/ {
+		var o = opts || {};
+		var ws/*:Worksheet*/ = o.dense ? ([]/*:any*/) : ({}/*:any*/);
+
+		var rows = str.match(/\\trowd[\s\S]*?\\row\b/g);
+		if(!rows.length) throw new Error("RTF missing table");
+		var range/*:Range*/ = ({s: {c:0, r:0}, e: {c:0, r:rows.length - 1}}/*:any*/);
+		rows.forEach(function(rowtf, R) {
+			if(Array.isArray(ws)) ws[R] = [];
+			var rtfre = /\\[\w\-]+\b/g;
+			var last_index = 0;
+			var res;
+			var C = -1;
+			var payload = [];
+			while((res = rtfre.exec(rowtf))) {
+				var data = rowtf.slice(last_index, rtfre.lastIndex - res[0].length);
+				if(data.charCodeAt(0) == 0x20) data = data.slice(1);
+				if(data.length) payload.push(data);
+				switch(res[0]) {
+					case "\\cell":
+						++C;
+						if(payload.length) {
+							// TODO: value parsing, including codepage adjustments
+							var cell = {v: payload.join(""), t:"s"};
+							if(Array.isArray(ws)) ws[R][C] = cell;
+							else ws[encode_cell({r:R, c:C})] = cell;
+						}
+						payload = [];
+						break;
+					case "\\par": // NOTE: Excel serializes both "\r" and "\n" as "\\par"
+						payload.push("\n");
+						break;
+				}
+				last_index = rtfre.lastIndex;
+			}
+			if(C > range.e.c) range.e.c = C;
+		});
+		ws['!ref'] = encode_range(range);
+		return ws;
+	}
+
+	function rtf_to_workbook(d/*:RawData*/, opts)/*:Workbook*/ { return sheet_to_workbook(rtf_to_sheet(d, opts), opts); }
+
+	/* TODO: this is a stub */
+	function sheet_to_rtf(ws/*:Worksheet*//*::, opts*/)/*:string*/ {
+		var o = ["{\\rtf1\\ansi"];
+		var r = safe_decode_range(ws['!ref']), cell/*:Cell*/;
+		var dense = Array.isArray(ws);
+		for(var R = r.s.r; R <= r.e.r; ++R) {
+			o.push("\\trowd\\trautofit1");
+			for(var C = r.s.c; C <= r.e.c; ++C) o.push("\\cellx" + (C+1));
+			o.push("\\pard\\intbl");
+			for(C = r.s.c; C <= r.e.c; ++C) {
+				var coord = encode_cell({r:R,c:C});
+				cell = dense ? (ws[R]||[])[C]: ws[coord];
+				if(!cell || cell.v == null && (!cell.f || cell.F)) continue;
+				o.push(" " + (cell.w || (format_cell(cell), cell.w)).replace(/[\r\n]/g, "\\par "));
+				o.push("\\cell");
+			}
+			o.push("\\pard\\intbl\\row");
+		}
+		return o.join("") + "}";
+	}
+
+	return {
+		to_workbook: rtf_to_workbook,
+		to_sheet: rtf_to_sheet,
+		from_sheet: sheet_to_rtf
+	};
+})();
--- a/bits/51_xlsxmeta.js
+++ b/bits/51_xlsxmeta.js
@ -71,7 +71,7 @@ function parse_xlmeta_xml(data, name, opts) {
        lastmeta.offsets.push(+y.i);
        break;
      default:
-        if (!pass && (opts == null ? void 0 : opts.WTF))
+        if (!pass && opts.WTF)
          throw new Error("unrecognized " + y[0] + " in metadata");
    }
    return x;
--- a/bits/56_cmntcommon.js
+++ b/bits/56_cmntcommon.js
@ -1,16 +1,15 @@
-function sheet_insert_comments(sheet/*:WorkSheet*/, comments/*:Array<RawComment>*/, threaded/*:boolean*/, people/*:?Array<any>*/) {
-	var dense = sheet["!data"] != null;
+function sheet_insert_comments(sheet, comments/*:Array<RawComment>*/, threaded/*:boolean*/, people/*:?Array<any>*/) {
+	var dense = Array.isArray(sheet);
 	var cell/*:Cell*/;
 	comments.forEach(function(comment) {
 		var r = decode_cell(comment.ref);
-		if(r.r < 0 || r.c < 0) return;
 		if(dense) {
-			if(!sheet["!data"][r.r]) sheet["!data"][r.r] = [];
-			cell = sheet["!data"][r.r][r.c];
+			if(!sheet[r.r]) sheet[r.r] = [];
+			cell = sheet[r.r][r.c];
 		} else cell = sheet[comment.ref];
 		if (!cell) {
 			cell = ({t:"z"}/*:any*/);
-			if(dense) sheet["!data"][r.r][r.c] = cell;
+			if(dense) sheet[r.r][r.c] = cell;
 			else sheet[comment.ref] = cell;
 			var range = safe_decode_range(sheet["!ref"]||"BDWGO1000001:A1");
 			if(range.s.r > r.r) range.s.r = r.r;
@ -18,7 +17,7 @@ function sheet_insert_comments(sheet/*:WorkSheet*/, comments/*:Array<RawComment>
 			if(range.s.c > r.c) range.s.c = r.c;
 			if(range.e.c < r.c) range.e.c = r.c;
 			var encoded = encode_range(range);
-			sheet["!ref"] = encoded;
+			if (encoded !== sheet["!ref"]) sheet["!ref"] = encoded;
 		}

 		if (!cell.c) cell.c = [];
@ -36,3 +35,4 @@ function sheet_insert_comments(sheet/*:WorkSheet*/, comments/*:Array<RawComment>
 		cell.c.push(o);
 	});
 }
+
--- a/bits/57_cmntxml.js
+++ b/bits/57_cmntxml.js
@ -50,27 +50,21 @@ function write_comments_xml(data/*::, opts*/) {
 	o.push("<commentList>");
 	data.forEach(function(d) {
 		/* 18.7.3 CT_Comment */
-		var lastauthor = 0, ts = [], tcnt = 0;
+		var lastauthor = 0, ts = [];
 		if(d[1][0] && d[1][0].T && d[1][0].ID) lastauthor = iauthor.indexOf("tc=" + d[1][0].ID);
-		d[1].forEach(function(c) {
+		else d[1].forEach(function(c) {
 			if(c.a) lastauthor = iauthor.indexOf(escapexml(c.a));
-			if(c.T) ++tcnt;
-			ts.push(c.t == null ? "" : escapexml(c.t));
+			ts.push(c.t||"");
 		});
-		if(tcnt === 0) {
-			d[1].forEach(function(c) {
-				o.push('<comment ref="' + d[0] + '" authorId="' + iauthor.indexOf(escapexml(c.a)) + '"><text>');
-				o.push(writetag("t", c.t == null ? "" : escapexml(c.t)));
-				o.push('</text></comment>');
-			});
-		} else {
+		o.push('<comment ref="' + d[0] + '" authorId="' + lastauthor + '"><text>');
+		if(ts.length <= 1) o.push(writetag("t", escapexml(ts[0]||"")));
+		else {
 			/* based on Threaded Comments -> Comments projection */
-			o.push('<comment ref="' + d[0] + '" authorId="' + lastauthor + '"><text>');
 			var t = "Comment:\n    " + (ts[0]) + "\n";
 			for(var i = 1; i < ts.length; ++i) t += "Reply:\n    " + ts[i] + "\n";
 			o.push(writetag("t", escapexml(t)));
-			o.push('</text></comment>');
 		}
+		o.push('</text></comment>');
 	});
 	o.push("</commentList>");
 	if(o.length>2) { o[o.length] = ('</comments>'); o[1]=o[1].replace("/>",">"); }
--- a/bits/67_wsxml.js
+++ b/bits/67_wsxml.js
@ -20,7 +20,7 @@ function parse_ws_xml(data/*:?string*/, opts, idx/*:number*/, rels, wb/*:WBWBPro
 	if(DENSE != null && opts.dense == null) opts.dense = DENSE;

 	/* 18.3.1.99 worksheet CT_Worksheet */
-	var s = ({}/*:any*/); if(opts.dense) s["!data"] = [];
+	var s = opts.dense ? ([]/*:any*/) : ({}/*:any*/);
 	var refguess/*:Range*/ = ({s: {r:2000000, c:2000000}, e: {r:0, c:0} }/*:any*/);

 	var data1 = "", data2 = "";
@ -39,7 +39,7 @@ function parse_ws_xml(data/*:?string*/, opts, idx/*:number*/, rels, wb/*:WBWBPro
 	var ridx = (data1.match(/<(?:\w*:)?dimension/)||{index:-1}).index;
 	if(ridx > 0) {
 		var ref = data1.slice(ridx,ridx+50).match(dimregex);
-		if(ref && !(opts && opts.nodim)) parse_ws_xml_dim(s, ref[1]);
+		if(ref) parse_ws_xml_dim(s, ref[1]);
 	}

 	/* 18.3.1.88 sheetViews CT_SheetViews */
@ -75,7 +75,6 @@ function parse_ws_xml(data/*:?string*/, opts, idx/*:number*/, rels, wb/*:WBWBPro
 	var margins = data2.match(marginregex);
 	if(margins) s['!margins'] = parse_ws_xml_margins(parsexmltag(margins[0]));

-	if(opts && opts.nodim) refguess.s.c = refguess.s.r = 0;
 	if(!s["!ref"] && refguess.e.c >= refguess.s.c && refguess.e.r >= refguess.s.r) s["!ref"] = encode_range(refguess);
 	if(opts.sheetRows > 0 && s["!ref"]) {
 		var tmpref = safe_decode_range(s["!ref"]);
@ -150,7 +149,7 @@ function write_ws_xml_protection(sp)/*:string*/ {
 }

 function parse_ws_xml_hlinks(s, data/*:Array<string>*/, rels) {
-	var dense = s["!data"] != null;
+	var dense = Array.isArray(s);
 	for(var i = 0; i != data.length; ++i) {
 		var val = parsexmltag(utf8read(data[i]), true);
 		if(!val.ref) return;
@ -166,11 +165,11 @@ function parse_ws_xml_hlinks(s, data/*:Array<string>*/, rels) {
 		if(val.tooltip) { val.Tooltip = val.tooltip; delete val.tooltip; }
 		var rng = safe_decode_range(val.ref);
 		for(var R=rng.s.r;R<=rng.e.r;++R) for(var C=rng.s.c;C<=rng.e.c;++C) {
-			var addr = encode_col(C) + encode_row(R);
+			var addr = encode_cell({c:C,r:R});
 			if(dense) {
-				if(!s["!data"][R]) s["!data"][R] = [];
-				if(!s["!data"][R][C]) s["!data"][R][C] = {t:"z",v:undefined};
-				s["!data"][R][C].l = val;
+				if(!s[R]) s[R] = [];
+				if(!s[R][C]) s[R][C] = {t:"z",v:undefined};
+				s[R][C].l = val;
 			} else {
 				if(!s[addr]) s[addr] = {t:"z",v:undefined};
 				s[addr].l = val;
@ -259,15 +258,12 @@ function write_ws_xml_sheetviews(ws, opts, idx, wb)/*:string*/ {

 function write_ws_xml_cell(cell/*:Cell*/, ref, ws, opts/*::, idx, wb*/)/*:string*/ {
 	if(cell.c) ws['!comments'].push([ref, cell.c]);
-	if((cell.v === undefined || cell.t === "z" && !(opts||{}).sheetStubs) && typeof cell.f !== "string" && typeof cell.z == "undefined") return "";
+	if(cell.v === undefined && typeof cell.f !== "string" || cell.t === 'z' && !cell.f) return "";
 	var vv = "";
 	var oldt = cell.t, oldv = cell.v;
 	if(cell.t !== "z") switch(cell.t) {
 		case 'b': vv = cell.v ? "1" : "0"; break;
-		case 'n':
-			if(isNaN(cell.v)) { cell.t = "e"; vv = BErr[cell.v = 0x24]; } // #NUM!
-			else if(!isFinite(cell.v)) { cell.t = "e"; vv = BErr[cell.v = 0x07]; } // #DIV/0!
-			else vv = ''+cell.v; break;
+		case 'n': vv = ''+cell.v; break;
 		case 'e': vv = BErr[cell.v]; break;
 		case 'd':
 			if(opts && opts.cellDates) vv = parseDate(cell.v, -1).toISOString();
@ -303,10 +299,7 @@ function write_ws_xml_cell(cell/*:Cell*/, ref, ws, opts/*::, idx, wb*/)/*:string
 		var ff = cell.F && cell.F.slice(0, ref.length) == ref ? {t:"array", ref:cell.F} : null;
 		v = writextag('f', escapexml(cell.f), ff) + (cell.v != null ? v : "");
 	}
-	if(cell.l) {
-		cell.l.display = escapexml(vv);
-		ws['!links'].push([ref, cell.l]);
-	}
+	if(cell.l) ws['!links'].push([ref, cell.l]);
 	if(cell.D) o.cm = 1;
 	return writextag('c', v, o);
 }
@ -325,7 +318,7 @@ return function parse_ws_xml_data(sdata/*:string*/, s, opts, guess/*:Range*/, th
 	var do_format = Array.isArray(styles.CellXf), cf;
 	var arrayf/*:Array<[Range, string]>*/ = [];
 	var sharedf = [];
-	var dense = s["!data"] != null;
+	var dense = Array.isArray(s);
 	var rows/*:Array<RowInfo>*/ = [], rowobj = {}, rowrite = false;
 	var sheetStubs = !!opts.sheetStubs;
 	for(var marr = sdata.split(rowregex), mt = 0, marrlen = marr.length; mt != marrlen; ++mt) {
@ -356,10 +349,8 @@ return function parse_ws_xml_data(sdata/*:string*/, s, opts, guess/*:Range*/, th
 		tag = parsexmltag(x.slice(rstarti,ri), true);
 		tagr = tag.r != null ? parseInt(tag.r, 10) : tagr+1; tagc = -1;
 		if(opts.sheetRows && opts.sheetRows < tagr) continue;
-		if(!opts.nodim) {
-			if(guess.s.r > tagr - 1) guess.s.r = tagr - 1;
-			if(guess.e.r < tagr - 1) guess.e.r = tagr - 1;
-		}
+		if(guess.s.r > tagr - 1) guess.s.r = tagr - 1;
+		if(guess.e.r < tagr - 1) guess.e.r = tagr - 1;

 		if(opts && opts.cellStyles) {
 			rowobj = {}; rowrite = false;
@ -490,16 +481,10 @@ return function parse_ws_xml_data(sdata/*:string*/, s, opts, guess/*:Range*/, th
 				var cm = (opts.xlmeta.Cell||[])[+tag.cm-1];
 				if(cm && cm.type == 'XLDAPR') p.D = true;
 			}
-			var _r;
-			if(opts.nodim) {
-				_r = decode_cell(tag.r);
-				if(guess.s.r > _r.r) guess.s.r = _r.r;
-				if(guess.e.r < _r.r) guess.e.r = _r.r;
-			}
 			if(dense) {
-				_r = decode_cell(tag.r);
-				if(!s["!data"][_r.r]) s["!data"][_r.r] = [];
-				s["!data"][_r.r][_r.c] = p;
+				var _r = decode_cell(tag.r);
+				if(!s[_r.r]) s[_r.r] = [];
+				s[_r.r][_r.c] = p;
 			} else s[tag.r] = p;
 		}
 	}
@ -508,7 +493,7 @@ return function parse_ws_xml_data(sdata/*:string*/, s, opts, guess/*:Range*/, th

 function write_ws_xml_data(ws/*:Worksheet*/, opts, idx/*:number*/, wb/*:Workbook*//*::, rels*/)/*:string*/ {
 	var o/*:Array<string>*/ = [], r/*:Array<string>*/ = [], range = safe_decode_range(ws['!ref']), cell="", ref, rr = "", cols/*:Array<string>*/ = [], R=0, C=0, rows = ws['!rows'];
-	var dense = ws["!data"] != null;
+	var dense = Array.isArray(ws);
 	var params = ({r:rr}/*:any*/), row/*:RowInfo*/, height = -1;
 	for(C = range.s.c; C <= range.e.c; ++C) cols[C] = encode_col(C);
 	for(R = range.s.r; R <= range.e.r; ++R) {
@ -516,7 +501,7 @@ function write_ws_xml_data(ws/*:Worksheet*/, opts, idx/*:number*/, wb/*:Workbook
 		rr = encode_row(R);
 		for(C = range.s.c; C <= range.e.c; ++C) {
 			ref = cols[C] + rr;
-			var _cell = dense ? (ws["!data"][R]||[])[C]: ws[ref];
+			var _cell = dense ? (ws[R]||[])[C]: ws[ref];
 			if(_cell === undefined) continue;
 			if((cell = write_ws_xml_cell(_cell, ref, ws, opts, idx, wb)) != null) r.push(cell);
 		}
@ -624,7 +609,6 @@ function write_ws_xml(idx/*:number*/, opts, wb/*:Workbook*/, rels)/*:string*/ {
 			}
 			if((relc = l[1].Target.indexOf("#")) > -1) rel.location = escapexml(l[1].Target.slice(relc+1));
 			if(l[1].Tooltip) rel.tooltip = escapexml(l[1].Tooltip);
-			rel.display = l[1].display;
 			o[o.length] = writextag("hyperlink",null,rel);
 		});
 		o[o.length] = "</hyperlinks>";
--- a/bits/68_wsbin.js
+++ b/bits/68_wsbin.js
@ -41,13 +41,12 @@ function write_BrtRowHdr(R/*:number*/, range, ws) {
 	o.l += 4;

 	var caddr = {r:R, c:0};
-	var dense = ws["!data"] != null;
 	for(var i = 0; i < 16; ++i) {
 		if((range.s.c > ((i+1) << 10)) || (range.e.c < (i << 10))) continue;
 		var first = -1, last = -1;
 		for(var j = (i<<10); j < ((i+1)<<10); ++j) {
 			caddr.c = j;
-			var cell = dense ? (ws["!data"][caddr.r]||[])[caddr.c] : ws[encode_cell(caddr)];
+			var cell = Array.isArray(ws) ? (ws[caddr.r]||[])[caddr.c] : ws[encode_cell(caddr)];
 			if(cell) { if(first < 0) first = j; last = j; }
 		}
 		if(first < 0) continue;
@ -259,10 +258,9 @@ function parse_BrtCellSt(data) {
 	return [cell, value, 'str'];
 }
 function write_BrtCellSt(cell, ncell, o) {
-	var data = cell.v == null ? "" : String(cell.v);
 	if(o == null) o = new_buf(12 + 4 * cell.v.length);
 	write_XLSBCell(ncell, o);
-	write_XLWideString(data, o);
+	write_XLWideString(cell.v, o);
 	return o.length > o.l ? o.slice(0, o.l) : o;
 }
 function parse_BrtShortSt(data) {
@ -271,10 +269,9 @@ function parse_BrtShortSt(data) {
 	return [cell, value, 'str'];
 }
 function write_BrtShortSt(cell, ncell, o) {
-	var data = cell.v == null ? "" : String(cell.v);
-	if(o == null) o = new_buf(8 + 4 * data.length);
+	if(o == null) o = new_buf(8 + 4 * cell.v.length);
 	write_XLSBShortCell(ncell, o);
-	write_XLWideString(data, o);
+	write_XLWideString(cell.v, o);
 	return o.length > o.l ? o.slice(0, o.l) : o;
 }

@ -511,7 +508,7 @@ function parse_ws_bin(data, _opts, idx, rels, wb/*:WBWBProps*/, themes, styles)/
 	var opts = _opts || {};
 	if(!rels) rels = {'!id':{}};
 	if(DENSE != null && opts.dense == null) opts.dense = DENSE;
-	var s/*:Worksheet*/ = ({}); if(opts.dense) s["!data"] = [];
+	var s/*:Worksheet*/ = (opts.dense ? [] : {});

 	var ref;
 	var refguess = {s: {r:2000000, c:2000000}, e: {r:0, c:0} };
@ -587,7 +584,7 @@ function parse_ws_bin(data, _opts, idx, rels, wb/*:WBWBProps*/, themes, styles)/
 				}
 				if((cf = styles.CellXf[val[0].iStyleRef])) safe_format(p,cf.numFmtId,null,opts, themes, styles);
 				C = val[0].c == -1 ? C + 1 : val[0].c;
-				if(opts.dense) { if(!s["!data"][R]) s["!data"][R] = []; s["!data"][R][C] = p; }
+				if(opts.dense) { if(!s[R]) s[R] = []; s[R][C] = p; }
 				else s[encode_col(C) + rr] = p;
 				if(opts.cellFormula) {
 					af = false;
@ -620,7 +617,7 @@ function parse_ws_bin(data, _opts, idx, rels, wb/*:WBWBProps*/, themes, styles)/
 				if(!opts.sheetStubs || pass) break;
 				p = ({t:'z',v:void 0}/*:any*/);
 				C = val[0].c == -1 ? C + 1 : val[0].c;
-				if(opts.dense) { if(!s["!data"][R]) s["!data"][R] = []; s["!data"][R][C] = p; }
+				if(opts.dense) { if(!s[R]) s[R] = []; s[R][C] = p; }
 				else s[encode_col(C) + rr] = p;
 				if(refguess.s.r > row.r) refguess.s.r = row.r;
 				if(refguess.s.c > C) refguess.s.c = C;
@ -651,11 +648,11 @@ function parse_ws_bin(data, _opts, idx, rels, wb/*:WBWBProps*/, themes, styles)/
 				}
 				for(R=val.rfx.s.r;R<=val.rfx.e.r;++R) for(C=val.rfx.s.c;C<=val.rfx.e.c;++C) {
 					if(opts.dense) {
-						if(!s["!data"][R]) s["!data"][R] = [];
-						if(!s["!data"][R][C]) s["!data"][R][C] = {t:'z',v:undefined};
-						s["!data"][R][C].l = val;
+						if(!s[R]) s[R] = [];
+						if(!s[R][C]) s[R][C] = {t:'z',v:undefined};
+						s[R][C].l = val;
 					} else {
-						addr = encode_col(C) + encode_row(R);
+						addr = encode_cell({c:C,r:R});
 						if(!s[addr]) s[addr] = {t:'z',v:undefined};
 						s[addr].l = val;
 					}
@ -665,14 +662,14 @@ function parse_ws_bin(data, _opts, idx, rels, wb/*:WBWBProps*/, themes, styles)/
 			case 0x01AA: /* 'BrtArrFmla' */
 				if(!opts.cellFormula) break;
 				arrayf.push(val);
-				cell = ((opts.dense ? s["!data"][R][C] : s[encode_col(C) + rr])/*:any*/);
+				cell = ((opts.dense ? s[R][C] : s[encode_col(C) + rr])/*:any*/);
 				cell.f = stringify_formula(val[1], refguess, {r:row.r, c:C}, supbooks, opts);
 				cell.F = encode_range(val[0]);
 				break;
 			case 0x01AB: /* 'BrtShrFmla' */
 				if(!opts.cellFormula) break;
 				sharedf[encode_cell(val[0].s)] = val[1];
-				cell = (opts.dense ? s["!data"][R][C] : s[encode_col(C) + rr]);
+				cell = (opts.dense ? s[R][C] : s[encode_col(C) + rr]);
 				cell.f = stringify_formula(val[1], refguess, {r:row.r, c:C}, supbooks, opts);
 				break;

@ -827,7 +824,7 @@ function write_ws_bin_cell(ba/*:BufArray*/, cell/*:Cell*/, R/*:number*/, C/*:num
 	switch(cell.t) {
 		case 's': case 'str':
 			if(opts.bookSST) {
-				vv = get_sst_id(opts.Strings, (cell.v == null ? "" : String(cell.v)/*:any*/), opts.revStrings);
+				vv = get_sst_id(opts.Strings, (cell.v/*:any*/), opts.revStrings);
 				o.t = "s"; o.v = vv;
 				if(last_seen) write_record(ba, 0x0012 /* BrtShortIsst */, write_BrtShortIsst(cell, o));
 				else write_record(ba, 0x0007 /* BrtCellIsst */, write_BrtCellIsst(cell, o));
@ -842,12 +839,6 @@ function write_ws_bin_cell(ba/*:BufArray*/, cell/*:Cell*/, R/*:number*/, C/*:num
 			if(cell.v == (cell.v | 0) && cell.v > -1000 && cell.v < 1000) {
 				if(last_seen) write_record(ba, 0x000D /* BrtShortRk */, write_BrtShortRk(cell, o));
 				else write_record(ba, 0x0002 /* BrtCellRk */, write_BrtCellRk(cell, o));
-			} else if(isNaN(cell.v)) {
-				if(last_seen) write_record(ba, 0x000E /* BrtShortError */, write_BrtShortError({t:"e", v: 0x24}, o)); // #NUM!
-				else write_record(ba, 0x0003 /* BrtCellError */, write_BrtCellError({t:"e", v: 0x24}, o)); // #NUM!
-			} else if(!isFinite(cell.v)) {
-				if(last_seen) write_record(ba, 0x000E /* BrtShortError */, write_BrtShortError({t:"e", v: 0x07}, o)); // #DIV/0!
-				else write_record(ba, 0x0003 /* BrtCellError */, write_BrtCellError({t:"e", v: 0x07}, o)); // #DIV/0!
 			} else {
 				if(last_seen) write_record(ba, 0x0010 /* BrtShortReal */, write_BrtShortReal(cell, o));
 				else write_record(ba, 0x0005 /* BrtCellReal */, write_BrtCellReal(cell, o));
@ -871,7 +862,7 @@ function write_ws_bin_cell(ba/*:BufArray*/, cell/*:Cell*/, R/*:number*/, C/*:num
 function write_CELLTABLE(ba, ws/*:Worksheet*/, idx/*:number*/, opts/*::, wb:Workbook*/) {
 	var range = safe_decode_range(ws['!ref'] || "A1"), ref, rr = "", cols/*:Array<string>*/ = [];
 	write_record(ba, 0x0091 /* BrtBeginSheetData */);
-	var dense = ws["!data"] != null;
+	var dense = Array.isArray(ws);
 	var cap = range.e.r;
 	if(ws['!rows']) cap = Math.max(range.e.r, ws['!rows'].length - 1);
 	for(var R = range.s.r; R <= cap; ++R) {
@ -884,7 +875,7 @@ function write_CELLTABLE(ba, ws/*:Worksheet*/, idx/*:number*/, opts/*::, wb:Work
 			/* *16384CELL */
 			if(R === range.s.r) cols[C] = encode_col(C);
 			ref = cols[C] + rr;
-			var cell = dense ? (ws["!data"][R]||[])[C] : ws[ref];
+			var cell = dense ? (ws[R]||[])[C] : ws[ref];
 			if(!cell) { last_seen = false; continue; }
 			/* write cell */
 			last_seen = write_ws_bin_cell(ba, cell, R, C, opts, ws, last_seen);
--- a/bits/69_chartxml.js
+++ b/bits/69_chartxml.js
@ -34,10 +34,7 @@ function parse_chart(data/*:?string*/, name/*:string*/, opts, rels, wb, csheet)
 		refguess.e.c = C;
 		col = encode_col(C);
 		cache[0].forEach(function(n,i) {
-			if(cs["!data"]) {
-				if(!cs["!data"][i]) cs["!data"][i] = [];
-				cs["!data"][i][C] = {t:'n', v:n, z:cache[1] };
-			} else cs[col + encode_row(i)] = {t:'n', v:n, z:cache[1] };
+			cs[col + encode_row(i)] = {t:'n', v:n, z:cache[1] };
 			R = i;
 		});
 		if(refguess.e.r < R) refguess.e.r = R;
--- a/bits/71_wbcommon.js
+++ b/bits/71_wbcommon.js
@ -113,19 +113,16 @@ function safe1904(wb/*:Workbook*/)/*:string*/ {
 	return parsexmlbool(wb.Workbook.WBProps.date1904) ? "true" : "false";
 }

-var badchars = /*#__PURE__*/":][*?\/\\".split("");
+var badchars = /*#__PURE__*/"][*?\/\\".split("");
 function check_ws_name(n/*:string*/, safe/*:?boolean*/)/*:boolean*/ {
-	try {
-		if(n == "") throw new Error("Sheet name cannot be blank");
-		if(n.length > 31) throw new Error("Sheet name cannot exceed 31 chars");
-		if(n.charCodeAt(0) == 0x27 || n.charCodeAt(n.length - 1) == 0x27) throw new Error("Sheet name cannot start or end with apostrophe (')");
-		if(n.toLowerCase() == "history") throw new Error("Sheet name cannot be 'History'");
-		badchars.forEach(function(c) {
-			if(n.indexOf(c) == -1) return;
-			throw new Error("Sheet name cannot contain : \\ / ? * [ ]");
-		});
-	} catch(e) { if(safe) return false; throw e; }
-	return true;
+	if(n.length > 31) { if(safe) return false; throw new Error("Sheet names cannot exceed 31 chars"); }
+	var _good = true;
+	badchars.forEach(function(c) {
+		if(n.indexOf(c) == -1) return;
+		if(!safe) throw new Error("Sheet name cannot contain : \\ / ? * [ ]");
+		_good = false;
+	});
+	return _good;
 }
 function check_wb_names(N, S, codes) {
 	N.forEach(function(n,i) {
--- a/bits/75_xlml.js
+++ b/bits/75_xlml.js
@ -207,7 +207,7 @@ function parse_xlml_xml(d, _opts)/*:Workbook*/ {
 	var Rn;
 	var state = [], tmp;
 	if(DENSE != null && opts.dense == null) opts.dense = DENSE;
-	var sheets = {}, sheetnames/*:Array<string>*/ = [], cursheet/*:Worksheet*/ = ({}), sheetname = ""; if(opts.dense) cursheet["!data"] = [];
+	var sheets = {}, sheetnames/*:Array<string>*/ = [], cursheet/*:Worksheet*/ = (opts.dense ? [] : {}), sheetname = "";
 	var cell = ({}/*:any*/), row = {};// eslint-disable-line no-unused-vars
 	var dtag = xlml_parsexmltag('<Data ss:Type="String">'), didx = 0;
 	var c = 0, r = 0;
@ -240,8 +240,8 @@ function parse_xlml_xml(d, _opts)/*:Workbook*/ {
 				if(comments.length > 0) cell.c = comments;
 				if((!opts.sheetRows || opts.sheetRows > r) && cell.v !== void 0) {
 					if(opts.dense) {
-						if(!cursheet["!data"][r]) cursheet["!data"][r] = [];
-						cursheet["!data"][r][c] = cell;
+						if(!cursheet[r]) cursheet[r] = [];
+						cursheet[r][c] = cell;
 					} else cursheet[encode_col(c) + encode_row(r)] = cell;
 				}
 				if(cell.HRef) {
@ -261,8 +261,8 @@ function parse_xlml_xml(d, _opts)/*:Workbook*/ {
 						for(var cmd = r; cmd <= rr; ++cmd) {
 							if(cma > c || cmd > r) {
 								if(opts.dense) {
-									if(!cursheet["!data"][cmd]) cursheet["!data"][cmd] = [];
-									cursheet["!data"][cmd][cma] = {t:'z'};
+									if(!cursheet[cmd]) cursheet[cmd] = [];
+									cursheet[cmd][cma] = {t:'z'};
 								} else cursheet[encode_col(cma) + encode_row(cmd)] = {t:'z'};
 							}
 						}
@ -321,7 +321,7 @@ function parse_xlml_xml(d, _opts)/*:Workbook*/ {
 				state.push([Rn[3], false]);
 				tmp = xlml_parsexmltag(Rn[0]);
 				sheetname = unescapexml(tmp.Name);
-				cursheet = ({}); if(opts.dense) cursheet["!data"] = [];
+				cursheet = (opts.dense ? [] : {});
 				merges = [];
 				arrayf = [];
 				rowinfo = [];
@ -919,7 +919,6 @@ function parse_xlml_xml(d, _opts)/*:Workbook*/ {
 	out.SSF = dup(table_fmt);
 	out.Props = Props;
 	out.Custprops = Custprops;
-	out.bookType = "xlml";
 	return out;
 }

@ -1177,7 +1176,7 @@ function write_ws_xlml_table(ws/*:Worksheet*/, opts, idx/*:number*/, wb/*:Workbo
 		if(n.hidden) k['ss:Hidden']="1";
 		o.push(writextag("Column",null,k));
 	});
-	var dense = ws["!data"] != null;
+	var dense = Array.isArray(ws);
 	for(var R = range.s.r; R <= range.e.r; ++R) {
 		var row = [write_ws_xlml_row(R, (ws['!rows']||[])[R])];
 		for(var C = range.s.c; C <= range.e.c; ++C) {
@ -1192,7 +1191,7 @@ function write_ws_xlml_table(ws/*:Worksheet*/, opts, idx/*:number*/, wb/*:Workbo
 			}
 			if(skip) continue;
 			var addr = {r:R,c:C};
-			var ref = encode_col(C) + encode_row(R), cell = dense ? (ws["!data"][R]||[])[C] : ws[ref];
+			var ref = encode_cell(addr), cell = dense ? (ws[R]||[])[C] : ws[ref];
 			row.push(write_ws_xlml_cell(cell, ref, ws, opts, idx, wb, addr));
 		}
 		row.push("</Row>");
--- a/bits/76_xls.js
+++ b/bits/76_xls.js
@ -104,7 +104,7 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
 	var wb = ({opts:{}}/*:any*/);
 	var Sheets = {};
 	if(DENSE != null && options.dense == null) options.dense = DENSE;
-	var out/*:Worksheet*/ = ({}/*:any*/); if(options.dense) out["!data"] = [];
+	var out/*:Worksheet*/ = ((options.dense ? [] : {})/*:any*/);
 	var Directory = {};
 	var range/*:Range*/ = ({}/*:any*/);
 	var last_formula = null;
@ -157,8 +157,8 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
 		}
 		{
 			if(options.dense) {
-				if(!out["!data"][cell.r]) out["!data"][cell.r] = [];
-				out["!data"][cell.r][cell.c] = line;
+				if(!out[cell.r]) out[cell.r] = [];
+				out[cell.r][cell.c] = line;
 			} else out[last_cell] = line;
 		}
 	};
@ -204,7 +204,6 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
 		if(RecordType === 0 && last_RT === 0x000a /* EOF */) break;
 		var length = (blob.l === blob.length ? 0 : blob.read_shift(2));
 		var R = XLSRecordEnum[RecordType];
-		if(file_depth == 0 && [0x0009, 0x0209, 0x0409, 0x0809].indexOf(RecordType) == -1 /* BOF */) break;
 		//console.log(RecordType.toString(16), RecordType, R, blob.l, length, blob.length);
 		//if(!R) console.log(blob.slice(blob.l, blob.l + length));
 		if(R && R.f) {
@ -324,7 +323,7 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
 						Workbook.Sheets.push(wsprops);
 					}
 					if(cur_sheet === "") Preamble = out; else Sheets[cur_sheet] = out;
-					out = ({}/*:any*/); if(options.dense) out["!data"] = [];
+					out = ((options.dense ? [] : {})/*:any*/);
 				} break;
 				case 0x0009: case 0x0209: case 0x0409: case 0x0809 /* BOF */: {
 					if(opts.biff === 8) opts.biff = {
@ -344,7 +343,7 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
 					if(val.BIFFVer == 0 && val.dt == 0x1000) { opts.biff = 5; seen_codepage = true; set_cp(opts.codepage = 28591); }
 					if(opts.biff == 8 && val.BIFFVer == 0 && val.dt == 16) opts.biff = 2;
 					if(file_depth++) break;
-					out = ({}/*:any*/); if(options.dense) out["!data"] = [];
+					out = ((options.dense ? [] : {})/*:any*/);

 					if(opts.biff < 8 && !seen_codepage) { seen_codepage = true; set_cp(opts.codepage = options.codepage || 1252); }

@ -367,7 +366,7 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
 					wsprops = {Hidden:(Directory[s]||{hs:0}).hs, name:cur_sheet };
 				} break;
 				case 0x0203 /* Number */: case 0x0003 /* BIFF2NUM */: case 0x0002 /* BIFF2INT */: {
-					if(out["!type"] == "chart") if(options.dense ? (out["!data"][val.r]||[])[val.c]: out[encode_col(val.c) + encode_row(val.r)]) ++val.c;
+					if(out["!type"] == "chart") if(options.dense ? (out[val.r]||[])[val.c]: out[encode_cell({c:val.c, r:val.r})]) ++val.c;
 					temp_val = ({ixfe: val.ixfe, XF: XFs[val.ixfe]||{}, v:val.val, t:'n'}/*:any*/);
 					if(BIFF2Fmt > 0) temp_val.z = BIFF2FmtTable[(temp_val.ixfe>>8) & 0x3F];
 					safe_format_xf(temp_val, options, wb.opts.Date1904);
@ -404,7 +403,7 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
 							var _fr = _f[0][0][1][0], _fc = _f[0][0][1][1];
 							var _fe = encode_cell({r:_fr, c:_fc});
 							if(sharedf[_fe]) temp_val.f = ""+stringify_formula(val.formula,range,val.cell,supbooks, opts);
-							else temp_val.F = ((options.dense ? (out["!data"][_fr]||[])[_fc]: out[_fe]) || {}).F;
+							else temp_val.F = ((options.dense ? (out[_fr]||[])[_fc]: out[_fe]) || {}).F;
 						} else temp_val.f = ""+stringify_formula(val.formula,range,val.cell,supbooks, opts);
 					}
 					if(BIFF2Fmt > 0) temp_val.z = BIFF2FmtTable[(temp_val.ixfe>>8) & 0x3F];
@ -429,7 +428,7 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
 				case 0x0021: case 0x0221 /* Array */: {
 					arrayf.push(val);
 					var _arraystart = encode_cell(val[0].s);
-					cc = options.dense ? (out["!data"][val[0].s.r]||[])[val[0].s.c] : out[_arraystart];
+					cc = options.dense ? (out[val[0].s.r]||[])[val[0].s.c] : out[_arraystart];
 					if(options.cellFormula && cc) {
 						if(!last_formula) break; /* technically unreachable */
 						if(!_arraystart || !cc) break;
@ -443,7 +442,7 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
 						/* TODO: capture range */
 						if(!last_formula) break; /* technically unreachable */
 						sharedf[encode_cell(last_formula.cell)]= val[0];
-						cc = options.dense ? (out["!data"][last_formula.cell.r]||[])[last_formula.cell.c] : out[encode_cell(last_formula.cell)];
+						cc = options.dense ? (out[last_formula.cell.r]||[])[last_formula.cell.c] : out[encode_cell(last_formula.cell)];
 						(cc||{}).f = ""+stringify_formula(val[0], range, lastcell, supbooks, opts);
 					}
 				} break;
@ -508,25 +507,25 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
 				case 0x01b8 /* HLink */: {
 					for(rngR = val[0].s.r; rngR <= val[0].e.r; ++rngR)
 						for(rngC = val[0].s.c; rngC <= val[0].e.c; ++rngC) {
-							cc = options.dense ? (out["!data"][rngR]||[])[rngC] : out[encode_cell({c:rngC,r:rngR})];
+							cc = options.dense ? (out[rngR]||[])[rngC] : out[encode_cell({c:rngC,r:rngR})];
 							if(cc) cc.l = val[1];
 						}
 				} break;
 				case 0x0800 /* HLinkTooltip */: {
 					for(rngR = val[0].s.r; rngR <= val[0].e.r; ++rngR)
 						for(rngC = val[0].s.c; rngC <= val[0].e.c; ++rngC) {
-							cc = options.dense ? (out["!data"][rngR]||[])[rngC] : out[encode_cell({c:rngC,r:rngR})];
+							cc = options.dense ? (out[rngR]||[])[rngC] : out[encode_cell({c:rngC,r:rngR})];
 							if(cc && cc.l) cc.l.Tooltip = val[1];
 							}
 				} break;
 				case 0x001c /* Note */: {
 					if(opts.biff <= 5 && opts.biff >= 2) break; /* TODO: BIFF5 */
-					cc = options.dense ? (out["!data"][val[0].r]||[])[val[0].c] : out[encode_cell(val[0])];
+					cc = options.dense ? (out[val[0].r]||[])[val[0].c] : out[encode_cell(val[0])];
 					var noteobj = objects[val[2]];
 					if(!cc) {
 						if(options.dense) {
-							if(!out["!data"][val[0].r]) out["!data"][val[0].r] = [];
-							cc = out["!data"][val[0].r][val[0].c] = ({t:"z"}/*:any*/);
+							if(!out[val[0].r]) out[val[0].r] = [];
+							cc = out[val[0].r][val[0].c] = ({t:"z"}/*:any*/);
 						} else {
 							cc = out[encode_cell(val[0])] = ({t:"z"}/*:any*/);
 						}
--- a/bits/78_writebiff.js
+++ b/bits/78_writebiff.js
@ -62,37 +62,33 @@ function write_ws_biff2_cell(ba/*:BufArray*/, cell/*:Cell*/, R/*:number*/, C/*:n
 			var v = cell.t == 'd' ? datenum(parseDate(cell.v)) : cell.v;
 			if((v == (v|0)) && (v >= 0) && (v < 65536))
 				write_biff_rec(ba, 0x0002, write_BIFF2INT(R, C, v));
-			else if(isNaN(v))
-				write_biff_rec(ba, 0x0005, write_BIFF2BERR(R, C, 0x24, "e")); // #NUM!
-			else if(!isFinite(v))
-				write_biff_rec(ba, 0x0005, write_BIFF2BERR(R, C, 0x07, "e")); // #DIV/0!
 			else
 				write_biff_rec(ba, 0x0003, write_BIFF2NUM(R,C, v));
 			return;
 		case 'b': case 'e': write_biff_rec(ba, 0x0005, write_BIFF2BERR(R, C, cell.v, cell.t)); return;
 		/* TODO: codepage, sst */
 		case 's': case 'str':
-			write_biff_rec(ba, 0x0004, write_BIFF2LABEL(R, C, cell.v == null ? "" : String(cell.v).slice(0,255)));
+			write_biff_rec(ba, 0x0004, write_BIFF2LABEL(R, C, (cell.v||"").slice(0,255)));
 			return;
 	}
 	write_biff_rec(ba, 0x0001, write_BIFF2Cell(null, R, C));
 }

 function write_ws_biff2(ba/*:BufArray*/, ws/*:Worksheet*/, idx/*:number*/, opts/*::, wb:Workbook*/) {
-	var dense = ws["!data"] != null;
+	var dense = Array.isArray(ws);
 	var range = safe_decode_range(ws['!ref'] || "A1"), ref/*:string*/, rr = "", cols/*:Array<string>*/ = [];
 	if(range.e.c > 0xFF || range.e.r > 0x3FFF) {
 		if(opts.WTF) throw new Error("Range " + (ws['!ref'] || "A1") + " exceeds format limit A1:IV16384");
 		range.e.c = Math.min(range.e.c, 0xFF);
 		range.e.r = Math.min(range.e.c, 0x3FFF);
+		ref = encode_range(range);
 	}
-	var row = [];
-	for(var C = range.s.c; C <= range.e.c; ++C) cols[C] = encode_col(C);
 	for(var R = range.s.r; R <= range.e.r; ++R) {
-		if(dense) row = ws["!data"][R] || [];
 		rr = encode_row(R);
-		for(C = range.s.c; C <= range.e.c; ++C) {
-			var cell = dense ? row[C] : ws[cols[C] + rr];
+		for(var C = range.s.c; C <= range.e.c; ++C) {
+			if(R === range.s.r) cols[C] = encode_col(C);
+			ref = cols[C] + rr;
+			var cell = dense ? (ws[R]||[])[C] : ws[ref];
 			if(!cell) continue;
 			/* write cell */
 			write_ws_biff2_cell(ba, cell, R, C, opts);
@ -103,6 +99,7 @@ function write_ws_biff2(ba/*:BufArray*/, ws/*:Worksheet*/, idx/*:number*/, opts/
 /* Based on test files */
 function write_biff2_buf(wb/*:Workbook*/, opts/*:WriteOpts*/) {
 	var o = opts || {};
+	if(DENSE != null && o.dense == null) o.dense = DENSE;
 	var ba = buf_array();
 	var idx = 0;
 	for(var i=0;i<wb.SheetNames.length;++i) if(wb.SheetNames[i] == o.sheet) idx=i;
@ -186,10 +183,8 @@ function write_ws_biff8_cell(ba/*:BufArray*/, cell/*:Cell*/, R/*:number*/, C/*:n
 	else switch(cell.t) {
 		case 'd': case 'n':
 			var v = cell.t == 'd' ? datenum(parseDate(cell.v)) : cell.v;
-			if(isNaN(v)) write_biff_rec(ba, 0x0205 /* BoolErr */, write_BoolErr(R, C, 0x24, os, opts, "e")); // #NUM!
-			else if(!isFinite(v)) write_biff_rec(ba, 0x0205 /* BoolErr */, write_BoolErr(R, C, 0x07, os, opts, "e")); // #DIV/0!
 			/* TODO: emit RK as appropriate */
-			else write_biff_rec(ba, 0x0203 /* Number */, write_Number(R, C, v, os, opts));
+			write_biff_rec(ba, 0x0203 /* Number */, write_Number(R, C, v, os, opts));
 			break;
 		case 'b': case 'e':
 			write_biff_rec(ba, 0x0205 /* BoolErr */, write_BoolErr(R, C, cell.v, os, opts, cell.t));
@ -197,9 +192,9 @@ function write_ws_biff8_cell(ba/*:BufArray*/, cell/*:Cell*/, R/*:number*/, C/*:n
 		/* TODO: codepage, sst */
 		case 's': case 'str':
 			if(opts.bookSST) {
-				var isst = get_sst_id(opts.Strings, cell.v == null ? "" : String(cell.v), opts.revStrings);
+				var isst = get_sst_id(opts.Strings, cell.v, opts.revStrings);
 				write_biff_rec(ba, 0x00fd /* LabelSst */, write_LabelSst(R, C, isst, os, opts));
-			} else write_biff_rec(ba, 0x0204 /* Label */, write_Label(R, C, (cell.v == null ? "" : String(cell.v)).slice(0,255), os, opts));
+			} else write_biff_rec(ba, 0x0204 /* Label */, write_Label(R, C, (cell.v||"").slice(0,255), os, opts));
 			break;
 		default:
 			write_biff_rec(ba, 0x0201 /* Blank */, write_XLSCell(R, C, os));
@ -212,7 +207,7 @@ function write_ws_biff8(idx/*:number*/, opts, wb/*:Workbook*/) {
 	var s = wb.SheetNames[idx], ws = wb.Sheets[s] || {};
 	var _WB/*:WBWBProps*/ = ((wb||{}).Workbook||{}/*:any*/);
 	var _sheet/*:WBWSProp*/ = ((_WB.Sheets||[])[idx]||{}/*:any*/);
-	var dense = ws["!data"] != null;
+	var dense = Array.isArray(ws);
 	var b8 = opts.biff == 8;
 	var ref/*:string*/, rr = "", cols/*:Array<string>*/ = [];
 	var range = safe_decode_range(ws['!ref'] || "A1");
@ -248,14 +243,12 @@ function write_ws_biff8(idx/*:number*/, opts, wb/*:Workbook*/) {

 	if(b8) ws['!links'] = [];
 	var comments = [];
-	var row = [];
-	for(var C = range.s.c; C <= range.e.c; ++C) cols[C] = encode_col(C);
 	for(var R = range.s.r; R <= range.e.r; ++R) {
-		if(dense) row = ws["!data"][R] || [];
 		rr = encode_row(R);
-		for(C = range.s.c; C <= range.e.c; ++C) {
+		for(var C = range.s.c; C <= range.e.c; ++C) {
+			if(R === range.s.r) cols[C] = encode_col(C);
 			ref = cols[C] + rr;
-			var cell = dense ? row[C] : ws[ref];
+			var cell = dense ? (ws[R]||[])[C] : ws[ref];
 			if(!cell) continue;
 			/* write cell */
 			write_ws_biff8_cell(ba, cell, R, C, opts);
--- a/bits/79_html.js
+++ b/bits/79_html.js
@ -1,8 +1,8 @@
 /* note: browser DOM element cannot see mso- style attrs, must parse */
 function html_to_sheet(str/*:string*/, _opts)/*:Workbook*/ {
 	var opts = _opts || {};
-	var dense = (opts.dense != null) ? opts.dense : DENSE;
-	var ws/*:Worksheet*/ = ({}/*:any*/); if(dense) ws["!data"] = [];
+	if(DENSE != null && opts.dense == null) opts.dense = DENSE;
+	var ws/*:Worksheet*/ = opts.dense ? ([]/*:any*/) : ({}/*:any*/);
 	str = str.replace(/<!--.*?-->/g, "");
 	var mtch/*:any*/ = str.match(/<table/i);
 	if(!mtch) throw new Error("Invalid HTML: could not find <table>");
@ -48,7 +48,7 @@ function html_to_sheet(str/*:string*/, _opts)/*:Workbook*/ {
 				if(!opts.cellDates) o = ({t:'n', v:datenum(o.v)}/*:any*/);
 				o.z = opts.dateNF || table_fmt[14];
 			}
-			if(dense) { if(!ws["!data"][R]) ws["!data"][R] = []; ws["!data"][R][C] = o; }
+			if(opts.dense) { if(!ws[R]) ws[R] = []; ws[R][C] = o; }
 			else ws[encode_cell({r:R, c:C})] = o;
 			C += CS;
 		}
@ -61,7 +61,6 @@ function make_html_row(ws/*:Worksheet*/, r/*:Range*/, R/*:number*/, o/*:Sheet2HT
 	var M/*:Array<Range>*/ = (ws['!merges'] ||[]);
 	var oo/*:Array<string>*/ = [];
 	var sp = ({}/*:any*/);
-	var dense = ws["!data"] != null;
 	for(var C = r.s.c; C <= r.e.c; ++C) {
 		var RS = 0, CS = 0;
 		for(var j = 0; j < M.length; ++j) {
@ -71,8 +70,8 @@ function make_html_row(ws/*:Worksheet*/, r/*:Range*/, R/*:number*/, o/*:Sheet2HT
 			RS = M[j].e.r - M[j].s.r + 1; CS = M[j].e.c - M[j].s.c + 1; break;
 		}
 		if(RS < 0) continue;
-		var coord = encode_col(C) + encode_row(R);
-		var cell = dense ? (ws["!data"][R]||[])[C] : ws[coord];
+		var coord = encode_cell({r:R,c:C});
+		var cell = o.dense ? (ws[R]||[])[C] : ws[coord];
 		/* TODO: html entities */
 		var w = (cell && cell.v != null) && (cell.h || escapehtml(cell.w || (format_cell(cell), cell.w) || "")) || "";
 		sp = ({}/*:any*/);
@ -83,7 +82,7 @@ function make_html_row(ws/*:Worksheet*/, r/*:Range*/, R/*:number*/, o/*:Sheet2HT
 			sp["data-t"] = cell && cell.t || 'z';
 			if(cell.v != null) sp["data-v"] = cell.v;
 			if(cell.z != null) sp["data-z"] = cell.z;
-			if(cell.l && (cell.l.Target || "#").charAt(0) != "#") w = '<a href="' + escapehtml(cell.l.Target) +'">' + w + '</a>';
+			if(cell.l && (cell.l.Target || "#").charAt(0) != "#") w = '<a href="' + cell.l.Target +'">' + w + '</a>';
 		}
 		sp.id = (o.id || "sjs") + "-" + coord;
 		oo.push(writextag('td', w, sp));
@ -98,14 +97,9 @@ var HTML_END = '</body></html>';
 function html_to_workbook(str/*:string*/, opts)/*:Workbook*/ {
 	var mtch = str.match(/<table[\s\S]*?>[\s\S]*?<\/table>/gi);
 	if(!mtch || mtch.length == 0) throw new Error("Invalid HTML: could not find <table>");
-	if(mtch.length == 1) {
-		var w = sheet_to_workbook(html_to_sheet(mtch[0], opts), opts);
-		w.bookType = "html";
-		return w;
-	}
+	if(mtch.length == 1) return sheet_to_workbook(html_to_sheet(mtch[0], opts), opts);
 	var wb = book_new();
 	mtch.forEach(function(s, idx) { book_append_sheet(wb, html_to_sheet(s, opts), "Sheet" + (idx+1)); });
-	wb.bookType = "html";
 	return wb;
 }

@ -120,6 +114,7 @@ function sheet_to_html(ws/*:Worksheet*/, opts/*:?Sheet2HTMLOpts*//*, wb:?Workboo
 	var footer = o.footer != null ? o.footer : HTML_END;
 	var out/*:Array<string>*/ = [header];
 	var r = decode_range(ws['!ref']);
+	o.dense = Array.isArray(ws);
 	out.push(make_html_preamble(ws, r, o));
 	for(var R = r.s.r; R <= r.e.r; ++R) out.push(make_html_row(ws, r, R, o));
 	out.push("</table>" + footer);
@ -134,7 +129,7 @@ function sheet_add_dom(ws/*:Worksheet*/, table/*:HTMLElement*/, _opts/*:?any*/)/
 	}

 	var opts = _opts || {};
-	var dense = ws["!data"] != null;
+	if(DENSE != null) opts.dense = DENSE;
 	var or_R = 0, or_C = 0;
 	if(opts.origin != null) {
 		if(typeof opts.origin == 'number') or_R = opts.origin;
@ -199,7 +194,7 @@ function sheet_add_dom(ws/*:Worksheet*/, table/*:HTMLElement*/, _opts/*:?any*/)/
 				l = Aelts[Aelti].getAttribute("href"); if(l.charAt(0) != "#") break;
 			}
 			if(l && l.charAt(0) != "#" &&	l.slice(0, 11).toLowerCase() != 'javascript:') o.l = ({ Target: l });
-			if(dense) { if(!ws["!data"][R + or_R]) ws["!data"][R + or_R] = []; ws["!data"][R + or_R][C + or_C] = o; }
+			if(opts.dense) { if(!ws[R + or_R]) ws[R + or_R] = []; ws[R + or_R][C + or_C] = o; }
 			else ws[encode_cell({c:C + or_C, r:R + or_R})] = o;
 			if(range.e.c < C + or_C) range.e.c = C + or_C;
 			C += CS;
@ -215,14 +210,12 @@ function sheet_add_dom(ws/*:Worksheet*/, table/*:HTMLElement*/, _opts/*:?any*/)/

 function parse_dom_table(table/*:HTMLElement*/, _opts/*:?any*/)/*:Worksheet*/ {
 	var opts = _opts || {};
-	var ws/*:Worksheet*/ = ({}/*:any*/); if(opts.dense) ws["!data"] = [];
+	var ws/*:Worksheet*/ = opts.dense ? ([]/*:any*/) : ({}/*:any*/);
 	return sheet_add_dom(ws, table, _opts);
 }

 function table_to_book(table/*:HTMLElement*/, opts/*:?any*/)/*:Workbook*/ {
-	var o = sheet_to_workbook(parse_dom_table(table, opts), opts);
-	//o.bookType = "dom"; // TODO: define a type for this
-	return o;
+	return sheet_to_workbook(parse_dom_table(table, opts), opts);
 }

 function is_dom_element_hidden(element/*:HTMLElement*/)/*:boolean*/ {
--- a/bits/80_parseods.js
+++ b/bits/80_parseods.js
@ -245,7 +245,7 @@ function parse_content_xml(d/*:string*/, _opts, _nfm)/*:Workbook*/ {
 		var sheetag/*:: = {name:"", '名称':""}*/;
 		var rowtag/*:: = {'行号':""}*/;
 		var Sheets = {}, SheetNames/*:Array<string>*/ = [];
-		var ws = ({}/*:any*/); if(opts.dense) ws["!data"] = [];
+		var ws = opts.dense ? ([]/*:any*/) : ({}/*:any*/);
 		var Rn, q/*:: :any = ({t:"", v:null, z:null, w:"",c:[],}:any)*/;
 		var ctag = ({value:""}/*:any*/);
 		var textp = "", textpidx = 0, textptag/*:: = {}*/;
@ -289,7 +289,7 @@ function parse_content_xml(d/*:string*/, _opts, _nfm)/*:Workbook*/ {
 					sheetag = parsexmltag(Rn[0], false);
 					R = C = -1;
 					range.s.r = range.s.c = 10000000; range.e.r = range.e.c = 0;
-					ws = ({}/*:any*/); if(opts.dense) ws["!data"] = []; merges = [];
+					ws = opts.dense ? ([]/*:any*/) : ({}/*:any*/); merges = [];
 					rowinfo = [];
 					intable = true;
 				}
@ -309,7 +309,7 @@ function parse_content_xml(d/*:string*/, _opts, _nfm)/*:Workbook*/ {
 			case 'covered-table-cell': // 9.1.5 <table:covered-table-cell>
 				if(Rn[1] !== '/') ++C;
 				if(opts.sheetStubs) {
-					if(opts.dense) { if(!ws["!data"][R]) ws["!data"][R] = []; ws["!data"][R][C] = {t:'z'}; }
+					if(opts.dense) { if(!ws[R]) ws[R] = []; ws[R][C] = {t:'z'}; }
 					else ws[encode_cell({r:R,c:C})] = {t:'z'};
 				}
 				textp = ""; textR = [];
@ -325,10 +325,10 @@ function parse_content_xml(d/*:string*/, _opts, _nfm)/*:Workbook*/ {
 					if((ctag['数据类型'] || ctag['value-type']) == "string") {
 						q.t = "s"; q.v = unescapexml(ctag['string-value'] || "");
 						if(opts.dense) {
-							if(!ws["!data"][R]) ws["!data"][R] = [];
-							ws["!data"][R][C] = q;
+							if(!ws[R]) ws[R] = [];
+							ws[R][C] = q;
 						} else {
-							ws[encode_col(C) + encode_row(R)] = q;
+							ws[encode_cell({r:R,c:C})] = q;
 						}
 					}
 					C+= colpeat-1;
@ -405,9 +405,9 @@ function parse_content_xml(d/*:string*/, _opts, _nfm)/*:Workbook*/ {
 							for(var rpt = 0; rpt < rowpeat; ++rpt) {
 								colpeat = parseInt(ctag['number-columns-repeated']||"1", 10);
 								if(opts.dense) {
-									if(!ws["!data"][R + rpt]) ws["!data"][R + rpt] = [];
-									ws["!data"][R + rpt][C] = rpt == 0 ? q : dup(q);
-									while(--colpeat > 0) ws["!data"][R + rpt][C + colpeat] = dup(q);
+									if(!ws[R + rpt]) ws[R + rpt] = [];
+									ws[R + rpt][C] = rpt == 0 ? q : dup(q);
+									while(--colpeat > 0) ws[R + rpt][C + colpeat] = dup(q);
 								} else {
 									ws[encode_cell({r:R + rpt,c:C})] = q;
 									while(--colpeat > 0) ws[encode_cell({r:R + rpt,c:C + colpeat})] = dup(q);
@ -596,9 +596,6 @@ function parse_content_xml(d/*:string*/, _opts, _nfm)/*:Workbook*/ {
 				if(Rn[1]==='/' && (!ctag || !ctag['string-value'])) {
 					var ptp = parse_text_p(str.slice(textpidx,Rn.index), textptag);
 					textp = (textp.length > 0 ? textp + "\n" : "") + ptp[0];
-				} else if(Rn[0].slice(-2) == "/>") {
-					/* TODO: is self-closing 文本串 valid? */
-					textp += "\n";
 				} else { textptag = parsexmltag(Rn[0], false); textpidx = Rn.index + Rn[0].length; }
 				break; // <text:p>
 			case 's': break; // <text:s>
@ -773,12 +770,9 @@ function parse_ods(zip/*:ZIPFile*/, opts/*:?ParseOpts*/)/*:Workbook*/ {
 	if(!content) throw new Error("Missing content.xml in ODS / UOF file");
 	var wb = parse_content_xml(utf8read(content), opts, Styles);
 	if(safegetzipfile(zip, 'meta.xml')) wb.Props = parse_core_props(getzipdata(zip, 'meta.xml'));
-	wb.bookType = "ods";
 	return wb;
 }
 function parse_fods(data/*:string*/, opts/*:?ParseOpts*/)/*:Workbook*/ {
-	var wb = parse_content_xml(data, opts);
-	wb.bookType = "fods";
-	return wb;
+	return parse_content_xml(data, opts);
 }

--- a/bits/81_writeods.js
+++ b/bits/81_writeods.js
@ -211,7 +211,7 @@ var write_content_ods/*:{(wb:any, opts:any):string}*/ = /* @__PURE__ */(function
 		o.push('      <table:table table:name="' + escapexml(wb.SheetNames[i]) + '" table:style-name="ta1">\n');
 		var R=0,C=0, range = decode_range(ws['!ref']||"A1");
 		var marr/*:Array<Range>*/ = ws['!merges'] || [], mi = 0;
-		var dense = ws["!data"] != null;
+		var dense = Array.isArray(ws);
 		if(ws["!cols"]) {
 			for(C = 0; C <= range.e.c; ++C) o.push('        <table:table-column' + (ws["!cols"][C] ? ' table:style-name="co' + ws["!cols"][C].ods + '"' : '') + '></table:table-column>\n');
 		}
@ -237,7 +237,7 @@ var write_content_ods/*:{(wb:any, opts:any):string}*/ = /* @__PURE__ */(function
 					break;
 				}
 				if(skip) { o.push(covered_cell_xml); continue; }
-				var ref = encode_cell({r:R, c:C}), cell = dense ? (ws["!data"][R]||[])[C]: ws[ref];
+				var ref = encode_cell({r:R, c:C}), cell = dense ? (ws[R]||[])[C]: ws[ref];
 				if(cell && cell.f) {
 					ct['table:formula'] = escapexml(csf_to_ods_formula(cell.f));
 					if(cell.F) {
@ -347,10 +347,9 @@ var write_content_ods/*:{(wb:any, opts:any):string}*/ = /* @__PURE__ */(function
 		var nfi = 69;
 		wb.SheetNames.map(function(n) { return wb.Sheets[n]; }).forEach(function(ws) {
 			if(!ws) return;
-			var dense = (ws["!data"] != null);
 			var range = decode_range(ws["!ref"]);
 			for(var R = 0; R <= range.e.r; ++R) for(var C = 0; C <= range.e.c; ++C) {
-				var c = dense ? (ws["!data"][R]||[])[C] : ws[encode_cell({r:R,c:C})];
+				var c = Array.isArray(ws) ? (ws[R]||[])[C] : ws[encode_cell({r:R,c:C})];
 				if(!c || !c.z || c.z.toLowerCase() == "general") continue;
 				if(!nfs[c.z]) {
 					var out = write_number_format_ods(c.z, "N" + nfi);
--- a/bits/83_numbers.js
+++ b/bits/83_numbers.js
--- a/bits/85_parsezip.js
+++ b/bits/85_parsezip.js
@ -36,12 +36,12 @@ function safe_parse_sheet(zip, path/*:string*/, relsPath/*:string*/, sheet, idx/
 		sheets[sheet] = _ws;

 		/* scan rels for comments and threaded comments */
-		var comments = [], tcomments = [];
+		var tcomments = [];
 		if(sheetRels && sheetRels[sheet]) keys(sheetRels[sheet]).forEach(function(n) {
 			var dfile = "";
 			if(sheetRels[sheet][n].Type == RELS.CMNT) {
 				dfile = resolve_path(sheetRels[sheet][n].Target, path);
-				comments = parse_cmnt(getzipdata(zip, dfile, true), dfile, opts);
+				var comments = parse_cmnt(getzipdata(zip, dfile, true), dfile, opts);
 				if(!comments || !comments.length) return;
 				sheet_insert_comments(_ws, comments, false);
 			}
@ -69,25 +69,16 @@ function parse_zip(zip/*:ZIP*/, opts/*:?ParseOpts*/)/*:Workbook*/ {
 	if(safegetzipfile(zip, 'Index/Document.iwa')) {
 		if(typeof Uint8Array == "undefined") throw new Error('NUMBERS file parsing requires Uint8Array support');
 		if(typeof parse_numbers_iwa != "undefined") {
-			if(zip.FileIndex) return parse_numbers_iwa(zip, opts);
+			if(zip.FileIndex) return parse_numbers_iwa(zip);
 			var _zip = CFB.utils.cfb_new();
 			zipentries(zip).forEach(function(e) { zip_add_file(_zip, e, getzipbin(zip, e)); });
-			return parse_numbers_iwa(_zip, opts);
+			return parse_numbers_iwa(_zip);
 		}
 		throw new Error('Unsupported NUMBERS file');
 	}
 	if(!safegetzipfile(zip, '[Content_Types].xml')) {
 		if(safegetzipfile(zip, 'index.xml.gz')) throw new Error('Unsupported NUMBERS 08 file');
 		if(safegetzipfile(zip, 'index.xml')) throw new Error('Unsupported NUMBERS 09 file');
-		var index_zip = CFB.find(zip, 'Index.zip');
-		if(index_zip) {
-			opts = dup(opts);
-			delete opts.type;
-			if(typeof index_zip.content == "string") opts.type = "binary";
-			// TODO: Bun buffer bug
-			if(typeof Bun !== "undefined" && Buffer.isBuffer(index_zip.content)) return readSync(new Uint8Array(index_zip.content), opts);
-			return readSync(index_zip.content, opts);
-		}
 		throw new Error('Unsupported ZIP file');
 	}

@ -249,8 +240,6 @@ function parse_zip(zip/*:ZIP*/, opts/*:?ParseOpts*/)/*:Workbook*/ {
 		if(dir.vba.length > 0) out.vbaraw = getzipdata(zip,strip_front_slash(dir.vba[0]),true);
 		else if(dir.defaults && dir.defaults.bin === CT_VBA) out.vbaraw = getzipdata(zip, 'xl/vbaProject.bin',true);
 	}
-	// TODO: pass back content types metdata for xlsm/xlsx resolution
-	out.bookType = xlsb ? "xlsb" : "xlsx";
 	return out;
 }

--- a/bits/86_writezip.js
+++ b/bits/86_writezip.js
@ -101,8 +101,7 @@ function write_zip_xlsb(wb/*:Workbook*/, opts/*:WriteOpts*/)/*:ZIP*/ {
 	/* TODO: something more intelligent with themes */

 	f = "xl/theme/theme1.xml";
-	var ww = write_theme(wb.Themes, opts);
-	zip_add_file(zip, f, ww);
+	zip_add_file(zip, f, write_theme(wb.Themes, opts));
 	ct.themes.push(f);
 	add_rels(opts.wbrels, -1, "theme/theme1.xml", RELS.THEME);

--- a/bits/87_read.js
+++ b/bits/87_read.js
@ -50,13 +50,7 @@ function read_plaintext_raw(data/*:RawData*/, o/*:ParseOpts*/)/*:Workbook*/ {
 function read_utf16(data/*:RawData*/, o/*:ParseOpts*/)/*:Workbook*/ {
 	var d = data;
 	if(o.type == 'base64') d = Base64_decode(d);
-	if(typeof ArrayBuffer !== "undefined" && data instanceof ArrayBuffer) d = new Uint8Array(data);
-	d = typeof $cptable !== "undefined" ? $cptable.utils.decode(1200, d.slice(2), 'str') : (
-		(has_buf && Buffer.isBuffer(data)) ? data.slice(2).toString("utf16le") :
-		(typeof Uint8Array !== "undefined" && d instanceof Uint8Array) ? (
-			typeof TextDecoder !== "undefined" ? new TextDecoder("utf-16le").decode(d.slice(2)) : utf16lereadu(d.slice(2))
-		) : utf16leread(d.slice(2))
-	);
+	d = $cptable.utils.decode(1200, d.slice(2), 'str');
 	o.type = "binary";
 	return read_plaintext(d, o);
 }
@ -73,7 +67,6 @@ function read_prn(data, d, o, str) {
 function readSync(data/*:RawData*/, opts/*:?ParseOpts*/)/*:Workbook*/ {
 	reset_cp();
 	var o = opts||{};
-	if(o.codepage && typeof $cptable === "undefined") console.error("Codepage tables are not loaded.  Non-ASCII characters may not give expected results");
 	if(typeof ArrayBuffer !== 'undefined' && data instanceof ArrayBuffer) return readSync(new Uint8Array(data), (o = dup(o), o.type = "array", o));
 	if(typeof Uint8Array !== 'undefined' && data instanceof Uint8Array && !o.type) o.type = typeof Deno !== "undefined" ? "buffer" : "array";
 	var d = data, n = [0,0,0,0], str = false;
@ -111,7 +104,7 @@ function readSync(data/*:RawData*/, opts/*:?ParseOpts*/)/*:Workbook*/ {
 			}
 			break;
 		case 0x03: case 0x83: case 0x8B: case 0x8C: return DBF.to_workbook(d, o);
-		case 0x7B: if(n[1] === 0x5C && n[2] === 0x72 && n[3] === 0x74) return rtf_to_workbook(d, o); break;
+		case 0x7B: if(n[1] === 0x5C && n[2] === 0x72 && n[3] === 0x74) return RTF.to_workbook(d, o); break;
 		case 0x0A: case 0x0D: case 0x20: return read_plaintext_raw(d, o);
 		case 0x89: if(n[1] === 0x50 && n[2] === 0x4E && n[3] === 0x47) throw new Error("PNG Image File is not a spreadsheet"); break;
 		case 0x08: if(n[1] === 0xE7) throw new Error("Unsupported Multiplan 1.x file!"); break;
--- a/bits/88_write.js
+++ b/bits/88_write.js
@ -81,7 +81,7 @@ function write_string_type(out/*:string*/, opts/*:WriteOpts*/, bom/*:?string*/)/

 function write_stxt_type(out/*:string*/, opts/*:WriteOpts*/)/*:any*/ {
 	switch(opts.type) {
-		case "base64": return Base64_encode_pass(out);
+		case "base64": return Base64_encode(out);
 		case "binary": return out;
 		case "string": return out; /* override in sheet_to_txt */
 		case "file": return write_dl(opts.file, out, 'binary');
@ -142,7 +142,7 @@ function writeSync(wb/*:Workbook*/, opts/*:?WriteOpts*/) {
 		case 'dif': return write_string_type(DIF.from_sheet(wb.Sheets[wb.SheetNames[idx]], o), o);
 		case 'dbf': return write_binary_type(DBF.from_sheet(wb.Sheets[wb.SheetNames[idx]], o), o);
 		case 'prn': return write_string_type(PRN.from_sheet(wb.Sheets[wb.SheetNames[idx]], o), o);
-		case 'rtf': return write_string_type(sheet_to_rtf(wb.Sheets[wb.SheetNames[idx]], o), o);
+		case 'rtf': return write_string_type(RTF.from_sheet(wb.Sheets[wb.SheetNames[idx]], o), o);
 		case 'eth': return write_string_type(ETH.from_sheet(wb.Sheets[wb.SheetNames[idx]], o), o);
 		case 'fods': return write_string_type(write_ods(wb, o), o);
 		case 'wk1': return write_binary_type(WK_.sheet_to_wk1(wb.Sheets[wb.SheetNames[idx]], o), o);
--- a/bits/90_utils.js
+++ b/bits/90_utils.js
@ -4,17 +4,17 @@ type MJRObject = {
 	isempty: boolean;
 };
 */
-function make_json_row(sheet/*:Worksheet*/, r/*:Range*/, R/*:number*/, cols/*:Array<string>*/, header/*:number*/, hdr/*:Array<any>*/, o/*:Sheet2JSONOpts*/)/*:MJRObject*/ {
+function make_json_row(sheet/*:Worksheet*/, r/*:Range*/, R/*:number*/, cols/*:Array<string>*/, header/*:number*/, hdr/*:Array<any>*/, dense/*:boolean*/, o/*:Sheet2JSONOpts*/)/*:MJRObject*/ {
 	var rr = encode_row(R);
 	var defval = o.defval, raw = o.raw || !Object.prototype.hasOwnProperty.call(o, "raw");
-	var isempty = true, dense = (sheet["!data"] != null);
+	var isempty = true;
 	var row/*:any*/ = (header === 1) ? [] : {};
 	if(header !== 1) {
 		if(Object.defineProperty) try { Object.defineProperty(row, '__rowNum__', {value:R, enumerable:false}); } catch(e) { row.__rowNum__ = R; }
 		else row.__rowNum__ = R;
 	}
-	if(!dense || sheet["!data"][R]) for (var C = r.s.c; C <= r.e.c; ++C) {
-		var val = dense ? (sheet["!data"][R]||[])[C] : sheet[cols[C] + rr];
+	if(!dense || sheet[R]) for (var C = r.s.c; C <= r.e.c; ++C) {
+		var val = dense ? sheet[R][C] : sheet[cols[C] + rr];
 		if(val === undefined || val.t === undefined) {
 			if(defval === undefined) continue;
 			if(hdr[C] != null) { row[hdr[C]] = defval; }
@ -63,16 +63,16 @@ function sheet_to_json(sheet/*:Worksheet*/, opts/*:?Sheet2JSONOpts*/) {
 	var cols/*:Array<string>*/ = [];
 	var out/*:Array<any>*/ = [];
 	var outi = 0, counter = 0;
-	var dense = sheet["!data"] != null;
+	var dense = Array.isArray(sheet);
 	var R = r.s.r, C = 0;
 	var header_cnt = {};
-	if(dense && !sheet["!data"][R]) sheet["!data"][R] = [];
+	if(dense && !sheet[R]) sheet[R] = [];
 	var colinfo/*:Array<ColInfo>*/ = o.skipHidden && sheet["!cols"] || [];
 	var rowinfo/*:Array<ColInfo>*/ = o.skipHidden && sheet["!rows"] || [];
 	for(C = r.s.c; C <= r.e.c; ++C) {
 		if(((colinfo[C]||{}).hidden)) continue;
 		cols[C] = encode_col(C);
-		val = dense ? sheet["!data"][R][C] : sheet[cols[C] + rr];
+		val = dense ? sheet[R][C] : sheet[cols[C] + rr];
 		switch(header) {
 			case 1: hdr[C] = C - r.s.c; break;
 			case 2: hdr[C] = cols[C]; break;
@ -91,7 +91,7 @@ function sheet_to_json(sheet/*:Worksheet*/, opts/*:?Sheet2JSONOpts*/) {
 	}
 	for (R = r.s.r + offset; R <= r.e.r; ++R) {
 		if ((rowinfo[R]||{}).hidden) continue;
-		var row = make_json_row(sheet, r, R, cols, header, hdr, o);
+		var row = make_json_row(sheet, r, R, cols, header, hdr, dense, o);
 		if((row.isempty === false) || (header === 1 ? o.blankrows !== false : !!o.blankrows)) out[outi++] = row.row;
 	}
 	out.length = outi;
@ -102,11 +102,9 @@ var qreg = /"/g;
 function make_csv_row(sheet/*:Worksheet*/, r/*:Range*/, R/*:number*/, cols/*:Array<string>*/, fs/*:number*/, rs/*:number*/, FS/*:string*/, o/*:Sheet2CSVOpts*/)/*:?string*/ {
 	var isempty = true;
 	var row/*:Array<string>*/ = [], txt = "", rr = encode_row(R);
-	var dense = sheet["!data"] != null;
-	var datarow = dense && sheet["!data"][R] || [];
 	for(var C = r.s.c; C <= r.e.c; ++C) {
 		if (!cols[C]) continue;
-		var val = dense ? datarow[C]: sheet[cols[C] + rr];
+		var val = o.dense ? (sheet[R]||[])[C]: sheet[cols[C] + rr];
 		if(val == null) txt = "";
 		else if(val.v != null) {
 			isempty = false;
@ -133,6 +131,7 @@ function sheet_to_csv(sheet/*:Worksheet*/, opts/*:?Sheet2CSVOpts*/)/*:string*/ {
 	var RS = o.RS !== undefined ? o.RS : "\n", rs = RS.charCodeAt(0);
 	var endregex = new RegExp((FS=="|" ? "\\|" : FS)+"+$");
 	var row = "", cols/*:Array<string>*/ = [];
+	o.dense = Array.isArray(sheet);
 	var colinfo/*:Array<ColInfo>*/ = o.skipHidden && sheet["!cols"] || [];
 	var rowinfo/*:Array<ColInfo>*/ = o.skipHidden && sheet["!rows"] || [];
 	for(var C = r.s.c; C <= r.e.c; ++C) if (!((colinfo[C]||{}).hidden)) cols[C] = encode_col(C);
@ -144,6 +143,7 @@ function sheet_to_csv(sheet/*:Worksheet*/, opts/*:?Sheet2CSVOpts*/)/*:string*/ {
 		if(o.strip) row = row.replace(endregex,"");
 		if(row || (o.blankrows !== false)) out.push((w++ ? RS : "") + row);
 	}
+	delete o.dense;
 	return out.join("");
 }

@ -160,13 +160,13 @@ function sheet_to_formulae(sheet/*:Worksheet*/)/*:Array<string>*/ {
 	if(sheet == null || sheet["!ref"] == null) return [];
 	var r = safe_decode_range(sheet['!ref']), rr = "", cols/*:Array<string>*/ = [], C;
 	var cmds/*:Array<string>*/ = [];
-	var dense = sheet["!data"] != null;
+	var dense = Array.isArray(sheet);
 	for(C = r.s.c; C <= r.e.c; ++C) cols[C] = encode_col(C);
 	for(var R = r.s.r; R <= r.e.r; ++R) {
 		rr = encode_row(R);
 		for(C = r.s.c; C <= r.e.c; ++C) {
 			y = cols[C] + rr;
-			x = dense ? (sheet["!data"][R]||[])[C] : sheet[y];
+			x = dense ? (sheet[R]||[])[C] : sheet[y];
 			val = "";
 			if(x === undefined) continue;
 			else if(x.F != null) {
@ -191,11 +191,8 @@ function sheet_to_formulae(sheet/*:Worksheet*/)/*:Array<string>*/ {

 function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array<any>*/, opts)/*:Worksheet*/ {
 	var o = opts || {};
-	var dense = _ws ? (_ws["!data"] != null) : o.dense;
-	if(DENSE != null && dense == null) dense = DENSE;
 	var offset = +!o.skipHeader;
-	var ws/*:Worksheet*/ = _ws || ({});
-	if(!_ws && dense) ws["!data"] = [];
+	var ws/*:Worksheet*/ = _ws || ({}/*:any*/);
 	var _R = 0, _C = 0;
 	if(ws && o.origin != null) {
 		if(typeof o.origin == 'number') _R = o.origin;
@ -204,6 +201,7 @@ function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array<any>*/, opts)/*:Worksheet
 			_R = _origin.r; _C = _origin.c;
 		}
 	}
+	var cell/*:Cell*/;
 	var range/*:Range*/ = ({s: {c:0, r:0}, e: {c:_C, r:_R + js.length - 1 + offset}}/*:any*/);
 	if(ws['!ref']) {
 		var _range = safe_decode_range(ws['!ref']);
@ -214,20 +212,17 @@ function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array<any>*/, opts)/*:Worksheet
 		if(_R == -1) { _R = 0; range.e.r = js.length - 1 + offset; }
 	}
 	var hdr/*:Array<string>*/ = o.header || [], C = 0;
-	var ROW = [];
+
 	js.forEach(function (JS, R/*:number*/) {
-		if(dense && !ws["!data"][_R + R + offset]) ws["!data"][_R + R + offset] = [];
-		if(dense) ROW = ws["!data"][_R + R + offset];
 		keys(JS).forEach(function(k) {
 			if((C=hdr.indexOf(k)) == -1) hdr[C=hdr.length] = k;
 			var v = JS[k];
 			var t = 'z';
 			var z = "";
-			var ref = dense ? "" : (encode_col(_C + C) + encode_row(_R + R + offset));
-			var cell/*:Cell*/ = dense ? ROW[_C + C] : ws[ref];
+			var ref = encode_cell({c:_C + C,r:_R + R + offset});
+			cell = ws_get_cell_stub(ws, ref);
 			if(v && typeof v === 'object' && !(v instanceof Date)){
-				if(dense) ROW[_C + C] = v;
-				else ws[ref] = v;
+				ws[ref] = v;
 			} else {
 				if(typeof v == 'number') t = 'n';
 				else if(typeof v == 'boolean') t = 'b';
@ -235,13 +230,11 @@ function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array<any>*/, opts)/*:Worksheet
 				else if(v instanceof Date) {
 					t = 'd';
 					if(!o.cellDates) { t = 'n'; v = datenum(v); }
-					z = (cell != null && cell.z && fmt_is_date(cell.z)) ? cell.z : (o.dateNF || table_fmt[14]);
+					z = (cell.z && fmt_is_date(cell.z)) ? cell.z : (o.dateNF || table_fmt[14]);
 				}
 				else if(v === null && o.nullError) { t = 'e'; v = 0; }
-				if(!cell) {
-					if(!dense) ws[ref] = cell = ({t:t, v:v}/*:any*/);
-					else ROW[_C + C] = cell = ({t:t, v:v}/*:any*/);
-				} else {
+				if(!cell) ws[ref] = cell = ({t:t, v:v}/*:any*/);
+				else {
 					cell.t = t; cell.v = v;
 					delete cell.w; delete cell.R;
 					if(z) cell.z = z;
@ -252,11 +245,7 @@ function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array<any>*/, opts)/*:Worksheet
 	});
 	range.e.c = Math.max(range.e.c, _C + hdr.length - 1);
 	var __R = encode_row(_R);
-	if(dense && !ws["!data"][_R]) ws["!data"][_R] = [];
-	if(offset) for(C = 0; C < hdr.length; ++C) {
-		if(dense) ws["!data"][_R][C + _C] = {t:'s', v:hdr[C]};
-		else ws[encode_col(C + _C) + __R] = {t:'s', v:hdr[C]};
-	}
+	if(offset) for(C = 0; C < hdr.length; ++C) ws[encode_col(C + _C) + __R] = {t:'s', v:hdr[C]};
 	ws['!ref'] = encode_range(range);
 	return ws;
 }
@ -266,17 +255,18 @@ function json_to_sheet(js/*:Array<any>*/, opts)/*:Worksheet*/ { return sheet_add
 function ws_get_cell_stub(ws/*:Worksheet*/, R, C/*:?number*/)/*:Cell*/ {
 	/* A1 cell address */
 	if(typeof R == "string") {
-		if(ws["!data"] != null) {
+		/* dense */
+		if(Array.isArray(ws)) {
 			var RC = decode_cell(R);
-			if(!ws["!data"][RC.r]) ws["!data"][RC.r] = [];
-			return ws["!data"][RC.r][RC.c] || (ws["!data"][RC.r][RC.c] = {t:'z'});
+			if(!ws[RC.r]) ws[RC.r] = [];
+			return ws[RC.r][RC.c] || (ws[RC.r][RC.c] = {t:'z'});
 		}
 		return ws[R] || (ws[R] = {t:'z'});
 	}
 	/* cell address object */
 	if(typeof R != "number") return ws_get_cell_stub(ws, encode_cell(R));
 	/* R and C are 0-based indices */
-	return ws_get_cell_stub(ws, encode_col(C||0) + encode_row(R));
+	return ws_get_cell_stub(ws, encode_cell({r:R,c:C||0}));
 }

 /* find sheet index for given name / validate index */
--- a/bits/97_node.js
+++ b/bits/97_node.js
@ -10,6 +10,7 @@ function write_csv_stream(sheet/*:Worksheet*/, opts/*:?Sheet2CSVOpts*/) {
 	var RS = o.RS !== undefined ? o.RS : "\n", rs = RS.charCodeAt(0);
 	var endregex = new RegExp((FS=="|" ? "\\|" : FS)+"+$");
 	var row/*:?string*/ = "", cols/*:Array<string>*/ = [];
+	o.dense = Array.isArray(sheet);
 	var colinfo/*:Array<ColInfo>*/ = o.skipHidden && sheet["!cols"] || [];
 	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);
@ -39,6 +40,7 @@ function write_html_stream(ws/*:Worksheet*/, opts/*:?Sheet2HTMLOpts*/) {
 	var footer = o.footer != null ? o.footer : HTML_END;
 	stream.push(header);
 	var r = decode_range(ws['!ref']);
+	o.dense = Array.isArray(ws);
 	stream.push(make_html_preamble(ws, r, o));
 	var R = r.s.r;
 	var end = false;
@ -76,16 +78,16 @@ function write_json_stream(sheet/*:Worksheet*/, opts/*:?Sheet2CSVOpts*/) {
 	var rr = encode_row(r.s.r);
 	var cols/*:Array<string>*/ = [];
 	var counter = 0;
-	var dense = sheet["!data"] != null;
+	var dense = Array.isArray(sheet);
 	var R = r.s.r, C = 0;
 	var header_cnt = {};
-	if(dense && !sheet["!data"][R]) sheet["!data"][R] = [];
+	if(dense && !sheet[R]) sheet[R] = [];
 	var colinfo/*:Array<ColInfo>*/ = o.skipHidden && sheet["!cols"] || [];
 	var rowinfo/*:Array<RowInfo>*/ = o.skipHidden && sheet["!rows"] || [];
 	for(C = r.s.c; C <= r.e.c; ++C) {
 		if(((colinfo[C]||{}).hidden)) continue;
 		cols[C] = encode_col(C);
-		val = dense ? sheet["!data"][R][C] : sheet[cols[C] + rr];
+		val = dense ? sheet[R][C] : sheet[cols[C] + rr];
 		switch(header) {
 			case 1: hdr[C] = C - r.s.c; break;
 			case 2: hdr[C] = cols[C]; break;
@ -106,7 +108,7 @@ function write_json_stream(sheet/*:Worksheet*/, opts/*:?Sheet2CSVOpts*/) {
 	stream._read = function() {
 		while(R <= r.e.r) {
 			if ((rowinfo[R-1]||{}).hidden) continue;
-			var row = make_json_row(sheet, r, R, cols, header, hdr, o);
+			var row = make_json_row(sheet, r, R, cols, header, hdr, dense, o);
 			++R;
 			if((row.isempty === false) || (header === 1 ? o.blankrows !== false : !!o.blankrows)) {
 				stream.push(row.row);
--- a/bits/98_exports.js
+++ b/bits/98_exports.js
@ -10,8 +10,6 @@ XLSX.writeFileAsync = writeFileAsync;
 XLSX.utils = utils;
 XLSX.writeXLSX = writeSyncXLSX;
 XLSX.writeFileXLSX = writeFileSyncXLSX;
-XLSX.set_fs = set_fs;
-XLSX.set_cptable = set_cptable;
 XLSX.SSF = SSF;
 if(typeof __stream !== "undefined") XLSX.stream = __stream;
 if(typeof CFB !== "undefined") XLSX.CFB = CFB;
--- a/demos/README.md
+++ b/demos/README.md
@ -0,0 +1,60 @@
+# Demos
+
+These demos are intended to demonstrate how to load this library in various
+ecosystems.  The library is designed to be used in the web browser and in node
+contexts, using dynamic feature tests to pull in features when necessary.  This
+works extremely well in common use cases: script tag insertion and node require.
+
+Systems like webpack try to be clever by performing simple static analysis to
+pull in code.  However, they do not support dynamic type tests, breaking
+compatibility with traditional scripts.  Configuration is required.  The demos
+cover basic configuration steps for various systems and should "just work".
+
+Mobile app and other larger demos do not include the full build structure. The
+demos have `Makefile` scripts that show how to reproduce the full projects.  The
+scripts have been tested against iOS and OSX.  For Windows platforms, GNU make
+can be installed with Bash on Windows or with `cygwin`.
+
+### Included Demos
+
+**Frameworks and APIs**
+- [`angularjs`](angular/)
+- [`angular and ionic`](angular2/)
+- [`knockout`](knockout/)
+- [`meteor`](meteor/)
+- [`react, react-native, next`](react/)
+- [`vue 2.x, weex, nuxt`](vue/)
+- [`XMLHttpRequest and fetch`](xhr/)
+- [`nodejs server`](server/)
+- [`databases and key/value stores`](database/)
+- [`typed arrays and math`](array/)
+
+**Bundlers and Tooling**
+- [`browserify`](browserify/)
+- [`parcel`](parcel/)
+- [`requirejs`](requirejs/)
+- [`rollup`](rollup/)
+- [`systemjs`](systemjs/)
+- [`typescript`](typescript/)
+- [`webpack 2.x`](webpack/)
+
+**Platforms and Integrations**
+- [`deno`](deno/)
+- [`electron application`](electron/)
+- [`nw.js application`](nwjs/)
+- [`Chrome / Chromium extensions`](chrome/)
+- [`Google Sheets API`](https://docs.sheetjs.com/docs/getting-started/demos/gsheet)
+- [`Adobe Apps`](https://docs.sheetjs.com/docs/getting-started/demos/extendscript)
+- [`Excel JavaScript API`](https://docs.sheetjs.com/docs/getting-started/demos/excel)
+- [`Headless Browsers`](headless/)
+- [`canvas-datagrid`](datagrid/)
+- [`x-spreadsheet`](xspreadsheet/)
+- [`react-data-grid`](react/modify/)
+- [`vue3-table-light`](/vue/modify/)
+- [`Swift JSC and other engines`](altjs/)
+- [`"serverless" functions`](function/)
+- [`internet explorer`](oldie/)
+
+Other examples are included in the [showcase](demos/showcase/).
+
+[![Analytics](https://ga-beacon.appspot.com/UA-36810333-1/SheetJS/js-xlsx?pixel)](https://github.com/SheetJS/js-xlsx)
--- a/demos/altjs/.gitignore
+++ b/demos/altjs/.gitignore
@ -0,0 +1,10 @@
+sheetjs.*
+SheetJSSwift
+duk*
+*.class
+*.jar
+rhino
+shim.min.js
+xlsx.*.js
+payload.js
+goja
--- a/demos/altjs/.swiftlint.yml
+++ b/demos/altjs/.swiftlint.yml
@ -0,0 +1,3 @@
+disabled_rules:
+  - trailing_semicolon
+  - identifier_name
--- a/demos/altjs/Makefile
+++ b/demos/altjs/Makefile
@ -0,0 +1,60 @@
+.PHONY: all
+all: duktape nashorn rhinojs swift goja
+
+.PHONY: base
+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: duk
+duk: base
+	bash ./duktape.sh
+	gcc -std=c99 -Wall -osheetjs.duk sheetjs.duk.c duktape.c -lm
+
+.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
+	jjs nashorn.js
+
+.PHONY: swift
+swift: base ## swift demo
+	swiftc SheetJSCore.swift main.swift -o SheetJSSwift
+	./SheetJSSwift
+
+.PHONY: goja
+goja: base ## goja demo
+	go build goja.go
+	for ext in xlsx xlsb biff8.xls xml.xls; do ./goja sheetjs.$$ext; done
+
+.PHONY: chakra
+chakra: base ## Chakra demo
+	node -pe "fs.writeFileSync('payload.js', 'var payload = \"' + fs.readFileSync('sheetjs.xlsx').toString('base64') + '\";')"
+	cat global.js xlsx.full.min.js payload.js chakra.js > xlsx.chakra.js
+	chakra ./xlsx.chakra.js
+
+.PHONY: rhinojs ## rhino demo
+rhinojs: base SheetJSRhino.class
+	for ext in xlsx xlsb biff8.xls xml.xls; do java -cp .:SheetJS.jar:rhino.jar SheetJSRhino sheetjs.$$ext; done
+
+RHDEPS=$(filter-out SheetJSRhino.class,$(patsubst %.java,%.class,$(wildcard com/sheetjs/*.java)))
+$(RHDEPS): %.class: %.java rhino.jar
+	javac -cp .:SheetJS.jar:rhino.jar $*.java
+
+SheetJSRhino.class: $(RHDEPS)
+	jar -cf SheetJS.jar $^ xlsx.full.min.js
+	javac -cp .:SheetJS.jar:rhino.jar SheetJSRhino.java
+
+rhino.jar:
+	if [ ! -e rhino ]; then git clone --depth=1 https://github.com/mozilla/rhino; fi
+	#if [ ! -e rhino/build/rhino*/js.jar ]; then cd rhino; ant jar; fi
+	#cp rhino/build/rhino*/js.jar rhino.jar
+	if [ ! -e rhino/buildGradle/libs/rhino-[0-1]*.jar ]; then cd rhino; ./gradlew jar; fi
+	cp rhino/buildGradle/libs/rhino-[0-9]*.jar rhino.jar
+
+.PHONY: clean
+clean:
+	rm SheetJS.jar *.class com/sheetjs/*.class
--- a/demos/altjs/README.md
+++ b/demos/altjs/README.md
@ -0,0 +1,186 @@
+# Other JS Engines and Deployments
+
+There are many JS engines and deployments outside of web browsers. NodeJS is the
+most popular deployment, but there are many others for special use cases.  Some
+optimize for low overhead and others optimize for ease of embedding within other
+applications.  Since it was designed for ES3 engines, the library can be used in
+those settings!  This demo tries to demonstrate a few alternative deployments.
+
+Some engines provide no default global object.  To create a global reference:
+
+```js
+var global = (function(){ return this; }).call(null);
+```
+
+
+## Swift + JavaScriptCore
+
+iOS and OSX ship with the JavaScriptCore framework for running JS scripts from
+Swift and Objective-C.  Hybrid function invocation is tricky, but explicit data
+passing is straightforward.  The demo shows a standalone example for OSX.  For
+playgrounds, the library should be copied to shared playground data directory
+(usually `~/Documents/Shared Playground Data`):
+
+```swift
+/* This only works in a playground, see SheetJSCore.swift for standalone use */
+import JavaScriptCore;
+import PlaygroundSupport;
+
+/* build path variable for the library */
+let shared_dir = PlaygroundSupport.playgroundSharedDataDirectory;
+let lib_path = shared_dir.appendingPathComponent("xlsx.full.min.js");
+
+/* prepare JS context */
+var context: JSContext! = JSContext();
+var src = "var global = (function(){ return this; }).call(null);";
+context.evaluateScript(src);
+
+/* load library */
+var lib = try? String(contentsOf: lib_path);
+context.evaluateScript(lib);
+let XLSX: JSValue! = context.objectForKeyedSubscript("XLSX");
+
+/* to verify the library was loaded, get the version string */
+let XLSXversion: JSValue! = XLSX.objectForKeyedSubscript("version")
+var version  = XLSXversion.toString();
+```
+
+Binary strings can be passed back and forth using `String.Encoding.isoLatin1`:
+
+```swift
+/* parse sheetjs.xls */
+let file_path = shared_dir.appendingPathComponent("sheetjs.xls");
+let data: String! = try String(contentsOf: file_path, encoding: String.Encoding.isoLatin1);
+context.setObject(data, forKeyedSubscript: "payload" as (NSCopying & NSObjectProtocol));
+src = "var wb = XLSX.read(payload, {type:'binary'});";
+context.evaluateScript(src);
+
+/* write to sheetjsw.xlsx  */
+let out_path = shared_dir.appendingPathComponent("sheetjsw.xlsx");
+src = "var out = XLSX.write(wb, {type:'binary', bookType:'xlsx'})";
+context.evaluateScript(src);
+let outvalue: JSValue! = context.objectForKeyedSubscript("out");
+var out: String! = outvalue.toString();
+try? out.write(to: out_path, atomically: false, encoding: String.Encoding.isoLatin1);
+```
+
+
+## Nashorn
+
+Nashorn ships with Java 8.  It includes a command-line tool `jjs` for running JS
+scripts.  It is somewhat limited but does offer access to the full Java runtime.
+
+The `load` function in `jjs` can load the minified source directly:
+
+```js
+var global = (function(){ return this; }).call(null);
+load('xlsx.full.min.js');
+```
+
+The Java `nio` API provides the `Files.readAllBytes` method to read a file into
+a byte array.  To use in `XLSX.read`, the demo copies the bytes into a plain JS
+array and calls `XLSX.read` with type `"array"`.
+
+
+## Rhino
+
+[Rhino](http://www.mozilla.org/rhino) is an ES3+ engine written in Java.  The
+`SheetJSRhino` class and `com.sheetjs` package show a complete JAR deployment,
+including the full XLSX source.
+
+Due to code generation errors, optimization must be turned off:
+
+```java
+Context context = Context.enter();
+context.setOptimizationLevel(-1);
+```
+
+
+## ChakraCore
+
+ChakraCore is an embeddable JS engine written in C++.  The library and binary
+distributions include a command-line tool `chakra` for running JS scripts.
+
+The simplest way to interact with the engine is to pass Base64 strings. The make
+target builds a very simple payload with the data.
+
+
+## Duktape
+
+[Duktape](http://duktape.org/) is an embeddable JS engine written in C.  The
+amalgamation makes integration extremely simple!  It supports `Buffer` natively
+but should be sliced before processing:
+
+```C
+/* parse a C char array as a workbook object */
+duk_push_external_buffer(ctx);
+duk_config_buffer(ctx, -1, buf, len);
+duk_put_global_string(ctx, "buf");
+duk_eval_string_noresult("workbook = XLSX.read(buf.slice(0, buf.length), {type:'buffer'});");
+
+/* write a workbook object to a C char array */
+duk_eval_string(ctx, "XLSX.write(workbook, {type:'array', bookType:'xlsx'})");
+duk_size_t sz;
+char *buf = (char *)duk_get_buffer_data(ctx, -1, sz);
+duk_pop(ctx);
+```
+
+
+## QuickJS
+
+QuickJS is an embeddable JS engine written in C.  It provides a separate set of
+functions for interacting with the filesystem and the global object.  It can run
+the browser dist build.
+
+The `global` object is available as `std.global`.  To make it visible to the
+loader, create a reference to itself:
+
+```js
+std.global.global = std.global;
+std.loadScript("xlsx.full.min.js");
+```
+
+The filesystem interaction mirrors POSIX, including separate allocations:
+
+```js
+/* read file */
+var rh = std.open(filename, "rb"); rh.seek(0, std.SEEK_END);
+var sz = rh.tell(); rh.seek();
+var ab = new ArrayBuffer(sz); rh.read(ab, 0, sz); rh.close();
+var wb = XLSX.read(ab, {type: 'array'});
+
+/* write file */
+var ab = XLSX.write(wb, {type: 'array'});
+var wh = std.open("sheetjs.qjs.xlsx", "wb");
+wh.write(out, 0, ab.byteLength); wh.close();
+```
+
+
+## Goja
+
+Goja is a pure Go implementation of ECMAScript 5.  `[]byte` should be converted
+to a binary string in the engine:
+
+```go
+/* read file */
+data, _ := ioutil.ReadFile("sheetjs.xlsx")
+
+/* load into engine */
+vm.Set("buf", data)
+
+/* convert to binary string */
+_, _ = vm.RunString("var bstr = ''; for(var i = 0; i < buf.length; ++i) bstr += String.fromCharCode(buf[i]);")
+
+/* parse */
+wb, _ = vm.RunString("wb = XLSX.read(bstr, {type:'binary', cellNF:true});")
+```
+
+On the write side, `"base64"` strings can be decoded in Go:
+
+```go
+b64str, _ := vm.RunString("XLSX.write(wb, {type:'base64', bookType:'xlsx'})")
+buf, _ := base64.StdEncoding.DecodeString(b64str.String())
+_ = ioutil.WriteFile("sheetjs.xlsx", buf, 0644)
+```
+
+[![Analytics](https://ga-beacon.appspot.com/UA-36810333-1/SheetJS/js-xlsx?pixel)](https://github.com/SheetJS/js-xlsx)
--- a/demos/altjs/SJSPlayground.swift
+++ b/demos/altjs/SJSPlayground.swift
@ -0,0 +1,37 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+/* This only works in a playground, see SheetJSCore.swift for standalone use */
+import JavaScriptCore;
+import PlaygroundSupport;
+
+/* build path variable for the library */
+let shared_dir = PlaygroundSupport.playgroundSharedDataDirectory;
+let lib_path = shared_dir.appendingPathComponent("xlsx.full.min.js");
+
+/* prepare JS context */
+var context: JSContext! = JSContext();
+var src = "var global = (function(){ return this; }).call(null);";
+context.evaluateScript(src);
+
+/* load library */
+var lib = try? String(contentsOf: lib_path);
+context.evaluateScript(lib);
+let XLSX: JSValue! = context.objectForKeyedSubscript("XLSX");
+
+/* to verify the library was loaded, get the version string */
+let XLSXversion: JSValue! = XLSX.objectForKeyedSubscript("version")
+var version  = XLSXversion.toString();
+
+/* parse sheetjs.xls */
+let file_path = shared_dir.appendingPathComponent("sheetjs.xls");
+let data: String! = try String(contentsOf: file_path, encoding: String.Encoding.isoLatin1);
+context.setObject(data, forKeyedSubscript: "payload" as (NSCopying & NSObjectProtocol)!);
+src = "var wb = XLSX.read(payload, {type:'binary'});";
+context.evaluateScript(src);
+
+/* write to sheetjsw.xlsx  */
+let out_path = shared_dir.appendingPathComponent("sheetjsw.xlsx");
+src = "var out = XLSX.write(wb, {type:'binary', bookType:'xlsx'})";
+context.evaluateScript(src);
+let outvalue: JSValue! = context.objectForKeyedSubscript("out");
+var out: String! = outvalue.toString();
+try? out.write(to: out_path, atomically: false, encoding: String.Encoding.isoLatin1);
--- a/demos/altjs/SheetJSCore.swift
+++ b/demos/altjs/SheetJSCore.swift
@ -0,0 +1,96 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+import JavaScriptCore;
+
+enum SJSError: Error {
+  case badJSContext;
+  case badJSWorkbook;
+  case badJSWorksheet;
+};
+
+class SJSWorksheet {
+  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();
+  }
+
+  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;
+
+  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();
+  }
+
+  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!;
+
+  func init_context() throws -> JSContext {
+    var context: JSContext!
+    do {
+      context = JSContext();
+      context.exceptionHandler = { _, 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 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);
+  }
+
+  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); }
+  }
+}
--- a/demos/altjs/SheetJSRhino.java
+++ b/demos/altjs/SheetJSRhino.java
@ -0,0 +1,31 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+/* vim: set ts=2: */
+import com.sheetjs.SheetJS;
+import com.sheetjs.SheetJSFile;
+import com.sheetjs.SheetJSSheet;
+
+public class SheetJSRhino {
+  public static void main(String args[]) throws Exception {
+    try {
+      SheetJS sjs = new SheetJS();
+
+      /* open file */
+      SheetJSFile xl = sjs.read_file(args[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();
+
+      System.out.println(csv);
+
+    } catch(Exception e) {
+      throw e;
+    } finally {
+      SheetJS.close();
+    }
+  }
+}
--- a/demos/altjs/chakra.js
+++ b/demos/altjs/chakra.js
@ -0,0 +1,3 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+var wb = XLSX.read(payload, {type:'base64'});
+console.log(XLSX.utils.sheet_to_csv(wb.Sheets[wb.SheetNames[0]]));
--- a/demos/altjs/com/sheetjs/JSHelper.java
+++ b/demos/altjs/com/sheetjs/JSHelper.java
@ -0,0 +1,51 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+/* vim: set ts=2: */
+package com.sheetjs;
+
+import java.lang.Integer;
+import java.lang.StringBuilder;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.NativeArray;
+import org.mozilla.javascript.NativeObject;
+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 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 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(); }
+
+}
--- a/demos/altjs/com/sheetjs/ObjectNotFoundException.java
+++ b/demos/altjs/com/sheetjs/ObjectNotFoundException.java
@ -0,0 +1,10 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+/* vim: set ts=2: */
+package com.sheetjs;
+
+import java.lang.Exception;
+
+public class ObjectNotFoundException extends Exception {
+  public ObjectNotFoundException() {}
+  public ObjectNotFoundException(String message) { super(message); }
+}
--- a/demos/altjs/com/sheetjs/SheetJS.java
+++ b/demos/altjs/com/sheetjs/SheetJS.java
@ -0,0 +1,58 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+/* vim: set ts=2: */
+package com.sheetjs;
+
+import java.lang.Integer;
+import java.util.Scanner;
+import java.io.IOException;
+import java.io.File;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.NativeObject;
+import org.mozilla.javascript.Scriptable;
+
+public class SheetJS {
+  public Scriptable scope;
+  public Context cx;
+  public NativeObject nXLSX;
+
+  public SheetJS() throws Exception {
+    this.cx = Context.enter();
+    this.scope = this.cx.initStandardObjects();
+
+    /* boilerplate */
+    cx.setOptimizationLevel(-1);
+    String s = "var global = (function(){ return this; }).call(null);";
+    cx.evaluateString(scope, s, "<cmd>", 1, null);
+
+    /* eval library */
+    s = new Scanner(SheetJS.class.getResourceAsStream("/xlsx.full.min.js")).useDelimiter("\\Z").next();
+    //s = new Scanner(new File("xlsx.full.min.js")).useDelimiter("\\Z").next();
+    cx.evaluateString(scope, s, "<cmd>", 1, null);
+
+    /* grab XLSX variable */
+    Object XLSX = scope.get("XLSX", scope);
+    if(XLSX == Scriptable.NOT_FOUND) throw new Exception("XLSX not found");
+    this.nXLSX = (NativeObject)XLSX;
+  }
+
+  public SheetJSFile read_file(String filename) throws IOException, ObjectNotFoundException {
+    /* open file */
+    String d = JSHelper.read_file(filename);
+
+    /* options argument */
+    NativeObject q = (NativeObject)this.cx.evaluateString(this.scope, "q = {'type':'binary', 'WTF':1};", "<cmd>", 2, null);
+
+    /* set up function arguments */
+    Object args[] = {d, q};
+
+    /* call read -> wb workbook */
+    Function readfunc = (Function)JSHelper.get_object("XLSX.read",this.scope);
+    NativeObject wb = (NativeObject)readfunc.call(this.cx, this.scope, this.nXLSX, args);
+
+    return new SheetJSFile(wb, this);
+  }
+
+  public static void close() { JSHelper.close(); }
+}
+
--- a/demos/altjs/com/sheetjs/SheetJSFile.java
+++ b/demos/altjs/com/sheetjs/SheetJSFile.java
@ -0,0 +1,24 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+/* vim: set ts=2: */
+package com.sheetjs;
+
+import org.mozilla.javascript.NativeObject;
+import org.mozilla.javascript.Function;
+
+public class SheetJSFile {
+  public NativeObject wb;
+  public SheetJS sheetjs;
+  public SheetJSFile() {}
+  public SheetJSFile(NativeObject wb, SheetJS sheetjs) { this.wb = wb; this.sheetjs = sheetjs; }
+  public String[] get_sheet_names() {
+    try {
+      return JSHelper.get_string_array("SheetNames", this.wb);
+    } catch(ObjectNotFoundException e) {
+      return null;
+    }
+  }
+  public SheetJSSheet get_sheet(int idx) throws ObjectNotFoundException {
+    return new SheetJSSheet(this, idx);
+  }
+}
+
--- a/demos/altjs/com/sheetjs/SheetJSSheet.java
+++ b/demos/altjs/com/sheetjs/SheetJSSheet.java
@ -0,0 +1,29 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+/* vim: set ts=2: */
+package com.sheetjs;
+
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.NativeObject;
+
+public class SheetJSSheet {
+  public NativeObject ws;
+  public SheetJSFile wb;
+  public SheetJSSheet(SheetJSFile wb, int idx) throws ObjectNotFoundException {
+    this.wb = wb;
+    this.ws = (NativeObject)JSHelper.get_object("Sheets." + wb.get_sheet_names()[idx],wb.wb);
+  }
+  public String get_range() throws ObjectNotFoundException {
+    return JSHelper.get_object("!ref",this.ws).toString();
+  }
+  public String get_string_value(String address) throws ObjectNotFoundException {
+    return JSHelper.get_object(address + ".v",this.ws).toString();
+  }
+
+  public String get_csv() throws ObjectNotFoundException {
+    Function csvify = (Function)JSHelper.get_object("XLSX.utils.sheet_to_csv",this.wb.sheetjs.scope);
+    Object csvArgs[] = {this.ws};
+    Object csv = csvify.call(this.wb.sheetjs.cx, this.wb.sheetjs.scope, this.wb.sheetjs.scope, csvArgs);
+    return csv.toString();
+  }
+}
+
--- a/demos/altjs/duktape.sh
+++ b/demos/altjs/duktape.sh
@ -0,0 +1,16 @@
+#!/bin/bash
+DUKTAPE_VER=2.6.0
+if [ ! -e duktape-$DUKTAPE_VER ]; then
+	if [ ! -e duktape-$DUKTAPE_VER.tar ]; then
+		if [ ! -e duktape-$DUKTAPE_VER.tar.xz ]; then
+			curl -O https://duktape.org/duktape-$DUKTAPE_VER.tar.xz
+		fi
+		xz -d duktape-$DUKTAPE_VER.tar.xz
+	fi
+	tar -xf duktape-$DUKTAPE_VER.tar
+fi
+
+for f in duktape.{c,h} duk_config.h; do
+	cp duktape-$DUKTAPE_VER/src/$f .
+done
+
--- a/demos/altjs/global.js
+++ b/demos/altjs/global.js
@ -0,0 +1,3 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+var global = (function(){ return this; }).call(null);
+
--- a/demos/altjs/goja.go
+++ b/demos/altjs/goja.go
@ -0,0 +1,71 @@
+package main
+
+import (
+	b64 "encoding/base64"
+	"fmt"
+	"os"
+	"io/ioutil"
+	"github.com/dop251/goja"
+)
+
+func safe_run_file(vm *goja.Runtime, file string) {
+	data, err := ioutil.ReadFile(file)
+	if err != nil { panic(err) }
+	src := string(data)
+	_, err = vm.RunString(src)
+	if err != nil { panic(err) }
+}
+
+func eval_string(vm *goja.Runtime, cmd string) goja.Value {
+	v, err := vm.RunString(cmd)
+	if err != nil { panic(err) }
+	return v
+}
+
+func write_type(vm *goja.Runtime, t string) {
+	/* due to some wonkiness with array passing, use base64 */
+	b64str := eval_string(vm, "XLSX.write(wb, {type:'base64', bookType:'" + t + "'})")
+	buf, err := b64.StdEncoding.DecodeString(b64str.String());
+	if err != nil { panic(err) }
+	err = ioutil.WriteFile("sheetjsg." + t, buf, 0644)
+	if err != nil { panic(err) }
+}
+
+func main() {
+	vm := goja.New()
+
+	/* initialize */
+	eval_string(vm, "if(typeof global == 'undefined') global = (function(){ return this; }).call(null);")
+
+	/* load library */
+	safe_run_file(vm, "shim.min.js")
+	safe_run_file(vm, "xlsx.full.min.js")
+
+	/* get version string */
+	v := eval_string(vm, "XLSX.version")
+	fmt.Printf("SheetJS library version %s\n", v)
+
+	/* read file */
+	data, err := ioutil.ReadFile(os.Args[1])
+	if err != nil { panic(err) }
+	vm.Set("buf", data)
+	fmt.Printf("Loaded file %s\n", os.Args[1])
+
+	/* parse workbook */
+	eval_string(vm, "var bstr = ''; for(var i = 0; i < buf.length; ++i) bstr += String.fromCharCode(buf[i]);")
+	eval_string(vm, "wb = XLSX.read(bstr, {type:'binary', cellNF:true});")
+	eval_string(vm, "ws = wb.Sheets[wb.SheetNames[0]]")
+
+	/* print CSV */
+	csv := eval_string(vm, "XLSX.utils.sheet_to_csv(ws)")
+	fmt.Printf("%s\n", csv)
+
+	/* change cell A1 to 3 */
+	eval_string(vm, "ws['A1'].v = 3; delete ws['A1'].w;")
+
+	/* write file */
+	//write_type(vm, "xlsb")
+	//write_type(vm, "xlsx")
+	write_type(vm, "xls")
+	write_type(vm, "csv")
+}
--- a/demos/altjs/main.swift
+++ b/demos/altjs/main.swift
@ -0,0 +1,21 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+
+let sheetjs = try SheetJSCore();
+
+try print(sheetjs.version());
+
+let filenames: [[String]] = [
+  ["xlsx", "xlsx"],
+  ["xlsb", "xlsb"],
+  ["biff8.xls", "xls"],
+  ["xml.xls", "xlml"]
+];
+
+for fn in filenames {
+  let wb: SJSWorkbook = try sheetjs.readFile(file: "sheetjs." + fn[0]);
+  let ws: SJSWorksheet = try wb.getSheetAtIndex(idx: 0);
+  let csv: String = try ws.toCSV();
+  print(csv);
+  let wbout: String = try wb.writeBStr(bookType: fn[1]);
+  try wbout.write(toFile: "sheetjsswift." + fn[0], atomically: false, encoding: String.Encoding.isoLatin1);
+}
--- a/demos/altjs/nashorn.js
+++ b/demos/altjs/nashorn.js
@ -0,0 +1,36 @@
+#!/usr/bin/env jjs
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+
+/* load module */
+var global = (function(){ return this; }).call(null);
+load('xlsx.full.min.js');
+
+/* helper to convert byte array to plain JS array */
+function b2a(b) {
+	var out = new Array(b.length);
+	for(var i = 0; i < out.length; i++) out[i] = (b[i] < 0 ? b[i] + 256 : b[i]);
+	return out;
+}
+
+function process_file(path) {
+	java.lang.System.out.println(path);
+
+	/* read file */
+	var path = java.nio.file.Paths.get(path);
+	var bytes = java.nio.file.Files.readAllBytes(path);
+	var u8a = b2a(bytes);
+
+	/* read data */
+	var wb = XLSX.read(u8a, {type:"array"});
+
+	/* get first worksheet as an array of arrays */
+	var ws = wb.Sheets[wb.SheetNames[0]];
+	var js = XLSX.utils.sheet_to_json(ws, {header:1});
+
+	/* print out every line */
+	js.forEach(function(l) { java.lang.System.out.println(JSON.stringify(l)); });
+}
+
+process_file('sheetjs.xlsx');
+process_file('sheetjs.xlsb');
+process_file('sheetjs.biff8.xls');
--- a/demos/altjs/qjs.js
+++ b/demos/altjs/qjs.js
@ -0,0 +1,25 @@
+#!/usr/bin/env qjs
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+/* load XLSX */
+std.global.global = std.global;
+std.loadScript("xlsx.full.min.js");
+
+/* read contents of file */
+var rh = std.open("sheetjs.xlsx", "rb");
+rh.seek(0, std.SEEK_END);
+var sz = rh.tell();
+var ab = new ArrayBuffer(sz);
+rh.seek();
+rh.read(ab, 0, sz);
+rh.close();
+
+/* parse file */
+var wb = XLSX.read(ab, {type: 'array'});
+
+/* write array */
+var out = XLSX.write(wb, {type: 'array'});
+
+/* write contents to file */
+var wh = std.open("sheetjs.qjs.xlsx", "wb");
+wh.write(out, 0, out.byteLength);
+wh.close();
--- a/demos/altjs/sheetjs.duk.c
+++ b/demos/altjs/sheetjs.duk.c
@ -0,0 +1,110 @@
+/* xlsx.js (C) 2013-present  SheetJS -- http://sheetjs.com */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "duktape.h"
+
+#define FAIL_LOAD { \
+	duk_push_undefined(ctx); \
+	perror("Error in load_file"); \
+	return 1; \
+}
+
+static char *read_file(const char *filename, size_t *sz) {
+	FILE *f = fopen(filename, "rb");
+	if(!f) return NULL;
+	long fsize; { fseek(f, 0, SEEK_END); fsize = ftell(f); fseek(f, 0, SEEK_SET); }
+	char *buf = (char *)malloc(fsize * sizeof(char));
+	*sz = fread((void *) buf, 1, fsize, f);
+	fclose(f);
+	return buf;
+}
+
+static duk_int_t eval_file(duk_context *ctx, const char *filename) {
+	size_t len; char *buf = read_file(filename, &len);
+	if(!buf) FAIL_LOAD
+
+	duk_push_lstring(ctx, (const char *)buf, (duk_size_t)len);
+	duk_int_t retval = duk_peval(ctx);
+	duk_pop(ctx);
+	return retval;
+}
+
+static duk_int_t load_file(duk_context *ctx, const char *filename, const char *var) {
+	size_t len; char *buf = read_file(filename, &len);
+	if(!buf) FAIL_LOAD
+
+	duk_push_external_buffer(ctx);
+	duk_config_buffer(ctx, -1, buf, len);
+	duk_put_global_string(ctx, var);
+	return 0;
+}
+
+static duk_int_t save_file(duk_context *ctx, const char *filename, const char *var) {
+	duk_get_global_string(ctx, var);
+	duk_size_t sz;
+	char *buf = (char *)duk_get_buffer_data(ctx, -1, &sz);
+
+	if(!buf) return 1;
+	FILE *f = fopen(filename, "wb"); fwrite(buf, 1, sz, f); fclose(f);
+	return 0;
+}
+
+#define FAIL(cmd) { \
+	printf("error in %s: %s\n", cmd, duk_safe_to_string(ctx, -1)); \
+	duk_destroy_heap(ctx); \
+	return res; \
+}
+
+#define DOIT(cmd) duk_eval_string_noresult(ctx, cmd);
+int main(int argc, char *argv[]) {
+	duk_int_t res = 0;
+
+	/* initialize */
+	duk_context *ctx = duk_create_heap_default();
+	/* duktape does not expose a standard "global" by default */
+	DOIT("var global = (function(){ return this; }).call(null);");
+
+	/* load library */
+	res = eval_file(ctx, "shim.min.js");
+	if(res != 0) FAIL("shim load")
+	res = eval_file(ctx, "xlsx.full.min.js");
+	if(res != 0) FAIL("library load")
+
+	/* get version string */
+	duk_eval_string(ctx, "XLSX.version");
+	printf("SheetJS library version %s\n", duk_get_string(ctx, -1));
+	duk_pop(ctx);
+
+	/* read file */
+	res = load_file(ctx, argv[1], "buf");
+	if(res != 0) FAIL("file load")
+	printf("Loaded file %s\n", argv[1]);
+
+	/* parse workbook */
+	DOIT("wb = XLSX.read(buf, {type:'buffer', cellNF:true});");
+	DOIT("ws = wb.Sheets[wb.SheetNames[0]]");
+
+	/* print CSV */
+	duk_eval_string(ctx, "XLSX.utils.sheet_to_csv(ws)");
+	printf("%s\n", duk_get_string(ctx, -1));
+	duk_pop(ctx);
+
+	/* change cell A1 to 3 */
+	DOIT("ws['A1'].v = 3; delete ws['A1'].w;");
+
+	/* write file */
+#define WRITE_TYPE(BOOKTYPE) \
+	DOIT("newbuf = (XLSX.write(wb, {type:'array', bookType:'" BOOKTYPE "'}));");\
+	res = save_file(ctx, "sheetjsw." BOOKTYPE, "newbuf");\
+	if(res != 0) FAIL("save sheetjsw." BOOKTYPE)
+
+	WRITE_TYPE("xlsb")
+	WRITE_TYPE("xlsx")
+	WRITE_TYPE("xls")
+	WRITE_TYPE("csv")
+
+	/* cleanup */
+	duk_destroy_heap(ctx);
+	return res;
+}
--- a/demos/angular/README.md
+++ b/demos/angular/README.md
@ -0,0 +1,148 @@
+# AngularJS
+
+The `xlsx.core.min.js` and `xlsx.full.min.js` scripts are designed to be dropped
+into web pages with script tags:
+
+```html
+<script src="xlsx.full.min.js"></script>
+```
+
+Strictly speaking, there should be no need for an Angular demo!  You can proceed
+as you would with any other browser-friendly library.
+
+This demo uses AngularJS 1.5.0.
+
+
+## Array of Objects
+
+A common data table is often stored as an array of objects:
+
+```js
+$scope.data = [
+  { Name: "Bill Clinton", Index: 42 },
+  { Name: "GeorgeW Bush", Index: 43 },
+  { Name: "Barack Obama", Index: 44 },
+  { Name: "Donald Trump", Index: 45 }
+];
+```
+
+This neatly maps to a table with `ng-repeat`:
+
+```html
+<table id="sjs-table">
+  <tr><th>Name</th><th>Index</th></tr>
+  <tr ng-repeat="row in data">
+    <td>{{row.Name}}</td>
+    <td>{{row.Index}}</td>
+  </tr>
+</table>
+```
+
+The `$http` service can request binary data using the `"arraybuffer"` response
+type coupled with `XLSX.read` with type `"array"`:
+
+```js
+  $http({
+    method:'GET',
+    url:'https://sheetjs.com/pres.xlsx',
+    responseType:'arraybuffer'
+  }).then(function(data) {
+    var wb = XLSX.read(data.data, {type:"array"});
+    var d = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
+    $scope.data = d;
+  }, function(err) { console.log(err); });
+```
+
+The HTML table can be directly exported with `XLSX.utils.table_to_book`:
+
+```js
+var wb = XLSX.utils.table_to_book(document.getElementById('sjs-table'));
+XLSX.writeFile(wb, "export.xlsx");
+```
+
+
+## Import Directive
+
+A general import directive is fairly straightforward:
+
+- Define the `importSheetJs` directive in the app:
+
+```js
+app.directive("importSheetJs", [SheetJSImportDirective]);
+```
+
+- Add the attribute `import-sheet-js=""` to the file input element:
+
+```html
+<input type="file" import-sheet-js="" multiple="false"  />
+```
+
+- Define the directive:
+
+```js
+function SheetJSImportDirective() {
+  return {
+    scope: { opts: '=' },
+    link: function ($scope, $elm) {
+      $elm.on('change', function (changeEvent) {
+        var reader = new FileReader();
+
+        reader.onload = function (e) {
+          /* read workbook */
+          var ab = e.target.result;
+          var workbook = XLSX.read(ab);
+
+          /* DO SOMETHING WITH workbook HERE */
+        };
+
+        reader.readAsArrayBuffer(changeEvent.target.files[0]);
+      });
+    }
+  };
+}
+```
+
+
+## Export Service
+
+An export can be triggered at any point!  Depending on how data is represented,
+a workbook object can be built using the utility functions.  For example, using
+an array of objects:
+
+```js
+/* starting from this data */
+var data = [
+  { name: "Barack Obama", pres: 44 },
+  { name: "Donald Trump", pres: 45 }
+];
+
+/* generate a worksheet */
+var ws = XLSX.utils.json_to_sheet(data);
+
+/* add to workbook */
+var wb = XLSX.utils.book_new();
+XLSX.utils.book_append_sheet(wb, ws, "Presidents");
+
+/* write workbook and force a download */
+XLSX.writeFile(wb, "sheetjs.xlsx");
+```
+
+## Demo
+
+`grid.html` uses `angular-ui-grid` to display a table.  The library does not
+provide any way to modify the import button, so the demo includes a simple
+directive for a HTML File Input control.  It also includes a sample service for
+export which adds an item to the export menu.
+
+The demo `SheetJSImportDirective` follows the prescription from the README for
+File input controls using `readAsArrayBuffer`, converting to a suitable
+representation and updating the scope.
+
+`SheetJSExportService` exposes export functions for `XLSB` and `XLSX`.  Other
+file formats can be exported by changing the `bookType` variable.  It grabs
+values from the grid, builds an array of arrays, generates a workbook and forces
+a download.  By setting the `filename` and `sheetname` options in the `ui-grid`
+options, the output can be controlled.
+
+
+[![Analytics](https://ga-beacon.appspot.com/UA-36810333-1/SheetJS/js-xlsx?pixel)](https://github.com/SheetJS/js-xlsx)
--- a/demos/angular/SheetJS-angular.js
+++ b/demos/angular/SheetJS-angular.js
@ -0,0 +1,96 @@
+/* xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
+/* eslint-env browser */
+/* global XLSX */
+/* exported SheetJSExportService, SheetJSImportDirective */
+function SheetJSExportService(uiGridExporterService) {
+
+  function exportSheetJS(gridApi, wopts) {
+    var columns = uiGridExporterService.getColumnHeaders(gridApi.grid, 'all');
+    var data = uiGridExporterService.getData(gridApi.grid, 'all', 'all');
+
+    var fileName = gridApi.grid.options.filename || 'SheetJS';
+    fileName += wopts.bookType ? "." + wopts.bookType : '.xlsx';
+
+    var sheetName = gridApi.grid.options.sheetname || 'Sheet1';
+
+    var wb = XLSX.utils.book_new(), ws = uigrid_to_sheet(data, columns);
+    XLSX.utils.book_append_sheet(wb, ws, sheetName);
+    XLSX.writeFile(wb, fileName);
+  }
+
+  var service = {};
+  service.exportXLSB = function exportXLSB(gridApi) { return exportSheetJS(gridApi, { bookType: 'xlsb', bookSST: true, type: 'array' }); };
+  service.exportXLSX = function exportXLSX(gridApi) { return exportSheetJS(gridApi, { bookType: 'xlsx', bookSST: true, type: 'array' }); }
+
+  return service;
+
+  /* utilities */
+  function uigrid_to_sheet(data, columns) {
+    var o = [], oo = [], i = 0, j = 0;
+
+    /* column headers */
+    for(j = 0; j < columns.length; ++j) oo.push(get_value(columns[j]));
+    o.push(oo);
+
+    /* table data */
+    for(i = 0; i < data.length; ++i) {
+      oo = [];
+      for(j = 0; j < data[i].length; ++j) oo.push(get_value(data[i][j]));
+      o.push(oo);
+    }
+    /* aoa_to_sheet converts an array of arrays into a worksheet object */
+    return XLSX.utils.aoa_to_sheet(o);
+  }
+
+  function get_value(col) {
+    if(!col) return col;
+    if(col.value) return col.value;
+    if(col.displayName) return col.displayName;
+    if(col.name) return col.name;
+    return null;
+  }
+}
+
+function SheetJSImportDirective() {
+  return {
+    scope: { opts: '=' },
+    link: function($scope, $elm) {
+      $elm.on('change', function(changeEvent) {
+        var reader = new FileReader();
+
+        reader.onload = function(e) {
+          /* read workbook */
+          var ab = e.target.result;
+          var wb = XLSX.read(ab);
+
+          /* grab first sheet */
+          var wsname = wb.SheetNames[0];
+          var ws = wb.Sheets[wsname];
+
+          /* grab first row and generate column headers */
+          var aoa = XLSX.utils.sheet_to_json(ws, {header:1, raw:false});
+          var cols = [];
+          for(var i = 0; i < aoa[0].length; ++i) cols[i] = { field: aoa[0][i] };
+
+          /* generate rest of the data */
+          var data = [];
+          for(var r = 1; r < aoa.length; ++r) {
+            data[r-1] = {};
+            for(i = 0; i < aoa[r].length; ++i) {
+              if(aoa[r][i] == null) continue;
+              data[r-1][aoa[0][i]] = aoa[r][i];
+            }
+          }
+
+          /* update scope */
+          $scope.$apply(function() {
+            $scope.opts.columnDefs = cols;
+            $scope.opts.data = data;
+          });
+        };
+
+        reader.readAsArrayBuffer(changeEvent.target.files[0]);
+      });
+    }
+  };
+}
--- a/demos/angular/app.js
+++ b/demos/angular/app.js
@ -0,0 +1,45 @@
+/* xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
+/* eslint-env browser */
+/* global angular, SheetJSExportService, SheetJSImportDirective */
+var app = angular.module('app', ['ngAnimate', 'ngTouch', 'ui.grid', 'ui.grid.selection', 'ui.grid.exporter']);
+
+/* Inject SheetJSExportService */
+app.factory('SheetJSExportService', SheetJSExportService);
+SheetJSExportService.inject = ['uiGridExporterService'];
+
+app.controller('MainCtrl', ['$scope', '$http','SheetJSExportService', function($scope, $http, SheetJSExportService) {
+  $scope.gridOptions = {
+    columnDefs: [
+      { field: 'name' },
+      { field: 'gender', visible: false},
+      { field: 'company' }
+    ],
+    enableGridMenu: true,
+    enableSelectAll: true,
+    exporterMenuPdf: false,
+    exporterMenuCsv: false,
+    showHeader: true,
+    onRegisterApi: function(gridApi){
+      $scope.gridApi = gridApi;
+    },
+    /* SheetJS Service setup */
+    filename: "SheetJSAngular",
+    sheetname: "ng-SheetJS",
+    gridMenuCustomItems: [
+      {
+        title: 'Export all data as XLSX',
+        action: function() { SheetJSExportService.exportXLSX($scope.gridApi); },
+        order: 200
+      },
+      {
+        title: 'Export all data as XLSB',
+        action: function() { SheetJSExportService.exportXLSB($scope.gridApi); },
+        order: 201
+      }
+    ]
+  };
+
+  $http.get('https://cdn.rawgit.com/angular-ui/ui-grid.info/gh-pages/data/100.json').success(function(data) { $scope.gridOptions.data = data; });
+
+}]);
+app.directive("importSheetJs", [SheetJSImportDirective]);
--- a/demos/angular/grid.html
+++ b/demos/angular/grid.html
@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<!-- xlsx.js (C) 2013-present  SheetJS http://sheetjs.com -->
+<!-- vim: set ts=2: -->
+<html ng-app="app">
+<head>
+  <title>SheetJS + AngularJS + ui-grid</title>
+  <!-- Angular -->
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular.js"></script>
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular-touch.js"></script>
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular-animate.js"></script>
+
+  <!-- ui-grid -->
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-grid/4.11.0/ui-grid.js"></script>
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-grid/4.11.0/ui-grid.css"/>
+
+  <!-- SheetJS js-xlsx library -->
+  <script src="shim.js"></script>
+  <script src="xlsx.full.min.js"></script>
+
+  <!-- SheetJS Service -->
+  <script src="SheetJS-angular.js"></script>
+
+<style>
+.grid1 {
+  width: 500px;
+  height: 400px;
+};
+</style>
+</head>
+<body>
+<pre>
+<b><a href="http://sheetjs.com">SheetJS + AngularJS demo</a></b>
+
+The core library can be used as-is in AngularJS applications.
+The <a href="https://github.com/sheetjs/js-xlsx">Community Edition README</a> details some common use cases.
+We also have some <a href="http://sheetjs.com/demos/">more public demos</a>
+
+This demo shows:
+- SheetJSExportService: a service for exporting data from a ui-grid
+- SheetJSImportDirective: a directive providing a file input button for import
+
+<a href="https://obamawhitehouse.archives.gov/sites/default/files/omb/budget/fy2014/assets/receipts.xls">Sample Spreadsheet</a>
+</pre>
+
+<div ng-controller="MainCtrl">
+  <input type="file" import-sheet-js="" opts="gridOptions" multiple="false"  />
+  <div id="grid1" ui-grid="gridOptions" ui-grid-selection ui-grid-exporter class="grid"></div>
+</div>
+
+<script src="app.js"></script>
+<script type="text/javascript">
+/* eslint no-use-before-define:0 */
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-36810333-1']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</body>
+</html>
--- a/demos/angular/index.html
+++ b/demos/angular/index.html
@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<!-- xlsx.js (C) 2013-present  SheetJS http://sheetjs.com -->
+<!-- vim: set ts=2: -->
+<html ng-app="sjs">
+<head>
+  <title>SheetJS + AngularJS</title>
+  <!-- Angular -->
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular.min.js"></script>
+
+  <!-- SheetJS js-xlsx library -->
+  <script src="shim.js"></script>
+  <script src="xlsx.full.min.js"></script>
+</head>
+<body>
+<pre>
+<b><a href="http://sheetjs.com">SheetJS + AngularJS demo</a></b>
+
+The core library can be used as-is in AngularJS applications.
+The <a href="https://github.com/sheetjs/js-xlsx">Community Edition README</a> details some common use cases.
+We also have some <a href="http://sheetjs.com/demos/">more public demos</a>
+
+This demo shows:
+- $http request for XLSX file and scope update with data
+- HTML table using ng-repeat
+- XLSX table export using `XLSX.utils.table_to_book`
+
+<a href="https://sheetjs.com/pres.xlsx">Sample Spreadsheet</a>
+</pre>
+
+<div ng-controller="sheetjs">
+
+<table id="sjs-table">
+  <tr><th>Name</th><th>Index</th></tr>
+  <tr ng-repeat="row in data">
+    <td>{{row.Name}}</td>
+    <td>{{row.Index}}</td>
+  </tr>
+</table>
+
+<button id="exportbtn">Export Table</button>
+
+</div>
+
+<script>
+var app = angular.module('sjs', []);
+app.controller('sheetjs', function($scope, $http) {
+  $http({
+    method:'GET',
+    url:'https://sheetjs.com/pres.xlsx',
+    responseType:'arraybuffer'
+  }).then(function(data) {
+    var wb = XLSX.read(data.data, {type:"array"});
+    var d = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
+    $scope.data = d;
+  }, function(err) { console.log(err); });
+});
+exportbtn.addEventListener('click', function() {
+  var wb = XLSX.utils.table_to_book(document.getElementById('sjs-table'));
+  XLSX.writeFile(wb, "export.xlsx");
+});
+</script>
+<script type="text/javascript">
+/* eslint no-use-before-define:0 */
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-36810333-1']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</body>
+</html>
--- a/demos/angular/shim.js
+++ b/demos/angular/shim.js
@ -0,0 +1 @@
+../../shim.js
--- a/demos/angular/xlsx.core.min.js
+++ b/demos/angular/xlsx.core.min.js
@ -0,0 +1 @@
+../../dist/xlsx.core.min.js
--- a/demos/angular/xlsx.full.min.js
+++ b/demos/angular/xlsx.full.min.js
@ -0,0 +1 @@
+../../dist/xlsx.full.min.js
--- a/demos/angular2/.angular-cli.json
+++ b/demos/angular2/.angular-cli.json
@ -0,0 +1,23 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "project": {
+    "name": "angular2"
+  },
+  "apps": [
+    {
+      "root": "src",
+      "outDir": "dist",
+      "index": "index.html",
+      "main": "main.ts",
+      "polyfills": "polyfills.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.app.json",
+      "prefix": "app",
+      "scripts": []
+    }
+  ],
+  "defaults": {
+    "styleExt": "css",
+    "component": {}
+  }
+}
--- a/demos/angular2/.eslintrc
+++ b/demos/angular2/.eslintrc
@ -0,0 +1,6 @@
+{
+	"parser": "@typescript-eslint/parser",
+	"extends": [
+		"eslint:recommended"
+	]
+}
--- a/demos/angular2/.gitattributes
+++ b/demos/angular2/.gitattributes
@ -0,0 +1 @@
+*.*-ng*           linguist-generated=true binary
--- a/demos/angular2/.gitignore
+++ b/demos/angular2/.gitignore
@ -0,0 +1,8 @@
+dist
+hooks
+SheetJSIonic
+SheetJSNS
+angular.json
+tsconfig.app.json
+src/polyfills.ts
+.angular
--- a/demos/angular2/Makefile
+++ b/demos/angular2/Makefile
@ -0,0 +1,45 @@
+.PHONY: ng2 ng4 ng5 ng6 ng7 ng8 ng9 ng10 ng11 ng12 ng13
+ng2 ng4 ng5 ng6 ng7 ng8 ng9 ng10 ng11 ng12 ng13:
+	rm -f angular.json tsconfig.app.json src/polyfills.ts
+	cp versions/package.json-$@ package.json
+	if [ -e versions/angular.json-$@ ]; then cp versions/angular.json-$@ angular.json; fi
+	if [ -e versions/tsconfig.app.json-$@ ]; then cp versions/tsconfig.app.json-$@ tsconfig.app.json; fi
+	if [ -e versions/polyfills.ts-$@ ]; then cp versions/polyfills.ts-$@ src/polyfills.ts; fi
+	rm -rf node_modules
+	if [ ! -e node_modules ]; then mkdir node_modules; fi
+	npm install
+	if [ ! -e node_modules/xlsx ]; then cd node_modules; ln -s ../../../ xlsx; cd -; fi
+	npm run build
+
+.PHONY: refresh
+refresh: ## refresh the `xlsx` symlink to force angular to rebuild
+	rm -rf .angular/
+	rm -f node_modules/xlsx
+	cd node_modules; ln -s ../../../ xlsx; cd -
+	touch node_modules/xlsx
+
+.PHONY: all
+all:
+	for i in 2 4 5 6 7 8 9 10 11 12 13; do make ng$$i; done
+
+.PHONY: ionic
+ionic:
+	bash ./ionic.sh
+
+.PHONY: ios android browser
+ios browser: ionic
+	cd SheetJSIonic; ionic cordova emulate $@ </dev/null; cd -
+android: ionic
+	cd SheetJSIonic; ionic cordova prepare $@ </dev/null; ionic cordova emulate $@ </dev/null; cd -
+
+
+.PHONY: nativescript
+nativescript:
+	bash ./nscript.sh
+
+.PHONY: ns-ios ns-android
+ns-ios: nativescript
+	cd SheetJSNS; ns run ios; cd -
+ns-android: nativescript
+	cd SheetJSNS; ns run android; cd -
+
--- a/demos/angular2/README.md
+++ b/demos/angular2/README.md
@ -0,0 +1,185 @@
+# Angular 2+
+
+The ESM build can be imported directly from TS code with:
+
+```typescript
+import { read, utils, writeFileXLSX } from 'xlsx';
+```
+
+This demo uses an array of arrays (type `Array<Array<any>>`) as the core state.
+The component template includes a file input element, a table that updates with
+the data, and a button to export the data.
+
+Other scripts in this demo show:
+- `ionic` deployment for iOS, android, and browser
+- `nativescript` deployment for iOS and android
+
+## Array of Arrays
+
+`Array<Array<any>>` neatly maps to a table with `ngFor`:
+
+```html
+<table class="sjs-table">
+  <tr *ngFor="let row of data">
+    <td *ngFor="let val of row">
+      {{val}}
+    </td>
+  </tr>
+</table>
+```
+
+The `aoa_to_sheet` utility function returns a worksheet.  Exporting is simple:
+
+```typescript
+/* generate worksheet */
+const ws: XLSX.WorkSheet = XLSX.utils.aoa_to_sheet(this.data);
+
+/* generate workbook and add the worksheet */
+const wb: XLSX.WorkBook = XLSX.utils.book_new();
+XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
+
+/* save to file */
+XLSX.writeFile(wb, 'SheetJS.xlsx');
+```
+
+`sheet_to_json` with the option `header:1` makes importing simple:
+
+```typescript
+/* <input type="file" (change)="onFileChange($event)" multiple="false" /> */
+/* ... (within the component class definition) ... */
+  onFileChange(evt: any) {
+    /* wire up file reader */
+    const target: DataTransfer = <DataTransfer>(evt.target);
+    if (target.files.length !== 1) throw new Error('Cannot use multiple files');
+    const reader: FileReader = new FileReader();
+    reader.onload = (e: any) => {
+      /* read workbook */
+      const ab: ArrayBuffer = e.target.result;
+      const wb: XLSX.WorkBook = XLSX.read(ab);
+
+      /* grab first sheet */
+      const wsname: string = wb.SheetNames[0];
+      const ws: XLSX.WorkSheet = wb.Sheets[wsname];
+
+      /* save data */
+      this.data = <AOA>(XLSX.utils.sheet_to_json(ws, {header: 1}));
+    };
+    reader.readAsArrayBuffer(target.files[0]);
+  }
+```
+
+## Switching between Angular versions
+
+Modules that work with Angular 2 largely work as-is with Angular 4+.  Switching
+between versions is mostly a matter of installing the correct version of the
+core and associated modules.  This demo includes `package.json-angular#` files
+for every major version of Angular up to 12.
+
+To test a particular Angular version, overwrite `package.json`:
+
+```bash
+# switch to Angular 2
+$ cp package.json-ng2 package.json
+$ npm install
+$ ng serve
+```
+
+Note: when running the demos, Angular 2 requires Node <= 14.  This is due to a
+tooling issue with `ng` and does not affect browser use.
+
+## XLSX Symbolic Link
+
+In this tree, `node_modules/xlsx` is a link pointing back to the root.  This
+enables testing the development version of the library.  In order to use this
+demo in other applications, add the `xlsx` dependency:
+
+```bash
+$ npm install --save https://cdn.sheetjs.com/xlsx-latest/xlsx-latest.tgz
+```
+
+## SystemJS Configuration
+
+The default angular-cli configuration requires no additional configuration.
+
+Some deployments use the SystemJS loader, which does require configuration.  The
+SystemJS example shows the required meta and map settings:
+
+```js
+SystemJS.config({
+  meta: {
+    'xlsx': {
+      exports: 'XLSX' // <-- tell SystemJS to expose the XLSX variable
+    }
+  },
+  map: {
+    'xlsx': 'xlsx.full.min.js', // <-- make sure xlsx.full.min.js is in same dir
+    'fs': '',     // <--|
+    'crypto': '', // <--| suppress native node modules
+    'stream': ''  // <--|
+  }
+});
+```
+
+## Ionic
+
+<img src="screen.png" width="400px"/>
+
+Reproducing the full project is a little bit tricky.  The included `ionic.sh`
+script performs the necessary installation steps.
+
+`Array<Array<any>>` neatly maps to a table with `ngFor`:
+
+```html
+<ion-grid>
+  <ion-row *ngFor="let row of data">
+    <ion-col *ngFor="let val of row">
+      {{val}}
+    </ion-col>
+  </ion-row>
+</ion-grid>
+```
+
+
+`@ionic-native/file` reads and writes files on devices. `readAsArrayBuffer`
+returns `ArrayBuffer` objects suitable for `array` type, and `array` type can
+be converted to blobs that can be exported with `writeFile`:
+
+```typescript
+/* read a workbook */
+const ab: ArrayBuffer = await this.file.readAsArrayBuffer(url, filename);
+const wb: XLSX.WorkBook = XLSX.read(bstr, {type: 'array'});
+
+/* write a workbook */
+const wbout: ArrayBuffer = XLSX.write(wb, { bookType: 'xlsx', type: 'array' });
+let blob = new Blob([wbout], {type: 'application/octet-stream'});
+this.file.writeFile(url, filename, blob, {replace: true});
+```
+
+## NativeScript
+
+Reproducing the full project is a little bit tricky.  The included `nscript.sh`
+script performs the necessary installation steps and adds the necessary shims
+for `async` support.  Due to incompatibilities with NativeScript and TypeScript
+definitions, apps should require the `xlsx.full.min.js` file directly:
+
+```typescript
+const XLSX = require("./xlsx.full.min.js");
+```
+
+The `ISO_8859_1` encoding from the text module specifies `"binary"` strings.
+`File#readText` and `File#writeText` reads and writes files:
+
+```typescript
+/* read a workbook */
+const bstr: string = await file.readText(encoding.ISO_8859_1);
+const wb = XLSX.read(bstr, { type: "binary" });
+
+/* write a workbook */
+const wbout: string = XLSX.write(wb, { bookType: 'xlsx', type: 'binary' });
+await file.writeText(wbout, encoding.ISO_8859_1);
+```
+
+Note: some versions of NativeScript do not properly support typed arrays or
+binary strings.  See <https://github.com/NativeScript/NativeScript/issues/9586>
+
+[![Analytics](https://ga-beacon.appspot.com/UA-36810333-1/SheetJS/js-xlsx?pixel)](https://github.com/SheetJS/js-xlsx)
--- a/demos/angular2/ionic-app.module.ts
+++ b/demos/angular2/ionic-app.module.ts
@ -0,0 +1,22 @@
+/* xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
+/* vim: set ts=2: */
+/* NOTE: this file exists because `File` must be added as a provider */
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { RouteReuseStrategy } from '@angular/router';
+
+import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
+
+import { AppComponent } from './app.component';
+import { AppRoutingModule } from './app-routing.module';
+
+import { File } from '@ionic-native/file/ngx';
+
+@NgModule({
+  declarations: [AppComponent],
+  entryComponents: [],
+  imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule],
+  providers: [File, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }],
+  bootstrap: [AppComponent],
+})
+export class AppModule {}
--- a/demos/angular2/ionic.sh
+++ b/demos/angular2/ionic.sh
@ -0,0 +1,16 @@
+#!/bin/bash
+if [ ! -e SheetJSIonic ]; then
+	ionic start SheetJSIonic blank --type angular --cordova --quiet --no-git --no-link --confirm </dev/null
+	cd SheetJSIonic
+	ionic cordova platform add browser --confirm </dev/null
+	ionic cordova platform add ios --confirm </dev/null
+	ionic cordova platform add android --confirm </dev/null
+	ionic cordova plugin add cordova-plugin-file </dev/null
+	npm install --save @ionic-native/core
+	npm install --save @ionic-native/file
+	npm install --save https://cdn.sheetjs.com/xlsx-latest/xlsx-latest.tgz
+	cp ../ionic-app.module.ts src/app/app.module.ts
+	cd -
+fi
+
+cp ionic.ts SheetJSIonic/src/app/home/home.page.ts
--- a/demos/angular2/ionic.ts
+++ b/demos/angular2/ionic.ts
@ -0,0 +1,126 @@
+/* xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
+/* vim: set ts=2: */
+import { Component } from '@angular/core';
+import { File } from '@ionic-native/file/ngx';
+import * as XLSX from 'xlsx';
+
+
+type AOA = any[][];
+
+@Component({
+  selector: 'app-home',
+  //templateUrl: 'home.page.html',
+  styleUrls: ['home.page.scss'],
+  template: `
+<ion-header>
+  <ion-toolbar>
+    <ion-title>SheetJS Ionic Demo</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+  <ion-header collapse="condense">
+    <ion-toolbar>
+      <ion-title>SheetJS Demo</ion-title>
+    </ion-toolbar>
+  </ion-header>
+
+  <ion-grid>
+    <ion-row *ngFor="let row of data">
+      <ion-col *ngFor="let val of row">
+        {{val}}
+      </ion-col>
+    </ion-row>
+  </ion-grid>
+</ion-content>
+
+<ion-footer padding>
+  <input type="file" (change)="onFileChange($event)" multiple="false" />
+  <button ion-button color="secondary" (click)="import()">Import Data</button>
+  <button ion-button color="secondary" (click)="export()">Export Data</button>
+</ion-footer>
+`
+})
+
+export class HomePage {
+  data: any[][] = [[1,2,3],[4,5,6]];
+  constructor(public file: File) {}
+
+  read(ab: ArrayBuffer) {
+    /* read workbook */
+    const wb: XLSX.WorkBook = XLSX.read(new Uint8Array(ab), {type: 'array'});
+
+    /* grab first sheet */
+    const wsname: string = wb.SheetNames[0];
+    const ws: XLSX.WorkSheet = wb.Sheets[wsname];
+
+    /* save data */
+    this.data = (XLSX.utils.sheet_to_json(ws, {header: 1}) as AOA);
+  };
+
+  write(): XLSX.WorkBook {
+    /* generate worksheet */
+    const ws: XLSX.WorkSheet = XLSX.utils.aoa_to_sheet(this.data);
+
+    /* generate workbook and add the worksheet */
+    const wb: XLSX.WorkBook = XLSX.utils.book_new();
+    XLSX.utils.book_append_sheet(wb, ws, 'SheetJS');
+
+    return wb;
+  };
+
+  /* File Input element for browser */
+  onFileChange(evt: any) {
+    /* wire up file reader */
+    const target: DataTransfer = (evt.target as DataTransfer);
+    if (target.files.length !== 1) { throw new Error('Cannot use multiple files'); }
+    const reader: FileReader = new FileReader();
+    reader.onload = (e: any) => {
+      const ab: ArrayBuffer = e.target.result;
+      this.read(ab);
+    };
+    reader.readAsArrayBuffer(target.files[0]);
+  };
+
+  /* Import button for mobile */
+  async import() {
+    try {
+      const target: string = this.file.documentsDirectory || this.file.externalDataDirectory || this.file.dataDirectory || '';
+      const dentry = await this.file.resolveDirectoryUrl(target);
+      const url: string = dentry.nativeURL || '';
+      alert(`Attempting to read SheetJSIonic.xlsx from ${url}`);
+      const ab: ArrayBuffer = await this.file.readAsArrayBuffer(url, 'SheetJSIonic.xlsx');
+      this.read(ab);
+    } catch(e) {
+      const m: string = e.message;
+      alert(m.match(/It was determined/) ? 'Use File Input control' : `Error: ${m}`);
+    }
+  };
+
+  /* Export button */
+  async export() {
+    const wb: XLSX.WorkBook = this.write();
+    const filename = 'SheetJSIonic.xlsx';
+    try {
+      /* generate Blob */
+      const wbout: ArrayBuffer = XLSX.write(wb, { bookType: 'xlsx', type: 'array' });
+
+      /* find appropriate path for mobile */
+      const target: string = this.file.documentsDirectory || this.file.externalDataDirectory || this.file.dataDirectory || '';
+      const dentry = await this.file.resolveDirectoryUrl(target);
+      const url: string = dentry.nativeURL || '';
+
+      /* attempt to save blob to file */
+      await this.file.writeFile(url, filename, wbout, {replace: true});
+      alert(`Wrote to SheetJSIonic.xlsx in ${url}`);
+    } catch(e) {
+      if(e.message.match(/It was determined/)) {
+        /* in the browser, use writeFile */
+        XLSX.writeFile(wb, filename);
+      } else {
+        alert(`Error: ${e.message}`);
+      }
+    }
+  };
+}
+
--- a/demos/angular2/nscript.sh
+++ b/demos/angular2/nscript.sh
@ -0,0 +1,10 @@
+#!/bin/bash
+if [ ! -e SheetJSNS ]; then
+	ns create SheetJSNS --ng
+	cd SheetJSNS
+	npm install --save https://cdn.sheetjs.com/xlsx-latest/xlsx-latest.tgz
+	cd ..
+fi
+
+<../../dist/xlsx.full.min.js sed 's/require("fs")/null/g' > SheetJSNS/src/app/xlsx.full.min.js
+cp nscript.ts SheetJSNS/src/app/app.component.ts
--- a/demos/angular2/nscript.ts
+++ b/demos/angular2/nscript.ts
@ -0,0 +1,82 @@
+/* xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
+/* vim: set ts=2: */
+
+import { Component } from '@angular/core';
+import { encoding } from '@nativescript/core/text';
+import { File, Folder, knownFolders, path } from '@nativescript/core/file-system';
+import { Dialogs } from '@nativescript/core';
+import { Page, GridLayout, WebView, DockLayout, Button } from '@nativescript/core';
+
+import * as XLSX from './xlsx.full.min';
+
+@Component({
+  selector: 'ns-app',
+  template: `
+  <Page>
+    <GridLayout rows="auto, *, auto">
+
+      <!-- data converted to HTML and rendered in web view -->
+      <WebView row="1" src="{{html}}"></WebView>
+
+      <DockLayout row="2" dock="bottom" stretchLastChild="false">
+        <Button text="Import File" (tap)="import()" style="padding: 10px"></Button>
+        <Button text="Export File" (tap)="export()" style="padding: 10px"></Button>
+      </DockLayout>
+    </GridLayout>
+  </Page>
+  `
+})
+
+export class AppComponent {
+  html: string = "";
+  constructor() {
+    const ws = XLSX.utils.aoa_to_sheet([[1,2],[3,4]]);
+    this.html = XLSX.utils.sheet_to_html(ws);
+  };
+
+  /* Import button */
+  async import() {
+    const filename: string = "SheetJSNS.csv";
+
+    /* find appropriate path */
+    const target: Folder = knownFolders.documents() || knownFolders.ios.sharedPublic();
+    const url: string = path.normalize(target.path + "///" + filename);
+    const file: File = File.fromPath(url);
+
+    try {
+      /* get binary string */
+      const bstr: string = await file.readText(encoding.ISO_8859_1);
+
+      /* read workbook */
+      const wb = XLSX.read(bstr, { type: "binary" });
+
+      /* grab first sheet */
+      const wsname: string = wb.SheetNames[0];
+      const ws = wb.Sheets[wsname];
+
+      /* update table */
+      this.html = XLSX.utils.sheet_to_html(ws);
+      Dialogs.alert(`Attempting to read to ${filename} in ${url}`);
+    } catch(e) {
+      Dialogs.alert(e.message);
+    }
+  };
+
+  /* Export button */
+  async export() {
+    const wb = XLSX.read(this.html, { type: "string" });
+    const filename: string = "SheetJSNS.csv";
+
+    /* generate binary string */
+    const wbout: string = XLSX.write(wb, { bookType: 'csv', type: 'binary' });
+
+    /* find appropriate path */
+    const target: Folder = knownFolders.documents() || knownFolders.ios.sharedPublic();
+    const url: string = path.normalize(target.path + "///" + filename);
+    const file: File = File.fromPath(url);
+
+    /* attempt to save binary string to file */
+    await file.writeText(wbout, encoding.ISO_8859_1);
+    Dialogs.alert(`Wrote to ${filename} in ${url}`);
+  };
+}
--- a/demos/angular2/package.json
+++ b/demos/angular2/package.json
@ -0,0 +1,39 @@
+{
+  "name": "angular13",
+  "version": "0.0.0",
+  "license": "MIT",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve",
+    "build": "ng build"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "~13.2.0",
+    "@angular/common": "~13.2.0",
+    "@angular/compiler": "~13.2.0",
+
+    "@angular/core": "~13.2.0",
+    "@angular/forms": "~13.2.0",
+
+    "@angular/platform-browser": "~13.2.0",
+    "@angular/platform-browser-dynamic": "~13.2.0",
+
+    "@angular/router": "~13.2.0",
+
+
+    "rxjs": "~7.5.0",
+    "tslib": "^2.3.0",
+    "zone.js": "~0.11.4"
+  },
+  "devDependencies": {
+    "@angular-devkit/build-angular": "~13.2.1",
+    "@angular/cli": "~13.2.1",
+    "@angular/compiler-cli": "~13.2.0",
+
+    "@types/node": "^12.11.1",
+
+
+    "typescript": "~4.5.2"
+  }
+}
--- a/demos/angular2/screen.png
+++ b/demos/angular2/screen.png
--- a/demos/angular2/src/app/app.module.ts
+++ b/demos/angular2/src/app/app.module.ts
@ -0,0 +1,28 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+import { SheetJSComponent } from './sheetjs.component';
+
+
+import { Component } from '@angular/core';
+
+@Component({
+	selector: 'app-root',
+	template: `<sheetjs></sheetjs>`
+})
+export class AppComponent {
+	title = 'test';
+}
+
+@NgModule({
+	declarations: [
+		SheetJSComponent,
+		AppComponent
+	],
+	imports: [
+		BrowserModule
+	],
+	providers: [],
+	bootstrap: [AppComponent]
+})
+export class AppModule { }
--- a/demos/angular2/src/app/sheetjs.component.ts
+++ b/demos/angular2/src/app/sheetjs.component.ts
@ -0,0 +1,64 @@
+/* xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
+/* vim: set ts=2: */
+import { Component } from '@angular/core';
+
+import { WorkBook, WorkSheet, WritingOptions, read, writeFileXLSX as writeFile, utils, version, set_cptable } from 'xlsx';
+//import * as cpexcel from 'xlsx/dist/cpexcel.full.mjs';
+//set_cptable(cpexcel);
+
+type AOA = any[][];
+
+@Component({
+	selector: 'sheetjs',
+	template: `
+	<pre><b>Version: {{ver}}</b></pre>
+	<input type="file" (change)="onFileChange($event)" multiple="false" />
+	<table class="sjs-table">
+		<tr *ngFor="let row of data">
+			<td *ngFor="let val of row">
+				{{val}}
+			</td>
+		</tr>
+	</table>
+	<button (click)="export()">Export!</button>
+	`
+})
+
+export class SheetJSComponent {
+	data: AOA = [ [1, 2], [3, 4] ];
+	wopts: WritingOptions = { bookType: 'xlsx', type: 'array' };
+	fileName: string = 'SheetJS.xlsx';
+	ver: string = version;
+
+	onFileChange(evt: any) {
+		/* wire up file reader */
+		const target: DataTransfer = <DataTransfer>(evt.target);
+		if (target.files.length !== 1) throw new Error('Cannot use multiple files');
+		const reader: FileReader = new FileReader();
+		reader.onload = (e: any) => {
+			/* read workbook */
+			const ab: ArrayBuffer = e.target.result;
+			const wb: WorkBook = read(ab);
+
+			/* grab first sheet */
+			const wsname: string = wb.SheetNames[0];
+			const ws: WorkSheet = wb.Sheets[wsname];
+
+			/* save data */
+			this.data = <AOA>(utils.sheet_to_json(ws, {header: 1}));
+		};
+		reader.readAsArrayBuffer(target.files[0]);
+	}
+
+	export(): void {
+		/* generate worksheet */
+		const ws: WorkSheet = utils.aoa_to_sheet(this.data);
+
+		/* generate workbook and add the worksheet */
+		const wb: WorkBook = utils.book_new();
+		utils.book_append_sheet(wb, ws, 'Sheet1');
+
+		/* save to file */
+		writeFile(wb, this.fileName);
+	}
+}
--- a/demos/angular2/src/environments/environment.prod.ts
+++ b/demos/angular2/src/environments/environment.prod.ts
@ -0,0 +1,3 @@
+export const environment = {
+  production: true
+};
--- a/demos/angular2/src/environments/environment.ts
+++ b/demos/angular2/src/environments/environment.ts
@ -0,0 +1,3 @@
+export const environment = {
+  production: false
+};
--- a/demos/angular2/src/index.html
+++ b/demos/angular2/src/index.html
@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!-- xlsx.js (C) 2013-present  SheetJS http://sheetjs.com -->
+<!-- vim: set ts=2: -->
+<html lang="en">
+<head>
+	<title>SheetJS + Angular 2+</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+<pre>
+<b><a href="http://sheetjs.com">SheetJS + Angular 2+ demo</a></b>
+
+The core library can be used as-is in angular applications.
+The <a href="https://github.com/sheetjs/js-xlsx">Community Edition README</a> details some common use cases.
+We also have some <a href="http://sheetjs.com/demos/">more public demos</a>
+
+This demo shows `SheetJSComponent` which provides:
+- File input button with an event handler to parse the workbook
+- `data` property: array of arrays
+- Simple angular table which binds to the `data` property
+- `export` function that exports the `data` property to a new file.
+
+<a href="https://obamawhitehouse.archives.gov/sites/default/files/omb/budget/fy2014/assets/receipts.xls">Sample Spreadsheet</a>
+</pre>
+
+<app-root></app-root>
+</body>
+</html>
--- a/demos/angular2/src/main.ts
+++ b/demos/angular2/src/main.ts
@ -0,0 +1,3 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { AppModule } from './app/app.module';
+platformBrowserDynamic().bootstrapModule(AppModule);
--- a/demos/angular2/src/styles.css
+++ b/demos/angular2/src/styles.css
@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */
--- a/demos/angular2/src/tsconfig.app.json
+++ b/demos/angular2/src/tsconfig.app.json
@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "module": "es2015",
+    "baseUrl": "",
+    "types": []
+  }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
scottysseus	456c403c09	added test cases from #2560 's thread; fixed more rounding edge cases	2022-06-21 20:58:17 +00:00
scottysseus	c580ffcbc2	fix rounding issue See: #2560 - Improved rounding to account for minutes, hours, etc. - Added tests for rounding dates/times	2022-06-15 18:40:16 +00:00
				`@ -0,0 +1 @@`
				`/* You can add global styles to this file, and also import other style files */`