monastery 1.31.6 → 1.32.1

package/changelog.md

@@ -2,11 +2,34 @@
 
 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.1](https://github.com/boycce/monastery/compare/1.32.0...1.32.1) (2022-03-01)
+
+
+### Bug Fixes
+
+* processAfterFind bug ([3183b79](https://github.com/boycce/monastery/commit/3183b79fc288665000b63e0221fbe8acf6f482aa))
+
+## [1.32.0](https://github.com/boycce/monastery/compare/1.31.7...1.32.0) (2022-02-28)
+
+
+### Features
+
+* added getSignedUrl(s) ([3552a4d](https://github.com/boycce/monastery/commit/3552a4d0b21c192a256a590e3ac1cb48b31c6564))
+* added image optiosn filename, and params ([353b2f0](https://github.com/boycce/monastery/commit/353b2f09ed429a5cd8d74a3b2e94493650fb52e4))
+
+### [1.31.7](https://github.com/boycce/monastery/compare/1.31.6...1.31.7) (2022-02-28)
+
+
+### Bug Fixes
+
+* refactored crud ops ([e7f3f78](https://github.com/boycce/monastery/commit/e7f3f784e123e4a66586a4d9e733d5cac477b98b))
+
 ### [1.31.6](https://github.com/boycce/monastery/compare/1.31.5...1.31.6) (2022-02-25)
 
 
 ### Bug Fixes
 
+* Fixed validateUndefined ([58daed1](https://github.com/boycce/monastery/commit/58daed1ca5317c061a4ddde280bf45b0a134ab30))
 * added partial unqiue index tests ([ff6f193](https://github.com/boycce/monastery/commit/ff6f1938e333407ee17895873d2b42fa5263d7e3))
 * scripts ([bc32680](https://github.com/boycce/monastery/commit/bc326809098ae24686158a0386fbbd6671d86c98))
 

package/docs/Gemfile

@@ -1,10 +1,4 @@
-# Old
-# source 'https://rubygems.org'
-# gem 'github-pages', group: :jekyll_plugins
-
-# Below pulls the latest remote_theme in development
 source 'https://rubygems.org'
-gem "github-docs", git: "https://github.com/boycce/github-docs"
-group :jekyll_plugins do
-  gem "jekyll-remote-theme", "~> 0.4.2"
-end
+
+# Development (strict gem versions used)
+gem 'github-pages', group: :jekyll_plugins

package/docs/_config.yml

@@ -2,6 +2,7 @@ remote_theme: boycce/github-docs
 title: Monastery
 description: A straight forward MongoDB ODM built upon MonkJS
 github_url: "https://github.com/boycce/monastery"
+port: 4001
 basedir: "docs"
 
 # Aux links for the naviation.

package/docs/image-plugin.md

@@ -26,9 +26,12 @@ Then in your model schema, e.g.
 ```js
 let user = db.model('user', { fields: {
   logo:  {
-    type: 'image',
-    formats: ['bmp', 'gif', 'jpg', 'jpeg', 'png', 'tiff'], // optional plugin rule
-    fileSize: 1000 * 1000 * 5 // optional plugin rule, size in bytes
+    type: 'image', // required
+    formats: ['bmp', 'gif', 'jpg', 'jpeg', 'png', 'tiff'],
+    filename: 'avatar',
+    filesize: 1000 * 1000 * 5, // max size in bytes
+    getSignedUrl: true, // get a s3 signed url after every `find()` operation (can be overridden per request)
+    params: {}, // upload params, https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#upload-property
   },
   logos: [{
     type: 'image'
@@ -61,4 +64,3 @@ user.update({
 Due to known limitations, we are inaccurately able to validate non-binary file types (e.g. txt, svg) before uploading to S3, and rely on their file processing to remove any malicious files.
 
 ...to be continued
-

package/docs/model/find.md

@@ -15,6 +15,7 @@ Find document(s) in a collection and call related hook: `schema.afterFind`
 - [[`options.populate`](#populate)] *(array)*
 - [`options.sort`] *(string\|array\|object)*: same as the mongodb option, but allows string parsing e.g. 'name', 'name:1'
 - [`options.blacklist`] *(array\|string\|false)*: augment `schema.findBL`. `false` will remove all blacklisting
+- [`options.getSignedUrls`] *(boolean)*: get signed urls for all image objects
 - [`options.project`] *(string\|array\|object)*: return only these fields, ignores blacklisting
 - [[`any mongodb option`](http://mongodb.github.io/node-mongodb-native/3.2/api/Collection.html#find)] *(any)*
 

package/docs/{schema.md → schema/index.md}

@@ -1,6 +1,7 @@
 ---
 title: Schema
 nav_order: 4
+has_children: true
 ---
 
 # Schema

package/docs/{rules.md → schema/rules.md}

@@ -1,6 +1,7 @@
 ---
 title: Rules
 nav_order: 5
+parent: Schema
 ---
 
 # Validation Rules

package/lib/model-crud.js

@@ -2,7 +2,7 @@ let util = require('./util')
 
 module.exports = {
 
-  insert: function(opts, cb) {
+  insert: async function(opts, cb) {
     /**
      * Inserts document(s) with monk after validating data & before hooks.
      * @param {object} opts
@@ -18,44 +18,36 @@ module.exports = {
      * @this model
      * @return promise
      */
-    opts = opts || {}
-    opts.insert = true
-    opts.model = this
-    let req = opts.req
-    let data = opts.data = util.isDefined(opts.data)? opts.data : util.isDefined((req||{}).body) ? req.body : {}
-    let options = util.omit(opts, [
-      'data', 'insert', 'model', 'respond', 'validateUndefined', 'skipValidation', 'blacklist'
-    ])
     if (cb && !util.isFunction(cb)) {
       throw new Error(`The callback passed to ${this.name}.insert() is not a function`)
     }
-    return util.parseData(data).then(data => {
-      opts.data = data
-      return this.validate(data, { ...opts })
-
-    }).then(data => {
-      return util.runSeries(this.beforeInsert.map(f => f.bind(opts, data))).then(() => data)
-
-    }).then(data => {
-      return this._insert(data, options)
-
-    }).then(data => {
-      return util.runSeries(this.afterInsert.map(f => f.bind(opts, data))).then(() => data)
-
-    // Success/error
-    }).then(data => {
-      if (cb) cb(null, data)
-      else if (opts.req && opts.respond) opts.req.res.json(data)
-      else return Promise.resolve(data)
-
-    }).catch(err => {
+    try {
+      opts = await this._queryObject(opts, 'insert')
+      let options = util.omit(opts, [
+        'data', 'insert', 'model', 'respond', 'validateUndefined', 'skipValidation', 'blacklist'
+      ])
+
+      // Validate
+      opts.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.afterInsert.map(f => f.bind(opts, response)))
+
+      // Success/error
+      if (cb) cb(null, response)
+      else if (opts.req && opts.respond) opts.req.res.json(response)
+      else return Promise.resolve(response)
+
+    } catch (err) {
       if (cb) cb(err)
       else if (opts && opts.req && opts.respond) opts.req.res.error(err)
       else throw err
-    })
+    }
   },
 
-  find: function(opts, cb, one) {
+  find: async function(opts, cb, one) {
     /**
      * Finds document(s) with monk, also auto populates
      * @param {object} opts
@@ -69,19 +61,15 @@ module.exports = {
      * @this model
      * @return promise
      */
-    let options, lookups = []
     if (cb && !util.isFunction(cb)) {
       throw new Error(`The callback passed to ${this.name}.find() is not a function`)
     }
-    return new Promise((resolve, reject) => {
-      opts = this._queryObject(opts)
-      opts.one = one || opts.one
-      // Operation options
-      options = util.omit(opts, ['blacklist', 'one', 'populate', 'project', 'query', 'respond'])
-      options.sort = options.sort || { 'createdAt': -1 }
-      options.skip = Math.max(0, options.skip || 0)
-      options.limit = opts.one? 1 : parseInt(options.limit || this.manager.limit || 0)
+    try {
+      opts = await this._queryObject(opts, 'find', one)
+      let lookups = []
+      let options = util.omit(opts, ['blacklist', 'one', 'populate', 'project', 'query', 'respond'])
       options.addFields = options.addFields || {}
+
       // Project, or use blacklisting
       if (opts.project) {
         // Can be an inclusion or exclusion projection
@@ -105,14 +93,10 @@ module.exports = {
       //   options.projection.score = { $meta: 'textScore' }
       //   options.sort = { score: { $meta: 'textScore' }}
       // }
-      // Sort string passed
-      if (util.isString(options.sort)) {
-        let name = (options.sort.match(/([a-z0-9-_]+)/) || [])[0]
-        let order = (options.sort.match(/:(-?[0-9])/) || [])[1]
-        options.sort = { [name]: parseInt(order || 1) }
-      }
       // Wanting to populate?
-      if (opts.populate) {
+      if (!opts.populate) {
+        var response = await this[`_find${opts.one? 'One' : ''}`](opts.query, options)
+      } else {
         loop: for (let item of opts.populate) {
           let path = util.isObject(item)? item.as : item
           // Blacklisted?
@@ -148,7 +132,7 @@ module.exports = {
         }
         // console.log(1, options.projection)
         // console.log(2, lookups)
-        let aggreagte = [
+        let aggregate = [
           { $match: opts.query },
           { $sort: options.sort },
           { $skip: options.skip },
@@ -157,41 +141,37 @@ module.exports = {
           ...util.isEmpty(options.addFields)? [] : [{ $addFields: options.addFields }],
           { $project: options.projection }
         ]
-        var operation = this._aggregate.bind(this._collection, aggreagte)
-        this.info('aggregate', JSON.stringify(aggreagte))
-
-      // Normal operation
-      } else {
-        operation = this[opts.one? '_findOne' : '_find'].bind(this._collection, opts.query, options)
+        response = await this._aggregate(aggregate)
+        this.info('aggregate', JSON.stringify(aggregate))
       }
-      operation()
-        .then(data => resolve(data))
-        .catch(err => reject(err))
 
-    }).then(data => {
-      if (opts.one && util.isArray(data)) data = data[0]
+      if (opts.one && util.isArray(response)) response = response[0]
       // (Not using) Project works with lookup.
       // Remove blacklisted properties from joined models, because subpiplines with 'project' are slower
       // if (opts.populate) this._depreciated_removeBlacklisted(data, opts.populate, options.projection)
-      return this._processAfterFind(data, options.projection, opts)
+      response = await this._processAfterFind(response, options.projection, opts)
 
-    }).then(data => {
-      if (cb) cb(null, data)
-      else if (opts.req && opts.respond) opts.req.res.json(data)
-      else return Promise.resolve(data)
+      // Success
+      if (cb) cb(null, response)
+      else if (opts.req && opts.respond) opts.req.res.json(response)
+      else return Promise.resolve(response)
 
-    }).catch(err => {
+    } catch (err) {
       if (cb) cb(err)
       else if (opts && opts.req && opts.respond) opts.req.res.error(err)
       else throw err
-    })
+    }
   },
 
-  findOne: function(opts, cb) {
+  findOne: async function(opts, cb) {
     return this.find(opts, cb, true)
   },
 
-  update: function(opts, cb) {
+  // findOneAndUpdate: function(opts, cb) {
+  //   return this._findOneAndUpdate(opts, cb)
+  // },
+
+  update: async function(opts, cb) {
     /**
      * Updates document(s) with monk after validating data & before hooks.
      * @param {object} opts
@@ -208,159 +188,144 @@ module.exports = {
      * @this model
      * @return promise(data)
      */
-    let data, options, operators
     if (cb && !util.isFunction(cb)) {
       throw new Error(`The callback passed to ${this.name}.update() is not a function`)
     }
-    return new Promise((resolve, reject) => {
-      opts = this._queryObject(opts)
-      opts.update = true
-      opts.model = this
-      let req = opts.req
-      data = opts.data = util.isDefined(opts.data)? opts.data : util.isDefined((req||{}).body) ? req.body : undefined
-      operators = util.pluck(opts, [/^\$/])
-      // Operation options
-      options = util.omit(opts, ['data', 'query', 'respond', 'validateUndefined', 'skipValidation', 'blacklist'])
-      options.sort = options.sort || { 'createdAt': -1 }
-      options.limit = parseInt(options.limit || 0)
-      // Sort string passed
-      if (util.isString(options.sort)) {
-        let name = (options.sort.match(/([a-z0-9-_]+)/) || [])[0]
-        let order = (options.sort.match(/:(-?[0-9])/) || [])[1]
-        options.sort = { [name]: parseInt(order || 1) }
+    try {
+      opts = await this._queryObject(opts, 'update')
+      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)) {
+        throw new Error(`Please pass an update operator to ${this.name}.update(), e.g. data, $unset, etc`)
       }
-      util.parseData(data).then(d => resolve(d))
-
-    }).then(data => {
-      opts.data = data
-      if (util.isDefined(data)) return this.validate(data, { ...opts })
-      else return Promise.resolve(data)
-
-    }).then(data => {
-      if (util.isDefined(data) && (!data || util.isEmpty(data))) {
+      if (util.isDefined(opts.data) && (!opts.data || util.isEmpty(opts.data))) {
         throw new Error(`No valid data passed to ${this.name}.update({ data: .. })`)
       }
-      if (!util.isDefined(data) && util.isEmpty(operators)) {
-        throw new Error(`Please pass an update operator to ${this.name}.update(), e.g. data, $unset, etc`)
-      }
-      return util.runSeries(this.beforeUpdate.map(f => f.bind(opts, data||{}))).then(() => data)
-
-    }).then(data => {
-      if (data && operators['$set']) {
+      // Hook: beforeUpdate
+      await util.runSeries(this.beforeUpdate.map(f => f.bind(opts, opts.data||{})))
+      if (opts.data && operators['$set']) {
         this.warn(`'$set' fields take precedence over the data fields for \`${this.name}.update()\``)
       }
-      if (data || operators['$set']) {
-        operators['$set'] = {
-          ...data,
-          ...(operators['$set'] || {}),
-        }
+      if (opts.data || operators['$set']) {
+        operators['$set'] = { ...opts.data, ...(operators['$set'] || {}) }
       }
-      return this._update(opts.query, operators, options).then(output => {
-        if (!output.n) return null
-        let response = Object.assign(Object.create({ _output: output }), operators['$set']||{})
-        output = data = null // Cleanup (just incase)
-        return response
-      })
+      // Update
+      let update = await this._update(opts.query, operators, options)
+      if (update.n) response = Object.assign(Object.create({ _output: update }), operators['$set']||{})
 
-    }).then(data => {
-      if (!data) return data
-      return util.runSeries(this.afterUpdate.map(f => f.bind(opts, data))).then(() => data)
+      // Hook: afterUpdate
+      if (update.n) await util.runSeries(this.afterUpdate.map(f => f.bind(opts, response)))
 
-    // Success/error
-    }).then(data => {
-      if (cb) cb(null, data)
-      else if (opts.req && opts.respond) opts.req.res.json(data)
-      else return Promise.resolve(data)
+      // Success
+      if (cb) cb(null, response)
+      else if (opts.req && opts.respond) opts.req.res.json(response)
+      else return response
 
-    }).catch(err => {
+    } catch (err) {
       if (cb) cb(err)
       else if (opts && opts.req && opts.respond) opts.req.res.error(err)
       else throw err
-    })
+    }
   },
 
-  remove: function(opts, cb) {
+  remove: async function(opts, cb) {
     /**
      * Remove document(s) with monk after before hooks.
      * @param {object} opts
      *     @param {object} <opts.query> - mongodb query object
      *     @param {boolean} <opts.respond> - automatically call res.json/error (requires opts.req)
+     *     @param {boolean=true} <opts.multi> - set to false to limit the deletion to just one document
      *     @param {any} <opts.any> - any mongodb option
      * @param {function} <cb> - execute cb(err, data) instead of responding
      * @this model
      * @return promise
      */
-    let options
     if (cb && !util.isFunction(cb)) {
       throw new Error(`The callback passed to ${this.name}.remove() is not a function`)
     }
-    return new Promise((resolve, reject) => {
-      opts = this._queryObject(opts)
-      opts.remove = true
-      opts.model = this
+    try {
+      opts = await this._queryObject(opts, 'remove')
+      let options = util.omit(opts, ['query', 'respond'])
       if (util.isEmpty(opts.query)) throw new Error('Please specify opts.query')
-      // Operation options
-      options = util.omit(opts, ['query', 'respond'])
-      options.sort = options.sort || { 'createdAt': -1 }
-      options.limit = parseInt(options.limit || 1)
-      // Sort string passed
-      if (util.isString(options.sort)) {
-        let name = (options.sort.match(/([a-z0-9-_]+)/) || [])[0]
-        let order = (options.sort.match(/:(-?[0-9])/) || [])[1]
-        options.sort = { [name]: parseInt(order || 1) }
-      }
-      util.runSeries(this.beforeRemove.map(f => f.bind(opts)))
-        .then(() => resolve())
-        .catch(e => reject(e))
-
-    }).then(() => {
-      return this._remove(opts.query, options)
 
-    }).then(data => {
-      return util.runSeries(this.afterRemove.map(f => f.bind(opts))).then(() => data)
+      // Remove
+      await util.runSeries(this.beforeRemove.map(f => f.bind(opts)))
+      let response = await this._remove(opts.query, options)
+      await util.runSeries(this.afterRemove.map(f => f.bind(response)))
 
-    // Success/error
-    }).then(data => {
-      if (cb) cb(null, data)
-      else if (opts.req && opts.respond) opts.req.res.json(data)
-      else return Promise.resolve(data)
+      // Success
+      if (cb) cb(null, response)
+      else if (opts.req && opts.respond) opts.req.res.json(response)
+      else return Promise.resolve(response)
 
-    }).catch(err => {
+    } catch (err) {
       if (cb) cb(err)
       else if (opts && opts.req && opts.respond) opts.req.res.error(err)
       else throw err
-    })
+    }
   },
 
-  _queryObject: function(opts) {
+  _queryObject: async function(opts, type, one) {
     /**
-     * Extract the query id from opts, opts.query
-     * @param {MongoId|ID string|Query object} opts
-     * @return opts
+     * Normalise options
+     * @param {MongoId|string|object} opts
+     * @param {string} type - operation type
+     * @param {boolean} one - return one document
+     * @this model
+     * @return {Promise} opts
      *
-     * opts == string|MongodID - treated as an id
+     * opts == string|MongodId - treated as an id
      * opts == undefined|null|false - throw error
      * opts.query == string|MongodID - treated as an id
      * opts.query == undefined|null|false - throw error
      */
-    let isIdType = (o) => util.isId(o) || util.isString(o)
-    if (isIdType(opts)) opts = { query: { _id: opts || '' }}
-    if (isIdType((opts||{}).query)) opts.query = { _id: opts.query || '' }
-    if (!util.isObject(opts) || !util.isObject(opts.query)) {
-      throw new Error('Please pass an object or MongoId to options.query')
-    }
-    // For security, if _id is set and undefined, throw an error
-    if (typeof opts.query._id == 'undefined' && opts.query.hasOwnProperty('_id')) {
-      throw new Error('Please pass an object or MongoId to options.query')
+
+    // Query
+    if (type != 'insert') {
+      let isIdType = (o) => util.isId(o) || util.isString(o)
+      if (isIdType(opts)) {
+        opts = { query: { _id: opts || '' }}
+      }
+      if (isIdType((opts||{}).query)) {
+        opts.query = { _id: opts.query || '' }
+      }
+      if (!util.isObject(opts) || !util.isObject(opts.query)) {
+        throw new Error('Please pass an object or MongoId to options.query')
+      }
+      // For security, if _id is set and undefined, throw an error
+      if (typeof opts.query._id == 'undefined' && opts.query.hasOwnProperty('_id')) {
+        throw new Error('Please pass an object or MongoId to options.query')
+      }
+      if (util.isId(opts.query._id)) opts.query._id = this.manager.id(opts.query._id)
+      if (isIdType(opts.query._id) || one) opts.one = true
+      opts.query = util.removeUndefined(opts.query)
+
+      // Query options
+      opts.limit = opts.one? 1 : parseInt(opts.limit || this.manager.limit || 0)
+      opts.skip = Math.max(0, opts.skip || 0)
+      opts.sort = opts.sort || { 'createdAt': -1 }
+      if (util.isString(opts.sort)) {
+        let name = (opts.sort.match(/([a-z0-9-_]+)/) || [])[0]
+        let order = (opts.sort.match(/:(-?[0-9])/) || [])[1]
+        opts.sort = { [name]: parseInt(order || 1) }
+      }
     }
-    // Remove undefined query parameters
-    opts.query = util.removeUndefined(opts.query)
-    if (util.isId(opts.query._id)) opts.query._id = this.manager.id(opts.query._id)
-    if (isIdType(opts.query._id)) opts.one = true
+
+    // Data
+    if (!opts) opts = {}
+    if (!util.isDefined(opts.data) && util.isDefined((opts.req||{}).body)) opts.data = opts.req.body
+    if (util.isDefined(opts.data)) opts.data = await util.parseData(opts.data)
+
+    opts[type] = true
+    opts.model = this
     return opts
   },
 
-  _processAfterFind: function(data, projection, afterFindContext) {
+  _processAfterFind: function(data, projection={}, afterFindContext={}) {
     /**
      * Todo: Maybe make this method public?
      * Recurses through fields that are models and populates missing default-fields and calls model.afterFind([fn,..])

package/lib/model-validate.js

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

package/lib/model.js

@@ -188,9 +188,12 @@ Model.prototype._setupFields = function(fields) {
 
       // Rule doesn't exist
       util.forEach(field, (rule, ruleName) => {
+        if ((this.rules[ruleName] || rules[ruleName]) && this._ignoredRules.indexOf(ruleName) != -1) {
+          this.error(`The rule name "${ruleName}" for the model "${this.name}" is a reserved keyword, ignoring rule.`)
+        }
         if (!this.rules[ruleName] && !rules[ruleName] && this._ignoredRules.indexOf(ruleName) == -1) {
           // console.log(field)
-          this.error(`No rule "${ruleName}" exists for model "${this.name}". Ignoring rule.`)
+          this.error(`No rule "${ruleName}" exists for model "${this.name}", ignoring rule.`)
           delete field[ruleName]
         }
       }, this)

package/package.json

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

package/plugins/images/index.js

@@ -32,7 +32,9 @@ let plugin = module.exports = {
       return
     }
 
-    // Create s3 service instance
+    // Create s3 'service' instance
+    // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#constructor-property
+    manager.getSignedUrl = this._getSignedUrl
     this.s3 = new S3({
       credentials: {
         accessKeyId: this.awsAccessKeyId,
@@ -71,6 +73,9 @@ let plugin = module.exports = {
       model.afterInsert.push(function(data, n) {
         plugin.addImages(this, data).then(() => n(null, data)).catch(e => n(e))
       })
+      model.afterFind.push(function(data, n) {
+        plugin.getSignedUrls.call(model, this, data).then(() => n(null, data)).catch(e => n(e))
+      })
     }
   },
 
@@ -121,16 +126,17 @@ let plugin = module.exports = {
         return Promise.all(filesArr.map(file => {
           return new Promise((resolve, reject) => {
             let uid = nanoid.nanoid()
+            let pathFilename = filesArr.imageField.filename ? '/' + filesArr.imageField.filename : ''
             let image = {
-              bucket: this.awsBucket,
-              date: this.manager.useMilliseconds? Date.now() : Math.floor(Date.now() / 1000),
+              bucket: plugin.awsBucket,
+              date: plugin.manager.useMilliseconds? Date.now() : Math.floor(Date.now() / 1000),
               filename: file.name,
               filesize: file.size,
-              path: `${plugin.bucketDir}/${uid}.${file.ext}`,
+              path: `${plugin.bucketDir}/${uid}${pathFilename}.${file.ext}`,
               // sizes: ['large', 'medium', 'small'],
-              uid: uid
+              uid: uid,
             }
-            this.manager.info(
+            plugin.manager.info(
               `Uploading '${image.filename}' to '${image.bucket}/${image.path}'`
             )
             if (test) {
@@ -138,10 +144,14 @@ let plugin = module.exports = {
               resolve()
             } else {
               plugin.s3.upload({
-                Bucket: this.awsBucket,
+                Bucket: plugin.awsBucket,
                 Key: image.path,
                 Body: file.data,
-                ACL: 'public-read'
+                // The IAM permission "s3:PutObjectACL" must be included in the appropriate policy
+                ACL: 'public-read',
+                // upload params,https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#upload-property
+                ...filesArr.imageField.params,
+
               }, (err, response) => {
                 if (err) return reject(err)
                 plugin._addImageObjectsToData(filesArr.inputPath, data, image)
@@ -161,7 +171,7 @@ let plugin = module.exports = {
       return model._update(
         idquery,
         { '$set': prunedData },
-        { 'multi': options.multi || options.create }
+        { 'multi': options.multi || options.create },
       )
 
     // If errors, remove inserted documents to prevent double ups when the user resaves.
@@ -172,6 +182,30 @@ let plugin = module.exports = {
     })
   },
 
+  getSignedUrls: async function(options, data) {
+    /**
+     * Get signed urls for all image objects in data
+     * @param {object} options - monastery operation options {model, query, files, ..}
+     * @param {object} data
+     * @return promise(data)
+     * @this model
+     */
+    // Not wanting signed urls for this operation?
+    if (util.isDefined(options.getSignedUrls) && !options.getSignedUrls) return
+
+    // Find all image objects in data
+    for (let doc of util.toArray(data)) {
+      for (let imageField of this.imageFields) {
+        if (options.getSignedUrls || imageField.getSignedUrl) {
+          let images = plugin._findImagesInData(doc, imageField, 0, '').filter(o => o.image)
+          for (let image of images) {
+            image.image.signedUrl = plugin._getSignedUrl(image.image.path)
+          }
+        }
+      }
+    }
+  },
+
   keepImagePlacement: async function(options, data) {
     /**
      * Hook before update/remove
@@ -303,7 +337,7 @@ let plugin = module.exports = {
         { Key: `medium/${key}.jpg` },
         { Key: `large/${key}.jpg` }
       )
-      this.manager.info(
+      plugin.manager.info(
         `Removing '${pre.image.filename}' from '${pre.image.bucket}/${pre.image.path}'`
       )
     }
@@ -376,7 +410,7 @@ let plugin = module.exports = {
       return Promise.all(filesArr.map((file, i) => {
         return new Promise((resolve, reject) => {
           fileType.fromBuffer(file.data).then(res => {
-            let maxSize = filesArr.imageField.fileSize
+            let maxSize = filesArr.imageField.filesize
             let formats = filesArr.imageField.formats || plugin.formats
             let allowAny = util.inArray(formats, 'any')
             file.format = res? res.ext : ''
@@ -421,17 +455,20 @@ let plugin = module.exports = {
       // Subdocument field
       if (util.isSubdocument(field)) {//schema.isObject
         // log(`Recurse 1: ${path2}`)
-        list = list.concat(this._findAndTransformImageFields(field, path2))
+        list = list.concat(plugin._findAndTransformImageFields(field, path2))
 
       // Array field
       } else if (util.isArray(field)) {//schema.isArray
         // log(`Recurse 2: ${path2}`)
-        list = list.concat(this._findAndTransformImageFields(field, path2))
+        list = list.concat(plugin._findAndTransformImageFields(field, path2))
 
       // Image field. Test for field.image as field.type may be 'any'
       } else if (field.type == 'image' || field.image) {
         let formats = field.formats
-        let fileSize = field.fileSize
+        let filesize = field.filesize || field.fileSize // old <= v1.31.7
+        let filename = field.filename
+        let getSignedUrl = field.getSignedUrl
+        let params = { ...field.params||{} }
         // Convert image field to subdocument
         fields[fieldName] = {
           bucket: { type: 'string' },
@@ -440,13 +477,16 @@ let plugin = module.exports = {
           filesize: { type: 'number' },
           path: { type: 'string' },
           schema: { image: true, nullObject: true, isImageObject: true },
-          uid: { type: 'string' }
+          uid: { type: 'string' },
         }
         list.push({
           fullPath: path2,
           fullPathRegex: new RegExp('^' + path2.replace(/\.[0-9]+/g, '.[0-9]+').replace(/\./g, '\\.') + '$'),
           formats: formats,
-          fileSize: fileSize
+          filesize: filesize,
+          filename: filename,
+          getSignedUrl: getSignedUrl,
+          params: params,
         })
       }
     })
@@ -474,7 +514,7 @@ let plugin = module.exports = {
           if (`${dataPath}.${m}`.match(imageField.fullPathRegex)) {
             list.push({ imageField: imageField, dataPath: `${dataPath}.${m}`, image: target[m] })
           } else {
-            list.push(...this._findImagesInData(
+            list.push(...plugin._findImagesInData(
               target[m],
               imageField,
               imageFieldChunkIndex+i+1,
@@ -495,6 +535,16 @@ let plugin = module.exports = {
     }
 
     return list
-  }
+  },
+
+  _getSignedUrl: (path, expires=3600) => {
+    // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#getSignedUrl-property
+    let signedUrl = plugin.s3.getSignedUrl('getObject', {
+      Bucket: plugin.awsBucket,
+      Key: path,
+      Expires: expires
+    })
+    return signedUrl
+  },
 
 }

package/test/crud.js

@@ -415,6 +415,40 @@ module.exports = function(monastery, opendb) {
     db.close()
   })
 
+  test('remove basics', async () => {
+    let db = (await opendb(null)).db
+    let user = db.model('user', {
+      fields: {
+        name: { type: 'string' },
+      },
+    })
+
+    // Insert multiple
+    let inserted2 = await user.insert({ data: [{ name: 'Martin' }, { name: 'Martin' }, { name: 'Martin' }]})
+    expect(inserted2).toEqual([
+      {
+        _id: expect.any(Object),
+        name: 'Martin'
+      }, {
+        _id: expect.any(Object),
+        name: 'Martin'
+      }, {
+        _id: expect.any(Object),
+        name: 'Martin'
+      }
+    ])
+
+    // Remove one
+    await expect(user.remove({ query: { name: 'Martin' }, multi: false }))
+      .resolves.toMatchObject({ deletedCount: 1, result: { n: 1, ok: 1 }})
+
+    // Remove many (default)
+    await expect(user.remove({ query: { name: 'Martin' } }))
+      .resolves.toMatchObject({ deletedCount: 2, result: { n: 2, ok: 1 }})
+
+    db.close()
+  })
+
   test('hooks', async () => {
     let db = (await opendb(null)).db
     let user = db.model('user', {

package/test/model.js

@@ -115,6 +115,29 @@ module.exports = function(monastery, opendb) {
     })
   })
 
+  test('model reserved rules', async () => {
+    // Setup
+    let db = (await opendb(false, {})).db
+    db.error = () => {} // hiding debug error
+    let user = db.model('user', {
+      fields: {
+        name: {
+          type: 'string',
+          params: {}, // reserved keyword (image plugin)
+          paramsUnreserved: {}
+        },
+      },
+      rules: {
+        params: (value) => {
+          return false // shouldn'r run
+        }
+      }
+    })
+    await expect(user.validate({ name: 'Martin' })).resolves.toMatchObject({
+      name: 'Martin',
+    })
+  })
+
   test('model indexes', async () => {
     // Setup: Need to test different types of indexes
     let db = (await opendb(null)).db

package/test/plugin-images.js

@@ -707,4 +707,57 @@ module.exports = function(monastery, opendb) {
     db.close()
   })
 
+  test('images getSignedUrls', async () => {
+    // latest (2022.02)
+    let db = (await opendb(null, {
+      timestamps: false,
+      serverSelectionTimeoutMS: 2000,
+      imagePlugin: { awsBucket: 'fake', awsAccessKeyId: 'fake', awsSecretAccessKey: 'fake' }
+    })).db
+
+    db.model('user', { fields: {
+      photos: [{ type: 'image' }],
+      photos2: [{ type: 'image', getSignedUrl: true }],
+    }})
+
+    let image = {
+      bucket: 'test',
+      date: 1234,
+      filename: 'lion1.png',
+      filesize: 1234,
+      path: 'test/lion1.png',
+      uid: 'lion1'
+    }
+
+    let userInserted = await db.user._insert({
+      photos: [image, image],
+      photos2: [image, image],
+    })
+
+    // Find signed URL via query option
+    let imageWithSignedUrl = { ...image, signedUrl: expect.stringMatching(/^https/) }
+    await expect(db.user.findOne({ query: userInserted._id, getSignedUrls: true })).resolves.toEqual({
+      _id: expect.any(Object),
+      photos: [imageWithSignedUrl, imageWithSignedUrl],
+      photos2: [imageWithSignedUrl, imageWithSignedUrl],
+    })
+
+    // Find signed URL via schema option
+    await expect(db.user.findOne({ query: userInserted._id })).resolves.toEqual({
+      _id: expect.any(Object),
+      photos: [image, image],
+      photos2: [imageWithSignedUrl, imageWithSignedUrl],
+    })
+
+    // Works with _processAfterFind
+    let rawUser = await db.user._findOne({ _id: userInserted._id })
+    await expect(db.user._processAfterFind(rawUser)).resolves.toEqual({
+      _id: expect.any(Object),
+      photos: [image, image],
+      photos2: [imageWithSignedUrl, imageWithSignedUrl],
+    })
+
+    db.close()
+  })
+
 }