@tanstack/db 0.5.11 → 0.5.13

package/src/indexes/base-index.ts

@@ -1,9 +1,9 @@
-import { compileSingleRowExpression } from "../query/compiler/evaluators.js"
-import { comparisonFunctions } from "../query/builder/functions.js"
-import { DEFAULT_COMPARE_OPTIONS, deepEquals } from "../utils.js"
-import type { RangeQueryOptions } from "./btree-index.js"
-import type { CompareOptions } from "../query/builder/types.js"
-import type { BasicExpression, OrderByDirection } from "../query/ir.js"
+import { compileSingleRowExpression } from '../query/compiler/evaluators.js'
+import { comparisonFunctions } from '../query/builder/functions.js'
+import { DEFAULT_COMPARE_OPTIONS, deepEquals } from '../utils.js'
+import type { RangeQueryOptions } from './btree-index.js'
+import type { CompareOptions } from '../query/builder/types.js'
+import type { BasicExpression, OrderByDirection } from '../query/ir.js'
 
 /**
  * Operations that indexes can support, imported from available comparison functions
@@ -46,12 +46,12 @@ export interface IndexInterface<
   take: (
     n: number,
     from?: TKey,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ) => Array<TKey>
   takeReversed: (
     n: number,
     from?: TKey,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ) => Array<TKey>
 
   get keyCount(): number
@@ -90,7 +90,7 @@ export abstract class BaseIndex<
     id: number,
     expression: BasicExpression,
     name?: string,
-    options?: any
+    options?: any,
   ) {
     this.id = id
     this.expression = expression
@@ -109,12 +109,12 @@ export abstract class BaseIndex<
   abstract take(
     n: number,
     from?: TKey,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ): Array<TKey>
   abstract takeReversed(
     n: number,
     from?: TKey,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ): Array<TKey>
   abstract get keyCount(): number
   abstract equalityLookup(value: any): Set<TKey>
@@ -155,7 +155,7 @@ export abstract class BaseIndex<
 
     return deepEquals(
       thisCompareOptionsWithoutDirection,
-      compareOptionsWithoutDirection
+      compareOptionsWithoutDirection,
     )
   }
 
@@ -203,7 +203,7 @@ export type IndexConstructor<TKey extends string | number = string | number> =
     id: number,
     expression: BasicExpression,
     name?: string,
-    options?: any
+    options?: any,
   ) => BaseIndex<TKey>
 
 /**

package/src/indexes/btree-index.ts

@@ -1,9 +1,10 @@
-import { BTree } from "../utils/btree.js"
-import { defaultComparator, normalizeValue } from "../utils/comparison.js"
-import { BaseIndex } from "./base-index.js"
-import type { CompareOptions } from "../query/builder/types.js"
-import type { BasicExpression } from "../query/ir.js"
-import type { IndexOperation } from "./base-index.js"
+import { compareKeys } from '@tanstack/db-ivm'
+import { BTree } from '../utils/btree.js'
+import { defaultComparator, normalizeValue } from '../utils/comparison.js'
+import { BaseIndex } from './base-index.js'
+import type { CompareOptions } from '../query/builder/types.js'
+import type { BasicExpression } from '../query/ir.js'
+import type { IndexOperation } from './base-index.js'
 
 /**
  * Options for Ordered index
@@ -51,7 +52,7 @@ export class BTreeIndex<
     id: number,
     expression: BasicExpression,
     name?: string,
-    options?: any
+    options?: any,
   ) {
     super(id, expression, name, options)
     this.compareFn = options?.compareFn ?? defaultComparator
@@ -72,7 +73,7 @@ export class BTreeIndex<
       indexedValue = this.evaluateIndexExpression(item)
     } catch (error) {
       throw new Error(
-        `Failed to evaluate index expression for key ${key}: ${error}`
+        `Failed to evaluate index expression for key ${key}: ${error}`,
       )
     }
 
@@ -104,7 +105,7 @@ export class BTreeIndex<
     } catch (error) {
       console.warn(
         `Failed to evaluate index expression for key ${key} during removal:`,
-        error
+        error,
       )
       return
     }
@@ -238,7 +239,7 @@ export class BTreeIndex<
         if (keys) {
           keys.forEach((key) => result.add(key))
         }
-      }
+      },
     )
 
     return result
@@ -261,7 +262,8 @@ export class BTreeIndex<
     n: number,
     nextPair: (k?: any) => [any, any] | undefined,
     from?: any,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
+    reversed: boolean = false,
   ): Array<TKey> {
     const keysInResult: Set<TKey> = new Set()
     const result: Array<TKey> = []
@@ -271,10 +273,12 @@ export class BTreeIndex<
     while ((pair = nextPair(key)) !== undefined && result.length < n) {
       key = pair[0]
       const keys = this.valueMap.get(key)
-      if (keys) {
-        const it = keys.values()
-        let ks: TKey | undefined
-        while (result.length < n && (ks = it.next().value)) {
+      if (keys && keys.size > 0) {
+        // Sort keys for deterministic order, reverse if needed
+        const sorted = Array.from(keys).sort(compareKeys)
+        if (reversed) sorted.reverse()
+        for (const ks of sorted) {
+          if (result.length >= n) break
           if (!keysInResult.has(ks) && (filterFn?.(ks) ?? true)) {
             result.push(ks)
             keysInResult.add(ks)
@@ -306,10 +310,10 @@ export class BTreeIndex<
   takeReversed(
     n: number,
     from?: any,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ): Array<TKey> {
     const nextPair = (k?: any) => this.orderedEntries.nextLowerPair(k)
-    return this.takeInternal(n, nextPair, from, filterFn)
+    return this.takeInternal(n, nextPair, from, filterFn, true)
   }
 
   /**

package/src/indexes/index-options.ts

@@ -1,4 +1,4 @@
-import type { IndexConstructor, IndexResolver } from "./base-index.js"
+import type { IndexConstructor, IndexResolver } from './base-index.js'
 
 /**
  * Enhanced index options that support both sync and async resolvers
@@ -11,7 +11,7 @@ export interface IndexOptions<TResolver extends IndexResolver = IndexResolver> {
         id: number,
         expr: any,
         name?: string,
-        options?: infer O
+        options?: infer O,
       ) => any
       ? O
       : never
@@ -20,7 +20,7 @@ export interface IndexOptions<TResolver extends IndexResolver = IndexResolver> {
           id: number,
           expr: any,
           name?: string,
-          options?: infer O
+          options?: infer O,
         ) => any
         ? O
         : never

package/src/indexes/lazy-index.ts

@@ -2,14 +2,14 @@ import type {
   BaseIndex,
   IndexConstructor,
   IndexResolver,
-} from "./base-index.js"
-import type { BasicExpression } from "../query/ir.js"
+} from './base-index.js'
+import type { BasicExpression } from '../query/ir.js'
 
 /**
  * Utility to determine if a resolver is a constructor or async loader
  */
 function isConstructor<TKey extends string | number>(
-  resolver: IndexResolver<TKey>
+  resolver: IndexResolver<TKey>,
 ): resolver is IndexConstructor<TKey> {
   // Check if it's a function with a prototype (constructor)
   return (
@@ -23,7 +23,7 @@ function isConstructor<TKey extends string | number>(
  * Resolve index constructor from resolver
  */
 async function resolveIndexConstructor<TKey extends string | number>(
-  resolver: IndexResolver<TKey>
+  resolver: IndexResolver<TKey>,
 ): Promise<IndexConstructor<TKey>> {
   if (isConstructor(resolver)) {
     return resolver
@@ -46,7 +46,7 @@ export class LazyIndexWrapper<TKey extends string | number = string | number> {
     private name: string | undefined,
     private resolver: IndexResolver<TKey>,
     private options: any,
-    private collectionEntries?: Iterable<[TKey, any]>
+    private collectionEntries?: Iterable<[TKey, any]>,
   ) {
     // For synchronous constructors, resolve immediately
     if (isConstructor(this.resolver)) {
@@ -54,7 +54,7 @@ export class LazyIndexWrapper<TKey extends string | number = string | number> {
         this.id,
         this.expression,
         this.name,
-        this.options
+        this.options,
       )
       // Build with initial data if provided
       if (this.collectionEntries) {
@@ -92,7 +92,7 @@ export class LazyIndexWrapper<TKey extends string | number = string | number> {
   getResolved(): BaseIndex<TKey> {
     if (!this.resolvedIndex) {
       throw new Error(
-        `Index ${this.id} has not been resolved yet. Ensure collection is synced.`
+        `Index ${this.id} has not been resolved yet. Ensure collection is synced.`,
       )
     }
     return this.resolvedIndex
@@ -131,7 +131,7 @@ export class LazyIndexWrapper<TKey extends string | number = string | number> {
 export class IndexProxy<TKey extends string | number = string | number> {
   constructor(
     private indexId: number,
-    private lazyIndex: LazyIndexWrapper<TKey>
+    private lazyIndex: LazyIndexWrapper<TKey>,
   ) {}
 
   /**

package/src/indexes/reverse-index.ts

@@ -1,7 +1,7 @@
-import type { CompareOptions } from "../query/builder/types"
-import type { OrderByDirection } from "../query/ir"
-import type { IndexInterface, IndexOperation, IndexStats } from "./base-index"
-import type { RangeQueryOptions } from "./btree-index"
+import type { CompareOptions } from '../query/builder/types'
+import type { OrderByDirection } from '../query/ir'
+import type { IndexInterface, IndexOperation, IndexStats } from './base-index'
+import type { RangeQueryOptions } from './btree-index'
 
 export class ReverseIndex<
   TKey extends string | number,
@@ -43,7 +43,7 @@ export class ReverseIndex<
   takeReversed(
     n: number,
     from?: any,
-    filterFn?: (key: TKey) => boolean
+    filterFn?: (key: TKey) => boolean,
   ): Array<TKey> {
     return this.originalIndex.take(n, from, filterFn)
   }

package/src/local-only.ts

@@ -9,9 +9,9 @@ import type {
   SyncConfig,
   UpdateMutationFnParams,
   UtilsRecord,
-} from "./types"
-import type { Collection } from "./collection/index"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+} from './types'
+import type { Collection } from './collection/index'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 /**
  * Configuration interface for Local-only collection options
@@ -152,7 +152,7 @@ export function localOnlyCollectionOptions<
 >(
   config: LocalOnlyCollectionConfig<InferSchemaOutput<T>, T, TKey> & {
     schema: T
-  }
+  },
 ): LocalOnlyCollectionOptionsResult<InferSchemaOutput<T>, TKey, T> & {
   schema: T
 }
@@ -165,7 +165,7 @@ export function localOnlyCollectionOptions<
 >(
   config: LocalOnlyCollectionConfig<T, never, TKey> & {
     schema?: never // prohibit schema
-  }
+  },
 ): LocalOnlyCollectionOptionsResult<T, TKey> & {
   schema?: never // no schema in the result
 }
@@ -175,7 +175,7 @@ export function localOnlyCollectionOptions<
   TSchema extends StandardSchemaV1 = never,
   TKey extends string | number = string | number,
 >(
-  config: LocalOnlyCollectionConfig<T, TSchema, TKey>
+  config: LocalOnlyCollectionConfig<T, TSchema, TKey>,
 ): LocalOnlyCollectionOptionsResult<T, TKey, TSchema> & {
   schema?: StandardSchemaV1
 } {
@@ -189,7 +189,7 @@ export function localOnlyCollectionOptions<
    * Wraps the user's onInsert handler to also confirm the transaction immediately
    */
   const wrappedOnInsert = async (
-    params: InsertMutationFnParams<T, TKey, LocalOnlyCollectionUtils>
+    params: InsertMutationFnParams<T, TKey, LocalOnlyCollectionUtils>,
   ) => {
     // Call user handler first if provided
     let handlerResult
@@ -207,7 +207,7 @@ export function localOnlyCollectionOptions<
    * Wrapper for onUpdate handler that also confirms the transaction immediately
    */
   const wrappedOnUpdate = async (
-    params: UpdateMutationFnParams<T, TKey, LocalOnlyCollectionUtils>
+    params: UpdateMutationFnParams<T, TKey, LocalOnlyCollectionUtils>,
   ) => {
     // Call user handler first if provided
     let handlerResult
@@ -225,7 +225,7 @@ export function localOnlyCollectionOptions<
    * Wrapper for onDelete handler that also confirms the transaction immediately
    */
   const wrappedOnDelete = async (
-    params: DeleteMutationFnParams<T, TKey, LocalOnlyCollectionUtils>
+    params: DeleteMutationFnParams<T, TKey, LocalOnlyCollectionUtils>,
   ) => {
     // Call user handler first if provided
     let handlerResult
@@ -249,7 +249,7 @@ export function localOnlyCollectionOptions<
     const collectionMutations = transaction.mutations.filter(
       (m) =>
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        m.collection === syncResult.collection
+        m.collection === syncResult.collection,
     )
 
     if (collectionMutations.length === 0) {
@@ -258,7 +258,7 @@ export function localOnlyCollectionOptions<
 
     // Persist the mutations through sync
     syncResult.confirmOperationsSync(
-      collectionMutations as Array<PendingMutation<T>>
+      collectionMutations as Array<PendingMutation<T>>,
     )
   }
 
@@ -289,7 +289,7 @@ export function localOnlyCollectionOptions<
  * @returns Object with sync configuration and confirmOperationsSync function
  */
 function createLocalOnlySync<T extends object, TKey extends string | number>(
-  initialData?: Array<T>
+  initialData?: Array<T>,
 ) {
   // Capture sync functions and collection for transaction confirmation
   let syncBegin: (() => void) | null = null

package/src/local-storage.ts

@@ -3,7 +3,7 @@ import {
   InvalidStorageObjectFormatError,
   SerializationError,
   StorageKeyRequiredError,
-} from "./errors"
+} from './errors'
 import type {
   BaseCollectionConfig,
   CollectionConfig,
@@ -14,8 +14,8 @@ import type {
   SyncConfig,
   UpdateMutationFnParams,
   UtilsRecord,
-} from "./types"
-import type { StandardSchemaV1 } from "@standard-schema/spec"
+} from './types'
+import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 /**
  * Storage API interface - subset of DOM Storage that we need
@@ -28,11 +28,11 @@ export type StorageApi = Pick<Storage, `getItem` | `setItem` | `removeItem`>
 export type StorageEventApi = {
   addEventListener: (
     type: `storage`,
-    listener: (event: StorageEvent) => void
+    listener: (event: StorageEvent) => void,
   ) => void
   removeEventListener: (
     type: `storage`,
-    listener: (event: StorageEvent) => void
+    listener: (event: StorageEvent) => void,
   ) => void
 }
 
@@ -132,14 +132,14 @@ export interface LocalStorageCollectionUtils extends UtilsRecord {
 function validateJsonSerializable(
   parser: Parser,
   value: any,
-  operation: string
+  operation: string,
 ): void {
   try {
     parser.stringify(value)
   } catch (error) {
     throw new SerializationError(
       operation,
-      error instanceof Error ? error.message : String(error)
+      error instanceof Error ? error.message : String(error),
     )
   }
 }
@@ -319,7 +319,7 @@ export function localStorageCollectionOptions<
 >(
   config: LocalStorageCollectionConfig<InferSchemaOutput<T>, T, TKey> & {
     schema: T
-  }
+  },
 ): CollectionConfig<
   InferSchemaOutput<T>,
   TKey,
@@ -339,7 +339,7 @@ export function localStorageCollectionOptions<
 >(
   config: LocalStorageCollectionConfig<T, never, TKey> & {
     schema?: never // prohibit schema
-  }
+  },
 ): CollectionConfig<T, TKey, never, LocalStorageCollectionUtils> & {
   id: string
   utils: LocalStorageCollectionUtils
@@ -347,7 +347,7 @@ export function localStorageCollectionOptions<
 }
 
 export function localStorageCollectionOptions(
-  config: LocalStorageCollectionConfig<any, any, string | number>
+  config: LocalStorageCollectionConfig<any, any, string | number>,
 ): Omit<
   CollectionConfig<any, string | number, any, LocalStorageCollectionUtils>,
   `id`
@@ -388,7 +388,7 @@ export function localStorageCollectionOptions(
     storageEventApi,
     parser,
     config.getKey,
-    lastKnownData
+    lastKnownData,
   )
 
   /**
@@ -396,7 +396,7 @@ export function localStorageCollectionOptions(
    * @param dataMap - Map of items with version tracking to save to storage
    */
   const saveToStorage = (
-    dataMap: Map<string | number, StoredItem<any>>
+    dataMap: Map<string | number, StoredItem<any>>,
   ): void => {
     try {
       // Convert Map to object format for storage
@@ -409,7 +409,7 @@ export function localStorageCollectionOptions(
     } catch (error) {
       console.error(
         `[LocalStorageCollection] Error saving data to storage key "${config.storageKey}":`,
-        error
+        error,
       )
       throw error
     }
@@ -631,7 +631,7 @@ export function localStorageCollectionOptions(
 function loadFromStorage<T extends object>(
   storageKey: string,
   storage: StorageApi,
-  parser: Parser
+  parser: Parser,
 ): Map<string | number, StoredItem<T>> {
   try {
     const rawData = storage.getItem(storageKey)
@@ -671,7 +671,7 @@ function loadFromStorage<T extends object>(
   } catch (error) {
     console.warn(
       `[LocalStorageCollection] Error loading data from storage key "${storageKey}":`,
-      error
+      error,
     )
     return new Map()
   }
@@ -693,7 +693,7 @@ function createLocalStorageSync<T extends object>(
   storageEventApi: StorageEventApi,
   parser: Parser,
   _getKey: (item: T) => string | number,
-  lastKnownData: Map<string | number, StoredItem<T>>
+  lastKnownData: Map<string | number, StoredItem<T>>,
 ): SyncConfig<T> & {
   manualTrigger?: () => void
   collection: any
@@ -710,7 +710,7 @@ function createLocalStorageSync<T extends object>(
    */
   const findChanges = (
     oldData: Map<string | number, StoredItem<T>>,
-    newData: Map<string | number, StoredItem<T>>
+    newData: Map<string | number, StoredItem<T>>,
   ): Array<{
     type: `insert` | `update` | `delete`
     key: string | number

package/src/optimistic-action.ts

@@ -1,7 +1,7 @@
-import { createTransaction } from "./transactions"
-import { OnMutateMustBeSynchronousError } from "./errors"
-import { isPromiseLike } from "./utils/type-guards"
-import type { CreateOptimisticActionsOptions, Transaction } from "./types"
+import { createTransaction } from './transactions'
+import { OnMutateMustBeSynchronousError } from './errors'
+import { isPromiseLike } from './utils/type-guards'
+import type { CreateOptimisticActionsOptions, Transaction } from './types'
 
 /**
  * Creates an optimistic action function that applies local optimistic updates immediately
@@ -52,7 +52,7 @@ import type { CreateOptimisticActionsOptions, Transaction } from "./types"
  * @returns A function that accepts variables of type TVariables and returns a Transaction
  */
 export function createOptimisticAction<TVariables = unknown>(
-  options: CreateOptimisticActionsOptions<TVariables>
+  options: CreateOptimisticActionsOptions<TVariables>,
 ) {
   const { mutationFn, onMutate, ...config } = options
 

package/src/paced-mutations.ts

@@ -1,6 +1,6 @@
-import { createTransaction } from "./transactions"
-import type { MutationFn, Transaction } from "./types"
-import type { Strategy } from "./strategies/types"
+import { createTransaction } from './transactions'
+import type { MutationFn, Transaction } from './types'
+import type { Strategy } from './strategies/types'
 
 /**
  * Configuration for creating a paced mutations manager
@@ -88,7 +88,7 @@ export function createPacedMutations<
   TVariables = unknown,
   T extends object = Record<string, unknown>,
 >(
-  config: PacedMutationsConfig<TVariables, T>
+  config: PacedMutationsConfig<TVariables, T>,
 ): (variables: TVariables) => Transaction<T> {
   const { onMutate, mutationFn, strategy, ...transactionConfig } = config
 
@@ -99,13 +99,13 @@ export function createPacedMutations<
   const commitCallback = () => {
     if (!activeTransaction) {
       throw new Error(
-        `Strategy callback called but no active transaction exists. This indicates a bug in the strategy implementation.`
+        `Strategy callback called but no active transaction exists. This indicates a bug in the strategy implementation.`,
       )
     }
 
     if (activeTransaction.state !== `pending`) {
       throw new Error(
-        `Strategy callback called but active transaction is in state "${activeTransaction.state}". Expected "pending".`
+        `Strategy callback called but active transaction is in state "${activeTransaction.state}". Expected "pending".`,
       )
     }