mongoose 8.8.4 → 8.9.0

package/lib/helpers/model/castBulkWrite.js

@@ -23,234 +23,47 @@ const setDefaultsOnInsert = require('../setDefaultsOnInsert');
 module.exports = function castBulkWrite(originalModel, op, options) {
   const now = originalModel.base.now();
 
-  const globalSetDefaultsOnInsert = originalModel.base.options.setDefaultsOnInsert;
   if (op['insertOne']) {
-    return (callback) => {
-      const model = decideModelByObject(originalModel, op['insertOne']['document']);
-
-      const doc = new model(op['insertOne']['document']);
-      if (model.schema.options.timestamps && getTimestampsOpt(op['insertOne'], options)) {
-        doc.initializeTimestamps();
-      }
-      if (options.session != null) {
-        doc.$session(options.session);
-      }
-      const versionKey = model?.schema?.options?.versionKey;
-      if (versionKey && doc[versionKey] == null) {
-        doc[versionKey] = 0;
-      }
-      op['insertOne']['document'] = doc;
-
-      if (options.skipValidation || op['insertOne'].skipValidation) {
-        callback(null);
-        return;
-      }
-
-      op['insertOne']['document'].$validate().then(
-        () => { callback(null); },
-        err => { callback(err, null); }
-      );
-    };
+    return callback => module.exports.castInsertOne(originalModel, op['insertOne'], options).then(() => callback(null), err => callback(err));
   } else if (op['updateOne']) {
     return (callback) => {
       try {
-        if (!op['updateOne']['filter']) {
-          throw new Error('Must provide a filter object.');
-        }
-        if (!op['updateOne']['update']) {
-          throw new Error('Must provide an update object.');
-        }
-
-        const model = decideModelByObject(originalModel, op['updateOne']['filter']);
-        const schema = model.schema;
-        const strict = options.strict != null ? options.strict : model.schema.options.strict;
-
-        const update = clone(op['updateOne']['update']);
-
-        _addDiscriminatorToObject(schema, op['updateOne']['filter']);
-
-        const doInitTimestamps = getTimestampsOpt(op['updateOne'], options);
-
-        if (model.schema.$timestamps != null && doInitTimestamps) {
-          const createdAt = model.schema.$timestamps.createdAt;
-          const updatedAt = model.schema.$timestamps.updatedAt;
-          applyTimestampsToUpdate(now, createdAt, updatedAt, update, {});
-        }
-
-        if (doInitTimestamps) {
-          applyTimestampsToChildren(now, update, model.schema);
-        }
-
-        const shouldSetDefaultsOnInsert = op['updateOne'].setDefaultsOnInsert == null ?
-          globalSetDefaultsOnInsert :
-          op['updateOne'].setDefaultsOnInsert;
-        if (shouldSetDefaultsOnInsert !== false) {
-          setDefaultsOnInsert(op['updateOne']['filter'], model.schema, update, {
-            setDefaultsOnInsert: true,
-            upsert: op['updateOne'].upsert
-          });
-        }
-
-        decorateUpdateWithVersionKey(
-          update,
-          op['updateOne'],
-          model.schema.options.versionKey
-        );
-
-        op['updateOne']['filter'] = cast(model.schema, op['updateOne']['filter'], {
-          strict: strict,
-          upsert: op['updateOne'].upsert
-        });
-        op['updateOne']['update'] = castUpdate(model.schema, update, {
-          strict: strict,
-          upsert: op['updateOne'].upsert,
-          arrayFilters: op['updateOne'].arrayFilters,
-          overwriteDiscriminatorKey: op['updateOne'].overwriteDiscriminatorKey
-        }, model, op['updateOne']['filter']);
-      } catch (error) {
-        return callback(error, null);
+        module.exports.castUpdateOne(originalModel, op['updateOne'], options, now);
+        callback(null);
+      } catch (err) {
+        callback(err);
       }
-
-      callback(null);
     };
   } else if (op['updateMany']) {
     return (callback) => {
       try {
-        if (!op['updateMany']['filter']) {
-          throw new Error('Must provide a filter object.');
-        }
-        if (!op['updateMany']['update']) {
-          throw new Error('Must provide an update object.');
-        }
-
-        const model = decideModelByObject(originalModel, op['updateMany']['filter']);
-        const schema = model.schema;
-        const strict = options.strict != null ? options.strict : model.schema.options.strict;
-
-        const shouldSetDefaultsOnInsert = op['updateMany'].setDefaultsOnInsert == null ?
-          globalSetDefaultsOnInsert :
-          op['updateMany'].setDefaultsOnInsert;
-
-        if (shouldSetDefaultsOnInsert !== false) {
-          setDefaultsOnInsert(op['updateMany']['filter'], model.schema, op['updateMany']['update'], {
-            setDefaultsOnInsert: true,
-            upsert: op['updateMany'].upsert
-          });
-        }
-
-        const doInitTimestamps = getTimestampsOpt(op['updateMany'], options);
-
-        if (model.schema.$timestamps != null && doInitTimestamps) {
-          const createdAt = model.schema.$timestamps.createdAt;
-          const updatedAt = model.schema.$timestamps.updatedAt;
-          applyTimestampsToUpdate(now, createdAt, updatedAt, op['updateMany']['update'], {});
-        }
-        if (doInitTimestamps) {
-          applyTimestampsToChildren(now, op['updateMany']['update'], model.schema);
-        }
-
-        _addDiscriminatorToObject(schema, op['updateMany']['filter']);
-
-        decorateUpdateWithVersionKey(
-          op['updateMany']['update'],
-          op['updateMany'],
-          model.schema.options.versionKey
-        );
-
-        op['updateMany']['filter'] = cast(model.schema, op['updateMany']['filter'], {
-          strict: strict,
-          upsert: op['updateMany'].upsert
-        });
-
-        op['updateMany']['update'] = castUpdate(model.schema, op['updateMany']['update'], {
-          strict: strict,
-          upsert: op['updateMany'].upsert,
-          arrayFilters: op['updateMany'].arrayFilters,
-          overwriteDiscriminatorKey: op['updateMany'].overwriteDiscriminatorKey
-        }, model, op['updateMany']['filter']);
-      } catch (error) {
-        return callback(error, null);
+        module.exports.castUpdateMany(originalModel, op['updateMany'], options, now);
+        callback(null);
+      } catch (err) {
+        callback(err);
       }
-
-      callback(null);
     };
   } else if (op['replaceOne']) {
     return (callback) => {
-      const model = decideModelByObject(originalModel, op['replaceOne']['filter']);
-      const schema = model.schema;
-      const strict = options.strict != null ? options.strict : model.schema.options.strict;
-
-      _addDiscriminatorToObject(schema, op['replaceOne']['filter']);
-      try {
-        op['replaceOne']['filter'] = cast(model.schema, op['replaceOne']['filter'], {
-          strict: strict,
-          upsert: op['replaceOne'].upsert
-        });
-      } catch (error) {
-        return callback(error, null);
-      }
-
-      // set `skipId`, otherwise we get "_id field cannot be changed"
-      const doc = new model(op['replaceOne']['replacement'], strict, true);
-      if (model.schema.options.timestamps && getTimestampsOpt(op['replaceOne'], options)) {
-        doc.initializeTimestamps();
-      }
-      if (options.session != null) {
-        doc.$session(options.session);
-      }
-      const versionKey = model?.schema?.options?.versionKey;
-      if (versionKey && doc[versionKey] == null) {
-        doc[versionKey] = 0;
-      }
-      op['replaceOne']['replacement'] = doc;
-
-      if (options.skipValidation || op['replaceOne'].skipValidation) {
-        op['replaceOne']['replacement'] = op['replaceOne']['replacement'].toBSON();
-        callback(null);
-        return;
-      }
-
-      op['replaceOne']['replacement'].$validate().then(
-        () => {
-          op['replaceOne']['replacement'] = op['replaceOne']['replacement'].toBSON();
-          callback(null);
-        },
-        error => {
-          callback(error, null);
-        }
-      );
+      module.exports.castReplaceOne(originalModel, op['replaceOne'], options).then(() => callback(null), err => callback(err));
     };
   } else if (op['deleteOne']) {
     return (callback) => {
-      const model = decideModelByObject(originalModel, op['deleteOne']['filter']);
-      const schema = model.schema;
-
-      _addDiscriminatorToObject(schema, op['deleteOne']['filter']);
-
       try {
-        op['deleteOne']['filter'] = cast(model.schema,
-          op['deleteOne']['filter']);
-      } catch (error) {
-        return callback(error, null);
+        module.exports.castDeleteOne(originalModel, op['deleteOne']);
+        callback(null);
+      } catch (err) {
+        callback(err);
       }
-
-      callback(null);
     };
   } else if (op['deleteMany']) {
     return (callback) => {
-      const model = decideModelByObject(originalModel, op['deleteMany']['filter']);
-      const schema = model.schema;
-
-      _addDiscriminatorToObject(schema, op['deleteMany']['filter']);
-
       try {
-        op['deleteMany']['filter'] = cast(model.schema,
-          op['deleteMany']['filter']);
-      } catch (error) {
-        return callback(error, null);
+        module.exports.castDeleteMany(originalModel, op['deleteMany']);
+        callback(null);
+      } catch (err) {
+        callback(err);
       }
-
-      callback(null);
     };
   } else {
     return (callback) => {
@@ -260,6 +73,206 @@ module.exports = function castBulkWrite(originalModel, op, options) {
   }
 };
 
+module.exports.castInsertOne = async function castInsertOne(originalModel, insertOne, options) {
+  const model = decideModelByObject(originalModel, insertOne['document']);
+
+  const doc = new model(insertOne['document']);
+  if (model.schema.options.timestamps && getTimestampsOpt(insertOne, options)) {
+    doc.initializeTimestamps();
+  }
+  if (options.session != null) {
+    doc.$session(options.session);
+  }
+  const versionKey = model?.schema?.options?.versionKey;
+  if (versionKey && doc[versionKey] == null) {
+    doc[versionKey] = 0;
+  }
+  insertOne['document'] = doc;
+
+  if (options.skipValidation || insertOne.skipValidation) {
+    return insertOne;
+  }
+
+  await insertOne['document'].$validate();
+  return insertOne;
+};
+
+module.exports.castUpdateOne = function castUpdateOne(originalModel, updateOne, options, now) {
+  if (!updateOne['filter']) {
+    throw new Error('Must provide a filter object.');
+  }
+  if (!updateOne['update']) {
+    throw new Error('Must provide an update object.');
+  }
+
+  const model = decideModelByObject(originalModel, updateOne['filter']);
+  const schema = model.schema;
+  const strict = options.strict != null ? options.strict : model.schema.options.strict;
+
+  const update = clone(updateOne['update']);
+
+  _addDiscriminatorToObject(schema, updateOne['filter']);
+
+  const doInitTimestamps = getTimestampsOpt(updateOne, options);
+
+  if (model.schema.$timestamps != null && doInitTimestamps) {
+    const createdAt = model.schema.$timestamps.createdAt;
+    const updatedAt = model.schema.$timestamps.updatedAt;
+    applyTimestampsToUpdate(now, createdAt, updatedAt, update, {});
+  }
+
+  if (doInitTimestamps) {
+    applyTimestampsToChildren(now, update, model.schema);
+  }
+
+  const globalSetDefaultsOnInsert = originalModel.base.options.setDefaultsOnInsert;
+  const shouldSetDefaultsOnInsert = updateOne.setDefaultsOnInsert == null ?
+    globalSetDefaultsOnInsert :
+    updateOne.setDefaultsOnInsert;
+  if (shouldSetDefaultsOnInsert !== false) {
+    setDefaultsOnInsert(updateOne['filter'], model.schema, update, {
+      setDefaultsOnInsert: true,
+      upsert: updateOne.upsert
+    });
+  }
+
+  decorateUpdateWithVersionKey(
+    update,
+    updateOne,
+    model.schema.options.versionKey
+  );
+
+  updateOne['filter'] = cast(model.schema, updateOne['filter'], {
+    strict: strict,
+    upsert: updateOne.upsert
+  });
+  updateOne['update'] = castUpdate(model.schema, update, {
+    strict: strict,
+    upsert: updateOne.upsert,
+    arrayFilters: updateOne.arrayFilters,
+    overwriteDiscriminatorKey: updateOne.overwriteDiscriminatorKey
+  }, model, updateOne['filter']);
+
+  return updateOne;
+};
+
+module.exports.castUpdateMany = function castUpdateMany(originalModel, updateMany, options, now) {
+  if (!updateMany['filter']) {
+    throw new Error('Must provide a filter object.');
+  }
+  if (!updateMany['update']) {
+    throw new Error('Must provide an update object.');
+  }
+
+  const model = decideModelByObject(originalModel, updateMany['filter']);
+  const schema = model.schema;
+  const strict = options.strict != null ? options.strict : model.schema.options.strict;
+
+  const globalSetDefaultsOnInsert = originalModel.base.options.setDefaultsOnInsert;
+  const shouldSetDefaultsOnInsert = updateMany.setDefaultsOnInsert == null ?
+    globalSetDefaultsOnInsert :
+    updateMany.setDefaultsOnInsert;
+
+  if (shouldSetDefaultsOnInsert !== false) {
+    setDefaultsOnInsert(updateMany['filter'], model.schema, updateMany['update'], {
+      setDefaultsOnInsert: true,
+      upsert: updateMany.upsert
+    });
+  }
+
+  const doInitTimestamps = getTimestampsOpt(updateMany, options);
+
+  if (model.schema.$timestamps != null && doInitTimestamps) {
+    const createdAt = model.schema.$timestamps.createdAt;
+    const updatedAt = model.schema.$timestamps.updatedAt;
+    applyTimestampsToUpdate(now, createdAt, updatedAt, updateMany['update'], {});
+  }
+  if (doInitTimestamps) {
+    applyTimestampsToChildren(now, updateMany['update'], model.schema);
+  }
+
+  _addDiscriminatorToObject(schema, updateMany['filter']);
+
+  decorateUpdateWithVersionKey(
+    updateMany['update'],
+    updateMany,
+    model.schema.options.versionKey
+  );
+
+  updateMany['filter'] = cast(model.schema, updateMany['filter'], {
+    strict: strict,
+    upsert: updateMany.upsert
+  });
+
+  updateMany['update'] = castUpdate(model.schema, updateMany['update'], {
+    strict: strict,
+    upsert: updateMany.upsert,
+    arrayFilters: updateMany.arrayFilters,
+    overwriteDiscriminatorKey: updateMany.overwriteDiscriminatorKey
+  }, model, updateMany['filter']);
+};
+
+module.exports.castReplaceOne = async function castReplaceOne(originalModel, replaceOne, options) {
+  const model = decideModelByObject(originalModel, replaceOne['filter']);
+  const schema = model.schema;
+  const strict = options.strict != null ? options.strict : model.schema.options.strict;
+
+  _addDiscriminatorToObject(schema, replaceOne['filter']);
+  replaceOne['filter'] = cast(model.schema, replaceOne['filter'], {
+    strict: strict,
+    upsert: replaceOne.upsert
+  });
+
+  // set `skipId`, otherwise we get "_id field cannot be changed"
+  const doc = new model(replaceOne['replacement'], strict, true);
+  if (model.schema.options.timestamps && getTimestampsOpt(replaceOne, options)) {
+    doc.initializeTimestamps();
+  }
+  if (options.session != null) {
+    doc.$session(options.session);
+  }
+  const versionKey = model?.schema?.options?.versionKey;
+  if (versionKey && doc[versionKey] == null) {
+    doc[versionKey] = 0;
+  }
+  replaceOne['replacement'] = doc;
+
+  if (options.skipValidation || replaceOne.skipValidation) {
+    replaceOne['replacement'] = replaceOne['replacement'].toBSON();
+    return;
+  }
+
+  await replaceOne['replacement'].$validate();
+  replaceOne['replacement'] = replaceOne['replacement'].toBSON();
+};
+
+module.exports.castDeleteOne = function castDeleteOne(originalModel, deleteOne) {
+  const model = decideModelByObject(originalModel, deleteOne['filter']);
+  const schema = model.schema;
+
+  _addDiscriminatorToObject(schema, deleteOne['filter']);
+
+  deleteOne['filter'] = cast(model.schema, deleteOne['filter']);
+};
+
+module.exports.castDeleteMany = function castDeleteMany(originalModel, deleteMany) {
+  const model = decideModelByObject(originalModel, deleteMany['filter']);
+  const schema = model.schema;
+
+  _addDiscriminatorToObject(schema, deleteMany['filter']);
+
+  deleteMany['filter'] = cast(model.schema, deleteMany['filter']);
+};
+
+module.exports.cast = {
+  insertOne: module.exports.castInsertOne,
+  updateOne: module.exports.castUpdateOne,
+  updateMany: module.exports.castUpdateMany,
+  replaceOne: module.exports.castReplaceOne,
+  deleteOne: module.exports.castDeleteOne,
+  deleteMany: module.exports.castDeleteMany
+};
+
 function _addDiscriminatorToObject(schema, obj) {
   if (schema == null) {
     return;

package/lib/helpers/populate/getModelsMapForPopulate.js

@@ -54,6 +54,13 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     doc = docs[i];
     let justOne = null;
 
+    if (doc.$__ != null && doc.populated(options.path)) {
+      const forceRepopulate = options.forceRepopulate != null ? options.forceRepopulate : doc.constructor.base.options.forceRepopulate;
+      if (forceRepopulate === false) {
+        continue;
+      }
+    }
+
     const docSchema = doc != null && doc.$__ != null ? doc.$__schema : modelSchema;
     schema = getSchemaTypes(model, docSchema, doc, options.path);
 

package/lib/helpers/schema/getIndexes.js

@@ -39,6 +39,11 @@ module.exports = function getIndexes(schema) {
         continue;
       }
 
+      if (path._duplicateKeyErrorMessage != null) {
+        schema._duplicateKeyErrorMessagesByPath = schema._duplicateKeyErrorMessagesByPath || {};
+        schema._duplicateKeyErrorMessagesByPath[key] = path._duplicateKeyErrorMessage;
+      }
+
       if (path.$isMongooseDocumentArray || path.$isSingleNested) {
         if (get(path, 'options.excludeIndexes') !== true &&
             get(path, 'schemaOptions.excludeIndexes') !== true &&