mongoose 9.0.2 → 9.1.0

package/lib/drivers/node-mongodb-native/collection.js

@@ -91,15 +91,8 @@ function iter(i) {
     const collection = this._getCollection();
     const args = Array.from(arguments);
     const _this = this;
-    const globalDebug = _this &&
-      _this.conn &&
-      _this.conn.base &&
-      _this.conn.base.options &&
-      _this.conn.base.options.debug;
-    const connectionDebug = _this &&
-      _this.conn &&
-      _this.conn.options &&
-      _this.conn.options.debug;
+    const globalDebug = _this?.conn?.base?.options?.debug;
+    const connectionDebug = _this?.conn?.options?.debug;
     const debug = connectionDebug == null ? globalDebug : connectionDebug;
     const opId = new ObjectId();
 
@@ -180,7 +173,7 @@ function iter(i) {
       }
 
       const ret = collection[i].apply(collection, args);
-      if (ret != null && typeof ret.then === 'function') {
+      if (typeof ret?.then === 'function') {
         return ret.then(
           result => {
             if (timeout != null) {
@@ -312,7 +305,7 @@ function formatDate(x, key, shell) {
   }
 }
 function format(obj, sub, color, shell) {
-  if (obj && typeof obj.toBSON === 'function') {
+  if (typeof obj?.toBSON === 'function') {
     obj = obj.toBSON();
   }
   if (obj == null) {
@@ -362,12 +355,7 @@ function format(obj, sub, color, shell) {
           formatDate(x, key, shell);
         } else if (_constructorName === 'ClientSession') {
           x[key] = inspectable('ClientSession("' +
-            (
-              x[key] &&
-              x[key].id &&
-              x[key].id.id &&
-              x[key].id.id.buffer || ''
-            ).toString('hex') + '")');
+            (x[key]?.id?.id?.buffer || '').toString('hex') + '")');
         } else if (Array.isArray(x[key])) {
           x[key] = x[key].map(map);
         } else if (error != null) {

package/lib/drivers/node-mongodb-native/connection.js

@@ -118,7 +118,7 @@ NativeConnection.prototype.useDb = function(name, options) {
   newConn.otherDbs.push(this);
 
   // push onto the relatedDbs cache, this is used when state changes
-  if (options && options.useCache) {
+  if (options?.useCache) {
     this.relatedDbs[newConn.name] = newConn;
     newConn.relatedDbs = this.relatedDbs;
   }
@@ -251,9 +251,7 @@ NativeConnection.prototype.createClient = async function createClient(uri, optio
 
   if (options) {
 
-    const autoIndex = options.config && options.config.autoIndex != null ?
-      options.config.autoIndex :
-      options.autoIndex;
+    const autoIndex = options.config?.autoIndex ?? options.autoIndex;
     if (autoIndex != null) {
       this.config.autoIndex = autoIndex !== false;
       delete options.config;
@@ -316,15 +314,15 @@ NativeConnection.prototype.createClient = async function createClient(uri, optio
 
   const { schemaMap, encryptedFieldsMap } = this._buildEncryptionSchemas();
 
-  if ((Object.keys(schemaMap).length > 0 || Object.keys(encryptedFieldsMap).length) && !options.autoEncryption) {
+  if ((utils.hasOwnKeys(schemaMap) || utils.hasOwnKeys(encryptedFieldsMap)) && !options.autoEncryption) {
     throw new Error('Must provide `autoEncryption` when connecting with encrypted schemas.');
   }
 
-  if (Object.keys(schemaMap).length > 0) {
+  if (utils.hasOwnKeys(schemaMap)) {
     options.autoEncryption.schemaMap = schemaMap;
   }
 
-  if (Object.keys(encryptedFieldsMap).length > 0) {
+  if (utils.hasOwnKeys(encryptedFieldsMap)) {
     options.autoEncryption.encryptedFieldsMap = encryptedFieldsMap;
   }
 
@@ -435,18 +433,8 @@ function _setClient(conn, client, options, dbName) {
   const db = dbName != null ? client.db(dbName) : client.db();
   conn.db = db;
   conn.client = client;
-  conn.host = client &&
-    client.s &&
-    client.s.options &&
-    client.s.options.hosts &&
-    client.s.options.hosts[0] &&
-    client.s.options.hosts[0].host || void 0;
-  conn.port = client &&
-    client.s &&
-    client.s.options &&
-    client.s.options.hosts &&
-    client.s.options.hosts[0] &&
-    client.s.options.hosts[0].port || void 0;
+  conn.host = client?.s?.options?.hosts?.[0]?.host;
+  conn.port = client?.s?.options?.hosts?.[0]?.port;
   conn.name = dbName != null ? dbName : db.databaseName;
   conn._closeCalled = client._closeCalled;
 
@@ -463,10 +451,7 @@ function _setClient(conn, client, options, dbName) {
     }
   };
 
-  const type = client &&
-  client.topology &&
-  client.topology.description &&
-  client.topology.description.type || '';
+  const type = client?.topology?.description?.type || '';
 
   if (type === 'Single') {
     client.on('serverDescriptionChanged', ev => {

package/lib/error/cast.js

@@ -109,7 +109,7 @@ function getValueType(value) {
 }
 
 function getMessageFormat(schemaType) {
-  const messageFormat = schemaType && schemaType._castErrorMessage || null;
+  const messageFormat = schemaType?._castErrorMessage || null;
   if (typeof messageFormat === 'string' || typeof messageFormat === 'function') {
     return messageFormat;
   }

package/lib/helpers/aggregate/prepareDiscriminatorPipeline.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = function prepareDiscriminatorPipeline(pipeline, schema, prefix) {
-  const discriminatorMapping = schema && schema.discriminatorMapping;
+  const discriminatorMapping = schema?.discriminatorMapping;
   prefix = prefix || '';
 
   if (discriminatorMapping && !discriminatorMapping.isRoot) {
@@ -18,12 +18,12 @@ module.exports = function prepareDiscriminatorPipeline(pipeline, schema, prefix)
       originalPipeline[0].$match[filterKey] = discriminatorValue;
       // `originalPipeline` is a ref, so there's no need for
       // aggregate._pipeline = originalPipeline
-    } else if (originalPipeline[0] != null && originalPipeline[0].$geoNear) {
+    } else if (originalPipeline[0]?.$geoNear) {
       originalPipeline[0].$geoNear.query =
           originalPipeline[0].$geoNear.query || {};
       originalPipeline[0].$geoNear.query[filterKey] = discriminatorValue;
-    } else if (originalPipeline[0] != null && originalPipeline[0].$search) {
-      if (originalPipeline[1] && originalPipeline[1].$match != null) {
+    } else if (originalPipeline[0]?.$search) {
+      if (originalPipeline[1]?.$match != null) {
         originalPipeline[1].$match[filterKey] = originalPipeline[1].$match[filterKey] || discriminatorValue;
       } else {
         const match = {};

package/lib/helpers/clone.js

@@ -53,7 +53,7 @@ function clone(obj, options, isArrayChild) {
         if (obj.__parentArray != null) {
           clonedDoc.__parentArray = obj.__parentArray;
         }
-        clonedDoc.$__parent = obj.$__parent;
+        clonedDoc.$__setParent(options.parentDoc ?? obj.$__parent);
         return clonedDoc;
       }
     }
@@ -63,7 +63,7 @@ function clone(obj, options, isArrayChild) {
     }
 
     let ret;
-    if (options && options.json && typeof obj.toJSON === 'function') {
+    if (options?.json && typeof obj.toJSON === 'function') {
       ret = obj.toJSON(options);
     } else {
       ret = obj.toObject(options);
@@ -89,14 +89,14 @@ function clone(obj, options, isArrayChild) {
   }
 
   if (isBsonType(obj, 'ObjectId')) {
-    if (options && options.flattenObjectIds) {
+    if (options?.flattenObjectIds) {
       return obj.toJSON();
     }
     return new ObjectId(obj.id);
   }
 
   if (isBsonType(obj, 'Decimal128')) {
-    if (options && options.flattenDecimals) {
+    if (options?.flattenDecimals) {
       return obj.toJSON();
     }
     return Decimal.fromString(obj.toString());
@@ -114,7 +114,7 @@ function clone(obj, options, isArrayChild) {
   // If we're cloning this object to go into a MongoDB command,
   // and there's a `toBSON()` function, assume this object will be
   // stored as a primitive in MongoDB and doesn't need to be cloned.
-  if (options && options.bson && typeof obj.toBSON === 'function') {
+  if (options?.bson && typeof obj.toBSON === 'function') {
     return obj;
   }
 
@@ -131,9 +131,9 @@ module.exports = clone;
  */
 
 function cloneObject(obj, options, isArrayChild) {
-  const minimize = options && options.minimize;
-  const omitUndefined = options && options.omitUndefined;
-  const seen = options && options._seen;
+  const minimize = options?.minimize;
+  const omitUndefined = options?.omitUndefined;
+  const seen = options?._seen;
   const ret = {};
   let hasKeys;
 

package/lib/helpers/common.js

@@ -35,12 +35,12 @@ function flatten(update, path, options, schema) {
     result[path + key] = val;
 
     // Avoid going into mixed paths if schema is specified
-    const keySchema = schema && schema.path && schema.path(path + key);
-    const isNested = schema && schema.nested && schema.nested[path + key];
-    if (keySchema && keySchema.instance === 'Mixed') continue;
+    const keySchema = schema?.path?.(path + key);
+    const isNested = schema?.nested?.[path + key];
+    if (keySchema?.instance === 'Mixed') continue;
 
     if (shouldFlatten(val)) {
-      if (options && options.skipArrays && Array.isArray(val)) {
+      if (options?.skipArrays && Array.isArray(val)) {
         continue;
       }
       const flat = flatten(val, path + key, options, schema);

package/lib/helpers/cursor/eachAsync.js

@@ -174,7 +174,7 @@ module.exports = async function eachAsync(next, fn, options) {
     } catch (err) {
       return callback(err);
     }
-    if (maybePromise && typeof maybePromise.then === 'function') {
+    if (typeof maybePromise?.then === 'function') {
       maybePromise.then(
         function() { callback(null); },
         function(error) {

package/lib/helpers/discriminator/getConstructor.js

@@ -9,7 +9,7 @@ const getDiscriminatorByValue = require('./getDiscriminatorByValue');
 
 module.exports = function getConstructor(Constructor, value, defaultDiscriminatorValue) {
   const discriminatorKey = Constructor.schema.options.discriminatorKey;
-  let discriminatorValue = (value != null && value[discriminatorKey]);
+  let discriminatorValue = value?.[discriminatorKey];
   if (discriminatorValue == null) {
     discriminatorValue = defaultDiscriminatorValue;
   }

package/lib/helpers/discriminator/getSchemaDiscriminatorByValue.js

@@ -11,7 +11,7 @@ const areDiscriminatorValuesEqual = require('./areDiscriminatorValuesEqual');
  */
 
 module.exports = function getSchemaDiscriminatorByValue(schema, value) {
-  if (schema == null || schema.discriminators == null) {
+  if (schema?.discriminators == null) {
     return null;
   }
   for (const key of Object.keys(schema.discriminators)) {

package/lib/helpers/discriminator/mergeDiscriminatorSchema.js

@@ -40,7 +40,7 @@ module.exports = function mergeDiscriminatorSchema(to, from, path, seen) {
         continue;
       }
     }
-    if (path === 'tree' && from != null && from.instanceOfSchema) {
+    if (path === 'tree' && from?.instanceOfSchema) {
       continue;
     }
     if (specialProperties.has(key)) {
@@ -85,7 +85,7 @@ module.exports = function mergeDiscriminatorSchema(to, from, path, seen) {
     }
   }
 
-  if (from != null && from.instanceOfSchema) {
+  if (from?.instanceOfSchema) {
     to.tree = Object.assign({}, from.tree, to.tree);
   }
 };

package/lib/helpers/document/applyDefaults.js

@@ -5,7 +5,7 @@ const isNestedProjection = require('../projection/isNestedProjection');
 module.exports = function applyDefaults(doc, fields, exclude, hasIncludedChildren, isBeforeSetters, pathsToSkip, options) {
   const paths = Object.keys(doc.$__schema.paths);
   const plen = paths.length;
-  const skipParentChangeTracking = options && options.skipParentChangeTracking;
+  const skipParentChangeTracking = options?.skipParentChangeTracking;
 
   for (let i = 0; i < plen; ++i) {
     let def;

package/lib/helpers/document/applyTimestamps.js

@@ -2,6 +2,7 @@
 
 const handleTimestampOption = require('../schema/handleTimestampOption');
 const mpath = require('mpath');
+const utils = require('../../utils');
 
 module.exports = applyTimestamps;
 
@@ -71,7 +72,7 @@ function applyTimestampsToDoc(schema, obj, options) {
     return;
   }
 
-  if (schema.discriminators && Object.keys(schema.discriminators).length > 0) {
+  if (schema.discriminators && utils.hasOwnKeys(schema.discriminators)) {
     for (const discriminatorKey of Object.keys(schema.discriminators)) {
       const discriminator = schema.discriminators[discriminatorKey];
       const key = discriminator.discriminatorMapping.key;

package/lib/helpers/document/applyVirtuals.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const mpath = require('mpath');
+const utils = require('../../utils');
 
 module.exports = applyVirtuals;
 
@@ -76,7 +77,7 @@ function applyVirtualsToChildren(schema, res, virtuals) {
     attachedVirtuals = true;
   }
 
-  if (virtuals && virtuals.length && !attachedVirtuals) {
+  if (virtuals?.length && !attachedVirtuals) {
     applyVirtualsToDoc(schema, res, virtuals);
   }
 }
@@ -101,7 +102,7 @@ function applyVirtualsToDoc(schema, obj, virtuals) {
     return;
   }
 
-  if (schema.discriminators && Object.keys(schema.discriminators).length > 0) {
+  if (schema.discriminators && utils.hasOwnKeys(schema.discriminators)) {
     for (const discriminatorKey of Object.keys(schema.discriminators)) {
       const discriminator = schema.discriminators[discriminatorKey];
       const key = discriminator.discriminatorMapping.key;
@@ -133,7 +134,7 @@ function applyVirtualsToDoc(schema, obj, virtuals) {
     }
     let val = virtualType.applyGetters(cur[sp[sp.length - 1]], obj);
     const isPopulateVirtual =
-      virtualType.options && (virtualType.options.ref || virtualType.options.refPath);
+      virtualType.options?.ref || virtualType.options?.refPath;
     if (isPopulateVirtual && val === undefined) {
       if (virtualType.options.justOne) {
         val = null;

package/lib/helpers/document/cleanModifiedSubpaths.js

@@ -16,7 +16,7 @@ module.exports = function cleanModifiedSubpaths(doc, path, options) {
   for (const modifiedPath of Object.keys(doc.$__.activePaths.getStatePaths('modify'))) {
     if (skipDocArrays) {
       const schemaType = doc.$__schema.path(modifiedPath);
-      if (schemaType && schemaType.$isMongooseDocumentArray) {
+      if (schemaType?.$isMongooseDocumentArray) {
         continue;
       }
     }

package/lib/helpers/document/compile.js

@@ -46,7 +46,7 @@ function compile(tree, proto, prefix, options) {
     const limb = tree[key];
 
     const hasSubprops = isPOJO(limb) &&
-      Object.keys(limb).length > 0 &&
+      utils.hasOwnKeys(limb) &&
       (!limb[typeKey] || (typeKey === 'type' && isPOJO(limb.type) && limb.type.type));
     const subprops = hasSubprops ? limb : null;
 
@@ -132,7 +132,7 @@ function defineKey({ prop, subprops, prototype, prefix, options }) {
             writable: false,
             value: function() {
               return _this.get(path, null, {
-                virtuals: this && this.schema && this.schema.options && this.schema.options.toObject && this.schema.options.toObject.virtuals || null
+                virtuals: this?.schema?.options?.toObject?.virtuals || null
               });
             }
           });
@@ -143,7 +143,7 @@ function defineKey({ prop, subprops, prototype, prefix, options }) {
             writable: false,
             value: function() {
               return _this.get(path, null, {
-                virtuals: this && this.schema && this.schema.options && this.schema.options.toJSON && this.schema.options.toJSON.virtuals || null
+                virtuals: this?.schema?.options?.toJSON?.virtuals || null
               });
             }
           });
@@ -178,7 +178,7 @@ function defineKey({ prop, subprops, prototype, prefix, options }) {
         return this.$__.getters[path];
       },
       set: function(v) {
-        if (v != null && v.$__isNested) {
+        if (v?.$__isNested) {
           // Convert top-level to POJO, but leave subdocs hydrated so `$set`
           // can handle them. See gh-9293.
           v = v.$__get();

package/lib/helpers/document/getDeepestSubdocumentForPath.js

@@ -17,7 +17,7 @@ module.exports = function getDeepestSubdocumentForPath(doc, parts, schema) {
   let subdoc = doc;
   for (let i = 0; i < parts.length - 1; ++i) {
     const curSchemaType = curSchema.path(curPath);
-    if (curSchemaType && curSchemaType.schema) {
+    if (curSchemaType?.schema) {
       let newSubdoc = subdoc.get(curPath);
       curSchema = curSchemaType.schema;
       curPath = parts[i + 1];

package/lib/helpers/indexes/decorateDiscriminatorIndexOptions.js

@@ -4,7 +4,7 @@ module.exports = function decorateDiscriminatorIndexOptions(schema, indexOptions
   // If the model is a discriminator and has an index, add a
   // partialFilterExpression by default so the index will only apply
   // to that discriminator.
-  const discriminatorName = schema.discriminatorMapping && schema.discriminatorMapping.value;
+  const discriminatorName = schema.discriminatorMapping?.value;
   if (discriminatorName && !('sparse' in indexOptions)) {
     const discriminatorKey = schema.options.discriminatorKey;
     indexOptions.partialFilterExpression = indexOptions.partialFilterExpression || {};

package/lib/helpers/indexes/getRelatedIndexes.js

@@ -31,8 +31,8 @@ function getRelatedIndexes({
   indexes,
   indexesType
 }) {
-  const discriminatorKey = discriminatorMapping && discriminatorMapping.key;
-  const discriminatorValue = discriminatorMapping && discriminatorMapping.value;
+  const discriminatorKey = discriminatorMapping?.key;
+  const discriminatorValue = discriminatorMapping?.value;
 
   if (!discriminatorKey) {
     return indexes;
@@ -57,7 +57,7 @@ function getRelatedIndexes({
 function getPartialFilterExpression(index, indexesType) {
   if (indexesType === 'schema') {
     const options = index[1];
-    return options && options.partialFilterExpression;
+    return options?.partialFilterExpression;
   }
   return index.partialFilterExpression;
 }

package/lib/helpers/model/castBulkWrite.js

@@ -107,7 +107,7 @@ module.exports.castUpdateOne = function castUpdateOne(originalModel, updateOne,
 
   const model = decideModelByObject(originalModel, updateOne['filter']);
   const schema = model.schema;
-  const strict = options.strict != null ? options.strict : model.schema.options.strict;
+  const strict = options.strict ?? model.schema.options.strict;
 
   const update = clone(updateOne['update']);
 
@@ -129,9 +129,7 @@ module.exports.castUpdateOne = function castUpdateOne(originalModel, updateOne,
   }
 
   const globalSetDefaultsOnInsert = originalModel.base.options.setDefaultsOnInsert;
-  const shouldSetDefaultsOnInsert = updateOne.setDefaultsOnInsert == null ?
-    globalSetDefaultsOnInsert :
-    updateOne.setDefaultsOnInsert;
+  const shouldSetDefaultsOnInsert = updateOne.setDefaultsOnInsert ?? globalSetDefaultsOnInsert;
   if (shouldSetDefaultsOnInsert !== false) {
     setDefaultsOnInsert(updateOne['filter'], model.schema, update, {
       setDefaultsOnInsert: true,
@@ -170,12 +168,10 @@ module.exports.castUpdateMany = function castUpdateMany(originalModel, updateMan
 
   const model = decideModelByObject(originalModel, updateMany['filter']);
   const schema = model.schema;
-  const strict = options.strict != null ? options.strict : model.schema.options.strict;
+  const strict = options.strict ?? model.schema.options.strict;
 
   const globalSetDefaultsOnInsert = originalModel.base.options.setDefaultsOnInsert;
-  const shouldSetDefaultsOnInsert = updateMany.setDefaultsOnInsert == null ?
-    globalSetDefaultsOnInsert :
-    updateMany.setDefaultsOnInsert;
+  const shouldSetDefaultsOnInsert = updateMany.setDefaultsOnInsert ?? globalSetDefaultsOnInsert;
 
   if (shouldSetDefaultsOnInsert !== false) {
     setDefaultsOnInsert(updateMany['filter'], model.schema, updateMany['update'], {
@@ -223,7 +219,7 @@ module.exports.castUpdateMany = function castUpdateMany(originalModel, updateMan
 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;
+  const strict = options.strict ?? model.schema.options.strict;
 
   _addDiscriminatorToObject(schema, replaceOne['filter']);
   replaceOne['filter'] = cast(model.schema, replaceOne['filter'], {

package/lib/helpers/model/discriminator.js

@@ -68,7 +68,7 @@ function validateDiscriminatorSchemasForEncryption(parentSchema, childSchema) {
  */
 
 module.exports = function discriminator(model, name, schema, tiedValue, applyPlugins, mergeHooks, overwriteExisting) {
-  if (!(schema && schema.instanceOfSchema)) {
+  if (!schema?.instanceOfSchema) {
     throw new Error('You must pass a valid discriminator Schema');
   }
 

package/lib/helpers/populate/assignRawDocsToIdStructure.js

@@ -104,7 +104,7 @@ function assignRawDocsToIdStructure(rawIds, resultDocs, resultOrder, options, re
         } else {
           newOrder.push(doc);
         }
-      } else if (id != null && id[modelSymbol] != null) {
+      } else if (id?.[modelSymbol] != null) {
         newOrder.push(id);
       } else {
         newOrder.push(options.retainNullValues || nullIfNotFound ? null : id);

package/lib/helpers/populate/assignVals.js

@@ -129,11 +129,11 @@ module.exports = function assignVals(o) {
 
     if (isDoc && Array.isArray(valueToSet)) {
       for (const val of valueToSet) {
-        if (val != null && val.$__ != null) {
+        if (val?.$__ != null) {
           val.$__.parent = docs[i];
         }
       }
-    } else if (isDoc && valueToSet != null && valueToSet.$__ != null) {
+    } else if (isDoc && valueToSet?.$__ != null) {
       valueToSet.$__.parent = docs[i];
     }
 
@@ -184,7 +184,7 @@ module.exports = function assignVals(o) {
         // See gh-8342, gh-8455
         const curPath = parts.slice(0, j + 1).join('.');
         const schematype = originalSchema._getSchema(curPath);
-        if (valueToSet == null && schematype != null && schematype.$isMongooseArray) {
+        if (valueToSet == null && schematype?.$isMongooseArray) {
           break;
         }
         cur[parts[j]] = {};
@@ -200,7 +200,7 @@ module.exports = function assignVals(o) {
       o.allOptions.options[populateModelSymbol] = o.allOptions.model;
       docs[i].$populated(_path, o.unpopulatedValues[i], o.allOptions.options);
 
-      if (valueToSet != null && valueToSet.$__ != null) {
+      if (valueToSet?.$__ != null) {
         valueToSet.$__.wasPopulated = { value: o.unpopulatedValues[i] };
       }