codexparser 0.1.94 → 0.1.97

package/.trunk/configs/.markdownlint.yaml

@@ -0,0 +1,2 @@
+# Prettier friendly markdownlint config (all formatting rules disabled)
+extends: markdownlint/style/prettier

package/.trunk/trunk.yaml

@@ -0,0 +1,32 @@
+# This file controls the behavior of Trunk: https://docs.trunk.io/cli
+# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
+version: 0.1
+cli:
+  version: 1.25.0
+# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
+plugins:
+  sources:
+    - id: trunk
+      ref: v1.7.2
+      uri: https://github.com/trunk-io/plugins
+# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
+runtimes:
+  enabled:
+    - node@22.16.0
+    - python@3.10.8
+# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
+lint:
+  enabled:
+    - checkov@3.2.464
+    - git-diff-check
+    - markdownlint@0.45.0
+    - osv-scanner@2.2.1
+    - prettier@3.6.2
+    - trufflehog@3.90.5
+actions:
+  disabled:
+    - trunk-announce
+    - trunk-check-pre-push
+    - trunk-fmt-pre-commit
+  enabled:
+    - trunk-upgrade-available

package/package.json

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

@@ -1141,6 +1141,11 @@ class CodexParser {
             throw new Error("Passages must be from the same book to join.")
         }
 
