@zodmon/core 0.8.0 → 0.10.0

package/dist/index.cjs

@@ -21,29 +21,52 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   $: () => $,
+  $addToSet: () => $addToSet,
   $and: () => $and,
+  $avg: () => $avg,
+  $count: () => $count,
   $eq: () => $eq,
   $exists: () => $exists,
+  $first: () => $first,
   $gt: () => $gt,
   $gte: () => $gte,
   $in: () => $in,
+  $last: () => $last,
   $lt: () => $lt,
   $lte: () => $lte,
+  $max: () => $max,
+  $min: () => $min,
   $ne: () => $ne,
   $nin: () => $nin,
   $nor: () => $nor,
   $not: () => $not,
   $or: () => $or,
+  $push: () => $push,
   $regex: () => $regex,
+  $sum: () => $sum,
+  AggregatePipeline: () => AggregatePipeline,
   CollectionHandle: () => CollectionHandle,
   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,
+  createAccumulatorBuilder: () => createAccumulatorBuilder,
   createClient: () => createClient,
+  createExpressionBuilder: () => createExpressionBuilder,
   deleteMany: () => deleteMany,
   deleteOne: () => deleteOne,
   extractComparableOptions: () => extractComparableOptions,
@@ -69,12 +92,913 @@ __export(index_exports, {
   toCompoundIndexSpec: () => toCompoundIndexSpec,
   toFieldIndexSpec: () => toFieldIndexSpec,
   updateMany: () => updateMany,
-  updateOne: () => updateOne
+  updateOne: () => updateOne,
+  wrapMongoError: () => wrapMongoError
 });
 module.exports = __toCommonJS(index_exports);
 
