move helpers to main db package

Author: samwillis

.changeset/expression-helpers-queryfn.md

@@ -1,10 +1,11 @@
 ---
+"@tanstack/db": patch
 "@tanstack/query-db-collection": patch
 ---
 
 Add expression helper utilities for parsing LoadSubsetOptions in queryFn.
 
-When using `syncMode: 'on-demand'`, query collections now provide helper functions to easily parse where clauses, orderBy, and limit predicates into your API's format:
+When using `syncMode: 'on-demand'`, TanStack DB now provides helper functions to easily parse where clauses, orderBy, and limit predicates into your API's format:
 
 - `parseWhereExpression`: Parse where clauses with custom handlers for each operator
 - `parseOrderByExpression`: Parse order by into simple array format
@@ -15,7 +16,8 @@ When using `syncMode: 'on-demand'`, query collections now provide helper functio
 **Example:**
 
 ```typescript
-import { parseLoadSubsetOptions } from "@tanstack/query-db-collection"
+import { parseLoadSubsetOptions } from "@tanstack/db"
+// or from "@tanstack/query-db-collection" (re-exported for convenience)
 
 queryFn: async (ctx) => {
   const { where, orderBy, limit } = ctx.meta.loadSubsetOptions

docs/collections/query-collection.md

@@ -417,7 +417,7 @@ queryFn: async (ctx) => {
 }
 ```
 
-The `where` and `orderBy` fields are expression trees (AST - Abstract Syntax Tree) that need to be parsed. The `@tanstack/query-db-collection` package provides helper functions to make this easy.
+The `where` and `orderBy` fields are expression trees (AST - Abstract Syntax Tree) that need to be parsed. TanStack DB provides helper functions to make this easy.
 
 ### Expression Helpers
 
@@ -427,7 +427,8 @@ import {
   parseOrderByExpression,
   extractSimpleComparisons,
   parseLoadSubsetOptions,
-} from '@tanstack/query-db-collection'
+} from '@tanstack/db'
+// Or from '@tanstack/query-db-collection' (re-exported for convenience)
 ```
 
 These helpers allow you to parse expression trees without manually traversing complex AST structures.
@@ -436,7 +437,8 @@ These helpers allow you to parse expression trees without manually traversing co
 
 ```typescript
 import { createCollection } from '@tanstack/react-db'
-import { queryCollectionOptions, parseLoadSubsetOptions } from '@tanstack/query-db-collection'
+import { queryCollectionOptions } from '@tanstack/query-db-collection'
+import { parseLoadSubsetOptions } from '@tanstack/db'
 import { QueryClient } from '@tanstack/query-core'
 
 const queryClient = new QueryClient()

packages/db/src/index.ts

@@ -22,6 +22,9 @@ export * from "./indexes/btree-index.js"
 export * from "./indexes/lazy-index.js"
 export { type IndexOptions } from "./indexes/index-options.js"
 
+// Expression helpers
+export * from "./query/expression-helpers.js"
+
 // Re-export some stuff explicitly to ensure the type & value is exported
 export type { Collection } from "./collection/index.js"
 export { IR }

packages/query-db-collection/src/expression-helpers.ts renamed to packages/db/src/query/expression-helpers.ts

@@ -1,13 +1,13 @@
 /**
- * Expression Helpers for Query Collections
+ * Expression Helpers for TanStack DB
  *
  * These utilities help parse LoadSubsetOptions (where, orderBy, limit) from TanStack DB
  * into formats suitable for your API backend. They provide a generic way to traverse
  * expression trees without having to implement your own parser.
  *
  * @example
  * ```typescript
- * import { parseWhereExpression, parseOrderByExpression } from '@tanstack/query-db-collection'
+ * import { parseWhereExpression, parseOrderByExpression } from '@tanstack/db'
  *
  * queryFn: async (ctx) => {
  *   const { limit, where, orderBy } = ctx.meta?.loadSubsetOptions ?? {}
@@ -27,7 +27,7 @@
  * ```
  */
 
-import type { IR, OperatorName } from "@tanstack/db"
+import type { IR, OperatorName } from "../index.js"
 
 type BasicExpression<T = any> = IR.BasicExpression<T>
 type OrderBy = IR.OrderBy

packages/query-db-collection/tests/expression-helpers.test.ts renamed to packages/db/tests/query/expression-helpers.test.ts

@@ -7,9 +7,9 @@ import {
   parseOrderByExpression,
   parseWhereExpression,
   walkExpression,
-} from "../src/expression-helpers"
-import { Func, PropRef, Value } from "../../db/src/query/ir.js"
-import type { IR } from "@tanstack/db"
+} from "../../src/query/expression-helpers"
+import { Func, PropRef, Value } from "../../src/query/ir.js"
+import type { IR } from "../../src/index.js"
 
 type OrderBy = IR.OrderBy
 

packages/query-db-collection/src/index.ts

@@ -7,6 +7,7 @@ export {
 
 export * from "./errors"
 
+// Re-export expression helpers from @tanstack/db
 export {
   parseWhereExpression,
   parseOrderByExpression,
@@ -19,4 +20,4 @@ export {
   type SimpleComparison,
   type ParseWhereOptions,
   type ParsedOrderBy,
-} from "./expression-helpers"
+} from "@tanstack/db"