codexparser 0.1.47 → 0.1.49

package/package.json

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

@@ -4,6 +4,7 @@ const { bookRegex, chapterRegex, verseRegex, scripturesRegex } = require("./rege
 const abbrevations = require("./abbr")
 const dump = require("./functions").dump
 const dd = require("./functions").dd
+const sch = require("./functions").sch
 const chapter_verses = require("./chapterVerseCombine")
 
 class CodexParser {
@@ -18,32 +19,13 @@ class CodexParser {
         this.abbreviations = abbrevations
         this.versificationDifferences = versified
         this.singleChapterBook = [
-            {
-                Jude: {
-                    1: Array.from({ length: 25 }, (_, i) => i + 1),
-                }, // Jude has 25 verses
-            },
-            {
-                "2 John": {
-                    1: Array.from({ length: 13 }, (_, i) => i + 1),
-                }, // 2 John has 13 verses
-            },
-            {
-                "3 John": {
-                    1: Array.from({ length: 15 }, (_, i) => i + 1),
-                }, // 3 John has 15 verses
-            },
-            {
-                Obadiah: {
-                    1: Array.from({ length: 21 }, (_, i) => i + 1),
-                }, // Obadiah has 21 verses
-            },
-            {
-                Philemon: {
-                    1: Array.from({ length: 25 }, (_, i) => i + 1),
-                }, // Philemon has 25 verses
-            },
+            sch("Jude", 25),
+            sch("2 John", 13),
+            sch("3 John", 15),
+            sch("Obadiah", 21),
+            sch("Philemon", 25),
         ]
+
         this.chapterVerses = chapter_verses
         this.error = false
         this.version = null
@@ -302,7 +284,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 +420,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 +434,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++) {
@@ -586,9 +568,10 @@ class CodexParser {
 
         // Start constructing the passage string
         let combined = `${passage.book}`
-
+        
         if (passage.type === "multi_chapter_verse_range" && passage.to) {
             // Multi-chapter verse range
+            
             combined += ` ${formatChapterVerse(passage.chapter, passage.verses)}-${formatChapterVerse(
                 passage.to.chapter,
                 passage.to.verses
@@ -700,6 +683,7 @@ class CodexParser {
 
         // Handle multi-chapter ranges
         if (firstChapter !== lastChapter) {
+            
             combined.type = "multi_chapter_verse_range"
             combined.to = {
                 book: combined.book,
@@ -708,7 +692,7 @@ class CodexParser {
             }
             combined.original = `${combined.book} ${firstChapter}:${combined.verses.join(
                 ","
-            )}-${lastChapter}:${combined.to.verses.join(",")}`
+            )}; ${lastChapter}:${combined.to.verses.join(",")}`
         } else {
             // Single-chapter range or comma-separated
             if (combined.verses.length > 1) {
@@ -720,13 +704,15 @@ class CodexParser {
         }
 
         // Build the scripture property
-        const chapterString = chapterStrings.join(",")
+        const chapterString = chapterStrings.join(";")
         combined.scripture = {
             passage: `${combined.book} ${chapterString}`,
             cv: chapterString,
-            hash: `${combined.book.toLowerCase()}_${chapterString.replace(/:/g, ".").replace(/,/g, ".")}`,
+            hash: `${combined.book.toLowerCase()}_${chapterString.replace(/:/g, ".").replace(/,|;/g, ".")}`,
+        }
+        if (combined.to === null) {
+            delete combined.to
         }
-
         return combined
     }
 

package/src/functions.js

@@ -10,7 +10,18 @@ function dd(message) {
     process.exit(1)
 }
 
+
+function sch(bookName, verseCount) {
+    return {
+        [bookName]: {
+            1: Array.from({ length: verseCount }, (_, i) => i + 1),
+        },
+    }
+}
+
+
 module.exports = {
     dump,
     dd,
+    sch
 }