Split tree version of orderBy into its own file to enable tree shaking the sorted-btree dependency.

Author: kevin-dp

packages/d2mini/src/operators/orderBy.ts

@@ -2,12 +2,11 @@ import { IStreamBuilder } from '../types'
 import { KeyValue } from '../types.js'
 import { topK, topKWithIndex } from './topK.js'
 import { topKWithFractionalIndex } from './topKWithFractionalIndex.js'
-import { topKWithFractionalIndexBTree } from './topKWithFractionalIndexBTree.js'
 import { map } from './map.js'
 import { innerJoin } from './join.js'
 import { consolidate } from './consolidate.js'
 
-interface OrderByOptions<Ve> {
+export interface OrderByOptions<Ve> {
   comparator?: (a: Ve, b: Ve) => number
   limit?: number
   offset?: number
@@ -129,7 +128,7 @@ export function orderByWithIndex<
   }
 }
 
-function orderByWithFractionalIndexBase<
+export function orderByWithFractionalIndexBase<
   T extends KeyValue<unknown, unknown>,
   Ve = unknown,
 >(
@@ -212,19 +211,3 @@ export function orderByWithFractionalIndex<
     options,
   )
 }
-
-export function orderByWithFractionalIndexBTree<
-  T extends KeyValue<unknown, unknown>,
-  Ve = unknown,
->(
-  valueExtractor: (
-    value: T extends KeyValue<unknown, infer V> ? V : never,
-  ) => Ve,
-  options?: OrderByOptions<Ve>,
-) {
-  return orderByWithFractionalIndexBase(
-    topKWithFractionalIndexBTree,
-    valueExtractor,
-    options,
-  )
-}

packages/d2mini/src/operators/orderByBTree.ts

@@ -0,0 +1,19 @@
+import { KeyValue } from '../types.js'
+import { OrderByOptions, orderByWithFractionalIndexBase } from './orderBy.js'
+import { topKWithFractionalIndexBTree } from './topKWithFractionalIndexBTree.js'
+
+export function orderByWithFractionalIndexBTree<
+  T extends KeyValue<unknown, unknown>,
+  Ve = unknown,
+>(
+  valueExtractor: (
+    value: T extends KeyValue<unknown, infer V> ? V : never,
+  ) => Ve,
+  options?: OrderByOptions<Ve>,
+) {
+  return orderByWithFractionalIndexBase(
+    topKWithFractionalIndexBTree,
+    valueExtractor,
+    options,
+  )
+}

packages/d2mini/tests/operators/orderByWithFractionalIndex.test.ts

@@ -3,9 +3,9 @@ import { D2 } from '../../src/d2.js'
 import { MultiSet } from '../../src/multiset.js'
 import {
   orderByWithFractionalIndex,
-  orderByWithFractionalIndexBTree,
   output,
 } from '../../src/operators/index.js'
+import { orderByWithFractionalIndexBTree } from '../../src/operators/orderByBTree.js'
 import { KeyValue } from '../../src/types.js'
 import { loadBTree } from '../../src/operators/topKWithFractionalIndexBTree.js'