usfm-grammar-web 3.2.0-beta.1 → 3.2.0-beta.3

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.2.0-beta.1/tree-sitter-usfm.wasm",
-                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.1/tree-sitter.wasm");
-      await Validator.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.1/tree-sitter-usfm.wasm",
-                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.1/tree-sitter.wasm");
+      await USFMParser.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.3/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.3/tree-sitter.wasm");
+      await Validator.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.3/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.3/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.2.0-beta.1/dist/bundle.mjs';
+  import { USFMParser, Filter, Validator } from 'https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.3/dist/bundle.mjs';
   console.log('Hello world');
   (async () => {
-  await USFMParser.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.1/tree-sitter-usfm.wasm",
-                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.1/tree-sitter.wasm");
-  await Validator.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.1/tree-sitter-usfm.wasm",
-                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.1/tree-sitter.wasm");
+  await USFMParser.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.3/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.3/tree-sitter.wasm");
+  await Validator.init("https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.3/tree-sitter-usfm.wasm",
+                            "https://cdn.jsdelivr.net/npm/usfm-grammar-web@3.2.0-beta.3/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

@@ -1,6 +1,5 @@
 import * as $5OpyM$fspromises from "fs/promises";
 import * as $5OpyM$module from "module";
-import $5OpyM$assert from "assert";
 import {DOMImplementation as $5OpyM$DOMImplementation} from "xmldom";
 import $5OpyM$ajv from "ajv";
 
@@ -3468,7 +3467,6 @@ module.exports = new URL("tree-sitter.0080292a.wasm", import.meta.url).toString(
 });
 
 
-
 var $dc2P8 = parcelRequire("dc2P8");
 const $142605215cbb4f88$export$b32929182cc4fefe = [
     'USJ',
@@ -3834,7 +3832,8 @@ const $28b0061e56e1edf2$export$af42bd8f70df8555 = [
     'th',
     'tcr',
     'thr',
-    'tcc'
+    'tcc',
+    'thc'
 ];
 const $28b0061e56e1edf2$export$c4d2f24f22330b2a = [
     'fig',
@@ -4099,7 +4098,7 @@ class $1bdca1468aa54399$var$USJGenerator {
         // Build USJ nodes for character markups, both regular and nested
         const tagNode = node.children[0];
         let childrenRange = node.children.length;
-        if (node.children[node.children.length - 1].type.startsWith('\\')) childrenRange -= 1; // Exclude the last node if it starts with '\', treating it as a closing node
+        for(let i = node.children.length - 1; i > 0; i--)if (node.children[i].type.startsWith('\\') || node.children[i].type === '*' || node.children[i].type.endsWith('Tag')) childrenRange -= 1;
         const style = this.usfm.substring(tagNode.startIndex, tagNode.endIndex).replace('\\', '').replace('+', '').trim();
         const charJsonObj = {
             type: 'char',
@@ -4139,7 +4138,7 @@ class $1bdca1468aa54399$var$USJGenerator {
                 type: 'table:cell',
                 marker: style,
                 content: [],
-                align: style.includes('tcc') ? 'center' : style.includes('r') ? 'end' : 'start'
+                align: style.includes('tcc') || style.includes('thc') ? 'center' : style.includes('r') ? 'end' : 'start'
             };
             node.children.slice(1).forEach((child)=>{
                 this.nodeToUSJ(child, cellJsonObj);
@@ -4701,7 +4700,7 @@ class $02bc2da10d8b76e8$var$USXGenerator {
         // Build USJ nodes for character markups, both regular and nested
         const tagNode = node.children[0];
         let childrenRange = node.children.length;
-        if (node.children[node.children.length - 1].type.startsWith('\\')) childrenRange -= 1; // Exclude the last node if it starts with '\', treating it as a closing node
+        for(let i = node.children.length - 1; i > 0; i--)if (node.children[i].type.startsWith('\\') || node.children[i].type === '*' || node.children[i].type.endsWith('Tag')) childrenRange -= 1;
         const charXmlNode = parentXmlNode.ownerDocument.createElement('char');
         const style = this.usfm.substring(tagNode.startIndex, tagNode.endIndex).replace('\\', '').replace('+', '').trim();
         charXmlNode.setAttribute('style', style);
@@ -4745,7 +4744,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('tcc') ? 'center' : style.includes('r') ? 'end' : 'start');
+            cellXmlNode.setAttribute('align', style.includes('tcc') || style.includes('thc') ? 'center' : style.includes('r') ? 'end' : 'start');
             parentXmlNode.appendChild(cellXmlNode);
             node.children.slice(1).forEach((child)=>{
                 this.node2Usx(child, cellXmlNode);
@@ -47147,9 +47146,9 @@ Only one of USFM, USJ, USX or BibleNLP is supported in one object.`);
     }
     convertUSXToUSFM() {
         try {
-            (0, $5OpyM$assert)(1 <= this.usx.nodeType && this.usx.nodeType <= 12, 'Input must be an instance of xmldom Document or Element');
+            if (!(1 <= this.usx.nodeType && this.usx.nodeType <= 12)) throw new Error('Input must be an instance of xmldom Document or Element');
             if (this.usx.tagName !== 'usx') {
-                (0, $5OpyM$assert)(this.usx.getElementsByTagName('usx').length === 1, `Expects a <usx> node.
+                if (!(this.usx.getElementsByTagName('usx').length === 1)) throw new Error(`Expects a <usx> node.
 Refer docs: https://docs.usfm.bible/usfm/3.1/syntax.html#_usx_usfm_xml`);
                 this.usx = this.usx.getElementsByTagName('usx')[0];
             }
@@ -47206,10 +47205,9 @@ Refer docs: https://docs.usfm.bible/usfm/3.1/syntax.html#_usx_usfm_xml`);
     }
     convertBibleNLPtoUSFM(bookCode) {
         try {
-            (0, $5OpyM$assert)(this.bibleNlp.vref, "Should have 'vref' key");
-            (0, $5OpyM$assert)(this.bibleNlp.text, "Should have 'text' key");
-            (0, $5OpyM$assert)(Array.isArray(this.bibleNlp.vref), "'vref' should contain an array of references.");
-            (0, $5OpyM$assert)(Array.isArray(this.bibleNlp.text), "'text' should contain an array of strings.");
+            if (typeof this.bibleNlp !== 'object' || this.bibleNlp === null) throw new Error('Input must be a non-null object');
+            if (!this.bibleNlp.hasOwnProperty('vref') || !this.bibleNlp.hasOwnProperty('text')) throw new Error("Input object must have 'vref' and 'text' properties");
+            if (!Array.isArray(this.bibleNlp.vref) || !Array.isArray(this.bibleNlp.text) || this.bibleNlp.vref.length === 0 || this.bibleNlp.text.length === 0) throw new Error("'vref' and 'text' properties must be non empty arrays!");
             let vrefs = this.bibleNlp.vref;
             if ([
                 31170,