@data-fair/lib-vue 1.3.0 → 1.5.0

package/fetch.d.ts

@@ -2,10 +2,12 @@ import type { QueryObject } from 'ufo';
 import type { Ref } from 'vue';
 type UseFetchOptions = {
     query?: QueryObject | Ref<QueryObject>;
+    watch?: 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 default useFetch;

package/fetch.js

@@ -12,16 +12,25 @@ export function useFetch (url, options = {}) {
   })
   const data = ref(null)
   const loading = ref(false)
+  let abortController
   const refresh = async () => {
+    if (abortController) { abortController.abort() }
     loading.value = true
+    abortController = new AbortController()
     try {
-      data.value = await ofetch(fullUrl.value)
+      data.value = await ofetch(fullUrl.value, { signal: abortController.signal })
     } catch (error) {
-      sendUiNotif({ msg: '', error })
+      if (error.name !== 'AbortError') { sendUiNotif({ msg: '', error }) }
     }
     loading.value = false
   }
-  watch(fullUrl, refresh, { immediate: true })
-  return { data, loading, refresh }
+  const initialFetch = async () => {
+    if (loading.value || data.value) { return }
+    await refresh()
+  }
+  if (options.watch !== false) {
+    watch(fullUrl, refresh, { immediate: true })
+  }
+  return { data, loading, refresh, initialFetch }
 }
 export default useFetch

package/package.json

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

package/session.d.ts

@@ -41,6 +41,9 @@ export interface Session {
 }
 export type SessionAuthenticated = Session & {
     state: SessionStateAuthenticated;
+    user: ComputedRef<SessionStateAuthenticated['user']>;
+    account: ComputedRef<SessionStateAuthenticated['account']>;
+    accountRole: ComputedRef<SessionStateAuthenticated['accountRole']>;
 };
 export declare function getSession(initOptions: Partial<SessionOptions>): Promise<Session>;
 export declare const sessionKey: unique symbol;