codexparser 0.0.39 → 0.0.41

package/all-scripture-test.js

@@ -5,7 +5,7 @@ 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"
 const jd = "Jd. 5"
-const cor = "Hos 1:1-3, 8 Song of Solomon 1:2, Song of Songs 2:2. Ezek 17:3. Ezekiel 17:3"
+const cor = "Hos 1:1-3, 8 Song of Solomon 1:2, Song of Songs 2:2. Ezek 17:3. Ezekiel 17:3 He 12:13-15"
 const passages = parser.parse(single + " " + text + " " + jd + " " + cor)
 console.log(passages.getPassages())
 //const passages = parser.parse('Romans 8:9,12,15,17,20,28')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexparser",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "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/quicktest.js

@@ -0,0 +1,5 @@
+const BibleParser = require("./src/CodexParser.js")
+const string = "He 4.4"
+const parser = new BibleParser()
+const result = parser.parse(string)
+console.log(result.getPassages())

package/src/CodexParser.js

@@ -27,19 +27,25 @@ class CodexParser {
      * @return {array} The found passages from the text.
      */
     scan(text) {
-        const abbrs = text.match(/(?:He)(?=.\d+)/gm)
-        const matches = abbrs.map(string => {
-            return {
-                abbr: string,
-                book: this.bookify(string)
+        text = text.trim()
+        console.log(text)
+        const abbrs = text.matchAll(/He(?=.\d)/gim)
+        if (abbrs) {
+            const matches = [...abbrs].map((match) => {
+                return {
+                    abbr: match[0],
+                    book: this.bookify(match[0]),
+                    index: match.index,
+                }
+            })
+            console.log(matches)
+            for (let i = matches.length - 1; i >= 0; i--) {
+                const match = matches[i]
+                text = text.substring(0, match.index) + match.book + text.substring(match.index + match.abbr.length)
             }
-        })
-        for(let i = 0; i < matches.length; i++) {
-            const match = matches[i]
-            text = text.replace(match.abbr, match.book)
         }
         const passages = this.crawler.parse(text).parsed_entities()
-        this.found.push(...passages.flatMap((passage) => passage.entities)) 
+        this.found.push(...passages.flatMap((passage) => passage.entities))
     }
 
     /**

package/src/regex.js

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

package/sub-verse-scripture-test.js

@@ -1,6 +1,5 @@
-const CodexParser = require("./src/CodexParser.js")
-
-const parser = new CodexParser()
-const scripture = "And then he said, turn to He 1:1-3, 8. and He doesn't like it"
-const result = parser.parse(`${scripture}. Please turn in your Bibles.`)
-console.log(result.getPassages())
+const BibleParser = require("./src/CodexParser.js")
+const parser = new BibleParser()
+const string = "Genesis 1.1 He 4.4"
+const result = parser.parse(string)
+console.log(result.getPassages())