json-bible 1.1.2 → 1.1.4

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
         }
@@ -100,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/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/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/package.json

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