codexparser 0.1.71 → 0.1.73

package/package.json

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

@@ -124,7 +124,7 @@ class CodexParser {
             for (let book of fullNames) {
                 if (
                     lowerCaseText.startsWith(book.toLowerCase(), i) &&
-                    (i + book.length >= lowerCaseText.length || /\s|:|\d/.test(lowerCaseText[i + book.length]))
+                    (i + book.length >= lowerCaseText.length || /[\s:;\d]/.test(lowerCaseText[i + book.length]))
                 ) {
                     foundBook = book
                     matchedLength = book.length
@@ -135,7 +135,7 @@ class CodexParser {
                 for (let abbr of abbreviations) {
                     if (
                         lowerCaseText.startsWith(abbr.toLowerCase(), i) &&
-                        (i + abbr.length >= lowerCaseText.length || /\s|:|\d/.test(lowerCaseText[i + abbr.length]))
+                        (i + abbr.length >= lowerCaseText.length || /[\s:;\d]/.test(lowerCaseText[i + abbr.length]))
                     ) {
                         foundBook = this.abbreviations[abbr]
                         matchedLength = abbr.length
@@ -145,11 +145,23 @@ class CodexParser {
             }
 
             if (foundBook) {
-                // Check if book is followed by a number when booksOnly is false
-                const nextCharIndex = i + matchedLength
-                const isFollowedByNumber =
-                    nextCharIndex < lowerCaseText.length && /\d/.test(lowerCaseText[nextCharIndex])
-                if (!this.config.booksOnly && !isFollowedByNumber && !hasOpeningParen) {
+                // Check if book is followed by a valid reference when booksOnly is false
+                let isFollowedByReference = false
+                if (!this.config.booksOnly && !hasOpeningParen) {
+                    let j = i + matchedLength
+                    // Skip spaces
+                    while (j < lowerCaseText.length && /\s/.test(lowerCaseText[j])) {
+                        j++
+                    }
+                    // Check for digit or colon indicating a reference
+                    if (j < lowerCaseText.length && /[\d:]/.test(lowerCaseText[j])) {
+                        isFollowedByReference = true
+                    }
+                } else {
+                    isFollowedByReference = true // Allow if booksOnly or in parentheses
+                }
+
+                if (!isFollowedByReference) {
                     i++
                     continue
                 }
@@ -164,21 +176,15 @@ class CodexParser {
                     i++
                 }
 
-                // Capture chapter-verse
-                while (
-                    i < lowerCaseText.length &&
-                    (/[\d]/.test(normalizedText[i]) ||
-                        normalizedText[i] === ":" ||
-                        normalizedText[i] === "," ||
-                        normalizedText[i] === "-")
-                ) {
+                // Capture chapter-verse (allow digits, colons, commas, dashes, spaces)
+                while (i < lowerCaseText.length && (/[\d:,\-]/.test(normalizedText[i]) || normalizedText[i] === " ")) {
                     if (normalizedText[i] === ":") hasColon = true
                     chapterVerse += normalizedText[i]
                     i++
                 }
 
                 // Only proceed if valid reference or booksOnly is true
-                if ((hasColon && chapterVerse.trim().length > 0) || this.config.booksOnly) {
+                if ((hasColon && chapterVerse.trim().length > 0) || (this.config.booksOnly && !chapterVerse.trim())) {
                     let endIndex = i
                     let version = null
 
@@ -268,9 +274,6 @@ class CodexParser {
     parse(reference) {
         this.scan(reference)
 
-        // Define non-abbreviated books per SBL/Crossway
-        const nonAbbreviatedBooks = ["John", "Luke", "Acts", "Jude", "James", "Titus"]
-
         this.passages = this.found.map((passage) => {
             const book = this.bookify(passage.book)
             const testament = this.bible.old.includes(book) ? "old" : "new"
@@ -298,18 +301,17 @@ class CodexParser {
             parsedPassage.scripture = this.scripturize(parsedPassage)
             parsedPassage.valid = this._isValid(parsedPassage, passage.reference)
 
-            // Set abbr property using SBL-style rules
-            const abbrKey = Object.keys(this.abbreviations).find(
-                (abbr) => this.abbreviations[abbr].toLowerCase() === book.toLowerCase()
+            // Set abbr property using SBL-style abbreviations
+            const sblEntry = Object.entries(this.sblAbbreviations).find(
+                ([key]) => key.toLowerCase() === book.toLowerCase()
             )
-            if (nonAbbreviatedBooks.includes(book)) {
-                // Use full book name without period for non-abbreviated books
-                parsedPassage.abbr = `${book} ${passage.reference}${passage.version ? " " + passage.version : ""}`
-            } else if (abbrKey) {
-                // Use abbreviation with period for abbreviated books
-                parsedPassage.abbr = `${abbrKey}. ${passage.reference}${passage.version ? " " + passage.version : ""}`
+            if (sblEntry) {
+                const { value, abbr } = sblEntry[1]
+                parsedPassage.abbr = abbr
+                    ? `${value}. ${passage.reference}${passage.version ? " " + passage.version : ""}`
+                    : `${value} ${passage.reference}${passage.version ? " " + passage.version : ""}`
             } else {
-                // Fallback to original if no abbreviation
+                // Fallback to original
                 parsedPassage.abbr = parsedPassage.original
             }