@tanstack/svelte-query 4.22.0 → 4.22.2

package/build/lib/createBaseQuery.d.ts

@@ -1,5 +1,3 @@
 import { type QueryKey, type QueryObserver } from '@tanstack/query-core';
-import type { CreateBaseQueryOptions } from './types';
-export declare function createBaseQuery<TQueryFnData, TError, TData, TQueryData, TQueryKey extends QueryKey>(options: CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>, Observer: typeof QueryObserver): {
-    subscribe: (this: void, run: import("svelte/store").Subscriber<import("@tanstack/query-core").QueryObserverResult<TData, TError>>, invalidate?: ((value?: import("@tanstack/query-core").QueryObserverResult<TData, TError> | undefined) => void) | undefined) => import("svelte/store").Unsubscriber;
-};
+import type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types';
+export declare function createBaseQuery<TQueryFnData, TError, TData, TQueryData, TQueryKey extends QueryKey>(options: CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>, Observer: typeof QueryObserver): CreateBaseQueryResult<TData, TError>;

package/build/lib/createMutation.d.ts

@@ -1,6 +1,6 @@
 import { type MutationFunction, type MutationKey } from '@tanstack/query-core';
-import type { CreateMutationOptions, MutationStoreResult } from './types';
-export declare function createMutation<TData = unknown, TError = unknown, TVariables = unknown, TContext = unknown>(options: CreateMutationOptions<TData, TError, TVariables, TContext>): MutationStoreResult<TData, TError, TVariables, TContext>;
-export declare function createMutation<TData = unknown, TError = unknown, TVariables = unknown, TContext = unknown>(mutationFn: MutationFunction<TData, TVariables>, options?: Omit<CreateMutationOptions<TData, TError, TVariables, TContext>, 'mutationFn'>): MutationStoreResult<TData, TError, TVariables, TContext>;
-export declare function createMutation<TData = unknown, TError = unknown, TVariables = unknown, TContext = unknown>(mutationKey: MutationKey, options?: Omit<CreateMutationOptions<TData, TError, TVariables, TContext>, 'mutationKey'>): MutationStoreResult<TData, TError, TVariables, TContext>;
-export declare function createMutation<TData = unknown, TError = unknown, TVariables = unknown, TContext = unknown>(mutationKey: MutationKey, mutationFn?: MutationFunction<TData, TVariables>, options?: Omit<CreateMutationOptions<TData, TError, TVariables, TContext>, 'mutationKey' | 'mutationFn'>): MutationStoreResult<TData, TError, TVariables, TContext>;
+import type { CreateMutationOptions, CreateMutationResult } from './types';
+export declare function createMutation<TData = unknown, TError = unknown, TVariables = unknown, TContext = unknown>(options: CreateMutationOptions<TData, TError, TVariables, TContext>): CreateMutationResult<TData, TError, TVariables, TContext>;
+export declare function createMutation<TData = unknown, TError = unknown, TVariables = unknown, TContext = unknown>(mutationFn: MutationFunction<TData, TVariables>, options?: Omit<CreateMutationOptions<TData, TError, TVariables, TContext>, 'mutationFn'>): CreateMutationResult<TData, TError, TVariables, TContext>;
+export declare function createMutation<TData = unknown, TError = unknown, TVariables = unknown, TContext = unknown>(mutationKey: MutationKey, options?: Omit<CreateMutationOptions<TData, TError, TVariables, TContext>, 'mutationKey'>): CreateMutationResult<TData, TError, TVariables, TContext>;
+export declare function createMutation<TData = unknown, TError = unknown, TVariables = unknown, TContext = unknown>(mutationKey: MutationKey, mutationFn?: MutationFunction<TData, TVariables>, options?: Omit<CreateMutationOptions<TData, TError, TVariables, TContext>, 'mutationKey' | 'mutationFn'>): CreateMutationResult<TData, TError, TVariables, TContext>;

package/build/lib/createQuery.d.ts

@@ -1,23 +1,23 @@
 import type { QueryFunction, QueryKey } from '@tanstack/query-core';
