json-bible 1.1.0 → 1.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/get.ts +12 -5
- package/lib/load.ts +2 -2
- package/package.json +1 -1
package/lib/get.ts
CHANGED
|
@@ -60,16 +60,23 @@ export function _getVerse(chapter: Chapter, index: number) {
|
|
|
60
60
|
|
|
61
61
|
// BOOK //
|
|
62
62
|
|
|
63
|
-
export function getBookNumber(numberOrNameOrId: number | string, bible?: Bible) {
|
|
63
|
+
export function getBookNumber(numberOrNameOrId: number | string, bible?: Bible, bookIndexFallback?: number) {
|
|
64
64
|
if (isNumber(numberOrNameOrId)) return Number(numberOrNameOrId)
|
|
65
|
-
if (bible?.books) return bible.books.findIndex((a) => a.name === numberOrNameOrId || a.id === numberOrNameOrId)
|
|
66
65
|
|
|
67
|
-
|
|
68
|
-
|
|
66
|
+
if (bible?.books) {
|
|
67
|
+
const bookIndex = bible.books.findIndex((a) => a.name === numberOrNameOrId || a.id === numberOrNameOrId)
|
|
68
|
+
if (bookIndex > -1) return bookIndex + 1
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
const abbrIndex = Object.entries(getDefaultBooks().data).findIndex(([id, name]) => name === numberOrNameOrId || id === numberOrNameOrId)
|
|
72
|
+
if (abbrIndex > -1) return abbrIndex + 1
|
|
73
|
+
|
|
74
|
+
if (bookIndexFallback) return bookIndexFallback + 1
|
|
75
|
+
return 0
|
|
69
76
|
}
|
|
70
77
|
|
|
71
78
|
export function getBookName(numberOrId: number | string, bible?: Bible) {
|
|
72
|
-
let bibleName = bible?.books.find((a) => a.number === numberOrId || a.id === numberOrId)
|
|
79
|
+
let bibleName = bible?.books.find((a) => Number(a.number) === numberOrId || a.number === numberOrId || a.id === numberOrId)
|
|
73
80
|
if (bibleName?.name) return bibleName.name
|
|
74
81
|
|
|
75
82
|
if (isNumber(numberOrId)) return getDefaultBooks().byNumber(Number(numberOrId))
|
package/lib/load.ts
CHANGED
|
@@ -56,9 +56,9 @@ export function validateBible(bible: Bible) {
|
|
|
56
56
|
if (!bible.books[0]?.chapters[0]?.verses[0]?.text?.length) incomplete("No initial text!")
|
|
57
57
|
|
|
58
58
|
// set book names/id if missing
|
|
59
|
-
bible.books = bible.books.map((book) => {
|
|
59
|
+
bible.books = bible.books.map((book, i) => {
|
|
60
60
|
if (!book.name) book.name = getBookName(book.id || book.number)
|
|
61
|
-
if (!book.number) book.number = getBookNumber(book.name)
|
|
61
|
+
if (!book.number) book.number = getBookNumber(book.name, bible, i)
|
|
62
62
|
if (!book.id) book.id = getDefaultBooks().ids[book.number - 1]
|
|
63
63
|
|
|
64
64
|
return book
|