monastery 2.2.3 → 3.0.0

package/package.json

@@ -1,25 +1,28 @@
 {
   "name": "monastery",
-  "description": "⛪ A straight forward MongoDB ODM built around Monk",
+  "description": "⛪ A simple, straightforward MongoDB ODM",
   "author": "Ricky Boyce",
-  "version": "2.2.3",
+  "version": "3.0.0",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",
   "main": "lib/index.js",
   "keywords": [
+    "database",
+    "javascript",
     "monastery",
-    "monk",
-    "mongodb",
+    "mongo driver",
     "mongo",
-    "driver",
-    "monk odm",
-    "mongo odm"
+    "mongodb",
+    "nodejs",
+    "odm",
+    "orm"
   ],
   "scripts": {
     "dev": "npm run lint & jest --watchAll --runInBand --verbose=false",
     "docs": "cd docs && bundle exec jekyll serve --livereload --livereload-port 4001",
     "lint": "eslint ./lib ./plugins ./test",
+    "mona": "nodemon resources/mona.js",
     "mong": "nodemon resources/mong.js",
     "major": "standard-version --release-as major && npm publish",
     "minor": "standard-version --release-as minor && npm publish",
@@ -30,12 +33,10 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "3.549.0",
-    "@aws-sdk/lib-storage": "3.549.0",
     "@aws-sdk/s3-request-presigner": "3.549.0",
     "debug": "4.3.4",
     "file-type": "^16.5.4",
-    "mongodb": "^3.2.3",
-    "monk": "7.3.4",
+    "mongodb": "^5.9.2",
     "nanoid": "3.2.0",
     "validator": "13.7.0"
   },
@@ -50,8 +51,7 @@
     "supertest": "4.0.2"
   },
   "engines": {
-    "node": ">=14",
-    "npm": ">=6"
+    "node": ">=14"
   },
   "standard-version": {
     "infile": "changelog.md",

package/plugins/images/index.js

@@ -39,7 +39,7 @@ let plugin = module.exports = {
 
     if (!options.awsBucket || !options.awsAccessKeyId || !options.awsSecretAccessKey) {
       manager.error('Monastery imagePlugin: awsBucket, awsAccessKeyId, or awsSecretAccessKey is not defined')
-      delete manager.imagePlugin
+      delete manager.opts.imagePlugin
       return
     }
 
@@ -54,8 +54,8 @@ let plugin = module.exports = {
         region: this.awsRegion,
         credentials: {
           accessKeyId: this.awsAccessKeyId,
-          secretAccessKey: this.awsSecretAccessKey
-        }
+          secretAccessKey: this.awsSecretAccessKey,
+        },
       }))
     }
 
@@ -150,7 +150,7 @@ let plugin = module.exports = {
             let path = filesArr.imageField.path || plugin.path
             let image = {
               bucket: filesArr.imageField.awsBucket || plugin.awsBucket,
-              date: plugin.manager.useMilliseconds? Date.now() : Math.floor(Date.now() / 1000),
+              date: plugin.manager.opts.useMilliseconds? Date.now() : Math.floor(Date.now() / 1000),
               filename: file.name,
               filesize: file.size,
               metadata: filesArr.imageField.metadata || plugin.metadata,
@@ -174,22 +174,11 @@ let plugin = module.exports = {
               plugin._addImageObjectsToData(filesArr.inputPath, data, image)
               resolve(s3Options)
             } else {
-              const { Upload } = require('@aws-sdk/lib-storage')
-              const upload = new Upload({
-                client: plugin.getS3Client(),
-                params: s3Options,
+              plugin.getS3Client().upload(s3Options, (err, response) => {
+                if (err) return reject(err)
+                plugin._addImageObjectsToData(filesArr.inputPath, data, image)
+                resolve(s3Options)
               })
-              // upload.on('httpUploadProgress', (progress) => {
-              //   console.log(progress)
-              // })
-              upload.done()
-                .then((res) => {
-                  plugin._addImageObjectsToData(filesArr.inputPath, data, image)
-                  resolve(s3Options)
-                })
-                .catch((err) => {
-                  reject(err)
-                })
             }
           })
         }))
@@ -204,7 +193,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.
@@ -372,7 +361,7 @@ let plugin = module.exports = {
         { Key: pre.image.path },
         { Key: `small/${key}.jpg` },
         { Key: `medium/${key}.jpg` },
-        { Key: `large/${key}.jpg` },
+        { Key: `large/${key}.jpg` }
       )
       plugin.manager.info(
         `Removing '${pre.image.filename}' from '${pre.image.bucket}/${pre.image.path}'`
@@ -385,7 +374,7 @@ let plugin = module.exports = {
     await new Promise((resolve, reject) => {
       plugin.getS3Client().deleteObjects({
         Bucket: plugin.awsBucket,
-        Delete: { Objects: unused }
+        Delete: { Objects: unused },
       }, (err, data) => {
         if (err) reject(err)
         resolve()
@@ -459,19 +448,19 @@ let plugin = module.exports = {
 
             if (file.truncated) reject({
               title: filesArr.inputPath + (i? `.${i}` : ''),
-              detail: `The file size for '${file.nameClipped}' is too big.`
+              detail: `The file size for '${file.nameClipped}' is too big.`,
             })
             else if (filesize && filesize < file.size) reject({ // file.size == bytes
               title: filesArr.inputPath + (i? `.${i}` : ''),
-              detail: `The file size for '${file.nameClipped}' is bigger than ${(filesize/1000/1000).toFixed(1)}MB.`
+              detail: `The file size for '${file.nameClipped}' is bigger than ${(filesize/1000/1000).toFixed(1)}MB.`,
             })
             else if (file.ext == 'unknown') reject({
               title: filesArr.inputPath + (i? `.${i}` : ''),
-              detail: `Please add a file extension to your file '${file.nameClipped}'`
+              detail: `Please add a file extension to your file '${file.nameClipped}'`,
             })
             else if (!allowAny && !util.inArray(formats, file.ext)) reject({
               title: filesArr.inputPath + (i? `.${i}` : ''),
-              detail: `The file format '${file.ext}' for '${file.nameClipped}' is not supported`
+              detail: `The file format '${file.ext}' for '${file.nameClipped}' is not supported`,
             })
             else resolve()
           })