cleanup

Author: baileympearson

src/cursor/find_cursor.ts

@@ -103,19 +103,19 @@ export class FindCursor<TSchema = any> extends ExplainableCursor<TSchema> {
     const limit = this.findOptions.limit ?? Infinity;
     const remaining = limit - numReturned;
 
-    if (numReturned >= limit) {
+    if (numReturned === limit && !this.id?.isZero()) {
+      // this is an optimization for the special case of a limit for a find command to avoid an
+      // extra getMore when the limit has been reached and the limit is a multiple of the batchSize.
+      // This is a consequence of the new query engine in 5.0 having no knowledge of the limit as it
+      // produces results for the find command.  Once a batch is filled up, it is returned and only
+      // on the subsequent getMore will the query framework consider the limit, determine the cursor
+      // is exhausted and return a cursorId of zero.
+      // instead, if we determine there are no more documents to request from the server, we preemptively
+      // close the cursor
       try {
         await this.close();
       } catch (error) {
         squashError(error);
-        // this is an optimization for the special case of a limit for a find command to avoid an
-        // extra getMore when the limit has been reached and the limit is a multiple of the batchSize.
-        // This is a consequence of the new query engine in 5.0 having no knowledge of the limit as it
-        // produces results for the find command.  Once a batch is filled up, it is returned and only
-        // on the subsequent getMore will the query framework consider the limit, determine the cursor
-        // is exhausted and return a cursorId of zero.
-        // instead, if we determine there are no more documents to request from the server, we preemptively
-        // close the cursor
       }
       return CursorResponse.emptyGetMore;
     }