codexparser 0.0.49 → 0.0.50

package/all-scripture-test.js

@@ -1,13 +1,18 @@
 const CodexParser = require("./src/CodexParser.js")
+const util = require("util")
+
+const dump = (item) => {
+    console.log(util.inspect(item, { depth: null, colors: true }))
+}
 
 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"
 const jd = "Jd. 5"
-const cor = "Song of Solomon 1:2, Song of Songs 2:2. Ezek 17:3.  He 12:13-15 Hos 1:1-3, 8 "
-const passages = parser.parse(single + " " + text + " " + jd + " " + cor)
+const cor = "1 Cor 12:4 2 Cor 3:4"
+const noSpace = "Re13.8"
+const passages = parser.parse(text)
 passages.getPassages().forEach((passage) => {
-    console.log(passage)
+    dump(passage)
 })
-//const passages = parser.parse('Romans 8:9,12,15,17,20,28')

package/bcv-single-test.js

@@ -0,0 +1,9 @@
+const bcv_parser = require("bible-passage-reference-parser/js/en_bcv_parser").bcv_parser
+const text = "Revelation 3:5; 7:14; 12:7; 13:8; 16:18; 20:1-6"
+
+const parser = new bcv_parser()
+const textParser = parser.parse(text)
+const passages = textParser.parsed_entities()
+passages.forEach((passage) => {
+    console.log(passage)
+})

package/chapter-range-test.js

@@ -1,5 +1,5 @@
 const BibleParser = require("./src/CodexParser.js")
-const string = "Psalms 113-118"
+const string = "Revelation 3:5; 7:14; 12:7; 13:8; 16:18; 20:1-6"
 const parser = new BibleParser()
 const passages = parser.parse(string)
-console.log(passages.getPassages()[0])
+//console.log(passages.getPassages())

package/package.json

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

@@ -3,6 +3,11 @@ const { bookRegex, chapterRegex, verseRegex, scripturesRegex } = require("./rege
 const abbrevations = require("./abbr")
 const toc = require("./toc")
 const crawler = require("bible-passage-reference-parser/js/en_bcv_parser").bcv_parser
+const util = require("util")
+
+const dump = (item) => {
+    console.log(util.inspect(item, { depth: null, colors: true }))
+}
 
 class CodexParser {
     constructor() {
@@ -47,6 +52,7 @@ class CodexParser {
             text = text.substring(0, match.index) + match.book + text.substring(match.index + match.abbr.length)
         }
         const passages = this.crawler.parse(text).parsed_entities()
+
         for (let j = 0; j < passages.length; j++) {
             const passage = passages[j]
             for (let i = 0; i < passage.entities.length; i++) {
@@ -74,99 +80,48 @@ class CodexParser {
             books.push(this.found[i].start.b)
         }
         const uniqueBooks = [...new Set(books)]
-        const booksWithResults = []
 
+        const booksWithResults = []
         for (const book of uniqueBooks) {
             const found = this.found.filter((passage) => passage.start.b === book)
             booksWithResults.push(found)
         }
+
         for (let i = 0; i < booksWithResults.length; i++) {
-            const initialPassage = booksWithResults[i].shift()
-            const shouldBeRange = initialPassage.osis.match(/[-–—]/)
-            if (shouldBeRange && initialPassage.type !== "range") {
-                if (initialPassage.end.v - initialPassage.start.v > 1) {
-                    initialPassage.type = "range"
+            const results = booksWithResults[i]
+            for (let j = 0; j < results.length; j++) {
+                const result = results[j]
+                const passage = {
+                    book: this.bookify(result.start.b),
+                    chapter: result.start.c,
+                    verses: this.versify(result),
+                    type: result.type,
                 }
-            }
-            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.end.v],
-                    }
-                } else {
-                    firstPassage.verses = [initialPassage.start.v + "-" + initialPassage.end.v]
+                let next = results[j + 1]
+                while (next && next.type === "integer" && next.end.c === result.start.c) {
+                    passage.verses.push(next.start.v)
+                    passage.subType = next.type
+                    j++
+                    next = results[j + 1]
                 }
-            } 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)
+                if (passage.type === "range") {
+                    if (result.start.c !== result.end.c) {
+                        passage.verses = [result.start.v]
+                        passage.to = {
+                            book: this.bookify(result.end.b),
+                            chapter: result.end.c,
+                            verses: result.end.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]
                     }
-                    subPassage.testament = this.bible.old.includes(subPassage.book) ? "old" : "new"
-                    this.passages.push(subPassage)
                 }
+                passage.original = result.osis
+                passage.scripture = this.scripturize(passage)
+                passage.indices = result.indices
+                passage.entities = result.entities
+                this.passages.push(passage)
             }
-            firstPassage.testament = this.bible.old.includes(firstPassage.book) ? "old" : "new"
-            this.passages.push(firstPassage)
-            //console.log(this.passages)
         }
+        this.passages.sort((a, b) => a.chapter - b.chapter)
         this.found = []
         return this
     }
@@ -176,10 +131,24 @@ class CodexParser {
         }
     }
 
-    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]
+    versify(passage) {
+        if (passage.start.v !== passage.end.v) {
+            if (passage.type === "range") {
+                return [`${passage.start.v}-${passage.end.v}`]
+            } else {
+                if (passage.end.v - passage.start.v > 1) {
+                    const verses = []
+                    for (let i = passage.start.v; i <= passage.end.v; i++) {
+                        verses.push(i)
+                    }
+                    return verses
+                } else {
+                    return [passage.start.v, passage.end.v]
+                }
+            }
+        } else {
+            return [passage.start.v]
+        }
     }
 
     /**
@@ -224,7 +193,6 @@ 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/sub-verse-scripture-test.js

@@ -1,5 +1,10 @@
 const BibleParser = require("./src/CodexParser.js")
-const string = "Romans 9:32 Romans 9:33"
+const util = require("util")
+
+const dump = (item) => {
+    console.log(util.inspect(item, { depth: null, colors: true }))
+}
+const string = "Revelation 1:2, 12:8, 13:3-5, 14:2, 4, 6, 8"
 const parser = new BibleParser()
 const result = parser.parse(string)
-console.log(result.getPassages())
+dump(result.getPassages())