codexparser 0.0.61 → 0.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexparser",
-  "version": "0.0.61",
+  "version": "0.0.62",
   "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/regex-tester.js

@@ -1,8 +1,13 @@
 const CodexParser = require("./src/CodexParser")
+const util = require("util")
+
+const dump = (item) => {
+    console.log(util.inspect(item, { depth: null, colors: true }))
+}
 
 const parser = new CodexParser()
 const passage = "jer 9.24 1 cor 1.31 Jd 1"
-let text = `Joel 10:13 The passages Luke 2:32 and Lk 1:23 that we are looking at tonight 1 Cor 12:34 2 Cor 3:4 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. Ps 109:4,5,6,8.  Isaiah 61.2-3 Mt 5.4
+let text = `Joel 10:13 The passages Luke 2:32 and Lk 1:23 that we are looking at tonight 1 Cor 12:34 2 Cor 3:4 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. Ps 109:4,5,6,8.  Isaiah 61.2-3 Mt 5.4
 
 Ge 27.27-29,89-40 Heb 11.20 Heb. 12.17 Jonah 3
 
@@ -15,13 +20,13 @@ Leviticus 16:6 He 5.3 He 7.27
 
 Hos 10:1-3, 8 and 1 John 2:23
 
-exod15.18. 2 Cor 12:23 Malachi 3:32 Hebrews 9:20; 10:29; 13:20 `
+exod15.18. 2 Cor 12:23 Malachi 3:32 Hebrews 9:20; 10:29; 13:20 2 Kings 4:8,17-37`
 
 const philemon = "Phlm 1    Phlm 1:2    Philemon 1:3    Phil 2:3  Phile 7"
 
 const ez = "Ezekiel 12:3 Ezek 1:2 Ezk 2:2 Ezra 1:1 Ezr 1:2 Ez 3:4-5"
 
-const noSpace = "1pet2.6"
+const noSpace = "1 Thess 2.15-16"
 
-parser.regex("1sam1:1").regexParser()
-console.log(parser.getPassages())
+parser.regex(text).regexParser()
+dump(parser.getPassages())

package/src/CodexParser.js

