@helloao/tools 0.0.5 → 0.0.6

package/parser/usx-parser.d.ts

@@ -1,5 +1,5 @@
-import { Chapter, ChapterContent, FootnoteReference, ParseTree, Verse, Text, HebrewSubtitle, InlineLineBreak } from "./types";
-import { RewindableIterator } from "./iterators";
+import { Chapter, ChapterContent, FootnoteReference, ParseTree, Verse, Text, HebrewSubtitle, InlineLineBreak } from './types';
+import { RewindableIterator } from './iterators';
 /**
  * The version of the parser.
  * Used to determine whether input files need to be re-parsed.

package/parser/usx-parser.js

@@ -32,7 +32,7 @@ class USXParser {
         const usxElement = doc.documentElement;
         let root = {
             type: 'root',
-            content: []
+            content: [],
         };
         const bookElement = usxElement.querySelector('book[code]');
         if (!bookElement) {
@@ -51,7 +51,10 @@ class USXParser {
         // const title2 = usxElement.querySelector('para[style="mt2"]');
         // const title3 = usxElement.querySelector('para[style="mt3"]');
         if (titles.length > 0) {
-            root.title = [...titles].map(t => t.textContent).filter(t => t).join(' ');
+            root.title = [...titles]
+                .map((t) => t.textContent)
+                .filter((t) => t)
+                .join(' ');
         }
         for (let content of this.iterateRootContent(usxElement)) {
             root.content.push(content);
@@ -85,10 +88,13 @@ class USXParser {
             }
             else if (child.nodeName === 'para') {
                 const style = child.getAttribute('style');
-                if (style === 's1' || style === 's2' || style === 's3' || style === 's4') {
+                if (style === 's1' ||
+                    style === 's2' ||
+                    style === 's3' ||
+                    style === 's4') {
                     yield {
                         type: 'heading',
-                        content: child.textContent ? [child.textContent] : []
+                        content: child.textContent ? [child.textContent] : [],
                     };
                 }
             }
@@ -108,10 +114,15 @@ class USXParser {
             }
             else if (element.nodeName === 'para') {
                 const style = element.getAttribute('style');
-                if (style === 's1' || style === 's2' || style === 's3' || style === 's4') {
+                if (style === 's1' ||
+                    style === 's2' ||
+                    style === 's3' ||
+                    style === 's4') {
                     yield {
                         type: 'heading',
-                        content: element.textContent ? [element.textContent] : []
+                        content: element.textContent
+                            ? [element.textContent]
+                            : [],
                     };
                 }
                 else if (style === 'b') {
@@ -145,8 +156,18 @@ class USXParser {
             let descriptive = null;
             if (parent.nodeName === 'para') {
                 const style = parent.getAttribute('style');
-                if (style === 'q1' || style === 'q2' || style === 'q3' || style === 'q4') {
-                    poem = style === 'q1' ? 1 : style === 'q2' ? 2 : style === 'q3' ? 3 : 4;
+                if (style === 'q1' ||
+                    style === 'q2' ||
+                    style === 'q3' ||
+                    style === 'q4') {
+                    poem =
+                        style === 'q1'
+                            ? 1
+                            : style === 'q2'
+                                ? 2
+                                : style === 'q3'
+                                    ? 3
+                                    : 4;
                 }
                 else if (style === 'd') {
                     descriptive = true;
@@ -156,7 +177,7 @@ class USXParser {
                 if (poem !== null || descriptive !== null) {
                     if (typeof content === 'string') {
                         let text = {
-                            text: content
+                            text: content,
                         };
                         if (poem !== null) {
                             text.poem = poem;
@@ -168,7 +189,7 @@ class USXParser {
                     }
                     else {
                         let text = {
-                            ...content
+                            ...content,
                         };
                         if ('text' in text) {
                             if (poem !== null) {
@@ -191,7 +212,7 @@ class USXParser {
         const verse = {
             type: 'verse',
             number: parseInt(element.getAttribute('number') || '0', 10),
-            content: []
+            content: [],
         };
         for (let content of this.iterateVerseContent(chapter, verse, nodes)) {
             addOrJoin(verse.content, content);
@@ -202,7 +223,7 @@ class USXParser {
     *parseHebrewSubtitle(para, chapter, nodes) {
         const subtitle = {
             type: 'hebrew_subtitle',
-            content: []
+            content: [],
         };
         for (let content of this.iterateHebrewSubtitleContent(para, chapter, nodes)) {
             if (typeof content === 'object' && 'number' in content) {
@@ -241,12 +262,14 @@ class USXParser {
         else if (node instanceof Element && node.nodeName === 'char') {
             yield* this.iterateChar(nodes, node);
         }
-        else if (node instanceof Element && node.nodeName === 'para' && node.getAttribute('style') === 'b') {
+        else if (node instanceof Element &&
+            node.nodeName === 'para' &&
+            node.getAttribute('style') === 'b') {
             for (let _ of (0, iterators_1.children)(nodes, node)) {
                 // iterate through all the children to prevent iterating over them multiple times
             }
             yield {
-                lineBreak: true
+                lineBreak: true,
             };
         }
         else if (node.nodeType === NodeType.Text) {
@@ -259,7 +282,7 @@ class USXParser {
         if (style === 'wj') {
             yield {
                 text,
-                wordsOfJesus: true
+                wordsOfJesus: true,
             };
         }
         else {
@@ -286,12 +309,12 @@ class USXParser {
                 text,
                 reference: {
                     chapter: chapter.number,
-                    verse: verse?.number ?? 0
-                }
+                    verse: verse?.number ?? 0,
+                },
             };
             chapter.footnotes.push(note);
             yield {
-                noteId: note.noteId
+                noteId: note.noteId,
             };
         }
         else {
@@ -312,7 +335,7 @@ class USXParser {
         if (style === 'wj') {
             yield {
                 text,
-                wordsOfJesus: true
+                wordsOfJesus: true,
             };
         }
         else {
@@ -329,15 +352,31 @@ const ignoredParaStyles = new Set([
     // <para> Identification [exclude all] - Running headings & table of contents
     'ide', // See https://github.com/schierlm/BibleMultiConverter/issues/67
     'rem', // Remarks (valid in schema though missed in docs)
-    'h', 'h1', 'h2', 'h3', 'h4',
-    'toc1', 'toc2', 'toc3',
-    'toca1', 'toca2', 'toca3',
+    'h',
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'toc1',
+    'toc2',
+    'toc3',
+    'toca1',
+    'toca2',
+    'toca3',
     /* <para> Introductions [exclude all] - Introductionary (non-biblical) content
         Which might be helpful in a printed book, but intro material in apps is usually bad UX,
         and users that really care can research a translations methodology themselves
     */
