json-bible 1.1.3 → 1.1.5

package/lib/api/get.ts

@@ -103,7 +103,8 @@ export default function ApiBibleHelper(key: string, customApiUrl?: string) {
 // HTTP
 
 export function fetchWrapper(url: string, headers: any, cacheTimeDays: number) {
-    if (getCachedContent(url)) return Promise.resolve(getCachedContent(url, cacheTimeDays))
+    const cached = getCachedContent(url, cacheTimeDays)
+    if (cached) return Promise.resolve(cached)
 
     // console.info("Fetching:", url)
     return fetch(url, { headers })

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/reference.ts

@@ -127,7 +127,7 @@ function referenceStringToId(ref: string) {
 // "Genesis 1:1-3" = { book: "Genesis ", chapter: 1, verses: [1, 2, 3] }
 function splitReferenceString(ref: string) {
     // (:,.) allowed between chapter/verse - (-+) allowed between verses
-    const regex = /(?<book>(?:\d+\.?\s?)?[\p{L}](?:[\p{L}\s']*[\p{L}])?)(?:\s(?<chapter>\d+))?(?:[:,.](?<verses>[0-9,.\-+]+))?/u
+    const regex = /(?<book>(?:\d+\.?\s?)?[\p{L}\p{M}](?:[\p{L}\p{M}\s']*[\p{L}\p{M}])?)(?:\s(?<chapter>\d+))?(?:[:,.](?<verses>[0-9,.\-+]+))?/u
     const match = ref.match(regex)
 
     if (!match) return { book: "", chapter: "", verses: "" }

package/lib/search.ts

@@ -70,13 +70,23 @@ 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]
+                }
             }
         }
 

package/package.json

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