@tanstack/db-ivm 0.1.24 → 0.1.26

package/src/operators/count.ts

@@ -29,8 +29,8 @@ export class CountOperator<K, V> extends ReduceOperator<K, V, number> {
  * Counts the number of elements by key (version-free)
  */
 export function count<
-  KType extends T extends KeyValue<infer K, infer _V> ? K : never,
-  VType extends T extends KeyValue<KType, infer V> ? V : never,
+  KType extends (T extends KeyValue<infer K, infer _V> ? K : never),
+  VType extends (T extends KeyValue<KType, infer V> ? V : never),
   T,
 >() {
   return (

package/src/operators/filterBy.ts

@@ -12,7 +12,7 @@ import type { IStreamBuilder, KeyValue, PipedOperator } from '../types.js'
  */
 export function filterBy<
   K,
-  V1 extends T extends KeyValue<infer _KT, infer VT> ? VT : never,
+  V1 extends (T extends KeyValue<infer _KT, infer VT> ? VT : never),
   T,
 >(
   other: IStreamBuilder<KeyValue<K, unknown>>,

package/src/operators/groupBy.ts

@@ -16,8 +16,7 @@ type PipedAggregateFunction<T, R> = {
 }
 
 type AggregateFunction<T, R, V = unknown> =
-  | BasicAggregateFunction<T, R, V>
-  | PipedAggregateFunction<T, R>
+  BasicAggregateFunction<T, R, V> | PipedAggregateFunction<T, R>
 
 type ExtractAggregateReturnType<T, A> =
   A extends AggregateFunction<T, infer R, any> ? R : never

package/src/operators/join.ts

@@ -254,7 +254,7 @@ export class JoinOperator<K, V1, V2> extends BinaryOperator<
  */
 export function join<
   K,
-  V1 extends T extends KeyValue<infer _KT, infer VT> ? VT : never,
+  V1 extends (T extends KeyValue<infer _KT, infer VT> ? VT : never),
   V2,
   T,
 >(
@@ -289,7 +289,7 @@ export function join<
  */
 export function innerJoin<
   K,
-  V1 extends T extends KeyValue<infer _KT, infer VT> ? VT : never,
+  V1 extends (T extends KeyValue<infer _KT, infer VT> ? VT : never),
   V2,
   T,
 >(
@@ -307,7 +307,7 @@ export function innerJoin<
  */
 export function antiJoin<
   K,
-  V1 extends T extends KeyValue<infer _KT, infer VT> ? VT : never,
+  V1 extends (T extends KeyValue<infer _KT, infer VT> ? VT : never),
   V2,
   T,
 >(
@@ -325,7 +325,7 @@ export function antiJoin<
  */
 export function leftJoin<
   K,
-  V1 extends T extends KeyValue<infer _KT, infer VT> ? VT : never,
+  V1 extends (T extends KeyValue<infer _KT, infer VT> ? VT : never),
   V2,
   T,
 >(
@@ -343,7 +343,7 @@ export function leftJoin<
  */
 export function rightJoin<
   K,
-  V1 extends T extends KeyValue<infer _KT, infer VT> ? VT : never,
+  V1 extends (T extends KeyValue<infer _KT, infer VT> ? VT : never),
   V2,
   T,
 >(
@@ -361,7 +361,7 @@ export function rightJoin<
  */
 export function fullJoin<
   K,
-  V1 extends T extends KeyValue<infer _KT, infer VT> ? VT : never,
+  V1 extends (T extends KeyValue<infer _KT, infer VT> ? VT : never),
   V2,
   T,
 >(

package/src/operators/reduce.ts

@@ -101,8 +101,8 @@ export class ReduceOperator<K, V1, V2> extends UnaryOperator<[K, V1], [K, V2]> {
  * Reduces the elements in the stream by key (version-free)
  */
 export function reduce<
-  KType extends T extends KeyValue<infer K, infer _V> ? K : never,
-  V1Type extends T extends KeyValue<KType, infer V> ? V : never,
+  KType extends (T extends KeyValue<infer K, infer _V> ? K : never),
+  V1Type extends (T extends KeyValue<KType, infer V> ? V : never),
   R,
   T,
 >(f: (values: Array<[V1Type, number]>) => Array<[R, number]>) {

package/src/operators/topK.ts

@@ -19,8 +19,8 @@ interface TopKOptions {
  * @returns A piped operator that limits the number of results
  */
 export function topK<
-  KType extends T extends KeyValue<infer K, infer _V> ? K : never,
-  V1Type extends T extends KeyValue<KType, infer V> ? V : never,
+  KType extends (T extends KeyValue<infer K, infer _V> ? K : never),
+  V1Type extends (T extends KeyValue<KType, infer V> ? V : never),
   T,
 >(
   comparator: (a: V1Type, b: V1Type) => number,
@@ -57,8 +57,8 @@ export function topK<
  * @returns A piped operator that orders the elements and limits the number of results
  */
 export function topKWithIndex<
-  KType extends T extends KeyValue<infer K, infer _V> ? K : never,
-  V1Type extends T extends KeyValue<KType, infer V> ? V : never,
+  KType extends (T extends KeyValue<infer K, infer _V> ? K : never),
+  V1Type extends (T extends KeyValue<KType, infer V> ? V : never),
   T,
 >(
   comparator: (a: V1Type, b: V1Type) => number,

package/src/utils.ts

@@ -50,20 +50,24 @@ export function binarySearch<T>(
   return low
 }
 
-const objectIds = new WeakMap<object, number>()
-let nextObjectId = 0
-
 /**
- * A string identity for composite keys: primitives by value, objects by
- * reference.
+ * A string identity within one consolidation: primitives by value, objects,
+ * functions, and symbols by identity.
  */
-export function getStringId(value: unknown): string {
+export function getStringId(
+  value: unknown,
+  referenceIds: Map<object | symbol, number>,
+): string {
   if (value === null) return `null`
   if (value === undefined) return `undefined`
-  if (typeof value !== `object`) return `str_${String(value)}`
-  let id = objectIds.get(value)
-  if (id === undefined) objectIds.set(value, (id = nextObjectId++))
-  return `obj_${id}`
+  const type = typeof value
+  if (type === `object` || type === `function` || type === `symbol`) {
+    const reference = value as object | symbol
+    let id = referenceIds.get(reference)
+    if (id === undefined) referenceIds.set(reference, (id = referenceIds.size))
+    return `ref_${id}`
+  }
+  return `${type}_${String(value)}`
 }
 
 export function* concatIterable<T>(