Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .oxfmtrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"$schema": "./node_modules/oxfmt/configuration_schema.json",
"semi": false,
"singleQuote": true,
"trailingComma": "all",
"printWidth": 80,
"sortPackageJson": false,
"svelte": {},
"ignorePatterns": [
"**/.next",
"**/.nx/cache",
"**/.svelte-kit",
"**/build",
"**/coverage",
"**/dist",
"**/query-codemods/**/__testfixtures__",
".changeset/*.md",
"pnpm-lock.yaml",
"**/tsconfig.vitest-temp.json",
"docs/framework/*/reference"
]
}
11 changes: 0 additions & 11 deletions .prettierignore

This file was deleted.

3 changes: 2 additions & 1 deletion docs/framework/lit/guides/ssr.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ queryClient.mount()
hydrate(queryClient, dehydratedState)

const appElement = document.querySelector('ssr-app') as
(HTMLElement & { queryClient?: QueryClient }) | null
| (HTMLElement & { queryClient?: QueryClient })
| null

if (!appElement) {
throw new Error('Expected the SSR app element to exist before hydration.')
Expand Down
6 changes: 1 addition & 5 deletions examples/lit/ssr/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@ export class SsrApp extends LitElement {
color: #1f2937;
display: block;
font-family:
ui-sans-serif,
system-ui,
-apple-system,
BlinkMacSystemFont,
'Segoe UI',
ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
sans-serif;
max-width: 32rem;
padding: 1.5rem;
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"build:all": "nx run-many --target=build --exclude=examples/** --exclude=integrations/**",
"watch": "pnpm run build:all && nx watch --all -- pnpm run build:all",
"dev": "pnpm run watch",
"format": "prettier --experimental-cli --ignore-unknown '**/*' --write",
"format": "oxfmt",
"generate-docs": "tsc -b packages/query-devtools/tsconfig.json && node scripts/generate-docs.ts",
"changeset": "changeset",
"changeset:version": "changeset version && pnpm install --no-frozen-lockfile && pnpm format",
Expand Down Expand Up @@ -66,12 +66,12 @@
"markdown-link-extractor": "^4.0.4",
"npm-run-all2": "^9.0.3",
"nx": "23.2.1",
"oxfmt": "0.72.0",
"premove": "^4.0.0",
"prettier": "^3.9.9",
"prettier-plugin-svelte": "^4.1.1",
"publint": "^0.3.24",
"sherif": "^1.13.0",
"size-limit": "^14.0.0",
"svelte": "catalog:",
"tinyglobby": "^0.2.15",
"tsdown": "^0.23.0",
"typescript": "catalog:",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ export const PENDING_TASKS = new InjectionToken<PendingTasksCompat>(
factory: (): PendingTasksCompat => {
// Access via Reflect so bundlers stay quiet when the token is absent (Angular < 19).
const token = Reflect.get(ng, 'PendingTasks') as unknown as
Parameters<typeof inject>[0] | undefined
| Parameters<typeof inject>[0]
| undefined

const svc: PendingTasksCompat | null = token
? (inject(token, { optional: true }) as PendingTasksCompat | null)
Expand Down
3 changes: 2 additions & 1 deletion packages/angular-query-experimental/src/query-options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ export type DefinedInitialDataOptions<
* cache.
*/
initialData:
NonUndefinedGuard<TQueryFnData> | (() => NonUndefinedGuard<TQueryFnData>)
| NonUndefinedGuard<TQueryFnData>
| (() => NonUndefinedGuard<TQueryFnData>)
/**
* Optional here, but omitting it is only safe when no fetch will be attempted — for example with
* `enabled: false`, or when a default query function has been defined. Otherwise, an enabled query with no
Expand Down
3 changes: 2 additions & 1 deletion packages/lit-query/src/QueryClientProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ export class QueryClientProvider extends LitElement {
}

const previousClient = changedProperties.get('client') as
QueryClient | undefined
| QueryClient
| undefined
if (previousClient && previousClient !== nextClient && this.isConnected) {
this.unmountClient(previousClient)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,8 @@ describe('createQueryController', () => {

it('should preserve discriminated-union narrowing', () => {
type Result =
{ type: 'first'; first: string } | { type: 'second'; second: string }
| { type: 'first'; first: string }
| { type: 'second'; second: string }

const query = createQueryController(
new Host(),
Expand Down
5 changes: 4 additions & 1 deletion packages/lit-query/src/controllers/BaseController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import type { QueryClient } from '@tanstack/query-core'
import type { ReactiveController, ReactiveControllerHost } from 'lit'

type QueryClientResolutionState =
'pre-connect' | 'awaiting-context' | 'bound' | 'missing'
| 'pre-connect'
| 'awaiting-context'
| 'bound'
| 'missing'

/**
* Base class of the query controllers. It resolves the `QueryClient`, either
Expand Down
3 changes: 2 additions & 1 deletion packages/lit-query/src/createMutationController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ class MutationController<
CreateMutationOptions<TData, TError, TVariables, TOnMutateResult>
>
private observer:
MutationObserver<TData, TError, TVariables, TOnMutateResult> | undefined
| MutationObserver<TData, TError, TVariables, TOnMutateResult>
| undefined
private unsubscribe: (() => void) | undefined
private queryClient: QueryClient | undefined

Expand Down
3 changes: 2 additions & 1 deletion packages/lit-query/src/queryOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ export type DefinedInitialDataOptions<
'queryFn'
> & {
initialData:
NonUndefinedGuard<TQueryFnData> | (() => NonUndefinedGuard<TQueryFnData>)
| NonUndefinedGuard<TQueryFnData>
| (() => NonUndefinedGuard<TQueryFnData>)
queryFn?: QueryFunction<TQueryFnData, TQueryKey>
}

Expand Down
3 changes: 2 additions & 1 deletion packages/preact-query/src/__tests__/useQuery.test-d.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ describe('useQuery', () => {

it('should preserve discriminated-union narrowing', () => {
type Result =
{ type: 'first'; first: string } | { type: 'second'; second: string }
| { type: 'first'; first: string }
| { type: 'second'; second: string }

const query = useQuery({
queryKey: queryKey(),
Expand Down
3 changes: 2 additions & 1 deletion packages/preact-query/src/queryOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ export type DefinedInitialDataOptions<
* cache.
*/
initialData:
NonUndefinedGuard<TQueryFnData> | (() => NonUndefinedGuard<TQueryFnData>)
| NonUndefinedGuard<TQueryFnData>
| (() => NonUndefinedGuard<TQueryFnData>)
/**
* Optional here, but omitting it is only safe when no fetch will be attempted — for example with
* `enabled: false`, or when a default query function has been defined. Otherwise, an enabled query with no
Expand Down
3 changes: 2 additions & 1 deletion packages/preact-query/src/suspense.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ export const ensureSuspenseTimers = (
*/
export const shouldSuspend = (
defaultedOptions:
DefaultedQueryObserverOptions<any, any, any, any, any> | undefined,
| DefaultedQueryObserverOptions<any, any, any, any, any>
| undefined,
result: QueryObserverResult<any, any>,
) => defaultedOptions?.suspense && result.isPending

Expand Down
15 changes: 10 additions & 5 deletions packages/query-core/src/__tests__/infiniteQueryBehavior.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ describe('InfiniteQueryBehavior', () => {
})

let observerResult:
InfiniteQueryObserverResult<unknown, unknown> | undefined
| InfiniteQueryObserverResult<unknown, unknown>
| undefined

const unsubscribe = observer.subscribe((result) => {
observerResult = result
Expand Down Expand Up @@ -65,7 +66,8 @@ describe('InfiniteQueryBehavior', () => {
})

let observerResult:
InfiniteQueryObserverResult<unknown, unknown> | undefined
| InfiniteQueryObserverResult<unknown, unknown>
| undefined

const unsubscribe = observer.subscribe((result) => {
observerResult = result
Expand Down Expand Up @@ -208,7 +210,8 @@ describe('InfiniteQueryBehavior', () => {
})

let observerResult:
InfiniteQueryObserverResult<unknown, unknown> | undefined
| InfiniteQueryObserverResult<unknown, unknown>
| undefined

const unsubscribe = observer.subscribe((result) => {
observerResult = result
Expand Down Expand Up @@ -258,7 +261,8 @@ describe('InfiniteQueryBehavior', () => {
})

let observerResult:
InfiniteQueryObserverResult<unknown, unknown> | undefined
| InfiniteQueryObserverResult<unknown, unknown>
| undefined

const unsubscribe = observer.subscribe((result) => {
observerResult = result
Expand Down Expand Up @@ -446,7 +450,8 @@ describe('InfiniteQueryBehavior', () => {
})

let observerResult:
InfiniteQueryObserverResult<unknown, unknown> | undefined
| InfiniteQueryObserverResult<unknown, unknown>
| undefined

const unsubscribe = observer.subscribe((result) => {
observerResult = result
Expand Down
3 changes: 2 additions & 1 deletion packages/query-core/src/__tests__/utils.test-d.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,8 @@ describe('skipToken', () => {
describe('ensureQueryFn', () => {
it('should accept a SkipToken in queryFn but never return one', () => {
const queryFn = skipToken as
QueryFunction<number, readonly ['key']> | SkipToken
| QueryFunction<number, readonly ['key']>
| SkipToken

expectTypeOf<
Parameters<typeof ensureQueryFn<number, readonly ['key']>>[0]['queryFn']
Expand Down
3 changes: 2 additions & 1 deletion packages/query-core/src/query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,8 @@ export class Query<
// Try to fetch the data
const retryer = (this.#retryer = createRetryer({
initialPromise: fetchOptions?.initialPromise as
Promise<TData> | undefined,
| Promise<TData>
| undefined,
fn: context.fetchFn as () => Promise<TData>,
onCancel: (error) => {
if (error instanceof CancelledError && error.revert) {
Expand Down
3 changes: 2 additions & 1 deletion packages/query-core/src/queryCache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,8 @@ export class QueryCache extends Subscribable<QueryCacheListener> {
queryHash: string,
): Query<TQueryFnData, TError, TData, TQueryKey> | undefined {
return this.#queries.get(queryHash) as
Query<TQueryFnData, TError, TData, TQueryKey> | undefined
| Query<TQueryFnData, TError, TData, TQueryKey>
| undefined
}

/**
Expand Down
12 changes: 8 additions & 4 deletions packages/query-core/src/queryObserver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,8 @@ export class QueryObserver<

let unsubscribe = () => {}
let resolveEarly:
((result: QueryObserverResult<TData, TError>) => void) | undefined
| ((result: QueryObserverResult<TData, TError>) => void)
| undefined

const cachePromise = new Promise<QueryObserverResult<TData, TError>>(
(resolve) => {
Expand Down Expand Up @@ -598,7 +599,8 @@ export class QueryObserver<
const prevQuery = this.#currentQuery
const prevOptions = this.options
const prevResult = this.#currentResult as
QueryObserverResult<TData, TError> | undefined
| QueryObserverResult<TData, TError>
| undefined
const prevResultState = this.#currentResultState
const prevResultOptions = this.#currentResultOptions
const queryChange = query !== prevQuery
Expand Down Expand Up @@ -762,7 +764,8 @@ export class QueryObserver<
*/
updateResult(): void {
const prevResult = this.#currentResult as
QueryObserverResult<TData, TError> | undefined
| QueryObserverResult<TData, TError>
| undefined

const nextResult = this.createResult(this.#currentQuery, this.options)

Expand Down Expand Up @@ -840,7 +843,8 @@ export class QueryObserver<
}

const prevQuery = this.#currentQuery as
Query<TQueryFnData, TError, TQueryData, TQueryKey> | undefined
| Query<TQueryFnData, TError, TQueryData, TQueryKey>
| undefined
this.#currentQuery = query
this.#currentQueryInitialState = query.state

Expand Down
20 changes: 13 additions & 7 deletions packages/query-core/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ export type DistributiveOmit<
export type OmitKeyof<
TObject,
TKey extends (TStrictly extends 'safely'
? | keyof TObject
| (string & Record<never, never>)
| (number & Record<never, never>)
| (symbol & Record<never, never>)
?
| keyof TObject
| (string & Record<never, never>)
| (number & Record<never, never>)
| (symbol & Record<never, never>)
: keyof TObject),
TStrictly extends 'strictly' | 'safely' = 'strictly',
> = Omit<TObject, TKey>
Expand Down Expand Up @@ -206,7 +207,8 @@ export type QueryBooleanOption<
TData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
> =
boolean | ((query: Query<TQueryFnData, TError, TData, TQueryKey>) => boolean)
| boolean
| ((query: Query<TQueryFnData, TError, TData, TQueryKey>) => boolean)

/** @inline */
export type QueryPersister<
Expand Down Expand Up @@ -445,7 +447,8 @@ export interface QueryOptions<
* @defaultValue true
*/
structuralSharing?:
boolean | ((oldData: unknown | undefined, newData: unknown) => unknown)
| boolean
| ((oldData: unknown | undefined, newData: unknown) => unknown)
/** @internal */
_defaulted?: boolean
/** @internal */
Expand Down Expand Up @@ -1380,7 +1383,10 @@ export interface QueryObserverPlaceholderResult<
/**
* A query result that always has `data`: the success and refetch error states.
*/
export type DefinedQueryObserverResult<TData = unknown, TError = DefaultError> =
export type DefinedQueryObserverResult<
TData = unknown,
TError = DefaultError,
> =
| QueryObserverRefetchErrorResult<TData, TError>
| QueryObserverSuccessResult<TData, TError>

Expand Down
3 changes: 2 additions & 1 deletion packages/query-devtools/src/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,8 @@ export const deleteNestedDataByPath = (
* @param target - The shadow root to add the style tag to, instead of `document.head`.
*/
export const setupStyleSheet = (nonce?: string, target?: ShadowRoot) => {
if (!nonce) return // Goober reads window.__nonce__ every time it creates or accesses its style
if (!nonce)
return // Goober reads window.__nonce__ every time it creates or accesses its style
// element (el.nonce = window.__nonce__). Without this, goober overwrites the
// nonce we set on the pre-created element with undefined, clearing it.
;(window as any).__nonce__ = nonce
Expand Down
3 changes: 2 additions & 1 deletion packages/react-query/src/__tests__/useQuery.test-d.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,8 @@ describe('useQuery', () => {

it('should preserve discriminated-union narrowing', () => {
type Result =
{ type: 'first'; first: string } | { type: 'second'; second: string }
| { type: 'first'; first: string }
| { type: 'second'; second: string }

const query = useQuery({
queryKey: queryKey(),
Expand Down
3 changes: 2 additions & 1 deletion packages/react-query/src/queryOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ export type DefinedInitialDataOptions<
* cache.
*/
initialData:
NonUndefinedGuard<TQueryFnData> | (() => NonUndefinedGuard<TQueryFnData>)
| NonUndefinedGuard<TQueryFnData>
| (() => NonUndefinedGuard<TQueryFnData>)
/**
* Optional here, but omitting it is only safe when no fetch will be attempted — for example with
* `enabled: false`, or when a default query function has been defined. Otherwise, an enabled query with no
Expand Down
3 changes: 2 additions & 1 deletion packages/react-query/src/suspense.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ export const ensureSuspenseTimers = (
*/
export const shouldSuspend = (
defaultedOptions:
DefaultedQueryObserverOptions<any, any, any, any, any> | undefined,
| DefaultedQueryObserverOptions<any, any, any, any, any>
| undefined,
result: QueryObserverResult<any, any>,
) => defaultedOptions?.suspense && result.isPending

Expand Down
Loading
Loading