@iebh/reflib 2.3.2 → 2.3.4

package/.vscode/launch.json

@@ -0,0 +1,38 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Vite Server",
+      "runtimeExecutable": "/home/connor/.nvm/versions/node/v20.12.2/bin/npm",
+      "runtimeArgs": ["run", "dev"],
+      "cwd": "${workspaceFolder}/test/browser",
+      "console": "integratedTerminal",
+      "env": {
+        "VITE_DEV_SERVER_URL": "http://localhost:3000"
+      }
+    },
+    {
+      "name": "Debug in Chrome",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:3000",
+      "webRoot": "${workspaceFolder}",
+      "sourceMaps": true,
+      "sourceMapPathOverrides": {
+        "/__vite-root/*": "${webRoot}/*",
+        "/@fs/*": "*",
+        "/@vite-root/*": "${webRoot}/*",
+        "/src/*": "${webRoot}/src/*",
+        "/modules/*": "${webRoot}/modules/*"
+      }
+    }
+  ],
+  "compounds": [
+    {
+      "name": "Debug Vite + Chrome",
+      "configurations": ["Debug Vite Server", "Debug in Chrome"]
+    }
+  ]
+}

package/modules/shims/WritableStream-browser.js

@@ -1,56 +1,52 @@
-import camelCase from '../../shared/camelCase.js';
 import Emitter from '../../shared/emitter.js';
+import CacxParser from '@iebh/cacx';
 
 export class WritableStream {
-    constructor(passedParserOptions) {
-        // Stores XML in text form once read
-        this.text = "";
-        this.emitter = Emitter();
-        // Add event listeners to mimic htmlparser2 behavior in the browser
-        this.emitter.on('opentag', passedParserOptions.onopentag);
-        this.emitter.on('closetag', passedParserOptions.onclosetag);
-        this.emitter.on('text', passedParserOptions.ontext);
-        this.emitter.on('end', passedParserOptions.onend);
-    }
-
-    write(data) {
-        // CF: TODO: Parse data as it comes in chunks for better memory efficiency
-        this.text += data;
-    }
-
-    end() {
-        this.parseXML(this.text);
-        // Free memory
-        this.text = ''
-        this.emitter.emit('end');
-    }
-
-    parseXML(xmlString) {
-        let parser = new DOMParser();
-        let doc = parser.parseFromString(xmlString, 'application/xml');
-        this.traverseNode(doc.documentElement);
-    }
-
-    traverseNode(node) {
-        if (node.nodeType === Node.ELEMENT_NODE) {
-            let name = camelCase(node.nodeName);
-            let attrs = Array.from(node.attributes).reduce((acc, attr) => {
-                acc[attr.name] = attr.value;
-                return acc;
-            }, {});
-
-            this.emitter.emit('opentag', name, attrs);
-
-            for (let child of node.childNodes) {
-                this.traverseNode(child);
-            }
-
-            this.emitter.emit('closetag', name);
-        } else if (node.nodeType === Node.TEXT_NODE) {
-            let text = node.nodeValue.trim();
-            if (text) {
-                this.emitter.emit('text', text);
-            }
-        }
-    }
+	constructor(passedParserOptions) {
+		this.emitter = Emitter();
+		this.parser = new CacxParser({
+			collect: false,
+			onTagOpen: (node) => {
+				console.log(node.tag, node.attrs);
+				const name = node.tag;
+				const attrs = node.attrs || {};
+				this.emitter.emit('opentag', name, attrs);
+			},
+			onTagClose: (node) => {
+				const name = node.tag;
+				// Emit text event before closing the tag
+				if (node.text && node.text.trim()) {
+					this.emitter.emit('text', node.text.trim());
+				}
+				this.emitter.emit('closetag', name);
+			},
+			flattenText: false,
+			keyText: 'text',
+			keyAttrs: 'attrs',
+		});
+
+		// Add event listeners to mimic htmlparser2 behavior
+		this.emitter.on('opentag', passedParserOptions.onopentag);
+		this.emitter.on('closetag', passedParserOptions.onclosetag);
+		this.emitter.on('text', passedParserOptions.ontext);
+		this.emitter.on('end', passedParserOptions.onend);
+	}
+
+	write(data) {
+		this.parser.append(data).exec();
+	}
+
+	end() {
+		// Process any remaining data
+		this.parser.exec();
+
+		// Emit text event for the last node if it has text
+		const lastNode = this.parser.stack.at(-1);
+		if (lastNode && lastNode.text && lastNode.text.trim()) {
+			this.emitter.emit('text', lastNode.text.trim());
+		}
+
+		// Emit end event
+		this.emitter.emit('end');
+	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iebh/reflib",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "Reference / Citation reference library utilities",
   "scripts": {
     "lint": "eslint lib modules shared test",
@@ -53,6 +53,7 @@
     "vite-plugin-replace": "^0.1.1"
   },
   "dependencies": {
+    "@iebh/cacx": "^1.0.0",
     "htmlparser2": "^9.0.0",
     "JSONStream": "^1.3.5",
     "mitt": "^3.0.1"