json-bible 1.1.4 → 1.1.6

package/lib/get.ts

@@ -145,6 +145,7 @@ export function formatText(value: string, html: boolean = false) {
 }
 
 function getVerseNumber(verse: Verse) {
+    if (verse.number === undefined) return ""
     let number = verse.number.toString()
     if (verse.endNumber) number += `-${verse.endNumber}`
     return number

package/lib/search.ts

@@ -70,19 +70,32 @@ export function _bookSearch(bible: Bible, searchValue: string) {
             if (bookName.includes(name)) matches.push(book)
         }
 
+        // remove any books that starts with the full name of another book (e.g. Johannes vs Johannes' Åpenbaring)
+        if (matches.length > 1) {
+            const shortestMatchName = matches.reduce((shortest, book) => (book.name.length < shortest.length ? book.name : shortest), matches[0].name)
+            matches = matches.filter((a) => a.name === shortestMatchName || !a.name.startsWith(shortestMatchName))
+        }
+
         const booksStartingWithSearch = bible.books.filter((a) => removeSpaces(formatText(a.name)).startsWith(name))
 
         // find any abbreviation matches
         if (booksStartingWithSearch.length < 2) {
             for (let book of bible.books) {
-                let abbr = getDefaultBooks().ids[book.number - 1] || ""
-                if (abbr.toLowerCase() === name) return [book]
+                if (book.abbreviation?.toLowerCase() === name) return [book]
+                // only match by index if books count are 66
+                if (bible.books.length === 66) {
+                    let abbr = getDefaultBooks().ids[book.number - 1] || ""
+                    if (abbr.toLowerCase() === name) return [book]
+                }
             }
         }
 
-        // remove books with numbers if no number at search start (John)
+        // remove books with numbers if no number at search start (John) - when there are matches
         const hasNum = (str: string) => /\d/.test(str)
-        if (!hasNum(name[0])) matches = matches.filter((book) => !hasNum(book.name))
+        if (!hasNum(name[0]) && name.length > 1) {
+            const noNumberMatches = matches.filter((book) => !hasNum(book.name))
+            if (noNumberMatches.length) matches = noNumberMatches
+        }
 
         return matches
     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "json-bible",
     "description": "Universal JSON Bible Format",
-    "version": "1.1.4",
+    "version": "1.1.6",
     "main": "index.js",
     "type": "module",
     "scripts": {