Merge pull request #1115 from hey-api/fix/abstract-infinite-params

hey-api · Oct 3, 2024 · c68e83b · c68e83b
2 parents e7e69e1 + e694787
commit c68e83b
Show file tree

Hide file tree

Showing 34 changed files with 798 additions and 1,093 deletions.
diff --git a/.changeset/metal-mayflies-rest.md b/.changeset/metal-mayflies-rest.md
@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: abstract page params logic in TanStack Query plugin
diff --git a/packages/openapi-ts/src/compiler/return.ts b/packages/openapi-ts/src/compiler/return.ts
@@ -44,7 +44,16 @@ export const createReturnFunctionCall = ({
   return statement;
 };
 
-export const createReturnVariable = ({ name }: { name: string }) =>
-  createReturnStatement({
-    expression: createIdentifier({ text: name }),
+export const createReturnVariable = ({
+  expression,
+}: {
+  expression: string | ts.Expression;
+}) => {
+  const statement = createReturnStatement({
+    expression:
+      typeof expression === 'string'
+        ? createIdentifier({ text: expression })
+        : expression,
   });
+  return statement;
+};
diff --git a/packages/openapi-ts/src/generate/transformers.ts b/packages/openapi-ts/src/generate/transformers.ts
@@ -225,7 +225,7 @@ const generateResponseTransformer = ({
     statements: [
       ...statements,
       compiler.returnVariable({
-        name: dataVariableName,
+        expression: dataVariableName,
       }),
     ],
   });