json-bible 1.1.0 → 1.1.2

package/lib/get.ts

@@ -60,16 +60,23 @@ export function _getVerse(chapter: Chapter, index: number) {
 
 // BOOK //
 
-export function getBookNumber(numberOrNameOrId: number | string, bible?: Bible) {
+export function getBookNumber(numberOrNameOrId: number | string, bible?: Bible, bookIndexFallback?: number) {
     if (isNumber(numberOrNameOrId)) return Number(numberOrNameOrId)
-    if (bible?.books) return bible.books.findIndex((a) => a.name === numberOrNameOrId || a.id === numberOrNameOrId)
 
-    const index = Object.entries(getDefaultBooks().data).findIndex(([id, name]) => name === numberOrNameOrId || id === numberOrNameOrId)
-    return index + 1
+    if (bible?.books) {
+        const bookIndex = bible.books.findIndex((a) => a.name === numberOrNameOrId || a.id === numberOrNameOrId)
+        if (bookIndex > -1) return bookIndex + 1
+    }
+
+    const abbrIndex = Object.entries(getDefaultBooks().data).findIndex(([id, name]) => name === numberOrNameOrId || id === numberOrNameOrId)
+    if (abbrIndex > -1) return abbrIndex + 1
+
+    if (bookIndexFallback) return bookIndexFallback + 1
+    return 0
 }
 
 export function getBookName(numberOrId: number | string, bible?: Bible) {
-    let bibleName = bible?.books.find((a) => a.number === numberOrId || a.id === numberOrId)
+    let bibleName = bible?.books.find((a) => Number(a.number) === numberOrId || a.number === numberOrId || a.id === numberOrId)
     if (bibleName?.name) return bibleName.name
 
     if (isNumber(numberOrId)) return getDefaultBooks().byNumber(Number(numberOrId))

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
-    bible.books = bible.books.map((book) => {
+    // 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)
         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.0",
+    "version": "1.1.2",
     "main": "index.js",
     "type": "module",
     "scripts": {