@@ -273,7 +273,6 @@ class CodexParser {
 
     regex(text) {
         this.found = text.match(this.scripturesRegex)
-        console.log(this.found)
         return this
     }
 
@@ -283,7 +282,6 @@ class CodexParser {
             let verse, chapter
             const hasChapterRange = this.found[i].match(/(?<=-\s?)\b\d+[.:].+\b/)
             const book = this.found[i].match(this.bookRegex)
-            console.log("Book that is found is ", book, this.bookify(book))
             if (book === null) continue
             chapter = this.found[i].replace(book[0], "").match(this.chapterRegex)
 
@@ -300,8 +298,12 @@ class CodexParser {
                 verse = this.found[i].split(" ")[1]
                 chapter = "1"
             } else {
-                if (this.found[i].match(this.verseRegex))
+                if (this.found[i].match(this.verseRegex) && !hasChapterRange)
                     verse = this.found[i].match(this.verseRegex)[0].replace(/[:.]/, "").trim()
+                else if (this.found[i].match(this.verseRegex) && hasChapterRange)
+                    verse = this.found[i].match(this.verseRegex)
+                        ? this.found[i].match(this.verseRegex)[0].split("-")[0].trim()
+                        : ["Empty"]
             }
             if (!verse && this.found[i].match(/\d+/)) {
                 chapter = this.found[i].match(/\d+/)[0]
@@ -317,8 +319,8 @@ class CodexParser {
             if (hasChapterRange) {
                 passage.to = {
                     book: passage.book,
-                    chapter: hasChapterRange[0].match(this.chapterRegex),
-                    verses: hasChapterRange[0].match(this.verseRegex)[0].replace(/[:.]/, "").trim(),
+                    chapter: hasChapterRange[0].match(this.chapterRegex)[0],
+                    verses: hasChapterRange[0].match(this.verseRegex)[0],
                 }
                 passage.to.verses = passage.to.verses.split(/,/).filter(Boolean)
                 passage.to.testament = this.bible.old.includes(passage.to.book) ? "old" : "new"

package/src/abbr.js

@@ -161,6 +161,7 @@ const abbrevations = {
     Matt: "Matthew",
     Mt: "Matthew",
     Mark: "Mark",
+    Mc: "Mark",
     Mrk: "Mark",
     Mar: "Mark",
     Mk: "Mark",
@@ -208,13 +209,16 @@ const abbrevations = {
     Co: "Colossians",
     "1Thess": "1 Thessalonians",
     "1 Thess": "1 Thessalonians",
+    "1Thes": "1 Thessalonians",
+    "1 Thes": "1 Thessalonians",
     "1 Th": "1 Thessalonians",
     "1Th": "1 Thessalonians",
     "2Thess": "2 Thessalonians",
     "2 Thess": "2 Thessalonians",
+    "2Thes": "2 Thessalonians",
+    "2 Thes": "2 Thessalonians",
     "2 Th": "2 Thessalonians",
     "2Th": "2 Thessalonians",
-    "2Thess": "2 Thessalonians",
     "1Tim": "1 Timothy",
     "1 Ti": "1 Timothy",
     "1 Tm": "1 Timothy",
@@ -231,6 +235,7 @@ const abbrevations = {
     Ti: "Titus",
     Phlm: "Philemon",
     Phm: "Philemon",
+    Philem: "Philemon",
     Hebr: "Hebrews",
     Heb: "Hebrews",
     He: "Hebrews",

package/src/regex.js

@@ -1,12 +1,12 @@
 const bookRegex =
-    /((?:(I+|1st|2nd|3rd|First|Second|Third|[123])\s?)?(Gen|Gn|Exo|Ex|Exod|Lev|Lv|Num|Nu|Nm|Nb|Deut|Dt|Josh|Jos|Jsh|Judg|Jdg|Jg|Jdgs|Rth|Ru|Sam|Samuel|Kings|Kgs|Chron|Chronicles|Ezra|Ezr|Neh|Ne|Esth|Job|Job|Jb|Pslm|Ps|Psalms|Psa|Psm|Pss|Prov|Pr|Prv|Eccles|Ec|Song|So|Canticles|Song of Songs|SOS|Isa|Is|Jer|Je|Jr|Lam|La|Ezek|Eze|Ezk|Dan|Da|Dn|Hos|Ho|Joel|Joe|Jl|Amos|Am|Obad|Ob|Jnh|Jon|Micah|Mic|Nah|Na|Hab|Zeph|Zep|Zp|Haggai|Hag|Hg|Zech|Zec|Zc|Mal|Mal|Ml|Matt|Mrk|Mk|Luk|Lk|John|Jn|Jhn|Acts|Ac|Rom|Ro|Rm|Co|Cor|Corinthians|Gal|Ga|Ephes|Eph|Php|Col|Col|Thes|Thess|Thessalonians|Ti|Tim|Timothy|Titus|Tit|Philem|Phm|Phlm|Phile|Hebrews|Heb|He|James|Jas|Jm|Pe|Pet|Pt|Peter|Jn|Jo|Joh|Jhn|John|Jude|Jd|Jud|Jud|Rev|The Revelation|Genesis|Exodus|Leviticus|Numbers|Deuteronomy|Joshua|Judges|Ruth|Samuel|Kings|Chronicles|Ezra|Nehemiah|Esther|Job|Psalms|Psalm|Proverbs|Ecclesiastes|Song of Solomon|Isaiah|Jeremiah|Lamentations|Ezekiel|Daniel|Hosea|Joel|Amos|Obadiah|Jonah|Micah|Nahum|Habakkuk|Zephaniah|Haggai|Zechariah|Malachi|Matthew|Mark|Luke|John|Acts|Romans|Corinthians|Galatians|Ephesians|Philippians|Phil|Colossians|Thessalonians|Timothy|Titus|Philemon|Hebrews|James|Peter|John|Revelation|Re|Ap))/gim
+    /((?:(I+|1st|2nd|3rd|First|Second|Third|[123])\s?)?(Gen|Ge|Gn|Exo|Ex|Exod|Lev|Lv|Num|Nu|Nm|Nb|Deut|Dt|Josh|Jos|Jsh|Judg|Jdg|Jg|Jdgs|Rth|Ru|Sam|Samuel|Kings|Kgs|Chron|Chronicles|Ezra|Ezr|Neh|Ne|Esth|Job|Job|Jb|Pslm|Ps|Psalms|Psa|Psm|Pss|Prov|Pr|Prv|Eccles|Ec|Song|So|Canticles|Song of Songs|SOS|Isa|Is|Jer|Je|Jr|Lam|La|Ezek|Eze|Ezk|Dan|Da|Dn|Hos|Ho|Joel|Joe|Jl|Amos|Am|Obad|Ob|Jnh|Jon|Micah|Mic|Nah|Na|Hab|Zeph|Zep|Zp|Haggai|Hag|Hg|Zech|Zec|Zc|Mal|Mal|Ml|Matt|Mrk|Mk|Luk|Lk|John|Jn|Jhn|Acts|Ac|Rom|Ro|Rm|Co|Cor|Corinthians|Gal|Ga|Ephes|Eph|Php|Col|Col|Thes|Thess|Thessalonians|Ti|Tim|Timothy|Titus|Tit|Philem|Phm|Phlm|Phile|Hebrews|Heb|He|James|Jas|Jm|Pe|Pet|Pt|Peter|Jn|Jo|Joh|Jhn|John|Jude|Jd|Jud|Jud|Rev|The Revelation|Genesis|Exodus|Leviticus|Numbers|Deuteronomy|Joshua|Judges|Ruth|Samuel|Kings|Chronicles|Ezra|Nehemiah|Esther|Job|Psalms|Psalm|Proverbs|Ecclesiastes|Song of Solomon|Isaiah|Jeremiah|Lamentations|Ezekiel|Daniel|Hosea|Joel|Amos|Obadiah|Jonah|Micah|Nahum|Habakkuk|Zephaniah|Haggai|Zechariah|Malachi|Matthew|Matt|Mt|Mc|Mark|Luke|John|Acts|Romans|Corinthians|Galatians|Ephesians|Philippians|Phil|Colossians|Thessalonians|Timothy|Titus|Philemon|Hebrews|James|Peter|John|Revelation|Re|Ap))/gim
 const EzraAbbrv = /(Ez)(?![a-zA-Z])/gim
 const chapterRegex = /(\d+)(?=[:.])/gim
 const verseRegex = /(?<=[:.])[\d: .\-]+(?:, ?[\d\-]+)*(?<![ .])/gim
 const chapterRange = /.?\s?(?:[-—–])\s?/gm
 const chapterRangeVerseRegex = /(?:.\d+)?/gm
 const chapterVerseRange =
-    /(.?\s?\d+((?:[:.]\d+)?(\s?[-–—]\s?)?(?:\d+)(?:(,\s?\d+)*)?\S([:.]?\d+)?(,?\s?\d+[–—-]\s?\d+,?\d+)?)?(?:[:.]\d+)?(?:[abcde])?(?:,\d+)*(?:[-–—]\d?\s?)?)(?:[:.]\d+[–-—]\s?\d+,?\s?\d+)?/gim
+    /(.?\s?\d+((?:[:.]\d+)?(\s?[-–—]\s?)?(?:\d+)(?:(,\s?\d+)*)?\S([:.]?\d+)?(,?\s?\d+[–—-]\s?\d+,?\d+)?)?(?:[:.]\d+)?(?:[abcde])?(?:,\s?\d+)*(?:[-–—]\d?\s?)?)(?:[:.]\d+[–-—]\s?\d+,?\s?\d+)?/gim
 const scripturesRegex = new RegExp(`(${bookRegex.source}|${EzraAbbrv.source})(${chapterVerseRange.source})`, "gmi")
 module.exports.bookRegex = new RegExp(`(${bookRegex.source}|${EzraAbbrv.source})`, "gmi") // bookRegex
 module.exports.chapterRegex = chapterRegex