codexparser 0.0.18 → 0.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexparser",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "This is a Javascript Bible parser and text scanner. It will search through texts and collate all scripture references into an array and parse them into objects, and it will parse passages into objects by book, chapter, verse, and testament. ",
   "main": "index.js",
   "scripts": {

package/src/CodexParser.js

@@ -23,7 +23,16 @@ class CodexParser {
      * @return {array} The found passages from the text.
      */
     scan(text) {
+        const judeRegex = /(?:[j|J][d|ude]+.?\s?\d+)/gim
+        const jude = text.match(judeRegex)
         this.found = text.match(this.scripturesRegex)
+        if (!this.found) {
+            this.found = []
+        }
+        if (jude) {
+            this.found.push(...jude)
+        }
+        console.log(this.found)
         return this.found
     }
 
@@ -42,8 +51,14 @@ class CodexParser {
         for (let i = 0; i < this.found.length; i++) {
             const hasChapterRange = this.found[i].match(/(?<=-\s?)\b\d+[.:].+\b/)
             const book = this.found[i].match(this.bookRegex)
-            const chapter = this.found[i].replace(book[0], "").match(this.chapterRegex)
-            const verse = this.found[i].match(this.verseRegex)[0].replace(/[:.]/, "").trim()
+            let verse,
+                chapter = this.found[i].replace(book[0], "").match(this.chapterRegex)
+            if (this.found[i].match(this.verseRegex))
+                verse = this.found[i].match(this.verseRegex)[0].replace(/[:.]/, "").trim()
+            else {
+                verse = chapter
+                chapter = "1"
+            }
             const passage = {
                 original: this.found[i],
                 book: this.bookify(book),
@@ -60,7 +75,10 @@ class CodexParser {
                 passage.to.verses = passage.to.verses.split(/,/).filter(Boolean)
                 passage.to.testament = this.bible.old.includes(passage.to.book) ? "old" : "new"
             }
-            passage.verses = passage.verses.split(/,/).filter(Boolean)
+            passage.verses =
+                typeof passage.verses !== "object"
+                    ? passage.verses.split(/,/).filter(Boolean)
+                    : passage.verses.filter((item) => item.trim())
             passage.testament = this.bible.old.includes(passage.book) ? "old" : "new"
             passage.scripture = this.scripturize(passage)
             this.passages.push(passage)

package/src/regex.js

@@ -1,5 +1,5 @@
 const bookRegex =
-    /(?:(?:[gG]e(?:[a-zA-Z]+)?|[eE]x(?:[a-zA-Z]+)?|[lL]e(?:[a-zA-Z]+)?|[nN]u(?:[a-zA-Z]+)?|[dD]e(?:[a-zA-Z]+)?|[jJ]o(?:[a-zA-Z]+)?|[jJ]u(?:[a-zA-Z]+)?|[rR]u(?:[a-zA-Z]+)?|1\s?[sS](?:[a-zA-Z]+)?|2\s?[sS](?:[a-zA-Z]+)?|1\s?[kK](?:[a-zA-Z]+)?|2\s?[kK](?:[a-zA-Z]+)?|1\s?[cC]hr(?:[a-zA-Z]+)?|2\s?[cC]hr(?:[a-zA-Z]+)?|[eE]z(?:[a-zA-Z]+)?|[nN]e(?:[a-zA-Z]+)?|[eE]s(?:[a-zA-Z]+)?|[jJ](?:[a-zA-Z]+)?|[pP]s(?:[a-zA-Z]+)?|[pP]r(?:[a-zA-Z]+)?|[eE|Qoh](?:[a-zA-Z]+)?|[sS]o(?:[a-zA-Z]+)?|[iI]s(?:[a-zA-Z]+)?|[jJ]e(?:[a-zA-Z]+)?|[lL]a(?:[a-zA-Z]+)?|[eE]z(?:[a-zA-Z]+)?|[dD](?:[a-zA-Z]+)?|[hH]o(?:[a-zA-Z]+)?|[jJ](?:[a-zA-Z]+)?|[aA](?:[a-zA-Z]+)?|[oO](?:[a-zA-Z]+)?|[jJ](?:[a-zA-Z]+)?|[mM](?:[a-zA-Z]+)?|[nN](?:[a-zA-Z]+)?|[hH]a(?:[a-zA-Z]+)?|[zZ](?:[a-zA-Z]+)?|[hH]a(?:[a-zA-Z]+)?|[zZ]e(?:[a-zA-Z]+)?|[mM]a(?:[a-zA-Z]+)?|[mM](?:[a-zA-Z]+)?|[mM](?:[a-zA-Z]+)?|[lL](?:[a-zA-Z]+)?|[jJ](?:[a-zA-Z]+)?|[aA](?:[a-zA-Z]+)?|[rR](?:[a-zA-Z]+)?|1\s?[cC]o(?:[a-zA-Z]+)?|2\s?[cC]o(?:[a-zA-Z]+)?|[gG](?:[a-zA-Z]+)?|[eE](?:[a-zA-Z]+)?|[pP]h(?:[a-zA-Z]+)?|[cC](?:[a-zA-Z]+)?|1\s?[tT]h(?:[a-zA-Z]+)?|2\s?[tT]h(?:[a-zA-Z]+)?|1\s?[tT](?:[a-zA-Z]+)?|2\s?[tT](?:[a-zA-Z]+)?|[tT](?:[a-zA-Z]+)?|[pP]h(?:[a-zA-Z]+)?|[hH](?:[a-zA-Z]+)?|[jJ]a(?:[a-zA-Z]+)?|1\s?[pP](?:[a-zA-Z]+)?|2\s?[pP](?:[a-zA-Z]+)?|1\s?[jJ](?:[a-zA-Z]+)?|2\s?[jJ](?:[a-zA-Z]+)?|3\s?[jJ](?:[a-zA-Z]+)?|[jJ](:[a-zA-Z]+)?|[Rr|Aa](?:[a-zA-Z]+)?))?/gim
+    /(?:(?:[gG]e(?:[a-zA-Z]+)?|[eE]x(?:[a-zA-Z]+)?|[lL]e(?:[a-zA-Z]+)?|[nN]u(?:[a-zA-Z]+)?|[dD]e(?:[a-zA-Z]+)?|[jJ]o(?:[a-zA-Z]+)?|[jJ]u(?:[a-zA-Z]+)?|[rR]u(?:[a-zA-Z]+)?|1\s?[sS](?:[a-zA-Z]+)?|2\s?[sS](?:[a-zA-Z]+)?|1\s?[kK](?:[a-zA-Z]+)?|2\s?[kK](?:[a-zA-Z]+)?|1\s?[cC]hr(?:[a-zA-Z]+)?|2\s?[cC]hr(?:[a-zA-Z]+)?|[eE]z(?:[a-zA-Z]+)?|[nN]e(?:[a-zA-Z]+)?|[eE]s(?:[a-zA-Z]+)?|[jJ](?:[a-zA-Z]+)?|[pP]s(?:[a-zA-Z]+)?|[pP]r(?:[a-zA-Z]+)?|[eE|Qoh](?:[a-zA-Z]+)?|[sS]o(?:[a-zA-Z]+)?|[iI]s(?:[a-zA-Z]+)?|[jJ]e(?:[a-zA-Z]+)?|[lL]a(?:[a-zA-Z]+)?|[eE]z(?:[a-zA-Z]+)?|[dD](?:[a-zA-Z]+)?|[hH]o(?:[a-zA-Z]+)?|[jJ](?:[a-zA-Z]+)?|[aA](?:[a-zA-Z]+)?|[oO](?:[a-zA-Z]+)?|[jJ](?:[a-zA-Z]+)?|[mM](?:[a-zA-Z]+)?|[nN](?:[a-zA-Z]+)?|[hH]a(?:[a-zA-Z]+)?|[zZ](?:[a-zA-Z]+)?|[hH]a(?:[a-zA-Z]+)?|[zZ]e(?:[a-zA-Z]+)?|[mM]a(?:[a-zA-Z]+)?|[mM](?:[a-zA-Z]+)?|[mM](?:[a-zA-Z]+)?|[lL](?:[a-zA-Z]+)?|[jJ](?:[a-zA-Z]+)?|[aA](?:[a-zA-Z]+)?|[rR](?:[a-zA-Z]+)?|1\s?[cC]o(?:[a-zA-Z]+)?|2\s?[cC]o(?:[a-zA-Z]+)?|[gG](?:[a-zA-Z]+)?|[eE](?:[a-zA-Z]+)?|[pP]h(?:[a-zA-Z]+)?|[cC](?:[a-zA-Z]+)?|1\s?[tT]h(?:[a-zA-Z]+)?|2\s?[tT]h(?:[a-zA-Z]+)?|1\s?[tT](?:[a-zA-Z]+)?|2\s?[tT](?:[a-zA-Z]+)?|[tT](?:[a-zA-Z]+)?|[pP]h(?:[a-zA-Z]+)?|[hH](?:[a-zA-Z]+)?|[jJ]a(?:[a-zA-Z]+)?|1\s?[pP](?:[a-zA-Z]+)?|2\s?[pP](?:[a-zA-Z]+)?|1\s?[jJ](?:[a-zA-Z]+)?|2\s?[jJ](?:[a-zA-Z]+)?|3\s?[jJ](?:[a-zA-Z]+)?|[jJ](?:[d|ude]+)?|[Rr|Aa](?:[a-zA-Z]+)?))/gim
 const chapterRegex = /\b(?:\.?\s?\d+[:|\.]?)\b/gm
 const verseRegex = /\b[:.](\d+(?:,?\s*?\d+?|-|–|—\d+)*)?\d+\b/gm
 const chapterRange = /\s?(?:[-|—|–])\s?/gm

package/test.js

@@ -2,8 +2,12 @@ const CodexParser = require("./src/CodexParser.js")
 
 const parser = new CodexParser()
 const text =
-    "The passages that we are looking at tonight are found in Genesis 2:1 - 3:19, 1 John 3:16-17, 1 Peter 1:1, and Romans 10:13, 15, 17. Please turn in your Bibles."
+    "The passages that we are looking at tonight are found Jude 6, in Jude 5, Genesis 2:1 - 3:19, 1 John 3:16-17, 1 Peter 1:1, and Romans 10:13, 15, 17. Please turn in your Bibles."
 const single = "Ge 27.27-29,89-40 Heb 11.20"
-const passages = parser.parse(text)
+const jd = "Jd. 5"
+const passages = parser.parse(single)
 console.log(passages)
-
+const textParser = parser.parse(text)
+console.log(textParser)
+const jude = parser.parse(jd)
+console.log(jude)