monastery 1.32.2 → 1.32.3

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.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)
 
 

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.2",
+  "version": "1.32.3",
   "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 })

package/test/plugin-images.js

@@ -161,7 +161,7 @@ module.exports = function(monastery, opendb) {
       let express = require('express')
       let upload = require('express-fileupload')
       let app = express()
-      app.use(upload({ limits: { fileSize: 1 * 1000 * 1000, files: 10 }}))
+      app.use(upload({ limits: { filesize: 1 * 1000 * 1000, files: 10 }}))
 
       app.post('/', function(req, res) {
         // Files exist
@@ -292,7 +292,7 @@ module.exports = function(monastery, opendb) {
       let express = require('express')
       let upload = require('express-fileupload')
       let app = express()
-      app.use(upload({ limits: { fileSize: 1 * 1000 * 1000, files: 10 }}))
+      app.use(upload({ limits: { filesize: 1 * 1000 * 1000, files: 10 }}))
 
       app.post('/', function(req, res) {
         req.body.logos = JSON.parse(req.body.logos)
@@ -368,7 +368,7 @@ module.exports = function(monastery, opendb) {
       let express = require('express')
       let upload = require('express-fileupload')
       let app = express()
-      app.use(upload({ limits: { fileSize: 1 * 1000 * 1000, files: 10 }}))
+      app.use(upload({ limits: { filesize: 1 * 1000 * 1000, files: 10 }}))
 
       app.post('/', function(req, res) {
         try {
@@ -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' },
       }})
 
@@ -426,7 +426,7 @@ module.exports = function(monastery, opendb) {
       let express = require('express')
       let upload = require('express-fileupload')
       let app = express()
-      app.use(upload({ limits: { fileSize: 1000 * 200, files: 10 }}))
+      app.use(upload({ limits: { filesize: 1000 * 200, files: 10 }}))
 
       app.post('/', async (req, res) => {
         let imageSvgBad = { imageSvgBad: req.files.imageSvgBad }