monastery 1.40.5 → 1.41.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.41.1](https://github.com/boycce/monastery/compare/1.41.0...1.41.1) (2023-04-17)
+
+## [1.41.0](https://github.com/boycce/monastery/compare/1.40.5...1.41.0) (2023-04-16)
+
 ### [1.40.5](https://github.com/boycce/monastery/compare/1.40.4...1.40.5) (2023-02-22)
 
 ### [1.40.4](https://github.com/boycce/monastery/compare/1.40.3...1.40.4) (2022-12-21)

package/docs/definition/index.md

@@ -43,15 +43,20 @@ Model definition object.
     pets: [{ // array of embedded documents
       name: { type: 'string' },
       type: { type: 'string' },
-    }]
-    // You can add a rule on the embedded document or array using the following structure
-    pets: {
-      type: [{
+    }],
+    // You can add a rule on an embedded-document/array using the following structure
+    address: {
+      name: { type: 'string' },
+      type: { type: 'string' },
+      schema: { minLength: 1 },
+    },
+    pets: db.arrayWithSchema(
+      [{
         name: { type: 'string' },
         type: { type: 'string' },
       }],
-      minLength: 1,
-    }
+      { minLength: 1 },
+    )
   }
 }
 ```

package/docs/model/remove.md

@@ -13,6 +13,7 @@ Remove document(s) in a collection and calls model hooks: `beforeRemove`,  `afte
 
 - `query` *(object\|id)*: [`MongoDB query document`](https://www.mongodb.com/docs/v4.4/tutorial/query-documents/), or id
 - [`sort`] *(string\|object\|array)*: same as the mongodb option, but  allows for string parsing e.g. 'name', 'name:1'
+- [`multi`] *(boolean)*: set to false remove only the first document that match the query criteria
 - [[`any mongodb option`](http://mongodb.github.io/node-mongodb-native/3.2/api/Collection.html#remove)] *(any)*
 
 [`callback`] *(function)*: pass instead of return a promise

package/lib/model.js

@@ -195,7 +195,13 @@ Model.prototype._setupFields = function(fields) {
         field.schema.index = index2dsphere
         delete field.index
       }
-      field.schema = { type: 'object', isObject: true, default: objectDefault, nullObject: nullObject, ...field.schema }
+      field.schema = { 
+        type: 'object', 
+        isObject: true, 
+        default: objectDefault, 
+        nullObject: nullObject, 
+        ...field.schema 
+      }
       this._setupFields(field)
     }
   }, this)

package/lib/util.js

@@ -109,6 +109,8 @@ module.exports = {
 
   isSubdocument: function(value) {
     /**
+     * "are all fields objects/arrays?"
+     * 
      * Is the value a subdocument which contains more fields? Or a just a field definition?
      * @param {object} value - object to check
      *   E.g. isSubdocument = {

package/package.json

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

package/test/model.js

@@ -115,6 +115,52 @@ module.exports = function(monastery, opendb) {
     })
   })
 
+  test('model setup with schema', async () => {
+    // Setup
+    let db = (await opendb(false)).db
+    let objectSchemaTypeRef = { name: { type: 'string', minLength: 5 } }
+    let user = db.model('user', { 
+      fields: {
+        pet: { ...objectSchemaTypeRef, schema: { virtual: true }}, 
+        pets: db.arrayWithSchema(
+          [objectSchemaTypeRef],
+          { virtual: true },
+        ),
+      }
+    })
+    // Object with schema
+    expect(user.fields.pet).toEqual({
+      name: {
+        type: 'string', 
+        isString: true,
+        minLength: 5,
+      },
+      schema: {
+        type: 'object', 
+        isObject: true,
+        virtual: true,
+      },
+    })
+    // Array with schema
+    expect(user.fields.pets[0]).toEqual({
+      name: {
+        type: 'string', 
+        isString: true,
+        minLength: 5,
+      },
+      schema: {
+        type: 'object', 
+        isObject: true,
+      },
+    })
+    expect(user.fields.pets.schema).toEqual({
+      type: 'array', 
+      isArray: true,
+      virtual: true,
+    })
+  })
+
+
   test('model reserved rules', async () => {
     // Setup
     let db = (await opendb(false, { hideErrors: true })).db // hide debug error