@zodmon/core 0.9.0 → 0.10.0

package/dist/index.cjs

@@ -49,8 +49,18 @@ __export(index_exports, {
   Database: () => Database,
   IndexBuilder: () => IndexBuilder,
   TypedFindCursor: () => TypedFindCursor,
+  ZodmonAuthError: () => ZodmonAuthError,
+  ZodmonBulkWriteError: () => ZodmonBulkWriteError,
+  ZodmonDocValidationError: () => ZodmonDocValidationError,
+  ZodmonDuplicateKeyError: () => ZodmonDuplicateKeyError,
+  ZodmonError: () => ZodmonError,
+  ZodmonIndexError: () => ZodmonIndexError,
+  ZodmonNetworkError: () => ZodmonNetworkError,
   ZodmonNotFoundError: () => ZodmonNotFoundError,
+  ZodmonQueryError: () => ZodmonQueryError,
+  ZodmonTimeoutError: () => ZodmonTimeoutError,
   ZodmonValidationError: () => ZodmonValidationError,
+  ZodmonWriteConflictError: () => ZodmonWriteConflictError,
   aggregate: () => aggregate,
   checkUnindexedFields: () => checkUnindexedFields,
   collection: () => collection,
@@ -82,7 +92,8 @@ __export(index_exports, {
   toCompoundIndexSpec: () => toCompoundIndexSpec,
   toFieldIndexSpec: () => toFieldIndexSpec,
   updateMany: () => updateMany,
-  updateOne: () => updateOne
+  updateOne: () => updateOne,
+  wrapMongoError: () => wrapMongoError
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -187,6 +198,245 @@ function createExpressionBuilder() {
   };
 }
 
+// src/errors/wrap.ts
+var import_mongodb = require("mongodb");
+
+// src/errors/base.ts
+var ZodmonError = class extends Error {
+  name = "ZodmonError";
+  /** The MongoDB collection name associated with this error. */
+  collection;
+  /** The underlying error that caused this error, if any. */
+  cause;
+  constructor(message, collection2, options) {
+    super(message);
+    this.collection = collection2;
+    if (options?.cause) {
+      this.cause = options.cause;
+    }
+  }
+};
+
+// src/errors/auth.ts
+var ZodmonAuthError = class extends ZodmonError {
+  name = "ZodmonAuthError";
+  /** The MongoDB error code (13 or 18). */
+  code;
+  constructor(collection2, code, cause) {
+    const message = code === 18 ? `Authentication failed for "${collection2}": check connection credentials` : `Not authorized to perform this operation on "${collection2}"`;
+    super(message, collection2, { cause });
+    this.code = code;
+  }
+};
+
+// src/errors/bulk-write.ts
+var ZodmonBulkWriteError = class extends ZodmonError {
+  name = "ZodmonBulkWriteError";
+  /** Number of documents successfully inserted. */
+  insertedCount;
+  /** Number of documents matched by update filters. */
+  matchedCount;
+  /** Number of documents actually modified. */
+  modifiedCount;
+  /** Number of documents deleted. */
+  deletedCount;
+  /** Individual write errors with their operation index, code, and message. */
+  writeErrors;
+  constructor(collection2, cause, totalOps) {
+    const bulkErr = cause;
+    const result = bulkErr["result"] ?? {};
+    const rawErrors = bulkErr["writeErrors"] ?? [];
+    const writeErrors = rawErrors.map((e) => ({
+      index: e["index"] ?? 0,
+      code: e["code"] ?? 0,
+      message: e["errmsg"] ?? e["message"] ?? "unknown error"
+    }));
+    const failedMsg = totalOps !== void 0 ? `${writeErrors.length} of ${totalOps} operations failed` : `${writeErrors.length} operations failed`;
+    super(`Bulk write failed on "${collection2}": ${failedMsg}`, collection2, { cause });
+    this.insertedCount = result["insertedCount"] ?? 0;
+    this.matchedCount = result["matchedCount"] ?? 0;
+    this.modifiedCount = result["modifiedCount"] ?? 0;
+    this.deletedCount = result["deletedCount"] ?? 0;
+    this.writeErrors = writeErrors;
+  }
+};
+
+// src/errors/doc-validation.ts
+var ZodmonDocValidationError = class extends ZodmonError {
+  name = "ZodmonDocValidationError";
+  /** Server-provided validation failure details. */
+  errInfo;
+  constructor(collection2, errInfo, cause) {
+    super(
+      `Server-side document validation failed for "${collection2}": ${cause.message}`,
+      collection2,
+      { cause }
+    );
+    this.errInfo = errInfo;
+  }
+};
+
+// src/errors/duplicate-key.ts
+var INDEX_REGEX = /index:\s+(\S+)/;
+var DUP_KEY_FIELD_REGEX = /dup key:\s*\{\s*(\w+):/;
+var ZodmonDuplicateKeyError = class extends ZodmonError {
+  name = "ZodmonDuplicateKeyError";
+  /** The first field that caused the duplicate key violation. */
+  field;
+  /** The duplicate value, or `undefined` if it could not be extracted. */
+  value;
+  /** The name of the index that was violated. */
+  index;
+  /** The key pattern of the violated index (e.g. `{ email: 1 }`). */
+  keyPattern;
+  /** The key values that caused the violation. */
+  keyValue;
+  constructor(collection2, cause) {
+    const serverErr = cause;
+    const kp = serverErr["keyPattern"];
+    const kv = serverErr["keyValue"];
+    let field;
+    let value;
+    let keyPattern;
+    let keyValue;
+    if (kp && kv) {
+      const firstKey = Object.keys(kp)[0] ?? "unknown";
+      field = firstKey;
+      value = kv[firstKey];
+      keyPattern = kp;
+      keyValue = kv;
+    } else {
+      const fieldMatch = cause.message.match(DUP_KEY_FIELD_REGEX);
+      field = fieldMatch?.[1] ?? "unknown";
+      value = void 0;
+      keyPattern = field !== "unknown" ? { [field]: 1 } : {};
+      keyValue = {};
+    }
+    const indexMatch = cause.message.match(INDEX_REGEX);
+    const index2 = indexMatch?.[1] ?? "unknown";
+    const valueStr = typeof value === "string" ? `"${value}"` : String(value);
+    super(
+      `Duplicate key in "${collection2}": ${field} = ${valueStr} (index: ${index2})`,
+      collection2,
+      { cause }
+    );
+    this.field = field;
+    this.value = value;
+    this.index = index2;
+    this.keyPattern = keyPattern;
+    this.keyValue = keyValue;
+  }
+};
+
+// src/errors/index-error.ts
+var ZodmonIndexError = class extends ZodmonError {
+  name = "ZodmonIndexError";
+  /** The MongoDB error code (67, 85, or 86). */
+  code;
+  constructor(collection2, code, errmsg, cause) {
+    const prefix = code === 67 ? "Cannot create index" : code === 85 ? "Index options conflict" : "Index key specs conflict";
+    super(`${prefix} on "${collection2}": ${errmsg}`, collection2, { cause });
+    this.code = code;
+  }
+};
+
+// src/errors/network.ts
+var ZodmonNetworkError = class extends ZodmonError {
+  name = "ZodmonNetworkError";
+  constructor(collection2, cause) {
+    super(`Network error on "${collection2}": ${cause.message}`, collection2, { cause });
+  }
+};
+
+// src/errors/query.ts
+var ZodmonQueryError = class extends ZodmonError {
+  name = "ZodmonQueryError";
+  /** The MongoDB error code (2, 9, or 292). */
+  code;
+  constructor(collection2, code, errmsg, cause) {
+    const message = code === 292 ? `Query exceeded memory limit on "${collection2}": enable allowDiskUse for large sorts or aggregations` : code === 9 ? `Failed to parse query on "${collection2}": ${errmsg}` : `Bad value in query on "${collection2}": ${errmsg}`;
+    super(message, collection2, { cause });
+    this.code = code;
+  }
+};
+
+// src/errors/timeout.ts
+var ZodmonTimeoutError = class extends ZodmonError {
+  name = "ZodmonTimeoutError";
+  /** The MongoDB error code (50 or 262). */
+  code;
+  constructor(collection2, code, cause) {
+    super(`Operation timed out on "${collection2}": exceeded server time limit`, collection2, {
+      cause
+    });
+    this.code = code;
+  }
+};
+
+// src/errors/write-conflict.ts
+var ZodmonWriteConflictError = class extends ZodmonError {
+  name = "ZodmonWriteConflictError";
+  constructor(collection2, cause) {
+    super(
+      `Write conflict in "${collection2}": another operation modified this document concurrently \u2014 retry the transaction`,
+      collection2,
+      { cause }
+    );
+  }
+};
+
+// src/errors/wrap.ts
+function wrapMongoError(err, collection2) {
+  if (err instanceof ZodmonError) {
+    throw err;
+  }
+  if (err instanceof import_mongodb.MongoBulkWriteError) {
+    throw new ZodmonBulkWriteError(collection2, err);
+  }
+  if (err instanceof import_mongodb.MongoNetworkError) {
+    throw new ZodmonNetworkError(collection2, err);
+  }
+  if (err instanceof import_mongodb.MongoServerError) {
+    switch (err.code) {
+      case 11e3:
+      case 11001:
+        throw new ZodmonDuplicateKeyError(collection2, err);
+      case 112:
+        throw new ZodmonWriteConflictError(collection2, err);
+      case 50:
+      case 262:
+        throw new ZodmonTimeoutError(collection2, err.code, err);
+      case 13:
+      case 18:
+        throw new ZodmonAuthError(collection2, err.code, err);
+      case 67:
+      case 85:
+      case 86:
+        throw new ZodmonIndexError(collection2, err.code, err.message, err);
+      case 2:
+      case 9:
+      case 292:
+        throw new ZodmonQueryError(collection2, err.code, err.message, err);
+      case 121:
+        throw new ZodmonDocValidationError(
+          collection2,
+          err.errInfo,
+          err
+        );
+      default:
+        throw new ZodmonError(`MongoDB error on "${collection2}": ${err.message}`, collection2, {
+          cause: err
+        });
+    }
+  }
+  if (err instanceof Error) {
+    throw new ZodmonError(`Unexpected error on "${collection2}": ${err.message}`, collection2, {
+      cause: err
+    });
+  }
+  throw new ZodmonError(`Unexpected error on "${collection2}": ${String(err)}`, collection2);
+}
+
 // src/schema/ref.ts
 var import_zod = require("zod");
 var refMetadata = /* @__PURE__ */ new WeakMap();
@@ -272,8 +522,12 @@ var AggregatePipeline = class _AggregatePipeline {
    * ```
    */
   async toArray() {
-    const cursor = this.nativeCollection.aggregate(this.stages);
-    return await cursor.toArray();
+    try {
+      const cursor = this.nativeCollection.aggregate(this.stages);
+      return await cursor.toArray();
+    } catch (err) {
+      wrapMongoError(err, this.definition.name);
+    }
   }
   /**
    * Stream pipeline results one document at a time via `for await...of`.
@@ -288,9 +542,13 @@ var AggregatePipeline = class _AggregatePipeline {
    * ```
    */
   async *[Symbol.asyncIterator]() {
-    const cursor = this.nativeCollection.aggregate(this.stages);
-    for await (const doc of cursor) {
-      yield doc;
+    try {
+      const cursor = this.nativeCollection.aggregate(this.stages);
+      for await (const doc of cursor) {
+        yield doc;
+      }
+    } catch (err) {
+      wrapMongoError(err, this.definition.name);
     }
   }
   /**
@@ -310,8 +568,12 @@ var AggregatePipeline = class _AggregatePipeline {
    * ```
    */
   async explain() {
-    const cursor = this.nativeCollection.aggregate(this.stages);
-    return await cursor.explain();
+    try {
+      const cursor = this.nativeCollection.aggregate(this.stages);
+      return await cursor.explain();
+    } catch (err) {
+      wrapMongoError(err, this.definition.name);
+    }
   }
   // ── Shape-preserving stages ──────────────────────────────────────
   /**
@@ -736,7 +998,7 @@ function aggregate(handle) {
 }
 
 // src/client/client.ts
-var import_mongodb2 = require("mongodb");
+var import_mongodb3 = require("mongodb");
 
 // src/indexes/spec.ts
 function toFieldIndexSpec(def) {
@@ -808,7 +1070,7 @@ async function processDesiredSpec(spec, existingByKey, native, dryRun, dropOrpha
   const serialized = serializeIndexKey(spec.key);
   const existing = existingByKey.get(serialized);
   if (!existing) {
-    if (!dryRun) await native.createIndex(spec.key, spec.options);
+    if (!dryRun) await safeCreateIndex(native, spec.key, spec.options);
     acc.created.push(resolveSpecName(spec));
     return;
   }
@@ -821,8 +1083,8 @@ async function processDesiredSpec(spec, existingByKey, native, dryRun, dropOrpha
   }
   if (dropOrphaned) {
     if (!dryRun) {
-      await native.dropIndex(existingName);
-      await native.createIndex(spec.key, spec.options);
+      await safeDropIndex(native, existingName);
+      await safeCreateIndex(native, spec.key, spec.options);
     }
     acc.dropped.push(existingName);
     acc.created.push(resolveSpecName(spec));
@@ -835,6 +1097,20 @@ async function processDesiredSpec(spec, existingByKey, native, dryRun, dropOrpha
     desired: spec.options
   });
 }
+async function safeCreateIndex(native, key, options) {
+  try {
+    await native.createIndex(key, options);
+  } catch (err) {
+    wrapMongoError(err, native.collectionName);
+  }
+}
+async function safeDropIndex(native, name) {
+  try {
+    await native.dropIndex(name);
+  } catch (err) {
+    wrapMongoError(err, native.collectionName);
+  }
+}
 async function processOrphanedIndexes(existingIndexes, desiredKeys, matchedKeys, native, dryRun, dropOrphaned, dropped) {
   for (const idx of existingIndexes) {
     const rawName = idx["name"];
@@ -843,7 +1119,7 @@ async function processOrphanedIndexes(existingIndexes, desiredKeys, matchedKeys,
     const serialized = serializeIndexKey(idx["key"]);
     if (matchedKeys.has(serialized) || desiredKeys.has(serialized)) continue;
     if (dropOrphaned) {
-      if (!dryRun) await native.dropIndex(name);
+      if (!dryRun) await safeDropIndex(native, name);
       dropped.push(name);
     }
   }
@@ -855,7 +1131,7 @@ async function listIndexesSafe(native) {
     if (err instanceof Error && err.message.includes("ns does not exist")) {
       return [];
     }
-    throw err;
+    wrapMongoError(err, native.collectionName);
   }
 }
 async function syncIndexes(handle, options) {
@@ -904,36 +1180,49 @@ async function syncIndexes(handle, options) {
 var import_zod2 = require("zod");
 
 // src/errors/validation.ts
-var ZodmonValidationError = class extends Error {
+var ZodmonValidationError = class extends ZodmonError {
   name = "ZodmonValidationError";
-  /** The MongoDB collection name where the validation failed. */
-  collection;
   /** The original Zod validation error with detailed issue information. */
   zodError;
-  constructor(collection2, zodError) {
+  /** The document that failed validation. */
+  document;
+  constructor(collection2, zodError, document) {
     const fields = zodError.issues.map((issue) => {
       const path = issue.path.join(".") || "(root)";
       return `${path} (${issue.message})`;
     }).join(", ");
-    super(`Validation failed for "${collection2}": ${fields}`);
-    this.collection = collection2;
+    super(`Validation failed for "${collection2}": ${fields}`, collection2, { cause: zodError });
     this.zodError = zodError;
+    this.document = document;
   }
 };
 
 // src/crud/delete.ts
 async function deleteOne(handle, filter) {
-  return await handle.native.deleteOne(filter);
+  try {
+    return await handle.native.deleteOne(filter);
+  } catch (err) {
+    wrapMongoError(err, handle.definition.name);
+  }
 }
 async function deleteMany(handle, filter) {
-  return await handle.native.deleteMany(filter);
+  try {
+    return await handle.native.deleteMany(filter);
+  } catch (err) {
+    wrapMongoError(err, handle.definition.name);
+  }
 }
 async function findOneAndDelete(handle, filter, options) {
-  const result = await handle.native.findOneAndDelete(
-    // biome-ignore lint/suspicious/noExplicitAny: TypedFilter intersection type is not directly assignable to MongoDB's Filter
-    filter,
-    { includeResultMetadata: false }
-  );
+  let result;
+  try {
+    result = await handle.native.findOneAndDelete(
+      // biome-ignore lint/suspicious/noExplicitAny: TypedFilter intersection type is not directly assignable to MongoDB's Filter
+      filter,
+      { includeResultMetadata: false }
+    );
+  } catch (err) {
+    wrapMongoError(err, handle.definition.name);
+  }
   if (!result) return null;
   const mode = options?.validate !== void 0 ? options.validate : handle.definition.options.validation;
   if (mode === false || mode === "passthrough") {
@@ -943,7 +1232,7 @@ async function findOneAndDelete(handle, filter, options) {
     return handle.definition.schema.parse(result);
   } catch (err) {
     if (err instanceof import_zod2.z.ZodError) {
-      throw new ZodmonValidationError(handle.definition.name, err);
+      throw new ZodmonValidationError(handle.definition.name, err, result);
     }
     throw err;
   }
@@ -953,13 +1242,13 @@ async function findOneAndDelete(handle, filter, options) {
 var import_zod4 = require("zod");
 
 // src/errors/not-found.ts
-var ZodmonNotFoundError = class extends Error {
+var ZodmonNotFoundError = class extends ZodmonError {
   name = "ZodmonNotFoundError";
-  /** The MongoDB collection name where the query found no results. */
-  collection;
-  constructor(collection2) {
-    super(`Document not found in "${collection2}"`);
-    this.collection = collection2;
+  /** The filter that produced no results. */
+  filter;
+  constructor(collection2, filter) {
+    super(`Document not found in "${collection2}"`, collection2);
+    this.filter = filter;
   }
 };
 
@@ -990,15 +1279,15 @@ function checkUnindexedFields(definition, filter) {
 var import_zod3 = require("zod");
 
 // src/crud/paginate.ts
-var import_mongodb = require("mongodb");
+var import_mongodb2 = require("mongodb");
 function serializeValue(value) {
-  if (value instanceof import_mongodb.ObjectId) return { $oid: value.toHexString() };
+  if (value instanceof import_mongodb2.ObjectId) return { $oid: value.toHexString() };
   if (value instanceof Date) return { $date: value.getTime() };
   return value;
 }
 function deserializeValue(value) {
   if (value != null && typeof value === "object") {
-    if ("$oid" in value) return new import_mongodb.ObjectId(value.$oid);
+    if ("$oid" in value) return new import_mongodb2.ObjectId(value.$oid);
     if ("$date" in value) return new Date(value.$date);
   }
   return value;
@@ -1160,10 +1449,17 @@ var TypedFindCursor = class {
   }
   /** @internal Offset pagination implementation. */
   async offsetPaginate(_sortKeys, sort, opts) {
-    const [total, raw2] = await Promise.all([
-      this.nativeCollection.countDocuments(this.filter),
-      this.nativeCollection.find(this.filter).sort(sort).skip((opts.page - 1) * opts.perPage).limit(opts.perPage).toArray()
-    ]);
+    let total;
+    let raw2;
+    try {
+      ;
+      [total, raw2] = await Promise.all([
+        this.nativeCollection.countDocuments(this.filter),
+        this.nativeCollection.find(this.filter).sort(sort).skip((opts.page - 1) * opts.perPage).limit(opts.perPage).toArray()
+      ]);
+    } catch (err) {
+      wrapMongoError(err, this.collectionName);
+    }
     const docs = raw2.map((doc) => this.validateDoc(doc));
     const totalPages = Math.ceil(total / opts.perPage);
     return {
@@ -1187,7 +1483,12 @@ var TypedFindCursor = class {
       combinedFilter = this.filter && Object.keys(this.filter).length > 0 ? { $and: [this.filter, cursorFilter] } : cursorFilter;
     }
     const effectiveSort = isBackward ? Object.fromEntries(sortKeys2.map(([f, d]) => [f, d === 1 ? -1 : 1])) : sort;
-    const raw2 = await this.nativeCollection.find(combinedFilter).sort(effectiveSort).limit(opts.limit + 1).toArray();
+    let raw2;
+    try {
+      raw2 = await this.nativeCollection.find(combinedFilter).sort(effectiveSort).limit(opts.limit + 1).toArray();
+    } catch (err) {
+      wrapMongoError(err, this.collectionName);
+    }
     const hasMore = raw2.length > opts.limit;
     if (hasMore) raw2.pop();
     if (isBackward) raw2.reverse();
@@ -1215,7 +1516,12 @@ var TypedFindCursor = class {
    * ```
    */
   async toArray() {
-    const raw2 = await this.cursor.toArray();
+    let raw2;
+    try {
+      raw2 = await this.cursor.toArray();
+    } catch (err) {
+      wrapMongoError(err, this.collectionName);
+    }
     return raw2.map((doc) => this.validateDoc(doc));
   }
   /**
@@ -1235,8 +1541,12 @@ var TypedFindCursor = class {
    * ```
    */
   async *[Symbol.asyncIterator]() {
-    for await (const doc of this.cursor) {
-      yield this.validateDoc(doc);
+    try {
+      for await (const doc of this.cursor) {
+        yield this.validateDoc(doc);
+      }
+    } catch (err) {
+      wrapMongoError(err, this.collectionName);
     }
   }
   /** @internal Validate a single raw document against the schema. */
@@ -1248,7 +1558,7 @@ var TypedFindCursor = class {
       return this.schema.parse(raw2);
     } catch (err) {
       if (err instanceof import_zod3.z.ZodError) {
-        throw new ZodmonValidationError(this.collectionName, err);
+        throw new ZodmonValidationError(this.collectionName, err, raw2);
       }
       throw err;
     }
@@ -1259,7 +1569,12 @@ var TypedFindCursor = class {
 async function findOne(handle, filter, options) {
   checkUnindexedFields(handle.definition, filter);
   const findOptions = options?.project ? { projection: options.project } : void 0;
-  const raw2 = await handle.native.findOne(filter, findOptions);
+  let raw2;
+  try {
+    raw2 = await handle.native.findOne(filter, findOptions);
+  } catch (err) {
+    wrapMongoError(err, handle.definition.name);
+  }
   if (!raw2) return null;
   const mode = options?.validate !== void 0 ? options.validate : handle.definition.options.validation;
   if (mode === false || mode === "passthrough") {
@@ -1269,7 +1584,7 @@ async function findOne(handle, filter, options) {
     return handle.definition.schema.parse(raw2);
   } catch (err) {
     if (err instanceof import_zod4.z.ZodError) {
-      throw new ZodmonValidationError(handle.definition.name, err);
+      throw new ZodmonValidationError(handle.definition.name, err, raw2);
     }
     throw err;
   }
@@ -1277,7 +1592,7 @@ async function findOne(handle, filter, options) {
 async function findOneOrThrow(handle, filter, options) {
   const doc = await findOne(handle, filter, options);
   if (!doc) {
-    throw new ZodmonNotFoundError(handle.definition.name);
+    throw new ZodmonNotFoundError(handle.definition.name, filter);
   }
   return doc;
 }
@@ -1297,11 +1612,15 @@ async function insertOne(handle, doc) {
     parsed = handle.definition.schema.parse(doc);
   } catch (err) {
     if (err instanceof import_zod5.z.ZodError) {
-      throw new ZodmonValidationError(handle.definition.name, err);
+      throw new ZodmonValidationError(handle.definition.name, err, doc);
     }
     throw err;
   }
-  await handle.native.insertOne(parsed);
+  try {
+    await handle.native.insertOne(parsed);
+  } catch (err) {
+    wrapMongoError(err, handle.definition.name);
+  }
   return parsed;
 }
 async function insertMany(handle, docs) {
@@ -1312,22 +1631,34 @@ async function insertMany(handle, docs) {
       parsed.push(handle.definition.schema.parse(doc));
     } catch (err) {
       if (err instanceof import_zod5.z.ZodError) {
-        throw new ZodmonValidationError(handle.definition.name, err);
+        throw new ZodmonValidationError(handle.definition.name, err, doc);
       }
       throw err;
     }
   }
-  await handle.native.insertMany(parsed);
+  try {
+    await handle.native.insertMany(parsed);
+  } catch (err) {
+    wrapMongoError(err, handle.definition.name);
+  }
   return parsed;
 }
 
 // src/crud/update.ts
 var import_zod6 = require("zod");
 async function updateOne(handle, filter, update, options) {
-  return await handle.native.updateOne(filter, update, options);
+  try {
+    return await handle.native.updateOne(filter, update, options);
+  } catch (err) {
+    wrapMongoError(err, handle.definition.name);
+  }
 }
 async function updateMany(handle, filter, update, options) {
-  return await handle.native.updateMany(filter, update, options);
+  try {
+    return await handle.native.updateMany(filter, update, options);
+  } catch (err) {
+    wrapMongoError(err, handle.definition.name);
+  }
 }
 async function findOneAndUpdate(handle, filter, update, options) {
   const driverOptions = {
@@ -1337,14 +1668,19 @@ async function findOneAndUpdate(handle, filter, update, options) {
   if (options?.upsert !== void 0) {
     driverOptions["upsert"] = options.upsert;
   }
-  const result = await handle.native.findOneAndUpdate(
-    // biome-ignore lint/suspicious/noExplicitAny: TypedFilter intersection type is not directly assignable to MongoDB's Filter
-    filter,
-    // biome-ignore lint/suspicious/noExplicitAny: TypedUpdateFilter intersection type is not directly assignable to MongoDB's UpdateFilter
-    update,
-    // biome-ignore lint/suspicious/noExplicitAny: dynamic options object is not assignable to driver's FindOneAndUpdateOptions under exactOptionalPropertyTypes
-    driverOptions
-  );
+  let result;
+  try {
+    result = await handle.native.findOneAndUpdate(
+      // biome-ignore lint/suspicious/noExplicitAny: TypedFilter intersection type is not directly assignable to MongoDB's Filter
+      filter,
+      // biome-ignore lint/suspicious/noExplicitAny: TypedUpdateFilter intersection type is not directly assignable to MongoDB's UpdateFilter
+      update,
+      // biome-ignore lint/suspicious/noExplicitAny: dynamic options object is not assignable to driver's FindOneAndUpdateOptions under exactOptionalPropertyTypes
+      driverOptions
+    );
+  } catch (err) {
+    wrapMongoError(err, handle.definition.name);
+  }
   if (!result) return null;
   const mode = options?.validate !== void 0 ? options.validate : handle.definition.options.validation;
   if (mode === false || mode === "passthrough") {
@@ -1354,7 +1690,7 @@ async function findOneAndUpdate(handle, filter, update, options) {
     return handle.definition.schema.parse(result);
   } catch (err) {
     if (err instanceof import_zod6.z.ZodError) {
-      throw new ZodmonValidationError(handle.definition.name, err);
+      throw new ZodmonValidationError(handle.definition.name, err, result);
     }
     throw err;
   }
@@ -1674,7 +2010,7 @@ var Database = class {
   /** Registered collection definitions, keyed by name. Used by syncIndexes(). */
   _collections = /* @__PURE__ */ new Map();
   constructor(uri, dbName, options) {
-    this._client = new import_mongodb2.MongoClient(uri, options);
+    this._client = new import_mongodb3.MongoClient(uri, options);
     this._db = this._client.db(dbName);
   }
   /**
@@ -1763,7 +2099,7 @@ function createClient(uri, dbNameOrOptions, maybeOptions) {
 }
 
 // src/collection/collection.ts
-var import_mongodb4 = require("mongodb");
+var import_mongodb5 = require("mongodb");
 var import_zod9 = require("zod");
 
 // src/schema/extensions.ts
@@ -1873,14 +2209,14 @@ function installExtensions() {
 installExtensions();
 
 // src/schema/object-id.ts
-var import_mongodb3 = require("mongodb");
+var import_mongodb4 = require("mongodb");
 var import_zod8 = require("zod");
 var OBJECT_ID_HEX = /^[a-f\d]{24}$/i;
 function objectId() {
   return import_zod8.z.custom((val) => {
-    if (val instanceof import_mongodb3.ObjectId) return true;
+    if (val instanceof import_mongodb4.ObjectId) return true;
     return typeof val === "string" && OBJECT_ID_HEX.test(val);
-  }, "Invalid ObjectId").transform((val) => val instanceof import_mongodb3.ObjectId ? val : import_mongodb3.ObjectId.createFromHexString(val));
+  }, "Invalid ObjectId").transform((val) => val instanceof import_mongodb4.ObjectId ? val : import_mongodb4.ObjectId.createFromHexString(val));
 }
 
 // src/collection/collection.ts
@@ -1895,7 +2231,7 @@ function extractFieldIndexes(shape) {
   return result;
 }
 function collection(name, shape, options) {
-  const resolvedShape = "_id" in shape ? shape : { _id: objectId().default(() => new import_mongodb4.ObjectId()), ...shape };
+  const resolvedShape = "_id" in shape ? shape : { _id: objectId().default(() => new import_mongodb5.ObjectId()), ...shape };
   const schema = import_zod9.z.object(resolvedShape);
   const fieldIndexes = extractFieldIndexes(shape);
   const { indexes: compoundIndexes, validation, ...rest } = options ?? {};
@@ -1966,14 +2302,14 @@ function index(fields) {
 }
 
 // src/helpers/oid.ts
-var import_mongodb5 = require("mongodb");
+var import_mongodb6 = require("mongodb");
 function oid(value) {
-  if (value === void 0) return new import_mongodb5.ObjectId();
-  if (value instanceof import_mongodb5.ObjectId) return value;
-  return import_mongodb5.ObjectId.createFromHexString(value);
+  if (value === void 0) return new import_mongodb6.ObjectId();
+  if (value instanceof import_mongodb6.ObjectId) return value;
+  return import_mongodb6.ObjectId.createFromHexString(value);
 }
 function isOid(value) {
-  return value instanceof import_mongodb5.ObjectId;
+  return value instanceof import_mongodb6.ObjectId;
 }
 
 // src/query/operators.ts
@@ -2046,8 +2382,18 @@ var $ = {
   Database,
   IndexBuilder,
   TypedFindCursor,
+  ZodmonAuthError,
+  ZodmonBulkWriteError,
+  ZodmonDocValidationError,
+  ZodmonDuplicateKeyError,
+  ZodmonError,
+  ZodmonIndexError,
+  ZodmonNetworkError,
   ZodmonNotFoundError,
+  ZodmonQueryError,
+  ZodmonTimeoutError,
   ZodmonValidationError,
+  ZodmonWriteConflictError,
   aggregate,
   checkUnindexedFields,
   collection,
@@ -2079,6 +2425,7 @@ var $ = {
   toCompoundIndexSpec,
   toFieldIndexSpec,
   updateMany,
-  updateOne
+  updateOne,
+  wrapMongoError
 });
 //# sourceMappingURL=index.cjs.map