codexparser 0.0.69 → 0.0.72

package/bcv_test.js

@@ -6,7 +6,7 @@ const jd = "Jd. 5"
 const cor = "Hos 1:1-3, 8 Song of Solomon 1:2, Song of Songs 2:2. Ezek 17:3. Ezekiel 17:3 He 10:13 Rev 12:13"
 
 const parser = new bcv_parser()
-const textParser = parser.parse(text + single + jd + cor.replace(/He/, "Hebrews"))
+const textParser = parser.parse("Gen 13:14-16 Clement of Letter to the Romanse, Letter to the Corinthians [51; 77; 111] 10:4-5; Jubilees [14; 43; 46; 118; 175; 179] 13:19-20; Genesis Apocryphon 21:8-10, 13 // Gen 13:15 Gal 3:16; Pseudo-Philo 8:3 Allusions - Jub 19:21-22; QapGn 21:8-10 // Gen 13:15 - Ac 7:5")
 const passages = textParser.parsed_entities()
 
 passages.forEach((passage) => {

package/mcleanTest.js

@@ -0,0 +1,14 @@
+const BibleParser = require("./src/CodexParser.js")
+const util = require("util")
+
+const dump = (item) => {
+    console.log(util.inspect(item, { depth: null, colors: true }))
+}
+
+const parser = new BibleParser()
+
+const text =
+    "Gen 1:1 - Jos Ant 1:27; Just Apol 1:59, 64; Mel Pasc 47; Ph Aet 19; Her 122; Opif 26-27; Theoph 2.10 Allusions Jn 1:1; Heb 11:3; DialSav 127:20; 4Ez 6:38; Mel Pasc 104; Ph QuGen 4:215; Opif 29; Mos 2:266; Plant 86; Praem 1; Sacrif 8; PrMan 2; Prov 8:22; Tat 5"
+
+parser.find(text)
+dump(parser.getPassages())

package/package.json

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

@@ -91,6 +91,20 @@ class CodexParser {
         this.scan(reference)
         for (let i = 0; i < this.found.length; i++) {
             const result = this.found[i]
+            if (!result.entities[0].valid.valid) {
+                continue
+            }
+
+            if (result.type === "range" && result.start.b !== result.end.b) {
+                console.log("=================")
+                const newPassageFound = result.end.b + " " + result.end.c + ":" + result.end.v
+                const newPassageToAdd = this.crawler.parse(newPassageFound).parsed_entities()[0].entities
+                this.found.splice(i + 1, 0, ...newPassageToAdd)
+                result.end.b = result.start.b
+                result.end.c = result.start.c
+                result.end.v = result.start.v
+            }
+
             const passage = {
                 book: this.bookify(result.start.b),
                 chapter: result.start.c,
@@ -106,14 +120,16 @@ class CodexParser {
                     next.start.b === result.end.b &&
                     next.end.c === result.start.c
                 ) {
-                    passage.verses.push(next.start.v)
-                    if (next.end.v !== next.start.v) passage.verses.push(next.end.v)
-                    passage.subType = next.type
+                    if (next.start.v > result.start.v) {
+                        passage.verses.push(next.start.v)
+                        if (next.end.v !== next.start.v) passage.verses.push(next.end.v)
+                        passage.subType = next.type
+                    }
                     i++
                     next = this.found[i + 1]
                 }
             }
-            if (passage.type === "range") {
+            if (passage.type === "range" && passage.book === result.end.b) {
                 if (result.start.c !== result.end.c) {
                     passage.verses = [result.start.v]
                     passage.to = {
@@ -146,7 +162,11 @@ class CodexParser {
     versify(passage) {
         if (passage.start.v !== passage.end.v) {
             if (passage.type === "range") {
-                return [`${passage.start.v}-${passage.end.v}`]
+                if (passage.start.b === passage.end.b) {
+                    return [`${passage.start.v}-${passage.end.v}`]
+                } else {
+                    return [passage.start.v]
+                }
             } else {
                 if (passage.type !== "bc") {
                     const verses = []
@@ -215,16 +235,15 @@ class CodexParser {
             .trim()
     }
     find(text) {
-        const books = [...this.bible.old, ...this.bible.new]
-        const found = []
-        const passages = []
+        const bookNames = this.bookRegex.toString().split("|").slice(8)
+        const books = [...this.bible.old, ...this.bible.new, ...bookNames]
         for (let i = 0; i < books.length; i++) {
             const book = books[i].toLowerCase()
             const index = text.toLowerCase().indexOf(book)
             // Checks to see if the previous character is a colon. If it is, skip.
             // This makes sure that if you have a case like Genesis 1:1 John 1:1, the code knows that
             // the book cannot be 1 John.
-            if (text[index - 1] && text[index - 1].includes(":")) continue
+            if (text[index - 1] && text[index - 1].includes(":") && text[index - 1].match(/[a-zA-Z]/)) continue
 
             // Get the book and chapter
             if (index > -1) {
@@ -236,10 +255,10 @@ class CodexParser {
                 let chapterStartIndex = null
                 let chapterEndIndex = null
                 let j = bookEndIndex + 1
-                while (j < text.length) {
+                while (j < text.length && !text[j].match(/[a-zA-Z]/)) {
                     const match = text.substring(j).match(/^\s*(\d+)/)
                     if (match) {
-                        chapter = match[1]
+                        chapter = parseInt(match[1])
                         chapterStartIndex = j
                         chapterEndIndex = j + match[0].length
                         break
@@ -251,9 +270,8 @@ class CodexParser {
                 let verseStartIndex = null
                 let verseEndIndex = null
                 let verse
-                while (verseIndex < text.length) {
+                while (verseIndex < text.length && !text[verseIndex].match(/[a-zA-Z]/)) {
                     const match = text.substring(verseIndex).match(/^\s*?(\d+)[^a-zA-Z]*/)
-
                     if (match) {
                         verseStartIndex = verseIndex
                         verseEndIndex = verseIndex + match[0].length
@@ -269,14 +287,15 @@ class CodexParser {
                 passage.index = {
                     start: index,
                 }
-                found.push(passage)
+                this.passages.push(passage)
             }
         }
-        return found
+        return this
     }
 
     regex(text) {
         this.found = text.match(this.scripturesRegex)
+        console.log(this.found)
         return this
     }
 
@@ -339,7 +358,7 @@ class CodexParser {
             this.passages.push(passage)
         }
 
-        this.found = []
+        this.found = this.passages.map((passage) => passage.scripture)
         return this
     }
 }

package/src/regex.js

@@ -1,5 +1,5 @@
 const bookRegex =
-    /((?:(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
+    /((?:(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|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

package/sub-verse-scripture-test.js

@@ -11,5 +11,5 @@ parser.options({
     invalid_sequence_strategy: "include",
     single_chapter_1_strategy: "verse",
 })
-const result = parser.parse("Ex 9.16 LXX")
+const result = parser.parse("2Cor 4:6; 4Ez 6:40")
 dump(result.getPassages())