fix: restore express dependency and improve findWithPagination function

Signed-off-by: Alejandro Dominguez <[email protected]>

Author: adborroto

package-lock.json

@@ -39,7 +39,6 @@
   },
   "homepage": "https://github.com/mixmaxhq/mongo-cursor-pagination#readme",
   "dependencies": {
-    "@types/express": "^4.17.21",
     "base64-url": "^2.2.0",
     "bson": "^4.7.2",
     "object-path": "^0.11.8",
@@ -55,6 +54,7 @@
     "@mixmaxhq/ts-config": "^1.2.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^18.19.70",
+    "@types/express": "^4.17.21",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "cz-conventional-changelog": "^3.2.0",

package.json

@@ -49,7 +49,7 @@ export default async function findWithPagination(
 
     // Support both the native 'mongodb' driver and 'mongoist'. See:
     // https://www.npmjs.com/package/mongoist#cursor-operations
-    const findMethod = (collection as any).findAsCursor
+    const findMethod = hasFindAsCursor(collection)
       ? COLLECTION_METHODS.FIND_AS_CURSOR
       : COLLECTION_METHODS.FIND;
 
@@ -79,9 +79,15 @@ export default async function findWithPagination(
   }
 
   // Remove fields that we added to the query (such as paginatedField and _id) that the user didn't ask for.
-  if (removePaginatedFieldInResponse) {
+  if (removePaginatedFieldInResponse && params.paginatedField) {
     response.results = _.map(response.results, (result) => _.omit(result, params.paginatedField));
   }
 
   return response;
 }
+
+function hasFindAsCursor(
+  collection: unknown
+): collection is Collection<Document> & { findAsCursor: Function } {
+  return typeof (collection as any).findAsCursor === 'function';
+}