effect-mongodb 0.1.2 → 0.1.3

package/dist/esm/MongoError.js

@@ -2,22 +2,8 @@
  * @since 0.0.1
  */
 import * as Data from "effect/Data";
-import * as Effect from "effect/Effect";
-import * as F from "effect/Function";
-import * as Match from "effect/Match";
-import * as Stream from "effect/Stream";
-import { MongoError as MongoError_ } from "mongodb";
+export class ClientErrorSource extends /*#__PURE__*/Data.TaggedClass("ClientErrorSource") {}
+export class DbErrorSource extends /*#__PURE__*/Data.TaggedClass("DbErrorSource") {}
+export class CollectionErrorSource extends /*#__PURE__*/Data.TaggedClass("CollectionErrorSource") {}
 export class MongoError extends /*#__PURE__*/Data.TaggedError("MongoError") {}
-export const mongoErrorDie = /*#__PURE__*/F.dual(2, (error, message) => F.pipe(Match.value(error), Match.when(Match.instanceOf(MongoError_), innerError => Effect.fail(new MongoError({
-  message,
-  innerError
-}))), Match.orElse(cause => Effect.die(new Error(message, {
-  cause
-})))));
-export const mongoErrorStream = /*#__PURE__*/F.dual(2, (error, message) => F.pipe(Match.value(error), Match.when(Match.instanceOf(MongoError_), innerError => Stream.fail(new MongoError({
-  message,
-  innerError
-}))), Match.orElse(cause => Stream.die(new Error(message, {
-  cause
-})))));
 //# sourceMappingURL=MongoError.js.map

package/dist/esm/MongoError.js.map

