@data-fair/lib-vue 1.26.0 → 1.27.1

package/fetch.d.ts

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

package/fetch.js

@@ -4,10 +4,11 @@ import { computed, watch, ref, shallowRef, readonly, shallowReadonly, toValue }
 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 = toValue(url);
+        const waitFor = toValue(options.waitFor);
+        if (waitFor === false)
+            return null;
         if (!fullUrl)
             return null;
         const query = toValue(options.query);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-vue",
-  "version": "1.26.0",
+  "version": "1.27.1",
   "description": "Composables and other utilities for Vue applications in the data-fair stack.",
   "main": "index.js",
   "files": [
@@ -17,7 +17,8 @@
     "dayjs": "1",
     "ofetch": "1",
     "reconnecting-websocket": "4",
-    "vue": "3"
+    "vue": "3",
+    "vue-router": "4 || 5"
   },
   "peerDependenciesMeta": {
     "reconnecting-websocket": {
@@ -25,6 +26,9 @@
     },
     "dayjs": {
       "optional": true
+    },
+    "vue-router": {
+      "optional": true
     }
   },
   "dependencies": {
@@ -36,7 +40,7 @@
   },
   "devDependencies": {
     "reconnecting-websocket": "^4.4.0",
-    "vue-router": "^4.4.5"
+    "vue-router": "^5.0.3"
   },
   "type": "module"
 }

package/reactive-search-params.d.ts

@@ -1,8 +1,15 @@
-import type { App } from 'vue';
-import type { Router } from 'vue-router';
-export declare function getReactiveSearchParams(router?: Router): Record<string, string>;
+import type { App, ShallowRef } from 'vue';
+interface ReactiveSearchParamsRouter {
+    currentRoute: ShallowRef<{
+        query: Record<string, string | null | (string | null)[]>;
+    }>;
+    replace: (to: {
+        query: Record<string, string>;
+    }) => unknown;
+}
+export declare function getReactiveSearchParams(router?: ReactiveSearchParamsRouter): Record<string, string>;
 export declare const reactiveSearchParamsKey: unique symbol;
-export declare function createReactiveSearchParams(router?: Router): {
+export declare function createReactiveSearchParams(router?: ReactiveSearchParamsRouter): {
     install(app: App): void;
     state: Record<string, string>;
 };

package/session.d.ts

@@ -1,7 +1,9 @@
 import { type IncomingMessage } from 'node:http';
 import { type Ref, type ComputedRef, type App } from 'vue';
-import { type RouteLocation } from 'vue-router';
 import { type fetch } from 'ofetch';
+interface RouteLocationLike {
+    fullPath: string;
+}
 import { type AccountKeys, type SessionState, type SessionStateAuthenticated } from '@data-fair/lib-common-types/session/index.js';
 export * from '@data-fair/lib-common-types/session/index.js';
 interface GenericCookies {
@@ -13,7 +15,7 @@ export interface SessionOptions {
     sitePath: string;
     directoryUrl: string;
     defaultLang: string;
-    route?: RouteLocation;
+    route?: RouteLocationLike;
     logoutRedirectUrl?: string;
     req?: IncomingMessage;
     cookies?: GenericCookies;