esm support and deno demo

Author: SheetJSDev

.gitignore

@@ -20,6 +20,7 @@ tmp
 *.[oO][dD][sS]
 *.[fF][oO][dD][sS]
 *.[xX][mM][lL]
+*.[xX][lL][mM][lL]
 *.[uU][oO][sS]
 *.[wW][kKqQbB][S1234567890]
 *.[qQ][pP][wW]

.spelling

@@ -35,6 +35,7 @@ tooltips
 Browserify
 CDNjs
 CommonJS
+Deno
 Ethercalc
 ExtendScript
 IndexedDB

Makefile

@@ -11,8 +11,6 @@ MINITGT=xlsx.mini.js
 MINIFLOW=xlsx.mini.flow.js
 MINIDEPS=$(shell cat mini.lst)
 
-NODESMTGT=xlsx.esm.mjs
-NODESMDEPS=$(shell cat misc/esm.lst)
 ESMJSTGT=xlsx.mjs
 ESMJSDEPS=$(shell cat misc/mjs.lst)
 
@@ -31,7 +29,7 @@ CLOSURE=/usr/local/lib/node_modules/google-closure-compiler/compiler.jar
 ## Main Targets
 
 .PHONY: all
-all: $(TARGET) $(AUXTARGETS) $(AUXSCPTS) $(MINITGT) $(NODESMTGT) $(ESMJSTGT) ## Build library and auxiliary scripts
+all: $(TARGET) $(AUXTARGETS) $(AUXSCPTS) $(MINITGT) $(ESMJSTGT) ## Build library and auxiliary scripts
 
 $(FLOWTGTS): %.js : %.flow.js
 	node -e 'process.stdout.write(require("fs").readFileSync("$<","utf8").replace(/^[ \t]*\/\*[:#][^*]*\*\/\s*(\n)?/gm,"").replace(/\/\*[:#][^*]*\*\//gm,""))' > $@
@@ -42,9 +40,6 @@ $(FLOWTARGET): $(DEPS)
 $(MINIFLOW): $(MINIDEPS)
 	cat $^ | tr -d '\15\32' > $@
 
-$(NODESMTGT): $(NODESMDEPS)
-	cat $^ | tr -d '\15\32' > $@
-
 $(ESMJSTGT): $(ESMJSDEPS)
 	cat $^ | tr -d '\15\32' > $@
 

README.md

@@ -118,6 +118,8 @@ port calculations to web apps; automate common spreadsheet tasks, and much more!
 
 ### Installation
 
+**Standalone Browser Scripts**
+
 The complete browser standalone build is saved to `dist/xlsx.full.min.js` and
 can be directly added to a page with a `script` tag:
 
@@ -167,18 +169,50 @@ be configured to remove support with `resolve.alias`:
 </details>
 
 
