monastery 1.30.0 → 1.30.4

package/lib/model-validate.js

@@ -266,13 +266,16 @@ module.exports = {
     if (!ruleMessage) ruleMessage = rule.message
 
     // Ignore undefined (if updated root property, or ignoring)
-    if ((!validateUndefined || (opts.update && !path.match(/\./))) && typeof value === 'undefined') return
+    if (typeof value === 'undefined' && (!validateUndefined || (opts.update && !path.match(/\./)))) return
 
-    // Ignore null (if nullObject is set on objects or arrays) (todo: change to ignoreNull)
-    if (field.nullObject && (field.isObject || field.isArray) && value === null) return
+    // Ignore null (if nullObject is set on objects or arrays)
+    if (value === null && (field.isObject || field.isArray) && field.nullObject) return
+
+    // Ignore null
+    if (value === null && !(field.isObject || field.isArray) && !rule.validateNull) return
 
     // Ignore empty strings
-    if (!rule.validateEmptyString && value === '') return
+    if (value === '' && !rule.validateEmptyString) return
 
     // Rule failed
     if (!rule.fn.call(dataRoot, value, ruleArg, path, this)) return {

package/lib/model.js

@@ -61,6 +61,7 @@ let Model = module.exports = function(name, opts, manager) {
       // Update with formatted rule
       let formattedRule = util.isObject(rule)? rule : { fn: rule }
       if (!formattedRule.message) formattedRule.message = `Invalid data property for rule "${ruleName}".`
+      if (typeof formattedRule.validateNull == 'undefined') formattedRule.validateNull = true
       if (typeof formattedRule.validateEmptyString == 'undefined') formattedRule.validateEmptyString = true
       this.rules[ruleName] = formattedRule
     }

package/lib/rules.js

@@ -5,7 +5,8 @@ let validator = require('validator')
 module.exports = {
 
   required: {
-    validateUndefined: true,
+    validateUndefined: true, // (false for custom rules)
+    validateNull: true,
     validateEmptyString: true,
     message: 'This field is required.',
     fn: function(x) {
@@ -14,12 +15,13 @@ module.exports = {
     }
   },
 
-  // Type rules below ignore undefined (default for custom model rules)
+  // "Type" rules below ignore undefined and null
 
-  'isBoolean': {
+  isBoolean: {
     validateEmptyString: true,
     message: 'Value was not a boolean.',
     tryParse: function(x) {
+      if (x === '') return null
       if (typeof x === 'string' && x === 'true') return true
       else if (typeof x === 'string' && x === 'false') return false
       else return x
@@ -28,7 +30,7 @@ module.exports = {
       return typeof x === 'boolean'
     }
   },
-  'isArray': {
+  isArray: {
     validateEmptyString: true,
     message: 'Value was not an array.',
     tryParse: function(x) {
@@ -41,10 +43,11 @@ module.exports = {
       return Array.isArray(x)
     }
   },
-  'isDate': {
+  isDate: {
     validateEmptyString: true,
     message: 'Value was not a unix timestamp.',
     tryParse: function(x) {
+      if (x === '') return null
       if (util.isString(x) && x.match(/^[+-]?[0-9]+$/)) return x // keep string nums intact
       return isNaN(parseInt(x))? x : parseInt(x)
     },
@@ -53,7 +56,7 @@ module.exports = {
       return typeof x === 'number' && (parseInt(x) === x)
     }
   },
-  'isImageObject': {
+  isImageObject: {
     validateEmptyString: true,
     message: 'Invalid image value',
     messageLong: 'Image fields need to either be null, undefined, file, or an object containing the following '
@@ -69,10 +72,11 @@ module.exports = {
       if (isObject && x.bucket && x.date && x.filename && x.filesize && x.path && x.uid) return true
     }
   },
-  'isInteger': {
+  isInteger: {
     validateEmptyString: true,
     message: 'Value was not an integer.',
     tryParse: function(x) {
+      if (x === '') return null
       if (util.isString(x) && x.match(/^[+-][0-9]+$/)) return x // keep string nums intact
       return isNaN(parseInt(x)) || (!x && x!==0) || x===true? x : parseInt(x)
     },
@@ -81,10 +85,11 @@ module.exports = {
       return typeof x === 'number' && (parseInt(x) === x)
     }
   },
-  'isNumber': {
+  isNumber: {
     validateEmptyString: true,
     message: 'Value was not a number.',
     tryParse: function(x) {
+      if (x === '') return null
       if (util.isString(x) && x.match(/^[+-][0-9]+$/)) return x // keep string nums intact
       return isNaN(Number(x)) || (!x && x!==0) || x===true? x : Number(x)
     },
@@ -93,7 +98,7 @@ module.exports = {
       return typeof x === 'number'
     }
   },
-  'isObject': {
+  isObject: {
     validateEmptyString: true,
     message: 'Value was not an object.',
     tryParse: function(x) {
@@ -106,21 +111,25 @@ module.exports = {
       return x !== null && typeof x === 'object' && !(x instanceof Array)
     }
   },
-  'isString': {
+  isString: {
     validateEmptyString: true,
     message: 'Value was not a string.',
+    tryParse: function(x) {
+      if (typeof x === 'number') return x + ''
+      else return x
+    },
     fn: function(x) {
       return typeof x === 'string'
     }
   },
-  'isAny': {
+  isAny: {
     validateEmptyString: true,
     message: '',
     fn: function(x) {
       return true
     }
   },
-  'isId': {
+  isId: {
     validateEmptyString: true,
     message: 'Value was not a valid ObjectId.',
     tryParse: function(x) {
@@ -135,34 +144,27 @@ module.exports = {
       return util.isObject(x) && ObjectId.isValid(x)/*x.get_inc*/? true : false
     }
   },
-  'max': {
-    validateEmptyString: true,
+
+  /* "Number" rules below ignore undefined and null */
+
+  max: {
     message: (x, arg) => 'Value was greater than the configured maximum (' + arg + ')',
     fn: function(x, arg) {
       if (typeof x !== 'number') { throw new Error ('Value was not a number.') }
       return x <= arg
     }
   },
-  'min': {
-    validateEmptyString: true,
+  min: {
     message: (x, arg) => 'Value was less than the configured minimum (' + arg + ')',
     fn: function(x, arg) {
       if (typeof x !== 'number') { throw new Error ('Value was not a number.') }
       return x >= arg
     }
   },
-  'isNotEmptyString': {
-    validateEmptyString: true,
-    message: 'Value was an empty string.',
-    fn: function(x) {
-      return x !== ''
-    }
-  },
 
-  // Rules below ignore undefined, & empty strings
-  // (e.g. an empty email field can be saved that isn't required)
+  /* "String" rules below ignore undefined, null, and empty strings */
 
-  'enum': {
+  enum: {
     message: (x, arg) => 'Invalid enum value',
     fn: function(x, arg) {
       for (let item of arg) {
@@ -170,51 +172,54 @@ module.exports = {
       }
     }
   },
-  // 'hasAgreed': {
-  //   message: (x, arg) => 'Please agree to the terms and conditions.',
-  //   fn: function(x, arg) { return !x }
-  // },
-  'isAfter': {
+  isAfter: {
     message: (x, arg) => 'Value was before the configured time (' + arg + ')',
     fn: function(x, arg) { return validator.isAfter(x, arg) }
   },
-  'isBefore': {
+  isBefore: {
     message: (x, arg) => 'Value was after the configured time (' + arg + ')',
     fn: function(x, arg) { return validator.isBefore(x, arg) }
   },
-  'isCreditCard': {
+  isCreditCard: {
     message: 'Value was not a valid credit card.',
     fn: function(x, arg) { return validator.isCreditCard(x, arg) }
   },
-  'isEmail': {
+  isEmail: {
     message: 'Please enter a valid email address.',
     fn: function(x, arg) { return validator.isEmail(x, arg) }
   },
-  'isHexColor': {
+  isHexColor: {
     message: 'Value was not a valid hex color.',
     fn: function(x, arg) { return validator.isHexColor(x, arg) }
   },
-  'isIn': {
+  isIn: {
     message: (x, arg) => 'Value was not in the configured whitelist (' + arg.join(', ') + ')',
     fn: function(x, arg) { return validator.isIn(x, arg) }
   },
-  'isIP': {
+  isIP: {
     message: 'Value was not a valid IP address.',
     fn: function(x, arg) { return validator.isIP(x, arg) }
   },
-  'isNotIn': {
+  isNotEmptyString: {
+    validateEmptyString: true,
+    message: 'Value was an empty string.',
+    fn: function(x) {
+      return x !== ''
+    }
+  },
+  isNotIn: {
     message: (x, arg) => 'Value was in the configured blacklist (' + arg.join(', ') + ')',
     fn: function(x, arg) { return !validator.isIn(x, arg) }
   },
-  'isURL': {
+  isURL: {
     message: 'Value was not a valid URL.',
     fn: function(x, arg) { return validator.isURL(x, arg === true? undefined : arg) }
   },
-  'isUUID': {
+  isUUID: {
     message: 'Value was not a valid UUID.',
     fn: function(x, arg) { return validator.isUUID(x) }
   },
-  'minLength': {
+  minLength: {
     message: function(x, arg) {
       if (typeof x === 'string') return 'Value needs to be at least ' + arg + ' characters long.'
       else return 'Value needs to contain a minimum of ' + arg + ' items.'
@@ -225,7 +230,7 @@ module.exports = {
       else return x.length >= arg
     }
   },
-  'maxLength': {
+  maxLength: {
     message: function(x, arg) {
       if (typeof x === 'string') return 'Value was longer than the configured maximum length (' + arg + ')'
       else return 'Value cannot contain more than ' + arg + ' items.'
@@ -236,7 +241,7 @@ module.exports = {
       else return x.length <= arg
     }
   },
-  'regex': {
+  regex: {
     message: (x, arg) => 'Value did not match the configured regular expression (' + arg + ')',
     fn: function(x, arg) {
       if (util.isRegex(arg)) return validator.matches(x, arg)

package/lib/util.js

@@ -300,7 +300,7 @@ module.exports = {
      * @param {boolean} ignoreEmptyArrays -  ignore empty arrays
      * @return obj
      */
-    let chunks = path.split('.') //  ['pets', '$', 'dog']
+    let chunks = path.split('.') //  ['pets', '$|0-9', 'dog']
     let target = obj
     for (let i=0, l=chunks.length; i<l; i++) {
       if (l === i+1) { // Last

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A straight forward MongoDB ODM built around Monk",
   "author": "Ricky Boyce",
-  "version": "1.30.0",
+  "version": "1.30.4",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",
@@ -23,7 +23,8 @@
     "test-one-example": "jest -t images",
     "dev": "npm run lint & DEBUG=-monastery:info jest --watchAll --runInBand --verbose=false",
     "lint": "eslint ./lib ./plugins ./test",
-    "docs": "cd docs && bundle exec jekyll serve --livereload --livereload-port 4001"
+    "docs": "cd docs && bundle exec jekyll serve --livereload --livereload-port 4001",
+    "mong": "nodemon resources/mong.js"
   },
   "dependencies": {
     "aws-sdk": "2.1062.0",
@@ -39,6 +40,7 @@
     "express": "4.17.1",
     "express-fileupload": "1.2.0",
     "jest": "27.4.7",
+    "nodemon": "2.0.15",
     "standard-version": "9.3.2",
     "supertest": "4.0.2"
   },

package/plugins/images/index.js

@@ -54,8 +54,11 @@ let plugin = module.exports = {
     model.imageFields = plugin._findAndTransformImageFields(model.fields, '')
 
     if (model.imageFields.length) {
-      // Update image fields and whitelists with the new object schema
-      // model._setupFieldsAndWhitelists(model.fields)
+      // Todo?: Update image fields and whitelists with the new object schema
+      //   model._setupFieldsAndWhitelists(model.fields)
+      model.beforeValidate.push(function(data, n) {
+        plugin.keepImagePlacement(this, data).then(() => n(null, data)).catch(e => n(e))
+      })
       model.beforeUpdate.push(function(data, n) {
         plugin.removeImages(this, data).then(() => n(null, data)).catch(e => n(e))
       })
@@ -91,7 +94,9 @@ let plugin = module.exports = {
      * @param {object} options - monastery operation options {model, query, files, ..}
      * @param {object} data -
      * @param {boolean} test -
-     * @return promise
+     * @return promise(
+     *   {object} data - data object containing new S3 image-object
+     * ])
      * @this plugin
      */
     let { model, query, files } = options
@@ -167,7 +172,33 @@ let plugin = module.exports = {
     })
   },
 
-  removeImages: function(options, data, test) {
+  keepImagePlacement: async function(options, data) {
+    /**
+     * Hook before update/remove
+     * Since monastery removes undefined array items on validate, we need to convert any
+     * undefined array items to null where files are located to maintain image ordering
+     * Todo: maybe dont remove undefined array items in general
+     *
+     * E.g.
+     * req.body  = 'photos[0]' : undefined || non existing (set to null)
+     * req.files = 'photos[0]' : { ...binary }
+     *
+     * @param {object} options - monastery operation options {query, model, files, multi, ..}
+     * @return promise
+     * @this plugin
+     */
+    if (typeof options.files == 'undefined') return
+    // Check upload errors and find valid uploaded images
+    let files = await plugin._findValidImages(options.files || {}, options.model)
+    // Set undefined primative-array items to null where files are located
+    for (let filesArray of files) {
+      if (filesArray.inputPath.match(/\.[0-9]+$/)) {
+        util.setDeepValue(data, filesArray.inputPath, null, true, false, true)
+      }
+    }
+  },
+
+  removeImages: async function(options, data, test) {
     /**
      * Hook before update/remove
      * Removes images not found in data, this means you will need to pass the image objects to every update operation
@@ -179,108 +210,113 @@ let plugin = module.exports = {
      *
      * @ref https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#deleteObjects-property
      * @param {object} options - monastery operation options {query, model, files, multi, ..}
-     * @return promise
+     * @return promise([
+     *   {object} useCount - images that wont be removed, e.g. { lion1: 1 }
+     *   {array} unused - S3 image uris to be removed,  e.g. [{ Key: 'small/lion1.jpg' }, ..]
+     * ])
      * @this plugin
      */
     let pre
     let preExistingImages = []
     let useCount = {}
-    if (typeof options.files == 'undefined') return new Promise(res => res())
+    if (typeof options.files == 'undefined') return
 
     // Find all documents from the same query
-    return options.model._find(options.query, options)
-      .then(docs => {
-        // Find all pre-existing image objects in documents
-        for (let doc of util.toArray(docs)) { //x2
-          for (let imageField of options.model.imageFields) { //x5
-            let images = plugin._findImagesInData(doc, imageField, 0, '').filter(o => o.image)
-            for (let image of images) {
-              preExistingImages.push(image)
-              useCount[image.image.uid] = (useCount[image.image.uid] || 0) + 1
-            }
-          }
+    let docs = await options.model._find(options.query, options)
+
+    // Find all pre-existing image objects in documents
+    for (let doc of util.toArray(docs)) { //x2
+      for (let imageField of options.model.imageFields) { //x5
+        let images = plugin._findImagesInData(doc, imageField, 0, '').filter(o => o.image)
+        for (let image of images) {
+          preExistingImages.push(image)
+          useCount[image.image.uid] = (useCount[image.image.uid] || 0) + 1
         }
+      }
+    }
 
-        // console.log(1, useCount, preExistingImages)
+    // console.log(1, useCount, preExistingImages)
 
-        // Assign pre-existing images within undefined deep objects and missing array items to null
-        // ignore undefined root images
-        let dataFilled = util.deepCopy(data)
-        for (let key in dataFilled) {
-          for (let pre of preExistingImages) {
-            if (!pre.dataPath.match(new RegExp('^' + key + '(\\.|$)'))) continue
-            util.setDeepValue(dataFilled, pre.dataPath, null, true)
-          }
-        }
+    // Assign pre-existing images within undefined deep objects and missing array items to null,
+    // ignore undefined root images
+    let dataFilled = util.deepCopy(data)
+    for (let key in dataFilled) {
+      for (let pre of preExistingImages) {
+        if (!pre.dataPath.match(new RegExp('^' + key + '(\\.|$)'))) continue
+        util.setDeepValue(dataFilled, pre.dataPath, null, true)
+      }
+    }
+    // console.log(dataFilled)
 
-        // Loop all schema image fields
-        for (let imageField of options.model.imageFields) { //x5
-          let images = plugin._findImagesInData(dataFilled, imageField, 0, '')
-          if (!images.length) continue
-          // console.log(images)
+    // Check upload errors and find valid uploaded images
+    let files = await plugin._findValidImages(options.files || {}, options.model)
 
-          // Data contains null images that once had a pre-existing image
-          for (let image of images) {
-            if (image.image == null && (pre = preExistingImages.find(o => o.dataPath == image.dataPath))) {
-              useCount[pre.image.uid]--
-            }
-          }
+    // Loop all schema image fields
+    for (let imageField of options.model.imageFields) { //x5
+      let images = plugin._findImagesInData(dataFilled, imageField, 0, '')
+      if (!images.length) continue
+      // console.log(images)
 
-          // Data contains valid (pre-existing) image-objects? And are we overriding a pre-existing image?
-          for (let image of images) {
-            if (image.image != null) {
-              let pre = preExistingImages.find(o => o.dataPath == image.dataPath)
-              if (typeof useCount[image.image.uid] == 'undefined') {
-                throw `The passed image object for '${image.dataPath}' does not match any pre-existing
-                  images saved on this document.`
-              } else if (pre && pre.image.uid != image.image.uid) {
-                useCount[pre.image.uid]--
-                useCount[image.image.uid]++
-              } else if (!pre) {
-                useCount[image.image.uid]++
-              }
-            }
-          }
+      // Data contains null images that once had a pre-existing image
+      for (let image of images) {
+        if (image.image == null && (pre = preExistingImages.find(o => o.dataPath == image.dataPath))) {
+          useCount[pre.image.uid]--
         }
-        // Check upload errors and find valid uploaded images. If any file is overriding a
-        // pre-existing image, push to unused
-        return plugin._findValidImages(options.files || {}, options.model).then(files => {
+      }
+
+      // Loop images found in the data
+      for (let image of images) {
+        if (image.image != null) {
+          let preExistingImage = preExistingImages.find(o => o.dataPath == image.dataPath)
+          // valid image-object?
+          if (typeof useCount[image.image.uid] == 'undefined') {
+            throw `The passed image object for '${image.dataPath}' does not match any pre-existing
+              images saved on this document.`
+          // Different image from prexisting image
+          } else if (preExistingImage && preExistingImage.image.uid != image.image.uid) {
+            useCount[preExistingImage.image.uid]--
+            useCount[image.image.uid]++
+          // No pre-existing image found
+          } else if (!preExistingImage) {
+            useCount[image.image.uid]++
+          }
+          // Any file overriding this image?
           for (let filesArray of files) {
-            if ((pre = preExistingImages.find(o => o.dataPath == filesArray.inputPath))) {
-              useCount[pre.image.uid]--
+            if (image.dataPath == filesArray.inputPath) {
+              useCount[image.image.uid]--
             }
           }
-        })
-
-      }).then(() => {
-        // Retrieve all the unused files
-        let unused = []
-        // console.log(3, useCount)
-        for (let key in useCount) {
-          if (useCount[key] > 0) continue
-          let pre = preExistingImages.find(o => o.image.uid == key)
-          unused.push(
-            // original key can have a different extension
-            { Key: pre.image.path },
-            { Key: `small/${key}.jpg` },
-            { Key: `medium/${key}.jpg` },
-            { Key: `large/${key}.jpg` }
-          )
-          this.manager.info(
-            `Removing '${pre.image.filename}' from '${pre.image.bucket}/${pre.image.path}'`
-          )
         }
-        if (test) return Promise.resolve([useCount, unused])
-        // Delete any unused images from s3. If the image is on a different bucket
-        // the file doesnt get deleted, we only delete from plugin.awsBucket.
-        if (!unused.length) return
-        return new Promise((resolve, reject) => {
-          plugin.s3.deleteObjects({ Bucket: plugin.awsBucket, Delete: { Objects: unused }}, (err, data) => {
-            if (err) reject(err)
-            resolve()
-          })
-        })
+      }
+    }
+
+    // Retrieve all the unused files
+    // console.log(3, useCount)
+    let unused = []
+    for (let key in useCount) {
+      if (useCount[key] > 0) continue
+      let pre = preExistingImages.find(o => o.image.uid == key)
+      unused.push(
+        // original key can have a different extension
+        { Key: pre.image.path },
+        { Key: `small/${key}.jpg` },
+        { Key: `medium/${key}.jpg` },
+        { Key: `large/${key}.jpg` }
+      )
+      this.manager.info(
+        `Removing '${pre.image.filename}' from '${pre.image.bucket}/${pre.image.path}'`
+      )
+    }
+    if (test) return [useCount, unused]
+    // Delete any unused images from s3. If the image is on a different bucket
+    // the file doesnt get deleted, we only delete from plugin.awsBucket.
+    if (!unused.length) return
+    await new Promise((resolve, reject) => {
+      plugin.s3.deleteObjects({ Bucket: plugin.awsBucket, Delete: { Objects: unused }}, (err, data) => {
+        if (err) reject(err)
+        resolve()
       })
+    })
   },
 
   _addImageObjectsToData: function(path, data, image) {

package/test/plugin-images.js

@@ -1,3 +1,5 @@
+let util = require('../lib/util')
+
 module.exports = function(monastery, opendb) {
 
   // Data no images doesn't throw error
@@ -299,13 +301,8 @@ module.exports = function(monastery, opendb) {
 
         plugin.removeImages(options, req.body, true)
           .then(res => {
-            expect(res[0]).toEqual({ test1: 0, test2: -1, test3: 1, test4: 0 })
+            expect(res[0]).toEqual({ test1: 1, test2: 0, test3: 1, test4: 0 })
             expect(res[1]).toEqual([
-              { Key: 'dir/test1.png' },
-              { Key: 'small/test1.jpg' },
-              { Key: 'medium/test1.jpg' },
-              { Key: 'large/test1.jpg' },
-
               { Key: 'dir/test2.png' },
               { Key: 'small/test2.jpg' },
               { Key: 'medium/test2.jpg' },
@@ -560,4 +557,154 @@ module.exports = function(monastery, opendb) {
     })()
   })
 
+  test('images reorder', async () => {
+    let db = (await opendb(null, {
+      timestamps: false,
+      serverSelectionTimeoutMS: 2000,
+      imagePlugin: { awsBucket: 'fake', awsAccessKeyId: 'fake', awsSecretAccessKey: 'fake' }
+    })).db
+
+    let user = db.model('user', { fields: {
+      logos: [{ type: 'image' }],
+    }})
+
+    let image = {
+      bucket: 'test',
+      date: 1234,
+      filename: 'lion1.png',
+      filesize: 1234,
+      path: 'test/lion1.png',
+      uid: 'lion1'
+    }
+
+    let user1 = await db.user._insert({
+      logos: [image],
+    })
+
+    let plugin = db.imagePluginFile
+    let supertest = require('supertest')
+    let express = require('express')
+    let upload = require('express-fileupload')
+    let app = express()
+    app.use(upload())
+
+    // Reorder
+    app.post('/', async function(req, res) {
+      try {
+        req.body.logos = JSON.parse(req.body.logos)
+        let options = { files: req.files, model: user, query: { _id: user1._id } }
+        let response = await plugin.removeImages(options, req.body, true)
+        expect(response[0]).toEqual({ lion1: 1 })
+        expect(response[1]).toEqual([])
+        res.send()
+      } catch (e) {
+        console.log(e.message || e)
+        res.status(500).send()
+      }
+    })
+    await supertest(app)
+      .post('/')
+      .field('logos', JSON.stringify([ null, image ]))
+      .expect(200)
+
+    db.close()
+  })
+
+  test('images reorder and added image', async () => {
+    // latest (2022.02)
+    let db = (await opendb(null, {
+      timestamps: false,
+      serverSelectionTimeoutMS: 2000,
+      imagePlugin: { awsBucket: 'fake', awsAccessKeyId: 'fake', awsSecretAccessKey: 'fake' }
+    })).db
+
+    let user = db.model('user', { fields: {
+      photos: [{ type: 'image' }],
+    }})
+
+    let image = {
+      bucket: 'test',
+      date: 1234,
+      filename: 'lion1.png',
+      filesize: 1234,
+      path: 'test/lion1.png',
+      uid: 'lion1'
+    }
+
+    let user1 = await db.user._insert({
+      photos: [image],
+    })
+
+    let plugin = db.imagePluginFile
+    let supertest = require('supertest')
+    let express = require('express')
+    let upload = require('express-fileupload')
+    let app = express()
+    app.use(upload())
+
+    app.post('/', async function(req, res) {
+      try {
+        // Parse and validate data which is used before in update/insert
+        let options = { files: req.files, model: user, query: { _id: user1._id } }
+        let data = await util.parseData(req.body)
+        data = await user.validate(data, { ...options, update: true })
+
+        // Empty photo placeholder not removed in validate?
+        expect(data.photos[0]).toEqual(null)
+        expect(data.photos[1]).toEqual(image)
+
+        // Remove images
+        let response = await plugin.removeImages(options, data, true)
+        expect(response[0]).toEqual({ lion1: 1 }) // useCount
+        expect(response[1]).toEqual([]) // unused
+
+        // New file exists
+        let validFiles = await plugin._findValidImages(req.files, user)
+        expect(((validFiles||[])[0]||{}).inputPath).toEqual('photos.0') // Valid inputPath
+
+        // Add images
+        response = await plugin.addImages(options, data, true)
+        expect(response[0]).toEqual({
+          photos: [{
+            bucket: 'fake',
+            date: expect.any(Number),
+            filename: 'lion2.jpg',
+            filesize: expect.any(Number),
+            path: expect.any(String),
+            uid: expect.any(String)
+          }, {
+            bucket: 'test', // still the same image-object reference (nothing new)
+            date: expect.any(Number),
+            filename: 'lion1.png',
+            filesize: expect.any(Number),
+            path: expect.any(String),
+            uid: expect.any(String)
+          },],
+        })
+
+        res.send()
+      } catch (e) {
+        console.log(e.message || e)
+        res.status(500).send()
+      }
+    })
+
+    await supertest(app)
+      .post('/')
+      // Mock multipart/form-data syntax which is not supported by supertest (formdata sent with axios)
+      //  E.g.
+      //    req.body  = 'photos[1][bucket]' : '...'
+      //    req.files = 'photos[0]' : { ...binary }
+      .field('photos[1][bucket]', image.bucket)
+      .field('photos[1][date]', image.date)
+      .field('photos[1][filename]', image.filename)
+      .field('photos[1][filesize]', image.filesize)
+      .field('photos[1][path]', image.path)
+      .field('photos[1][uid]', image.uid)
+      .attach('photos[0]', `${__dirname}/assets/lion2.jpg`)
+      .expect(200)
+
+    db.close()
+  })
+
 }

package/test/validate.js

@@ -2,7 +2,7 @@ let validate = require('../lib/model-validate')
 
 module.exports = function(monastery, opendb) {
 
-  test('Validation basic errors', async () => {
+  test('validation basic errors', async () => {
     // Setup
     let db = (await opendb(false)).db
     let user = db.model('user', { fields: {
@@ -19,7 +19,7 @@ module.exports = function(monastery, opendb) {
       detail: 'This field is required.',
       meta: { rule: 'required', model: 'user', field: 'name' }
     })
-    await expect(user.validate({ name : '' }, { validateUndefined: false })).rejects.toContainEqual({
+    await expect(user.validate({ name : '' })).rejects.toContainEqual({
       status: '400',
       title: 'name',
       detail: 'This field is required.',
@@ -34,7 +34,16 @@ module.exports = function(monastery, opendb) {
     await expect(user.validate({}, { update: true })).resolves.toEqual({})
 
     // Type error (string)
-    await expect(user.validate({ name: 1 })).rejects.toContainEqual({
+    await expect(user.validate({ name: 1 })).resolves.toEqual({ name: '1' })
+    await expect(user.validate({ name: 1.123 })).resolves.toEqual({ name: '1.123' })
+    await expect(user.validate({ name: undefined }, { validateUndefined: false })).resolves.toEqual({})
+    await expect(user.validate({ name: null })).rejects.toContainEqual({
+      status: '400',
+      title: 'name',
+      detail: 'This field is required.',
+      meta: { rule: 'required', model: 'user', field: 'name' }
+    })
+    await expect(user.validate({ name: true })).rejects.toContainEqual({
       status: '400',
       title: 'name',
       detail: 'Value was not a string.',
@@ -42,6 +51,7 @@ module.exports = function(monastery, opendb) {
     })
 
     // Type error (date)
+    await expect(user.validate({ name: 'a', date: null })).resolves.toEqual({ name: 'a', date: null })
     await expect(user.validate({ name: 'a', date: 'fe' })).rejects.toContainEqual({
       status: '400',
       title: 'date',
@@ -49,6 +59,30 @@ module.exports = function(monastery, opendb) {
       meta: { rule: 'isDate', model: 'user', field: 'date' }
     })
 
+    // Type error (number)
+    let usernum = db.model('usernum', { fields: { amount: { type: 'number', required: true }}})
+    await expect(usernum.validate({ amount: 0 })).resolves.toEqual({ amount: 0 })
+    await expect(usernum.validate({ amount: '0' })).resolves.toEqual({ amount: 0 })
+    await expect(usernum.validate({ amount: undefined }, { validateUndefined: false })).resolves.toEqual({})
+    await expect(usernum.validate({ amount: false })).rejects.toEqual([{
+      status: '400',
+      title: 'amount',
+      detail: 'Value was not a number.',
+      meta: { rule: 'isNumber', model: 'usernum', field: 'amount' }
+    }])
+    await expect(usernum.validate({ amount: null })).rejects.toEqual([{
+      status: '400',
+      title: 'amount',
+      detail: 'This field is required.',
+      meta: { rule: 'required', model: 'usernum', field: 'amount' },
+    }])
+    await expect(usernum.validate({ amount: null }, { validateUndefined: false })).rejects.toEqual([{
+      status: '400',
+      title: 'amount',
+      detail: 'This field is required.',
+      meta: { rule: 'required', model: 'usernum', field: 'amount' },
+    }])
+
     // Type error (array)
     await expect(user.validate({ name: 'a', colors: 1 })).rejects.toContainEqual({
       status: '400',
@@ -224,7 +258,7 @@ module.exports = function(monastery, opendb) {
 
     // Type error within an array (string)
     await expect(user.validate({
-      animals: { cats: [1] }
+      animals: { cats: [true] }
     })).rejects.toContainEqual({
       status: '400',
       title: 'animals.cats.0',
@@ -239,7 +273,7 @@ module.exports = function(monastery, opendb) {
       detail: 'This field is required.',
       meta: { rule: 'required', model: 'user', field: 'color' }
     }
-    await expect(user.validate({ animals: { dogs: [{ name: 'sparky', color: 1 }] }}))
+    await expect(user.validate({ animals: { dogs: [{ name: 'sparky', color: false }] }}))
       .rejects.toContainEqual({
         ...error,
         detail: 'Value was not a string.',
@@ -623,16 +657,9 @@ module.exports = function(monastery, opendb) {
     // Ignores invalid data
     await expect(user.validate({ badprop: true, schema: {} })).resolves.toEqual({})
 
-    // Rejects null for non object/array fields
-    await expect(user.validate({ name: null })).rejects.toEqual([{
-      'detail': 'Value was not a string.',
-      'meta': {'detailLong': undefined, 'field': 'name', 'model': 'user', 'rule': 'isString'},
-      'status':'400',
-      'title': 'name'
-    }])
-
     // String data
     await expect(user.validate({ name: 'Martin Luther' })).resolves.toEqual({ name: 'Martin Luther' })
+    await expect(user.validate({ name: null })).resolves.toEqual({ name: null })
 
     // Array data
     await expect(user.validate({ names: ['blue'] })).resolves.toEqual({ names: ['blue'] })
@@ -652,12 +679,7 @@ module.exports = function(monastery, opendb) {
 
     // Subdocument property data (null)
     await expect(user.validate({ animals: { dog: null }}))
-      .rejects.toEqual([{
-        'detail': 'Value was not a string.',
-        'meta': {'detailLong': undefined, 'field': 'dog', 'model': 'user', 'rule': 'isString'},
-        'status': '400',
-        'title': 'animals.dog',
-      }])
+      .resolves.toEqual({ animals: { dog: null }})
 
     // Subdocument property data (unknown data)
     await expect(user.validate({ animals: { dog: 'sparky', cat: 'grumpy' } }))
@@ -766,15 +788,10 @@ module.exports = function(monastery, opendb) {
     })
 
     // Number valid
-    await expect(user2.validate({ amount: 0 })).resolves.toEqual({ amount: 0 }) // required
-    await expect(user.validate({ amount: '0' })).resolves.toEqual({ amount: 0 }) // required
-    await expect(user.validate({ amount: undefined })).resolves.toEqual({})  // not required
-    await expect(user.validate({ amount: null })).rejects.toEqual([{ // type error
-      'detail': 'Value was not a number.',
-      'meta': { 'field': 'amount', 'model': 'user', 'rule': 'isNumber'},
-      'status': '400',
-      'title': 'amount'
-    }])
+    await expect(user2.validate({ amount: 0 })).resolves.toEqual({ amount: 0 })
+    await expect(user2.validate({ amount: '0' })).resolves.toEqual({ amount: 0 })
+    await expect(user.validate({ amount: undefined })).resolves.toEqual({})
+    await expect(user.validate({ amount: null })).resolves.toEqual({ amount: null })
 
     // Number required
     let mock1 = {