codexparser 0.0.46 → 0.0.47

package/all-scripture-test.js

@@ -2,12 +2,21 @@ 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,32-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,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)
-passages.getPassages().forEach(passage => {
-    console.log(passage)    
-})
-//const passages = parser.parse('Romans 8:9,12,15,17,20,28')
+const cor = "1 Cor 12:34 2 Cor 3:4"
+const noSpace = 'Re13.8'
+const passages = parser.parse(single)
+console.log(passages)
+
+const jude = parser.parse(jd)
+console.log(jude)
+const textParser = parser.parse(cor)
+console.log(textParser)
+
+const fullText = parser.parse(text)
+console.log(fullText)
+
+const noSpaceText = parser.parse(noSpace)
+console.log(noSpaceText)

package/chapter-range-test.js

@@ -0,0 +1,5 @@
+const BibleParser = require("./src/CodexParser.js")
+const string = "Psalms 113-118"
+const parser = new BibleParser()
+const passages = parser.parse(string)
+console.log(passages.getPassages()[0])

package/package.json

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

@@ -80,7 +80,7 @@ class CodexParser {
             const found = this.found.filter((passage) => passage.start.b === book)
             booksWithResults.push(found)
         }
-        //console.log(booksWithResults)
+        console.log(booksWithResults[0][0])
         for (let i = 0; i < booksWithResults.length; i++) {
             const initialPassage = booksWithResults[i].shift()
             const shouldBeRange = initialPassage.osis.match(/[-–—]/)
@@ -102,7 +102,7 @@ class CodexParser {
                     firstPassage.to = {
                         book: this.bookify(initialPassage.end.b),
                         chapter: initialPassage.end.c,
-                        verses: [initialPassage.start.v],
+                        verses: [initialPassage.end.v],
                     }
                 } else {
                     firstPassage.verses = [initialPassage.start.v + "-" + initialPassage.end.v]

package/src/regex.js

@@ -4,7 +4,7 @@ const verseRegex =  /\b[:.].+\b/gm
 const chapterRange = /.?\s?(?:[-—–])\s?/gm
 const chapterRangeVerseRegex = /(?:.\d+)?/gm
 const chapterVerseRange =
-    /.?\s?(?:\d+[:.])?\d+[a-e]?(?:(?:\s?[-–—]|,)(?!\s[1-3]\s+[A-Z])\s?(?:\d+[:.])?\d+[a-e]?)*/gim
+    /.?\s?\d+((?:[:.]\d+)?(\s?[-–—]\s?)?(?:\d+)(?:(,\s?\d+)*)?\S([:.]?\d+)?(,\s?\d+[–—-]\s?\d+)?)?(?:[:.]\d+)?(?:[abcde])?(?:,\d+)*(?:[-–—]\d?\s?)?/gim
 const scripturesRegex = new RegExp(`(${bookRegex.source})(${chapterVerseRange.source})`, "gmi")
 module.exports.bookRegex = bookRegex
 module.exports.chapterRegex = chapterRegex