+With [bower](https://bower.io/search/?q=js-xlsx):
+
+```bash
+$ bower install js-xlsx
+```
+
+**Deno**
+
+The [`sheetjs`](https://deno.land/x/sheetjs) package is available on deno:
+
+```ts
+import * as XLSX from 'https://deno.land/x/sheetjs/xlsx.mjs'
+```
+
+**NodeJS**
+
 With [npm](https://www.npmjs.org/package/xlsx):
 
 ```bash
 $ npm install xlsx
 ```
 
-With [bower](https://bower.io/search/?q=js-xlsx):
+By default, the module supports `require`:
 
-```bash
-$ bower install js-xlsx
+```js
+var XLSX = require("xlsx");
+```
+
+The module also ships with `xlsx.mjs` for use with `import`:
+
+```js
+import * as XLSX from 'xlsx/xlsx.mjs';
+
+/* load 'fs' for readFile and writeFile support */
+import * as fs from 'fs';
+XLSX.set_fs(fs);
+
+/* load the codepage support library for extended support with older formats  */
+import * as cpexcel from 'xlsx/dist/cpexcel.full.mjs';
+XLSX.set_cptable(cpexcel);
 ```
 
+**PhotoShop and InDesign**
+
 `dist/xlsx.extendscript.js` is an ExtendScript build for Photoshop and InDesign
 that is included in the `npm` package.  It can be directly referenced with a
 `#include` directive:
@@ -1650,7 +1684,9 @@ data grid for previewing and modifying structured data in the web browser.  The
 [`react-data-grid`](https://npm.im/react-data-grid) is a data grid tailored for
 react.  It expects two properties: `rows` of data objects and `columns` which
 describe the columns.  For the purposes of massaging the data to fit the react
-data grid API it is easiest to start from an array of arrays:
+data grid API it is easiest to start from an array of arrays.
+
+This demo starts by fetching a remote file and using `XLSX.read` to extract:
 
 ```js
 import { useEffect, useState } from "react";

bits/19_fsutils.js

@@ -11,6 +11,16 @@ function blobify(data) {
 function write_dl(fname/*:string*/, payload/*:any*/, enc/*:?string*/) {
 	/*global IE_SaveFile, Blob, navigator, saveAs, document, File, chrome */
 	if(typeof _fs !== 'undefined' && _fs.writeFileSync) return enc ? _fs.writeFileSync(fname, payload, enc) : _fs.writeFileSync(fname, payload);
+	if(typeof Deno !== 'undefined') {
+		/* in this spot, it's safe to assume typed arrays and TextEncoder/TextDecoder exist */
+		if(enc) switch(enc) {
+			case "utf8": payload = new TextEncoder(enc).encode(payload); break;
+			case "binary": payload = s2ab(payload); break;
+			/* TODO: binary equivalent */
+			default: throw new Error("Unsupported encoding " + enc);
+		}
+		return Deno.writeFileSync(fname, payload);
+	}
 	var data = (enc == "utf8") ? utf8write(payload) : payload;
 	/*:: declare var IE_SaveFile: any; */
 	if(typeof IE_SaveFile !== 'undefined') return IE_SaveFile(data, fname);
@@ -50,6 +60,7 @@ function write_dl(fname/*:string*/, payload/*:any*/, enc/*:?string*/) {
 /* read binary data from file */
 function read_binary(path/*:string*/) {
 	if(typeof _fs !== 'undefined') return _fs.readFileSync(path);
+	if(typeof Deno !== 'undefined') return Deno.readFileSync(path);
 	// $FlowIgnore
 	if(typeof $ !== 'undefined' && typeof File !== 'undefined' && typeof Folder !== 'undefined') try { // extendscript
 		// $FlowIgnore

bits/20_jsutils.js

@@ -146,7 +146,7 @@ function fuzzydate(s/*:string*/)/*:Date*/ {
 	if(isNaN(d)) return n;
 	var lower = s.toLowerCase();
 	if(lower.match(/jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec/)) {
-		lower = lower.replace(/[^a-z]/g,"");
+		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.match(/[a-z]/)) return n;
 	if(y < 0 || y > 8099) return n;

bits/40_harb.js

@@ -508,7 +508,7 @@ var SYLK = (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.replace(/"/g,"") + '"'; break;
+			case 's': o += '"' + cell.v.replace(/"/g,"").replace(/;/g, ";;") + '"'; break;
 		}
 		return o;
 	}

bits/87_read.js

@@ -72,7 +72,7 @@ function readSync(data/*:RawData*/, opts/*:?ParseOpts*/)/*:Workbook*/ {
 	_ssfopts = {};
 	if(o.dateNF) _ssfopts.dateNF = o.dateNF;
 	if(!o.type) o.type = (has_buf && Buffer.isBuffer(data)) ? "buffer" : "base64";
-	if(o.type == "file") { o.type = has_buf ? "buffer" : "binary"; d = read_binary(data); }
+	if(o.type == "file") { o.type = has_buf ? "buffer" : "binary"; d = read_binary(data); if(typeof Uint8Array !== 'undefined' && !has_buf) o.type = "array"; }
 	if(o.type == "string") { str = true; o.type = "binary"; o.codepage = 65001; d = bstrify(data); }
 	if(o.type == 'array' && typeof Uint8Array !== 'undefined' && data instanceof Uint8Array && typeof ArrayBuffer !== 'undefined') {
 		// $FlowIgnore

bits/88_write.js

@@ -48,6 +48,7 @@ function write_zip_type(wb/*:Workbook*/, opts/*:?WriteOpts*/)/*:any*/ {
 		default: throw new Error("Unrecognized type " + o.type);
 	}
 	var out = z.FullPaths ? CFB.write(z, {fileType:"zip", type: /*::(*/{"nodebuffer": "buffer", "string": "binary"}/*:: :any)*/[oopts.type] || oopts.type}) : z.generate(oopts);
+	if(typeof Deno !== "undefined" && typeof out == "string") out = new Uint8Array(s2ab(out));
 /*jshint -W083 */
 	if(o.password && typeof encrypt_agile !== 'undefined') return write_cfb_ctr(encrypt_agile(out, o.password), o); // eslint-disable-line no-undef
 /*jshint +W083 */

demos/deno/Makefile

@@ -0,0 +1,11 @@
+TESTS= x mjs jspm
+UNSTABLE= node
+.PHONY: test
+test: $(UNSTABLE) $(TESTS)
+
+$(TESTS): %: %.ts doit.ts
+	deno run --allow-read --allow-write $<
+
+# --unstable is required, see https://github.com/denoland/deno_std/issues/1900
+$(UNSTABLE): %: %.ts doit.ts
+	deno run --allow-read --allow-write --unstable $<