Skip to content

refactor: rename cache methods for better clarity and consistency #9216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

braden-w
Copy link
Contributor

@braden-w braden-w commented May 29, 2025

Renamed cache methods in QueryCache and MutationCache to better reflect their behavior and improve developer understanding:

  • QueryCache.build()QueryCache.ensure()
  • MutationCache.build()MutationCache.create()
  • Enhanced documentation for QueryCache.get() to clarify retrieval-only behavior

The previous naming was confusing because both QueryCache.build() and MutationCache.build() had the same name but fundamentally different behaviors:

  • QueryCache.build(): Used a "get or create" pattern - retrieved existing queries or created new ones
  • MutationCache.build(): Always created new mutation instances (since each mutation execution should be unique)

This inconsistency made the API harder to understand and could lead to incorrect assumptions about behavior.

Changes

QueryCache

  • build()ensure(): Better conveys "ensure this query exists" semantics, borrowing the ensure pattern used in ensureQueryData and ensureQueryFn
  • Enhanced get() documentation: Clarifies it only retrieves existing queries, returns undefined if not found
  • Improved ensure() documentation: Explains the "get or create" behavior and when to use it

MutationCache

  • build()create(): Clearly indicates it always creates new mutation instances
  • Enhanced documentation: Explains why mutations are always created new (each execution should be unique)

Updated References

Updated all usages across the codebase:

  • packages/query-core/src/queryClient.ts - Updated QueryCache method calls
  • packages/query-core/src/queryObserver.ts - Updated QueryCache method calls
  • packages/query-core/src/mutationObserver.ts - Updated MutationCache method calls
  • packages/query-core/src/hydration.ts - Updated both cache method calls
  • packages/query-core/src/__tests__/utils.ts - Updated test utilities
  • packages/query-persist-client-core/src/__tests__/persist.test.ts - Updated test
  • packages/query-broadcast-client-experimental/src/index.ts - Updated broadcast client

Renamed cache methods in QueryCache and MutationCache to better reflect their behavior and improve developer understanding:

- `QueryCache.build()` → `QueryCache.ensure()`
- `MutationCache.build()` → `MutationCache.create()`
- Enhanced documentation for `QueryCache.get()` to clarify retrieval-only behavior

The previous naming was confusing because both `QueryCache.build()` and `MutationCache.build()` had the same name but fundamentally different behaviors:

- **QueryCache.build()**: Used a "get or create" pattern - retrieved existing queries or created new ones
- **MutationCache.build()**: Always created new mutation instances (since each mutation execution should be unique)

This inconsistency made the API harder to understand and could lead to incorrect assumptions about behavior.

## Changes

### QueryCache
- **`build()` → `ensure()`**: Better conveys "ensure this query exists" semantics
- **Enhanced `get()` documentation**: Clarifies it only retrieves existing queries, returns `undefined` if not found
- **Improved `ensure()` documentation**: Explains the "get or create" behavior and when to use it

### MutationCache
- **`build()` → `create()`**: Clearly indicates it always creates new mutation instances
- **Enhanced documentation**: Explains why mutations are always created new (each execution should be unique)

### Updated References
Updated all usages across the codebase:
- `packages/query-core/src/queryClient.ts` - Updated QueryCache method calls
- `packages/query-core/src/queryObserver.ts` - Updated QueryCache method calls
- `packages/query-core/src/mutationObserver.ts` - Updated MutationCache method calls
- `packages/query-core/src/hydration.ts` - Updated both cache method calls
- `packages/query-core/src/__tests__/utils.ts` - Updated test utilities
- `packages/query-persist-client-core/src/__tests__/persist.test.ts` - Updated test
- `packages/query-broadcast-client-experimental/src/index.ts` - Updated broadcast client
Copy link

nx-cloud bot commented May 29, 2025

View your CI Pipeline Execution ↗ for commit 034d91a.

