fix: support passing all UseVisitorDataOptions to getData function

fingerprintjs · Jul 19, 2024 · 0506079 · 0506079
1 parent 4d4af09
commit 0506079
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/lib/useVisitorData.ts b/src/lib/useVisitorData.ts
@@ -22,7 +22,7 @@ import type { UseGetVisitorDataResult, UseVisitorDataOptions } from './useVisito
  * ```
  * */
 export function useVisitorData<TExtended extends boolean>(
-  { ignoreCache: defaultIgnoreCache, ...options }: UseVisitorDataOptions<TExtended>,
+  topLevelOptions: UseVisitorDataOptions<TExtended>,
   { immediate = true }: FpjsSvelteQueryOptions = {}
 ): UseGetVisitorDataResult<TExtended> {
   const dataValue = writable<VisitorData<TExtended> | undefined>(undefined)
@@ -34,11 +34,13 @@ export function useVisitorData<TExtended extends boolean>(
   const getData: UseGetVisitorDataResult<TExtended>['getData'] = async (getDataOptions) => {
     loadingValue.set(true)
 
-    const ignoreCache =
-      typeof getDataOptions?.ignoreCache === 'boolean' ? getDataOptions.ignoreCache : defaultIgnoreCache
+    const options: UseVisitorDataOptions<TExtended> = {
+      ...(topLevelOptions ?? {}),
+      ...(getDataOptions ?? {}),
+    }
 
     try {
-      const result = await context.getVisitorData(options, ignoreCache)
+      const result = await context.getVisitorData(options, options.ignoreCache)
 
       dataValue.set(result)
       errorValue.set(undefined)

diff --git a/src/lib/useVisitorData.types.ts b/src/lib/useVisitorData.types.ts
@@ -1,4 +1,4 @@
-import type { GetOptions, VisitorData } from '@fingerprintjs/fingerprintjs-pro-spa'
+import type { FingerprintJSPro, VisitorData } from '@fingerprintjs/fingerprintjs-pro-spa'
 import type { FpjsVisitorQueryData, GetDataOptions } from './types'
 import type { Writable } from 'svelte/store'
 
@@ -8,7 +8,8 @@ export type UseGetVisitorDataResult<TExtended extends boolean> = {
   /**
    * Fetches visitor data.
    * */
-  getData: (options?: GetDataOptions) => Promise<VisitorData<TExtended> | undefined>
+  getData: (options?: UseVisitorDataOptions<TExtended>) => Promise<VisitorData<TExtended> | undefined>
 }
 
-export type UseVisitorDataOptions<TExtended extends boolean> = GetOptions<TExtended> & Partial<GetDataOptions>
+export type UseVisitorDataOptions<TExtended extends boolean> = FingerprintJSPro.GetOptions<TExtended> &
+  Partial<GetDataOptions>