monastery 1.41.2 → 1.42.1

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.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)
+
 ### [1.41.2](https://github.com/boycce/monastery/compare/1.41.1...1.41.2) (2023-10-04)
 
 ### [1.41.1](https://github.com/boycce/monastery/compare/1.41.0...1.41.1) (2023-04-17)

package/lib/model-crud.js

@@ -25,9 +25,13 @@ 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,6 +108,8 @@ 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 = []
@@ -131,8 +133,11 @@ 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
@@ -141,6 +146,7 @@ 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/lib/model.js

@@ -39,7 +39,9 @@ let Model = module.exports = function(name, opts, manager) {
     error: manager.error,
     info: manager.info,
     warn: manager.warn,
-    insertBL: opts.insertBL || [],
+    insertBL: opts.insertBL
+      ? !opts.insertBL.includes('_id') && !opts.insertBL.includes('-_id') ? ['_id'].concat(opts.insertBL) : opts.insertBL
+      : ['_id'],
     fields: { ...(util.deepCopy(opts.fields) || {}) },
     findBL: opts.findBL || ['password'],
     manager: manager,
@@ -71,7 +73,7 @@ let Model = module.exports = function(name, opts, manager) {
   }, this)
 
   // Extend default fields with passed in fields and check for invalid fields
-  this._setupFields(this.fields = Object.assign({}, this._timestampFields, this.fields))
+  this._setupFields(this.fields = Object.assign({}, this._defaultFields, this.fields))
   this.fieldsFlattened = this._getFieldsFlattened(this.fields, '') // test output?
 
   // Extend model with monk collection queries
@@ -321,7 +323,11 @@ Model.prototype._setupIndexes = function(fields, opts={}) {
   }
 }
 
-Model.prototype._timestampFields = {
+Model.prototype._defaultFields = {
+  _id: {
+    insertOnly: true,
+    type: 'id'
+  },
   createdAt: {
     default: function(fieldName, model) {
       return model.manager.useMilliseconds? Date.now() : Math.floor(Date.now() / 1000)

package/package.json

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

package/test/blacklisting.js

@@ -339,7 +339,7 @@ module.exports = function(monastery, opendb) {
     db.close()
   })
 
-  test('insert update blacklisting (validate)', async () => {
+  test('insert blacklisting (validate)', async () => {
     // Setup
     let db = (await opendb(null)).db
     let user = db.model('user', {
@@ -365,15 +365,21 @@ module.exports = function(monastery, opendb) {
         }
       },
       insertBL: [
+        // '_id', // default
         'dog',
         'animals.cat',
         'pets.age',
         'hiddenPets',
         'hiddenList',
         'deep.deep2.deep3'
-      ]
+      ],
+      updateBL: [
+        // '_id' // default
+      ],
     })
+    let doc1Id = db.id()
     let doc1 = {
+      _id: doc1Id,
       list: [44, 54],
       dog: 'Bruce',
       pet: 'Freddy',
@@ -409,9 +415,10 @@ module.exports = function(monastery, opendb) {
       }
     })
 
-    // Custom blacklist (remove and add to the current schema blacklist)
+    // Custom insert blacklist (remove and add to the current schema blacklist)
     let user2 = await user.validate(doc1, {
       blacklist: [
+        '-_id',
         '-dog',
         '-animals.dog', // wrong property
         'pets.name',
@@ -421,6 +428,7 @@ module.exports = function(monastery, opendb) {
     })
     let customBlacklist
     expect(user2).toEqual((customBlacklist = {
+      _id: doc1Id,
       list: [44, 54],
       dog: 'Bruce',
       pet: 'Freddy',
@@ -440,7 +448,7 @@ module.exports = function(monastery, opendb) {
 
     // Blacklist string
     let user3 = await user.validate(doc1, {
-      blacklist: '-dog -animals.dog pets.name -hiddenList -deep'
+      blacklist: '-_id -dog -animals.dog pets.name -hiddenList -deep'
     })
     expect(user3).toEqual(customBlacklist)
 
@@ -467,6 +475,14 @@ module.exports = function(monastery, opendb) {
         }
       }
     })
+
+    // double check that _id.insertOnly is working
+    let user6 = await user.validate(doc1, { update: true, blacklist: false })
+    expect(user6).toEqual({
+      ...doc1,
+      _id: undefined,
+    })
+
     db.close()
   })
 

package/test/model.js

@@ -14,6 +14,11 @@ module.exports = function(monastery, opendb) {
 
     // no fields defined
     expect(db.model('user2', { fields: {} }).fields).toEqual({
+      _id: {
+         insertOnly: true,
+         isId: true,
+         type: 'id',
+       },
       createdAt: {
          default: expect.any(Function),
          insertOnly: true,
@@ -74,6 +79,11 @@ module.exports = function(monastery, opendb) {
 
     // Default fields
     expect(db.model('user2', { fields: {} }).fields).toEqual({
+      _id: {
+        insertOnly: true,
+        isId: true,
+        type: 'id',
+      },
       createdAt: {
         default: expect.any(Function),
         insertOnly: true,

package/test/validate.js

@@ -765,6 +765,11 @@ module.exports = function(monastery, opendb) {
     // Subdocument -> array -> subdocument data (empty)
     await expect(user.validate({ animals: { dogs: [{}] }}))
       .resolves.toEqual({ animals: { dogs: [{}] }})
+
+    // _id is blacklisted by default
+    let id = db.id()
+    await expect(user.validate({ _id: id })).resolves.toEqual({})
+    await expect(user.validate({ _id: id }, { update: true })).resolves.toEqual({})
   })
 
   test('schema options', async () => {