usfm-grammar-web 3.1.1 → 3.1.2

package/README.md

@@ -23,10 +23,10 @@ function App() {
 
   useEffect(() => {
     const initParser = async () => {
-      await USFMParser.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.1/tree-sitter-usfm.wasm",
-                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.1/tree-sitter.wasm");
-      await Validator.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.1/tree-sitter-usfm.wasm",
-                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.1/tree-sitter.wasm");
+      await USFMParser.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.2/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.2/tree-sitter.wasm");
+      await Validator.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.2/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.2/tree-sitter.wasm");
 
     };
     initParser();
@@ -60,13 +60,13 @@ It can be used directly in the HTML script tag too. Please ensure its dependenci
 
 ```html
 <script type="module">
-  import { USFMParser, Filter, Validator } from 'https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.1/dist/bundle.mjs';
+  import { USFMParser, Filter, Validator } from 'https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.2/dist/bundle.mjs';
   console.log('Hello world');
   (async () => {
-  await USFMParser.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.1/tree-sitter-usfm.wasm",
-                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.1/tree-sitter.wasm");
-  await Validator.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.1/tree-sitter-usfm.wasm",
-                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.1/tree-sitter.wasm");
+  await USFMParser.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.2/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.2/tree-sitter.wasm");
+  await Validator.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.2/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.1.2/tree-sitter.wasm");
   const usfmParser = new USFMParser('\\id GEN\n\\c 1\n\\p\n\\v 1 In the begining..\\v 2 more text')
   const output = usfmParser.toUSJ()
   console.log({ output })

package/dist/bundle.mjs

@@ -2012,7 +2012,8 @@ const $28b0061e56e1edf2$export$af42bd8f70df8555 = [
     "tc",
     "th",
     "tcr",
-    "thr"
+    "thr",
+    "tcc"
 ];
 const $28b0061e56e1edf2$export$c4d2f24f22330b2a = [
     "fig",
@@ -2239,7 +2240,7 @@ class $1bdca1468aa54399$var$USJGenerator {
                 type: "table:cell",
                 marker: style,
                 content: [],
-                align: style.includes("r") ? "end" : "start"
+                align: style.includes("tcc") ? "center" : style.includes("r") ? "end" : "start"
             };
             node.children.slice(1).forEach((child)=>{
                 this.nodeToUSJ(child, cellJsonObj);
@@ -2534,6 +2535,10 @@ class $02bc2da10d8b76e8$var$USXGenerator {
             this.xmlRootNode = doc.documentElement;
             this.xmlRootNode.setAttribute('version', '3.1');
         } else this.xmlRootNode = usxRootElement;
+        this.parseState = {
+            prevVerseSid: null,
+            prevVerseParent: null
+        };
     }
     /**
      * Builds the ID node in USX
@@ -2607,42 +2612,13 @@ class $02bc2da10d8b76e8$var$USXGenerator {
             } else parentXmlNode.appendChild(vEndXmlNode);
         }
     }
-    findPrevUncle(parentXmlNode) {
-        // Get the grandparent node
-        const grandParent = parentXmlNode.parentNode;
-        let uncleIndex = grandParent.childNodes.length - 2; // Start from the previous sibling
-        while(uncleIndex >= 0){
-            const uncle = grandParent.childNodes[uncleIndex];
-            // Skip 'sidebar' and 'ms' elements
-            if (uncle.tagName === "sidebar" || uncle.tagName === "ms") uncleIndex--;
-            else if (uncle.getAttribute('style') === 'ca' || uncle.getAttribute('style') === 'cp') uncleIndex--;
-            else return uncle;
-        }
-        return null; // No suitable uncle found
-    }
     node2UsxVerse(node, parentXmlNode) {
-        // Find all previous 'verse' elements
-        const prevVerses = (0, $5OpyM$xpath).select("//verse", this.xmlRootNode);
-        // Check if there are previous verses and if the last one has a 'sid' attribute
-        if (prevVerses.length > 0 && prevVerses[prevVerses.length - 1].hasAttribute('sid')) {
-            let vEndXmlNode;
-            if (parentXmlNode.textContent.trim() !== "") {
-                // If there is verse text in the current parent
-                vEndXmlNode = parentXmlNode.ownerDocument.createElement('verse');
-                parentXmlNode.appendChild(vEndXmlNode);
-            } else {
-                // If no text, find the previous uncle and attach the end verse
-                const prevUncle = this.findPrevUncle(parentXmlNode);
-                if (prevUncle.tagName === "para") {
-                    vEndXmlNode = prevUncle.ownerDocument.createElement('verse');
-                    prevUncle.appendChild(vEndXmlNode);
-                } else if (prevUncle.tagName === "table") {
-                    const rows = prevUncle.getElementsByTagName('row');
-                    vEndXmlNode = prevUncle.ownerDocument.createElement('verse');
-                    rows[rows.length - 1].appendChild(vEndXmlNode);
-                } else throw new Error(`prev_uncle is ${String(prevUncle)}`);
-            }
-            vEndXmlNode.setAttribute('eid', prevVerses[prevVerses.length - 1].getAttribute('sid'));
+        // Check if there are previous verses to close
+        if (this.parseState.prevVerseSid !== null) {
+            let prevPara = this.parseState.prevVerseParent;
+            let vEndXmlNode = prevPara.ownerDocument.createElement('verse');
+            vEndXmlNode.setAttribute("eid", this.parseState.prevVerseSid);
+            prevPara.appendChild(vEndXmlNode);
         }
         // Query to capture verse-related elements
         const verseNumCap = this.usfmLanguage.query(`
@@ -2671,6 +2647,7 @@ class $02bc2da10d8b76e8$var$USXGenerator {
         vXmlNode.setAttribute('number', verseNum.trim());
         vXmlNode.setAttribute('style', 'v');
         vXmlNode.setAttribute('sid', ref.trim());
+        this.parseState.prevVerseSid = ref.trim();
     }
     node2UsxCaVa(node, parentXmlNode) {
         // Build elements for independent ca and va away from c and v
@@ -2774,7 +2751,7 @@ class $02bc2da10d8b76e8$var$USXGenerator {
             const style = this.usfm.substring(tagNode.startIndex, tagNode.endIndex).replace("\\", "").trim();
             const cellXmlNode = parentXmlNode.ownerDocument.createElement("cell");
             cellXmlNode.setAttribute("style", style);
-            cellXmlNode.setAttribute("align", style.includes("r") ? "end" : "start");
+            cellXmlNode.setAttribute("align", style.includes("tcc") ? "center" : style.includes("r") ? "end" : "start");
             parentXmlNode.appendChild(cellXmlNode);
             node.children.slice(1).forEach((child)=>{
                 this.node2Usx(child, cellXmlNode);
@@ -2870,10 +2847,12 @@ class $02bc2da10d8b76e8$var$USXGenerator {
             "va"
         ].includes(node.type)) this.node2UsxCaVa(node, parentXmlNode);
         else if (node.type === "v") this.node2UsxVerse(node, parentXmlNode);
-        else if (node.type === "verseText") node.children.forEach((child)=>{
-            this.node2Usx(child, parentXmlNode);
-        });
-        else if ([
+        else if (node.type === "verseText") {
+            node.children.forEach((child)=>{
+                this.node2Usx(child, parentXmlNode);
+            });
+            this.parseState.prevVerseParent = parentXmlNode;
+        } else if ([
             "paragraph",
             "pi",
             "ph"