-    'imt', 'imt1', 'imt2', 'imt3', 'imt4',
-    'is', 'is1', 'is2', 'is3', 'is4',
+    'imt',
+    'imt1',
+    'imt2',
+    'imt3',
+    'imt4',
+    'is',
+    'is1',
+    'is2',
+    'is3',
+    'is4',
     'ip',
     'ipi',
     'im',
@@ -345,19 +384,39 @@ const ignoredParaStyles = new Set([
     'ipq',
     'imq',
     'ipr',
-    'iq', 'iq1', 'iq2', 'iq3', 'iq4',
+    'iq',
+    'iq1',
+    'iq2',
+    'iq3',
+    'iq4',
     'ib',
-    'ili', 'ili1', 'ili2', 'ili3', 'ili4',
+    'ili',
+    'ili1',
+    'ili2',
+    'ili3',
+    'ili4',
     'iot',
-    'io', 'io1', 'io2', 'io3', 'io4',
+    'io',
+    'io1',
+    'io2',
+    'io3',
+    'io4',
     'iex',
     'imte',
     'ie',
     /* <para> Headings [exclude some] - Exclude book & chapter headings but keep section headings
         Not excluded: ms# | mr | s# | sr | d | sp | sd#
     */
-    'mt', 'mt1', 'mt2', 'mt3', 'mt4',
-    'mte', 'mte1', 'mte2', 'mte3', 'mte4',
+    'mt',
+    'mt1',
+    'mt2',
+    'mt3',
+    'mt4',
+    'mte',
+    'mte1',
+    'mte2',
+    'mte3',
+    'mte4',
     'cl',
     'cd', // Non-biblical chapter summary, more than heading
     'r', // Parallels to be provided by external data
@@ -368,7 +427,7 @@ function* iterateCharContent(char) {
     if (style === 'wj') {
         yield {
             text,
-            wordsOfJesus: true
+            wordsOfJesus: true,
         };
     }
     else {
@@ -409,7 +468,9 @@ function addOrJoin(array, value) {
         if (typeof last === 'string' && typeof value === 'string') {
             array[array.length - 1] = last + value;
         }
-        else if (isVerseText(last) && isVerseText(value) && hasSameFormatting(last, value)) {
+        else if (isVerseText(last) &&
+            isVerseText(value) &&
+            hasSameFormatting(last, value)) {
             last.text += value.text;
         }
         else {