@data-fair/lib-vue 1.5.0 → 1.7.0

package/fetch.d.ts

@@ -3,11 +3,13 @@ import type { Ref } from 'vue';
 type UseFetchOptions = {
     query?: QueryObject | Ref<QueryObject>;
     watch?: Boolean;
+    notifError?: Boolean;
 };
-export declare function useFetch<T>(url: string | Ref<string>, options?: UseFetchOptions): {
-    data: [T | null] extends [Ref<any, any>] ? import("@vue/shared").IfAny<Ref<any, any> & T, Ref<Ref<any, any> & T, Ref<any, any> & T>, Ref<any, any> & T> : Ref<import("vue").UnwrapRef<T> | null, T | import("vue").UnwrapRef<T> | null>;
-    loading: Ref<boolean, boolean>;
-    refresh: () => Promise<void>;
-    initialFetch: () => Promise<void>;
+export declare function useFetch<T>(url: string | Ref<string> | (() => string), options?: UseFetchOptions): {
+    data: Ref<T | null>;
+    loading: Ref<boolean>;
+    initialized: Ref<boolean>;
+    error: Ref<any>;
+    refresh: (() => Promise<T | null>);
 };
 export default useFetch;

package/fetch.js

@@ -4,6 +4,7 @@ import { computed, isRef, watch, ref } from 'vue'
 import { useUiNotif } from '@data-fair/lib-vue/ui-notif.js'
 export function useFetch (url, options = {}) {
   const { sendUiNotif } = useUiNotif()
+  if (typeof url === 'function') { url = computed(url) }
   const fullUrl = computed(() => {
     let fullUrl = isRef(url) ? url.value : url
     const query = isRef(options.query) ? options.query.value : options.query
@@ -12,25 +13,31 @@ export function useFetch (url, options = {}) {
   })
   const data = ref(null)
   const loading = ref(false)
+  const initialized = ref(false)
+  const error = ref(null)
   let abortController
   const refresh = async () => {
+    initialized.value = true
+    error.value = null
     if (abortController) { abortController.abort() }
     loading.value = true
     abortController = new AbortController()
     try {
       data.value = await ofetch(fullUrl.value, { signal: abortController.signal })
-    } catch (error) {
-      if (error.name !== 'AbortError') { sendUiNotif({ msg: '', error }) }
+    } catch (err) {
+      if (err.name !== 'AbortError') {
+        error.value = err
+        if (options.notifError !== false) {
+          sendUiNotif({ msg: '', error: err })
+        }
+      }
     }
     loading.value = false
-  }
-  const initialFetch = async () => {
-    if (loading.value || data.value) { return }
-    await refresh()
+    return data.value
   }
   if (options.watch !== false) {
     watch(fullUrl, refresh, { immediate: true })
   }
-  return { data, loading, refresh, initialFetch }
+  return { initialized, data, loading, refresh, error }
 }
 export default useFetch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-vue",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Composables and other utilities for Vue applications in the data-fair stack.",
   "main": "index.js",
   "files": [