+        const versions = new Set(passages.map((p) => p.version.abbreviation))
+        if (versions.size > 1) {
+            throw new Error("Cannot combine passages from different versions.")
+        }
+
         const combined = {
             ...passages[0],
             verses: [],
@@ -1160,35 +1165,30 @@ class CodexParser {
 
         passages.forEach((passage) => {
             passage.passages.forEach((p) => {
-                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
-                }
-                if (!chapterVerses[normChapter]) {
-                    chapterVerses[normChapter] = new Set()
+                const chapter = p.chapter
+                const verse = p.verse
+                if (!chapterVerses[chapter]) {
+                    chapterVerses[chapter] = new Set()
                 }
-                chapterVerses[normChapter].add(normVerse)
+                chapterVerses[chapter].add(verse)
                 combined.passages.push({
                     book: p.book,
-                    chapter: normChapter,
-                    verse: normVerse,
+                    chapter: p.chapter,
+                    verse: p.verse,
                     versification: p.versification,
                 })
 
-                if (firstChapter === null || normChapter < firstChapter) {
-                    firstChapter = normChapter
-                    firstVerse = normVerse
-                } else if (normChapter === firstChapter && (firstVerse === null || normVerse < firstVerse)) {
-                    firstVerse = normVerse
+                if (firstChapter === null || chapter < firstChapter) {
+                    firstChapter = chapter
+                    firstVerse = verse
+                } else if (chapter === firstChapter && (firstVerse === null || verse < firstVerse)) {
+                    firstVerse = verse
                 }
-                if (lastChapter === null || normChapter > lastChapter) {
-                    lastChapter = normChapter
-                    lastVerse = normVerse
-                } else if (normChapter === lastChapter && (lastVerse === null || normVerse > lastVerse)) {
-                    lastVerse = normVerse
+                if (lastChapter === null || chapter > lastChapter) {
+                    lastChapter = chapter
+                    lastVerse = verse
+                } else if (chapter === lastChapter && (lastVerse === null || verse > lastVerse)) {
+                    lastVerse = verse
                 }
             })
         })
@@ -1272,18 +1272,21 @@ class CodexParser {
             delete combined.to
         }
 
-        // Prefer English version
-        combined.version = { name: "English", value: "ENG", abbreviation: "eng" }
+        // Respect the common version
+        combined.version = passages[0].version
 
-        // Set abbr without version suffix
+        // Set abbr with version suffix if not ENG
         const sblEntry = Object.entries(this.sblAbbreviations).find(
             ([key]) => key.toLowerCase() === combined.book.toLowerCase()
         )
+        const suffix = combined.version.abbreviation === "eng" ? "" : ` ${combined.version.value}`
         if (sblEntry) {
             const { value, abbr } = sblEntry[1]
-            combined.abbr = abbr ? `${value}. ${combined.scripture.cv}` : `${value} ${combined.scripture.cv}`
+            combined.abbr = abbr
+                ? `${value}. ${combined.scripture.cv}${suffix}`
+                : `${value} ${combined.scripture.cv}${suffix}`
         } else {
-            combined.abbr = `${combined.book} ${combined.scripture.cv}`
+            combined.abbr = `${combined.book} ${combined.scripture.cv}${suffix}`
         }
 
         const self = this

package/src/versifications/daniel.js

@@ -1,4 +1,120 @@
 module.exports = {
+    // Chapter 3: Include all LXX verses, with mt/eng set to null where no correspondence exists
+    "3:1": {
+        lxx: "3:1",
+        mt: "3:1",
+        eng: "3:1",
+    },
+    "3:2": {
+        lxx: "3:2",
+        mt: "3:2",
+        eng: "3:2",
+    },
+    "3:3": {
+        lxx: "3:3",
+        mt: "3:3",
+        eng: "3:3",
+    },
+    "3:4": {
+        lxx: "3:4",
+        mt: "3:4",
+        eng: "3:4",
+    },
+    "3:5": {
+        lxx: "3:5",
+        mt: "3:5",
+        eng: "3:5",
+    },
+    "3:6": {
+        lxx: "3:6",
+        mt: "3:6",
+        eng: "3:6",
+    },
+    "3:7": {
+        lxx: "3:7",
+        mt: "3:7",
+        eng: "3:7",
+    },
+    "3:8": {
+        lxx: "3:8",
+        mt: "3:8",
+        eng: "3:8",
+    },
+    "3:9": {
+        lxx: "3:9",
+        mt: "3:9",
+        eng: "3:9",
+    },
+    "3:10": {
+        lxx: "3:10",
+        mt: "3:10",
+        eng: "3:10",
+    },
+    "3:11": {
+        lxx: "3:11",
+        mt: "3:11",
+        eng: "3:11",
+    },
+    "3:12": {
+        lxx: "3:12",
+        mt: "3:12",
+        eng: "3:12",
+    },
+    "3:13": {
+        lxx: "3:13",
+        mt: "3:13",
+        eng: "3:13",
+    },
+    "3:14": {
+        lxx: "3:14",
+        mt: "3:14",
+        eng: "3:14",
+    },
+    "3:15": {
+        lxx: "3:15",
+        mt: "3:15",
+        eng: "3:15",
+    },
+    "3:16": {
+        lxx: "3:16",
+        mt: "3:16",
+        eng: "3:16",
+    },
+    "3:17": {
+        lxx: "3:17",
+        mt: "3:17",
+        eng: "3:17",
+    },
+    "3:18": {
+        lxx: "3:18",
+        mt: "3:18",
+        eng: "3:18",
+    },
+    "3:19": {
+        lxx: "3:19",
+        mt: "3:19",
+        eng: "3:19",
+    },
+    "3:20": {
+        lxx: "3:20",
+        mt: "3:20",
+        eng: "3:20",
+    },
+    "3:21": {
+        lxx: "3:21",
+        mt: "3:21",
+        eng: "3:21",
+    },
+    "3:22": {
+        lxx: "3:22",
+        mt: "3:22",
+        eng: "3:22",
+    },
+    "3:23": {
+        lxx: "3:23",
+        mt: "3:23",
+        eng: "3:23",
+    },
     "3:24": {
         lxx: "3:91",
         mt: "3:24",
@@ -34,211 +150,550 @@ module.exports = {
         mt: "3:30",
         eng: "3:30",
     },
-    "3:31": {
+    // Additional LXX verses in Chapter 3 (Prayer of Azariah and Song of the Three Young Men)
+    "3:24a": {
+        lxx: "3:24",
+        mt: null,
+        eng: null,
+    },
+    "3:25a": {
+        lxx: "3:25",
+        mt: null,
+        eng: null,
+    },
+    "3:26a": {
+        lxx: "3:26",
+        mt: null,
+        eng: null,
+    },
+    "3:27a": {
+        lxx: "3:27",
+        mt: null,
+        eng: null,
+    },
+    "3:28a": {
+        lxx: "3:28",
+        mt: null,
+        eng: null,
+    },
+    "3:29a": {
+        lxx: "3:29",
+        mt: null,
+        eng: null,
+    },
+    "3:30a": {
+        lxx: "3:30",
+        mt: null,
+        eng: null,
+    },
+    "3:31a": {
         lxx: "3:31",
+        mt: null,
+        eng: null,
+    },
+    "3:32a": {
+        lxx: "3:32",
+        mt: null,
+        eng: null,
+    },
+    "3:33a": {
+        lxx: "3:33",
+        mt: null,
+        eng: null,
+    },
+    "3:34": {
+        lxx: "3:34",
+        mt: null,
+        eng: null,
+    },
+    "3:35": {
+        lxx: "3:35",
+        mt: null,
+        eng: null,
+    },
+    "3:36": {
+        lxx: "3:36",
+        mt: null,
+        eng: null,
+    },
+    "3:37": {
+        lxx: "3:37",
+        mt: null,
+        eng: null,
+    },
+    "3:38": {
+        lxx: "3:38",
+        mt: null,
+        eng: null,
+    },
+    "3:39": {
+        lxx: "3:39",
+        mt: null,
+        eng: null,
+    },
+    "3:40": {
+        lxx: "3:40",
+        mt: null,
+        eng: null,
+    },
+    "3:41": {
+        lxx: "3:41",
+        mt: null,
+        eng: null,
+    },
+    "3:42": {
+        lxx: "3:42",
+        mt: null,
+        eng: null,
+    },
+    "3:43": {
+        lxx: "3:43",
+        mt: null,
+        eng: null,
+    },
+    "3:44": {
+        lxx: "3:44",
+        mt: null,
+        eng: null,
+    },
+    "3:45": {
+        lxx: "3:45",
+        mt: null,
+        eng: null,
+    },
+    "3:46": {
+        lxx: "3:46",
+        mt: null,
+        eng: null,
+    },
+    "3:47": {
+        lxx: "3:47",
+        mt: null,
+        eng: null,
+    },
+    "3:48": {
+        lxx: "3:48",
+        mt: null,
+        eng: null,
+    },
+    "3:49": {
+        lxx: "3:49",
+        mt: null,
+        eng: null,
+    },
+    "3:50": {
+        lxx: "3:50",
+        mt: null,
+        eng: null,
+    },
+    "3:51": {
+        lxx: "3:51",
+        mt: null,
+        eng: null,
+    },
+    "3:52": {
+        lxx: "3:52",
+        mt: null,
+        eng: null,
+    },
+    "3:53": {
+        lxx: "3:53",
+        mt: null,
+        eng: null,
+    },
+    "3:54": {
+        lxx: "3:54",
+        mt: null,
+        eng: null,
+    },
+    "3:55": {
+        lxx: "3:55",
+        mt: null,
+        eng: null,
+    },
+    "3:56": {
+        lxx: "3:56",
+        mt: null,
+        eng: null,
+    },
+    "3:57": {
+        lxx: "3:57",
+        mt: null,
+        eng: null,
+    },
+    "3:58": {
+        lxx: "3:58",
+        mt: null,
+        eng: null,
+    },
+    "3:59": {
+        lxx: "3:59",
+        mt: null,
+        eng: null,
+    },
+    "3:60": {
+        lxx: "3:60",
+        mt: null,
+        eng: null,
+    },
+    "3:61": {
+        lxx: "3:61",
+        mt: null,
+        eng: null,
+    },
+    "3:62": {
+        lxx: "3:62",
+        mt: null,
+        eng: null,
+    },
+    "3:63": {
+        lxx: "3:63",
+        mt: null,
+        eng: null,
+    },
+    "3:64": {
+        lxx: "3:64",
+        mt: null,
+        eng: null,
+    },
+    "3:65": {
+        lxx: "3:65",
+        mt: null,
+        eng: null,
+    },
+    "3:66": {
+        lxx: "3:66",
+        mt: null,
+        eng: null,
+    },
+    "3:67": {
+        lxx: "3:67",
+        mt: null,
+        eng: null,
+    },
+    "3:68": {
+        lxx: "3:68",
+        mt: null,
+        eng: null,
+    },
+    "3:69": {
+        lxx: "3:69",
+        mt: null,
+        eng: null,
+    },
+    "3:70": {
+        lxx: "3:70",
+        mt: null,
+        eng: null,
+    },
+    "3:71": {
+        lxx: "3:71",
+        mt: null,
+        eng: null,
+    },
+    "3:72": {
+        lxx: "3:72",
+        mt: null,
+        eng: null,
+    },
+    "3:73": {
+        lxx: "3:73",
+        mt: null,
+        eng: null,
+    },
+    "3:74": {
+        lxx: "3:74",
+        mt: null,
+        eng: null,
+    },
+    "3:75": {
+        lxx: "3:75",
+        mt: null,
+        eng: null,
+    },
+    "3:76": {
+        lxx: "3:76",
+        mt: null,
+        eng: null,
+    },
+    "3:77": {
+        lxx: "3:77",
+        mt: null,
+        eng: null,
+    },
+    "3:78": {
+        lxx: "3:78",
+        mt: null,
+        eng: null,
+    },
+    "3:79": {
+        lxx: "3:79",
+        mt: null,
+        eng: null,
+    },
+    "3:80": {
+        lxx: "3:80",
+        mt: null,
+        eng: null,
+    },
+    "3:81": {
+        lxx: "3:81",
+        mt: null,
+        eng: null,
+    },
+    "3:82": {
+        lxx: "3:82",
+        mt: null,
+        eng: null,
+    },
+    "3:83": {
+        lxx: "3:83",
+        mt: null,
+        eng: null,
+    },
+    "3:84": {
+        lxx: "3:84",
+        mt: null,
+        eng: null,
+    },
+    "3:85": {
+        lxx: "3:85",
+        mt: null,
+        eng: null,
+    },
+    "3:86": {
+        lxx: "3:86",
+        mt: null,
+        eng: null,
+    },
+    "3:87": {
+        lxx: "3:87",
+        mt: null,
+        eng: null,
+    },
+    "3:88": {
+        lxx: "3:88",
+        mt: null,
+        eng: null,
+    },
+    "3:89": {
+        lxx: "3:89",
+        mt: null,
+        eng: null,
+    },
+    "3:90": {
+        lxx: "3:90",
+        mt: null,
+        eng: null,
+    },
+    // Chapter 4
+    "3:31": {
+        lxx: "4:34a",
         mt: "3:31",
         eng: "4:1",
     },
     "3:32": {
-        lxx: "3:32",
+        lxx: "4:34b",
         mt: "3:32",
         eng: "4:2",
     },
     "3:33": {
-        lxx: "3:33",
+        lxx: "4:34c",
         mt: "3:33",
         eng: "4:3",
     },
     "4:1": {
-        lxx: "3:31",
+        lxx: "4:34a",
         mt: "3:31",
         eng: "4:1",
     },
     "4:2": {
-        lxx: "3:32",
+        lxx: "4:34b",
         mt: "3:32",
         eng: "4:2",
     },
     "4:3": {
-        lxx: "3:33",
+        lxx: "4:34c",
         mt: "3:33",
         eng: "4:3",
     },
     "4:4": {
-        lxx: "4:4",
+        lxx: "4:1",
         mt: "4:1",
         eng: "4:4",
     },
     "4:5": {
-        lxx: "4:5",
+        lxx: "4:2",
         mt: "4:2",
         eng: "4:5",
     },
     "4:6": {
-        lxx: "4:6",
+        lxx: "4:3",
         mt: "4:3",
         eng: "4:6",
     },
     "4:7": {
-        lxx: "4:7",
+        lxx: "4:4",
         mt: "4:4",
         eng: "4:7",
     },
     "4:8": {
-        lxx: "4:8",
+        lxx: "4:5",
         mt: "4:5",
         eng: "4:8",
     },
     "4:9": {
-        lxx: "4:9",
+        lxx: "4:6",
         mt: "4:6",
         eng: "4:9",
     },
     "4:10": {
-        lxx: "4:10",
+        lxx: "4:7",
         mt: "4:7",
         eng: "4:10",
     },
     "4:11": {
-        lxx: "4:11",
+        lxx: "4:8",
         mt: "4:8",
         eng: "4:11",
     },
     "4:12": {
-        lxx: "4:12",
+        lxx: "4:9",
         mt: "4:9",
         eng: "4:12",
     },
     "4:13": {
-        lxx: "4:13",
+        lxx: "4:10",
         mt: "4:10",
         eng: "4:13",
     },
     "4:14": {
-        lxx: "4:14",
+        lxx: "4:11",
         mt: "4:11",
         eng: "4:14",
     },
     "4:15": {
-        lxx: "4:15",
+        lxx: "4:12",
         mt: "4:12",
         eng: "4:15",
     },
     "4:16": {
-        lxx: "4:16",
+        lxx: "4:13",
         mt: "4:13",
         eng: "4:16",
     },
     "4:17": {
-        lxx: "4:17",
+        lxx: "4:14",
         mt: "4:14",
         eng: "4:17",
     },
     "4:18": {
-        lxx: "4:18",
+        lxx: "4:15",
         mt: "4:15",
         eng: "4:18",
     },
     "4:19": {
-        lxx: "4:19",
+        lxx: "4:16",
         mt: "4:16",
         eng: "4:19",
     },
     "4:20": {
-        lxx: "4:20",
+        lxx: "4:17",
         mt: "4:17",
         eng: "4:20",
     },
     "4:21": {
-        lxx: "4:21",
+        lxx: "4:18",
         mt: "4:18",
         eng: "4:21",
     },
     "4:22": {
-        lxx: "4:22",
+        lxx: "4:19",
         mt: "4:19",
         eng: "4:22",
     },
     "4:23": {
-        lxx: "4:23",
+        lxx: "4:20",
         mt: "4:20",
         eng: "4:23",
     },
     "4:24": {
-        lxx: "4:24",
+        lxx: "4:21",
         mt: "4:21",
         eng: "4:24",
     },
     "4:25": {
-        lxx: "4:25",
+        lxx: "4:22",
         mt: "4:22",
         eng: "4:25",
     },
     "4:26": {
-        lxx: "4:26",
+        lxx: "4:23",
         mt: "4:23",
         eng: "4:26",
     },
     "4:27": {
-        lxx: "4:27",
+        lxx: "4:24",
         mt: "4:24",
         eng: "4:27",
     },
     "4:28": {
-        lxx: "4:28",
+        lxx: "4:25",
         mt: "4:25",
         eng: "4:28",
     },
     "4:29": {
-        lxx: "4:29",
+        lxx: "4:26",
         mt: "4:26",
         eng: "4:29",
     },
     "4:30": {
-        lxx: "4:30",
+        lxx: "4:27",
         mt: "4:27",
         eng: "4:30",
     },
     "4:31": {
-        lxx: "4:31",
+        lxx: "4:28",
         mt: "4:28",
         eng: "4:31",
     },
     "4:32": {
-        lxx: "4:32",
+        lxx: "4:29",
         mt: "4:29",
         eng: "4:32",
     },
     "4:33": {
-        lxx: "4:33",
+        lxx: "4:30",
         mt: "4:30",
         eng: "4:33",
     },
     "4:34": {
-        lxx: "4:34",
+        lxx: "4:31",
         mt: "4:31",
         eng: "4:34",
     },
     "4:35": {
-        lxx: "4:35",
+        lxx: "4:32",
         mt: "4:32",
         eng: "4:35",
     },
     "4:36": {
-        lxx: "4:36",
+        lxx: "4:33",
         mt: "4:33",
         eng: "4:36",
     },
     "4:37": {
-        lxx: "4:37",
+        lxx: "4:34",
         mt: "4:34",
         eng: "4:37",
     },
+    // Chapter 5
     "5:31": {
         lxx: "6:1",
         mt: "6:1",
         eng: "5:31",
     },
+    // Chapter 6
     "6:1": {
         lxx: "6:2",
         mt: "6:2",