fix(util): ensureSortedSet handles null iterable

tabcat · Dec 2, 2024 · 5926307 · 5926307
1 parent 95597cf
commit 5926307
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/util.ts b/src/util.ts
@@ -59,14 +59,16 @@ export function* readArray<T>(
   }
 }
 
+const sentinel = Symbol();
+
 export function* ensureSortedSet<T>(
   iterable: Iterable<T>,
   comparator: (a: T, b: T) => number,
 ): Generator<T> {
-  let previous: T | null = null;
+  let previous: T | typeof sentinel = sentinel;
 
   for (const element of iterable) {
-    if (previous != null && comparator(element, previous) <= 0) {
+    if (previous !== sentinel && comparator(previous, element) >= 0) {
       throw new Error("iterable is not a sorted set.");
     }
 
@@ -79,10 +81,10 @@ export async function* ensureSortedSetAsync<T>(
   iterable: AsyncIterable<T> | Iterable<T>,
   comparator: (a: T, b: T) => number,
 ): AsyncGenerator<T> {
-  let previous: T | null = null;
+  let previous: T | typeof sentinel = sentinel;
 
   for await (const element of iterable) {
-    if (previous != null && comparator(element, previous) <= 0) {
+    if (previous !== sentinel && comparator(previous, element) >= 0) {
       throw new Error("async-iterable is not a sorted set.");
     }