Fix issues with queryOptions factory method types #8394

Nick-Lucas · 2024-12-03T22:21:27Z

This tackles a few things we've spotted in tRPC:

Fix issues with queryOptions factory method types not passing through the query key despite taking it
Fix DataTag creating intersections upon intersections when a data-tagged querykey is passed as the first argument, now if its TType arg is already a datatag it just returns the TType

nx-cloud · 2024-12-03T22:21:56Z

☁️ Nx Cloud Report

CI is running/has finished running commands for commit 3b26d75. As they complete they will appear below. Click to see the status, the terminal output, and the build insights.

📂 See all runs for this CI Pipeline Execution

✅ Successfully ran 1 target

nx affected --targets=test:sherif,test:knip,test:eslint,test:lib,test:types,test:build,build --parallel=3

Sent with 💌 from NxCloud.

pkg-pr-new · 2024-12-03T22:24:09Z

Open in Stackblitz

More templates

@tanstack/angular-query-devtools-experimental

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

@tanstack/query-async-storage-persister

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

@tanstack/query-broadcast-client-experimental

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

@tanstack/eslint-plugin-query

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

@tanstack/query-core

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

@tanstack/angular-query-experimental

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

@tanstack/query-devtools

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

@tanstack/query-persist-client-core

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

@tanstack/query-sync-storage-persister

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

@tanstack/react-query

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

@tanstack/react-query-devtools

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

@tanstack/react-query-next-experimental

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

@tanstack/react-query-persist-client

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

@tanstack/solid-query

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

@tanstack/solid-query-devtools

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

@tanstack/solid-query-persist-client

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

@tanstack/svelte-query

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

@tanstack/svelte-query-devtools

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

@tanstack/svelte-query-persist-client

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

@tanstack/vue-query

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

@tanstack/vue-query-devtools

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

commit: 3b26d75

packages/query-core/src/types.ts

codecov · 2024-12-03T22:26:55Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.03%. Comparing base (4521a04) to head (3b26d75).
Report is 1 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff             @@
##             main    #8394       +/-   ##
===========================================
+ Coverage   46.21%   63.03%   +16.81%     
===========================================
  Files         198      134       -64     
  Lines        7509     4804     -2705     
  Branches     1710     1345      -365     
===========================================
- Hits         3470     3028      -442     
+ Misses       3664     1536     -2128     
+ Partials      375      240      -135

Components	Coverage Δ
@tanstack/angular-query-devtools-experimental	`∅ <ø> (∅)`
@tanstack/angular-query-experimental	`88.65% <ø> (ø)`
@tanstack/eslint-plugin-query	`∅ <ø> (∅)`
@tanstack/query-async-storage-persister	`43.85% <ø> (ø)`
@tanstack/query-broadcast-client-experimental	`∅ <ø> (∅)`
@tanstack/query-codemods	`∅ <ø> (∅)`
@tanstack/query-core	`94.56% <ø> (ø)`
@tanstack/query-devtools	`4.78% <ø> (ø)`
@tanstack/query-persist-client-core	`57.73% <ø> (ø)`
@tanstack/query-sync-storage-persister	`84.61% <ø> (ø)`
@tanstack/react-query	`95.54% <ø> (ø)`
@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	`87.33% <ø> (ø)`
@tanstack/svelte-query-devtools	`∅ <ø> (∅)`
@tanstack/svelte-query-persist-client	`100.00% <ø> (ø)`
@tanstack/vue-query	`71.45% <ø> (ø)`
@tanstack/vue-query-devtools	`∅ <ø> (∅)`

TkDodo · 2024-12-04T08:01:46Z

There might be more like this as I'm having trouble with linked builds of react-query

can you try the PR preview builds?

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

packages/react-query/src/__tests__/queryOptions.test-d.tsx

Nick-Lucas · 2024-12-04T21:06:20Z

There might be more like this as I'm having trouble with linked builds of react-query

can you try the PR preview builds?
npm i https://pkg.pr.new/@tanstack/react-query@8394

