codexparser 0.0.14 → 0.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexparser",
-  "version": "0.0.14",
+  "version": "0.0.18",
   "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

@@ -1,5 +1,5 @@
 const bible = require("./bible")
-const { bookRegex, bookAbbrRegex, chapterRegex, verseRegex, scripturesRegex, abbrScripturesRegex } = require("./regex")
+const { bookRegex, chapterRegex, verseRegex, scripturesRegex } = require("./regex")
 const abbrevations = require("./abbr")
 const toc = require("./toc")
 
@@ -9,11 +9,9 @@ class CodexParser {
         this.passages = []
         this.bible = bible
         this.bookRegex = bookRegex
-        this.bookAbbrRegex = bookAbbrRegex
         this.chapterRegex = chapterRegex
         this.verseRegex = verseRegex
         this.scripturesRegex = scripturesRegex
-        this.abbrScripturesRegex = abbrScripturesRegex
         this.abbrevations = abbrevations
         this.toc = toc
     }
@@ -41,26 +39,49 @@ class CodexParser {
         }
         this.passages = []
         this.scan(reference)
-        console.log(this.found)
         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()
             const passage = {
                 original: this.found[i],
-                book: this.bookify(book[0].charAt(0).toUpperCase() + book[0].slice(1)),
-                chapter: chapter[0].replace(/[:.]/, "").trim(),
-                verses: this.found[i].match(this.verseRegex)[0].replace(/[:.]/, "").trim(),
+                book: this.bookify(book),
+                chapter: this.chapterify(chapter),
+                verses: verse,
+            }
+
+            if (hasChapterRange) {
+                passage.to = {
+                    book: passage.book,
+                    chapter: this.chapterify(hasChapterRange[0].match(this.chapterRegex)),
+                    verses: hasChapterRange[0].match(this.verseRegex)[0].replace(/[:.]/, "").trim(),
+                }
+                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.testament = this.bible.old.includes(passage.book) ? "old" : "new"
+            passage.scripture = this.scripturize(passage)
             this.passages.push(passage)
         }
+
         this.found = []
         return this.passages
     }
+    chapterify(chapter) {
+        return chapter[0].replace(/[:\.]/, "").trim()
+    }
+
+    /**
+     * Converts a book name to its corresponding full name from the bible.
+     *
+     * @param {string} book - The abbreviated or partial name of the book.
+     * @return {string|undefined} The full name of the book if found, otherwise undefined.
+     */
     bookify(book) {
         let bookified
-
+        book = book[0].charAt(0).toUpperCase() + book[0].slice(1)
         bookified = this.abbrevations[book]
 
         if (!bookified) {
@@ -79,7 +100,7 @@ class CodexParser {
         }
         return bookified
     }
-    //TODO: Need to create a bookfiy function that will convert abbreviated books into full books
+
     /**
      * Returns the passages stored in the object.
      *
@@ -88,6 +109,21 @@ class CodexParser {
     getPassages() {
         return this.passages
     }
+
+    /**
+     * @param {object} passage - A passage object
+     */
+    scripturize(passage) {
+        const { book, chapter, verses, to } = passage
+        const parts = [book, chapter, ":", verses]
+        if (to) {
+            parts.push("-", to.chapter, ":", to.verses)
+        }
+        return parts
+            .join(" ")
+            .replace(/\s+:\s+/g, ":")
+            .trim()
+    }
 }
 
 module.exports = CodexParser

package/src/regex.js

@@ -1,20 +1,15 @@
 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
-const bookAbbrRegex =
-    /(?:(?:[gG]en|[eE]xo|[lL]ev|[nN]um|[dD]eu|[jJ]os|[jJ]dg|[rR]ut|1 [sS]a|2 [sS]a|1 [kK]gs|2 [kK]gs|1 [cC]hr|2 [cC]hr|[eE]zr|[nN]eh|[eE]st|[jJ]ob|[pP]sa|[pP]ro|[eE]cc|[sS]on|[iI]sa|[jJ]er|[lL]am|[eE]ze|[dD]an|[hH]os|[jJ]oe|[aA]mo|[oO]ba|[jJ]on|[mM]ic|[nN]ah|[hH]ab|[zZ]ep|[hH]ag|[zZ]ec|[mM]al|[mM]att|[mM]ar|[lL]uk|[jJ]oh|[aA]ct|[rR]om|1 [cC]or|2 [cC]or|[gG]al|[eE]ph|[pP]hi|[cC]ol|1 [tT]hess|2 [tT]hess|1 [tT]i|2 [tT]i|[tT]it|[pP]hm|[hH]eb|[jJ]am|1 [pP]e|2 [pP]e|1 [jJ]o|2 [jJ]o|3 [jJ]o|[jJ]ud|[rR]ev))/gim
-const chapterRegex = /(?:\s?\d+:?)/g
-const verseRegex = /\b[:|\.]\s*?(\d+(?:,?\s*?\d+?|-|–|—\d+)*)?\d+(?!p|j|k|s|c|t)\b/g
-const chapterRange = /\s?(?:[-|—|–])\s?/g
-const chapterRangeVerseRegex = /./gm
+    /(?:(?:[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
+const chapterRegex = /\b(?:\.?\s?\d+[:|\.]?)\b/gm
+const verseRegex = /\b[:.](\d+(?:,?\s*?\d+?|-|–|—\d+)*)?\d+\b/gm
+const chapterRange = /\s?(?:[-|—|–])\s?/gm
+const chapterRangeVerseRegex = /.\d+/gm
 const scripturesRegex = new RegExp(
-    `(${bookRegex.source})(${chapterRegex.source})?(${verseRegex.source})(${chapterRange.source})?((${chapterRegex.source})?(${verseRegex.source})?)(${chapterRangeVerseRegex.source})?`,
-    "gm"
+    `(${bookRegex.source})(${chapterRegex.source})?(${verseRegex.source})(${chapterRange.source}?)?(${chapterRangeVerseRegex.source})?(${chapterRegex.source})?(${chapterRangeVerseRegex.source})?`,
+    "gmi"
 )
-const abbrScripturesRegex = new RegExp(`(${bookAbbrRegex.source})(${chapterRegex.source})?(${verseRegex.source})`, "gm")
 
 module.exports.bookRegex = bookRegex
-module.exports.bookAbbrRegex = bookAbbrRegex
 module.exports.chapterRegex = chapterRegex
 module.exports.scripturesRegex = scripturesRegex
-module.exports.abbrScripturesRegex = abbrScripturesRegex
 module.exports.verseRegex = verseRegex

package/test.js

@@ -2,8 +2,8 @@ const CodexParser = require("./src/CodexParser.js")
 
 const parser = new CodexParser()
 const text =
-    "The passages that we are looking at tonight are found in 1 John 3:16-17, 1 Peter 1:1, and Romans 10:13, 15, 17. Please turn in your Bibles."
-const single = "psalm 1:1-3"
-parser.parse(single)
-//parser.parse(single)
-console.log(parser.getPassages())
+    "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."
+const single = "Ge 27.27-29,89-40 Heb 11.20"
+const passages = parser.parse(text)
+console.log(passages)
+