Command Status Duration Result
nx affected --targets=test:sherif,test:knip,tes... ✅ Succeeded 2m 51s View ↗
nx run-many --target=build --exclude=examples/*... ✅ Succeeded 1m 52s View ↗

☁️ Nx Cloud last updated this comment at 2025-05-29 17:36:11 UTC

Copy link

pkg-pr-new bot commented May 29, 2025

More templates

@tanstack/angular-query-devtools-experimental

npm i https://pkg.pr.new/@tanstack/angular-query-devtools-experimental@9216

@tanstack/angular-query-experimental

npm i https://pkg.pr.new/@tanstack/angular-query-experimental@9216

@tanstack/eslint-plugin-query

npm i https://pkg.pr.new/@tanstack/eslint-plugin-query@9216

@tanstack/query-async-storage-persister

npm i https://pkg.pr.new/@tanstack/query-async-storage-persister@9216

@tanstack/query-broadcast-client-experimental

npm i https://pkg.pr.new/@tanstack/query-broadcast-client-experimental@9216

@tanstack/query-core

npm i https://pkg.pr.new/@tanstack/query-core@9216

@tanstack/query-devtools

npm i https://pkg.pr.new/@tanstack/query-devtools@9216

@tanstack/query-persist-client-core

npm i https://pkg.pr.new/@tanstack/query-persist-client-core@9216

@tanstack/query-sync-storage-persister

npm i https://pkg.pr.new/@tanstack/query-sync-storage-persister@9216

@tanstack/react-query

npm i https://pkg.pr.new/@tanstack/react-query@9216

@tanstack/react-query-devtools

npm i https://pkg.pr.new/@tanstack/react-query-devtools@9216

@tanstack/react-query-next-experimental

npm i https://pkg.pr.new/@tanstack/react-query-next-experimental@9216

@tanstack/react-query-persist-client

npm i https://pkg.pr.new/@tanstack/react-query-persist-client@9216

@tanstack/solid-query

npm i https://pkg.pr.new/@tanstack/solid-query@9216

@tanstack/solid-query-devtools

npm i https://pkg.pr.new/@tanstack/solid-query-devtools@9216

@tanstack/solid-query-persist-client

npm i https://pkg.pr.new/@tanstack/solid-query-persist-client@9216

@tanstack/svelte-query

npm i https://pkg.pr.new/@tanstack/svelte-query@9216

@tanstack/svelte-query-devtools

npm i https://pkg.pr.new/@tanstack/svelte-query-devtools@9216

@tanstack/svelte-query-persist-client

npm i https://pkg.pr.new/@tanstack/svelte-query-persist-client@9216

@tanstack/vue-query

npm i https://pkg.pr.new/@tanstack/vue-query@9216

@tanstack/vue-query-devtools

npm i https://pkg.pr.new/@tanstack/vue-query-devtools@9216

commit: 034d91a

Copy link

codecov bot commented May 29, 2025

Codecov Report

Attention: Patch coverage is 75.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 59.63%. Comparing base (b475d21) to head (034d91a).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##             main    #9216       +/-   ##
===========================================
+ Coverage   45.30%   59.63%   +14.32%     
===========================================
  Files         209      138       -71     
  Lines        8257     5495     -2762     
  Branches     1856     1477      -379     
===========================================
- Hits         3741     3277      -464     
+ Misses       4076     1921     -2155     
+ Partials      440      297      -143     
Components Coverage Δ
@tanstack/angular-query-devtools-experimental ∅ <ø> (∅)
@tanstack/angular-query-experimental 85.04% <ø> (ø)
@tanstack/eslint-plugin-query ∅ <ø> (∅)
@tanstack/query-async-storage-persister 43.85% <ø> (ø)
@tanstack/query-broadcast-client-experimental 24.39% <0.00%> (ø)
@tanstack/query-codemods ∅ <ø> (∅)
@tanstack/query-core 98.13% <100.00%> (ø)
@tanstack/query-devtools 3.56% <ø> (ø)
@tanstack/query-persist-client-core 78.32% <ø> (ø)
@tanstack/query-sync-storage-persister 84.61% <ø> (ø)
@tanstack/query-test-utils ∅ <ø> (∅)
@tanstack/react-query 96.02% <ø> (ø)
@tanstack/react-query-devtools 10.00% <ø> (ø)
@tanstack/react-query-next-experimental ∅ <ø> (∅)
@tanstack/react-query-persist-client 100.00% <ø> (ø)
@tanstack/solid-query 78.20% <ø> (ø)
@tanstack/solid-query-devtools ∅ <ø> (∅)
@tanstack/solid-query-persist-client 100.00% <ø> (ø)
@tanstack/svelte-query 88.15% <ø> (ø)
@tanstack/svelte-query-devtools ∅ <ø> (∅)
@tanstack/svelte-query-persist-client 100.00% <ø> (ø)
@tanstack/vue-query 70.85% <ø> (ø)
@tanstack/vue-query-devtools ∅ <ø> (∅)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

braden-w added a commit to EpicenterHQ/query that referenced this pull request May 29, 2025
…of `get` then `ensure`

This commit builds on the changes from TanStack#9216.

Refactored the `setQueryData` method in `QueryClient` to simplify its logic and improve readability.

The previous implementation of `setQueryData` was redundant:

1. It first called `this.#queryCache.get()` to retrieve an existing query.
2. Then, it called `this.#queryCache.ensure()` which internally also performs a "get or create" operation.

This meant the query was potentially being retrieved or checked for existence twice. The `ensure()` method already handles the logic of getting an existing query or creating a new one if it doesn't exist.

The `setQueryData` method has been updated to:

1. Directly call `this.#queryCache.ensure()` to get or create the query.
2. Use the returned query instance to access `state.data` for the `functionalUpdate`.
3. Call `setData()` on the same query instance.

**Before:**

```typescript
    const query = this.#queryCache.get<TInferredQueryFnData>(
      defaultedOptions.queryHash,
    )
    const prevData = query?.state.data
    const data = functionalUpdate(updater, prevData)

    if (data === undefined) {
      return undefined
    }

    return this.#queryCache
      .ensure(this, defaultedOptions)
      .setData(data, { ...options, manual: true })
```

**After:**

```typescript
    const query = this.#queryCache.ensure<TInferredQueryFnData>(
      this,
      defaultedOptions,
    )
    const prevData = query.state.data
    const data = functionalUpdate(updater, prevData)

    if (data === undefined) {
      return undefined
    }

    return query.setData(data, { ...options, manual: true })
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant