codexparser 0.0.33 → 0.0.35

package/all-scripture-test.js

@@ -2,19 +2,9 @@ const CodexParser = require("./src/CodexParser.js")
 
 const parser = new CodexParser()
 const 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"
-const single = "Ge 27.27-29,89-40 Heb 11.20 Heb. 12.17 Jonah 3"
+    "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"
+const single = "Ge 27.27-29,32-40 Heb 11.20 Heb. 12.17 Jonah 3"
 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"
-const passages = parser.parse(single)
-console.log(passages)
-
-const jude = parser.parse(jd)
-console.log(jude)
-
-
-const fullText = parser.parse(text)
-console.log(fullText)
-
-const textParser = parser.parse(cor)
-console.log(textParser)
+const passages = parser.parse(single + " " + text + " " + jd + " " + cor)
+//const passages = parser.parse('Romans 8:9,12,15,17,20,28')

package/bcv_test.js

@@ -0,0 +1,14 @@
+const bcv_parser = require("bible-passage-reference-parser/js/en_bcv_parser").bcv_parser
+const 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"
+const single = "Ge 27.27-29,89-40 Heb 11.20 Heb. 12.17 Jonah 3"
+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"
+
+const parser = new bcv_parser()
+const textParser = parser.parse(text + single + jd + cor)
+const passages = textParser.parsed_entities()
+
+passages.forEach((passage) => {
+    console.log(passage.entities)
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexparser",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "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": {
@@ -20,5 +20,8 @@
     "path": "^0.12.7",
     "webpack": "^5.90.3",
     "webpack-cli": "^5.1.4"
+  },
+  "dependencies": {
+    "bible-passage-reference-parser": "^2.0.1"
   }
 }

package/passage-generator.js

@@ -0,0 +1,25 @@
+function generateScriptureCombinations(book, chapters, versesPerChapter) {
+    let scriptureCombinations = []
+
+    for (let chapter = 1; chapter <= chapters; chapter++) {
+        for (let verse = 1; verse <= versesPerChapter[chapter - 1]; verse++) {
+            // Single verse
+            scriptureCombinations.push(`${book} ${chapter}:${verse}`)
+            // Verse ranges within a chapter
+            for (let endVerse = verse + 1; endVerse <= versesPerChapter[chapter - 1]; endVerse++) {
+                scriptureCombinations.push(`${book} ${chapter}:${verse}-${endVerse}`)
+            }
+        }
+        // Chapter ranges
+        for (let endChapter = chapter + 1; endChapter <= chapters; endChapter++) {
+            scriptureCombinations.push(`${book} ${chapter}:${versesPerChapter[chapter - 1]}-${endChapter}:1`)
+        }
+    }
+
+    return scriptureCombinations
+}
+
+// Example usage for the book of Genesis (assuming 50 chapters and a fixed number of verses per chapter for simplicity)
+const genesisVersesPerChapter = new Array(50).fill(30) // Replace with actual verse count per chapter
+const genesisCombinations = generateScriptureCombinations("Genesis", 50, genesisVersesPerChapter)
+console.log(genesisCombinations.join(", "))

package/src/CodexParser.js

@@ -2,6 +2,7 @@ const bible = require("./bible")
 const { bookRegex, chapterRegex, verseRegex, scripturesRegex } = require("./regex")
 const abbrevations = require("./abbr")
 const toc = require("./toc")
