assai 2.1.2 → 2.1.4

package/dist/src/usecases/mongo/transformers/object_id/index.d.mts

@@ -1,2 +1,3 @@
 export * from "./ids_into_strings.mjs";
 export * from "./strings_into_id.mjs";
+export * from "./transform_options.mjs";

package/dist/src/usecases/mongo/transformers/object_id/transform_options.d.mts

@@ -0,0 +1,12 @@
+/**
+ * Applies `stringsIntoId` to the data-bearing fields of an operation's
+ * `options`, leaving metadata and special objects untouched.
+ *
+ * Does not mutate the caller's `options`: a shallow copy is created only when a
+ * field actually changes, otherwise the original reference is returned.
+ *
+ * @template {Record<string, any> | undefined} T
+ * @param {T} options
+ * @returns {T}
+ */
+export function transformOptions<T extends Record<string, any> | undefined>(options: T): T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assai",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "repository": {
     "url": "https://github.com/TimeLord2010/assai",
     "type": "git"

package/src/usecases/mongo/operation/aggregate.mjs

@@ -1,5 +1,5 @@
 import { Collection } from 'mongodb'
-import { renameToMongoId, stringsIntoId } from '../transformers/index.mjs'
+import { renameToMongoId, stringsIntoId, transformOptions } from '../transformers/index.mjs'
 import { outputTransformer } from '../transformers/output_transformer.mjs'
 
 /**
@@ -15,6 +15,7 @@ export async function aggregate({ getCollection, pipeline, options, collectionOp
     const finalPipeline = stringsIntoId(renameToMongoId(pipeline))
 
     const col = await getCollection()
+    options = transformOptions(options)
     const docs = await col.aggregate(finalPipeline, options).toArray()
     // @ts-ignore
     return docs.map((doc) => outputTransformer({ document: doc, collectionOptions }))

package/src/usecases/mongo/operation/bulk_write.mjs

@@ -1,5 +1,5 @@
 import { Collection } from 'mongodb'
-import { renameToMongoId, stringsIntoId } from '../transformers/index.mjs'
+import { renameToMongoId, stringsIntoId, transformOptions } from '../transformers/index.mjs'
 import { inputTransformer } from '../transformers/input_transformer.mjs'
 
 /**
@@ -23,10 +23,17 @@ export async function bulkWrite({ getCollection, operations, options, collection
             o.updateOne.filter = renameToMongoId(o.updateOne.filter)
             o.updateOne.filter = stringsIntoId(o.updateOne.filter)
             o.updateOne.update = stringsIntoId(o.updateOne.update)
+            // `o.updateOne` is a bulk operation descriptor, not an `options` object,
+            // but it carries `arrayFilters` at the same top level that transformOptions
+            // looks for. `filter`/`update`/`upsert` aren't data-bearing keys, so they
+            // are left untouched — this reuses the same conversion without duplicating it.
+            o.updateOne = transformOptions(o.updateOne)
         } else if (o.updateMany != null) {
             o.updateMany.filter = renameToMongoId(o.updateMany.filter)
             o.updateMany.filter = stringsIntoId(o.updateMany.filter)
             o.updateMany.update = stringsIntoId(o.updateMany.update)
+            // See the note above: same reuse of transformOptions on the operation descriptor.
+            o.updateMany = transformOptions(o.updateMany)
         } else if (o.deleteOne != null) {
             o.deleteOne.filter = renameToMongoId(o.deleteOne.filter)
             o.deleteOne.filter = stringsIntoId(o.deleteOne.filter)

package/src/usecases/mongo/operation/find.mjs

@@ -2,7 +2,8 @@ import { Collection } from 'mongodb'
 import {
     renameFindOptions,
     renameToMongoId,
-    stringsIntoId
+    stringsIntoId,
+    transformOptions
 } from '../transformers/index.mjs'
 import { outputTransformer } from '../transformers/output_transformer.mjs'
 
@@ -19,6 +20,7 @@ import { outputTransformer } from '../transformers/output_transformer.mjs'
 export async function find({ getCollection, query, options, collectionOptions }) {
     query = renameToMongoId(query)
     options = renameFindOptions(options)
+    options = transformOptions(options)
 
     query = stringsIntoId(query)
 

package/src/usecases/mongo/operation/find_one_and_delete.mjs

@@ -1,5 +1,5 @@
 import { Collection } from 'mongodb'
-import { renameToMongoId, stringsIntoId } from '../transformers/index.mjs'
+import { renameToMongoId, stringsIntoId, transformOptions } from '../transformers/index.mjs'
 import { outputTransformer } from '../transformers/output_transformer.mjs'
 
 /**
@@ -16,6 +16,8 @@ export async function findOneAndDelete({ query, options, collectionOptions, getC
     query = stringsIntoId(query)
     const col = await getCollection()
 
+    options = transformOptions(options)
+
     const doc = await col.findOneAndDelete(query, options ?? {})
     if (doc == null) return null
 

package/src/usecases/mongo/operation/find_one_and_replace.mjs

@@ -1,5 +1,5 @@
 import { Collection } from 'mongodb'
-import { renameToMongoId, stringsIntoId } from '../transformers/index.mjs'
+import { renameToMongoId, stringsIntoId, transformOptions } from '../transformers/index.mjs'
 import { outputTransformer } from '../transformers/output_transformer.mjs'
 
 /**
@@ -17,6 +17,8 @@ export async function findOneAndReplace({ query, replacement, options, collectio
     query = stringsIntoId(query)
     const col = await getCollection()
 
+    options = transformOptions(options)
+
     const doc = await col.findOneAndReplace(query, replacement, options ?? {})
     if (doc == null) return null
 

package/src/usecases/mongo/operation/find_one_and_update.mjs

@@ -1,5 +1,5 @@
 import { Collection } from 'mongodb'
-import { renameToMongoId, stringsIntoId } from '../transformers/index.mjs'
+import { renameToMongoId, stringsIntoId, transformOptions } from '../transformers/index.mjs'
 import { outputTransformer } from '../transformers/output_transformer.mjs'
 
 /**
@@ -33,6 +33,8 @@ export async function findOneAndUpdate({ query, update, options, collectionOptio
         }
     }
 
+    options = transformOptions(options)
+
     const doc = await col.findOneAndUpdate(query, update, options ?? {})
     if (doc == null) return null
 

package/src/usecases/mongo/operation/insert_many.mjs

@@ -1,5 +1,6 @@
 import { Collection, ObjectId } from 'mongodb'
 import { inputTransformer } from '../transformers/input_transformer.mjs'
+import { outputTransformer } from '../transformers/output_transformer.mjs'
 
 /**
  * @template {import('../../../types.js').MongoDocument} T
@@ -30,11 +31,16 @@ export async function insertMany({ docs, collectionOptions, getCollection }) {
     let { insertedIds } = result
     const indexes = Object.keys(insertedIds)
     for (const index of indexes) {
+        // @ts-ignore
         const id = insertedIds[index]
         if (id instanceof ObjectId) {
+            // @ts-ignore
             docs[index].id = id.toHexString()
         }
     }
-    // @ts-ignore
-    return docs
+    return docs.map(doc => outputTransformer({
+        // @ts-ignore
+        document: doc,
+        collectionOptions
+    }))
 }

package/src/usecases/mongo/operation/insert_one.mjs

@@ -1,5 +1,6 @@
 import { Collection, ObjectId } from 'mongodb'
 import { inputTransformer } from '../transformers/input_transformer.mjs'
+import { outputTransformer } from '../transformers/output_transformer.mjs'
 
 /**
  * @template {import('../../../types.js').MongoDocument} T
@@ -26,8 +27,12 @@ export async function insertOne({ doc, collectionOptions, getCollection }) {
         id = id.toHexString()
     }
 
-    delete doc._id
-
     // @ts-ignore
-    return { id, ...doc }
+    doc.id = id
+
+    return outputTransformer({
+        // @ts-ignore
+        document: doc,
+        collectionOptions,
+    })
 }

package/src/usecases/mongo/operation/update_many.mjs

@@ -1,5 +1,5 @@
 import { Collection } from 'mongodb'
-import { renameToMongoId, stringsIntoId } from '../transformers/index.mjs'
+import { renameToMongoId, stringsIntoId, transformOptions } from '../transformers/index.mjs'
 
 /**
  * @template {import('../../../types.js').MongoDocument} T
@@ -34,6 +34,8 @@ export async function updateMany({ query, update, options, collectionOptions, ge
         }
     }
 
+    options = transformOptions(options)
+
     const col = await getCollection()
     const r = await col.updateMany(query, update, options)
     return r

package/src/usecases/mongo/operation/update_one.mjs

@@ -1,5 +1,5 @@
 import { Collection } from 'mongodb'
-import { renameToMongoId, stringsIntoId } from '../transformers/index.mjs'
+import { renameToMongoId, stringsIntoId, transformOptions } from '../transformers/index.mjs'
 
 /**
  * @template {import('../../../types.js').MongoDocument} T
@@ -36,6 +36,8 @@ export async function updateOne({ query, update, options, collectionOptions, get
         }
     }
 
+    options = transformOptions(options)
+
     const r = await col.updateOne(query, update, options)
     return r.matchedCount > 0
 }

package/src/usecases/mongo/transformers/index.mjs

@@ -1,2 +1,2 @@
 export * from './id/index.mjs'
-export * from './object_id/index.mjs'
+export * from './object_id/index.mjs'

package/src/usecases/mongo/transformers/object_id/index.mjs

@@ -1,4 +1,5 @@
 export * from './ids_into_strings.mjs'
 export * from './strings_into_id.mjs'
+export * from './transform_options.mjs'
 
 // Contains usecases related to the value ObjectId.

package/src/usecases/mongo/transformers/object_id/transform_options.mjs

@@ -0,0 +1,52 @@
+import { stringsIntoId } from './strings_into_id.mjs'
+
+/**
+ * Option fields that carry actual data values (documents/queries that may
+ * contain ObjectId hex-strings), as opposed to metadata like sort directions,
+ * index names or write concerns. These are the only fields that need the same
+ * hex-string → `ObjectId` conversion applied to `query` and `update`.
+ *
+ * - `arrayFilters`: filters referencing filtered positional operators.
+ * - `let`: variables accessible via `$$var` in `$expr`/pipeline updates.
+ * - `min`/`max`: inclusive/exclusive index bounds (find only).
+ * - `projection`: normally inclusion/exclusion flags, but may embed a query
+ *   through operators like `$elemMatch`.
+ *
+ * Fields such as `session` (`ClientSession`), `signal` (`AbortSignal`),
+ * `readPreference` and `writeConcern` are deliberately left out: `stringsIntoId`
+ * only preserves `Date`, so recursing into those class instances would deep-clone
+ * them into plain objects and break them. Scoping to data-bearing keys keeps the
+ * conversion safe.
+ */
+const DATA_BEARING_KEYS = ['arrayFilters', 'let', 'min', 'max', 'projection']
+
+/**
+ * Applies `stringsIntoId` to the data-bearing fields of an operation's
+ * `options`, leaving metadata and special objects untouched.
+ *
+ * Does not mutate the caller's `options`: a shallow copy is created only when a
+ * field actually changes, otherwise the original reference is returned.
+ *
+ * @template {Record<string, any> | undefined} T
+ * @param {T} options
+ * @returns {T}
+ */
+export function transformOptions(options) {
+    if (options == null) return options
+
+    let result = options
+    for (const key of DATA_BEARING_KEYS) {
+        const value = options[key]
+        if (value == null) continue
+
+        const transformed = stringsIntoId(value)
+        if (transformed !== value) {
+            if (result === options) {
+                result = { ...options }
+            }
+            result[key] = transformed
+        }
+    }
+
+    return result
+}