codexparser 0.0.79 → 0.0.80

package/bcv-single-test.js

@@ -4,11 +4,12 @@ const util = require("util")
 const dump = (item) => {
     console.log(util.inspect(item, { depth: null, colors: true }))
 }
-const text = "Psalm 34:12f"
+const text = "Psalm 95:6 MT"
 
 const parser = new bcv_parser({
     invalid_sequence_strategy: "include",
     invalid_passage_strategy: "include",
+    sequence_combination_strategy: "combine"
 })
 const textParser = parser.parse(text)
 console.log(textParser)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexparser",
-  "version": "0.0.79",
+  "version": "0.0.80",
   "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/scan-test.js

@@ -4,20 +4,7 @@ const util = require("util")
 const dump = (item) => {
     console.log(util.inspect(item, { depth: null, colors: true }))
 }
-let 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
-
-Ge 27.27-29,89-40 Heb 11.20 Heb. 12.17 Jonah 3
-
-Jd. 5
-Jd 6
-
-1 Cor 12:34 2 Cor 3:4. He 4.12 Re 1.16
-
-Leviticus 16:6 He 5.3 He 7.27
-
-Hos 10:1-3, 8 and 1 John 2:23
-
-exod15.18. 2 Cor 12:23 Malachi 3:32`
+let text = `Psalm 94:4-100:6 MT`
 const parser = new BibleParser()
-const result = parser.find(text)
+const result = parser.find(text).enhance()
 dump(result)

package/src/CodexParser.js

@@ -90,6 +90,7 @@ class CodexParser {
         }
         this.passages = []
         this.scan(reference)
+        const books = []
         for (let i = 0; i < this.found.length; i++) {
             const result = this.found[i]
             if (result.type === "range" && result.start.b !== result.end.b) {
@@ -229,6 +230,7 @@ class CodexParser {
         return parts
             .join(" ")
             .replace(/\s+:\s+/g, ":")
+            .replace(/\s[-–—]\s/, "-")
             .trim()
     }
     find(text) {
@@ -541,6 +543,7 @@ class CodexParser {
             this.found.push(passage.trim())
             newText += "</span>&nbsp;"
         }
+        console.log(newText)
         return this
     }
 
@@ -551,7 +554,7 @@ class CodexParser {
                     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(/(?<=[.:])(\d+.+)/),
+                    verse: this.found[i].match(this.verseRegex)[0],
                 }
                 this.passages.push(passage)
             }

package/src/abbr.js

@@ -91,7 +91,6 @@ const abbrevations = {
     "II Ch": "2 Chronicles",
     Ezra: "Ezra",
     Ezr: "Ezra",
-    Ez: "Ezra",
     Neh: "Nehemiah",
     Ne: "Nehemiah",
     Esth: "Esther",

package/sub-verse-scripture-test.js

@@ -10,6 +10,7 @@ parser.options({
     invalid_passage_strategy: "include",
     invalid_sequence_strategy: "include",
     single_chapter_1_strategy: "verse",
+    sequence_combination_strategy: "combine",
 })
-const result = parser.parse("Isaiah 8:21-9:6")
+const result = parser.parse("John 3:1-3")
 dump(result.getPassages())

package/tests/find.js

@@ -0,0 +1,7 @@
+const CodexParser = require("../src/CodexParser.js")
+
+const parser = new CodexParser()
+
+parser.find('1 John 2-3').enhance()
+
+console.log(parser.getPassages())