+// src/aggregate/expressions.ts
+var $count = () => ({
+  __accum: true,
+  expr: { $sum: 1 }
+});
+var $sum = (field) => ({
+  __accum: true,
+  expr: { $sum: field }
+});
+var $avg = (field) => ({
+  __accum: true,
+  expr: { $avg: field }
+});
+var $min = (field) => ({
+  __accum: true,
+  expr: { $min: field }
+});
+var $max = (field) => ({
+  __accum: true,
+  expr: { $max: field }
+});
+var $first = (field) => ({
+  __accum: true,
+  expr: { $first: field }
+});
+var $last = (field) => ({
+  __accum: true,
+  expr: { $last: field }
+});
+var $push = (field) => ({
+  __accum: true,
+  expr: { $push: field }
+});
+var $addToSet = (field) => ({
+  __accum: true,
+  expr: { $addToSet: field }
+});
+function createAccumulatorBuilder() {
+  return {
+    count: () => ({ __accum: true, expr: { $sum: 1 } }),
+    sum: (field) => ({
+      __accum: true,
+      expr: { $sum: typeof field === "number" ? field : `$${field}` }
+    }),
+    avg: (field) => ({ __accum: true, expr: { $avg: `$${field}` } }),
+    min: (field) => ({ __accum: true, expr: { $min: `$${field}` } }),
+    max: (field) => ({ __accum: true, expr: { $max: `$${field}` } }),
+    first: (field) => ({ __accum: true, expr: { $first: `$${field}` } }),
+    last: (field) => ({ __accum: true, expr: { $last: `$${field}` } }),
+    push: (field) => ({ __accum: true, expr: { $push: `$${field}` } }),
+    addToSet: (field) => ({ __accum: true, expr: { $addToSet: `$${field}` } })
+    // biome-ignore lint/suspicious/noExplicitAny: Runtime implementation uses string field names and returns plain objects — TypeScript cannot verify that the runtime Accumulator objects match the generic AccumulatorBuilder<T> return types. Safe because type resolution happens at compile time via AccumulatorBuilder<T>, and runtime values are identical to what the standalone $min/$max/etc. produce.
+  };
+}
+function createExpressionBuilder() {
+  const $2 = (field) => `$${field}`;
+  const val = (v) => typeof v === "number" ? v : `$${v}`;
+  const expr = (value) => ({ __expr: true, value });
+  return {
+    // Arithmetic
+    add: (field, value) => expr({ $add: [$2(field), val(value)] }),
+    subtract: (field, value) => expr({ $subtract: [$2(field), val(value)] }),
+    multiply: (field, value) => expr({ $multiply: [$2(field), val(value)] }),
+    divide: (field, value) => expr({ $divide: [$2(field), val(value)] }),
+    mod: (field, value) => expr({ $mod: [$2(field), val(value)] }),
+    abs: (field) => expr({ $abs: $2(field) }),
+    ceil: (field) => expr({ $ceil: $2(field) }),
+    floor: (field) => expr({ $floor: $2(field) }),
+    round: (field, place = 0) => expr({ $round: [$2(field), place] }),
+    // String
+    concat: (...parts) => {
+      const resolved = parts.map((p) => {
+        if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(p)) return $2(p);
+        return p;
+      });
+      return expr({ $concat: resolved });
+    },
+    toLower: (field) => expr({ $toLower: $2(field) }),
+    toUpper: (field) => expr({ $toUpper: $2(field) }),
+    trim: (field) => expr({ $trim: { input: $2(field) } }),
+    substr: (field, start, length) => expr({ $substrBytes: [$2(field), start, length] }),
+    // Comparison
+    eq: (field, value) => expr({ $eq: [$2(field), value] }),
+    gt: (field, value) => expr({ $gt: [$2(field), value] }),
+    gte: (field, value) => expr({ $gte: [$2(field), value] }),
+    lt: (field, value) => expr({ $lt: [$2(field), value] }),
+    lte: (field, value) => expr({ $lte: [$2(field), value] }),
+    ne: (field, value) => expr({ $ne: [$2(field), value] }),
+    // Date
+    year: (field) => expr({ $year: $2(field) }),
+    month: (field) => expr({ $month: $2(field) }),
+    dayOfMonth: (field) => expr({ $dayOfMonth: $2(field) }),
+    // Array
+    size: (field) => expr({ $size: $2(field) }),
+    // Conditional
+    cond: (condition, thenValue, elseValue) => expr({ $cond: [condition.value, thenValue, elseValue] }),
+    ifNull: (field, fallback) => expr({ $ifNull: [$2(field), fallback] })
+    // biome-ignore lint/suspicious/noExplicitAny: Runtime implementation uses string field names — TypeScript cannot verify generic ExpressionBuilder<T> return types match. Safe because type resolution happens at compile time.
+  };
+}
+
+// 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();
+function getRefMetadata(schema) {
+  if (typeof schema !== "object" || schema === null) return void 0;
+  return refMetadata.get(schema);
+}
+var REF_GUARD = /* @__PURE__ */ Symbol.for("zodmon_ref");
+function installRefExtension() {
+  const proto = import_zod.z.ZodType.prototype;
+  if (REF_GUARD in proto) return;
+  Object.defineProperty(proto, "ref", {
+    value(collection2) {
+      refMetadata.set(this, { collection: collection2 });
+      return this;
+    },
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+  Object.defineProperty(proto, REF_GUARD, {
+    value: true,
+    enumerable: false,
+    configurable: false,
+    writable: false
+  });
+}
+
+// src/aggregate/pipeline.ts
+var AggregatePipeline = class _AggregatePipeline {
+  definition;
+  nativeCollection;
+  stages;
+  constructor(definition, nativeCollection, stages) {
+    this.definition = definition;
+    this.nativeCollection = nativeCollection;
+    this.stages = stages;
+  }
+  /**
+   * Append an arbitrary aggregation stage to the pipeline (escape hatch).
+   *
+   * Returns a new pipeline instance with the stage appended — the
+   * original pipeline is not modified.
+   *
+   * Optionally accepts a type parameter `TNew` to change the output
+   * type when the stage transforms the document shape.
+   *
+   * @typeParam TNew - The output type after this stage. Defaults to the current output type.
+   * @param stage - A raw MongoDB aggregation stage document (e.g. `{ $match: { ... } }`).
+   * @returns A new pipeline with the stage appended.
+   *
+   * @example
+   * ```ts
+   * const admins = aggregate(users)
+   *   .raw({ $match: { role: 'admin' } })
+   *   .toArray()
+   * ```
+   *
+   * @example
+   * ```ts
+   * // Change output type with a $project stage
+   * const names = aggregate(users)
+   *   .raw<{ name: string }>({ $project: { name: 1, _id: 0 } })
+   *   .toArray()
+   * ```
+   */
+  raw(stage) {
+    return new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      stage
+    ]);
+  }
+  /**
+   * Execute the pipeline and return all results as an array.
+   *
+   * @returns A promise resolving to the array of output documents.
+   *
+   * @example
+   * ```ts
+   * const results = await aggregate(users)
+   *   .raw({ $match: { age: { $gte: 18 } } })
+   *   .toArray()
+   * ```
+   */
+  async 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`.
+   *
+   * @returns An async generator yielding output documents.
+   *
+   * @example
+   * ```ts
+   * for await (const user of aggregate(users).raw({ $match: { role: 'admin' } })) {
+   *   console.log(user.name)
+   * }
+   * ```
+   */
+  async *[Symbol.asyncIterator]() {
+    try {
+      const cursor = this.nativeCollection.aggregate(this.stages);
+      for await (const doc of cursor) {
+        yield doc;
+      }
+    } catch (err) {
+      wrapMongoError(err, this.definition.name);
+    }
+  }
+  /**
+   * Return the query execution plan without running the pipeline.
+   *
+   * Useful for debugging and understanding how MongoDB will process
+   * the pipeline stages.
+   *
+   * @returns A promise resolving to the explain output document.
+   *
+   * @example
+   * ```ts
+   * const plan = await aggregate(users)
+   *   .raw({ $match: { role: 'admin' } })
+   *   .explain()
+   * console.log(plan)
+   * ```
+   */
+  async explain() {
+    try {
+      const cursor = this.nativeCollection.aggregate(this.stages);
+      return await cursor.explain();
+    } catch (err) {
+      wrapMongoError(err, this.definition.name);
+    }
+  }
+  // ── Shape-preserving stages ──────────────────────────────────────
+  /**
+   * Filter documents using a type-safe match expression.
+   *
+   * Appends a `$match` stage to the pipeline. The filter is constrained
+   * to the current output type, so only valid fields and operators are accepted.
+   *
+   * Supports two forms of type narrowing:
+   *
+   * **Tier 1 — Explicit type parameter:**
+   * ```ts
+   * .match<{ role: 'engineer' | 'designer' }>({ role: { $in: ['engineer', 'designer'] } })
+   * // role narrows to 'engineer' | 'designer'
+   * ```
+   *
+   * **Tier 2 — Automatic inference from filter literals:**
+   * ```ts
+   * .match({ role: 'engineer' })           // role narrows to 'engineer'
+   * .match({ role: { $ne: 'intern' } })    // role narrows to Exclude<Role, 'intern'>
+   * .match({ role: { $in: ['engineer', 'designer'] as const } })  // needs as const
+   * ```
+   *
+   * When no type parameter is provided and the filter doesn't contain
+   * inferrable literals, the output type is unchanged (backward compatible).
+   *
+   * @typeParam TNarrow - Optional object mapping field names to narrowed types. Must be a subtype of the corresponding fields in TOutput.
+   * @typeParam F - Inferred from the filter argument. Do not provide explicitly.
+   * @param filter - A type-safe filter for the current output type.
+   * @returns A new pipeline with the `$match` stage appended and output type narrowed.
+   *
+   * @example
+   * ```ts
+   * // Explicit narrowing
+   * const filtered = await users.aggregate()
+   *   .match<{ role: 'engineer' }>({ role: 'engineer' })
+   *   .toArray()
+   * // filtered[0].role → 'engineer'
+   *
+   * // Automatic narrowing with $in (requires as const)
+   * const subset = await users.aggregate()
+   *   .match({ role: { $in: ['engineer', 'designer'] as const } })
+   *   .toArray()
+   * // subset[0].role → 'engineer' | 'designer'
+   * ```
+   */
+  match(filter) {
+    const pipeline = new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $match: filter }
+    ]);
+    return pipeline;
+  }
+  /**
+   * Sort documents by one or more fields.
+   *
+   * Appends a `$sort` stage. Keys are constrained to `keyof TOutput & string`
+   * and values must be `1` (ascending) or `-1` (descending).
+   *
+   * @param spec - A sort specification mapping field names to sort direction.
+   * @returns A new pipeline with the `$sort` stage appended.
+   *
+   * @example
+   * ```ts
+   * const sorted = await aggregate(users)
+   *   .sort({ age: -1, name: 1 })
+   *   .toArray()
+   * ```
+   */
+  sort(spec) {
+    return new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $sort: spec }
+    ]);
+  }
+  /**
+   * Skip a number of documents in the pipeline.
+   *
+   * Appends a `$skip` stage. Commonly used with {@link limit} for pagination.
+   *
+   * @param n - The number of documents to skip.
+   * @returns A new pipeline with the `$skip` stage appended.
+   *
+   * @example
+   * ```ts
+   * // Page 2 (10 items per page)
+   * const page2 = await aggregate(users)
+   *   .sort({ name: 1 })
+   *   .skip(10)
+   *   .limit(10)
+   *   .toArray()
+   * ```
+   */
+  skip(n) {
+    return new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $skip: n }
+    ]);
+  }
+  /**
+   * Limit the number of documents passing through the pipeline.
+   *
+   * Appends a `$limit` stage. Commonly used with {@link skip} for pagination,
+   * or after {@link sort} to get top/bottom N results.
+   *
+   * @param n - The maximum number of documents to pass through.
+   * @returns A new pipeline with the `$limit` stage appended.
+   *
+   * @example
+   * ```ts
+   * const top5 = await aggregate(users)
+   *   .sort({ score: -1 })
+   *   .limit(5)
+   *   .toArray()
+   * ```
+   */
+  limit(n) {
+    return new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $limit: n }
+    ]);
+  }
+  // ── Shape-transforming projection stages ─────────────────────────
+  /**
+   * Include only specified fields in the output.
+   *
+   * Appends a `$project` stage with inclusion (`1`) for each key.
+   * The `_id` field is always included. The output type narrows to
+   * `Pick<TOutput, K | '_id'>`.
+   *
+   * @param spec - An object mapping field names to `1` for inclusion.
+   * @returns A new pipeline with the `$project` stage appended.
+   *
+   * @example
+   * ```ts
+   * const namesOnly = await aggregate(users)
+   *   .project({ name: 1 })
+   *   .toArray()
+   * // [{ _id: ..., name: 'Ada' }, ...]
+   * ```
+   */
+  project(spec) {
+    const pipeline = new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $project: spec }
+    ]);
+    return pipeline;
+  }
+  /**
+   * Variadic shorthand for {@link project} — pick fields to include.
+   *
+   * Generates a `$project` stage that includes only the listed fields
+   * (plus `_id`). Equivalent to `.project({ field1: 1, field2: 1 })`.
+   *
+   * @param fields - Field names to include in the output.
+   * @returns A new pipeline with the `$project` stage appended.
+   *
+   * @example
+   * ```ts
+   * const namesAndRoles = await aggregate(users)
+   *   .pick('name', 'role')
+   *   .toArray()
+   * ```
+   */
+  pick(...fields) {
+    const spec = Object.fromEntries(fields.map((f) => [f, 1]));
+    const pipeline = new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $project: spec }
+    ]);
+    return pipeline;
+  }
+  /**
+   * Exclude specified fields from the output.
+   *
+   * Appends a `$project` stage with exclusion (`0`) for each key.
+   * All other fields pass through. The output type becomes `Omit<TOutput, K>`.
+   *
+   * @param fields - Field names to exclude from the output.
+   * @returns A new pipeline with the `$project` stage appended.
+   *
+   * @example
+   * ```ts
+   * const noAge = await aggregate(users)
+   *   .omit('age')
+   *   .toArray()
+   * ```
+   */
+  omit(...fields) {
+    const spec = Object.fromEntries(fields.map((f) => [f, 0]));
+    const pipeline = new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $project: spec }
+    ]);
+    return pipeline;
+  }
+  groupBy(field, accumulators) {
+    const resolved = typeof accumulators === "function" ? accumulators(createAccumulatorBuilder()) : accumulators;
+    const _id = Array.isArray(field) ? Object.fromEntries(field.map((f) => [f, `$${f}`])) : `$${field}`;
+    const accumExprs = Object.fromEntries(
+      Object.entries(resolved).map(([key, acc]) => [key, acc.expr])
+    );
+    const pipeline = new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $group: { _id, ...accumExprs } }
+    ]);
+    return pipeline;
+  }
+  // Implementation
+  addFields(fields) {
+    const resolved = typeof fields === "function" ? fields(createExpressionBuilder()) : fields;
+    const stage = Object.fromEntries(
+      Object.entries(resolved).map(([k, v]) => [
+        k,
+        v && typeof v === "object" && "__expr" in v ? v.value : v
+      ])
+    );
+    const pipeline = new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $addFields: stage }
+    ]);
+    return pipeline;
+  }
+  // ── unwind stage ─────────────────────────────────────────────────
+  /**
+   * Deconstruct an array field, outputting one document per array element.
+   *
+   * Appends an `$unwind` stage. The unwound field's type changes from
+   * `T[]` to `T` in the output type. Documents with empty or missing
+   * arrays are dropped unless `preserveEmpty` is `true`.
+   *
+   * @param field - The name of the array field to unwind.
+   * @param options - Optional settings for the unwind stage.
+   * @param options.preserveEmpty - If `true`, documents with null, missing, or empty arrays are preserved.
+   * @returns A new pipeline with the `$unwind` stage appended.
+   *
+   * @example
+   * ```ts
+   * const flat = await aggregate(orders)
+   *   .unwind('items')
+   *   .toArray()
+   * // Each result has a single `items` value instead of an array
+   * ```
+   */
+  unwind(field, options) {
+    const stage = options?.preserveEmpty ? { $unwind: { path: `$${field}`, preserveNullAndEmptyArrays: true } } : { $unwind: `$${field}` };
+    const pipeline = new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      stage
+    ]);
+    return pipeline;
+  }
+  lookup(fieldOrFrom, options) {
+    const stages = [...this.stages];
+    if (typeof fieldOrFrom === "object") {
+      const foreignName = fieldOrFrom.name;
+      const foreignField = options?.on;
+      if (!foreignField) {
+        throw new Error(
+          `[zodmon] lookup: reverse lookup on '${foreignName}' requires an 'on' option specifying which field on the foreign collection references this collection.`
+        );
+      }
+      const asField = options?.as ?? foreignName;
+      stages.push({
+        $lookup: {
+          from: foreignName,
+          localField: "_id",
+          foreignField,
+          as: asField
+        }
+      });
+      if (options?.unwind) {
+        stages.push({ $unwind: { path: `$${asField}`, preserveNullAndEmptyArrays: true } });
+      }
+    } else {
+      const shape = this.definition.shape;
+      const fieldSchema = shape[fieldOrFrom];
+      const ref = getRefMetadata(fieldSchema);
+      if (!ref) {
+        throw new Error(
+          `[zodmon] lookup: field '${fieldOrFrom}' has no .ref() metadata. Use .lookup(CollectionDef, { on: foreignKey }) for reverse lookups, or add .ref(TargetCollection) to the field schema.`
+        );
+      }
+      const targetName = ref.collection.name;
+      const asField = options?.as ?? targetName;
+      stages.push({
+        $lookup: {
+          from: targetName,
+          localField: fieldOrFrom,
+          foreignField: "_id",
+          as: asField
+        }
+      });
+      if (options?.unwind) {
+        stages.push({ $unwind: { path: `$${asField}`, preserveNullAndEmptyArrays: true } });
+      }
+    }
+    const pipeline = new _AggregatePipeline(this.definition, this.nativeCollection, stages);
+    return pipeline;
+  }
+  // ── Convenience shortcuts ────────────────────────────────────────
+  /**
+   * Count documents per group, sorted by count descending.
+   *
+   * Shorthand for `.groupBy(field, { count: $count() }).sort({ count: -1 })`.
+   *
+   * @param field - The field to group and count by.
+   * @returns A new pipeline producing `{ _id: TOutput[K], count: number }` results.
+   *
+   * @example
+   * ```ts
+   * const roleCounts = await aggregate(users)
+   *   .countBy('role')
+   *   .toArray()
+   * // [{ _id: 'user', count: 3 }, { _id: 'admin', count: 2 }]
+   * ```
+   */
+  countBy(field) {
+    const pipeline = new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $group: { _id: `$${field}`, count: { $sum: 1 } } },
+      { $sort: { count: -1 } }
+    ]);
+    return pipeline;
+  }
+  /**
+   * Sum a numeric field per group, sorted by total descending.
+   *
+   * Shorthand for `.groupBy(field, { total: $sum('$sumField') }).sort({ total: -1 })`.
+   *
+   * @param field - The field to group by.
+   * @param sumField - The numeric field to sum.
+   * @returns A new pipeline producing `{ _id: TOutput[K], total: number }` results.
+   *
+   * @example
+   * ```ts
+   * const revenueByCategory = await aggregate(orders)
+   *   .sumBy('category', 'amount')
+   *   .toArray()
+   * // [{ _id: 'electronics', total: 5000 }, ...]
+   * ```
+   */
+  sumBy(field, sumField) {
+    const pipeline = new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $group: { _id: `$${field}`, total: { $sum: `$${sumField}` } } },
+      { $sort: { total: -1 } }
+    ]);
+    return pipeline;
+  }
+  /**
+   * Sort by a single field with a friendly direction name.
+   *
+   * Shorthand for `.sort({ [field]: direction === 'desc' ? -1 : 1 })`.
+   *
+   * @param field - The field to sort by.
+   * @param direction - Sort direction: `'asc'` (default) or `'desc'`.
+   * @returns A new pipeline with the `$sort` stage appended.
+   *
+   * @example
+   * ```ts
+   * const youngest = await aggregate(users)
+   *   .sortBy('age')
+   *   .toArray()
+   * ```
+   */
+  sortBy(field, direction = "asc") {
+    return new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $sort: { [field]: direction === "desc" ? -1 : 1 } }
+    ]);
+  }
+  /**
+   * Return the top N documents sorted by a field descending.
+   *
+   * Shorthand for `.sort({ [by]: -1 }).limit(n)`.
+   *
+   * @param n - The number of documents to return.
+   * @param options - An object with a `by` field specifying the sort key.
+   * @returns A new pipeline with `$sort` and `$limit` stages appended.
+   *
+   * @example
+   * ```ts
+   * const top3 = await aggregate(users)
+   *   .top(3, { by: 'score' })
+   *   .toArray()
+   * ```
+   */
+  top(n, options) {
+    return new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $sort: { [options.by]: -1 } },
+      { $limit: n }
+    ]);
+  }
+  /**
+   * Return the bottom N documents sorted by a field ascending.
+   *
+   * Shorthand for `.sort({ [by]: 1 }).limit(n)`.
+   *
+   * @param n - The number of documents to return.
+   * @param options - An object with a `by` field specifying the sort key.
+   * @returns A new pipeline with `$sort` and `$limit` stages appended.
+   *
+   * @example
+   * ```ts
+   * const bottom3 = await aggregate(users)
+   *   .bottom(3, { by: 'score' })
+   *   .toArray()
+   * ```
+   */
+  bottom(n, options) {
+    return new _AggregatePipeline(this.definition, this.nativeCollection, [
+      ...this.stages,
+      { $sort: { [options.by]: 1 } },
+      { $limit: n }
+    ]);
+  }
+};
+function aggregate(handle) {
+  return new AggregatePipeline(handle.definition, handle.native, []);
+}
+
 // src/client/client.ts
-var import_mongodb2 = require("mongodb");
+var import_mongodb3 = require("mongodb");
 
 // src/indexes/spec.ts
 function toFieldIndexSpec(def) {
@@ -146,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;
   }
@@ -159,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));
@@ -173,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"];
@@ -181,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);
     }
   }
@@ -193,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) {
@@ -239,39 +1177,52 @@ async function syncIndexes(handle, options) {
 }
 
 // src/crud/delete.ts
-var import_zod = require("zod");
+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") {
@@ -280,24 +1231,24 @@ async function findOneAndDelete(handle, filter, options) {
   try {
     return handle.definition.schema.parse(result);
   } catch (err) {
-    if (err instanceof import_zod.z.ZodError) {
-      throw new ZodmonValidationError(handle.definition.name, err);
+    if (err instanceof import_zod2.z.ZodError) {
+      throw new ZodmonValidationError(handle.definition.name, err, result);
     }
     throw err;
   }
 }
 
 // src/crud/find.ts
-var import_zod3 = require("zod");
+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;
   }
 };
 
@@ -325,18 +1276,18 @@ function checkUnindexedFields(definition, filter) {
 }
 
 // src/query/cursor.ts
-var import_zod2 = require("zod");
+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;
@@ -498,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 {
@@ -525,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();
@@ -553,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));
   }
   /**
@@ -573,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. */
@@ -585,8 +1557,8 @@ var TypedFindCursor = class {
     try {
       return this.schema.parse(raw2);
     } catch (err) {
-      if (err instanceof import_zod2.z.ZodError) {
-        throw new ZodmonValidationError(this.collectionName, err);
+      if (err instanceof import_zod3.z.ZodError) {
+        throw new ZodmonValidationError(this.collectionName, err, raw2);
       }
       throw err;
     }
@@ -597,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") {
@@ -606,8 +1583,8 @@ async function findOne(handle, filter, options) {
   try {
     return handle.definition.schema.parse(raw2);
   } catch (err) {
-    if (err instanceof import_zod3.z.ZodError) {
-      throw new ZodmonValidationError(handle.definition.name, err);
+    if (err instanceof import_zod4.z.ZodError) {
+      throw new ZodmonValidationError(handle.definition.name, err, raw2);
     }
     throw err;
   }
@@ -615,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;
 }
@@ -628,18 +1605,22 @@ function find(handle, filter, options) {
 }
 
 // src/crud/insert.ts
-var import_zod4 = require("zod");
+var import_zod5 = require("zod");
 async function insertOne(handle, doc) {
   let parsed;
   try {
     parsed = handle.definition.schema.parse(doc);
   } catch (err) {
-    if (err instanceof import_zod4.z.ZodError) {
-      throw new ZodmonValidationError(handle.definition.name, err);
+    if (err instanceof import_zod5.z.ZodError) {
+      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) {
@@ -649,23 +1630,35 @@ async function insertMany(handle, docs) {
     try {
       parsed.push(handle.definition.schema.parse(doc));
     } catch (err) {
-      if (err instanceof import_zod4.z.ZodError) {
-        throw new ZodmonValidationError(handle.definition.name, err);
+      if (err instanceof import_zod5.z.ZodError) {
+        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_zod5 = require("zod");
+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 = {
@@ -675,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") {
@@ -691,8 +1689,8 @@ async function findOneAndUpdate(handle, filter, update, options) {
   try {
     return handle.definition.schema.parse(result);
   } catch (err) {
-    if (err instanceof import_zod5.z.ZodError) {
-      throw new ZodmonValidationError(handle.definition.name, err);
+    if (err instanceof import_zod6.z.ZodError) {
+      throw new ZodmonValidationError(handle.definition.name, err, result);
     }
     throw err;
   }
@@ -982,6 +1980,27 @@ var CollectionHandle = class {
   async syncIndexes(options) {
     return await syncIndexes(this, options);
   }
+  /**
+   * Start a type-safe aggregation pipeline on this collection.
+   *
+   * Returns a fluent pipeline builder that tracks the output document
+   * shape through each stage. The pipeline is lazy — no query executes
+   * until a terminal method (`toArray`, `for await`, `explain`) is called.
+   *
+   * @returns A new pipeline builder starting with this collection's document type.
+   *
+   * @example
+   * ```ts
+   * const users = db.use(Users)
+   * const result = await users.aggregate()
+   *   .match({ role: 'admin' })
+   *   .groupBy('role', { count: $count() })
+   *   .toArray()
+   * ```
+   */
+  aggregate() {
+    return aggregate(this);
+  }
 };
 
 // src/client/client.ts
@@ -991,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);
   }
   /**
@@ -1007,9 +2026,7 @@ var Database = class {
    */
   use(def) {
     this._collections.set(def.name, def);
-    const native = this._db.collection(
-      def.name
-    );
+    const native = this._db.collection(def.name);
     return new CollectionHandle(
       def,
       native
@@ -1082,41 +2099,11 @@ 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
 var import_zod7 = require("zod");
-
-// src/schema/ref.ts
-var import_zod6 = require("zod");
-var refMetadata = /* @__PURE__ */ new WeakMap();
-function getRefMetadata(schema) {
-  if (typeof schema !== "object" || schema === null) return void 0;
-  return refMetadata.get(schema);
-}
-var REF_GUARD = /* @__PURE__ */ Symbol.for("zodmon_ref");
-function installRefExtension() {
-  const proto = import_zod6.z.ZodType.prototype;
-  if (REF_GUARD in proto) return;
-  Object.defineProperty(proto, "ref", {
-    value(collection2) {
-      refMetadata.set(this, { collection: collection2 });
-      return this;
-    },
-    enumerable: true,
-    configurable: true,
-    writable: true
-  });
-  Object.defineProperty(proto, REF_GUARD, {
-    value: true,
-    enumerable: false,
-    configurable: false,
-    writable: false
-  });
-}
-
-// src/schema/extensions.ts
 var indexMetadata = /* @__PURE__ */ new WeakMap();
 function getIndexMetadata(schema) {
   if (typeof schema !== "object" || schema === null) return void 0;
@@ -1222,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
@@ -1244,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 ?? {};
@@ -1315,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
@@ -1367,29 +2354,52 @@ var $ = {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   $,
+  $addToSet,
   $and,
+  $avg,
+  $count,
   $eq,
   $exists,
+  $first,
   $gt,
   $gte,
   $in,
+  $last,
   $lt,
   $lte,
+  $max,
+  $min,
   $ne,
   $nin,
   $nor,
   $not,
   $or,
+  $push,
   $regex,
+  $sum,
+  AggregatePipeline,
   CollectionHandle,
   Database,
   IndexBuilder,
   TypedFindCursor,
+  ZodmonAuthError,
+  ZodmonBulkWriteError,
+  ZodmonDocValidationError,
+  ZodmonDuplicateKeyError,
+  ZodmonError,
+  ZodmonIndexError,
+  ZodmonNetworkError,
   ZodmonNotFoundError,
+  ZodmonQueryError,
+  ZodmonTimeoutError,
   ZodmonValidationError,
+  ZodmonWriteConflictError,
+  aggregate,
   checkUnindexedFields,
   collection,
+  createAccumulatorBuilder,
   createClient,
+  createExpressionBuilder,
   deleteMany,
   deleteOne,
   extractComparableOptions,
@@ -1415,6 +2425,7 @@ var $ = {
   toCompoundIndexSpec,
   toFieldIndexSpec,
   updateMany,
-  updateOne
+  updateOne,
+  wrapMongoError
 });
 //# sourceMappingURL=index.cjs.map