ODS XML Parse nit

Author: SheetJSDev

.github/workflows/deno.yml

@@ -3,11 +3,10 @@ name: 'Tests: deno 1.x'
 on: [pull_request, push]
 
 jobs:
-  # small test
-  misc:
+  # full test
+  full:
+    name: 'full (with codepage)'
     runs-on: ubuntu-latest
-    env:
-      FMTS: misc
     steps:
       - uses: actions/checkout@v2
       - uses: denoland/setup-deno@main
@@ -21,8 +20,9 @@ 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
-  full:
+  # full test (no codepage)
+  fullnocp:
+    name: 'full (no codepage)'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -36,4 +36,4 @@ jobs:
       - 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
+      - run: deno test --allow-env --allow-read --allow-write --config misc/test.deno.jsonc testnocp.ts

Makefile

@@ -148,6 +148,10 @@ test.ts: test.mts
 test-deno: test.ts ## Run Deno test suite
 	deno test --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 --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))

bits/04_base64.js

@@ -19,6 +19,32 @@ 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;

bits/20_jsutils.js

@@ -184,9 +184,7 @@ 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) return n;
-	if((m > 0 || d > 1) && y != 101) return o;
-	if(s.match(/[^-0-9:,\/\\]/)) return n;
+	if(y < 0 || y > 8099 || s.match(/[^-0-9:,\/\\]/)) return n;
 	return o;
 }
 

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 = ({

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(out);
+		case "base64": return Base64_encode_pass(out);
 		case "binary": return out;
 		case "string": return out; /* override in sheet_to_txt */
 		case "file": return write_dl(opts.file, out, 'binary');

demos/README.md

@@ -29,32 +29,36 @@ can be installed with Bash on Windows or with `cygwin`.
 - [`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/)
+**Front-End UI Components**
+- [`canvas-datagrid`](datagrid/)
+- [`x-spreadsheet`](xspreadsheet/)
+- [`react-data-grid`](react/modify/)
+- [`vue3-table-light`](/vue/modify/)
 
 **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)
+- [`ExtendScript for Adobe Apps`](https://docs.sheetjs.com/docs/getting-started/demos/extendscript)
+- [`NetSuite SuiteScript`](https://docs.sheetjs.com/docs/getting-started/demos/netsuite)
+- [`SalesForce Lightning Web Components`](https://docs.sheetjs.com/docs/getting-started/demos/salesforce)
 - [`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/)
 
+**Bundlers and Tooling**
+- [`browserify`](browserify/)
+- [`parcel`](parcel/)
+- [`requirejs`](requirejs/)
+- [`rollup`](rollup/)
+- [`systemjs`](systemjs/)
+- [`typescript`](typescript/)
+- [`webpack 2.x`](webpack/)
+
 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)

demos/database/README.md

@@ -48,13 +48,13 @@ The `sheet_to_json` helper function generates arrays of JS objects that can be
 scanned to determine the column "types", and there are third-party connectors
 that can push arrays of JS objects to database tables.
 
-The [`sexql`](http://sheetjs.com/sexql) browser demo uses WebSQL, which is
+The [`sql`](http://sheetjs.com/sql) browser demo uses WebSQL, which is
 limited to the SQLite fundamental types.
 
 <details>
 	<summary><b>Implementation details</b> (click to show)</summary>
 
-The `sexql` schema builder scans the first row to find headers:
+The `sql` schema builder scans the first row to find headers:
 
 ```js
   if(!ws || !ws['!ref']) return;
@@ -202,11 +202,11 @@ function object_to_workbook(obj) {
 
 #### WebSQL
 
-WebSQL is a popular SQL-based in-browser database available on Chrome / Safari.
-In practice, it is powered by SQLite, and most simple SQLite-compatible queries
+WebSQL is a popular SQL-based in-browser database available on Chrome.  In
+practice, it is powered by SQLite, and most simple SQLite-compatible queries
 work as-is in WebSQL.
 
-The public demo <http://sheetjs.com/sexql> generates a database from workbook.
+The public demo <http://sheetjs.com/sql> generates a database from workbook.
 
 #### LocalStorage and SessionStorage
 
@@ -259,9 +259,9 @@ the `sheetj5` database and verifies the tables are preserved.
 
 #### PostgreSQL
 
-[The `pg` module](https://www.npmjs.com/package/pg) supplies a Promise wrapper.
-Like with `mysql2`, `Client#query` runs a statement and returns a result object.
-The `rows` key of the object is an array of JS objects.
+[The `pg` module](https://node-postgres.com/) supplies a Promise wrapper.
+`Client#query` runs a statement and returns a result object.  The `rows` key of
+the object is an array of JS objects.
 
 `PgSQLTest.js` connects to the PostgreSQL server on `localhost`, builds two
 tables in the `sheetjs` database, exports to XLSX, imports the new XLSX file to

demos/electron/.gitignore

@@ -0,0 +1 @@
+out/

demos/electron/Makefile

@@ -10,3 +10,6 @@ lint:
 run:
 	npm i
 	npx electron .
+.PHONY: build
+build:
+	npm run make