codexparser 0.0.80 → 0.0.81

package/package.json

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

@@ -22,6 +22,35 @@ class CodexParser {
         this.EzraAbbrv = EzraAbbrv
         //this.toc = toc
         this.crawler = new crawler()
+        this.preStrings = ["III", "II", "I", "1st", "2nd", "3rd", "First", "Second", "Third", "1", "2", "3"]
+        this.preStringed = [
+            "Sam",
+            "Samuel",
+            "Kings",
+            "Kgs",
+            "Kin",
+            "Chron",
+            "Chronicles",
+            "Corinthians",
+            "Co",
+            "Cor",
+            "Thessalonians",
+            "Th",
+            "Thes",
+            "Thess",
+            "Timothy",
+            "Ti",
+            "Tim",
+            "Peter",
+            "Pe",
+            "Pet",
+            "Pt",
+            "John",
+            "Jn",
+            "Jhn",
+        ]
+
+        this.text = String
     }
 
     /**
@@ -139,13 +168,14 @@ class CodexParser {
             }
             passage.original = result.osis
             passage.scripture = this.scripturize(passage)
+            passage.passages = this.populate(result.entities[0], passage.verses)
             passage.indices = result.indices
-            passage.entities = result.entities
-            if (passage.entities[0].translations) {
+            passage.entities = result.entities[0]
+            if (passage.entities.translations) {
                 passage.version = {
-                    name: passage.entities[0].translations[0].translation,
-                    alias: passage.entities[0].translations[0].alias,
-                    abbreviation: passage.entities[0].translations[0].osis,
+                    name: passage.entities.translations[0].translation,
+                    alias: passage.entities.translations[0].alias,
+                    abbreviation: passage.entities.translations[0].osis,
                 }
             }
             this.passages.push(passage)
@@ -153,6 +183,37 @@ class CodexParser {
         this.found = []
         return this
     }
+
+    populate(entities, verses) {
+        let passages = []
+        for (let i = entities.start.v; i <= entities.end.v; i++) {
+            passages.push({
+                book: entities.start.b,
+                chapter: entities.start.c,
+                verse: i,
+            })
+        }
+
+        if (verses.length > 1) {
+            for (let i = 0; i < verses.length; i++) {
+                const passage = {
+                    book: entities.start.b,
+                    chapter: entities.start.c,
+                    verse: verses[i],
+                }
+                if (
+                    !passages.find(
+                        (p) => p.book === passage.book && p.chapter === passage.chapter && p.verse === passage.verse
+                    )
+                ) {
+                    passages.push(passage)
+                }
+            }
+        }
+
+        return [...new Set(passages)]
+    }
+
     chapterify(chapter) {
         return chapter.start.c
     }
@@ -234,259 +295,14 @@ class CodexParser {
             .trim()
     }
     find(text) {
-        const books = [
-            "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",
-            "Jd.",
-            "Heb.",
-        ]
+        const books = [...Object.keys(this.abbrevations), ...this.bible.new, ...this.bible.old]
 
-        const preStrings = ["III", "II", "I", "1st", "2nd", "3rd", "First", "Second", "Third", "1", "2", "3"]
-        const preStringed = [
-            "Sam",
-            "Samuel",
-            "Kings",
-            "Kgs",
-            "Kin",
-            "Chron",
-            "Chronicles",
-            "Corinthians",
-            "Co",
-            "Cor",
-            "Thessalonians",
-            "Th",
-            "Thes",
-            "Thess",
-            "Timothy",
-            "Ti",
-            "Tim",
-            "Peter",
-            "Pe",
-            "Pet",
-            "Pt",
-            "John",
-            "Jn",
-            "Jhn",
-        ]
         let newText = ""
 
         //add the prestringed versions e.g. 1 Peter
-        for (let b = 0; b < preStringed.length; b++) {
-            for (let pre = 0; pre < preStrings.length; pre++) {
-                books.push(preStrings[pre] + " " + preStringed[b])
+        for (let b = 0; b < this.preStringed.length; b++) {
+            for (let pre = 0; pre < this.preStrings.length; pre++) {
+                books.push(this.preStrings[pre] + " " + this.preStringed[b])
             }
         }
         // add the book name with . at the end as this seems to be added sometimes, at least to the shortened forms
@@ -531,30 +347,67 @@ class CodexParser {
             newText += "<span class='passage'>" + booksAt[b][0]
             let passage = booksAt[b][0]
             chNoInText += booksAt[b][0].length //skip the 'fill-in characters
+            let abbr
+            let index = []
             for (let i = 0; i < 100; i++) {
                 chNoInText++
-                const nextCh = text.charAt(chNoInText)
+                let nextCh = text.charAt(chNoInText)
+                const testStr = text.substring(chNoInText - passage.length, chNoInText + 5).toLowerCase()
+                if (testStr.includes("lxx")) abbr = "lxx"
+                if (testStr.includes("na")) abbr = "na"
+                if (testStr.includes("ubs")) abbr = "ubs"
+                if (testStr.includes("mt")) abbr = "mt"
+                if (testStr.includes("bhs")) abbr = "bhs"
+                if (testStr.includes("lxx")) abbr = "lxx"
+                if (testStr.includes("na")) abbr = "na"
+                if (testStr.includes("ubs")) abbr = "ubs"
+                if (testStr.includes("mt")) abbr = "mt"
+                if (testStr.includes("bhs")) abbr = "bhs"
                 //test whether are at the end of the chapter(s) and verse(s)
-                if (nextCh.match(/^[a-z]+$/) && nextCh !== "f" && nextCh !== "ff") break
+                if (nextCh.match(/^[a-z]+$/) && nextCh !== "f" && nextCh !== "ff" && nextCh !== "a") break
                 if (nextCh.match(/^[A-Z]+$/)) break
                 newText += text.charAt(chNoInText - 1)
                 passage += text.charAt(chNoInText - 1)
+                index.push(chNoInText - 1)
             }
-            this.found.push(passage.trim())
+
+            index = [index[0], index[index.length - 1]]
+            console.log(index)
+            this.found.push(passage.trim() + (abbr ? " " + abbr.toUpperCase() : ""))
             newText += "</span>&nbsp;"
         }
-        console.log(newText)
+        this.text = newText
         return this
     }
 
+    getText() {
+        return this.text
+    }
+
     enhance() {
         if (this.found.length > 0) {
             for (let i = 0; i < this.found.length; i++) {
+                const found = this.found[i]
+                const book = this.bookify(this.found[i].match(this.bookRegex)[0])
+                const passageWithoutBook = found.replace(book, "")
+                let chapter, verse
+                if (/[:\.]/.test(passageWithoutBook)) {
+                    chapter = parseInt(passageWithoutBook.split(":").shift().trim(), 10)
+                    verse = parseInt(passageWithoutBook.split(":").pop().trim(), 10)
+                } else {
+                    if (/\d+/gim.test(passageWithoutBook)) {
+                        chapter = parseInt(passageWithoutBook.trim())
+                        verse = null
+                    }
+                }
+
+                let type = "verseRange"
+
                 const passage = {
                     original: this.found[i],
                     book: this.bookify(this.found[i].match(this.bookRegex)[0]),
                     chapter: this.found[i].match(this.chapterRegex),
-                    verse: this.found[i].match(this.verseRegex)[0],
+                    verse: this.found[i].match(/(?<=[.:])(\d+.+)/)[0],
                 }
                 this.passages.push(passage)
             }

package/src/functions.js

@@ -0,0 +1,6 @@
+const util = require("util")
+const dump = (item) => {
+    console.log(util.inspect(item, { depth: null, colors: true }))
+}
+
+module.exports.dump = dump

package/sub-verse-scripture-test.js

@@ -12,5 +12,5 @@ parser.options({
     single_chapter_1_strategy: "verse",
     sequence_combination_strategy: "combine",
 })
-const result = parser.parse("John 3:1-3")
+const result = parser.parse("Jude 5-7,11 Numbers 14:29-30 Genesis 19:24-25 Genesis 4:3-8 Numbers 31:16 Numbers 16:1-50")
 dump(result.getPassages())

package/tests/abbreviated_verses.js

@@ -0,0 +1,8 @@
+const BibleParser = require("../src/CodexParser.js")
+const dump = require("../src/functions.js").dump
+const parser = new BibleParser()
+const text = "Job 1:1b"
+
+const passages = parser.find(text).enhance()
+
+dump(passages)

package/{bcv-single-test.js → tests/bcv-single-test.js}

@@ -4,7 +4,7 @@ const util = require("util")
 const dump = (item) => {
     console.log(util.inspect(item, { depth: null, colors: true }))
 }
-const text = "Psalm 95:6 MT"
+const text = "John 12:38 John 1:29,34 Isaiah 53:1 Isaiah 6:10 Isaiah 6:1 Isaiah 52:13 Isaiah 6:3 LXX Isaiah 52:13 LXX Isaiah 6:7 Isaiah 53:12 Isaiah 52:13 - 53:12"
 
 const parser = new bcv_parser({
     invalid_sequence_strategy: "include",

package/tests/find.js

@@ -2,6 +2,7 @@ const CodexParser = require("../src/CodexParser.js")
 
 const parser = new CodexParser()
 
-parser.find('1 John 2-3').enhance()
+parser.find('Psalm 2:2-13; 3:2-4 30:5 LXX').enhance()
 
-console.log(parser.getPassages())
+console.log(parser.getPassages())
+console.log(parser.getText())

package/tests/single.js

@@ -0,0 +1,10 @@
+const BibleParser = require("../src/CodexParser.js")
+const dump = require("../src/functions.js").dump
+
+const parser = new BibleParser()
+
+const text = "Job 1:1-5"
+
+const passages = parser.parse(text).getPassages()
+
+dump(passages)