effect-mongodb 0.4.1 → 0.6.0

package/dist/esm/FindCursor.js

@@ -8,7 +8,7 @@ import { pipeArguments } from "effect/Pipeable";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
 import * as Tuple from "effect/Tuple";
-import { mongoErrorOrDie } from "./internal/mongo-error.js";
+import { mongoOperation, mongoStreamOperation } from "./internal/mongo-operation.js";
 import * as MongoError from "./MongoError.js";
 /** @internal */
 export class FindCursorImpl extends /*#__PURE__*/Data.TaggedClass("FindCursor") {
@@ -17,44 +17,59 @@ export class FindCursorImpl extends /*#__PURE__*/Data.TaggedClass("FindCursor")
   }
 }
 export const filter = /*#__PURE__*/F.dual(args => isFindCursor(args[0]), (cursor, filter) => new FindCursorImpl({
-  cursor: cursor.cursor.filter(filter),
-  schema: cursor.schema
+  ...cursor,
+  filter
 }));
 export const project = /*#__PURE__*/F.dual(args => isFindCursor(args[0]), (cursor, newSchema, value) => new FindCursorImpl({
-  cursor: cursor.cursor.project(value),
-  schema: newSchema
+  ...cursor,
+  schema: newSchema,
+  options: {
+    ...cursor.options,
+    projection: value
+  }
 }));
 export const sort = /*#__PURE__*/F.dual(args => isFindCursor(args[0]), (cursor, sort, direction) => new FindCursorImpl({
-  cursor: cursor.cursor.sort(sort, direction),
-  schema: cursor.schema
+  ...cursor,
+  options: {
+    ...cursor.options,
+    sort: sortOption(sort, direction)
+  }
 }));
 export const limit = /*#__PURE__*/F.dual(args => isFindCursor(args[0]), (cursor, value) => new FindCursorImpl({
-  cursor: cursor.cursor.limit(value),
-  schema: cursor.schema
+  ...cursor,
+  options: {
+    ...cursor.options,
+    limit: value
+  }
 }));
 export const toArray = cursor => {
   const decode = Schema.decodeUnknown(cursor.schema);
-  return Effect.promise(() => cursor.cursor.toArray()).pipe(Effect.catchAllDefect(mongoErrorOrDie(errorSource(cursor, "toArray"))), Effect.flatMap(Effect.forEach(x => decode(x))));
+  return Effect.promise(() => nativeCursor(cursor).toArray()).pipe(mongoOperation(errorSource(cursor, "toArray")), Effect.flatMap(Effect.forEach(x => decode(x))));
 };
 export const toArrayEither = cursor => {
   const decode = Schema.decodeUnknown(cursor.schema);
-  return Effect.promise(() => cursor.cursor.toArray()).pipe(Effect.catchAllDefect(mongoErrorOrDie(errorSource(cursor, "toArrayEither"))), Effect.flatMap(Effect.forEach(x => F.pipe(decode(x), Effect.mapError(error => Tuple.make(x, error)), Effect.either))));
+  return Effect.promise(() => nativeCursor(cursor).toArray()).pipe(mongoOperation(errorSource(cursor, "toArrayEither")), Effect.flatMap(Effect.forEach(x => F.pipe(decode(x), Effect.mapError(error => Tuple.make(x, error)), Effect.either))));
 };
 export const toStream = cursor => {
   const decode = Schema.decodeUnknown(cursor.schema);
-  return F.pipe(Stream.fromAsyncIterable(cursor.cursor, F.identity), Stream.catchAll(mongoErrorOrDie(errorSource(cursor, "toStream"))), Stream.mapEffect(x => decode(x)));
+  return F.pipe(Stream.suspend(() => Stream.fromAsyncIterable(nativeCursor(cursor), F.identity)), mongoStreamOperation(errorSource(cursor, "toStream")), Stream.mapEffect(x => decode(x)));
 };
 export const toStreamEither = cursor => {
   const decode = Schema.decodeUnknown(cursor.schema);
-  return F.pipe(Stream.fromAsyncIterable(cursor.cursor, F.identity), Stream.catchAll(mongoErrorOrDie(errorSource(cursor, "toStreamEither"))), Stream.mapEffect(x => F.pipe(
+  return F.pipe(Stream.suspend(() => Stream.fromAsyncIterable(nativeCursor(cursor), F.identity)), mongoStreamOperation(errorSource(cursor, "toStreamEither")), Stream.mapEffect(x => F.pipe(
   // keep new line
   decode(x), Effect.mapError(error => Tuple.make(x, error)), Effect.either)));
 };
+/** @internal */
+export const sortOption = (sort, direction) => typeof sort === "string" && direction !== undefined ? {
+  [sort]: direction
+} : sort;
+const nativeCursor = cursor => cursor.collection.find(cursor.filter, cursor.options);
 const isFindCursor = x => x instanceof FindCursorImpl;
 const errorSource = (cursor, functionName) => new MongoError.CollectionErrorSource({
-  module: FindCursorImpl.name,
+  module: "FindCursor",
   functionName,
-  db: cursor.cursor.namespace.db,
-  collection: cursor.cursor.namespace.collection ?? "NO_COLLECTION_NAME"
+  db: cursor.collection.dbName,
+  collection: cursor.collection.collectionName
 });
 //# sourceMappingURL=FindCursor.js.map

package/dist/esm/FindCursor.js.map

@@ -1 +1 @@
-{"version":3,"file":"FindCursor.js","names":["Data","Effect","F","pipeArguments","Schema","Stream","Tuple","mongoErrorOrDie","MongoError","FindCursorImpl","TaggedClass","pipe","arguments","filter","dual","args","isFindCursor","cursor","schema","project","newSchema","value","sort","direction","limit","toArray","decode","decodeUnknown","promise","catchAllDefect","errorSource","flatMap","forEach","x","toArrayEither","mapError","error","make","either","toStream","fromAsyncIterable","identity","catchAll","mapEffect","toStreamEither","functionName","CollectionErrorSource","module","name","db","namespace","collection"],"sources":["../../src/FindCursor.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"FindCursor.js","names":["Data","Effect","F","pipeArguments","Schema","Stream","Tuple","mongoOperation","mongoStreamOperation","MongoError","FindCursorImpl","TaggedClass","pipe","arguments","filter","dual","args","isFindCursor","cursor","project","newSchema","value","schema","options","projection","sort","direction","sortOption","limit","toArray","decode","decodeUnknown","promise","nativeCursor","errorSource","flatMap","forEach","x","toArrayEither","mapError","error","make","either","toStream","suspend","fromAsyncIterable","identity","mapEffect","toStreamEither","undefined","collection","find","functionName","CollectionErrorSource","module","db","dbName","collectionName"],"sources":["../../src/FindCursor.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/ListCollectionsCursor.js

@@ -6,7 +6,7 @@ import * as Effect from "effect/Effect";
 import * as F from "effect/Function";
 import { pipeArguments } from "effect/Pipeable";
 import * as Stream from "effect/Stream";
-import { mongoErrorOrDie } from "./internal/mongo-error.js";
+import { mongoOperation, mongoStreamOperation } from "./internal/mongo-operation.js";
 import * as MongoError from "./MongoError.js";
 /** @internal */
 export class ListCollectionsCursorImpl extends /*#__PURE__*/Data.TaggedClass("ListCollectionsCursor") {
@@ -14,10 +14,10 @@ export class ListCollectionsCursorImpl extends /*#__PURE__*/Data.TaggedClass("Li
     return pipeArguments(this, arguments);
   }
 }
-export const toArray = cursor => F.pipe(Effect.promise(() => cursor.cursor.toArray()), Effect.catchAllDefect(mongoErrorOrDie(errorSource(cursor, "toArray"))));
-export const toStream = cursor => F.pipe(Stream.fromAsyncIterable(cursor.cursor, F.identity), Stream.catchAll(mongoErrorOrDie(errorSource(cursor, "toStream"))));
+export const toArray = cursor => F.pipe(Effect.promise(() => cursor.cursor.toArray()), mongoOperation(errorSource(cursor, "toArray")));
+export const toStream = cursor => F.pipe(Stream.fromAsyncIterable(cursor.cursor, F.identity), mongoStreamOperation(errorSource(cursor, "toStream")));
 const errorSource = (cursor, functionName) => new MongoError.CollectionErrorSource({
-  module: ListCollectionsCursorImpl.name,
+  module: "ListCollectionsCursor",
   functionName,
   db: cursor.cursor.namespace.db,
   collection: cursor.cursor.namespace.collection ?? "NO_COLLECTION_NAME"

package/dist/esm/ListCollectionsCursor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ListCollectionsCursor.js","names":["Data","Effect","F","pipeArguments","Stream","mongoErrorOrDie","MongoError","ListCollectionsCursorImpl","TaggedClass","pipe","arguments","toArray","cursor","promise","catchAllDefect","errorSource","toStream","fromAsyncIterable","identity","catchAll","functionName","CollectionErrorSource","module","name","db","namespace","collection"],"sources":["../../src/ListCollectionsCursor.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,IAAI,MAAM,aAAa;AACnC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,CAAC,MAAM,iBAAiB;AAEpC,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAKvC,SAASC,eAAe,QAAQ,2BAA2B;AAC3D,OAAO,KAAKC,UAAU,MAAM,iBAAiB;AAiB7C;AACA,OAAM,MAAOC,yBAEX,sBAAQP,IAAI,CAACQ,WAAW,CAAC,uBAAuB,CAAiC;EACjFC,IAAIA,CAAA;IACF,OAAON,aAAa,CAAC,IAAI,EAAEO,SAAS,CAAC;EACvC;;AASF,OAAO,MAAMC,OAAO,GAClBC,MAAgC,IAEhCV,CAAC,CAACO,IAAI,CACJR,MAAM,CAACY,OAAO,CAAC,MAAMD,MAAM,CAACA,MAAM,CAACD,OAAO,EAAE,CAAC,EAC7CV,MAAM,CAACa,cAAc,CAACT,eAAe,CAACU,WAAW,CAACH,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CACvE;AAEH,OAAO,MAAMI,QAAQ,GACnBJ,MAAgC,IAEhCV,CAAC,CAACO,IAAI,CACJL,MAAM,CAACa,iBAAiB,CAACL,MAAM,CAACA,MAAM,EAAEV,CAAC,CAACgB,QAAQ,CAAC,EACnDd,MAAM,CAACe,QAAQ,CAACd,eAAe,CAACU,WAAW,CAACH,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAClE;AAEH,MAAMG,WAAW,GAAGA,CAACH,MAA6B,EAAEQ,YAAoB,KACtE,IAAId,UAAU,CAACe,qBAAqB,CAAC;EACnCC,MAAM,EAAEf,yBAAyB,CAACgB,IAAI;EACtCH,YAAY;EACZI,EAAE,EAAEZ,MAAM,CAACA,MAAM,CAACa,SAAS,CAACD,EAAE;EAC9BE,UAAU,EAAEd,MAAM,CAACA,MAAM,CAACa,SAAS,CAACC,UAAU,IAAI;CACnD,CAAC","ignoreList":[]}
+{"version":3,"file":"ListCollectionsCursor.js","names":["Data","Effect","F","pipeArguments","Stream","mongoOperation","mongoStreamOperation","MongoError","ListCollectionsCursorImpl","TaggedClass","pipe","arguments","toArray","cursor","promise","errorSource","toStream","fromAsyncIterable","identity","functionName","CollectionErrorSource","module","db","namespace","collection"],"sources":["../../src/ListCollectionsCursor.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,IAAI,MAAM,aAAa;AACnC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,CAAC,MAAM,iBAAiB;AAEpC,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAKvC,SAASC,cAAc,EAAEC,oBAAoB,QAAQ,+BAA+B;AACpF,OAAO,KAAKC,UAAU,MAAM,iBAAiB;AAiB7C;AACA,OAAM,MAAOC,yBAEX,sBAAQR,IAAI,CAACS,WAAW,CAAC,uBAAuB,CAAiC;EACjFC,IAAIA,CAAA;IACF,OAAOP,aAAa,CAAC,IAAI,EAAEQ,SAAS,CAAC;EACvC;;AASF,OAAO,MAAMC,OAAO,GAClBC,MAAgC,IAEhCX,CAAC,CAACQ,IAAI,CACJT,MAAM,CAACa,OAAO,CAAC,MAAMD,MAAM,CAACA,MAAM,CAACD,OAAO,EAAE,CAAC,EAC7CP,cAAc,CAACU,WAAW,CAACF,MAAM,EAAE,SAAS,CAAC,CAAC,CAC/C;AAEH,OAAO,MAAMG,QAAQ,GACnBH,MAAgC,IAEhCX,CAAC,CAACQ,IAAI,CACJN,MAAM,CAACa,iBAAiB,CAACJ,MAAM,CAACA,MAAM,EAAEX,CAAC,CAACgB,QAAQ,CAAC,EACnDZ,oBAAoB,CAACS,WAAW,CAACF,MAAM,EAAE,UAAU,CAAC,CAAC,CACtD;AAEH,MAAME,WAAW,GAAGA,CAACF,MAA6B,EAAEM,YAAoB,KACtE,IAAIZ,UAAU,CAACa,qBAAqB,CAAC;EACnCC,MAAM,EAAE,uBAAuB;EAC/BF,YAAY;EACZG,EAAE,EAAET,MAAM,CAACA,MAAM,CAACU,SAAS,CAACD,EAAE;EAC9BE,UAAU,EAAEX,MAAM,CAACA,MAAM,CAACU,SAAS,CAACC,UAAU,IAAI;CACnD,CAAC","ignoreList":[]}

package/dist/esm/MongoClient.js

@@ -6,15 +6,15 @@ import * as Effect from "effect/Effect";
 import * as F from "effect/Function";
 import { MongoClient as MongoClient_ } from "mongodb";
 import * as Db from "./Db.js";
-import { mongoErrorOrDie } from "./internal/mongo-error.js";
+import { mongoOperation } from "./internal/mongo-operation.js";
 import * as MongoError from "./MongoError.js";
 export class MongoClient extends /*#__PURE__*/Data.TaggedClass("MongoClient") {}
 export const connect = (url, options) => Effect.promise(() => MongoClient_.connect(url, options)).pipe(Effect.map(client => new MongoClient({
   client
-})), Effect.catchAllDefect(mongoErrorOrDie(errorSource(hostsFromUrl(url), "connect"))));
+})), mongoOperation(errorSource(hostsFromUrl(url), "connect")));
 export const close = /*#__PURE__*/F.dual(args => isMongoClient(args[0]), ({
   client
-}, force) => Effect.promise(() => client.close(force)).pipe(Effect.catchAllDefect(mongoErrorOrDie(errorSource(client.options.hosts.map(x => x.host ?? UNKNOWN_HOST), "close")))));
+}, force) => Effect.promise(() => client.close(force)).pipe(mongoOperation(errorSource(client.options.hosts.map(x => x.host ?? UNKNOWN_HOST), "close"))));
 export const connectScoped = (url, options) => Effect.acquireRelease(connect(url, options), client => close(client, options?.forceClose).pipe(Effect.orDie));
 export const db = /*#__PURE__*/F.dual(args => isMongoClient(args[0]), ({
   client

package/dist/esm/MongoClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"MongoClient.js","names":["Data","Effect","F","MongoClient","MongoClient_","Db","mongoErrorOrDie","MongoError","TaggedClass","connect","url","options","promise","pipe","map","client","catchAllDefect","errorSource","hostsFromUrl","close","dual","args","isMongoClient","force","hosts","x","host","UNKNOWN_HOST","connectScoped","acquireRelease","forceClose","orDie","db","dbName","functionName","ClientErrorSource","module","SCHEME","CREDENTIALS","HOSTS","MONGO_CONNECTION_STRING","RegExp","source","match","split"],"sources":["../../src/MongoClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"MongoClient.js","names":["Data","Effect","F","MongoClient","MongoClient_","Db","mongoOperation","MongoError","TaggedClass","connect","url","options","promise","pipe","map","client","errorSource","hostsFromUrl","close","dual","args","isMongoClient","force","hosts","x","host","UNKNOWN_HOST","connectScoped","acquireRelease","forceClose","orDie","db","dbName","functionName","ClientErrorSource","module","SCHEME","CREDENTIALS","HOSTS","MONGO_CONNECTION_STRING","RegExp","source","match","split"],"sources":["../../src/MongoClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,8 @@
+import * as Effect from "effect/Effect";
+import * as F from "effect/Function";
+import * as Stream from "effect/Stream";
+import { mongoErrorOrDie } from "./mongo-error.js";
+import { withSpan, withSpanStream } from "./tracing.js";
+export const mongoOperation = source => self => F.pipe(self, Effect.catchAllDefect(mongoErrorOrDie(source)), withSpan(source));
+export const mongoStreamOperation = source => self => F.pipe(self, Stream.catchAll(mongoErrorOrDie(source)), withSpanStream(source));
+//# sourceMappingURL=mongo-operation.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mongo-operation.js","names":["Effect","F","Stream","mongoErrorOrDie","withSpan","withSpanStream","mongoOperation","source","self","pipe","catchAllDefect","mongoStreamOperation","catchAll"],"sources":["../../../src/internal/mongo-operation.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,CAAC,MAAM,iBAAiB;AACpC,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,SAASC,eAAe,QAAQ,kBAAkB;AAClD,SAASC,QAAQ,EAAEC,cAAc,QAAQ,cAAc;AAEvD,OAAO,MAAMC,cAAc,GACxBC,MAAmB,IAAeC,IAA4B,IAC7DP,CAAC,CAACQ,IAAI,CACJD,IAAI,EACJR,MAAM,CAACU,cAAc,CAACP,eAAe,CAACI,MAAM,CAAC,CAAC,EAC9CH,QAAQ,CAACG,MAAM,CAAC,CACjB;AAEL,OAAO,MAAMI,oBAAoB,GAC9BJ,MAAmB,IAAeC,IAA4B,IAC7DP,CAAC,CAACQ,IAAI,CACJD,IAAI,EACJN,MAAM,CAACU,QAAQ,CAACT,eAAe,CAACI,MAAM,CAAC,CAAC,EACxCF,cAAc,CAACE,MAAM,CAAC,CACvB","ignoreList":[]}

package/dist/esm/internal/tracing.js

@@ -0,0 +1,39 @@
+import * as Effect from "effect/Effect";
+import * as F from "effect/Function";
+import * as Match from "effect/Match";
+import * as Stream from "effect/Stream";
+export const withSpan = source => self => Effect.withSpan(self, spanName(source), spanOptions(source));
+export const withSpanStream = source => self => Stream.withSpan(self, spanName(source), spanOptions(source));
+const spanName = source => `mongodb.${source.module}.${source.functionName}`;
+const spanOptions = source => ({
+  kind: "client",
+  captureStackTrace: false,
+  attributes: {
+    "db.system.name": "mongodb",
+    "db.operation.name": source.functionName,
+    ...sourceAttributes(source)
+  }
+});
+const sourceAttributes = source => F.pipe(Match.value(source), Match.tag("ClientErrorSource", s => serverAttributes(s.hosts)), Match.tag("DbErrorSource", s => ({
+  "db.namespace": s.db
+})), Match.tag("CollectionErrorSource", s => ({
+  "db.namespace": s.db,
+  "db.collection.name": s.collection
+})), Match.exhaustive);
+const serverAttributes = hosts => {
+  if (hosts.length !== 1) return {};
+  const [address, port] = splitHost(hosts[0]);
+  return port === undefined ? {
+    "server.address": address
+  } : {
+    "server.address": address,
+    "server.port": port
+  };
+};
+const splitHost = host => {
+  const separator = host.lastIndexOf(":");
+  if (separator === -1) return [host, undefined];
+  const port = Number(host.slice(separator + 1));
+  return Number.isInteger(port) ? [host.slice(0, separator), port] : [host, undefined];
+};
+//# sourceMappingURL=tracing.js.map

package/dist/esm/internal/tracing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracing.js","names":["Effect","F","Match","Stream","withSpan","source","self","spanName","spanOptions","withSpanStream","module","functionName","kind","captureStackTrace","attributes","sourceAttributes","pipe","value","tag","s","serverAttributes","hosts","db","collection","exhaustive","length","address","port","splitHost","undefined","host","separator","lastIndexOf","Number","slice","isInteger"],"sources":["../../../src/internal/tracing.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,CAAC,MAAM,iBAAiB;AACpC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AAIvC,OAAO,MAAMC,QAAQ,GAAIC,MAAmB,IAAeC,IAA4B,IACrFN,MAAM,CAACI,QAAQ,CAACE,IAAI,EAAEC,QAAQ,CAACF,MAAM,CAAC,EAAEG,WAAW,CAACH,MAAM,CAAC,CAAC;AAE9D,OAAO,MAAMI,cAAc,GACxBJ,MAAmB,IAAeC,IAA4B,IAC7DH,MAAM,CAACC,QAAQ,CAACE,IAAI,EAAEC,QAAQ,CAACF,MAAM,CAAC,EAAEG,WAAW,CAACH,MAAM,CAAC,CAAC;AAEhE,MAAME,QAAQ,GAAIF,MAAmB,IAAK,WAAWA,MAAM,CAACK,MAAM,IAAIL,MAAM,CAACM,YAAY,EAAE;AAE3F,MAAMH,WAAW,GAAIH,MAAmB,KAA0B;EAChEO,IAAI,EAAE,QAAQ;EACdC,iBAAiB,EAAE,KAAK;EACxBC,UAAU,EAAE;IACV,gBAAgB,EAAE,SAAS;IAC3B,mBAAmB,EAAET,MAAM,CAACM,YAAY;IACxC,GAAGI,gBAAgB,CAACV,MAAM;;CAE7B,CAAC;AAEF,MAAMU,gBAAgB,GAAIV,MAAmB,IAC3CJ,CAAC,CAACe,IAAI,CACJd,KAAK,CAACe,KAAK,CAACZ,MAAM,CAAC,EACnBH,KAAK,CAACgB,GAAG,CAAC,mBAAmB,EAAGC,CAAC,IAAKC,gBAAgB,CAACD,CAAC,CAACE,KAAK,CAAC,CAAC,EAChEnB,KAAK,CAACgB,GAAG,CAAC,eAAe,EAAGC,CAAC,KAAM;EAAE,cAAc,EAAEA,CAAC,CAACG;AAAE,CAAE,CAAC,CAAC,EAC7DpB,KAAK,CAACgB,GAAG,CAAC,uBAAuB,EAAGC,CAAC,KAAM;EAAE,cAAc,EAAEA,CAAC,CAACG,EAAE;EAAE,oBAAoB,EAAEH,CAAC,CAACI;AAAU,CAAE,CAAC,CAAC,EACzGrB,KAAK,CAACsB,UAAU,CACjB;AAEH,MAAMJ,gBAAgB,GAAIC,KAAoB,IAA6B;EACzE,IAAIA,KAAK,CAACI,MAAM,KAAK,CAAC,EAAE,OAAO,EAAE;EACjC,MAAM,CAACC,OAAO,EAAEC,IAAI,CAAC,GAAGC,SAAS,CAACP,KAAK,CAAC,CAAC,CAAC,CAAC;EAC3C,OAAOM,IAAI,KAAKE,SAAS,GAAG;IAAE,gBAAgB,EAAEH;EAAO,CAAE,GAAG;IAAE,gBAAgB,EAAEA,OAAO;IAAE,aAAa,EAAEC;EAAI,CAAE;AAChH,CAAC;AAED,MAAMC,SAAS,GAAIE,IAAY,IAAiD;EAC9E,MAAMC,SAAS,GAAGD,IAAI,CAACE,WAAW,CAAC,GAAG,CAAC;EACvC,IAAID,SAAS,KAAK,CAAC,CAAC,EAAE,OAAO,CAACD,IAAI,EAAED,SAAS,CAAC;EAC9C,MAAMF,IAAI,GAAGM,MAAM,CAACH,IAAI,CAACI,KAAK,CAACH,SAAS,GAAG,CAAC,CAAC,CAAC;EAC9C,OAAOE,MAAM,CAACE,SAAS,CAACR,IAAI,CAAC,GAAG,CAACG,IAAI,CAACI,KAAK,CAAC,CAAC,EAAEH,SAAS,CAAC,EAAEJ,IAAI,CAAC,GAAG,CAACG,IAAI,EAAED,SAAS,CAAC;AACtF,CAAC","ignoreList":[]}

package/dist/esm/internal/version.js

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

package/package.json

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

package/src/AggregationCursor.ts

@@ -10,7 +10,7 @@ import { pipeArguments } from "effect/Pipeable"
 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 { mongoOperation, mongoStreamOperation } from "./internal/mongo-operation.js"
 import * as MongoError from "./MongoError.js"
 
 interface AggregationCursorFields<A, I = A, R = never> {
@@ -37,7 +37,7 @@ export const toArray = <A, I, R>(
 ): Effect.Effect<Array<A>, MongoError.MongoError | ParseResult.ParseError, R> => {
   const decode = Schema.decodeUnknown(cursor.schema)
   return Effect.promise(() => cursor.cursor.toArray()).pipe(
-    Effect.catchAllDefect(mongoErrorOrDie(errorSource(cursor, "toArray"))),
+    mongoOperation(errorSource(cursor, "toArray")),
     Effect.flatMap(Effect.forEach((x) => decode(x)))
   )
 }
@@ -48,14 +48,14 @@ export const toStream = <A, I, R>(
   const decode = Schema.decodeUnknown(cursor.schema)
   return F.pipe(
     Stream.fromAsyncIterable(cursor.cursor, F.identity),
-    Stream.catchAll(mongoErrorOrDie(errorSource(cursor, "toStream"))),
+    mongoStreamOperation(errorSource(cursor, "toStream")),
     Stream.mapEffect((x) => decode(x))
   )
 }
 
 const errorSource = <A, I, R>(cursor: AggregationCursor<A, I, R>, functionName: string) =>
   new MongoError.CollectionErrorSource({
-    module: AggregationCursorImpl.name,
+    module: "AggregationCursor",
     functionName,
     db: cursor.cursor.namespace.db,
     collection: cursor.cursor.namespace.collection ?? "NO_COLLECTION_NAME"

package/src/Collection.ts

@@ -44,7 +44,7 @@ import type { AnyBulkWriteOperation as AnyBulkWriteOperation_ } from "./internal
 import { encodeBulkWriteOperation } from "./internal/bulk-write-operation.js"
 import type { Filter as Filter_ } from "./internal/filter.js"
 import type { ModifyResult } from "./internal/modify-result.js"
-import { mongoErrorOrDie } from "./internal/mongo-error.js"
+import { mongoOperation } from "./internal/mongo-operation.js"
 import * as SchemaExt from "./internal/schema.js"
 import * as MongoError from "./MongoError.js"
 
@@ -94,7 +94,9 @@ export const find: {
     options?: FindOptions
   ): FindCursor.FindCursor<A, I, R> =>
     new FindCursor.FindCursorImpl<A, I, R>({
-      cursor: collection.collection.find(filter ?? {}, options),
+      collection: collection.collection,
+      filter: filter ?? {},
+      options: options ?? {},
       schema: collection.schema
     })
 )
@@ -119,7 +121,7 @@ export const findOne: {
       const value = yield* Effect.promise(() => collection.collection.findOne(filter, options))
       return yield* SchemaExt.decodeNullableDocument(collection.schema, value)
     }).pipe(
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "findOne")))
+      mongoOperation(errorSource(collection, "findOne"))
     )
 )
 
@@ -140,7 +142,7 @@ export const insertOne: {
   F.pipe(
     collection.encode(doc),
     Effect.flatMap((doc) => Effect.promise(() => collection.collection.insertOne(doc, options))),
-    Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "insertOne")))
+    mongoOperation(errorSource(collection, "insertOne"))
   ))
 
 export const insertMany: {
@@ -161,7 +163,7 @@ export const insertMany: {
     docs,
     Effect.forEach((doc) => collection.encode(doc)),
     Effect.flatMap((docs) => Effect.promise(() => collection.collection.insertMany(docs, options))),
-    Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "insertMany")))
+    mongoOperation(errorSource(collection, "insertMany"))
   )
 })
 
