@nullix/zod-mongoose-studio 1.0.13 → 2.1.0

package/.output/server/node_modules/mongoose/lib/cursor/aggregationCursor.js

@@ -63,34 +63,24 @@ util.inherits(AggregationCursor, Readable);
 
 function _init(model, c, agg) {
   if (!model.collection.buffer) {
-    model.hooks.execPre('aggregate', agg, function(err) {
-      if (err != null) {
-        _handlePreHookError(c, err);
-        return;
-      }
-      if (typeof agg.options?.cursor?.transform === 'function') {
-        c._transforms.push(agg.options.cursor.transform);
-      }
-
-      c.cursor = model.collection.aggregate(agg._pipeline, agg.options || {});
-      c.emit('cursor', c.cursor);
-    });
+    model.hooks.execPre('aggregate', agg).then(() => onPreComplete(null), err => onPreComplete(err));
   } else {
     model.collection.emitter.once('queue', function() {
-      model.hooks.execPre('aggregate', agg, function(err) {
-        if (err != null) {
-          _handlePreHookError(c, err);
-          return;
-        }
+      model.hooks.execPre('aggregate', agg).then(() => onPreComplete(null), err => onPreComplete(err));
+    });
+  }
 
-        if (typeof agg.options?.cursor?.transform === 'function') {
-          c._transforms.push(agg.options.cursor.transform);
-        }
+  function onPreComplete(err) {
+    if (err != null) {
+      _handlePreHookError(c, err);
+      return;
+    }
+    if (typeof agg.options?.cursor?.transform === 'function') {
+      c._transforms.push(agg.options.cursor.transform);
+    }
 
-        c.cursor = model.collection.aggregate(agg._pipeline, agg.options || {});
-        c.emit('cursor', c.cursor);
-      });
-    });
+    c.cursor = model.collection.aggregate(agg._pipeline, agg.options || {});
+    c.emit('cursor', c.cursor);
   }
 }
 
