@bedrockio/model 0.19.1 → 0.19.2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.19.2
+
+- Fixed issue with delete hooks in subdocument arrays.
+
 ## 0.19.1
 
 - Fix for deep cache field not saving.

package/dist/cjs/delete-hooks.js

@@ -11,7 +11,8 @@ var _errors = require("./errors");
 var _utils = require("./utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const {
-  ObjectId: SchemaObjectId
+  ObjectId: SchemaObjectId,
+  DocumentArray: SchemaDocumentArray
 } = _mongoose.default.Schema.Types;
 function addDeletedFields(definition) {
   let {
@@ -223,7 +224,7 @@ function assertModelNames(arr = []) {
 function getAllReferences(doc) {
   const targetName = doc.constructor.modelName;
   return Object.values(_mongoose.default.models).map(model => {
-    const paths = getModelReferences(model, targetName);
+    const paths = getModelReferences(model.schema, targetName);
     return {
       model,
       paths
@@ -234,10 +235,13 @@ function getAllReferences(doc) {
     return paths.length > 0;
   });
 }
-function getModelReferences(model, targetName) {
-  const paths = [];
-  model.schema.eachPath((schemaPath, schemaType) => {
-    if (schemaType instanceof SchemaObjectId && schemaPath[0] !== '_') {
+function getModelReferences(schema, targetName, path = []) {
+  let references = [];
+  schema.eachPath((name, schemaType) => {
+    if (name.startsWith('_') || name === 'deletedRefs') {
+      return;
+    }
+    if (schemaType instanceof SchemaObjectId) {
       const {
         ref,
         refPath
@@ -246,16 +250,18 @@ function getModelReferences(model, targetName) {
       if (ref) {
         refs = [ref];
       } else if (refPath) {
-        refs = model.schema.path(refPath).options.enum;
+        refs = schema.path(refPath).options.enum;
       } else {
-        throw new Error(`Cannot derive refs for ${model.modelName}#${schemaPath}.`);
+        throw new Error(`Cannot derive refs for ${targetName}#${name}.`);
       }
       if (refs.includes(targetName)) {
-        paths.push(schemaPath);
+        references.push([...path, name].join('.'));
       }
+    } else if (schemaType instanceof SchemaDocumentArray) {
+      references = [...references, ...getModelReferences(schemaType.schema, targetName, [name])];
     }
   });
-  return paths;
+  return references;
 }
 
 // Delete

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrockio/model",
-  "version": "0.19.1",
+  "version": "0.19.2",
   "description": "Bedrock utilities for model creation.",
   "type": "module",
   "scripts": {

package/src/delete-hooks.js

@@ -4,7 +4,8 @@ import mongoose from 'mongoose';
 import { ReferenceError } from './errors';
 import { getInnerField } from './utils';
 
-const { ObjectId: SchemaObjectId } = mongoose.Schema.Types;
+const { ObjectId: SchemaObjectId, DocumentArray: SchemaDocumentArray } =
+  mongoose.Schema.Types;
 
 export function addDeletedFields(definition) {
   let { onDelete: deleteHooks } = definition;
@@ -215,7 +216,7 @@ function getAllReferences(doc) {
   const targetName = doc.constructor.modelName;
   return Object.values(mongoose.models)
     .map((model) => {
-      const paths = getModelReferences(model, targetName);
+      const paths = getModelReferences(model.schema, targetName);
       return { model, paths };
     })
     .filter(({ paths }) => {
@@ -223,27 +224,34 @@ function getAllReferences(doc) {
     });
 }
 
-function getModelReferences(model, targetName) {
-  const paths = [];
-  model.schema.eachPath((schemaPath, schemaType) => {
-    if (schemaType instanceof SchemaObjectId && schemaPath[0] !== '_') {
+function getModelReferences(schema, targetName, path = []) {
+  let references = [];
+  schema.eachPath((name, schemaType) => {
+    if (name.startsWith('_') || name === 'deletedRefs') {
+      return;
+    }
+
+    if (schemaType instanceof SchemaObjectId) {
       const { ref, refPath } = schemaType.options;
       let refs;
       if (ref) {
         refs = [ref];
       } else if (refPath) {
-        refs = model.schema.path(refPath).options.enum;
+        refs = schema.path(refPath).options.enum;
       } else {
-        throw new Error(
-          `Cannot derive refs for ${model.modelName}#${schemaPath}.`,
-        );
+        throw new Error(`Cannot derive refs for ${targetName}#${name}.`);
       }
       if (refs.includes(targetName)) {
-        paths.push(schemaPath);
+        references.push([...path, name].join('.'));
       }
+    } else if (schemaType instanceof SchemaDocumentArray) {
+      references = [
+        ...references,
+        ...getModelReferences(schemaType.schema, targetName, [name]),
+      ];
     }
   });
-  return paths;
+  return references;
 }
 
 // Delete

package/types/delete-hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-hooks.d.ts","sourceRoot":"","sources":["../src/delete-hooks.js"],"names":[],"mappings":"AAQA,wDAgBC;AAED,qEAqCC"}
+{"version":3,"file":"delete-hooks.d.ts","sourceRoot":"","sources":["../src/delete-hooks.js"],"names":[],"mappings":"AASA,wDAgBC;AAED,qEAqCC"}