Thanks, that's a life-safer, the content of this PR has tRPC's codebase passing now (trpc/trpc#6290) albeit with one fix for correctness related to the DataTag change: packages/react-query/src/shared/types.ts

packages/react-query/src/__tests__/queryOptions.test-d.tsx

packages/angular-query-experimental/src/infinite-query-options.ts

packages/react-query/src/__tests__/queryOptions.test-d.tsx

Fix issues with queryOptions factory method types

00bd10e

github-actions bot added package: react-query package: query-core labels Dec 3, 2024

Nick-Lucas commented Dec 3, 2024

View reviewed changes

packages/query-core/src/types.ts Show resolved Hide resolved

TkDodo requested changes Dec 4, 2024

View reviewed changes

packages/react-query/src/__tests__/queryOptions.test-d.tsx Outdated Show resolved Hide resolved

Nick-Lucas added 3 commits December 4, 2024 14:03

Apply the same fixes to infiniteQueryOptions

f3deaf1

Revert change to failing test

59313c0

Fix test in more userland way

2c4ec39

Nick-Lucas mentioned this pull request Dec 4, 2024

Upgrade tanstack query to latest trpc/trpc#6290

Merged

3 tasks

Unused import

1f7d0b2

Nick-Lucas commented Dec 4, 2024

View reviewed changes

packages/react-query/src/__tests__/queryOptions.test-d.tsx Outdated Show resolved Hide resolved

Nick-Lucas requested a review from TkDodo December 4, 2024 21:13

Nick-Lucas added a commit to trpc/trpc that referenced this pull request Dec 4, 2024

Upgrade tRPC to preview build from TanStack/query#8394

b7305d4

Nick-Lucas added a commit to trpc/trpc that referenced this pull request Dec 4, 2024

Upgrade react query to preview build from TanStack/query#8394

754f0bd

github-actions bot added package: vue-query package: solid-query package: svelte-query package: angular-query-experimental labels Dec 5, 2024

Nick-Lucas force-pushed the fixing-type-issues branch from 1030e64 to 2cc0950 Compare December 6, 2024 13:56

TkDodo reviewed Dec 7, 2024

View reviewed changes

packages/angular-query-experimental/src/infinite-query-options.ts Outdated Show resolved Hide resolved

Nick-Lucas force-pushed the fixing-type-issues branch from 2cc0950 to 0d57717 Compare December 7, 2024 09:19

github-actions bot removed package: vue-query package: solid-query package: svelte-query package: angular-query-experimental labels Dec 7, 2024

Nick-Lucas force-pushed the fixing-type-issues branch 3 times, most recently from 9beffc5 to 1f7d0b2 Compare December 11, 2024 21:52

Nick-Lucas and others added 2 commits December 11, 2024 21:56

Add tRPC-style solution

9623166

Merge branch 'main' into fixing-type-issues

b369e80

Nick-Lucas commented Dec 11, 2024

View reviewed changes

packages/react-query/src/__tests__/queryOptions.test-d.tsx Show resolved Hide resolved

Nick-Lucas requested a review from TkDodo December 11, 2024 22:07

Nick-Lucas force-pushed the fixing-type-issues branch from d0151ee to bc8908d Compare December 11, 2024 22:19

Unused import

e464740

Nick-Lucas force-pushed the fixing-type-issues branch from bc8908d to e464740 Compare December 11, 2024 22:20

Nick-Lucas mentioned this pull request Dec 17, 2024

queryKey is not inferred when using queryOptions #8428

Closed

Merge branch 'main' into fixing-type-issues

3b26d75

TkDodo approved these changes Dec 17, 2024

View reviewed changes

TkDodo merged commit 4989399 into TanStack:main Dec 17, 2024
8 checks passed

arnoud-dv mentioned this pull request Dec 23, 2024

TypeScript errors when using exported queryOptions factory in @tanstack/react-query 5.62.8 #8453

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix issues with queryOptions factory method types #8394

Fix issues with queryOptions factory method types #8394

Nick-Lucas commented Dec 3, 2024 •

edited by TkDodo

Loading

nx-cloud bot commented Dec 3, 2024 •

edited

Loading

pkg-pr-new bot commented Dec 3, 2024 •

edited

Loading

codecov bot commented Dec 3, 2024 •

edited

Loading

TkDodo commented Dec 4, 2024

Nick-Lucas commented Dec 4, 2024

Fix issues with queryOptions factory method types #8394

Fix issues with queryOptions factory method types #8394

Conversation

Nick-Lucas commented Dec 3, 2024 • edited by TkDodo Loading

nx-cloud bot commented Dec 3, 2024 • edited Loading

☁️ Nx Cloud Report

pkg-pr-new bot commented Dec 3, 2024 • edited Loading

codecov bot commented Dec 3, 2024 • edited Loading

Codecov Report

TkDodo commented Dec 4, 2024

Nick-Lucas commented Dec 4, 2024

Nick-Lucas commented Dec 3, 2024 •

edited by TkDodo

Loading

nx-cloud bot commented Dec 3, 2024 •

edited

Loading

pkg-pr-new bot commented Dec 3, 2024 •

edited

Loading

codecov bot commented Dec 3, 2024 •

edited

Loading