+const crawler = require("bible-passage-reference-parser/js/en_bcv_parser").bcv_parser
 
 class CodexParser {
     constructor() {
@@ -14,6 +15,9 @@ class CodexParser {
         this.scripturesRegex = scripturesRegex
         this.abbrevations = abbrevations
         this.toc = toc
+        this.crawler = new crawler({
+            sequence_combination_strategy: "separate",
+        })
     }
 
     /**
@@ -23,16 +27,8 @@ 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)
-        }
-        return this.found
+        const passages = this.crawler.parse(text).parsed_entities()
+        this.found.push(...passages.flatMap((passage) => passage.entities))
     }
 
     /**
@@ -43,11 +39,104 @@ class CodexParser {
      */
     parse(reference) {
         if (!reference) {
-            return null // return null if no reference is provided
+            throw new Error("Parse error (parse(), line 46): reference is undefined")
         }
         this.passages = []
         this.scan(reference)
+        const books = []
         for (let i = 0; i < this.found.length; i++) {
+            books.push(this.found[i].start.b)
+        }
+        const uniqueBooks = [...new Set(books)]
+        const booksWithResults = []
+        //TODO: Need to loop through and create an array of all the same passage
+        // in order to be able to identify if comma separated verses goes with it or not.
+        for (const book of uniqueBooks) {
+            const found = this.found.filter((passage) => passage.start.b === book)
+            booksWithResults.push(found)
+        }
+        //console.log(booksWithResults)
+        for (let i = 0; i < booksWithResults.length; i++) {
+            const initialPassage = booksWithResults[i].shift()
+            const firstPassage = {
+                original: initialPassage.osis,
+                book: this.bookify(initialPassage.start.b),
+                chapter: initialPassage.start.c,
+                type: initialPassage.type,
+                entities: initialPassage.entities,
+            }
+            if (initialPassage.type === "range") {
+                if (initialPassage.start.c !== initialPassage.end.c) {
+                    firstPassage.verses = [initialPassage.start.v]
+                    firstPassage.to = {
+                        book: this.bookify(initialPassage.end.b),
+                        chapter: initialPassage.end.c,
+                        verses: [initialPassage.start.v],
+                    }
+                } else {
+                    firstPassage.verses = [initialPassage.start.v + "-" + initialPassage.end.v]
+                }
+            } else {
+                firstPassage.verses =
+                    initialPassage.start.v !== initialPassage.end.v
+                        ? [initialPassage.start.v, initialPassage.end.v]
+                        : [initialPassage.start.v]
+            }
+            for (let j = 0; j < booksWithResults[i].length; j++) {
+                const passage = booksWithResults[i][j]
+                if (passage.type === "integer") {
+                    if (firstPassage.type === "range") {
+                        if (passage.start.c !== passage.end.c) {
+                            firstPassage.to.verses.push(passage.start.v)
+                        } else {
+                            firstPassage.verses.push(passage.start.v)
+                        }
+                        firstPassage.original += ", " + passage.start.v
+                    } else {
+                        if (passage.start.v !== passage.end.v) {
+                            firstPassage.verses.push(passage.start.v)
+                            firstPassage.verses.push(passage.end.v)
+                            firstPassage.original += ", " + passage.start.v + ", " + passage.end.v
+                        } else {
+                            firstPassage.verses.push(passage.start.v)
+                            firstPassage.original += ", " + passage.start.v
+                        }
+                    }
+                } else if (passage.type === "range") {
+                    if (firstPassage.chapter === passage.start.c) {
+                        firstPassage.verses.push(passage.start.v + "-" + passage.end.v)
+                    }
+                } else {
+                    const subPassage = {
+                        original: passage.osis,
+                        book: this.bookify(passage.start.b),
+                        chapter: passage.start.c,
+                        type: passage.type,
+                        entities: passage.entities,
+                    }
+                    if (passage.type === "range") {
+                        if (passage.start.c !== passage.end.c) {
+                            subPassage.to = {
+                                book: this.bookify(passage.end.b),
+                                chapter: passage.end.c,
+                                verses: [passage.end.v],
+                            }
+                        } else {
+                            subPassage.verses =
+                                passage.start.v !== passage.end.v ? [passage.start.v, passage.end.v] : [passage.start.v]
+                        }
+                    } else {
+                        subPassage.verses =
+                            passage.start.v !== passage.end.v ? [passage.start.v, passage.end.v] : [passage.start.v]
+                    }
+                    this.passages.push(subPassage)
+                }
+            }
+            this.passages.push(firstPassage)
+            //console.log(this.passages)
+        }
+        //console.log(booksWithResults)
+        /* 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)
             if (book === null) continue
@@ -63,7 +152,6 @@ class CodexParser {
                     verse = []
                 }
             }
-            console.log(verse)
             const passage = {
                 original: this.found[i].replace(/([.,])\1*$/, "").trim(),
                 book: this.bookify(book),
@@ -90,10 +178,18 @@ class CodexParser {
         }
 
         this.found = []
-        return this.passages
+        return this.passages */
     }
     chapterify(chapter) {
-        return chapter[0].replace(/[:\.]/, "").trim()
+        if (chapter.type === "range") {
+            return `${chapter.start.c} - ${chapter.end}`
+        }
+    }
+
+    versify(passage, type) {
+        if (type !== "range")
+            return passage.start.v !== passage.end.v ? [passage.start.v, passage.end.v] : [passage.start.v]
+        else return [passage.start.v + "-" + passage.end.v]
     }
 
     /**
@@ -103,10 +199,11 @@ class CodexParser {
      * @return {string|undefined} The full name of the book if found, otherwise undefined.
      */
     bookify(book) {
+        if(typeof book !== "string") {
+            book = book[0]
+        }
         let bookified
-        book = book[0].charAt(0).toUpperCase() + book[0].slice(1)
         bookified = this.abbrevations[book]
-        
         if (!bookified) {
             bookified = this.bible.new.find(
                 (b) =>
@@ -137,6 +234,7 @@ class CodexParser {
      * @param {object} passage - A passage object
      */
     scripturize(passage) {
+        console.log(passage)
         const { book, chapter, verses, to } = passage
         const colon = verses.length !== 0 ? ":" : ""
         const parts = [book, chapter, colon, verses]

package/src/abbr.js

@@ -81,7 +81,6 @@ const abbrevations = {
     "II Ch": "2 Chronicles",
     Ezra: "Ezra",
     Ezr: "Ezra",
-    Ez: "Ezra",
     Neh: "Nehemiah",
     Ne: "Nehemiah",
     Esth: "Esther",
@@ -263,7 +262,6 @@ const abbrevations = {
     "1K": "1 Corinthians",
     "2K": "2 Corinthians",
     G: "Galatians",
-    E: "Ephesians",
     Ph: "Philippians",
     Kol: "Colossians",
     "1Th": "1 Thessalonians",

package/src/regex.js

@@ -1,10 +1,10 @@
-const bookRegex = /(?:(I+|1st|2nd|3rd|First|Second|Third|[123])\s)?(Gen|Ge|Gn|Exo|Ex|Exod|Lev|Le|Lv|Num|Nu|Nm|Nb|Deut|Dt|Josh|Jos|Jsh|Judg|Jdg|Jg|Jdgs|Rth|Ru|Sam|Samuel|Kings|Kgs|Kin|Chron|Chronicles|Ezra|Ezr|Neh|Ne|Esth|Es|Job|Job|Jb|Pslm|Ps|Psalms|Psa|Psm|Pss|Prov|Pr|Prv|Eccles|Ec|Song|So|Canticles|Song of Songs|SOS|Song of Solomon|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|Mt|Mrk|Mk|Mr|Luk|Lk|John|Jn|Jhn|Acts|Ac|Rom|Ro|Rm|Co|Cor|Corinthians|Gal|Ga|Ephes|Eph|Phil|Php|Col|Col|Th|Thes|Thess|Thessalonians|Ti|Tim|Timothy|Titus|Tit|Philem|Phm|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|Colossians|Thessalonians|Timothy|Titus|Philemon|Hebrews|James|Peter|John|Revelation|Re|Ap)/gmi
+const bookRegex = /((?:(I+|1st|2nd|3rd|First|Second|Third|[123])\s)?(Gen|Ge|Gn|Exo|Ex|Exod|Lev|Le|Lv|Num|Nu|Nm|Nb|Deut|Dt|Josh|Jos|Jsh|Judg|Jdg|Jg|Jdgs|Rth|Ru|Sam|Samuel|Kings|Kgs|Kin|Chron|Chronicles|Ezra|Ezr|Ez|Neh|Ne|Esth|Es|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|Mt|Mrk|Mk|Mr|Luk|Lk|John|Jn|Jhn|Acts|Ac|Rom|Ro|Rm|Co|Cor|Corinthians|Gal|Ga|Ephes|Eph|Phil|Php|Col|Col|Th|Thes|Thess|Thessalonians|Ti|Tim|Timothy|Titus|Tit|Philem|Phm|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|Colossians|Thessalonians|Timothy|Titus|Philemon|Hebrews|James|Peter|John|Revelation|Re|Ap))/gmi
 const chapterRegex = /\b(?:\.?\s?\d+[:|\.]?)\b/gm
-const verseRegex = /\b[:.](\d+(?:,?\s*?\d+?|-|–|—\d+)*)?\d+(?:[abcde])?(?:,\d+)*(?:,\s?\d+)?\b/gm
+const verseRegex =  /\b[:.].+\b/gm
 const chapterRange = /.?\s?(?:[-—–])\s?/gm
 const chapterRangeVerseRegex = /(?:.\d+)?/gm
 const chapterVerseRange =
-    /(.?\s?\d+((?:[:.]\d+)?(\s?[-–—]\s?)?(?:\d+)(?:(,\s?\d+)*)?([:.]?\d+)?(,?\s?\d+[–—-]\s?\d+,?\d+)?)?(?:[:.]\d+)?(?:[abcde])?(?:,\d+)*(?:[-–—]\d?\s?)?)(?:[:.]\d+[–-—]\s?\d+,?\s?\d+)?(?:(\d+)?,\s?\d+)?/gim
+    /.?(?:\d+)((?:[:.])(?:(\d+)?)(?:(,\s?\d+)*)?(?:\s?[-–—]\s?\d+)?(?:,\s?\d+(?:\s?[-–—]\s?\d+)?)?(?:[:.]\d+)?)?/gim
 const scripturesRegex = new RegExp(`(${bookRegex.source})(${chapterVerseRange.source})`, "gmi")
 module.exports.bookRegex = bookRegex
 module.exports.chapterRegex = chapterRegex

package/sub-verse-scripture-test.js

@@ -1,5 +1,6 @@
 const CodexParser = require("./src/CodexParser.js")
 
 const parser = new CodexParser()
-const text = parser.parse("Joel 2:10, 11")
-console.log(text)
+const scripture = "Hos 1:1-3, 8"
+console.log(scripture)
+parser.parse(`${scripture}. Please turn in your Bibles.`)