codexparser 0.1.88 → 0.1.90

package/package.json

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

@@ -957,23 +957,35 @@ class CodexParser {
 
         passages.forEach((passage) => {
             passage.passages.forEach((p) => {
-                if (!chapterVerses[p.chapter]) {
-                    chapterVerses[p.chapter] = new Set()
+                let normChapter = p.chapter
+                let normVerse = p.verse
+                if (p.versification && p.versification.eng) {
+                    const [c, v] = p.versification.eng.split(":").map(Number)
+                    normChapter = c
+                    normVerse = v
                 }
-                chapterVerses[p.chapter].add(p.verse)
-                combined.passages.push(p)
-
-                if (firstChapter === null || p.chapter < firstChapter) {
-                    firstChapter = p.chapter
-                    firstVerse = p.verse
-                } else if (p.chapter === firstChapter && (firstVerse === null || p.verse < firstVerse)) {
-                    firstVerse = p.verse
+                if (!chapterVerses[normChapter]) {
+                    chapterVerses[normChapter] = new Set()
                 }
-                if (lastChapter === null || p.chapter > lastChapter) {
-                    lastChapter = p.chapter
-                    lastVerse = p.verse
-                } else if (p.chapter === lastChapter && (lastVerse === null || p.verse > lastVerse)) {
-                    lastVerse = p.verse
+                chapterVerses[normChapter].add(normVerse)
+                combined.passages.push({
+                    book: p.book,
+                    chapter: normChapter,
+                    verse: normVerse,
+                    versification: p.versification,
+                })
+
+                if (firstChapter === null || normChapter < firstChapter) {
+                    firstChapter = normChapter
+                    firstVerse = normVerse
+                } else if (normChapter === firstChapter && (firstVerse === null || normVerse < firstVerse)) {
+                    firstVerse = normVerse
+                }
+                if (lastChapter === null || normChapter > lastChapter) {
+                    lastChapter = normChapter
+                    lastVerse = normVerse
+                } else if (normChapter === lastChapter && (lastVerse === null || normVerse > lastVerse)) {
+                    lastVerse = normVerse
                 }
             })
         })
@@ -1003,12 +1015,18 @@ class CodexParser {
             throw new Error("No valid verses found in passages.")
         }
 
+        combined.chapter = firstChapter
+
         if (firstChapter !== lastChapter) {
             combined.type = this.MULTI_CHAPTER_RANGE
             combined.to = {
                 book: combined.book,
                 chapter: lastChapter,
-                verses: this.mergeRanges(Array.from(chapterVerses[lastChapter]).filter((verse) => verse > 0)),
+                verses: this.mergeRanges(
+                    Array.from(chapterVerses[lastChapter])
+                        .filter((verse) => verse > 0)
+                        .sort((a, b) => a - b)
+                ),
             }
             combined.original = `${combined.book} ${chapterStrings.join("; ")}`
         } else {
@@ -1048,6 +1066,20 @@ class CodexParser {
             delete combined.to
         }
 
+        // Prefer English version
+        combined.version = { name: "English", value: "ENG", abbreviation: "eng" }
+
+        // Set abbr without version suffix
+        const sblEntry = Object.entries(this.sblAbbreviations).find(
+            ([key]) => key.toLowerCase() === combined.book.toLowerCase()
+        )
+        if (sblEntry) {
+            const { value, abbr } = sblEntry[1]
+            combined.abbr = abbr ? `${value}. ${combined.scripture.cv}` : `${value} ${combined.scripture.cv}`
+        } else {
+            combined.abbr = `${combined.book} ${combined.scripture.cv}`
+        }
+
         return combined
     }
 

package/src/versifications/deuteronomy.js

@@ -95,69 +95,69 @@ module.exports = {
         eng: "13:18",
     },
     "14:16": {
-        lxx: "14:17",
+        lxx: "14:15",
         mt: "14:16",
         eng: "14:16",
     },
     "14:17": {
-        lxx: "14:18",
+        lxx: "14:16",
         mt: "14:17",
         eng: "14:17",
     },
     "14:18": {
-        lxx: "14:19",
+        lxx: "14:17",
         mt: "14:18",
         eng: "14:18",
     },
     "14:19": {
-        lxx: "14:20",
+        lxx: "14:18",
         mt: "14:19",
         eng: "14:19",
     },
     "14:20": {
-        lxx: "14:21",
+        lxx: "14:19",
         mt: "14:20",
         eng: "14:20",
     },
     "14:21": {
-        lxx: "14:22",
+        lxx: "14:20",
         mt: "14:21",
         eng: "14:21",
     },
     "14:22": {
-        lxx: "14:23",
+        lxx: "14:21",
         mt: "14:22",
         eng: "14:22",
     },
     "14:23": {
-        lxx: "14:24",
+        lxx: "14:22",
         mt: "14:23",
         eng: "14:23",
     },
     "14:24": {
-        lxx: "14:25",
+        lxx: "14:23",
         mt: "14:24",
         eng: "14:24",
     },
     "14:25": {
-        lxx: "14:26",
+        lxx: "14:24",
         mt: "14:25",
         eng: "14:25",
     },
     "14:26": {
-        lxx: "14:27",
+        lxx: "14:25",
         mt: "14:26",
         eng: "14:26",
     },
     "14:27": {
-        lxx: "14:28",
+        lxx: "14:26",
         mt: "14:27",
         eng: "14:27",
     },
-    "14:28": {
-        lxx: "14:29",
-        mt: "14:28",
-        eng: "14:28",
+    "14:29": {
+        lxx: "14:28",
+        mt: "14:29",
+        eng: "14:29",
     },
     "22:30": {
         lxx: "23:1",