codexparser 0.0.11 → 0.0.12

package/package.json

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

@@ -39,6 +39,7 @@ class CodexParser {
         }
         this.passages = []
         this.scan(reference)
+        console.log(this.found)
         for (let i = 0; i < this.found.length; i++) {
             const book = this.found[i].match(this.bookRegex)
             const chapter = this.found[i].replace(book[0], "").match(this.chapterRegex)

package/src/regex.js

@@ -3,8 +3,13 @@ const bookRegex =
 const bookAbbrRegex =
     /(?:(?:[gG]en|[eE]xo|[lL]ev|[nN]um|[dD]eu|[jJ]os|[jJ]dg|[rR]ut|1 [sS]a|2 [sS]a|1 [kK]gs|2 [kK]gs|1 [cC]hr|2 [cC]hr|[eE]zr|[nN]eh|[eE]st|[jJ]ob|[pP]sa|[pP]ro|[eE]cc|[sS]on|[iI]sa|[jJ]er|[lL]am|[eE]ze|[dD]an|[hH]os|[jJ]oe|[aA]mo|[oO]ba|[jJ]on|[mM]ic|[nN]ah|[hH]ab|[zZ]ep|[hH]ag|[zZ]ec|[mM]al|[mM]att|[mM]ar|[lL]uk|[jJ]oh|[aA]ct|[rR]om|1 [cC]or|2 [cC]or|[gG]al|[eE]ph|[pP]hi|[cC]ol|1 [tT]hess|2 [tT]hess|1 [tT]i|2 [tT]i|[tT]it|[pP]hm|[hH]eb|[jJ]am|1 [pP]e|2 [pP]e|1 [jJ]o|2 [jJ]o|3 [jJ]o|[jJ]ud|[rR]ev))/gim
 const chapterRegex = /(?:\s?\d+:?)/g
-const verseRegex = /\b[:|.]\s*?(\d+(?:,?\s*?\d+?|-|–|—\d+)*)?\d+(?!p|j|k|s|c|t)\b/g
-const scripturesRegex = new RegExp(`(${bookRegex.source})(${chapterRegex.source})?(${verseRegex.source})`, "gm")
+const verseRegex = /\b[:|\.]\s*?(\d+(?:,?\s*?\d+?|-|–|—\d+)*)?\d+(?!p|j|k|s|c|t)\b/g
+const chapterRange = /\s?(?:[-|—|–])\s?/g
+const chapterRangeVerseRegex = /./gm
+const scripturesRegex = new RegExp(
+    `(${bookRegex.source})(${chapterRegex.source})?(${verseRegex.source})(${chapterRange.source})?((${chapterRegex.source})?(${verseRegex.source})?)(${chapterRangeVerseRegex.source})?`,
+    "gm"
+)
 const abbrScripturesRegex = new RegExp(`(${bookAbbrRegex.source})(${chapterRegex.source})?(${verseRegex.source})`, "gm")
 
 module.exports.bookRegex = bookRegex
@@ -12,4 +17,4 @@ module.exports.bookAbbrRegex = bookAbbrRegex
 module.exports.chapterRegex = chapterRegex
 module.exports.scripturesRegex = scripturesRegex
 module.exports.abbrScripturesRegex = abbrScripturesRegex
-module.exports.verseRegex = verseRegex
+module.exports.verseRegex = verseRegex

package/test.js

@@ -3,7 +3,7 @@ const CodexParser = require("./src/CodexParser.js")
 const parser = new CodexParser()
 const text =
     "The passages that we are looking at tonight are found in 1 John 3:16-17, 1 Peter 1:1, and Romans 10:13, 15, 17. Please turn in your Bibles."
-const single = "Ge 2:9"
+const single = "Ge 2:9-3:3-2 and 2 Cor 2:2"
 parser.parse(single)
 //parser.parse(single)
 console.log(parser.getPassages())