monastery 1.32.1 → 1.32.4

package/changelog.md

@@ -2,6 +2,22 @@
 
 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.32.4](https://github.com/boycce/monastery/compare/1.32.3...1.32.4) (2022-03-07)
+
+### [1.32.3](https://github.com/boycce/monastery/compare/1.32.2...1.32.3) (2022-03-07)
+
+
+### Bug Fixes
+
+* fileSize warning ([3824b23](https://github.com/boycce/monastery/commit/3824b23883fad508e081d2a2bce1c340ec2775dc))
+
+### [1.32.2](https://github.com/boycce/monastery/compare/1.32.1...1.32.2) (2022-03-04)
+
+
+### Bug Fixes
+
+* missing original non-validated this.data in beforeUpdate ([4b4002d](https://github.com/boycce/monastery/commit/4b4002d3d4d2609025cbb22cacecf948252be38b))
+
 ### [1.32.1](https://github.com/boycce/monastery/compare/1.32.0...1.32.1) (2022-03-01)
 
 

package/lib/model-crud.js

@@ -28,11 +28,11 @@ module.exports = {
       ])
 
       // Validate
-      opts.data = await this.validate(opts.data||{}, { ...opts })
+      let data = await this.validate(opts.data||{}, { ...opts })
 
       // Insert
-      await util.runSeries(this.beforeInsert.map(f => f.bind(opts, opts.data)))
-      let response = await this._insert(opts.data, options)
+      await util.runSeries(this.beforeInsert.map(f => f.bind(opts, data)))
+      let response = await this._insert(data, options)
       await util.runSeries(this.afterInsert.map(f => f.bind(opts, response)))
 
       // Success/error
@@ -193,31 +193,32 @@ module.exports = {
     }
     try {
       opts = await this._queryObject(opts, 'update')
+      let data = opts.data
       let response = null
       let operators = util.pluck(opts, [/^\$/])
       let options = util.omit(opts, ['data', 'query', 'respond', 'validateUndefined', 'skipValidation', 'blacklist'])
 
       // Validate
-      if (util.isDefined(opts.data)) opts.data = await this.validate(opts.data, { ...opts })
-      if (!util.isDefined(opts.data) && util.isEmpty(operators)) {
+      if (util.isDefined(data)) data = await this.validate(opts.data, { ...opts })
+      if (!util.isDefined(data) && util.isEmpty(operators)) {
         throw new Error(`Please pass an update operator to ${this.name}.update(), e.g. data, $unset, etc`)
       }
-      if (util.isDefined(opts.data) && (!opts.data || util.isEmpty(opts.data))) {
+      if (util.isDefined(data) && (!data || util.isEmpty(data))) {
         throw new Error(`No valid data passed to ${this.name}.update({ data: .. })`)
       }
-      // Hook: beforeUpdate
-      await util.runSeries(this.beforeUpdate.map(f => f.bind(opts, opts.data||{})))
-      if (opts.data && operators['$set']) {
+      // Hook: beforeUpdate (has access to original, non-validated opts.data)
+      await util.runSeries(this.beforeUpdate.map(f => f.bind(opts, data||{})))
+      if (data && operators['$set']) {
         this.warn(`'$set' fields take precedence over the data fields for \`${this.name}.update()\``)
       }
-      if (opts.data || operators['$set']) {
-        operators['$set'] = { ...opts.data, ...(operators['$set'] || {}) }
+      if (data || operators['$set']) {
+        operators['$set'] = { ...data, ...(operators['$set'] || {}) }
       }
       // Update
       let update = await this._update(opts.query, operators, options)
       if (update.n) response = Object.assign(Object.create({ _output: update }), operators['$set']||{})
 
-      // Hook: afterUpdate
+      // Hook: afterUpdate (doesn't have access to validated data)
       if (update.n) await util.runSeries(this.afterUpdate.map(f => f.bind(opts, response)))
 
       // Success

package/lib/model-validate.js

@@ -291,7 +291,7 @@ module.exports = {
 
   _ignoredRules: [ // todo: change name? i.e. 'specialFields'
     // Need to remove filesize and formats..
-    'default', 'defaultOverride', 'filename', 'filesize', 'formats', 'image', 'index', 'insertOnly',
+    'default', 'defaultOverride', 'filename', 'filesize', 'fileSize', 'formats', 'image', 'index', 'insertOnly',
     'model', 'nullObject', 'params', 'getSignedUrl', 'timestampField', 'type', 'virtual'
   ]
 

package/package.json

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

package/test/crud.js

@@ -3,6 +3,7 @@
 module.exports = function(monastery, opendb) {
 
   test('basic operator calls', async () => {
+    // Todo: take out and group query/id parsing tests
     let db = (await opendb(null)).db
     let user = db.model('user', {
       fields: {
@@ -53,20 +54,23 @@ module.exports = function(monastery, opendb) {
     let find6 = await user.find(inserted2[0]._id.toString())
     expect(find6).toEqual({ _id: inserted2[0]._id, name: 'Martin Luther1' })
 
-    // Missing parameters
-    await expect(user.find()).rejects.toThrow('Please pass an object or MongoId to options.query')
-    await expect(user.find(undefined)).rejects.toThrow('Please pass an object or MongoId to options.query')
-    await expect(user.find({})).rejects.toThrow('Please pass an object or MongoId to options.query')
-    await expect(user.find({ query: null })).rejects.toThrow('Please pass an object or MongoId to options.query')
-    await expect(user.find({ query: undefined })).rejects.toThrow('Please pass an object or MongoId to options.query')
-    await expect(user.find({ query: { _id: undefined }}))
-      .rejects.toThrow('Please pass an object or MongoId to options.query')
-    await expect(user.find(1)).rejects.toThrow('Please pass an object or MongoId to options.query')
-
-    // Bad MongoID
-    await expect(user.find({ query: '' })).resolves.toEqual(null)
-    await expect(user.find('bad-id')).resolves.toEqual(null)
+    // Bad ids
+    let badIdOrQuery = 'Please pass an object or MongoId to options.query'
+    await expect(user.find()).rejects.toThrow(badIdOrQuery)
+    await expect(user.find(1)).rejects.toThrow(badIdOrQuery)
+    await expect(user.find(null)).rejects.toThrow(badIdOrQuery)
+    await expect(user.find(undefined)).rejects.toThrow(badIdOrQuery)
+    await expect(user.find({})).rejects.toThrow(badIdOrQuery)
+    await expect(user.find({ query: null })).rejects.toThrow(badIdOrQuery)
+    await expect(user.find({ query: undefined })).rejects.toThrow(badIdOrQuery)
+    await expect(user.find({ query: { _id: undefined }})).rejects.toThrow(badIdOrQuery)
+
+    // Parseable
     await expect(user.find('')).resolves.toEqual(null)
+    await expect(user.find('invalid-id')).resolves.toEqual(null)
+    await expect(user.find({ query: '' })).resolves.toEqual(null)
+    await expect(user.find({ query: { _id: '' }})).resolves.toEqual(null)
+    await expect(user.find({ query: { _id: null }})).resolves.toEqual([]) // should throw error
 
     // FindOne (query id)
     let findOne = await user.findOne({ query: inserted._id })
@@ -516,6 +520,26 @@ module.exports = function(monastery, opendb) {
       last: 'Luther'
     })
 
+    // beforeUpdate/beforeInsert should have access to the original non-validated data
+    let user2 = db.model('user2', {
+      fields: {
+        first: { type: 'string' },
+      },
+      beforeInsert: [function (data, next) {
+        if (this.data.bad === true && !data.bad) next(new Error('error1'))
+        else next()
+      }],
+      beforeUpdate: [function (data, next) {
+        if (this.data.bad === true && !data.bad) next(new Error('error2'))
+        else next()
+      }],
+    })
+    let userDoc2 = await user2._insert({ first: 'M' })
+    await expect(user2.insert({ data: { first: 'M' } })).resolves.toMatchObject({ first: 'M' })
+    await expect(user2.insert({ data: { first: 'M', bad: true } })).rejects.toThrow('error1')
+    await expect(user2.update({ query: userDoc2._id, data: { first: 'M',  } })).resolves.toEqual({ first: 'M' })
+    await expect(user2.update({ query: userDoc2._id, data: { first: 'M', bad: true } })).rejects.toThrow('error2')
+
     db.close()
   })
 

package/test/plugin-images.js

@@ -417,7 +417,7 @@ module.exports = function(monastery, opendb) {
         imageSvgBad:  { type: 'image' },
         imageSvgGood: { type: 'image', formats: ['svg'] },
         imageSvgAny:  { type: 'image', formats: ['any'] },
-        imageSize1:   { type: 'image', fileSize: 1000 * 100 },
+        imageSize1:   { type: 'image', filesize: 1000 * 100 },
         imageSize2:   { type: 'image' },
       }})