@data-fair/lib-vue 1.16.0 → 1.18.0

package/async-action.d.ts

@@ -1,11 +1,13 @@
 import { type Ref } from 'vue';
 import { type PartialUiNotif, type UiNotif } from './ui-notif.js';
+type Finally = () => Promise<void>;
 type AsyncActionOptions = {
     error?: string;
     success?: PartialUiNotif;
     catch?: 'error' | 'success' | 'all';
+    finally?: Finally;
 };
-export declare function useAsyncAction<F extends (...args: any[]) => Promise<any>>(fn: F, options?: AsyncActionOptions): {
+export declare function useAsyncAction<F extends (...args: any[]) => Promise<any>>(fn: F, options?: AsyncActionOptions | Finally): {
     execute: F;
     notif: Ref<UiNotif | undefined>;
     loading: Ref<boolean>;

package/async-action.js

@@ -2,6 +2,9 @@
 import { ref, readonly, shallowReadonly, shallowRef } from 'vue'
 import { useUiNotif, getFullNotif, getErrorMsg } from './ui-notif.js'
 export function useAsyncAction (fn, options) {
+  if (typeof options === 'function') {
+    options = { finally: options }
+  }
   const { sendUiNotif } = useUiNotif()
   const notif = shallowRef()
   const loading = ref(false)
@@ -30,6 +33,9 @@ export function useAsyncAction (fn, options) {
       }
       loading.value = false
     }
+    if (options?.finally) {
+      await options?.finally()
+    }
   }
   return { execute, notif: shallowReadonly(notif), loading: readonly(loading), error: readonly(error) }
 }

package/fetch.d.ts

@@ -4,6 +4,7 @@ type UseFetchOptions = {
     query?: QueryObject | Ref<QueryObject>;
     watch?: Boolean;
     notifError?: Boolean;
+    immediate?: Boolean;
 };
 type OptionalUrl = string | null | undefined;
 export declare function useFetch<T>(url: OptionalUrl | Ref<OptionalUrl> | (() => OptionalUrl), options?: UseFetchOptions): {

package/fetch.js

@@ -18,8 +18,8 @@ export function useFetch (url, options = {}) {
   const error = shallowRef(null)
   let abortController
   const refresh = async () => {
-    if (!fullUrl.value) { return null }
     initialized.value = true
+    if (!fullUrl.value) { return null }
     error.value = null
     if (abortController) { abortController.abort() }
     loading.value = true
@@ -38,7 +38,9 @@ export function useFetch (url, options = {}) {
     return data.value
   }
   if (options.watch !== false) {
-    watch(fullUrl, refresh, { immediate: true })
+    watch(fullUrl, () => {
+      if (options.immediate !== false || initialized.value) { refresh() }
+    }, { immediate: true })
   }
   return {
     initialized: readonly(initialized),

package/package.json

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

package/ui-notif.js

@@ -63,6 +63,7 @@ export function useUiNotif () {
 export default useUiNotif
 export function withUiNotif (fn, errorMsg, successNotif) {
   const { sendUiNotif } = useUiNotif()
+  console.warn('withUiNotif is deprecated, use useAsyncAction instead')
   return async function (...args) {
     try {
       const result = await fn(...args)