monastery 1.42.1 → 1.42.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.
 
+### [1.42.3](https://github.com/boycce/monastery/compare/1.42.2...1.42.3) (2024-04-30)
+
+### [1.42.2](https://github.com/boycce/monastery/compare/1.42.1...1.42.2) (2023-10-31)
+
 ### [1.42.1](https://github.com/boycce/monastery/compare/1.42.0...1.42.1) (2023-10-09)
 
 ## [1.42.0](https://github.com/boycce/monastery/compare/1.41.2...1.42.0) (2023-10-09)

package/docs/readme.md

@@ -104,6 +104,7 @@ Coming soon...
 - 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 {}
+- ~~can't insert/update model id (maybe we can allow this and add _id to default insert/update blacklists)~~
 
 ## Versions
 

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?.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/lib/model-crud.js

@@ -25,13 +25,9 @@ module.exports = {
     try {
       opts = await this._queryObject(opts, 'insert')
 
-      // console.log(11, opts.data )
-
       // Validate
       let data = await this.validate(opts.data || {}, opts) // was { ...opts }
 
-      // console.log(22, data)
-
       // Insert
       await util.runSeries(this.beforeInsert.map(f => f.bind(opts, data)))
       let response = await this._insert(data, util.omit(opts, this._queryOptions))

package/lib/model-validate.js

@@ -108,8 +108,6 @@ module.exports = {
     let data2 = util.isArray(fields)? [] : {}
     let timestamps = util.isDefined(opts.timestamps)? opts.timestamps : this.manager.timestamps
 
-    // console.log(8888, fields)
-
     util.forEach(util.forceArray(data), function(data, i) {
       util.forEach(fields, function(field, fieldName) {
         let verrors = []
@@ -133,11 +131,8 @@ module.exports = {
           }
         }
 
-        // console.log(333,path3)
-
         // Ignore blacklisted
         if (this._pathBlacklisted(path3, opts.projectionValidate) && !schema.defaultOverride) return
-        // console.log(444,path3)
         // Ignore insert only
         if (opts.update && schema.insertOnly) return
         // Ignore virtual fields
@@ -146,7 +141,6 @@ module.exports = {
         if (isTypeRule && util.isFunction(isTypeRule.tryParse)) {
           value = isTypeRule.tryParse.call(dataRoot, value, fieldName, this)
         }
-        // console.log(555,path3)
 
         // Schema field (ignore object/array schemas)
         if (util.isSchema(field) && fieldName !== 'schema') {

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A straight forward MongoDB ODM built around Monk",
   "author": "Ricky Boyce",
-  "version": "1.42.1",
+  "version": "1.42.3",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",

package/test/model.js

@@ -462,6 +462,24 @@ module.exports = function(monastery, opendb) {
          type: 'Point'
        },
     })
+    // Insert no 2dsphere point data
+    await expect(db.user3.insert({
+      data: {}
+    })).resolves.toEqual({
+       _id: expect.any(Object),
+    })
+    // Insert bad 2dsphere point data
+    let MongoError = require('mongodb').MongoError
+    let id = db.id()
+    await expect(db.user3.insert({
+      data: { _id: id, location: {} },
+      blacklist: ['-_id'],
+    })).rejects.toEqual(
+      new MongoError(
+        `Can't extract geo keys: { _id: ObjectId('${String(id)}'), location: { type: "Point" } }` +
+        '  Point must be an array or object'
+      )
+    )
 
     db.close()
   })