monastery 2.2.2 → 2.2.4

package/changelog.md

@@ -2,6 +2,10 @@
 
 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.
 
+### [2.2.4](https://github.com/boycce/monastery/compare/2.2.3...2.2.4) (2024-04-30)
+
+### [2.2.3](https://github.com/boycce/monastery/compare/2.2.2...2.2.3) (2024-04-28)
+
 ### [2.2.2](https://github.com/boycce/monastery/compare/2.2.1...2.2.2) (2024-04-07)
 
 ### [2.2.1](https://github.com/boycce/monastery/compare/2.2.0...2.2.1) (2024-04-07)

package/docs/readme.md

@@ -65,6 +65,12 @@ db.user.insert({
   // }]
 })
 ```
+## Versions
+
+- Monk: `v7.3.4`
+- MongoDB NodeJS driver: `v3.7.4` ([MongoDB compatibility](https://www.mongodb.com/docs/drivers/node/current/compatibility/#compatibility))
+- MongoDB: [`v5.0.0`](https://www.mongodb.com/docs/v5.0/reference/) [(`v6.0.0` partial support)](https://www.mongodb.com/docs/v6.0/reference/)
+  
 ## Debugging
 
 This package uses [debug](https://github.com/visionmedia/debug) which allows you to set different levels of output via the `DEBUG` environment variable. Due to known limations `monastery:warning` and `monastery:error` are forced on, you can however disable these via [manager settings](./manager).
@@ -101,7 +107,7 @@ Coming soon...
 - Global after/before hooks
 - before hooks can receive a data array, remove this
 - docs: Make the implicit ID query conversion more apparent
-- Split away from Monk (unless updated)
+- Split away from Monk so we can update the MongoDB NodeJS Driver version
 - Add a warning if an invalid model is referenced in jthe schema
 - Remove leading forward slashes from custom image paths (AWS adds this as a seperate folder)
 - double check await db.model.remove({ query: idfromparam }) doesnt cause issues for null, undefined or '', but continue to allow {}
@@ -111,12 +117,6 @@ Coming soon...
 - test importing of models
 - Docs: model.methods
 
-## Versions
-
-- Monk: `v7.3.4`
-- MongoDB NodeJS driver: `v3.2.3` ([compatibility](https://www.mongodb.com/docs/drivers/node/current/compatibility/#compatibility))
-- MongoDB: [`v4.0.0`](https://www.mongodb.com/docs/v4.2/reference/)
-
 ## Special Thanks
 
 [Jerome Gravel-Niquet](https://github.com/jeromegn)

package/lib/index.js

@@ -80,10 +80,12 @@ let arrayWithSchema = function(array, schema) {
   return array
 }
 
-let models = async function(pathname, waitForIndexes) {
+let models = async function(pathname, waitForIndexes, commonJs) {
   /**
    * Setup model definitions from a folder location
    * @param {string} pathname
+   * @param {boolean} waitForIndexes - Wait for indexes to be created?
+   * @param {boolean} commonJs - Use commonJs require() instead of ES6 import()
    * @return {Promise(object)} - e.g. { user: , article: , .. }
    * @this Manager
    */
@@ -97,12 +99,17 @@ let models = async function(pathname, waitForIndexes) {
     if (!filename.match(/\.[cm]?js$/)) continue
     let name = filename.replace('.js', '')
     let filepath = path.join(pathname, filename)
-    // We can't use require() here since we need to be able to import both CJS and ES6 modules
-    let definition = ((await import(filepath))||{}).default
-    // When a commonJS project uses babel (e.g. `nodemon -r @babel/register`, similar to `-r esm`), import() 
-    // will return ES6 model definitions in another nested `default` object
-    if (definition && definition.default) definition = definition.default
-    if (!definition) throw new Error(`The model definition for '${name}' must export a default object`)
+    let definition
+    if (commonJs) {
+      definition = require(require('path').join(path, filename)).default
+    } else {
+      // We can't use require() here since we need to be able to import both CJS and ES6 modules
+      definition = ((await import(filepath))||{}).default
+      // When a commonJS project uses babel (e.g. `nodemon -r @babel/register`, similar to `-r esm`), import() 
+      // will return ES6 model definitions in another nested `default` object
+      if (definition && definition.default) definition = definition.default
+      if (!definition) throw new Error(`The model definition for '${name}' must export a default object`)
+    }
     // Wait for indexes to be created?
     if (waitForIndexes) out[name] = await this.model(name, { ...definition, waitForIndexes })
     else out[name] = this.model(name, definition)

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A straight forward MongoDB ODM built around Monk",
   "author": "Ricky Boyce",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",
@@ -30,11 +30,12 @@
   },
   "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",
-    "monk": "7.3.4",
     "mongodb": "^3.2.3",
+    "monk": "7.3.4",
     "nanoid": "3.2.0",
     "validator": "13.7.0"
   },

package/plugins/images/index.js

@@ -174,11 +174,22 @@ let plugin = module.exports = {
               plugin._addImageObjectsToData(filesArr.inputPath, data, image)
               resolve(s3Options)
             } else {
-              plugin.getS3Client().upload(s3Options, (err, response) => {
-                if (err) return reject(err)
-                plugin._addImageObjectsToData(filesArr.inputPath, data, image)
-                resolve(s3Options)
+              const { Upload } = require('@aws-sdk/lib-storage')
+              const upload = new Upload({
+                client: plugin.getS3Client(),
+                params: s3Options,
               })
+              // upload.on('httpUploadProgress', (progress) => {
+              //   console.log(progress)
+              // })
+              upload.done()
+                .then((res) => {
+                  plugin._addImageObjectsToData(filesArr.inputPath, data, image)
+                  resolve(s3Options)
+                })
+                .catch((err) => {
+                  reject(err)
+                })
             }
           })
         }))

package/test/monk.js

@@ -37,4 +37,17 @@ module.exports = function(monastery, opendb) {
     })
   })
 
+  test('Monk basic operations', async () => {
+    let db = monastery('localhost/monastery', { serverSelectionTimeoutMS: 2000 })
+    let userCol = db.get('user')
+
+    // Insert (returns whole document)
+    let res1 = await userCol.insert({ woot: 'b' })
+    expect(res1).toEqual(expect.objectContaining({ woot: 'b', _id: expect.any(Object) }))
+
+    // Update (returns whole document)
+    let res2 = await userCol.update({ woot: 'b' }, { $set: { woot: 'c' }})
+    expect(res2).toEqual(expect.objectContaining({ n: 1, nModified: 1, ok: 1 }))
+  })
+
 }