codexparser 0.1.27 → 0.1.29

package/package.json

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

@@ -486,21 +486,49 @@ class CodexParser {
      * @return {object} The object with the human-readable name, chapter and verses and a hash.
      */
     scripturize(passage) {
-        const { book, chapter, verses, to } = passage
-        const colon = verses.length !== 0 ? ":" : ""
-        const parts = [book, chapter, colon, verses]
-        if (to) {
-            parts.push("-", to.chapter, ":", to.verses)
+        const { book, chapter, passages } = passage
+
+        // Extract verses from the passages array
+        const verses = passages.map((p) => p.verse)
+        let formattedVerses = ""
+
+        if (verses.length === 1) {
+            // If there is only one verse
+            formattedVerses = verses[0].toString()
+        } else if (verses.length === 2 && verses[1] === verses[0] + 1) {
+            // If there are exactly two verses and they are consecutive, use a comma
+            formattedVerses = `${verses[0]},${verses[1]}`
+        } else {
+            // For more than two verses, or non-consecutive verses
+            let ranges = []
+            let tempRange = [verses[0]]
+
+            for (let i = 1; i < verses.length; i++) {
+                if (verses[i] === verses[i - 1] + 1) {
+                    // If the verse is consecutive, add to tempRange
+                    tempRange.push(verses[i])
+                } else {
+                    // If not consecutive, finalize tempRange
+                    ranges.push(tempRange)
+                    tempRange = [verses[i]]
+                }
+            }
+            ranges.push(tempRange) // Push the last range
+
+            // Format ranges: convert consecutive numbers to ranges, non-consecutive remain separate
+            formattedVerses = ranges
+                .map((range) => (range.length > 1 ? `${range[0]}-${range[range.length - 1]}` : range[0]))
+                .join(",")
         }
-        const full = parts
-            .join(" ")
-            .replace(/\s+:\s+/g, ":")
-            .replace(/\s[-–—]\s/, "-")
-            .trim()
+
+        // Format the final passage
+        const colon = formattedVerses ? ":" : ""
+        const full = `${book} ${chapter}${colon}${formattedVerses}`.trim()
         const hash = full.toLowerCase().replace(/ /g, "_").replace(/:/g, ".").replace(/-/g, ".").replace(/,/g, ".")
+
         return {
             passage: full,
-            cv: chapter + colon + verses,
+            cv: `${chapter}${colon}${formattedVerses}`,
             hash,
         }
     }
@@ -514,10 +542,12 @@ class CodexParser {
      * @return {object} The combined passage object.
      */
     combine(passages) {
-        const noDuplicates = [...new Set(passages.map((p) => p.book + " " + p.chapter))]
+        // Only check if passages are from the same book
+        const noDuplicates = [...new Set(passages.map((p) => p.book))]
         if (noDuplicates.length > 1) {
-            throw new Error("Passages are not from the same book and chapter.")
+            throw new Error("Passages are not from the same book.")
         }
+
         const newPassages = []
         passages.forEach((passageSet) => {
             passageSet.passages.forEach((passage) => {
@@ -528,6 +558,7 @@ class CodexParser {
                 }
             })
         })
+
         const noDuplicates2 = [...new Set(newPassages)]
         const parsed = this.parse(noDuplicates2.join(" // ")).getPassages()
         return this.join(parsed)