@@ -182,7 +184,7 @@ export const deleteOne: {
     options?: DeleteOptions
   ): Effect.Effect<DeleteResult, MongoError.MongoError, R> =>
     Effect.promise(() => collection.collection.deleteOne(filter, options)).pipe(
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "deleteOne")))
+      mongoOperation(errorSource(collection, "deleteOne"))
     )
 )
 
@@ -203,7 +205,7 @@ export const deleteMany: {
     options?: DeleteOptions
   ): Effect.Effect<DeleteResult, MongoError.MongoError, R> =>
     Effect.promise(() => collection.collection.deleteMany(filter, options)).pipe(
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "deleteMany")))
+      mongoOperation(errorSource(collection, "deleteMany"))
     )
 )
 
@@ -235,7 +237,7 @@ export const updateOne: {
         Array.isArray(update) ? [...update] : update as UpdateFilter<Document>,
         options
       )
-    ).pipe(Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "updateOne"))))
+    ).pipe(mongoOperation(errorSource(collection, "updateOne")))
 )
 
 export const updateMany: {
@@ -266,7 +268,7 @@ export const updateMany: {
         Array.isArray(update) ? [...update] : update as UpdateFilter<Document>,
         options
       )
-    ).pipe(Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "updateMany"))))
+    ).pipe(mongoOperation(errorSource(collection, "updateMany")))
 )
 
 export const replaceOne: {
@@ -300,7 +302,7 @@ export const replaceOne: {
       Effect.flatMap((replacement) =>
         Effect.promise(() => collection.collection.replaceOne(filter, replacement, options))
       ),
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "replaceOne")))
+      mongoOperation(errorSource(collection, "replaceOne"))
     )
 )
 
