Merge main branch and resolve conflicts

- Updated utils.ts to use Map instead of WeakMap for cycle detection (from main)
- Kept all collection indexing utility functions
- Updated optimizer.ts to use main branch patterns while preserving enhancements
- Added distinct import to compiler/index.ts from main branch
- Fixed non-null assertions in compiler to match main branch style
- All review comments from PR #257 remain addressed

Author: cursoragent

.gitignore

@@ -145,3 +145,9 @@ dev-debug.log
 # Task files
 tasks.json
 tasks/ 
+
+## Tanstack Start
+.nitro
+.output
+.tanstack
+.claude

.prettierignore

@@ -6,3 +6,4 @@
 **/docs
 **/snap
 pnpm-lock.yaml
+**/routeTree.gen.ts

README.md

@@ -48,14 +48,18 @@ TanStack DB is **backend agnostic** and **incrementally adoptable**:
 Sync data into collections:
 
 ```ts
-import { createQueryCollection } from "@tanstack/db-collections"
-
-const todoCollection = createQueryCollection({
-  queryKey: ["todos"],
-  queryFn: async () => fetch("/api/todos"),
-  getKey: (item) => item.id,
-  schema: todoSchema, // any standard schema
-})
+import { createCollection, QueryClient } from "@tanstack/react-db"
+import { queryCollectionOptions } from "@tanstack/query-db-collection"
+
+const todoCollection = createCollection(
+  queryCollectionOptions({
+    queryKey: ["todos"],
+    queryFn: async () => fetch("/api/todos"),
+    queryClient: new QueryClient(),
+    getKey: (item) => item.id,
+    schema: todoSchema, // any standard schema
+  })
+)
 ```
 
 Use live queries in your components:
@@ -135,7 +139,9 @@ There's also an example [React todo app](./examples/react/todo) and usage exampl
 ## 🔧 Install
 
 ```bash
-npm install @tanstack/react-db @tanstack/db-collections
+npm install @tanstack/react-db
+# Optional: for specific collection types
+npm install @tanstack/electric-db-collection @tanstack/query-db-collection
 ```
 
 Other framework integrations are in progress.

docs/config.json

@@ -45,9 +45,7 @@
     },
     {
       "label": "Guides",
-      "children": [
-        
-      ]
+      "children": []
     },
     {
       "label": "API Reference",

docs/framework/react/adapter.md

@@ -14,4 +14,3 @@ npm install @tanstack/react-db
 See the [React Functions Reference](../reference/index.md) to see the full list of hooks available in the React Adapter.
 
 ## Basic Usage
-

docs/framework/solid/adapter.md

@@ -1,8 +1,5 @@
 ---
 title: TanStack DB Solid Adapter
 ref: docs/framework/react/adapter.md
-replace: {
-  "React": "Solid",
-  "react": "solid"
-}
+replace: { "React": "Solid", "react": "solid" }
 ---

docs/framework/svelte/adapter.md

@@ -1,8 +1,5 @@
 ---
 title: TanStack DB Svelte Adapter
 ref: docs/framework/react/adapter.md
-replace: {
-  "React": "Svelte",
-  "react": "svelte"
-}
+replace: { "React": "Svelte", "react": "svelte" }
 ---

docs/framework/vue/adapter.md

@@ -1,8 +1,5 @@
 ---
 title: TanStack DB Vue Adapter
 ref: docs/framework/react/adapter.md
-replace: {
-  "React": "Vue",
-  "react": "vue"
-}
+replace: { "React": "Vue", "react": "vue" }
 ---