document-dataply 0.0.9-alpha.11 → 0.0.9-alpha.13

package/dist/cjs/index.js

@@ -157,39 +157,125 @@ var require_cjs = __commonJS({
     var MVCCStrategy = class {
     };
     var LRUMap = class {
-      cache = /* @__PURE__ */ new Map();
       capacity;
+      map;
+      head = null;
+      tail = null;
+      /**
+       * Creates an instance of LRUMap.
+       * @param capacity The maximum number of items the cache can hold.
+       */
       constructor(capacity) {
         this.capacity = capacity;
+        this.map = /* @__PURE__ */ new Map();
       }
-      get(key) {
-        if (!this.cache.has(key)) return void 0;
-        const value = this.cache.get(key);
-        this.cache.delete(key);
-        this.cache.set(key, value);
-        return value;
+      /**
+       * Promotes a node to the head of the linked list (marks as most recently used).
+       * @param node The node to promote.
+       */
+      promote(node) {
+        this.extract(node);
+        this.prepend(node);
+      }
+      /**
+       * Disconnects a node from the doubly linked list.
+       * @param node The node to extract.
+       */
+      extract(node) {
+        if (node.prev) node.prev.next = node.next;
+        else this.head = node.next;
+        if (node.next) node.next.prev = node.prev;
+        else this.tail = node.prev;
+        node.prev = null;
+        node.next = null;
+      }
+      /**
+       * Inserts a node at the head of the doubly linked list.
+       * @param node The node to prepend.
+       */
+      prepend(node) {
+        node.next = this.head;
+        if (this.head) this.head.prev = node;
+        this.head = node;
+        if (!this.tail) this.tail = node;
       }
+      /**
+       * Stores or updates a value by key.
+       * If the capacity is exceeded, the least recently used item (tail) is removed.
+       * @param key The key to store.
+       * @param value The value to store.
+       */
       set(key, value) {
-        if (this.cache.has(key)) {
-          this.cache.delete(key);
-        } else if (this.cache.size >= this.capacity) {
-          const oldestKey = this.cache.keys().next().value;
-          if (oldestKey !== void 0) this.cache.delete(oldestKey);
+        const existing = this.map.get(key);
+        if (existing) {
+          existing.value = value;
+          this.promote(existing);
+          return;
         }
-        this.cache.set(key, value);
-        return this;
+        const newNode = { key, value, prev: null, next: null };
+        this.map.set(key, newNode);
+        this.prepend(newNode);
+        if (this.map.size > this.capacity && this.tail) {
+          this.map.delete(this.tail.key);
+          this.extract(this.tail);
+        }
+      }
+      /**
+       * Retrieves a value by key.
+       * Accessing the item moves it to the "most recently used" position.
+       * @param key The key to look for.
+       * @returns The value associated with the key, or undefined if not found.
+       */
+      get(key) {
+        const node = this.map.get(key);
+        if (!node) return void 0;
+        this.promote(node);
+        return node.value;
       }
+      /**
+       * Checks if a key exists in the cache without changing its access order.
+       * @param key The key to check.
+       * @returns True if the key exists, false otherwise.
+       */
       has(key) {
-        return this.cache.has(key);
+        return this.map.has(key);
       }
+      /**
+       * Removes a key and its associated value from the cache.
+       * @param key The key to remove.
+       * @returns True if the key was found and removed, false otherwise.
+       */
       delete(key) {
-        return this.cache.delete(key);
+        const node = this.map.get(key);
+        if (!node) return false;
+        this.extract(node);
+        this.map.delete(key);
+        return true;
       }
-      clear() {
-        this.cache.clear();
+      /**
+       * Returns an iterator of keys in the order of most recently used to least recently used.
+       * @returns An iterable iterator of keys.
+       */
+      *keys() {
+        let current = this.head;
+        while (current) {
+          yield current.key;
+          current = current.next;
+        }
       }
+      /**
+       * Returns the current number of items in the cache.
+       */
       get size() {
-        return this.cache.size;
+        return this.map.size;
+      }
+      /**
+       * Clears all items from the cache.
+       */
+      clear() {
+        this.map.clear();
+        this.head = null;
+        this.tail = null;
       }
     };
     var MVCCTransaction = class {
@@ -1583,7 +1669,7 @@ var require_cjs = __commonJS({
       searchConfigs = {
         gt: {
           asc: {
-            start: (tx, v) => tx.insertableNodeByPrimary(v[0]),
+            start: (tx, v) => tx.insertableRightestNodeByPrimary(v[0]),
             end: () => null,
             direction: 1,
             earlyTerminate: false
@@ -1681,7 +1767,7 @@ var require_cjs = __commonJS({
         },
         primaryGt: {
           asc: {
-            start: (tx, v) => tx.insertableRightestEndNodeByPrimary(v[0]),
+            start: (tx, v) => tx.insertableRightestNodeByPrimary(v[0]),
             end: () => null,
             direction: 1,
             earlyTerminate: false
@@ -1743,7 +1829,7 @@ var require_cjs = __commonJS({
             earlyTerminate: true
           },
           desc: {
-            start: (tx, v) => tx.insertableRightestEndNodeByPrimary(v[0]),
+            start: (tx, v) => tx.insertableRightestNodeByPrimary(v[0]),
             end: (tx, v) => tx.insertableEndNode(v[0], -1),
             direction: -1,
             earlyTerminate: true
@@ -1771,7 +1857,7 @@ var require_cjs = __commonJS({
             earlyTerminate: false
           },
           desc: {
-            start: (tx, v) => tx.insertableRightestEndNodeByPrimary(tx.highestPrimaryValue(v)),
+            start: (tx, v) => tx.insertableRightestNodeByPrimary(tx.highestPrimaryValue(v)),
             end: (tx, v) => tx.insertableEndNode(tx.lowestPrimaryValue(v), -1),
             direction: -1,
             earlyTerminate: false
@@ -1928,30 +2014,62 @@ var require_cjs = __commonJS({
         return JSON.parse(JSON.stringify(node));
       }
       /**
-       * Selects the best driver key from a condition object.
-       * The driver key determines the starting point and traversal direction for queries.
-       * 
+       * Resolves the best start/end configuration by independently examining
+       * all conditions. Selects the tightest lower bound for start and the
+       * tightest upper bound for end (in asc; reversed for desc).
+       *
        * @param condition The condition to analyze.
-       * @returns The best driver key or null if no valid key found.
-       */
-      getDriverKey(condition) {
-        if ("primaryEqual" in condition) return "primaryEqual";
-        if ("equal" in condition) return "equal";
-        if ("gt" in condition) return "gt";
-        if ("gte" in condition) return "gte";
-        if ("lt" in condition) return "lt";
-        if ("lte" in condition) return "lte";
-        if ("primaryGt" in condition) return "primaryGt";
-        if ("primaryGte" in condition) return "primaryGte";
-        if ("primaryLt" in condition) return "primaryLt";
-        if ("primaryLte" in condition) return "primaryLte";
-        if ("like" in condition) return "like";
-        if ("notEqual" in condition) return "notEqual";
-        if ("primaryNotEqual" in condition) return "primaryNotEqual";
-        if ("or" in condition) return "or";
-        if ("primaryOr" in condition) return "primaryOr";
-        return null;
-      }
+       * @param order The sort order ('asc' or 'desc').
+       * @returns The resolved start/end keys, values, and traversal direction.
+       */
+      resolveStartEndConfigs(condition, order) {
+        const direction = order === "asc" ? 1 : -1;
+        const startCandidates = order === "asc" ? _BPTreeTransaction._lowerBoundKeys : _BPTreeTransaction._upperBoundKeys;
+        const endCandidates = order === "asc" ? _BPTreeTransaction._upperBoundKeys : _BPTreeTransaction._lowerBoundKeys;
+        let startKey = null;
+        let endKey = null;
+        let startValues = [];
+        let endValues = [];
+        for (const key of startCandidates) {
+          if (key in condition) {
+            startKey = key;
+            startValues = this.ensureValues(condition[key]);
+            break;
+          }
+        }
+        for (const key of endCandidates) {
+          if (key in condition) {
+            endKey = key;
+            endValues = this.ensureValues(condition[key]);
+            break;
+          }
+        }
+        return { startKey, endKey, startValues, endValues, direction };
+      }
+      // Lower bound providers, ordered by selectivity (tightest first)
+      // Used for asc start / desc end
+      static _lowerBoundKeys = [
+        "primaryEqual",
+        "equal",
+        "primaryGt",
+        "gt",
+        "primaryGte",
+        "gte",
+        "primaryOr",
+        "or"
+      ];
+      // Upper bound providers, ordered by selectivity (tightest first)
+      // Used for asc end / desc start
+      static _upperBoundKeys = [
+        "primaryEqual",
+        "equal",
+        "primaryLt",
+        "lt",
+        "primaryLte",
+        "lte",
+        "primaryOr",
+        "or"
+      ];
       constructor(rootTx, mvccRoot, mvcc, strategy, comparator, option) {
         this.rootTx = rootTx === null ? this : rootTx;
         this.mvccRoot = mvccRoot;
@@ -2257,13 +2375,10 @@ var require_cjs = __commonJS({
         }
         return node;
       }
-      *getPairsGenerator(value, startNode, endNode, comparator, direction, earlyTerminate) {
+      *getPairsGenerator(startNode, endNode, direction) {
         let node = startNode;
-        let done = false;
-        let hasMatched = false;
-        while (!done) {
+        while (true) {
           if (endNode && node.id === endNode.id) {
-            done = true;
             break;
           }
           const len = node.values.length;
@@ -2271,14 +2386,8 @@ var require_cjs = __commonJS({
             for (let i = 0; i < len; i++) {
               const nValue = node.values[i];
               const keys = node.keys[i];
-              if (comparator(nValue, value)) {
-                hasMatched = true;
-                for (let j = 0; j < keys.length; j++) {
-                  yield [keys[j], nValue];
-                }
-              } else if (earlyTerminate && hasMatched) {
-                done = true;
-                break;
+              for (let j = 0, kLen = keys.length; j < kLen; j++) {
+                yield [keys[j], nValue];
               }
             }
           } else {
@@ -2286,30 +2395,17 @@ var require_cjs = __commonJS({
             while (i--) {
               const nValue = node.values[i];
               const keys = node.keys[i];
-              if (comparator(nValue, value)) {
-                hasMatched = true;
-                let j = keys.length;
-                while (j--) {
-                  yield [keys[j], nValue];
-                }
-              } else if (earlyTerminate && hasMatched) {
-                done = true;
-                break;
+              let j = keys.length;
+              while (j--) {
+                yield [keys[j], nValue];
               }
             }
           }
-          if (done) break;
           if (direction === 1) {
-            if (!node.next) {
-              done = true;
-              break;
-            }
+            if (!node.next) break;
             node = this.getNode(node.next);
           } else {
-            if (!node.prev) {
-              done = true;
-              break;
-            }
+            if (!node.prev) break;
             node = this.getNode(node.prev);
           }
         }
@@ -2398,49 +2494,36 @@ var require_cjs = __commonJS({
       }
       *whereStream(condition, options) {
         const { filterValues, limit, order = "asc" } = options ?? {};
-        const driverKey = this.getDriverKey(condition);
-        if (!driverKey) return;
-        const value = condition[driverKey];
-        const v = this.ensureValues(value);
-        const config = this.searchConfigs[driverKey][order];
-        let startNode = config.start(this, v);
-        let endNode = config.end(this, v);
-        const direction = config.direction;
-        const earlyTerminate = config.earlyTerminate;
-        if (order === "desc" && !startNode) {
-          startNode = this.rightestNode();
-        }
-        if (order === "asc" && !startNode) {
-          startNode = this.leftestNode();
+        const conditionKeys = Object.keys(condition);
+        if (conditionKeys.length === 0) return;
+        const resolved = this.resolveStartEndConfigs(condition, order);
+        const direction = resolved.direction;
+        let startNode;
+        if (resolved.startKey) {
+          const startConfig = this.searchConfigs[resolved.startKey][order];
+          startNode = startConfig.start(this, resolved.startValues);
+        } else {
+          startNode = order === "asc" ? this.leftestNode() : this.rightestNode();
+        }
+        let endNode = null;
+        if (resolved.endKey) {
+          const endConfig = this.searchConfigs[resolved.endKey][order];
+          endNode = endConfig.end(this, resolved.endValues);
         }
         if (!startNode) return;
-        const comparator = this.verifierMap[driverKey];
         const generator = this.getPairsGenerator(
-          value,
           startNode,
           endNode,
-          comparator,
-          direction,
-          earlyTerminate
+          direction
         );
         let count = 0;
         const intersection = filterValues && filterValues.size > 0 ? filterValues : null;
         for (const pair of generator) {
-          const [k, v2] = pair;
+          const [k, v] = pair;
           if (intersection && !intersection.has(k)) {
             continue;
           }
-          let isMatch = true;
-          for (const key in condition) {
-            if (key === driverKey) continue;
-            const verify = this.verifierMap[key];
-            const condValue = condition[key];
-            if (!verify(v2, condValue)) {
-              isMatch = false;
-              break;
-            }
-          }
-          if (isMatch) {
+          if (this.verify(v, condition)) {
             yield pair;
             count++;
             if (limit !== void 0 && count >= limit) {
@@ -3385,22 +3468,19 @@ var require_cjs = __commonJS({
         }
         return node;
       }
-      async *getPairsGenerator(value, startNode, endNode, comparator, direction, earlyTerminate) {
+      async *getPairsGenerator(startNode, endNode, direction) {
         let node = startNode;
-        let done = false;
-        let hasMatched = false;
         let nextNodePromise = null;
-        while (!done) {
+        while (true) {
           if (endNode && node.id === endNode.id) {
-            done = true;
             break;
           }
           if (direction === 1) {
-            if (node.next && !done) {
+            if (node.next) {
               nextNodePromise = this.getNode(node.next);
             }
           } else {
-            if (node.prev && !done) {
+            if (node.prev) {
               nextNodePromise = this.getNode(node.prev);
             }
           }
@@ -3409,14 +3489,8 @@ var require_cjs = __commonJS({
             for (let i = 0; i < len; i++) {
               const nValue = node.values[i];
               const keys = node.keys[i];
-              if (comparator(nValue, value)) {
-                hasMatched = true;
-                for (let j = 0; j < keys.length; j++) {
-                  yield [keys[j], nValue];
-                }
-              } else if (earlyTerminate && hasMatched) {
-                done = true;
-                break;
+              for (let j = 0, kLen = keys.length; j < kLen; j++) {
+                yield [keys[j], nValue];
               }
             }
           } else {
@@ -3424,27 +3498,17 @@ var require_cjs = __commonJS({
             while (i--) {
               const nValue = node.values[i];
               const keys = node.keys[i];
-              if (comparator(nValue, value)) {
-                hasMatched = true;
-                let j = keys.length;
-                while (j--) {
-                  yield [keys[j], nValue];
-                }
-              } else if (earlyTerminate && hasMatched) {
-                done = true;
-                break;
+              let j = keys.length;
+              while (j--) {
+                yield [keys[j], nValue];
               }
             }
           }
-          if (done) {
-            if (nextNodePromise) await nextNodePromise;
-            break;
-          }
           if (nextNodePromise) {
             node = await nextNodePromise;
             nextNodePromise = null;
           } else {
-            done = true;
+            break;
           }
         }
       }
@@ -3532,49 +3596,36 @@ var require_cjs = __commonJS({
       }
       async *whereStream(condition, options) {
         const { filterValues, limit, order = "asc" } = options ?? {};
-        const driverKey = this.getDriverKey(condition);
-        if (!driverKey) return;
-        const value = condition[driverKey];
-        const v = this.ensureValues(value);
-        const config = this.searchConfigs[driverKey][order];
-        let startNode = await config.start(this, v);
-        let endNode = await config.end(this, v);
-        const direction = config.direction;
-        const earlyTerminate = config.earlyTerminate;
-        if (order === "desc" && !startNode) {
-          startNode = await this.rightestNode();
-        }
-        if (order === "asc" && !startNode) {
-          startNode = await this.leftestNode();
+        const conditionKeys = Object.keys(condition);
+        if (conditionKeys.length === 0) return;
+        const resolved = this.resolveStartEndConfigs(condition, order);
+        const direction = resolved.direction;
+        let startNode;
+        if (resolved.startKey) {
+          const startConfig = this.searchConfigs[resolved.startKey][order];
+          startNode = await startConfig.start(this, resolved.startValues);
+        } else {
+          startNode = order === "asc" ? await this.leftestNode() : await this.rightestNode();
+        }
+        let endNode = null;
+        if (resolved.endKey) {
+          const endConfig = this.searchConfigs[resolved.endKey][order];
+          endNode = await endConfig.end(this, resolved.endValues);
         }
         if (!startNode) return;
-        const comparator = this.verifierMap[driverKey];
         const generator = this.getPairsGenerator(
-          value,
           startNode,
           endNode,
-          comparator,
-          direction,
-          earlyTerminate
+          direction
         );
         let count = 0;
         const intersection = filterValues && filterValues.size > 0 ? filterValues : null;
         for await (const pair of generator) {
-          const [k, v2] = pair;
+          const [k, v] = pair;
           if (intersection && !intersection.has(k)) {
             continue;
           }
-          let isMatch = true;
-          for (const key in condition) {
-            if (key === driverKey) continue;
-            const verify = this.verifierMap[key];
-            const condValue = condition[key];
-            if (!verify(v2, condValue)) {
-              isMatch = false;
-              break;
-            }
-          }
-          if (isMatch) {
+          if (this.verify(v, condition)) {
             yield pair;
             count++;
             if (limit !== void 0 && count >= limit) {
@@ -4869,39 +4920,125 @@ var require_cjs = __commonJS({
     var MVCCStrategy2 = class {
     };
     var LRUMap3 = class {
-      cache = /* @__PURE__ */ new Map();
       capacity;
+      map;
+      head = null;
+      tail = null;
+      /**
+       * Creates an instance of LRUMap.
+       * @param capacity The maximum number of items the cache can hold.
+       */
       constructor(capacity) {
         this.capacity = capacity;
+        this.map = /* @__PURE__ */ new Map();
       }
-      get(key) {
-        if (!this.cache.has(key)) return void 0;
-        const value = this.cache.get(key);
-        this.cache.delete(key);
-        this.cache.set(key, value);
-        return value;
+      /**
+       * Promotes a node to the head of the linked list (marks as most recently used).
+       * @param node The node to promote.
+       */
+      promote(node) {
+        this.extract(node);
+        this.prepend(node);
       }
+      /**
+       * Disconnects a node from the doubly linked list.
+       * @param node The node to extract.
+       */
+      extract(node) {
+        if (node.prev) node.prev.next = node.next;
+        else this.head = node.next;
+        if (node.next) node.next.prev = node.prev;
+        else this.tail = node.prev;
+        node.prev = null;
+        node.next = null;
+      }
+      /**
+       * Inserts a node at the head of the doubly linked list.
+       * @param node The node to prepend.
+       */
+      prepend(node) {
+        node.next = this.head;
+        if (this.head) this.head.prev = node;
+        this.head = node;
+        if (!this.tail) this.tail = node;
+      }
+      /**
+       * Stores or updates a value by key.
+       * If the capacity is exceeded, the least recently used item (tail) is removed.
+       * @param key The key to store.
+       * @param value The value to store.
+       */
       set(key, value) {
-        if (this.cache.has(key)) {
-          this.cache.delete(key);
-        } else if (this.cache.size >= this.capacity) {
-          const oldestKey = this.cache.keys().next().value;
-          if (oldestKey !== void 0) this.cache.delete(oldestKey);
+        const existing = this.map.get(key);
+        if (existing) {
+          existing.value = value;
+          this.promote(existing);
+          return;
         }
-        this.cache.set(key, value);
-        return this;
+        const newNode = { key, value, prev: null, next: null };
+        this.map.set(key, newNode);
+        this.prepend(newNode);
+        if (this.map.size > this.capacity && this.tail) {
+          this.map.delete(this.tail.key);
+          this.extract(this.tail);
+        }
+      }
+      /**
+       * Retrieves a value by key.
+       * Accessing the item moves it to the "most recently used" position.
+       * @param key The key to look for.
+       * @returns The value associated with the key, or undefined if not found.
+       */
+      get(key) {
+        const node = this.map.get(key);
+        if (!node) return void 0;
+        this.promote(node);
+        return node.value;
       }
+      /**
+       * Checks if a key exists in the cache without changing its access order.
+       * @param key The key to check.
+       * @returns True if the key exists, false otherwise.
+       */
       has(key) {
-        return this.cache.has(key);
+        return this.map.has(key);
       }
+      /**
+       * Removes a key and its associated value from the cache.
+       * @param key The key to remove.
+       * @returns True if the key was found and removed, false otherwise.
+       */
       delete(key) {
-        return this.cache.delete(key);
+        const node = this.map.get(key);
+        if (!node) return false;
+        this.extract(node);
+        this.map.delete(key);
+        return true;
       }
-      clear() {
-        this.cache.clear();
+      /**
+       * Returns an iterator of keys in the order of most recently used to least recently used.
+       * @returns An iterable iterator of keys.
+       */
+      *keys() {
+        let current = this.head;
+        while (current) {
+          yield current.key;
+          current = current.next;
+        }
       }
+      /**
+       * Returns the current number of items in the cache.
+       */
       get size() {
-        return this.cache.size;
+        return this.map.size;
+      }
+      /**
+       * Clears all items from the cache.
+       */
+      clear() {
+        this.map.clear();
+        this.head = null;
+        this.tail = null;
       }
     };
     var MVCCTransaction2 = class {
@@ -6348,21 +6485,68 @@ var require_cjs = __commonJS({
       }
       return (crc ^ -1) >>> 0;
     }
-    function getMinMaxValue(array) {
-      let i = 0;
-      let min = Infinity;
-      let max = -Infinity;
-      let len = array.length;
-      while (i < len) {
-        if (array[i] < min) {
-          min = array[i];
-        }
-        if (array[i] > max) {
-          max = array[i];
+    function calcThreshold(sortedGaps, n) {
+      const gLen = sortedGaps.length;
+      if (gLen === 0) return 0;
+      const median = sortedGaps[Math.floor(gLen * 0.5)];
+      const q1 = sortedGaps[Math.floor(gLen * 0.25)];
+      const q3 = sortedGaps[Math.floor(gLen * 0.75)];
+      const iqr = q3 - q1;
+      const logN = Math.max(1, Math.log10(n));
+      if (iqr > 0) {
+        const threshold2 = q3 + iqr * 1.5 * logN;
+        const minJump = Math.max(median * 5, 20);
+        return Math.max(threshold2, minJump);
+      }
+      const baseGap = median > 0 ? median : 1;
+      const p90 = sortedGaps[Math.floor(gLen * 0.9)];
+      if (p90 > baseGap) {
+        const threshold2 = baseGap + (p90 - baseGap) * 0.5 * logN;
+        return Math.max(threshold2, baseGap * 5, 20);
+      }
+      let mean = 0;
+      for (let i = 0; i < gLen; i++) mean += sortedGaps[i];
+      mean /= gLen;
+      let variance = 0;
+      for (let i = 0; i < gLen; i++) {
+        const d = sortedGaps[i] - mean;
+        variance += d * d;
+      }
+      const stddev = Math.sqrt(variance / gLen);
+      if (stddev === 0) {
+        return baseGap * 2;
+      }
+      const threshold = mean + stddev * logN;
+      return Math.max(threshold, baseGap * 5, 20);
+    }
+    function clusterNumbers(numbers, gapMultiplier) {
+      const n = numbers.length;
+      if (n === 0) return [];
+      if (n === 1) return [new Float64Array([numbers[0]])];
+      const sorted = (numbers instanceof Float64Array ? numbers.slice() : Float64Array.from(numbers)).sort();
+      const gaps = new Float64Array(n - 1);
+      for (let i = 0, len = n - 1; i < len; i++) {
+        gaps[i] = sorted[i + 1] - sorted[i];
+      }
+      const sortedGaps = gaps.slice().sort();
+      let threshold;
+      if (gapMultiplier !== void 0) {
+        const q3 = sortedGaps[Math.floor((n - 1) * 0.75)];
+        const iqr = q3 - sortedGaps[Math.floor((n - 1) * 0.25)];
+        threshold = q3 + iqr * gapMultiplier;
+      } else {
+        threshold = calcThreshold(sortedGaps, n);
+      }
+      const clusters = [];
+      let clusterStart = 0;
+      for (let i = 0, len = n - 1; i < len; i++) {
+        if (gaps[i] > threshold) {
+          clusters.push(sorted.subarray(clusterStart, i + 1));
+          clusterStart = i + 1;
         }
-        i++;
       }
-      return [min, max];
+      clusters.push(sorted.subarray(clusterStart));
+      return clusters;
     }
     var Row = class _Row {
       static CONSTANT = {
@@ -9302,14 +9486,30 @@ var require_cjs = __commonJS({
         for (let i = 0, len = pks.length; i < len; i++) {
           pkIndexMap.set(pks[i], i);
         }
-        const [minPk, maxPk] = getMinMaxValue(pks);
         const pkRidPairs = new Array(pks.length).fill(null);
         const btx = await this.getBPTreeTransaction(tx);
-        const stream = btx.whereStream({ gte: minPk, lte: maxPk });
-        for await (const [rid, pk] of stream) {
-          const index = pkIndexMap.get(pk);
-          if (index !== void 0) {
-            pkRidPairs[index] = { pk, rid, index };
+        const clusters = clusterNumbers(pks);
+        for (let i = 0, len = clusters.length; i < len; i++) {
+          const cluster = clusters[i];
+          const minPk = cluster[0];
+          const maxPk = cluster[cluster.length - 1];
+          if (minPk === maxPk) {
+            const keys = await btx.keys({ equal: minPk });
+            if (keys.size > 0) {
+              const rid = keys.values().next().value;
+              const index = pkIndexMap.get(minPk);
+              if (index !== void 0) {
+                pkRidPairs[index] = { pk: minPk, rid, index };
+              }
+            }
+            continue;
+          }
+          const stream = btx.whereStream({ gte: minPk, lte: maxPk });
+          for await (const [rid, pk] of stream) {
+            const index = pkIndexMap.get(pk);
+            if (index !== void 0) {
+              pkRidPairs[index] = { pk, rid, index };
+            }
           }
         }
         return this.fetchRowsByRids(pkRidPairs, tx);
@@ -10301,61 +10501,36 @@ var DocumentSerializeStrategyAsync = class extends import_dataply.SerializeStrat
 
 // src/core/bptree/documentComparator.ts
 var import_dataply2 = __toESM(require_cjs());
-function comparePrimitive(a, b) {
-  if (a === b) return 0;
-  if (a === null) return -1;
-  if (b === null) return 1;
-  if (typeof a !== typeof b) {
-    const typeOrder = (v) => typeof v === "boolean" ? 0 : typeof v === "number" ? 1 : 2;
-    return typeOrder(a) - typeOrder(b);
-  }
-  if (typeof a === "string" && typeof b === "string") {
-    return a.localeCompare(b);
+function compareDiff(a, b) {
+  if (typeof a !== "string" && typeof b !== "string") {
+    return +a - +b;
   }
-  return +a - +b;
+  return (a + "").localeCompare(b + "");
 }
 function compareValue(a, b) {
   const aArr = Array.isArray(a);
   const bArr = Array.isArray(b);
   if (!aArr && !bArr) {
-    return comparePrimitive(a, b);
+    return compareDiff(a, b);
   }
   const aList = aArr ? a : [a];
   const bList = bArr ? b : [b];
   const len = Math.min(aList.length, bList.length);
   for (let i = 0; i < len; i++) {
-    const diff = comparePrimitive(aList[i], bList[i]);
-    if (diff !== 0) return diff;
-  }
-  return aList.length - bList.length;
-}
-function comparePrimaryValue(a, b) {
-  const aArr = Array.isArray(a);
-  const bArr = Array.isArray(b);
-  if (!aArr && !bArr) {
-    return comparePrimitive(a, b);
-  }
-  const aList = aArr ? a : [a];
-  const bList = bArr ? b : [b];
-  const len = Math.min(aList.length, bList.length);
-  for (let i = 0; i < len; i++) {
-    const diff = comparePrimitive(aList[i], bList[i]);
+    const diff = compareDiff(aList[i], bList[i]);
     if (diff !== 0) return diff;
   }
   return 0;
 }
 var DocumentValueComparator = class extends import_dataply2.ValueComparator {
   primaryAsc(a, b) {
-    return comparePrimaryValue(a.v, b.v);
+    return compareValue(a.v, b.v);
   }
   asc(a, b) {
     const diff = compareValue(a.v, b.v);
     return diff === 0 ? a.k - b.k : diff;
   }
   match(value) {
-    if (Array.isArray(value.v)) {
-      return value.v[0] + "";
-    }
     return value.v + "";
   }
 };
@@ -10598,8 +10773,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
   async registerIndexRuntime(name, option, tx) {
     const config = this.toIndexMetaConfig(option);
     if (this.registeredIndices.has(name)) {
-      const existing = this.registeredIndices.get(name);
-      if (JSON.stringify(existing) === JSON.stringify(config)) return;
+      throw new Error(`Index "${name}" already exists.`);
     }
     await this.runWithDefaultWrite(async (tx2) => {
       const metadata = await this.getDocumentInnerMetadata(tx2);
@@ -10608,7 +10782,8 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
       this.indices = metadata.indices;
       this.registeredIndices.set(name, config);
       const fields = this.getFieldsFromConfig(config);
-      for (const field of fields) {
+      for (let i = 0; i < fields.length; i++) {
+        const field = fields[i];
         this.indexedFields.add(field);
         if (!this.fieldToIndices.has(field)) {
           this.fieldToIndices.set(field, []);
@@ -10640,14 +10815,14 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    */
   async dropIndex(name, tx) {
     if (name === "_id") {
-      throw new Error("Cannot drop the _id index");
+      throw new Error('Cannot drop the "_id" index.');
     }
     if (!this._initialized) {
       this.pendingCreateIndices.delete(name);
       return;
     }
     if (!this.registeredIndices.has(name)) {
-      throw new Error(`Index '${name}' does not exist`);
+      throw new Error(`Index "${name}" does not exist.`);
     }
     await this.runWithDefaultWrite(async (tx2) => {
       const config = this.registeredIndices.get(name);
@@ -10657,7 +10832,8 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
       this.indices = metadata.indices;
       this.registeredIndices.delete(name);
       const fields = this.getFieldsFromConfig(config);
-      for (const field of fields) {
+      for (let i = 0; i < fields.length; i++) {
+        const field = fields[i];
         const indexNames = this.fieldToIndices.get(field);
         if (indexNames) {
           const filtered = indexNames.filter((n) => n !== name);
@@ -10688,7 +10864,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
       if (!Array.isArray(option.fields) || option.fields.length === 0) {
         throw new Error('btree index requires a non-empty "fields" array');
       }
-      for (let i = 0; i < option.fields.length; i++) {
+      for (let i = 0, len = option.fields.length; i < len; i++) {
         if (typeof option.fields[i] !== "string" || option.fields[i].length === 0) {
           throw new Error(`btree index "fields[${i}]" must be a non-empty string, got: ${JSON.stringify(option.fields[i])}`);
         }
@@ -11135,7 +11311,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
     }
     candidates.sort((a, b) => b.score - a.score);
     const driver = candidates[0];
-    const others = candidates.slice(1);
+    const others = candidates.slice(1).filter((c) => c.field !== driver.field);
     const compositeVerifyConditions = [];
     for (const field of driver.compositeVerifyFields) {
       if (query[field]) {
@@ -11609,8 +11785,12 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    */
   async *processChunkedKeysWithVerify(keysStream, startIdx, initialChunkSize, ftsConditions, compositeVerifyConditions, others, tx) {
     const verifyOthers = others.filter((o) => !o.isFtsMatch);
+    const isFts = ftsConditions.length > 0;
+    const isCompositeVerify = compositeVerifyConditions.length > 0;
+    const isVerifyOthers = verifyOthers.length > 0;
     let currentChunkSize = initialChunkSize;
     let chunk = [];
+    let chunkSize = 0;
     let dropped = 0;
     const processChunk = async (pks) => {
       const docs = [];
@@ -11621,9 +11801,9 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
         if (!s) continue;
         const doc = JSON.parse(s);
         chunkTotalSize += s.length * 2;
-        if (ftsConditions.length > 0 && !this.verifyFts(doc, ftsConditions)) continue;
-        if (compositeVerifyConditions.length > 0 && this.verifyCompositeConditions(doc, compositeVerifyConditions) === false) continue;
-        if (verifyOthers.length > 0) {
+        if (isFts && !this.verifyFts(doc, ftsConditions)) continue;
+        if (isCompositeVerify && this.verifyCompositeConditions(doc, compositeVerifyConditions) === false) continue;
+        if (isVerifyOthers) {
           const flatDoc = this.flattenDocument(doc);
           let passed = true;
           for (let k = 0, kLen = verifyOthers.length; k < kLen; k++) {
@@ -11652,15 +11832,17 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
         continue;
       }
       chunk.push(pk);
-      if (chunk.length >= currentChunkSize) {
+      chunkSize++;
+      if (chunkSize >= currentChunkSize) {
         const docs = await processChunk(chunk);
-        for (let j = 0; j < docs.length; j++) yield docs[j];
+        for (let j = 0, dLen = docs.length; j < dLen; j++) yield docs[j];
         chunk = [];
+        chunkSize = 0;
       }
     }
-    if (chunk.length > 0) {
+    if (chunkSize > 0) {
       const docs = await processChunk(chunk);
-      for (let j = 0; j < docs.length; j++) yield docs[j];
+      for (let j = 0, dLen = docs.length; j < dLen; j++) yield docs[j];
     }
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "document-dataply",
-  "version": "0.0.9-alpha.11",
+  "version": "0.0.9-alpha.13",
   "description": "Simple and powerful JSON document database supporting complex queries and flexible indexing policies.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",
@@ -42,7 +42,7 @@
     "dataply"
   ],
   "dependencies": {
-    "dataply": "^0.0.24-alpha.10"
+    "dataply": "^0.0.24-alpha.12"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
@@ -51,4 +51,4 @@
     "ts-jest": "^29.4.6",
     "typescript": "^5.9.3"
   }
-}
+}