monastery 3.0.18 → 3.0.19

package/changelog.md

@@ -2,6 +2,8 @@
 
 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.
 
+### [3.0.19](https://github.com/boycce/monastery/compare/3.0.18...3.0.19) (2024-05-05)
+
 ### [3.0.18](https://github.com/boycce/monastery/compare/3.0.16...3.0.18) (2024-05-02)
 
 ### [3.0.16](https://github.com/boycce/monastery/compare/3.0.15...3.0.16) (2024-05-02)

package/lib/model-crud.js

@@ -579,7 +579,7 @@ Model.prototype._processAfterFind = function (data, projection={}, afterFindCont
   let callbackSeries = []
   let models = this.manager.models
   let parent = util.toArray(data).map(o => ({ dataRef: o, dataPath: '', dataFieldName: '', modelName: this.name }))
-  let modelFields = this._recurseAndFindModels('', this.fields, data).concat(parent)
+  let modelFields = this._recurseAndFindModels(data).concat(parent)
 
   // Loop found model/deep-model data objects, and populate missing default-fields and call afterFind on each
   for (let item of modelFields) {
@@ -612,12 +612,12 @@ Model.prototype._processAfterFind = function (data, projection={}, afterFindCont
   return util.runSeries.call(this, callbackSeries, 'afterFind').then(() => data)
 }
 
-Model.prototype._recurseAndFindModels = function (parentPath, schemaFields, dataArr) {
+Model.prototype._recurseAndFindModels = function (dataArr, dataParentPath='', modelPaths) {
   /**
    * Returns a flattened list of models fields
-   * @param {string} parentPath
-   * @param {object} schemaFields - schema fields object
    * @param {object|array} dataArr
+   * @param {string} <dataParentPath>
+   * @this Model
    * @return [{
    *   dataRef: { *fields here* },
    *   dataPath: 'usersNewCompany',
@@ -626,44 +626,67 @@ Model.prototype._recurseAndFindModels = function (parentPath, schemaFields, data
    * },..]
    */
   let out = []
+  let dataParentPath2 = dataParentPath.replace(/\.[0-9]+(\.|$)/g, '$1')
+  
+  // Get all model fields
+  if (!modelPaths) {
+    modelPaths = Object.keys(this.fieldsFlattened).reduce((acc, k) => {
+      if (this.fieldsFlattened[k].model) {
+        acc.push({ k: k, k2: k.replace(/\.[0-9]+(\.|$)/g, '$1') }) // e.g. [{k: 'pets.0.dog', 'k2': 'pets.dog'}, ...]
+      }
+      return acc
+    }, [])
+  }
+
   for (let data of util.toArray(dataArr)) {
-    util.forEach(schemaFields, (field, fieldName) => {
-      if (!data || !data[fieldName]) return
-      const newParentPath = parentPath ? `${parentPath}.${fieldName}` : fieldName 
-      // console.log(11, newParentPath, fieldName, field)
+    for (let key in data) {
+      if (!data[key]) continue
+      const dataPath = dataParentPath ? `${dataParentPath}.${key}` : key
+      const dataPath2 = dataParentPath2 ? `${dataParentPath2}.${key}` : key
+
+      // modelPath has to contain data path
+      const modelPath = modelPaths.find(o => o.k2.match(new RegExp('^' + dataPath2 + '(\\.|$)')))
+      if (!modelPath) continue
+      
+      // Exact path match
+      const pathMatch = modelPath.k2 == dataPath2
 
-      // Recurse through sub-document fields
-      if (util.isObjectAndNotID(data[fieldName]) && util.isSubdocument(field)) {
-        out = [...out, ...this._recurseAndFindModels(newParentPath, field, data[fieldName])]
+      // Ignore id values
+      if (util.isId(data[key])) continue
 
+      // Recurse through sub-document fields
+      if (!pathMatch && util.isSubdocument(data[key])) {
+        out = [...out, ...this._recurseAndFindModels(data[key], dataPath, modelPaths)]
+      
       // Recurse through array of sub-documents
-      } else if (util.isArray(data[fieldName]) && util.isSubdocument((field||[])[0])) {
-        for (let i=0, l=data[fieldName].length; i<l; i++) {
-          out = [...out, ...this._recurseAndFindModels(newParentPath + '.' + i, field[0], data[fieldName][i])]
+      } else if (!pathMatch && util.isSubdocument((data[key]||{})[0])) {
+        for (let i=0, l=data[key].length; i<l; i++) {
+          out = [...out, ...this._recurseAndFindModels(data[key][i], dataPath + '.' + i, modelPaths)]
         }
 
-      // Single data model (schema field can be either a single or array of models, due to custom $lookup's)
-      } else if (util.isObjectAndNotID(data[fieldName]) && (field.model || (field[0]||{}).model)) {
+      // Array of data models (schema field can be either a single or array of models, due to custom $lookup's)
+      } else if (pathMatch && util.isObject(data[key])) {
         out.push({
-          dataRef: data[fieldName],
-          dataPath: newParentPath,
-          dataFieldName: fieldName,
-          modelName: field.model || field[0].model,
+          dataRef: data[key],
+          dataPath: dataPath,
+          dataFieldName: key,
+          modelName: this.fieldsFlattened[modelPath.k].model,
         })
-      
+
       // Array of data models (schema field can be either a single or array of models, due to custom $lookup's)
-      } else if (util.isObjectAndNotID(data[fieldName][0]) && (field.model || (field[0]||{}).model)) {
-        for (let i=0, l=data[fieldName].length; i<l; i++) {
+      } else if (pathMatch && util.isObject(data[key][0])) {
+        for (let i=0, l=data[key].length; i<l; i++) {
           out.push({
-            dataRef: data[fieldName][i],
-            dataPath: newParentPath + '.' + i,
-            dataFieldName: fieldName,
-            modelName: field.model || field[0].model,
+            dataRef: data[key][i],
+            dataPath: dataPath + '.' + i,
+            dataFieldName: key,
+            modelName: this.fieldsFlattened[modelPath.k].model,
           })
         }
-      } 
-    }, this)
+      }
+    }
   }
+
   return out
 }
 

package/lib/util.js

@@ -110,8 +110,7 @@ module.exports = {
   isId: function(value) {
     // Called from db.isId
     // True if value is a MongoDB ObjectId() or a valid id string
-    if (this.isObject(value) && ObjectId.isValid(value)) return true
-    else if (value && this.isString(value) && ObjectId.isValid(value)) return true
+    if (ObjectId.isValid(value) && typeof value !== 'number') return true
     else return false
   },
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A simple, straightforward MongoDB ODM",
   "author": "Ricky Boyce",
-  "version": "3.0.18",
+  "version": "3.0.19",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",