monastery 2.2.1 → 2.2.3

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.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)
 
 ## [2.2.0](https://github.com/boycce/monastery/compare/2.1.1...2.2.0) (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

@@ -2,13 +2,13 @@ let fs = require('fs')
 let debug = require('debug')
 let monk = require('monk')
 let path = require('path')
-let rules = require('./rules')
-let util = require('./util')
+let rules = require('./rules.js')
+let util = require('./util.js')
 
 // Apply monk monkey patches
-monk.manager.prototype.open = require('./monk-monkey-patches').open
-monk.manager.prototype.then = require('./monk-monkey-patches').then
-monk.Collection.prototype.findOneAndUpdate = require('./monk-monkey-patches').findOneAndUpdate
+monk.manager.prototype.open = require('./monk-monkey-patches.js').open
+monk.manager.prototype.then = require('./monk-monkey-patches.js').then
+monk.Collection.prototype.findOneAndUpdate = require('./monk-monkey-patches.js').findOneAndUpdate
 
 module.exports = function(uri, opts, fn) {
   /**
@@ -49,9 +49,9 @@ module.exports = function(uri, opts, fn) {
   // Add monastery properties
   manager.arrayWithSchema = arrayWithSchema
   manager.beforeModel = []
-  manager.imagePluginFile = require('../plugins/images')
+  manager.imagePluginFile = require('../plugins/images/index.js')
   manager.isId = util.isId.bind(util)
-  manager.model = require('./model')
+  manager.model = require('./model.js')
   manager.models = models
   manager.parseData = util.parseData.bind(util)
   manager.info = info

package/lib/model-crud.js

@@ -1,4 +1,4 @@
-let util = require('./util')
+let util = require('./util.js')
 
 module.exports = {
 

package/lib/model-validate.js

@@ -1,5 +1,5 @@
-let util = require('./util')
-let rules = require('./rules')
+let util = require('./util.js')
+let rules = require('./rules.js')
 
 module.exports = {
 

package/lib/model.js

@@ -1,7 +1,7 @@
-let crud = require('./model-crud')
-let rules = require('./rules')
-let util = require('./util')
-let validate = require('./model-validate')
+let crud = require('./model-crud.js')
+let rules = require('./rules.js')
+let util = require('./util.js')
+let validate = require('./model-validate.js')
 
 let Model = module.exports = function(name, opts, manager) {
   /**

package/lib/rules.js

@@ -1,6 +1,6 @@
 // Todo: remove stringnums in date/number/integer rules
 let ObjectId = require('mongodb').ObjectId
-let util = require('./util')
+let util = require('./util.js')
 
 module.exports = {
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A straight forward MongoDB ODM built around Monk",
   "author": "Ricky Boyce",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "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

@@ -1,6 +1,6 @@
 // requiring: nanoid, file-type, aws-sdk/clients/s3
 const { getSignedUrl } = require('@aws-sdk/s3-request-presigner')
-const util = require('../../lib/util')
+const util = require('../../lib/util.js')
 
 let plugin = module.exports = {
 
@@ -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/blacklisting.js

@@ -1,6 +1,6 @@
-let bird = require('./mock/blacklisting').bird
-let user = require('./mock/blacklisting').user
-let util = require('../lib/util')
+let bird = require('./mock/blacklisting.js').bird
+let user = require('./mock/blacklisting.js').user
+let util = require('../lib/util.js')
 
 module.exports = function(monastery, opendb) {
 

package/test/crud.js

@@ -1,5 +1,3 @@
-// let util = require('../lib/util')
-
 module.exports = function(monastery, opendb) {
 
   test('basic operator calls', async () => {

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 }))
+  })
+
 }

package/test/plugin-images.js

@@ -1,4 +1,4 @@
-let util = require('../lib/util')
+let util = require('../lib/util.js')
 
 module.exports = function(monastery, opendb) {
 

package/test/test.js

@@ -14,7 +14,7 @@
 
 global.oid = require('mongodb').ObjectID
 
-let monastery = require('../lib')
+let monastery = require('../lib/index.js')
 let opendb = async function(uri, opts) {
   let db = monastery(
     uri === false? false : (uri || 'localhost/monastery'),
@@ -27,12 +27,12 @@ let opendb = async function(uri, opts) {
 }
 
 /* Run tests sequentially */
-require('./util')(monastery, opendb)
-require('./monk')(monastery, opendb)
-require('./model')(monastery, opendb)
-require('./crud')(monastery, opendb)
-require('./blacklisting')(monastery, opendb)
-require('./populate')(monastery, opendb)
-require('./validate')(monastery, opendb)
-require('./plugin-images')(monastery, opendb)
-require('./virtuals')(monastery, opendb)
+require('./util.js')(monastery, opendb)
+require('./monk.js')(monastery, opendb)
+require('./model.js')(monastery, opendb)
+require('./crud.js')(monastery, opendb)
+require('./blacklisting.js')(monastery, opendb)
+require('./populate.js')(monastery, opendb)
+require('./validate.js')(monastery, opendb)
+require('./plugin-images.js')(monastery, opendb)
+require('./virtuals.js')(monastery, opendb)

package/test/util.js

@@ -1,4 +1,4 @@
-let util = require('../lib/util')
+let util = require('../lib/util.js')
 
 module.exports = function(monastery, opendb) {
 

package/test/validate.js

@@ -1,6 +1,5 @@
 // Todo: split out basic 'type' tests
-
-let validate = require('../lib/model-validate')
+let validate = require('../lib/model-validate.js')
 
 module.exports = function(monastery, opendb) {