@@ -1 +1 @@
-{"version":3,"file":"MongoError.js","names":["Data","Effect","F","Match","Stream","MongoError","MongoError_","TaggedError","mongoErrorDie","dual","error","message","pipe","value","when","instanceOf","innerError","fail","orElse","cause","die","Error","mongoErrorStream"],"sources":["../../src/MongoError.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,IAAI,MAAM,aAAa;AACnC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,CAAC,MAAM,iBAAiB;AACpC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,SAASC,UAAU,IAAIC,WAAW,QAAQ,SAAS;AAEnD,OAAM,MAAOD,UAAW,sBAAQL,IAAI,CAACO,WAAW,CAAC,YAAY,CAG3D;AAEF,OAAO,MAAMC,aAAa,gBAGtBN,CAAC,CAACO,IAAI,CAAC,CAAC,EAAE,CAAIC,KAAc,EAAEC,OAAe,KAC/CT,CAAC,CAACU,IAAI,CACJT,KAAK,CAACU,KAAK,CAACH,KAAK,CAAC,EAClBP,KAAK,CAACW,IAAI,CAACX,KAAK,CAACY,UAAU,CAACT,WAAW,CAAC,EAAGU,UAAU,IAAKf,MAAM,CAACgB,IAAI,CAAC,IAAIZ,UAAU,CAAC;EAAEM,OAAO;EAAEK;AAAU,CAAE,CAAC,CAAC,CAAC,EAC/Gb,KAAK,CAACe,MAAM,CAAEC,KAAK,IACjBlB,MAAM,CAACmB,GAAG,CACR,IAAIC,KAAK,CAACV,OAAO,EAAE;EACjBQ;CACD,CAAC,CACH,CACF,CACF,CAAC;AAEJ,OAAO,MAAMG,gBAAgB,gBAGzBpB,CAAC,CAACO,IAAI,CAAC,CAAC,EAAE,CAAIC,KAAc,EAAEC,OAAe,KAC/CT,CAAC,CAACU,IAAI,CACJT,KAAK,CAACU,KAAK,CAACH,KAAK,CAAC,EAClBP,KAAK,CAACW,IAAI,CAACX,KAAK,CAACY,UAAU,CAACT,WAAW,CAAC,EAAGU,UAAU,IAAKZ,MAAM,CAACa,IAAI,CAAC,IAAIZ,UAAU,CAAC;EAAEM,OAAO;EAAEK;AAAU,CAAE,CAAC,CAAC,CAAC,EAC/Gb,KAAK,CAACe,MAAM,CAAEC,KAAK,IAAKf,MAAM,CAACgB,GAAG,CAAC,IAAIC,KAAK,CAACV,OAAO,EAAE;EAAEQ;AAAK,CAAE,CAAC,CAAC,CAAC,CACnE,CAAC","ignoreList":[]}
+{"version":3,"file":"MongoError.js","names":["Data","ClientErrorSource","TaggedClass","DbErrorSource","CollectionErrorSource","MongoError","TaggedError"],"sources":["../../src/MongoError.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,IAAI,MAAM,aAAa;AAGnC,OAAM,MAAOC,iBAAkB,sBAAQD,IAAI,CAACE,WAAW,CAAC,mBAAmB,CAIzE;AAEF,OAAM,MAAOC,aAAc,sBAAQH,IAAI,CAACE,WAAW,CAAC,eAAe,CAIjE;AAEF,OAAM,MAAOE,qBAAsB,sBAAQJ,IAAI,CAACE,WAAW,CAAC,uBAAuB,CAKjF;AAIF,OAAM,MAAOG,UAAW,sBAAQL,IAAI,CAACM,WAAW,CAAC,YAAY,CAI3D","ignoreList":[]}

package/dist/esm/internal/mongo-error.js

@@ -0,0 +1,18 @@
+import * as Effect from "effect/Effect";
+import * as F from "effect/Function";
+import * as Match from "effect/Match";
+import { MongoError as MongoError_ } from "mongodb";
+import { MongoError } from "../MongoError.js";
+export const mongoErrorOrDie = (source, message) => error => F.pipe(Match.value(error), Match.when(Match.instanceOf(MongoError_), F.flow(makeMongoError(source, message), Effect.fail)), Match.orElse(F.flow(makeError(source, message), Effect.die)));
+const makeMongoError = (source, message) => cause => new MongoError({
+  message: messageFrom(source, message),
+  cause,
+  source
+});
+const makeError = (source, message) => cause => new Error(messageFrom(source, message), {
+  cause
+});
+const messageFrom = (source, message) => message ? `${messageFromSource(source)} - ${message}` : messageFromSource(source);
+const messageFromSource = source => F.pipe(Match.value(source), Match.tag("ClientErrorSource", s => `${baseMessage(s)} - hosts ${s.hosts.join(", ")}`), Match.tag("DbErrorSource", s => `${baseMessage(s)} - ${s.db}`), Match.tag("CollectionErrorSource", s => `${baseMessage(s)} - ${s.db}.${s.collection}`), Match.exhaustive);
+const baseMessage = s => `Error in ${s.module}.${s.functionName}`;
+//# sourceMappingURL=mongo-error.js.map

package/dist/esm/internal/mongo-error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mongo-error.js","names":["Effect","F","Match","MongoError","MongoError_","mongoErrorOrDie","source","message","error","pipe","value","when","instanceOf","flow","makeMongoError","fail","orElse","makeError","die","cause","messageFrom","Error","messageFromSource","tag","s","baseMessage","hosts","join","db","collection","exhaustive","module","functionName"],"sources":["../../../src/internal/mongo-error.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,CAAC,MAAM,iBAAiB;AACpC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,SAASC,UAAU,IAAIC,WAAW,QAAQ,SAAS;AAEnD,SAASD,UAAU,QAAQ,kBAAkB;AAE7C,OAAO,MAAME,eAAe,GAC1BA,CAACC,MAAmB,EAAEC,OAAgB,KAAMC,KAAc,IACxDP,CAAC,CAACQ,IAAI,CACJP,KAAK,CAACQ,KAAK,CAACF,KAAK,CAAC,EAClBN,KAAK,CAACS,IAAI,CAACT,KAAK,CAACU,UAAU,CAACR,WAAW,CAAC,EAAEH,CAAC,CAACY,IAAI,CAACC,cAAc,CAACR,MAAM,EAAEC,OAAO,CAAC,EAAEP,MAAM,CAACe,IAAI,CAAC,CAAC,EAC/Fb,KAAK,CAACc,MAAM,CAACf,CAAC,CAACY,IAAI,CAACI,SAAS,CAACX,MAAM,EAAEC,OAAO,CAAC,EAAEP,MAAM,CAACkB,GAAG,CAAC,CAAC,CAC7D;AAEL,MAAMJ,cAAc,GAAGA,CAACR,MAAmB,EAAEC,OAA2B,KAAMY,KAAkB,IAC9F,IAAIhB,UAAU,CAAC;EAAEI,OAAO,EAAEa,WAAW,CAACd,MAAM,EAAEC,OAAO,CAAC;EAAEY,KAAK;EAAEb;AAAM,CAAE,CAAC;AAE1E,MAAMW,SAAS,GAAGA,CAACX,MAAmB,EAAEC,OAA2B,KAAMY,KAAc,IACrF,IAAIE,KAAK,CAACD,WAAW,CAACd,MAAM,EAAEC,OAAO,CAAC,EAAE;EAAEY;AAAK,CAAE,CAAC;AAEpD,MAAMC,WAAW,GAAGA,CAACd,MAAmB,EAAEC,OAAgB,KACxDA,OAAO,GAAG,GAAGe,iBAAiB,CAAChB,MAAM,CAAC,MAAMC,OAAO,EAAE,GAAGe,iBAAiB,CAAChB,MAAM,CAAC;AAEnF,MAAMgB,iBAAiB,GAAIhB,MAAmB,IAC5CL,CAAC,CAACQ,IAAI,CACJP,KAAK,CAACQ,KAAK,CAACJ,MAAM,CAAC,EACnBJ,KAAK,CAACqB,GAAG,CAAC,mBAAmB,EAAGC,CAAC,IAAK,GAAGC,WAAW,CAACD,CAAC,CAAC,YAAYA,CAAC,CAACE,KAAK,CAACC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EACxFzB,KAAK,CAACqB,GAAG,CAAC,eAAe,EAAGC,CAAC,IAAK,GAAGC,WAAW,CAACD,CAAC,CAAC,MAAMA,CAAC,CAACI,EAAE,EAAE,CAAC,EAChE1B,KAAK,CAACqB,GAAG,CAAC,uBAAuB,EAAGC,CAAC,IAAK,GAAGC,WAAW,CAACD,CAAC,CAAC,MAAMA,CAAC,CAACI,EAAE,IAAIJ,CAAC,CAACK,UAAU,EAAE,CAAC,EACxF3B,KAAK,CAAC4B,UAAU,CACjB;AAEH,MAAML,WAAW,GAAID,CAA2C,IAAK,YAAYA,CAAC,CAACO,MAAM,IAAIP,CAAC,CAACQ,YAAY,EAAE","ignoreList":[]}

package/dist/esm/internal/version.js

@@ -1,4 +1,4 @@
-let moduleVersion = "0.1.2";
+let moduleVersion = "0.1.3";
 export const getCurrentVersion = () => moduleVersion;
 export const setCurrentVersion = version => {
   moduleVersion = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-mongodb",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "A MongoDB toolkit for Effect",
   "license": "MIT",
   "repository": {

package/src/AggregationCursor.ts

@@ -8,6 +8,7 @@ import type * as ParseResult from "effect/ParseResult"
 import * as Schema from "effect/Schema"
 import * as Stream from "effect/Stream"
 import type { AggregationCursor as MongoAggregationCursor } from "mongodb"
+import { mongoErrorOrDie } from "./internal/mongo-error.js"
 import * as MongoError from "./MongoError.js"
 
 export class AggregationCursor<A, I = A, R = never> extends Data.TaggedClass("AggregationCursor")<
@@ -19,8 +20,8 @@ export const toArray = <A, I, R>(
   cursor: AggregationCursor<A, I, R>
 ): Effect.Effect<Array<A>, MongoError.MongoError | ParseResult.ParseError, R> => {
   const decode = Schema.decodeUnknown(cursor.schema)
-  return Effect.tryPromise({ try: () => cursor.cursor.toArray(), catch: F.identity }).pipe(
-    Effect.catchAll(MongoError.mongoErrorDie<Array<A>>("Unable to get array from mongodb aggregate cursor")),
+  return Effect.promise(() => cursor.cursor.toArray()).pipe(
+    Effect.catchAllDefect(mongoErrorOrDie(errorSource(cursor, "toArray"))),
     Effect.flatMap(Effect.forEach((x) => decode(x)))
   )
 }
@@ -31,7 +32,15 @@ export const toStream = <A, I, R>(
   const decode = Schema.decodeUnknown(cursor.schema)
   return F.pipe(
     Stream.fromAsyncIterable(cursor.cursor, F.identity),
-    Stream.catchAll(MongoError.mongoErrorStream<A>("Unable to get stream from mongodb aggregate cursor")),
+    Stream.catchAll(mongoErrorOrDie(errorSource(cursor, "toStream"))),
     Stream.mapEffect((x) => decode(x))
   )
 }
+
+const errorSource = <A, I, R>(cursor: AggregationCursor<A, I, R>, functionName: string) =>
+  new MongoError.CollectionErrorSource({
+    module: AggregationCursor.name,
+    functionName,
+    db: cursor.cursor.namespace.db,
+    collection: cursor.cursor.namespace.collection ?? "NO_COLLECTION_NAME"
+  })

package/src/Collection.ts

@@ -38,6 +38,7 @@ import * as AggregationCursor from "./AggregationCursor.js"
 import * as FindCursor from "./FindCursor.js"
 import type { Filter } from "./internal/filter.js"
 import type { ModifyResult } from "./internal/modify-result.js"
+import { mongoErrorOrDie } from "./internal/mongo-error.js"
 import * as SchemaExt from "./internal/schema.js"
 import * as MongoError from "./MongoError.js"
 
@@ -93,49 +94,49 @@ export const findOne: {
       const value = yield* _(Effect.promise(() => collection.collection.findOne(filter, options)))
       return yield* _(SchemaExt.decodeNullableDocument(collection.schema, value))
     }).pipe(
-      Effect.catchAllDefect(MongoError.mongoErrorDie<O.Option<A>>("findOne error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "findOne")))
     )
 )
 
 export const insertOne: {
   <A extends Document>(doc: A, options?: InsertOneOptions): <I extends Document, R>(
     collection: Collection<A, I, R>
-  ) => Effect.Effect<InsertOneResult, MongoError.MongoError | ParseResult.ParseError, R>
+  ) => Effect.Effect<InsertOneResult<I>, MongoError.MongoError | ParseResult.ParseError, R>
   <A extends Document, I extends Document, R>(
     collection: Collection<A, I, R>,
     doc: A,
     options?: InsertOneOptions
-  ): Effect.Effect<InsertOneResult, MongoError.MongoError | ParseResult.ParseError, R>
+  ): Effect.Effect<InsertOneResult<I>, MongoError.MongoError | ParseResult.ParseError, R>
 } = F.dual((args) => isCollection(args[0]), <A extends Document, I extends Document, R>(
   collection: Collection<A, I, R>,
   doc: A,
   options?: InsertOneOptions
-): Effect.Effect<InsertOneResult, MongoError.MongoError | ParseResult.ParseError, R> =>
+): Effect.Effect<InsertOneResult<I>, MongoError.MongoError | ParseResult.ParseError, R> =>
   F.pipe(
     collection.encode(doc),
     Effect.flatMap((doc) => Effect.promise(() => collection.collection.insertOne(doc, options))),
-    Effect.catchAllDefect(MongoError.mongoErrorDie<InsertOneResult>("insertOne error"))
+    Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "insertOne")))
   ))
 
 export const insertMany: {
   <A extends Document>(docs: ReadonlyArray<A>, options?: BulkWriteOptions): <I extends Document, R>(
     collection: Collection<A, I, R>
-  ) => Effect.Effect<InsertManyResult, MongoError.MongoError | ParseResult.ParseError, R>
+  ) => Effect.Effect<InsertManyResult<I>, MongoError.MongoError | ParseResult.ParseError, R>
   <A extends Document, I extends Document, R>(
     collection: Collection<A, I, R>,
     docs: ReadonlyArray<A>,
     options?: BulkWriteOptions
-  ): Effect.Effect<InsertManyResult, MongoError.MongoError | ParseResult.ParseError, R>
+  ): Effect.Effect<InsertManyResult<I>, MongoError.MongoError | ParseResult.ParseError, R>
 } = F.dual((args) => isCollection(args[0]), <A extends Document, I extends Document, R>(
   collection: Collection<A, I, R>,
   docs: ReadonlyArray<A>,
   options?: BulkWriteOptions
-): Effect.Effect<InsertManyResult, MongoError.MongoError | ParseResult.ParseError, R> => {
+): Effect.Effect<InsertManyResult<I>, MongoError.MongoError | ParseResult.ParseError, R> => {
   return F.pipe(
     docs,
     Effect.forEach((doc) => collection.encode(doc)),
     Effect.flatMap((docs) => Effect.promise(() => collection.collection.insertMany(docs, options))),
-    Effect.catchAllDefect(MongoError.mongoErrorDie<InsertManyResult>("insertMany error"))
+    Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "insertMany")))
   )
 })
 
