From b2179513f5d8d3bc35d843cb309b0059bdbebabe Mon Sep 17 00:00:00 2001
From: David Bruant <davidbruant@protonmail.com>
Date: Mon, 8 Jul 2024 15:29:25 +0200
Subject: [PATCH] Split exports into 2 files : browser and node

---
 package.json                 |  3 ++-
 scripts/App.svelte           |  2 +-
 scripts/browser.js           | 48 ++++++++++++++++++++++++++++++++++++
 scripts/{main.js => node.js} | 16 ++----------
 tests/basic-node.js          |  2 +-
 tests/ods-files.js           |  2 +-
 6 files changed, 55 insertions(+), 18 deletions(-)
 create mode 100644 scripts/browser.js
 rename scripts/{main.js => node.js} (64%)

diff --git a/package.json b/package.json
index 99e2b99..3b0f294 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,8 @@
   "name": "ods-xlsx",
   "version": "0.5.0",
   "type": "module",
-  "main": "./scripts/main.js",
+  "main": "./scripts/node.js",
+  "browser": "./scripts/browser.js",
   "scripts": {
     "build": "rollup -c",
     "dev": "npm-run-all --parallel dev:* start",
diff --git a/scripts/App.svelte b/scripts/App.svelte
index 6920064..8de4bc2 100644
--- a/scripts/App.svelte
+++ b/scripts/App.svelte
@@ -1,7 +1,7 @@
 <script>
 	//@ts-check
 
-	import {tableRawContentToObjects, tableWithoutEmptyRows, getODSTableRawContent, getXLSXTableRawContent} from './main.js'
+	import {tableRawContentToObjects, tableWithoutEmptyRows, getODSTableRawContent, getXLSXTableRawContent} from './browser.js'
 
 	const ODS_TYPE = "application/vnd.oasis.opendocument.spreadsheet";
 	const XLSX_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
diff --git a/scripts/browser.js b/scripts/browser.js
new file mode 100644
index 0000000..d46dc75
--- /dev/null
+++ b/scripts/browser.js
@@ -0,0 +1,48 @@
+//@ts-check
+
+function parseXML(str){
+    return (new DOMParser()).parseFromString(str, 'application/xml');
+}
+
+import {
+    _getODSTableRawContent, 
+    _getXLSXTableRawContent
+} from './shared.js'
+
+/**
+ * @param {ArrayBuffer} odsArrBuff
+ * @returns {ReturnType<_getODSTableRawContent>}
+ */
+export function getODSTableRawContent(odsArrBuff){
+    return _getODSTableRawContent(odsArrBuff, parseXML)
+}
+
+/**
+ * @param {ArrayBuffer} xlsxArrBuff
+ * @returns {ReturnType<_getXLSXTableRawContent>}
+ */
+export function getXLSXTableRawContent(xlsxArrBuff){
+    return _getXLSXTableRawContent(xlsxArrBuff, parseXML)
+}
+
+
+export {
+    // table-level exports
+    tableWithoutEmptyRows,
+    tableRawContentToValues,
+    tableRawContentToStrings,
+    tableRawContentToObjects, 
+
+    // sheet-level exports
+    sheetRawContentToObjects,
+    sheetRawContentToStrings,
+
+    // row-level exports
+    rowRawContentToStrings,
+    isRowNotEmpty,
+
+    // cell-level exports
+    cellRawContentToStrings,
+    convertCellValue
+} from './shared.js'
+
diff --git a/scripts/main.js b/scripts/node.js
similarity index 64%
rename from scripts/main.js
rename to scripts/node.js
index af19b9d..50f8dda 100644
--- a/scripts/main.js
+++ b/scripts/node.js
@@ -1,21 +1,9 @@
 //@ts-check
 
-let _DOMParser
-
-if(typeof DOMParser !== 'undefined' && Object(DOMParser) === DOMParser && DOMParser.prototype && typeof DOMParser.prototype.parseFromString === 'function'){
-    //console.info('[ods-xlsx] Already existing DOMParser. Certainly in the browser')
-    
-    _DOMParser = DOMParser
-}
-else{
-    //console.info('[ods-xlsx] No native DOMParser. Certainly in Node.js')
-
-    const xmldom = await import('@xmldom/xmldom')
-    _DOMParser = xmldom.DOMParser
-}
+import {DOMParser} from '@xmldom/xmldom'
 
 function parseXML(str){
-    return (new _DOMParser()).parseFromString(str, 'application/xml');
+    return (new DOMParser()).parseFromString(str, 'application/xml');
 }
 
 import {
diff --git a/tests/basic-node.js b/tests/basic-node.js
index 57578dc..d4e1fd1 100644
--- a/tests/basic-node.js
+++ b/tests/basic-node.js
@@ -2,7 +2,7 @@ import {readFile} from 'node:fs/promises'
 
 import test from 'ava';
 
-import {getODSTableRawContent} from '../scripts/main.js'
+import {getODSTableRawContent} from '../scripts/node.js'
 
 const nomAgeContent = (await readFile('./tests/data/nom-age.ods')).buffer
 
diff --git a/tests/ods-files.js b/tests/ods-files.js
index 8fdb352..05b8190 100644
--- a/tests/ods-files.js
+++ b/tests/ods-files.js
@@ -2,7 +2,7 @@ import {readFile} from 'node:fs/promises'
 
 import test from 'ava';
 
-import {getODSTableRawContent} from '../scripts/main.js'
+import {getODSTableRawContent} from '../scripts/node.js'
 
 test('.ods file with table:number-columns-repeated attribute in cell', async t => {
     const repeatedCellFileContent = (await readFile('./tests/data/cellules-répétées.ods')).buffer