@@ -371,9 +373,7 @@ export const findOneAndReplace: {
           return yield* SchemaExt.decodeNullableDocument(collection.schema, value)
         })
       ),
-      Effect.catchAllDefect(
-        mongoErrorOrDie(errorSource(collection, "findOneAndReplace"))
-      )
+      mongoOperation(errorSource(collection, "findOneAndReplace"))
     )
 )
 
@@ -455,9 +455,7 @@ export const findOneAndUpdate: {
           return yield* SchemaExt.decodeNullableDocument(collection.schema, value)
         })
       ),
-      Effect.catchAllDefect(
-        mongoErrorOrDie(errorSource(collection, "findOneAndUpdate"))
-      )
+      mongoOperation(errorSource(collection, "findOneAndUpdate"))
     )
 )
 
@@ -482,7 +480,7 @@ export const rename: {
       Effect.map((newCollection) =>
         new CollectionImpl<A, I, R>({ collection: newCollection, schema: collection.schema })
       ),
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "rename")))
+      mongoOperation(errorSource(collection, "rename"))
     )
 )
 
@@ -502,7 +500,7 @@ export const drop: {
   ): Effect.Effect<boolean, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.drop(options)),
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "drop")))
+      mongoOperation(errorSource(collection, "drop"))
     )
 )
 
