json-bible 1.1.5 → 1.1.7

package/lib/search.ts

@@ -90,9 +90,12 @@ export function _bookSearch(bible: Bible, searchValue: string) {
             }
         }
 
-        // 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
     }
@@ -108,52 +111,75 @@ export function _bookSearch(bible: Bible, searchValue: string) {
 
 // TEXT SEARCH //
 
-let textSearchCache: { [key: string]: string } = {}
+const formattedTextCache = new Map<string, string>()
+function getFormattedVerse(text: string) {
+    const cached = formattedTextCache.get(text)
+    if (cached !== undefined) return cached
+
+    const formatted = formatText(text)
+    formattedTextCache.set(text, formatted)
+
+    return formatted
+}
+
+const textSearchCache = new Map<string, VerseReference[]>()
 export function _textSearch(bible: Bible, searchValue: string, limit: number, bookNumber?: number) {
     searchValue = formatText(searchValue).trim()
-    if (!searchValue.length) return []
-
-    const cacheId = searchValue + limit + (bookNumber ?? "")
-    if (textSearchCache[cacheId]) return JSON.parse(textSearchCache[cacheId]) as VerseReference[]
+    if (!searchValue) return []
 
-    const matches = bibleSearch().slice(0, limit)
+    // cache results for identical searches
+    const cacheId = `${bible.name}|${searchValue}|${limit}|${bookNumber ?? ""}`
+    const cached = textSearchCache.get(cacheId)
+    if (cached) return cached
 
-    textSearchCache[cacheId] = JSON.stringify(matches)
-    return matches
+    // split into individual words so we can match verses containing all words even if the exact phrase is absent
+    const searchWords = searchValue.split(/\s+/)
 
-    /////
+    // search in a specific book or all books
+    const books = bookNumber === undefined ? bible.books : [bible.books[getBookIndex(bible, bookNumber)]]
 
-    function bibleSearch() {
-        const searchWords = searchValue.split(" ")
-        const books = bookNumber === undefined ? bible.books : [bible.books[getBookIndex(bible, bookNumber)]]
+    const matches: VerseReference[] = []
+    for (const book of books) {
+        for (const chapter of book.chapters) {
+            const verses: number[] = []
 
-        let matches: VerseReference[] = []
+            for (const verse of chapter.verses) {
+                const verseValue = getFormattedVerse(verse.text ?? "")
 
-        for (let book of books) {
-            for (let chapter of book.chapters) {
-                let verses: number[] = []
+                // check if the full phrase exists in the verse
+                let isMatch = verseValue.includes(searchValue)
 
-                for (let verse of chapter.verses) {
-                    const verseValue = formatText(verse.text || "")
+                // or check whether every search word exists somewhere in the verse
+                if (!isMatch) {
+                    isMatch = true
 
-                    // check if the full verse, or one of the words contains the search value
-                    if (verseValue.includes(searchValue) || searchWords.every((word) => verseValue.includes(word))) {
-                        verses.push(verse.number)
+                    for (const word of searchWords) {
+                        if (!verseValue.includes(word)) {
+                            isMatch = false
+                            break
+                        }
                     }
                 }
 
-                if (verses.length) {
-                    const reference = getVerseReferences(bible, { book: book.number, chapter: chapter.number, verses })
-                    matches.push(...reference)
+                if (isMatch) verses.push(verse.number)
+            }
+
+            if (verses.length) {
+                const reference = getVerseReferences(bible, { book: book.number, chapter: chapter.number, verses })
+                matches.push(...reference)
 
-                    // return early if we have reached the limit
-                    if (matches.length >= limit) return matches
+                // return early once we have enough results
+                if (matches.length >= limit) {
+                    const result = matches.slice(0, limit)
+                    textSearchCache.set(cacheId, result)
+                    return result
                 }
             }
         }
-
-        return matches
     }
+
+    textSearchCache.set(cacheId, matches)
+    return matches
 }
 
 // HELPERS //

package/package.json

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