codexparser 0.1.46 → 0.1.48

package/package.json

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

@@ -302,7 +302,7 @@ class CodexParser {
                         ? part.split(separator)
                         : [parsedPassage.chapter, part]
 
-                    if (separator !== ":") {
+                    if (separator.trim() !== ":" && !parsedPassage.chapter) {
                         if (singleChapterBook) {
                             parsedPassage.chapter = 1
                             parsedPassage.verses.push(versePart) // Add single verse to array
@@ -438,6 +438,7 @@ class CodexParser {
      */
     populate(parsedPassage) {
         const passages = []
+
         const { book, chapter, verses, type, to } = parsedPassage
         const version = parsedPassage.version ? parsedPassage.version.abbreviation : "eng"
         this._setVersion(book, chapter, version) // Set version data if needed
@@ -451,11 +452,10 @@ class CodexParser {
             }
         } else if (type === "comma_separated_verses") {
             // Handle explicitly mentioned verses (e.g., 3:1,3,6)
-            if (this.chapterVerses[book] && this.chapterVerses[book][chapter]) {
-                verses.forEach((verse) => {
-                    passages.push({ book, chapter: Number(chapter), verse: Number(verse) })
-                })
-            }
+
+            verses.forEach((verse) => {
+                passages.push({ book, chapter: Number(chapter), verse: Number(verse) })
+            })
         } else if (type === "chapter_range") {
             // Handle ranges of chapters (e.g., 3-5)
             for (let currentChapter = chapter; currentChapter <= to.chapter; currentChapter++) {
@@ -636,106 +636,6 @@ class CodexParser {
      * @return {object} The combined passage object.
      */
     combine(passages) {
-        if (!passages || passages.length === 0) {
-            throw new Error("No passages provided to combine.")
-        }
-
-        // Ensure all passages are from the same book
-        const uniqueBooks = [...new Set(passages.map((p) => p.book))]
-        if (uniqueBooks.length > 1) {
-            throw new Error("Passages must be from the same book to combine.")
-        }
-
-        // Initialize combined passage object
-        const combined = {
-            ...passages[0],
-            verses: [],
-            passages: [],
-            to: null,
-            type: null,
-        }
-
-        const chapterVerses = {}
-        let firstChapter = null
-        let lastChapter = null
-
-        // Collect all verses grouped by chapter
-        passages.forEach((passage) => {
-            passage.passages.forEach((p) => {
-                if (!chapterVerses[p.chapter]) {
-                    chapterVerses[p.chapter] = new Set()
-                }
-                chapterVerses[p.chapter].add(p.verse)
-                combined.passages.push(p) // Add individual passage
-            })
-
-            // Track first and last chapters
-            const chapters = passage.passages.map((p) => p.chapter)
-            if (!firstChapter || Math.min(...chapters) < firstChapter) {
-                firstChapter = Math.min(...chapters)
-            }
-            if (!lastChapter || Math.max(...chapters) > lastChapter) {
-                lastChapter = Math.max(...chapters)
-            }
-        })
-
-        // Ensure unique and sorted passages
-        combined.passages = Array.from(new Set(combined.passages.map(JSON.stringify))).map(JSON.parse)
-
-        // Process chapter and verse data
-        const sortedChapters = Object.keys(chapterVerses)
-            .map(Number)
-            .sort((a, b) => a - b)
-
-        const originalParts = []
-        sortedChapters.forEach((chapter, index) => {
-            const verses = Array.from(chapterVerses[chapter]).sort((a, b) => a - b)
-            if (chapter === firstChapter) {
-                combined.verses = verses // First chapter's verses
-            }
-            if (chapter === lastChapter) {
-                combined.to = {
-                    book: combined.book,
-                    chapter,
-                    verses,
-                }
-            }
-            originalParts.push(`${chapter}:${verses.join(",")}`)
-        })
-
-        // Ensure `to` is properly set for multi-chapter ranges
-        if (firstChapter !== lastChapter) {
-            const lastChapterVerses = Array.from(chapterVerses[lastChapter]).sort((a, b) => a - b)
-            combined.to = {
-                book: combined.book,
-                chapter: lastChapter,
-                verses: lastChapterVerses,
-            }
-        }
-
-        // Determine the passage type
-        if (firstChapter !== lastChapter) {
-            combined.type = "multi_chapter_verse_range"
-        } else if (combined.verses.length > 1) {
-            combined.type = "chapter_verse_range"
-        } else {
-            combined.type = "chapter_verse"
-        }
-
-        // Build the `original` field
-        combined.original = `${combined.book} ${originalParts.join("-")}`
-
-        return this.parse(combined.original).getPassages().first()
-    }
-
-    /**
-     * Combine multiple passages into one. The method checks for duplicates, merges overlapping or adjacent ranges,
-     * and builds the original and scripture properties.
-     *
-     * @param {array} passages - An array of passage objects to combine.
-     * @return {object} The combined passage object.
-     */
-    join(passages) {
         if (!passages || passages.length === 0) {
             throw new Error("No passages provided to join.")
         }
@@ -826,7 +726,9 @@ class CodexParser {
             cv: chapterString,
             hash: `${combined.book.toLowerCase()}_${chapterString.replace(/:/g, ".").replace(/,/g, ".")}`,
         }
-
+        if (combined.to === null) {
+            delete combined.to
+        }
         return combined
     }