monastery 3.0.6 → 3.0.8

package/changelog.md

@@ -2,6 +2,10 @@
 
 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.
 
+### [3.0.8](https://github.com/boycce/monastery/compare/3.0.7...3.0.8) (2024-04-30)
+
+### [3.0.7](https://github.com/boycce/monastery/compare/3.0.5...3.0.7) (2024-04-29)
+
 ### [3.0.6](https://github.com/boycce/monastery/compare/3.0.5...3.0.6) (2024-04-29)
 
 ### [3.0.5](https://github.com/boycce/monastery/compare/3.0.4...3.0.5) (2024-04-29)

package/docs/readme.md

@@ -92,6 +92,7 @@ You can view MongoDB's [compatibility table here](https://www.mongodb.com/docs/d
   - db._client moved to db.client
   - db._db moved to db.db
   - db.catch/then() moved to db.onError/db.onOpen()
+  - next() is now redundant when returning promises from hooks, e.g. `afterFind: [async (data) => {...}]`
 
 ## Roadmap
 

package/lib/collection.js

@@ -114,7 +114,7 @@ Collection.prototype.drop = async function () {
     await this.col.drop()
     // this.col = null
   } catch (err) {
-    if (err?.message == 'ns not found') return 'ns not found'
+    if ((err||{}).message == 'ns not found') return 'ns not found'
     throw err
   }
 }
@@ -186,7 +186,7 @@ Collection.prototype.find = async function (query, opts) {
 Collection.prototype.findOne = async function (query, opts) {
   const args = await this._middleware({ query, opts })
   const docs = await this.col.find(args.query, args.opts).limit(1).toArray()
-  return docs?.[0] || null
+  return (docs||{})[0] || null
 }
 
 Collection.prototype.findOneAndDelete = async function (query, opts) {
@@ -202,10 +202,10 @@ Collection.prototype.findOneAndUpdate = async function (query, update, opts) {
   const args = await this._middleware({ query, update, opts })
   let method = 'findOneAndUpdate'
 
-  if (typeof args.opts?.returnDocument === 'undefined') {
+  if (typeof (args.opts||{}).returnDocument === 'undefined') {
     args.opts.returnDocument = 'after'
   }
-  if (typeof args.opts?.returnOriginal !== 'undefined') {
+  if (typeof (args.opts||{}).returnOriginal !== 'undefined') {
     this.manager.warn('The `returnOriginal` option is deprecated, use `returnDocument` instead.')
     args.opts.returnDocument = args.opts.returnOriginal ? 'before' : 'after'
   }
@@ -230,7 +230,7 @@ Collection.prototype.indexInformation = async function (opts) {
     return await this.col.indexInformation(args.opts)
   } catch (e) {
     // col.indexInformation() throws an error if the collection is created yet...
-    if (e?.message.match(/ns does not exist/)) return {}
+    if ((e||{}).message.match(/ns does not exist/)) return {}
     else throw new Error(e)
   } 
 }
@@ -241,7 +241,7 @@ Collection.prototype.indexes = async function (opts) {
     return await this.col.indexes(args.opts)
   } catch (e) {
     // col.indexes() throws an error if the collection is created yet...
-    if (e?.message.match(/ns does not exist/)) return []
+    if ((e||{}).message.match(/ns does not exist/)) return []
     else throw new Error(e)
   } 
 }
@@ -317,7 +317,7 @@ Collection.prototype.update = async function (query, update, opts) {
   }
 
   const doc = await this.col[method](args.query, args.update, args.opts)
-  // return doc?.result || doc
+  // return (doc||{}).result || doc
   return doc
 }
 

package/lib/index.js

@@ -159,8 +159,8 @@ Manager.prototype.get = function(name, options) {
    * @param {Object} [options] - options to pass to the collection
    * @return {MongoDB Collection}
    */
-  if (!this.collections[name] || options?.cache === false) {
-    delete options?.cache
+  if (!this.collections[name] || (options||{}).cache === false) {
+    delete (options||{}).cache
     this.collections[name] = new Collection(this, name, options)
   }
   return this.collections[name]

package/lib/model.js

@@ -263,7 +263,7 @@ Model.prototype._setupIndexes = async function(fields, opts={}) {
   let textIndex = { name: 'text', key: {} }
 
   // No db defined
-  if (!model.manager?._state?.match(/^open/)) {
+  if (!((model.manager||{})._state||{}).match(/^open/)) {
     throw new Error(`Skipping createIndex on the '${model.name||''}' model, no mongodb connection found.`)
   }
 

package/lib/util.js

@@ -328,8 +328,9 @@ module.exports = {
           console.error(`Monastery ${info} error: you cannot return a promise AND call next()`)
           return
         }
+        current++
         results.push(result)
-        if (!err && ++current < tasks.length) callTask(current)
+        if (!err && current < tasks.length) callTask(current)
         else done(err)
       }
       function done(err) {
@@ -345,7 +346,7 @@ module.exports = {
         const next2 = next.bind(null, i)
         const res = tasks[i](next2)
         if (res instanceof Promise) {
-          res.then((result) => next2(null, result)).catch(next2)
+          res.then((result) => next2(null, result)).catch((e) => next2(e))
         }
       }
       

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A simple, straightforward MongoDB ODM",
   "author": "Ricky Boyce",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",

package/test/crud.js

@@ -902,6 +902,7 @@ test('hooks > async and next conflict', async () => {
     fields: { age: { type: 'number'} },
     afterFind: [
       async (data, next) => {
+        data.age = data.age + 1
         next() // should console an error for empty promise
       },
       async (data, next) => {
@@ -909,7 +910,7 @@ test('hooks > async and next conflict', async () => {
       },
     ],
   })
-  let user4 = db.model('user3', {
+  let user4 = db.model('user4', {
     fields: { age: { type: 'number'} },
     afterFind: [
       async (data, next) => {
@@ -926,10 +927,27 @@ test('hooks > async and next conflict', async () => {
       },
     ],
   })
+
+  let user5 = db.model('user5', {
+    fields: { age: { type: 'number'} },
+    afterFind: [
+      async (data, next) => {
+        const promise = Promise.reject(new Error('An async error occurred with Martin3'))
+        next(new Error('An async error occurred with Martin3'))
+        return promise
+      },
+      async (data, next) => {
+        data.age = data.age + 1 // shouldn't be reached
+      },
+    ],
+  })
+
+
   let user1Doc = await user1.insert({ data: { age: 0 } })
   let user2Doc = await user2.insert({ data: { age: 0 } })
   let user3Doc = await user3.insert({ data: { age: 0 } })
   let user4Doc = await user4.insert({ data: { age: 0 } })
+  let user5Doc = await user5.insert({ data: { age: 0 } })
 
   const logSpy = jest.spyOn(console, 'error').mockImplementation(() => {})
 
@@ -946,4 +964,7 @@ test('hooks > async and next conflict', async () => {
   await expect(user4.find({ query: user4Doc._id })).resolves.toEqual({ _id: expect.any(Object), age: 2 })
   expect(logSpy).toHaveBeenCalledWith('Monastery afterFind error: you cannot return a promise AND call next()')
 
+  await expect(user5.find({ query: user5Doc._id })).rejects.toThrow('An async error occurred with Martin3')
+  expect(logSpy).toHaveBeenCalledWith('Monastery afterFind error: you cannot return a promise AND call next()')
+
 })