@@ -527,7 +525,7 @@ export const createIndexes: {
   ): Effect.Effect<Array<string>, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.createIndexes([...indexSpecs], options)),
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "createIndexes")))
+      mongoOperation(errorSource(collection, "createIndexes"))
     )
 )
 
@@ -549,7 +547,7 @@ export const createIndex: {
   ): Effect.Effect<string, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.createIndex(indexSpec, options)),
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "createIndex")))
+      mongoOperation(errorSource(collection, "createIndex"))
     )
 )
 
@@ -571,7 +569,7 @@ export const dropIndex: {
   ): Effect.Effect<Document, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.dropIndex(indexName, options)),
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "dropIndex")))
+      mongoOperation(errorSource(collection, "dropIndex"))
     )
 )
 
@@ -591,7 +589,7 @@ export const dropIndexes: {
   ): Effect.Effect<boolean, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.dropIndexes(options)),
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "dropIndexes")))
+      mongoOperation(errorSource(collection, "dropIndexes"))
     )
 )
 
@@ -639,7 +637,7 @@ export const estimatedDocumentCount: {
   ): Effect.Effect<number, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.estimatedDocumentCount(options)),
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "estimatedDocumentCount")))
+      mongoOperation(errorSource(collection, "estimatedDocumentCount"))
     )
 )
 