@@ -227,7 +217,7 @@ AggregationCursor.prototype._markError = function(error) {
  * @api public
  * @method close
  * @emits "close"
- * @see AggregationCursor.close https://mongodb.github.io/node-mongodb-native/4.9/classes/AggregationCursor.html#close
+ * @see AggregationCursor.close https://mongodb.github.io/node-mongodb-native/7.0/classes/AggregationCursor.html#close
  */
 
 AggregationCursor.prototype.close = async function close() {
@@ -303,10 +293,10 @@ AggregationCursor.prototype.next = async function next() {
  * Returns a promise that resolves when done.
  *
  * @param {Function} fn
- * @param {Object} [options]
- * @param {Number} [options.parallel] the number of promises to execute in parallel. Defaults to 1.
- * @param {Number} [options.batchSize=null] if set, Mongoose will call `fn` with an array of at most `batchSize` documents, instead of a single document
- * @param {Boolean} [options.continueOnError=false] if true, `eachAsync()` iterates through all docs even if `fn` throws an error. If false, `eachAsync()` throws an error immediately if the given function `fn()` throws an error.
+ * @param {object} [options]
+ * @param {number} [options.parallel] the number of promises to execute in parallel. Defaults to 1.
+ * @param {number} [options.batchSize=null] if set, Mongoose will call `fn` with an array of at most `batchSize` documents, instead of a single document
+ * @param {boolean} [options.continueOnError=false] if true, `eachAsync()` iterates through all docs even if `fn` throws an error. If false, `eachAsync()` throws an error immediately if the given function `fn()` throws an error.
  * @return {Promise}
  * @api public
  * @method eachAsync
@@ -396,11 +386,11 @@ function _transformForAsyncIterator(doc) {
 }
 
 /**
- * Adds a [cursor flag](https://mongodb.github.io/node-mongodb-native/4.9/classes/AggregationCursor.html#addCursorFlag).
+ * Adds a [cursor flag](https://mongodb.github.io/node-mongodb-native/7.0/classes/AggregationCursor.html#addCursorFlag).
  * Useful for setting the `noCursorTimeout` and `tailable` flags.
  *
- * @param {String} flag
- * @param {Boolean} value
+ * @param {'tailable'|'oplogReplay'|'noCursorTimeout'|'awaitData'|'partial'} flag
+ * @param {boolean} value
  * @return {AggregationCursor} this
  * @api public
  * @method addCursorFlag
@@ -430,7 +420,7 @@ function _waitForCursor(ctx, cb) {
 /**
  * Get the next doc from the underlying cursor and mongooseify it
  * (populate, etc.)
- * @param {Any} ctx
+ * @param {any} ctx
  * @param {Function} cb
  * @api private
  */

package/.output/server/node_modules/mongoose/lib/cursor/changeStream.js

@@ -18,7 +18,7 @@ const driverChangeStreamEvents = ['close', 'change', 'end', 'error', 'resumeToke
  */
 
 class ChangeStream extends EventEmitter {
-  constructor(changeStreamThunk, pipeline, options) {
+  constructor(changeStreamPromise, pipeline, options) {
     super();
 
     this.driverChangeStream = null;
@@ -28,43 +28,29 @@ 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()`'
       );
     }
 
-    let syncError = null;
-    this.$driverChangeStreamPromise = new Promise((resolve, reject) => {
-      // This wrapper is necessary because of buffering.
-      try {
-        changeStreamThunk((err, driverChangeStream) => {
-          if (err != null) {
-            this.errored = true;
-            this.emit('error', err);
-            return reject(err);
-          }
-
-          this.driverChangeStream = driverChangeStream;
-          this.emit('ready');
-          resolve();
-        });
-      } catch (err) {
-        syncError = err;
+    this.$driverChangeStreamPromise = changeStreamPromise.then(
+      driverChangeStream => {
+        this.driverChangeStream = driverChangeStream;
+        // Use setImmediate so the stream pump (_read) has a chance to run and
+        // the driver cursor initializes before 'ready' resolves. Without this,
+        // changes emitted immediately after 'ready' can be missed because the
+        // underlying cursor hasn't sent its initial aggregate to MongoDB yet.
+        setImmediate(() => this.emit('ready'));
+        return this;
+      },
+      err => {
         this.errored = true;
         this.emit('error', err);
-        reject(err);
+        throw err;
       }
-    });
-
-    // Because a ChangeStream is an event emitter, there's no way to register an 'error' handler
-    // that catches errors which occur in the constructor, unless we force sync errors into async
-    // errors with setImmediate(). For cleaner stack trace, we just immediately throw any synchronous
-    // errors that occurred with changeStreamThunk().
-    if (syncError != null) {
-      throw syncError;
-    }
+    );
   }
 
   _bindEvents() {
@@ -83,7 +69,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 +88,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);
@@ -114,14 +100,27 @@ class ChangeStream extends EventEmitter {
     if (this.errored) {
       throw new MongooseError('Cannot call hasNext() on errored ChangeStream');
     }
-    return this.driverChangeStream.hasNext(cb);
+
+    if (this.driverChangeStream != null) {
+      return this.driverChangeStream.hasNext(cb);
+    }
+
+    return this.$driverChangeStreamPromise.then(
+      () => this.driverChangeStream.hasNext(cb),
+      err => {
+        if (cb != null) {
+          return cb(err);
+        }
+        throw err;
+      }
+    );
   }
 
   next(cb) {
     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) => {
@@ -135,8 +134,21 @@ class ChangeStream extends EventEmitter {
         };
       }
 
-      let maybePromise = this.driverChangeStream.next(cb);
-      if (maybePromise && typeof maybePromise.then === 'function') {
+      let maybePromise;
+      if (this.driverChangeStream != null) {
+        maybePromise = this.driverChangeStream.next(cb);
+      } else {
+        maybePromise = this.$driverChangeStreamPromise.then(
+          () => this.driverChangeStream.next(cb),
+          err => {
+            if (cb != null) {
+              return cb(err);
+            }
+            throw err;
+          }
+        );
+      }
+      if (typeof maybePromise?.then === 'function') {
         maybePromise = maybePromise.then(data => {
           if (data.fullDocument != null) {
             data.fullDocument = this.options.model.hydrate(data.fullDocument);
@@ -147,7 +159,19 @@ class ChangeStream extends EventEmitter {
       return maybePromise;
     }
 
-    return this.driverChangeStream.next(cb);
+    if (this.driverChangeStream != null) {
+      return this.driverChangeStream.next(cb);
+    }
+
+    return this.$driverChangeStreamPromise.then(
+      () => this.driverChangeStream.next(cb),
+      err => {
+        if (cb != null) {
+          return cb(err);
+        }
+        throw err;
+      }
+    );
   }
 
   addListener(event, handler) {
@@ -174,10 +198,6 @@ class ChangeStream extends EventEmitter {
     return super.once(event, handler);
   }
 
-  _queue(cb) {
-    this.once('ready', () => cb());
-  }
-
   close() {
     this.closed = true;
     if (this.driverChangeStream) {

package/.output/server/node_modules/mongoose/lib/cursor/queryCursor.js

@@ -26,7 +26,7 @@ const util = require('util');
  * Use [`Query#cursor()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.cursor()) instead.
  *
  * @param {Query} query
- * @param {Object} options query options passed to `.find()`
+ * @param {object} options query options passed to `.find()`
  * @inherits Readable https://nodejs.org/api/stream.html#class-streamreadable
  * @event `cursor`: Emitted when the cursor is created
  * @event `error`: Emitted when an error occurred
@@ -49,7 +49,8 @@ function QueryCursor(query) {
   this._transforms = [];
   this.model = model;
   this.options = {};
-  model.hooks.execPre('find', query, (err) => {
+
+  const onPreComplete = (err) => {
     if (err != null) {
       if (err instanceof kareem.skipWrappedFunction) {
         const resultValue = err.args[0];
@@ -94,7 +95,9 @@ function QueryCursor(query) {
     } else {
       _getRawCursor(query, this);
     }
-  });
+  };
+
+  model.hooks.execPre('find', query).then(() => onPreComplete(null), err => onPreComplete(err));
 }
 
 util.inherits(QueryCursor, Readable);
@@ -129,7 +132,7 @@ QueryCursor.prototype._read = function() {
     }
     if (!doc) {
       this.push(null);
-      this.cursor.close(function(error) {
+      this.cursor.close((error) => {
         if (error) {
           return this.emit('error', error);
         }
@@ -224,7 +227,7 @@ QueryCursor.prototype._markError = function(error) {
  * @api public
  * @method close
  * @emits close
- * @see AggregationCursor.close https://mongodb.github.io/node-mongodb-native/4.9/classes/AggregationCursor.html#close
+ * @see AggregationCursor.close https://mongodb.github.io/node-mongodb-native/7.0/classes/AggregationCursor.html#close
  */
 
 QueryCursor.prototype.close = async function close() {
@@ -334,10 +337,10 @@ QueryCursor.prototype.next = async function next() {
  *       })
  *
  * @param {Function} fn
- * @param {Object} [options]
- * @param {Number} [options.parallel] the number of promises to execute in parallel. Defaults to 1.
- * @param {Number} [options.batchSize] if set, will call `fn()` with arrays of documents with length at most `batchSize`
- * @param {Boolean} [options.continueOnError=false] if true, `eachAsync()` iterates through all docs even if `fn` throws an error. If false, `eachAsync()` throws an error immediately if the given function `fn()` throws an error.
+ * @param {object} [options]
+ * @param {number} [options.parallel] the number of promises to execute in parallel. Defaults to 1.
+ * @param {number} [options.batchSize] if set, will call `fn()` with arrays of documents with length at most `batchSize`
+ * @param {boolean} [options.continueOnError=false] if true, `eachAsync()` iterates through all docs even if `fn` throws an error. If false, `eachAsync()` throws an error immediately if the given function `fn()` throws an error.
  * @return {Promise}
  * @api public
  * @method eachAsync
@@ -365,11 +368,11 @@ QueryCursor.prototype.eachAsync = function(fn, opts) {
 QueryCursor.prototype.options;
 
 /**
- * Adds a [cursor flag](https://mongodb.github.io/node-mongodb-native/4.9/classes/FindCursor.html#addCursorFlag).
+ * Adds a [cursor flag](https://mongodb.github.io/node-mongodb-native/7.0/classes/FindCursor.html#addCursorFlag).
  * Useful for setting the `noCursorTimeout` and `tailable` flags.
  *
- * @param {String} flag
- * @param {Boolean} value
+ * @param {'tailable'|'oplogReplay'|'noCursorTimeout'|'awaitData'|'partial'} flag
+ * @param {boolean} value
  * @return {AggregationCursor} this
  * @api public
  * @method addCursorFlag
@@ -423,7 +426,7 @@ if (Symbol.asyncIterator != null) {
 /**
  * Get the next doc from the underlying cursor and mongooseify it
  * (populate, etc.)
- * @param {Any} ctx
+ * @param {any} ctx
  * @param {Function} cb
  * @api private
  */
@@ -588,12 +591,7 @@ function _populateBatch() {
 
 function _nextDoc(ctx, doc, pop, callback) {
   if (ctx.query._mongooseOptions.lean) {
-    return ctx.model.hooks.execPost('find', ctx.query, [[doc]], err => {
-      if (err != null) {
-        return callback(err);
-      }
-      callback(null, doc);
-    });
+    return ctx.model.hooks.execPost('find', ctx.query, [[doc]]).then(() => callback(null, doc), err => callback(err));
   }
 
   const { model, _fields, _userProvidedFields, options } = ctx.query;
@@ -601,12 +599,10 @@ function _nextDoc(ctx, doc, pop, callback) {
     if (err != null) {
       return callback(err);
     }
-    ctx.model.hooks.execPost('find', ctx.query, [[doc]], err => {
-      if (err != null) {
-        return callback(err);
-      }
-      callback(null, doc);
-    });
+    if (options.session != null) {
+      doc.$session(options.session);
+    }
+    ctx.model.hooks.execPost('find', ctx.query, [[doc]]).then(() => callback(null, doc), err => callback(err));
   });
 }