-import type { DefinedCreateQueryResult, CreateQueryOptions, CreateQueryStoreResult } from './types';
+import type { DefinedCreateQueryResult, CreateQueryOptions, CreateQueryResult } from './types';
 export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: Omit<CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'initialData'> & {
     initialData?: () => undefined;
-}): CreateQueryStoreResult<TData, TError>;
+}): CreateQueryResult<TData, TError>;
 export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: Omit<CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'initialData'> & {
     initialData: TQueryFnData | (() => TQueryFnData);
 }): DefinedCreateQueryResult<TData, TError>;
-export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>): CreateQueryStoreResult<TData, TError>;
+export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>): CreateQueryResult<TData, TError>;
 export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(queryKey: TQueryKey, options?: Omit<CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey' | 'initialData'> & {
     initialData?: () => undefined;
-}): CreateQueryStoreResult<TData, TError>;
+}): CreateQueryResult<TData, TError>;
 export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(queryKey: TQueryKey, options?: Omit<CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey' | 'initialData'> & {
     initialData: TQueryFnData | (() => TQueryFnData);
 }): DefinedCreateQueryResult<TData, TError>;
-export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(queryKey: TQueryKey, options?: Omit<CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey'>): CreateQueryStoreResult<TData, TError>;
+export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(queryKey: TQueryKey, options?: Omit<CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey'>): CreateQueryResult<TData, TError>;
 export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(queryKey: TQueryKey, queryFn: QueryFunction<TQueryFnData, TQueryKey>, options?: Omit<CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey' | 'queryFn' | 'initialData'> & {
     initialData?: () => undefined;
-}): CreateQueryStoreResult<TData, TError>;
+}): CreateQueryResult<TData, TError>;
 export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(queryKey: TQueryKey, queryFn: QueryFunction<TQueryFnData, TQueryKey>, options?: Omit<CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey' | 'queryFn' | 'initialData'> & {
     initialData: TQueryFnData | (() => TQueryFnData);
 }): DefinedCreateQueryResult<TData, TError>;