@@ -661,7 +659,7 @@ export const countDocuments: {
   ): Effect.Effect<number, MongoError.MongoError, R> =>
     F.pipe(
       Effect.promise(() => collection.collection.countDocuments(filter, options)),
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "countDocuments")))
+      mongoOperation(errorSource(collection, "countDocuments"))
     )
 )
 
@@ -688,7 +686,7 @@ export const bulkWrite: {
       operations,
       Effect.forEach((op) => encodeBulkWriteOperation(collection.schema, op)),
       Effect.flatMap((operations) => Effect.promise(() => collection.collection.bulkWrite(operations, options))),
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(collection, "bulkWrite")))
+      mongoOperation(errorSource(collection, "bulkWrite"))
     )
 )
 
@@ -699,7 +697,7 @@ const errorSource = <A extends Document, I extends Document = A, R = never>(
   functionName: string
 ) =>
   new MongoError.CollectionErrorSource({
-    module: CollectionImpl.name,
+    module: "Collection",
     functionName,
     db: collection.collection.dbName,
     collection: collection.collection.collectionName

package/src/Db.ts

@@ -8,7 +8,7 @@ import type * as Schema from "effect/Schema"
 import type { Db as Db_, Document, DropCollectionOptions, ListCollectionsOptions } from "mongodb"
 import type * as Collection from "./Collection.js"
 import * as DocumentCollection from "./DocumentCollection.js"
-import { mongoErrorOrDie } from "./internal/mongo-error.js"
+import { mongoOperation } from "./internal/mongo-operation.js"
 import * as ListCollectionsCursor from "./ListCollectionsCursor.js"
 import * as MongoError from "./MongoError.js"
 
@@ -82,7 +82,7 @@ export const dropCollection: {
   (db: Db, name: string, options?: DropCollectionOptions): Effect.Effect<boolean, MongoError.MongoError> =>
     F.pipe(
       Effect.promise(() => db.db.dropCollection(name, options)),
-      Effect.catchAllDefect(mongoErrorOrDie(errorSource(db, "dropCollection")))
+      mongoOperation(errorSource(db, "dropCollection"))
     )
 )
 

package/src/DocumentAggregationCursor.ts

@@ -8,7 +8,7 @@ import type { Pipeable } from "effect/Pipeable"
 import { pipeArguments } from "effect/Pipeable"
 import * as Stream from "effect/Stream"
 import type { AggregationCursor as MongoAggregationCursor, Document } from "mongodb"
-import { mongoErrorOrDie } from "./internal/mongo-error.js"
+import { mongoOperation, mongoStreamOperation } from "./internal/mongo-operation.js"
 import * as MongoError from "./MongoError.js"
 
 type DocumentAggregationCursorFields = { cursor: MongoAggregationCursor<Document> }
@@ -32,7 +32,7 @@ export const toArray = (
 ): Effect.Effect<Array<Document>, MongoError.MongoError> =>
   F.pipe(
     Effect.promise(() => cursor.cursor.toArray()),
-    Effect.catchAllDefect(mongoErrorOrDie(errorSource(cursor, "toArray")))
+    mongoOperation(errorSource(cursor, "toArray"))
   )
 
 export const toStream = (
@@ -40,12 +40,12 @@ export const toStream = (
 ): Stream.Stream<Document, MongoError.MongoError> =>
   F.pipe(
     Stream.fromAsyncIterable(cursor.cursor, F.identity),
-    Stream.catchAll(mongoErrorOrDie(errorSource(cursor, "toStream")))
+    mongoStreamOperation(errorSource(cursor, "toStream"))
   )
 
 const errorSource = (cursor: DocumentAggregationCursor, functionName: string) =>
   new MongoError.CollectionErrorSource({
-    module: DocumentAggregationCursorImpl.name,
+    module: "DocumentAggregationCursor",
     functionName,
     db: cursor.cursor.namespace.db,
     collection: cursor.cursor.namespace.collection ?? "NO_COLLECTION_NAME"