From 96d9671fab03ab223479b5124e3a0444fc821ce5 Mon Sep 17 00:00:00 2001 From: Arnoud de Vries <6420061+arnoud-dv@users.noreply.github.com> Date: Tue, 6 Aug 2024 20:32:35 +0200 Subject: [PATCH] fix(angular-query): reorder query function declarations --- .../etc/angular-query-experimental.api.md | 15 ++++++++------- .../src/infinite-query-options.ts | 8 ++++---- .../src/inject-infinite-query.ts | 8 ++++---- .../src/query-options.ts | 8 ++++---- packages/angular-query-experimental/tsconfig.json | 6 ++++++ 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/packages/angular-query-experimental/etc/angular-query-experimental.api.md b/packages/angular-query-experimental/etc/angular-query-experimental.api.md index db449b52a5..aae6ed1093 100644 --- a/packages/angular-query-experimental/etc/angular-query-experimental.api.md +++ b/packages/angular-query-experimental/etc/angular-query-experimental.api.md @@ -12,6 +12,7 @@ import type { EnvironmentProviders } from '@angular/core'; import type { InfiniteData } from '@tanstack/query-core'; import type { InfiniteQueryObserverOptions } from '@tanstack/query-core'; import type { InfiniteQueryObserverResult } from '@tanstack/query-core'; +import type { InitialDataFunction } from '@tanstack/query-core'; import { InjectOptions } from '@angular/core'; import { Injector } from '@angular/core'; import type { MutateFunction } from '@tanstack/query-core'; @@ -120,20 +121,20 @@ export type DefinedInitialDataOptions, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(options: UndefinedInitialDataInfiniteOptions): UndefinedInitialDataInfiniteOptions & { +export function infiniteQueryOptions, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(options: DefinedInitialDataInfiniteOptions): DefinedInitialDataInfiniteOptions & { queryKey: DataTag>; }; // @public -export function infiniteQueryOptions, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(options: DefinedInitialDataInfiniteOptions): DefinedInitialDataInfiniteOptions & { +export function infiniteQueryOptions, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(options: UndefinedInitialDataInfiniteOptions): UndefinedInitialDataInfiniteOptions & { queryKey: DataTag>; }; // @public -export function injectInfiniteQuery, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(optionsFn: (client: QueryClient) => UndefinedInitialDataInfiniteOptions, injector?: Injector): CreateInfiniteQueryResult; +export function injectInfiniteQuery, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(optionsFn: (client: QueryClient) => DefinedInitialDataInfiniteOptions, injector?: Injector): DefinedCreateInfiniteQueryResult; // @public -export function injectInfiniteQuery, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(optionsFn: (client: QueryClient) => DefinedInitialDataInfiniteOptions, injector?: Injector): DefinedCreateInfiniteQueryResult; +export function injectInfiniteQuery, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(optionsFn: (client: QueryClient) => UndefinedInitialDataInfiniteOptions, injector?: Injector): CreateInfiniteQueryResult; // @public export function injectInfiniteQuery, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown>(optionsFn: (client: QueryClient) => CreateInfiniteQueryOptions, injector?: Injector): CreateInfiniteQueryResult; @@ -224,12 +225,12 @@ GetResults ]> : T extends Array> ? Array> : Array; // @public -export function queryOptions(options: UndefinedInitialDataOptions): UndefinedInitialDataOptions & { +export function queryOptions(options: DefinedInitialDataOptions): DefinedInitialDataOptions & { queryKey: DataTag; }; // @public -export function queryOptions(options: DefinedInitialDataOptions): DefinedInitialDataOptions & { +export function queryOptions(options: UndefinedInitialDataOptions): UndefinedInitialDataOptions & { queryKey: DataTag; }; @@ -240,7 +241,7 @@ export type UndefinedInitialDataInfiniteOptions = CreateQueryOptions & { - initialData?: undefined; + initialData?: undefined | InitialDataFunction>; }; diff --git a/packages/angular-query-experimental/src/infinite-query-options.ts b/packages/angular-query-experimental/src/infinite-query-options.ts index 3508951398..266df37910 100644 --- a/packages/angular-query-experimental/src/infinite-query-options.ts +++ b/packages/angular-query-experimental/src/infinite-query-options.ts @@ -63,14 +63,14 @@ export function infiniteQueryOptions< TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, >( - options: UndefinedInitialDataInfiniteOptions< + options: DefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, TQueryKey, TPageParam >, -): UndefinedInitialDataInfiniteOptions< +): DefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, @@ -95,14 +95,14 @@ export function infiniteQueryOptions< TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, >( - options: DefinedInitialDataInfiniteOptions< + options: UndefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, TQueryKey, TPageParam >, -): DefinedInitialDataInfiniteOptions< +): UndefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, diff --git a/packages/angular-query-experimental/src/inject-infinite-query.ts b/packages/angular-query-experimental/src/inject-infinite-query.ts index 85dd0c7b35..6f02f6588a 100644 --- a/packages/angular-query-experimental/src/inject-infinite-query.ts +++ b/packages/angular-query-experimental/src/inject-infinite-query.ts @@ -36,7 +36,7 @@ export function injectInfiniteQuery< >( optionsFn: ( client: QueryClient, - ) => UndefinedInitialDataInfiniteOptions< + ) => DefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, @@ -44,7 +44,7 @@ export function injectInfiniteQuery< TPageParam >, injector?: Injector, -): CreateInfiniteQueryResult +): DefinedCreateInfiniteQueryResult /** * Injects an infinite query: a declarative dependency on an asynchronous source of data that is tied to a unique key. @@ -63,7 +63,7 @@ export function injectInfiniteQuery< >( optionsFn: ( client: QueryClient, - ) => DefinedInitialDataInfiniteOptions< + ) => UndefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, @@ -71,7 +71,7 @@ export function injectInfiniteQuery< TPageParam >, injector?: Injector, -): DefinedCreateInfiniteQueryResult +): CreateInfiniteQueryResult /** * Injects an infinite query: a declarative dependency on an asynchronous source of data that is tied to a unique key. diff --git a/packages/angular-query-experimental/src/query-options.ts b/packages/angular-query-experimental/src/query-options.ts index 4bc4233ba2..3dc91a6d0a 100644 --- a/packages/angular-query-experimental/src/query-options.ts +++ b/packages/angular-query-experimental/src/query-options.ts @@ -60,8 +60,8 @@ export function queryOptions< TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, >( - options: UndefinedInitialDataOptions, -): UndefinedInitialDataOptions & { + options: DefinedInitialDataOptions, +): DefinedInitialDataOptions & { queryKey: DataTag } @@ -93,8 +93,8 @@ export function queryOptions< TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, >( - options: DefinedInitialDataOptions, -): DefinedInitialDataOptions & { + options: UndefinedInitialDataOptions, +): UndefinedInitialDataOptions & { queryKey: DataTag } diff --git a/packages/angular-query-experimental/tsconfig.json b/packages/angular-query-experimental/tsconfig.json index 04a006aad9..31e256a963 100644 --- a/packages/angular-query-experimental/tsconfig.json +++ b/packages/angular-query-experimental/tsconfig.json @@ -12,5 +12,11 @@ "target": "ES2022", "types": ["vitest/globals"] }, + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "strictTemplates": true + }, "include": ["src", "eslint.config.js", "vite.config.ts"] }