@data-fair/lib-vue 1.2.1 → 1.4.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.2.1",
+  "version": "1.4.0",
   "description": "Composables and other utilities for Vue applications in the data-fair stack.",
   "main": "index.js",
   "files": [

package/reactive-search-params.js

@@ -105,7 +105,7 @@ export const useBooleanSearchParam = (key, options = {}) => {
   const defaultValue = typeof options === 'boolean' ? options : (options.default ?? false)
   const strings = (typeof options !== 'boolean' && options.strings) || ['1', '0']
   return computed({
-    get: () => key in reactiveSearchParams ? reactiveSearchParams[key] === strings[0] : defaultValue,
+    get: () => key in reactiveSearchParams ? (reactiveSearchParams[key] === strings[0] || reactiveSearchParams[key] === 'true') : defaultValue,
     set: (value) => {
       if (value === defaultValue) { delete reactiveSearchParams[key] } else { reactiveSearchParams[key] = value ? strings[0] : strings[1] }
     }

package/session.d.ts

@@ -1,5 +1,5 @@
 import { type IncomingMessage } from 'node:http';
-import { type Ref, App } from 'vue';
+import { type Ref, type ComputedRef, type App } from 'vue';
 import { type RouteLocation } from 'vue-router';
 import { type fetch } from 'ofetch';
 import { type SessionState, type SessionStateAuthenticated } from '@data-fair/lib-common-types/session/index.js';
@@ -20,6 +20,12 @@ export interface SessionOptions {
 }
 export interface Session {
     state: SessionState;
+    user: ComputedRef<SessionState['user']>;
+    organization: ComputedRef<SessionState['organization']>;
+    account: ComputedRef<SessionState['account']>;
+    accountRole: ComputedRef<SessionState['accountRole']>;
+    lang: ComputedRef<SessionState['lang']>;
+    dark: ComputedRef<SessionState['dark']>;
     loginUrl: (redirect?: string, extraParams?: Record<string, string>, immediateRedirect?: true) => string;
     login: (redirect?: string, extraParams?: Record<string, string>, immediateRedirect?: true) => void;
     logout: (redirect?: string) => Promise<void>;
@@ -35,12 +41,21 @@ 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;
 export declare function createSession(initOptions: Partial<SessionOptions>): Promise<{
     install(app: App): void;
     state: SessionState;
+    user: ComputedRef<SessionState["user"]>;
+    organization: ComputedRef<SessionState["organization"]>;
+    account: ComputedRef<SessionState["account"]>;
+    accountRole: ComputedRef<SessionState["accountRole"]>;
+    lang: ComputedRef<SessionState["lang"]>;
+    dark: ComputedRef<SessionState["dark"]>;
     loginUrl: (redirect?: string, extraParams?: Record<string, string>, immediateRedirect?: true) => string;
     login: (redirect?: string, extraParams?: Record<string, string>, immediateRedirect?: true) => void;
     logout: (redirect?: string) => Promise<void>;

package/session.js

@@ -218,6 +218,12 @@ export async function getSession (initOptions) {
   }
   const session = {
     state,
+    organization: computed(() => state.organization),
+    user: computed(() => state.user),
+    account: computed(() => state.account),
+    accountRole: computed(() => state.accountRole),
+    dark: computed(() => state.dark),
+    lang: computed(() => state.lang),
     loginUrl,
     login,
     logout,