Merge pull request #1239 from hey-api/fix/parser-ref-pagination

fix: handle pagination with basic refs
hey-api · Nov 7, 2024 · 3562159 · 3562159
2 parents 4a4f582 + 319a28a
commit 3562159
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 11 deletions.
diff --git a/.changeset/tiny-bobcats-invent.md b/.changeset/tiny-bobcats-invent.md
@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: handle pagination with basic refs
diff --git a/packages/openapi-ts/src/ir/operation.ts b/packages/openapi-ts/src/ir/operation.ts
@@ -1,3 +1,4 @@
+import type { IRContext } from './context';
 import type { IROperationObject, IRResponseObject, IRSchemaObject } from './ir';
 import type { Pagination } from './pagination';
 import {
@@ -21,18 +22,29 @@ export const hasOperationDataRequired = (
   return false;
 };
 
-export const operationPagination = (
-  operation: IROperationObject,
-): Pagination | undefined => {
+export const operationPagination = ({
+  context,
+  operation,
+}: {
+  context: IRContext;
+  operation: IROperationObject;
+}): Pagination | undefined => {
   if (operation.body?.pagination) {
+    if (typeof operation.body.pagination === 'boolean') {
+      return {
+        in: 'body',
+        name: 'body',
+        schema: operation.body.schema,
+      };
+    }
+
+    const schema = operation.body.schema.$ref
+      ? context.resolveIrRef<IRSchemaObject>(operation.body.schema.$ref)
+      : operation.body.schema;
     return {
       in: 'body',
-      name:
-        operation.body.pagination === true ? 'body' : operation.body.pagination,
-      schema:
-        operation.body.pagination === true
-          ? operation.body.schema
-          : operation.body.schema.properties![operation.body.pagination],
+      name: operation.body.pagination,
+      schema: schema.properties![operation.body.pagination],
     };
   }
 

diff --git a/packages/openapi-ts/src/openApi/3.0.x/parser/pagination.ts b/packages/openapi-ts/src/openApi/3.0.x/parser/pagination.ts
@@ -84,5 +84,16 @@ export const paginationField = ({
     }
   }
 
+  for (const allOf of schema.allOf ?? []) {
+    const pagination = paginationField({
+      context,
+      name,
+      schema: allOf,
+    });
+    if (pagination) {
+      return pagination;
+    }
+  }
+
   return false;
 };
diff --git a/packages/openapi-ts/src/openApi/3.1.x/parser/pagination.ts b/packages/openapi-ts/src/openApi/3.1.x/parser/pagination.ts
@@ -80,5 +80,16 @@ export const paginationField = ({
     }
   }
 
+  for (const allOf of schema.allOf ?? []) {
+    const pagination = paginationField({
+      context,
+      name,
+      schema: allOf,
+    });
+    if (pagination) {
+      return pagination;
+    }
+  }
+
   return false;
 };
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/plugin.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/plugin.ts
@@ -853,7 +853,7 @@ export const handler: PluginHandler<
         plugin.infiniteQueryOptions &&
         (['get', 'post'] as (typeof method)[]).includes(method)
       ) {
-        const pagination = operationPagination(operation);
+        const pagination = operationPagination({ context, operation });
 
         if (pagination) {
           if (!hasInfiniteQueries) {

diff --git a/packages/openapi-ts/test/sample.cjs b/packages/openapi-ts/test/sample.cjs
@@ -43,7 +43,7 @@ const main = async () => {
         // style: 'PascalCase',
         // tree: false,
       },
-      // '@tanstack/react-query',
+      '@tanstack/react-query',
       // 'zod',
     ],
     // useOptions: false,