mongoose 9.0.2 → 9.1.0

package/lib/aggregate.js

@@ -1049,7 +1049,7 @@ Aggregate.prototype.exec = async function exec() {
 
   this._optionsForExec();
 
-  if (this.options && this.options.cursor) {
+  if (this.options?.cursor) {
     return new AggregationCursor(this);
   }
 

package/lib/cast/string.js

@@ -20,7 +20,7 @@ module.exports = function castString(value, path) {
   }
 
   // handle documents being passed
-  if (value._id && typeof value._id === 'string') {
+  if (typeof value?._id === 'string') {
     return value._id;
   }
 

package/lib/cast.js

@@ -42,7 +42,7 @@ module.exports = function cast(schema, obj, options, context) {
     return obj;
   }
 
-  if (schema != null && schema.discriminators != null && obj[schema.options.discriminatorKey] != null) {
+  if (schema?.discriminators != null && obj[schema.options.discriminatorKey] != null) {
     schema = getSchemaDiscriminatorByValue(schema, obj[schema.options.discriminatorKey]) || schema;
   }
 
@@ -79,7 +79,7 @@ module.exports = function cast(schema, obj, options, context) {
           val[k] = cast(discriminatorSchema ? discriminatorSchema : schema, val[k], options, context);
         }
 
-        if (Object.keys(val[k]).length === 0 && beforeCastKeysLength !== 0) {
+        if (utils.hasOwnKeys(val[k]) === false && beforeCastKeysLength !== 0) {
           val.splice(k, 1);
         }
       }
@@ -126,16 +126,12 @@ module.exports = function cast(schema, obj, options, context) {
           const pathFirstHalf = split.slice(0, j).join('.');
           const pathLastHalf = split.slice(j).join('.');
           const _schematype = schema.path(pathFirstHalf);
-          const discriminatorKey = _schematype &&
-            _schematype.schema &&
-            _schematype.schema.options &&
-            _schematype.schema.options.discriminatorKey;
+          const discriminatorKey = _schematype?.schema?.options?.discriminatorKey;
 
           // gh-6027: if we haven't found the schematype but this path is
           // underneath an embedded discriminator and the embedded discriminator
           // key is in the query, use the embedded discriminator schema
-          if (_schematype != null &&
-            (_schematype.schema && _schematype.schema.discriminators) != null &&
+          if (_schematype?.schema?.discriminators != null &&
             discriminatorKey != null &&
             pathLastHalf !== discriminatorKey) {
             const discriminatorVal = get(obj, pathFirstHalf + '.' + discriminatorKey);
@@ -330,9 +326,9 @@ module.exports = function cast(schema, obj, options, context) {
             $cond = ks[k];
             nested = val[$cond];
             if ($cond === '$elemMatch') {
-              if (nested && schematype != null && schematype.schema != null) {
+              if (nested && schematype?.schema != null) {
                 cast(schematype.schema, nested, options, context);
-              } else if (nested && schematype != null && schematype.$isMongooseArray) {
+              } else if (nested && schematype?.$isMongooseArray) {
                 if (utils.isPOJO(nested) && nested.$not != null) {
                   cast(schema, nested, options, context);
                 } else {
@@ -430,11 +426,7 @@ function getStrictQuery(queryOptions, schemaUserProvidedOptions, schemaOptions,
   if ('strictQuery' in schemaUserProvidedOptions) {
     return schemaUserProvidedOptions.strictQuery;
   }
-  const mongooseOptions = context &&
-    context.mongooseCollection &&
-    context.mongooseCollection.conn &&
-    context.mongooseCollection.conn.base &&
-    context.mongooseCollection.conn.base.options;
+  const mongooseOptions = context?.mongooseCollection?.conn?.base?.options;
   if (mongooseOptions) {
     if ('strictQuery' in mongooseOptions) {
       return mongooseOptions.strictQuery;

package/lib/collection.js

@@ -290,7 +290,7 @@ Collection.prototype._shouldBufferCommands = function _shouldBufferCommands() {
   if (opts.bufferCommands != null) {
     return opts.bufferCommands;
   }
-  if (opts && opts.schemaUserProvidedOptions != null && opts.schemaUserProvidedOptions.bufferCommands != null) {
+  if (opts?.schemaUserProvidedOptions?.bufferCommands != null) {
     return opts.schemaUserProvidedOptions.bufferCommands;
   }
 
@@ -308,7 +308,7 @@ Collection.prototype._getBufferTimeoutMS = function _getBufferTimeoutMS() {
   if (opts.bufferTimeoutMS != null) {
     return opts.bufferTimeoutMS;
   }
-  if (opts && opts.schemaUserProvidedOptions != null && opts.schemaUserProvidedOptions.bufferTimeoutMS != null) {
+  if (opts?.schemaUserProvidedOptions?.bufferTimeoutMS != null) {
     return opts.schemaUserProvidedOptions.bufferTimeoutMS;
   }
   return conn._getBufferTimeoutMS();

package/lib/connection.js

@@ -630,7 +630,7 @@ Connection.prototype.createCollections = async function createCollections(option
     }
   }
 
-  if (!continueOnError && Object.keys(errorsMap).length) {
+  if (!continueOnError && utils.hasOwnKeys(errorsMap)) {
     const message = Object.entries(errorsMap).map(([modelName, err]) => `${modelName}: ${err.message}`).join(', ');
     const createCollectionsError = new CreateCollectionsError(message, errorsMap);
     throw createCollectionsError;
@@ -883,7 +883,7 @@ Connection.prototype._getBufferTimeoutMS = function _getBufferTimeoutMS() {
   if (this.config.bufferTimeoutMS != null) {
     return this.config.bufferTimeoutMS;
   }
-  if (this.base != null && this.base.get('bufferTimeoutMS') != null) {
+  if (this.base?.get('bufferTimeoutMS') != null) {
     return this.base.get('bufferTimeoutMS');
   }
   return 10000;
@@ -1250,8 +1250,11 @@ Connection.prototype._close = async function _close(force, destroy) {
   const conn = this;
   switch (this.readyState) {
     case STATES.disconnected:
-      if (destroy && this.base.connections.indexOf(conn) !== -1) {
-        this.base.connections.splice(this.base.connections.indexOf(conn), 1);
+      if (destroy) {
+        const index = this.base.connections.indexOf(conn);
+        if (index !== -1) {
+          this.base.connections.splice(index, 1);
+        }
       }
       if (!closeCalled) {
         await this.doClose(force);
@@ -1262,8 +1265,11 @@ Connection.prototype._close = async function _close(force, destroy) {
     case STATES.connected:
       this.readyState = STATES.disconnecting;
       await this.doClose(force);
-      if (destroy && _this.base.connections.indexOf(conn) !== -1) {
-        this.base.connections.splice(this.base.connections.indexOf(conn), 1);
+      if (destroy) {
+        const index = _this.base.connections.indexOf(conn);
+        if (index !== -1) {
+          this.base.connections.splice(index, 1);
+        }
       }
       this.onClose(force);
 
@@ -1349,13 +1355,13 @@ Connection.prototype.onClose = function onClose(force) {
 
 Connection.prototype.collection = function(name, options) {
   const defaultOptions = {
-    autoIndex: this.config.autoIndex != null ? this.config.autoIndex : this.base.options.autoIndex,
-    autoCreate: this.config.autoCreate != null ? this.config.autoCreate : this.base.options.autoCreate,
-    autoSearchIndex: this.config.autoSearchIndex != null ? this.config.autoSearchIndex : this.base.options.autoSearchIndex
+    autoIndex: this.config.autoIndex ?? this.base.options.autoIndex,
+    autoCreate: this.config.autoCreate ?? this.base.options.autoCreate,
+    autoSearchIndex: this.config.autoSearchIndex ?? this.base.options.autoSearchIndex
   };
   options = Object.assign({}, defaultOptions, options ? clone(options) : {});
   options.$wasForceClosed = this.$wasForceClosed;
-  const Collection = this.base && this.base.__driver && this.base.__driver.Collection || driver.get().Collection;
+  const Collection = this.base?.__driver?.Collection || driver.get().Collection;
   if (!(name in this.collections)) {
     this.collections[name] = new Collection(name, this, options);
   }
@@ -1456,7 +1462,7 @@ Connection.prototype.model = function model(name, schema, collection, options) {
   const opts = Object.assign(defaultOptions, options, { connection: this });
   if (this.models[name] && !collection && opts.overwriteModels !== true) {
     // model exists but we are not subclassing with custom collection
-    if (schema && schema.instanceOfSchema && schema !== this.models[name].schema) {
+    if (schema?.instanceOfSchema && schema !== this.models[name].schema) {
       throw new MongooseError.OverwriteModelError(name);
     }
     return this.models[name];
@@ -1464,7 +1470,7 @@ Connection.prototype.model = function model(name, schema, collection, options) {
 
   let model;
 
-  if (schema && schema.instanceOfSchema) {
+  if (schema?.instanceOfSchema) {
     applyPlugins(schema, this.plugins, null, '$connectionPluginsApplied');
 
     // compile a model
@@ -1672,7 +1678,7 @@ Connection.prototype.shouldAuthenticate = function shouldAuthenticate() {
  *  a password, otherwise false.
  */
 Connection.prototype.authMechanismDoesNotRequirePassword = function authMechanismDoesNotRequirePassword() {
-  if (this.options && this.options.auth) {
+  if (this.options?.auth) {
     return noPasswordAuthMechanisms.indexOf(this.options.auth.authMechanism) >= 0;
   }
   return true;
@@ -1772,7 +1778,7 @@ Connection.prototype.syncIndexes = async function syncIndexes(options = {}) {
     }
   }
 
-  if (!continueOnError && Object.keys(errorsMap).length) {
+  if (!continueOnError && utils.hasOwnKeys(errorsMap)) {
     const message = Object.entries(errorsMap).map(([modelName, err]) => `${modelName}: ${err.message}`).join(', ');
     const syncIndexesError = new SyncIndexesError(message, errorsMap);
     throw syncIndexesError;

package/lib/cursor/changeStream.js

@@ -28,7 +28,7 @@ class ChangeStream extends EventEmitter {
     this.options = options;
     this.errored = false;
 
-    if (options && options.hydrate && !options.model) {
+    if (options?.hydrate && !options.model) {
       throw new Error(
         'Cannot create change stream with `hydrate: true` ' +
         'unless calling `Model.watch()`'
@@ -83,7 +83,7 @@ class ChangeStream extends EventEmitter {
 
           driverChangeStreamEvents.forEach(ev => {
             this.driverChangeStream.on(ev, data => {
-              if (data != null && data.fullDocument != null && this.options && this.options.hydrate) {
+              if (data?.fullDocument != null && this.options?.hydrate) {
                 data.fullDocument = this.options.model.hydrate(data.fullDocument);
               }
               this.emit(ev, data);
@@ -102,7 +102,7 @@ class ChangeStream extends EventEmitter {
 
     driverChangeStreamEvents.forEach(ev => {
       this.driverChangeStream.on(ev, data => {
-        if (data != null && data.fullDocument != null && this.options && this.options.hydrate) {
+        if (data?.fullDocument != null && this.options?.hydrate) {
           data.fullDocument = this.options.model.hydrate(data.fullDocument);
         }
         this.emit(ev, data);
@@ -121,7 +121,7 @@ class ChangeStream extends EventEmitter {
     if (this.errored) {
       throw new MongooseError('Cannot call next() on errored ChangeStream');
     }
-    if (this.options && this.options.hydrate) {
+    if (this.options?.hydrate) {
       if (cb != null) {
         const originalCb = cb;
         cb = (err, data) => {
@@ -136,7 +136,7 @@ class ChangeStream extends EventEmitter {
       }
 
       let maybePromise = this.driverChangeStream.next(cb);
-      if (maybePromise && typeof maybePromise.then === 'function') {
+      if (typeof maybePromise?.then === 'function') {
         maybePromise = maybePromise.then(data => {
           if (data.fullDocument != null) {
             data.fullDocument = this.options.model.hydrate(data.fullDocument);