@@ -156,7 +157,7 @@ export const deleteOne: {
     options?: DeleteOptions
   ): Effect.Effect<DeleteResult, MongoError.MongoError, R> =>
     Effect.promise(() => collection.collection.deleteOne(filter, options)).pipe(
-      Effect.catchAllDefect(MongoError.mongoErrorDie<DeleteResult>("deleteOne error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "deleteOne")))
     )
 )
 
@@ -177,7 +178,7 @@ export const deleteMany: {
     options?: DeleteOptions
   ): Effect.Effect<DeleteResult, MongoError.MongoError, R> =>
     Effect.promise(() => collection.collection.deleteMany(filter, options)).pipe(
-      Effect.catchAllDefect(MongoError.mongoErrorDie<DeleteResult>("deleteMany error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "deleteMany")))
     )
 )
 
@@ -186,15 +187,15 @@ export const updateMany: {
     filter: Filter<I>,
     update: UpdateFilter<I> | ReadonlyArray<Document>,
     options?: UpdateOptions
-  ): <A extends Document, R>(
-    collection: Collection<A, I, R>
-  ) => Effect.Effect<UpdateResult, MongoError.MongoError, R>
+  ): <A extends Document, I2 extends I, R>(
+    collection: Collection<A, I2, R>
+  ) => Effect.Effect<UpdateResult<I2>, MongoError.MongoError, R>
   <A extends Document, I extends Document, R>(
     collection: Collection<A, I, R>,
     filter: Filter<I>,
     update: UpdateFilter<I> | ReadonlyArray<Document>,
     options?: UpdateOptions
-  ): Effect.Effect<UpdateResult, MongoError.MongoError, R>
+  ): Effect.Effect<UpdateResult<I>, MongoError.MongoError, R>
 } = F.dual(
   (args) => isCollection(args[0]),
   <A extends Document, I extends Document, R>(
@@ -202,31 +203,30 @@ export const updateMany: {
     filter: Filter<I>,
     update: UpdateFilter<I> | ReadonlyArray<Document>,
     options?: UpdateOptions
-  ): Effect.Effect<UpdateResult, MongoError.MongoError, R> =>
+  ): Effect.Effect<UpdateResult<I>, MongoError.MongoError, R> =>
     Effect.promise(() =>
       collection.collection.updateMany(
         filter,
         Array.isArray(update) ? [...update] : update as UpdateFilter<Document>,
         options
       )
-    ).pipe(Effect.catchAllDefect(MongoError.mongoErrorDie<UpdateResult>("updateMany error")))
+    ).pipe(Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "updateMany"))))
 )
 
 export const replaceOne: {
   <A extends Document, I extends Document>(
     filter: Filter<I>,
-    // TODO: should we put WithoutId<A> here like the driver signature?
     replacement: A,
     options?: ReplaceOptions
   ): <R>(
     collection: Collection<A, I, R>
-  ) => Effect.Effect<UpdateResult | Document, MongoError.MongoError | ParseResult.ParseError, R>
+  ) => Effect.Effect<UpdateResult<I> | Document, MongoError.MongoError | ParseResult.ParseError, R>
   <A extends Document, I extends Document, R>(
     collection: Collection<A, I, R>,
     filter: Filter<I>,
     replacement: A,
     options?: ReplaceOptions
-  ): Effect.Effect<UpdateResult | Document, MongoError.MongoError | ParseResult.ParseError, R>
+  ): Effect.Effect<UpdateResult<I> | Document, MongoError.MongoError | ParseResult.ParseError, R>
 } = F.dual(
   (args) => isCollection(args[0]),
   <A extends Document, I extends Document, R>(
@@ -235,7 +235,7 @@ export const replaceOne: {
     replacement: A,
     options?: ReplaceOptions
   ): Effect.Effect<
-    UpdateResult | Document,
+    UpdateResult<I> | Document,
     MongoError.MongoError | ParseResult.ParseError,
     R
   > =>
@@ -244,7 +244,7 @@ export const replaceOne: {
       Effect.flatMap((replacement) =>
         Effect.promise(() => collection.collection.replaceOne(filter, replacement, options))
       ),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<UpdateResult | Document>("replaceOne error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "replaceOne")))
     )
 )
 
@@ -316,7 +316,7 @@ export const findOneAndReplace: {
         })
       ),
       Effect.catchAllDefect(
-        MongoError.mongoErrorDie<O.Option<A> | ModifyResult<A>>("findOneAndReplace error")
+        mongoErrorOrDie(errorSource(collection, "findOneAndReplace"))
       )
     )
 )
