json-bible 1.1.1 → 1.1.3

package/lib/api/get.ts

@@ -45,6 +45,8 @@ export default function ApiBibleHelper(key: string, customApiUrl?: string) {
 
         // GEN
         async function getChapters(bookId: string) {
+            if (!bookId) return { json: [], chaptersData: [] }
+
             const chaptersData = await getApiChapters(bookId)
 
             const json = chaptersData.map((chapter) => {
@@ -87,6 +89,7 @@ export default function ApiBibleHelper(key: string, customApiUrl?: string) {
 
         // no api key needed, just the bible id
         async function contentSearch(query: string, { limit } = { limit: 20 }) {
+            query = encodeURIComponent(query.trim())
             const url = `${bibleUrl}/search?query=${query}&limit=${limit}`
             return ((await fetchWrapper(url, headers, 14)) as BibleContentSearchResult).verses
         }

package/lib/api/index.ts

@@ -273,6 +273,7 @@ export async function ApiBible(apiKey: string, bibleKey: string, apiUrl?: string
      */
     async function textSearch(value: string, limit: number = 50) {
         const result = await bibleData.contentSearch(value, { limit })
+        if (!result) return []
 
         // convert result to VerseReference[]
         return result.map((r) => {

package/lib/load.ts

@@ -1,6 +1,7 @@
 import { Bible } from "./Bible"
 import { getDefaultBooks } from "./defaults"
 import { getBookName, getBookNumber } from "./get"
+import { isNumber } from "./util"
 
 export async function bibleFromFile(filePath: string) {
     let content = ""
@@ -55,12 +56,14 @@ export function validateBible(bible: Bible) {
     if (!bible.books[0]?.chapters[0]?.verses?.length) incomplete("No initial verses!")
     if (!bible.books[0]?.chapters[0]?.verses[0]?.text?.length) incomplete("No initial text!")
 
-    // set book names/id if missing
+    // set book names/id/number if missing
     bible.books = bible.books.map((book, i) => {
         if (!book.name) book.name = getBookName(book.id || book.number)
-        if (!book.number) book.number = getBookNumber(book.name, bible, i)
         if (!book.id) book.id = getDefaultBooks().ids[book.number - 1]
 
+        if (!book.number || !isNumber(book.number)) book.number = getBookNumber(book.name, bible, i)
+        if (typeof book.number === "string") book.number = Number(book.number)
+
         return book
     })
 

package/lib/search.ts

@@ -70,10 +70,14 @@ export function _bookSearch(bible: Bible, searchValue: string) {
             if (bookName.includes(name)) matches.push(book)
         }
 
+        const booksStartingWithSearch = bible.books.filter((a) => removeSpaces(formatText(a.name)).startsWith(name))
+
         // find any abbreviation matches
-        for (let book of bible.books) {
-            let abbr = getDefaultBooks().ids[book.number - 1] || ""
-            if (abbr.toLowerCase() === name) return [book]
+        if (booksStartingWithSearch.length < 2) {
+            for (let book of bible.books) {
+                let abbr = getDefaultBooks().ids[book.number - 1] || ""
+                if (abbr.toLowerCase() === name) return [book]
+            }
         }
 
         // remove books with numbers if no number at search start (John)

package/package.json

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