monastery 1.37.0 → 1.37.1

package/changelog.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.37.1](https://github.com/boycce/monastery/compare/1.37.0...1.37.1) (2022-06-13)
+
+
+### Bug Fixes
+
+* add _id to upserted document ([a78512f](https://github.com/boycce/monastery/commit/a78512f16b39422160756fe91ef4d4a3239f5890))
+
 ## [1.37.0](https://github.com/boycce/monastery/compare/1.36.3...1.37.0) (2022-06-12)
 
 

package/lib/model-crud.js

@@ -255,7 +255,11 @@ module.exports = {
       // Update
       let update = await this['_' + type](opts.query, operators, util.omit(opts, this._queryOptions))
       if (type == 'findOneAndUpdate') response = update
-      else if (update.n) response = Object.assign(Object.create({ _output: update }), operators['$set']||{})
+      else if (update.n) response = Object.assign(
+        Object.create({ _output: update }),
+        operators['$set'] || {},
+        (update.upserted||[])[0] ? { _id: update.upserted[0]._id } : {},
+      )
 
       // Hook: afterUpdate (doesn't have access to validated data)
       if (response) await util.runSeries(this.afterUpdate.map(f => f.bind(opts, response)))

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A straight forward MongoDB ODM built around Monk",
   "author": "Ricky Boyce",
-  "version": "1.37.0",
+  "version": "1.37.1",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",

package/test/crud.js

@@ -201,6 +201,15 @@ module.exports = function(monastery, opendb) {
         name: 'Martin Luther3'
       }
     ])
+
+    // Upsert
+    let newId = db.id()
+    await expect(user.update({ query: newId, data: { name: 'Martin Luther3' }, upsert: true }))
+      .resolves.toEqual({ _id: newId, name: 'Martin Luther3' }) // inserted
+
+    await expect(user.update({ query: inserted._id, data: { name: 'Martin Luther4' }, upsert: true }))
+      .resolves.toEqual({ name: 'Martin Luther4' }) // updated
+
     db.close()
   })