Merge pull request #172 from jd1378/fix_normalize_find

fix: handle unpaginated find response
marshallswain · May 24, 2024 · 7cb567b · 7cb567b
2 parents 2ebcb19 + 3577275
commit 7cb567b
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/hooks/6-normalize-find.ts b/src/hooks/6-normalize-find.ts
@@ -20,12 +20,14 @@ export function normalizeFind() {
 
     next && await next()
 
-    if (context.method === 'find' && !context.result?.data) {
+    // this makes sure it only affects finds that are not paginated and are not custom.
+    // so the custom find responses fall through.
+    if (context.method === 'find' && !context.result?.data && Array.isArray(context.result)) {
       context.result = {
-        data: [],
-        limit: context.params.$limit,
-        skip: context.params.$skip,
-        total: 0,
+        data: context.result,
+        limit: context.params.$limit || context.result.length,
+        skip: context.params.$skip || 0,
+        total: context.result.length,
       }
     }
   }