-export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(queryKey: TQueryKey, queryFn: QueryFunction<TQueryFnData, TQueryKey>, options?: Omit<CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey' | 'queryFn'>): CreateQueryStoreResult<TData, TError>;
+export declare function createQuery<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(queryKey: TQueryKey, queryFn: QueryFunction<TQueryFnData, TQueryKey>, options?: Omit<CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey' | 'queryFn'>): CreateQueryResult<TData, TError>;

package/build/lib/types.d.ts

@@ -9,17 +9,15 @@ export interface ContextOptions {
 }
 export interface CreateBaseQueryOptions<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends ContextOptions, QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey> {
 }
+export interface CreateBaseQueryResult<TData = unknown, TError = unknown> extends Readable<QueryObserverResult<TData, TError>> {
+}
 export interface CreateQueryOptions<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> {
 }
+export interface CreateQueryResult<TData = unknown, TError = unknown> extends CreateBaseQueryResult<TData, TError> {
+}
 export interface CreateInfiniteQueryOptions<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey> {
 }
 export declare type CreateInfiniteQueryResult<TData = unknown, TError = unknown> = Readable<InfiniteQueryObserverResult<TData, TError>>;
-export interface CreateInfiniteQueryStoreResult<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData> extends Readable<CreateInfiniteQueryResult<TData, TError>> {
-}
-export declare type CreateBaseQueryResult<TData = unknown, TError = unknown> = QueryObserverResult<TData, TError>;
-export declare type CreateQueryResult<TData = unknown, TError = unknown> = CreateBaseQueryResult<TData, TError>;
-export interface CreateQueryStoreResult<TQueryFnData = unknown, TError = unknown, TData = TQueryFnData> extends Readable<CreateQueryResult<TData, TError>> {
-}
 export declare type DefinedCreateBaseQueryResult<TData = unknown, TError = unknown> = Readable<DefinedQueryObserverResult<TData, TError>>;
 export declare type DefinedCreateQueryResult<TData = unknown, TError = unknown> = DefinedCreateBaseQueryResult<TData, TError>;
 export interface CreateMutationOptions<TData = unknown, TError = unknown, TVariables = void, TContext = unknown> extends ContextOptions, Omit<MutationObserverOptions<TData, TError, TVariables, TContext>, '_defaulted' | 'variables'> {
@@ -31,8 +29,7 @@ export declare type UseBaseMutationResult<TData = unknown, TError = unknown, TVa
 }> & {
     mutateAsync: UseMutateAsyncFunction<TData, TError, TVariables, TContext>;
 };
-export declare type CreateMutationResult<TData = unknown, TError = unknown, TVariables = unknown, TContext = unknown> = UseBaseMutationResult<TData, TError, TVariables, TContext>;
-export interface MutationStoreResult<TData = unknown, TError = unknown, TVariables = unknown, TContext = unknown> extends Readable<CreateMutationResult<TData, TError, TVariables, TContext>> {
+export interface CreateMutationResult<TData = unknown, TError = unknown, TVariables = unknown, TContext = unknown> extends Readable<UseBaseMutationResult<TData, TError, TVariables, TContext>> {
 }
 declare type Override<A, B> = {
     [K in keyof A]: K extends keyof B ? B[K] : A[K];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/svelte-query",
-  "version": "4.22.0",
+  "version": "4.22.2",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Svelte",
   "author": "Dre Johnson",
   "license": "MIT",
@@ -14,14 +14,12 @@
   "module": "build/lib/index.js",
   "type": "module",
   "devDependencies": {
-    "@sveltejs/adapter-auto": "^1.0.0",
-    "@sveltejs/kit": "^1.0.0",
     "@sveltejs/package": "^1.0.0",
+    "@sveltejs/vite-plugin-svelte": "^2.0.2",
     "@testing-library/svelte": "^3.2.2",
     "@vitest/coverage-istanbul": "^0.26.3",
     "eslint-plugin-svelte": "^2.14.1",
     "jsdom": "^20.0.3",
-    "rimraf": "^3.0.2",
     "svelte": "^3.54.0",
     "svelte-check": "^2.9.2",
     "tslib": "^2.4.1",
@@ -46,9 +44,11 @@
   ],
   "scripts": {
     "clean": "rimraf ./build",
-    "build": "svelte-kit sync && svelte-package && rimraf ./build/lib/package.json",
-    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
-    "test:eslint": "svelte-kit sync && ../../node_modules/.bin/eslint --ext .svelte,.ts ./src",
-    "test:jest": "svelte-kit sync && vitest run --coverage"
+    "test:types": "svelte-check --tsconfig ./tsconfig.json",
+    "test:eslint": "eslint --ext .svelte,.ts ./src",
+    "test:lib": "vitest run --coverage true",
+    "test:lib:dev": "vitest watch",
+    "test:lib:publish": "vitest run --coverage false",
+    "build": "svelte-package && rimraf ./build/lib/package.json"
   }
 }

package/src/__tests__/CreateMutation.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { createMutation, QueryClient } from '../lib'
-  import { setQueryClientContext } from '../lib/context'
+  import { createMutation, QueryClient } from '../index'
+  import { setQueryClientContext } from '../context'
 
   export let queryFn: () => Promise<string>
 

package/src/__tests__/CreateQuery.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { createQuery, QueryClient } from '../lib'
-  import { setQueryClientContext } from '../lib/context'
+  import { createQuery, QueryClient } from '../index'
+  import { setQueryClientContext } from '../context'
 
   export let queryKey: Array<string>
   export let queryFn: () => Promise<string>

package/src/__tests__/utils.ts

@@ -4,7 +4,7 @@ import {
   QueryClient,
   type QueryClientConfig,
   type MutationOptions,
-} from '../lib'
+} from '../index'
 
 export function createQueryClient(config?: QueryClientConfig): QueryClient {
   vi.spyOn(console, 'error').mockImplementation(() => undefined)

package/src/{lib/createBaseQuery.ts → createBaseQuery.ts}

@@ -3,7 +3,7 @@ import {
   type QueryKey,
   type QueryObserver,
 } from '@tanstack/query-core'
-import type { CreateBaseQueryOptions } from './types'
+import type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types'
 import { useQueryClient } from './useQueryClient'
 import { derived, readable } from 'svelte/store'
 
@@ -22,7 +22,7 @@ export function createBaseQuery<
     TQueryKey
   >,
   Observer: typeof QueryObserver,
-) {
+): CreateBaseQueryResult<TData, TError> {
   const queryClient = useQueryClient()
   const defaultedOptions = queryClient.defaultQueryOptions(options)
   defaultedOptions._optimisticResults = 'optimistic'

package/src/{lib/createMutation.ts → createMutation.ts}

@@ -9,7 +9,7 @@ import {
 import type {
   UseMutateFunction,
   CreateMutationOptions,
-  MutationStoreResult,
+  CreateMutationResult,
 } from './types'
 import { useQueryClient } from './useQueryClient'
 
@@ -20,7 +20,7 @@ export function createMutation<
   TContext = unknown,
 >(
   options: CreateMutationOptions<TData, TError, TVariables, TContext>,
-): MutationStoreResult<TData, TError, TVariables, TContext>
+): CreateMutationResult<TData, TError, TVariables, TContext>
 
 export function createMutation<
   TData = unknown,
@@ -33,7 +33,7 @@ export function createMutation<
     CreateMutationOptions<TData, TError, TVariables, TContext>,
     'mutationFn'
   >,
-): MutationStoreResult<TData, TError, TVariables, TContext>
+): CreateMutationResult<TData, TError, TVariables, TContext>
 
 export function createMutation<
   TData = unknown,
@@ -46,7 +46,7 @@ export function createMutation<
     CreateMutationOptions<TData, TError, TVariables, TContext>,
     'mutationKey'
   >,
-): MutationStoreResult<TData, TError, TVariables, TContext>
+): CreateMutationResult<TData, TError, TVariables, TContext>
 
 export function createMutation<
   TData = unknown,
