@rotorsoft/act 1.32.12 → 1.32.13

package/dist/test/index.cjs

@@ -749,17 +749,34 @@ var InMemoryStore = class {
     this._streams = /* @__PURE__ */ new Map();
   }
   in_query(query, e) {
-    if (query.stream) {
-      if (query.stream_exact) {
-        if (e.stream !== query.stream) return false;
-      } else if (!RegExp(query.stream).test(e.stream)) return false;
-    }
+    if (query.stream && !this._stream_matches(query.stream, query, e.stream))
+      return false;
     if (query.names && !query.names.includes(e.name)) return false;
     if (query.correlation && e.meta?.correlation !== query.correlation)
       return false;
     if (e.name === SNAP_EVENT && !query.with_snaps) return false;
+    if (query.created_after && e.created <= query.created_after) return false;
+    if (query.created_before && e.created >= query.created_before) return false;
     return true;
   }
+  _stream_matches(pattern, query, stream) {
+    return query.stream_exact ? stream === pattern : RegExp(pattern).test(stream);
+  }
+  /**
+   * Index of the latest snapshot of the queried stream, or -1. `with_snaps`
+   * on an exact single stream resumes there, so earlier events aren't read.
+   * The orchestrator asks only for unbounded current-state loads, so the
+   * floor applies whenever asked; an explicit `after` wins over it.
+   */
+  _snap_floor(query) {
+    if (!query?.with_snaps || !query.stream_exact || query.stream === void 0 || query.after !== void 0)
+      return -1;
+    for (let j = this._events.length - 1; j >= 0; j--) {
+      const e = this._events[j];
+      if (e.stream === query.stream && e.name === SNAP_EVENT) return j;
+    }
+    return -1;
+  }
   /**
    * Query events in the store, optionally filtered by query options.
    * @param callback - Function to call for each event.
@@ -768,59 +785,19 @@ var InMemoryStore = class {
    */
   async query(callback, query) {
     await sleep();
+    const floor = this._snap_floor(query);
+    const lo = floor >= 0 ? floor : this._first_index_after(query?.after ?? -1);
+    const hi = query?.before !== void 0 ? this._first_index_after(query.before - 1) : this._events.length;
+    const with_pii = query?.with_pii !== false;
     let count = 0;
-    let floor_index = -1;
-    if (query?.with_snaps && query.stream_exact && query.stream !== void 0 && query.after === void 0) {
-      for (let j = this._events.length - 1; j >= 0; j--) {
-        const e = this._events[j];
-        if (e.stream === query.stream && e.name === SNAP_EVENT) {
-          floor_index = j;
-          break;
-        }
-      }
-    }
-    if (query?.backward) {
-      const floor_id = floor_index >= 0 ? this._events[floor_index].id : -1;
-      let i = (query?.before !== void 0 ? this._first_index_after(query.before - 1) : this._events.length) - 1;
-      while (i >= 0) {
-        const e = this._events[i--];
-        if (query && !this.in_query(query, e)) continue;
-        if (query?.created_before && e.created >= query.created_before)
-          continue;
-        if (query.after !== void 0 && e.id <= query.after) break;
-        if (floor_id >= 0 && e.id < floor_id) break;
-        if (query.created_after && e.created <= query.created_after) continue;
-        await Promise.resolve(
-          callback(
-            this._with_pii(
-              e,
-              query?.with_pii !== false
-            )
-          )
-        );
-        count++;
-        if (query?.limit && count >= query.limit) break;
-      }
-    } else {
-      let i = floor_index >= 0 ? floor_index : this._first_index_after(query?.after ?? -1);
-      while (i < this._events.length) {
-        const e = this._events[i++];
-        if (query && !this.in_query(query, e)) continue;
-        if (query?.created_after && e.created <= query.created_after) continue;
-        if (query?.before !== void 0 && e.id >= query.before) break;
-        if (query?.created_before && e.created >= query.created_before)
-          continue;
-        await Promise.resolve(
-          callback(
-            this._with_pii(
-              e,
-              query?.with_pii !== false
-            )
-          )
-        );
-        count++;
-        if (query?.limit && count >= query.limit) break;
-      }
+    for (let k = 0; k < hi - lo; k++) {
+      const e = this._events[query?.backward ? hi - 1 - k : lo + k];
+      if (query && !this.in_query(query, e)) continue;
+      await Promise.resolve(
+        callback(this._with_pii(e, with_pii))
+      );
+      count++;
+      if (query?.limit && count >= query.limit) break;
     }
     return count;
   }