@procedures/mongo 0.52.2 → 0.52.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@procedures/mongo",
-  "version": "0.52.2",
+  "version": "0.52.3",
   "description": "MongoDB as typed procedures: documents, bulk writes, distinct, explain, collections, indexes, aggregation, change streams and database info, with safe update and delete targets.",
   "keywords": [
     "mongodb",
@@ -68,8 +68,8 @@
     "@mark1russell7/rigor-generators": "^0.1.5",
     "@mark1russell7/rigor-statistics": "^0.1.9",
     "@mark1russell7/service": "^0.6.0",
-    "@procedures/peer": "0.52.2",
-    "@procedures/store": "0.52.2",
+    "@procedures/peer": "0.52.3",
+    "@procedures/store": "0.52.3",
     "@types/node": "^22.0.0",
     "typescript": "^7.0.2",
     "vitest": "^5.0.3"
@@ -78,8 +78,8 @@
     "procedures": "./dist/register.js"
   },
   "dependencies": {
-    "@procedures/client": "0.52.2",
-    "@procedures/collections": "0.52.2",
+    "@procedures/client": "0.52.3",
+    "@procedures/collections": "0.52.3",
     "mongodb": "^7.0.0",
     "zod": "^4.6.5"
   },

package/src/storage/document-storage.ts

@@ -559,6 +559,20 @@ export interface RawStorageWrite {
 /** The result of an adoption: `adopted`, `lost` (the document changed since: another adoption or write won), or `unknown` (no image and no stored `_id` tells the id and the partition). */
 export type RawAdoption = "adopted" | "lost" | "unknown";
 
+/**
+ * The key of a stored `_id` in a map: its extended JSON. Two object ids with other fields are two
+ * keys, and an `ObjectId` and its hex text are two keys too (audit 2026-11-08).
+ */
+function storedIdKey(id: unknown): string {
+  return BSON.EJSON.stringify({ v: id as never }, { relaxed: false });
+}
+
+/** The order of two stored `_id` values of one place: two texts by their text, else by their keys. */
+function idOrder(a: unknown, b: unknown, keyA: string, keyB: string): number {
+  const [x, y] = typeof a === "string" && typeof b === "string" ? [a, b] : [keyA, keyB];
+  return x < y ? -1 : x > y ? 1 : 0;
+}
+
 /** True when two values have the same BSON. */
 function sameBson(a: unknown, b: unknown): boolean {
   try {
@@ -1398,13 +1412,16 @@ export class MongoDocumentStorage<T> implements CollectionStorage<T> {
 
   /** The listed documents with later documents over them, in the order of the entries. A tombstone removes its document. */
   private withLaterDocs(listed: readonly Document[], later: readonly Document[]): Document[] {
-    const idOf = (doc: Document): string => String(doc["_id"]);
-    const docs = new Map(listed.map((doc) => [idOf(doc), doc]));
+    // The key knows the type of the `_id`: before, `String()` gave each object `_id` one key
+    const keyOf = (doc: Document): string => storedIdKey(doc["_id"]);
+    const docs = new Map(listed.map((doc) => [keyOf(doc), doc]));
     for (const doc of later) {
-      if (doc[TOMB] === true) docs.delete(idOf(doc));
-      else docs.set(idOf(doc), doc);
+      if (doc[TOMB] === true) docs.delete(keyOf(doc));
+      else docs.set(keyOf(doc), doc);
     }
-    return [...docs.values()].sort((a, b) => this.placeOf(a) - this.placeOf(b) || (idOf(a) < idOf(b) ? -1 : idOf(a) > idOf(b) ? 1 : 0));
+    return [...docs]
+      .sort(([keyA, a], [keyB, b]) => this.placeOf(a) - this.placeOf(b) || idOrder(a["_id"], b["_id"], keyA, keyB))
+      .map(([, doc]) => doc);
   }
 
   async getChangesSince(since?: string): Promise<StorageChanges<T>> {

package/src/storage/storage-hints.ts

@@ -940,6 +940,8 @@ export function watchStorageChanges<T>(storage: MongoDocumentStorage<T>, publish
     }
     stream = next;
     const joiner = eventJoiner();
+    /** The token before the document of the last token: the token before the event at fragment 1. */
+    let tokenBefore: unknown = token;
     /** The token at the open: a reopen at the same token is no success, so the backoff does not start again. */
     const openToken = JSON.stringify(token ?? null);
     let ended = false;
@@ -975,7 +977,11 @@ export function watchStorageChanges<T>(storage: MongoDocumentStorage<T>, publish
     next.on("resumeTokenChanged", (resumeToken: unknown) => {
       if (resumeToken === undefined || resumeToken === null) return;
       // In the middle of a split event, the token stays before the event: a stream that opens again gets all its fragments
-      if (!joiner.partial) token = resumeToken;
+      if (!joiner.partial) {
+        // The driver gives the token of a document before its change: fragment 1 puts the token back (audit 2026-11-08)
+        tokenBefore = token;
+        token = resumeToken;
+      }
       opened = true;
       if (JSON.stringify(resumeToken) !== openToken) attempt = 0;
       markReady();
@@ -988,7 +994,11 @@ export function watchStorageChanges<T>(storage: MongoDocumentStorage<T>, publish
       live = true;
       afterQueue();
       const result = joiner.push(change);
-      if (result.kind === "part") return;
+      if (result.kind === "part") {
+        // The first fragment of a split event: the token goes back to the token before the event
+        if ((change["splitEvent"] as { fragment?: unknown } | undefined)?.fragment === 1) token = tokenBefore;
+        return;
+      }
       if (result.kind === "missing") {
         // The stream started after a fragment: the event cannot be read, so the subscribers read the collection in full
         token = result.change["_id"];