@@ -60,7 +60,7 @@ export function createMutation<
     CreateMutationOptions<TData, TError, TVariables, TContext>,
     'mutationKey' | 'mutationFn'
   >,
-): MutationStoreResult<TData, TError, TVariables, TContext>
+): CreateMutationResult<TData, TError, TVariables, TContext>
 
 export function createMutation<
   TData = unknown,
@@ -76,7 +76,7 @@ export function createMutation<
     | MutationFunction<TData, TVariables>
     | CreateMutationOptions<TData, TError, TVariables, TContext>,
   arg3?: CreateMutationOptions<TData, TError, TVariables, TContext>,
-): MutationStoreResult<TData, TError, TVariables, TContext> {
+): CreateMutationResult<TData, TError, TVariables, TContext> {
   const options = parseMutationArgs(arg1, arg2, arg3)
   const queryClient = useQueryClient()
   let observer = new MutationObserver<TData, TError, TVariables, TContext>(

package/src/{lib/createQuery.ts → createQuery.ts}

@@ -4,7 +4,7 @@ import { createBaseQuery } from './createBaseQuery'
 import type {
   DefinedCreateQueryResult,
   CreateQueryOptions,
-  CreateQueryStoreResult,
+  CreateQueryResult,
 } from './types'
 
 export function createQuery<
@@ -19,7 +19,7 @@ export function createQuery<
   > & {
     initialData?: () => undefined
   },
-): CreateQueryStoreResult<TData, TError>
+): CreateQueryResult<TData, TError>
 
 export function createQuery<
   TQueryFnData = unknown,
@@ -42,7 +42,7 @@ export function createQuery<
   TQueryKey extends QueryKey = QueryKey,
 >(
   options: CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-): CreateQueryStoreResult<TData, TError>
+): CreateQueryResult<TData, TError>
 
 export function createQuery<
   TQueryFnData = unknown,
@@ -55,7 +55,7 @@ export function createQuery<
     CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
     'queryKey' | 'initialData'
   > & { initialData?: () => undefined },
-): CreateQueryStoreResult<TData, TError>
+): CreateQueryResult<TData, TError>
 
 export function createQuery<
   TQueryFnData = unknown,