@@ -340,7 +340,7 @@ export const rename: {
     F.pipe(
       Effect.promise(() => collection.collection.rename(newName, options)),
       Effect.map((newCollection) => new Collection<A, I, R>({ collection: newCollection, schema: collection.schema })),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<Collection<A, I, R>>("rename error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "rename")))
     )
 )
 
@@ -360,7 +360,7 @@ export const drop: {
   ): Effect.Effect<boolean, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.drop(options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<boolean>("drop error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "drop")))
     )
 )
 
@@ -385,7 +385,7 @@ export const createIndexes: {
   ): Effect.Effect<Array<string>, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.createIndexes([...indexSpecs], options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<Array<string>>("createIndexes error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "createIndexes")))
     )
 )
 
@@ -407,54 +407,52 @@ export const createIndex: {
   ): Effect.Effect<string, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.createIndex(indexSpec, options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<string>("createIndex error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "createIndex")))
     )
 )
 
-// TODO: review return type. Should we return Document like mongodb driver?
 export const dropIndex: {
   (indexName: string, options?: DropIndexesOptions): <A extends Document, I extends Document, R>(
     collection: Collection<A, I, R>
-  ) => Effect.Effect<void, MongoError.MongoError, R>
+  ) => Effect.Effect<Document, MongoError.MongoError, R>
   <A extends Document, I extends Document, R>(
     collection: Collection<A, I, R>,
     indexName: string,
     options?: DropIndexesOptions
-  ): Effect.Effect<void, MongoError.MongoError, R>
+  ): Effect.Effect<Document, MongoError.MongoError, R>
 } = F.dual(
   (args) => isCollection(args[0]),
   <A extends Document, I extends Document, R>(
     collection: Collection<A, I, R>,
     indexName: string,
     options?: DropIndexesOptions
-  ): Effect.Effect<void, MongoError.MongoError, R> =>
+  ): Effect.Effect<Document, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.dropIndex(indexName, options)),
-      Effect.asVoid,
-      Effect.catchAllDefect(MongoError.mongoErrorDie<void>("dropIndex error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "dropIndex")))
     )
 )
 
 export const aggregate: {
   <B extends Document, BI extends Document, BR>(
-    pipeline: ReadonlyArray<Document>,
     schema: Schema.Schema<B, BI, BR>,
+    pipeline: ReadonlyArray<Document>,
     options?: AggregateOptions
   ): <A extends Document, I extends Document, R>(
     collection: Collection<A, I, R>
   ) => AggregationCursor.AggregationCursor<B, BI, BR>
   <A extends Document, I extends Document, R, B extends Document, BI extends Document, BR>(
     collection: Collection<A, I, R>,
-    pipeline: ReadonlyArray<Document>,
     schema: Schema.Schema<B, BI, BR>,
+    pipeline: ReadonlyArray<Document>,
     options?: AggregateOptions
   ): AggregationCursor.AggregationCursor<B, BI, BR>
 } = F.dual(
   (args) => isCollection(args[0]),
   <A extends Document, I extends Document, R, B extends Document, BI extends Document, BR>(
     collection: Collection<A, I, R>,
-    pipeline: ReadonlyArray<Document>,
     schema: Schema.Schema<B, BI, BR>,
+    pipeline: ReadonlyArray<Document>,
     options?: AggregateOptions
   ): AggregationCursor.AggregationCursor<B, BI, BR> =>
     new AggregationCursor.AggregationCursor<B, BI, BR>({
@@ -479,7 +477,7 @@ export const estimatedDocumentCount: {
   ): Effect.Effect<number, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.estimatedDocumentCount(options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<number>("estimatedDocumentCount error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "estimatedDocumentCount")))
     )
 )
 
@@ -501,8 +499,19 @@ export const countDocuments: {
   ): Effect.Effect<number, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.countDocuments(filter, options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<number>("countDocuments error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "countDocuments")))
     )
 )
 
 const isCollection = (x: unknown) => x instanceof Collection
+
+const errorSource = <A extends Document, I extends Document = A, R = never>(
+  collection: Collection<A, I, R>,
+  functionName: string
+) =>
+  new MongoError.CollectionErrorSource({
+    module: Collection.name,
+    functionName,
+    db: collection.collection.dbName,
+    collection: collection.collection.collectionName
+  })

package/src/Db.ts

@@ -8,6 +8,7 @@ import type { Document, DropCollectionOptions, ListCollectionsOptions } from "mo
 import { Db } from "mongodb"
 import type * as Collection from "./Collection.js"
 import * as DocumentCollection from "./DocumentCollection.js"
+import { mongoErrorOrDie } from "./internal/mongo-error.js"
 import * as ListCollectionsCursor from "./ListCollectionsCursor.js"
 import * as MongoError from "./MongoError.js"
 
@@ -79,8 +80,11 @@ export const dropCollection: {
   (db: Db, name: string, options?: DropCollectionOptions): Effect.Effect<boolean, MongoError.MongoError> =>
     F.pipe(
       Effect.promise(() => db.dropCollection(name, options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<boolean>("dropCollection error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(db, "dropCollection")))
     )
 )
 
 const isDb = (x: unknown) => x instanceof Db
+
+const errorSource = (db: Db, functionName: string) =>
+  new MongoError.DbErrorSource({ module: "Db", functionName, db: db.databaseName })

package/src/DocumentAggregationCursor.ts

@@ -6,6 +6,7 @@ import * as Effect from "effect/Effect"
 import * as F from "effect/Function"
 import * as Stream from "effect/Stream"
 import type { AggregationCursor as MongoAggregationCursor, Document } from "mongodb"
+import { mongoErrorOrDie } from "./internal/mongo-error.js"
 import * as MongoError from "./MongoError.js"
 
 export class DocumentAggregationCursor
@@ -17,8 +18,8 @@ export const toArray = (
   cursor: DocumentAggregationCursor
 ): Effect.Effect<Array<Document>, MongoError.MongoError> =>
   F.pipe(
-    Effect.tryPromise({ try: () => cursor.cursor.toArray(), catch: F.identity }),
-    Effect.catchAll(MongoError.mongoErrorDie<Array<Document>>(`${cursor._tag}.toArray error`))
+    Effect.promise(() => cursor.cursor.toArray()),
+    Effect.catchAllDefect(mongoErrorOrDie(errorSource(cursor, "toArray")))
   )
 
 export const toStream = (
@@ -26,5 +27,13 @@ export const toStream = (
 ): Stream.Stream<Document, MongoError.MongoError> =>
   F.pipe(
     Stream.fromAsyncIterable(cursor.cursor, F.identity),
-    Stream.catchAll(MongoError.mongoErrorStream<Document>(`${cursor._tag}.toStream error`))
+    Stream.catchAll(mongoErrorOrDie(errorSource(cursor, "toStream")))
   )
+
+const errorSource = (cursor: DocumentAggregationCursor, functionName: string) =>
+  new MongoError.CollectionErrorSource({
+    module: DocumentAggregationCursor.name,
+    functionName,
+    db: cursor.cursor.namespace.db,
+    collection: cursor.cursor.namespace.collection ?? "NO_COLLECTION_NAME"
+  })

package/src/DocumentCollection.ts

@@ -40,6 +40,7 @@ import * as Collection from "./Collection.js"
 import * as DocumentAggregationCursor from "./DocumentAggregationCursor.js"
 import * as DocumentFindCursor from "./DocumentFindCursor.js"
 import type { ModifyResult } from "./internal/modify-result.js"
+import { mongoErrorOrDie } from "./internal/mongo-error.js"
 import * as MongoError from "./MongoError.js"
 
 export class DocumentCollection extends Data.TaggedClass("DocumentCollection")<{
@@ -86,7 +87,7 @@ export const findOne: {
     F.pipe(
       Effect.promise(() => collection.collection.findOne(filter, options)),
       Effect.map((value) => O.fromNullable(value)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<O.Option<Document>>("findOne error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "findOne")))
     )
 )
 
@@ -110,7 +111,7 @@ export const insertOne: {
 ): Effect.Effect<InsertOneResult, MongoError.MongoError> =>
   F.pipe(
     Effect.promise(() => collection.collection.insertOne(doc, options)),
-    Effect.catchAllDefect(MongoError.mongoErrorDie<InsertOneResult>("insertOne error"))
+    Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "insertOne")))
   ))
 
 export const insertMany: {
@@ -132,7 +133,7 @@ export const insertMany: {
 ): Effect.Effect<InsertManyResult, MongoError.MongoError> =>
   F.pipe(
     Effect.promise(() => collection.collection.insertMany(docs, options)),
-    Effect.catchAllDefect(MongoError.mongoErrorDie<InsertManyResult>("insertMany error"))
+    Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "insertMany")))
   ))
 
 export const deleteOne: {
@@ -153,7 +154,7 @@ export const deleteOne: {
   ): Effect.Effect<DeleteResult, MongoError.MongoError> =>
     F.pipe(
       Effect.promise(() => collection.collection.deleteOne(filter, options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<DeleteResult>("deleteOne error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "deleteOne")))
     )
 )
 
@@ -175,7 +176,7 @@ export const deleteMany: {
   ): Effect.Effect<DeleteResult, MongoError.MongoError> =>
     F.pipe(
       Effect.promise(() => collection.collection.deleteMany(filter, options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<DeleteResult>("deleteMany error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "deleteMany")))
     )
 )
 
@@ -205,7 +206,7 @@ export const updateMany: {
       Effect.promise(() =>
         collection.collection.updateMany(filter, Array.isArray(update) ? [...update] : update, options)
       ),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<UpdateResult>("updateMany error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "updateMany")))
     )
 )
 
@@ -233,7 +234,7 @@ export const replaceOne: {
   ): Effect.Effect<UpdateResult | Document, MongoError.MongoError> =>
     F.pipe(
       Effect.promise(() => collection.collection.replaceOne(filter, replacement, options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<UpdateResult | Document>("replaceOne error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "replaceOne")))
     )
 )
 
@@ -303,7 +304,7 @@ export const findOneAndReplace: {
         return O.fromNullable(value)
       }),
       Effect.catchAllDefect(
-        MongoError.mongoErrorDie<O.Option<Document> | ModifyResult<Document>>("findOneAndReplace error")
+        mongoErrorOrDie(errorSource(collection, "findOneAndReplace"))
       )
     )
 )
@@ -327,7 +328,7 @@ export const rename: {
     F.pipe(
       Effect.promise(() => collection.collection.rename(newName, options)),
       Effect.map((collection) => new DocumentCollection({ collection })),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<DocumentCollection>("rename error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "rename")))
     )
 )
 
@@ -342,7 +343,7 @@ export const drop: {
   ): Effect.Effect<boolean, MongoError.MongoError> =>
     F.pipe(
       Effect.promise(() => collection.collection.drop(options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<boolean>("drop error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "drop")))
     )
 )
 
@@ -364,7 +365,7 @@ export const createIndexes: {
   ): Effect.Effect<Array<string>, MongoError.MongoError> =>
     F.pipe(
       Effect.promise(() => collection.collection.createIndexes([...indexSpecs], options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<Array<string>>("createIndexes error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "createIndexes")))
     )
 )
 
@@ -387,32 +388,30 @@ export const createIndex: {
   ): Effect.Effect<string, MongoError.MongoError> =>
     F.pipe(
       Effect.promise(() => collection.collection.createIndex(indexSpec, options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<string>("createIndex error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "createIndex")))
     )
 )
 
-// TODO: review return type. Should we return Document like mongodb driver?
 export const dropIndex: {
   (
     indexName: string,
     options?: DropIndexesOptions
-  ): (collection: DocumentCollection) => Effect.Effect<void, MongoError.MongoError>
+  ): (collection: DocumentCollection) => Effect.Effect<Document, MongoError.MongoError>
   (
     collection: DocumentCollection,
     indexName: string,
     options?: DropIndexesOptions
-  ): Effect.Effect<void, MongoError.MongoError>
+  ): Effect.Effect<Document, MongoError.MongoError>
 } = F.dual(
   (args) => isDocumentCollection(args[0]),
   (
     collection: DocumentCollection,
     indexName: string,
     options?: DropIndexesOptions
-  ): Effect.Effect<void, MongoError.MongoError> =>
+  ): Effect.Effect<Document, MongoError.MongoError> =>
     F.pipe(
       Effect.promise(() => collection.collection.dropIndex(indexName, options)),
-      Effect.asVoid,
-      Effect.catchAllDefect(MongoError.mongoErrorDie<void>("dropIndex error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "dropIndex")))
     )
 )
 
@@ -453,7 +452,7 @@ export const estimatedDocumentCount: {
   ): Effect.Effect<number, MongoError.MongoError> =>
     F.pipe(
       Effect.promise(() => collection.collection.estimatedDocumentCount(options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<number>("estimatedDocumentCount error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "estimatedDocumentCount")))
     )
 )
 
@@ -475,7 +474,7 @@ export const countDocuments: {
   ): Effect.Effect<number, MongoError.MongoError> =>
     F.pipe(
       Effect.promise(() => collection.collection.countDocuments(filter, options)),
-      Effect.catchAllDefect(MongoError.mongoErrorDie<number>("countDocuments error"))
+      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "countDocuments")))
     )
 )
 
@@ -493,3 +492,14 @@ export const typed: {
 ): Collection.Collection<A, I, R> => new Collection.Collection<A, I, R>({ collection: collection.collection, schema }))
 
 const isDocumentCollection = (x: unknown) => x instanceof DocumentCollection
+
+const errorSource = (
+  collection: DocumentCollection,
+  functionName: string
+) =>
+  new MongoError.CollectionErrorSource({
+    module: DocumentCollection.name,
+    functionName,
+    db: collection.collection.dbName,
+    collection: collection.collection.collectionName
+  })