Fix: Enable $selected access in orderBy after fn.select #1183
+249
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The orderBy method was only checking for regular select clause
(this.query.select) to determine if $selected should be exposed.
When using fn.select, the callback is stored in fnSelect instead,
so $selected was not available in orderBy callbacks.
This change updates orderBy to check for both select and fnSelect,
enabling queries like:
```ts
q.from({ user: usersCollection })
.fn.select((row) => ({ name: row.user.name, salary: row.user.salary }))
.orderBy(({ $selected }) => $selected.salary)
```
https://claude.ai/code/session_01EPRCG2K8348FMNWzjPiacC
🦋 Changeset detectedLatest commit: 7e45f71 The changes in this PR will be included in the next version bump. This PR includes changesets to release 12 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
More templates
@tanstack/angular-db
@tanstack/db
@tanstack/db-ivm
@tanstack/electric-db-collection
@tanstack/offline-transactions
@tanstack/powersync-db-collection
@tanstack/query-db-collection
@tanstack/react-db
@tanstack/rxdb-db-collection
@tanstack/solid-db
@tanstack/svelte-db
@tanstack/trailbase-db-collection
@tanstack/vue-db
commit: |
Contributor
|
Size Change: +8 B (+0.01%) Total Size: 90.9 kB
ℹ️ View Unchanged
|
Contributor
|
Size Change: 0 B Total Size: 3.7 kB ℹ️ View Unchanged
|
Also adds tests for orderBy with table refs after fn.select. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
The having method fix was made for consistency but couldn't be verified with a passing test. Keeping only the orderBy fix which has comprehensive test coverage. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Contributor
|
@KyleAMathews The |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fixed
$selectednamespace availability inorderBy()clauses when using functional select (fn.select()). Users can now order by computed/derived fields from functional selects.Root Cause
The query builder only checked for
this.query.selectwhen deciding whether to expose the$selectednamespace inorderBycallbacks. It did not account forthis.query.fnSelect(functional select), so users couldn't reference$selectedfields after usingfn.select().Approach
Added
|| this.query.fnSelectto the condition in theorderBy()method:Key Invariants
$selectedis available inorderBywhen either.select()orfn.select()has been called$selected(both namespaces work together)fn.select()Verification
Files Changed
packages/db/src/query/builder/index.tsfnSelectcheck toorderBymethodpackages/db/tests/query/functional-variants.test.tsfn.selectwithorderBypackages/db/tests/query/functional-variants.test-d.ts$selectedtype inferencehttps://claude.ai/code/session_01EPRCG2K8348FMNWzjPiacC