@@ -81,7 +81,7 @@ export function createQuery<
     CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
     'queryKey'
   >,
-): CreateQueryStoreResult<TData, TError>
+): CreateQueryResult<TData, TError>
 
 export function createQuery<
   TQueryFnData = unknown,
@@ -95,7 +95,7 @@ export function createQuery<
     CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
     'queryKey' | 'queryFn' | 'initialData'
   > & { initialData?: () => undefined },
-): CreateQueryStoreResult<TData, TError>
+): CreateQueryResult<TData, TError>
 
 export function createQuery<
   TQueryFnData = unknown,
@@ -123,7 +123,7 @@ export function createQuery<
     CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
     'queryKey' | 'queryFn'
   >,
-): CreateQueryStoreResult<TData, TError>
+): CreateQueryResult<TData, TError>
 
 export function createQuery<
   TQueryFnData,
@@ -136,7 +136,7 @@ export function createQuery<
     | QueryFunction<TQueryFnData, TQueryKey>
     | CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
   arg3?: CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-): CreateQueryStoreResult<TData, TError> {
+): CreateQueryResult<TData, TError> {
   const parsedOptions = parseQueryArgs(arg1, arg2, arg3)
   const result = createBaseQuery(parsedOptions, QueryObserver)
   return result

package/src/{lib/types.ts → types.ts}

@@ -28,6 +28,9 @@ export interface CreateBaseQueryOptions<
 > extends ContextOptions,
     QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey> {}
 
+export interface CreateBaseQueryResult<TData = unknown, TError = unknown>
+  extends Readable<QueryObserverResult<TData, TError>> {}
+
 export interface CreateQueryOptions<
   TQueryFnData = unknown,
   TError = unknown,
@@ -41,6 +44,9 @@ export interface CreateQueryOptions<
     TQueryKey
   > {}
 
+export interface CreateQueryResult<TData = unknown, TError = unknown>
+  extends CreateBaseQueryResult<TData, TError> {}
+
 export interface CreateInfiniteQueryOptions<
   TQueryFnData = unknown,
   TError = unknown,
@@ -60,28 +66,6 @@ export type CreateInfiniteQueryResult<
   TError = unknown,
 > = Readable<InfiniteQueryObserverResult<TData, TError>>
 
-export interface CreateInfiniteQueryStoreResult<
-  TQueryFnData = unknown,
-  TError = unknown,
-  TData = TQueryFnData,
-> extends Readable<CreateInfiniteQueryResult<TData, TError>> {}
-
-export type CreateBaseQueryResult<
-  TData = unknown,
-  TError = unknown,
-> = QueryObserverResult<TData, TError>
-
-export type CreateQueryResult<
-  TData = unknown,
-  TError = unknown,
-> = CreateBaseQueryResult<TData, TError>
-
-export interface CreateQueryStoreResult<
-  TQueryFnData = unknown,
-  TError = unknown,
-  TData = TQueryFnData,
-> extends Readable<CreateQueryResult<TData, TError>> {}
-
 export type DefinedCreateBaseQueryResult<
   TData = unknown,
   TError = unknown,
@@ -129,18 +113,13 @@ export type UseBaseMutationResult<
   { mutate: UseMutateFunction<TData, TError, TVariables, TContext> }
 > & { mutateAsync: UseMutateAsyncFunction<TData, TError, TVariables, TContext> }
 
-export type CreateMutationResult<
+export interface CreateMutationResult<
   TData = unknown,
   TError = unknown,
   TVariables = unknown,
   TContext = unknown,
-> = UseBaseMutationResult<TData, TError, TVariables, TContext>
-
-export interface MutationStoreResult<
-  TData = unknown,
-  TError = unknown,
-  TVariables = unknown,
-  TContext = unknown,
-> extends Readable<CreateMutationResult<TData, TError, TVariables, TContext>> {}
+> extends Readable<
+    UseBaseMutationResult<TData, TError, TVariables, TContext>
+  > {}
 
 type Override<A, B> = { [K in keyof A]: K extends keyof B ? B[K] : A[K] }