@7nohe/openapi-react-query-codegen 1.3.0 → 1.4.1

package/dist/createPrefetch.mjs

@@ -1,6 +1,6 @@
 import ts from "typescript";
 import { BuildCommonTypeName, extractPropertiesFromObjectParam, getNameFromMethod, } from "./common.mjs";
-import { createQueryKeyFromMethod, getRequestParamFromMethod, hookNameFromMethod, } from "./createUseQuery.mjs";
+import { createQueryKeyFromMethod, getQueryKeyFnName, getRequestParamFromMethod, hookNameFromMethod, } from "./createUseQuery.mjs";
 import { addJSDocToNode } from "./util.mjs";
 /**
  * Creates a prefetch function for a query
@@ -19,16 +19,13 @@ function createPrefetchHook({ requestParams, method, className, }) {
             ...requestParams,
         ], undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), ts.factory.createCallExpression(ts.factory.createIdentifier("queryClient.prefetchQuery"), undefined, [
             ts.factory.createObjectLiteralExpression([
-                ts.factory.createPropertyAssignment(ts.factory.createIdentifier("queryKey"), ts.factory.createArrayLiteralExpression([
-                    BuildCommonTypeName(queryKey),
-                    method.getParameters().length
-                        ? ts.factory.createArrayLiteralExpression([
-                            ts.factory.createObjectLiteralExpression(method
-                                .getParameters()
-                                .flatMap((param) => extractPropertiesFromObjectParam(param).map((p) => ts.factory.createShorthandPropertyAssignment(ts.factory.createIdentifier(p.name))))),
-                        ])
-                        : ts.factory.createArrayLiteralExpression([]),
-                ], false)),
+                ts.factory.createPropertyAssignment(ts.factory.createIdentifier("queryKey"), ts.factory.createCallExpression(BuildCommonTypeName(getQueryKeyFnName(queryKey)), undefined, method.getParameters().length
+                    ? [
+                        ts.factory.createObjectLiteralExpression(method
+                            .getParameters()
+                            .flatMap((param) => extractPropertiesFromObjectParam(param).map((p) => ts.factory.createShorthandPropertyAssignment(ts.factory.createIdentifier(p.name))))),
+                    ]
+                    : [])),
                 ts.factory.createPropertyAssignment(ts.factory.createIdentifier("queryFn"), ts.factory.createArrowFunction(undefined, undefined, [], undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(className), ts.factory.createIdentifier(methodName)), undefined, method.getParameters().length
                     ? [
                         ts.factory.createObjectLiteralExpression(method

package/dist/createUseQuery.mjs

@@ -122,7 +122,7 @@ export function createQueryHook({ queryString, suffix, responseDataType, request
                             .flatMap((param) => extractPropertiesFromObjectParam(param).map((p) => ts.factory.createShorthandPropertyAssignment(ts.factory.createIdentifier(p.name))))),
                         ts.factory.createIdentifier("queryKey"),
                     ]
-                    : [])),
+                    : [ts.factory.createIdentifier("queryKey")])),
                 ts.factory.createPropertyAssignment(ts.factory.createIdentifier("queryFn"), ts.factory.createArrowFunction(undefined, undefined, [], undefined, EqualsOrGreaterThanToken, ts.factory.createAsExpression(ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(className), ts.factory.createIdentifier(methodName)), undefined, method.getParameters().length
                     ? [
                         ts.factory.createObjectLiteralExpression(method
@@ -183,7 +183,7 @@ export const createUseQuery = ({ className, method, jsDoc, }) => {
         queryKeyFn,
     };
 };
-function getQueryKeyFnName(queryKey) {
+export function getQueryKeyFnName(queryKey) {
     return `${capitalizeFirstLetter(queryKey)}Fn`;
 }
 function createQueryKeyFnExport(queryKey, method) {
@@ -191,16 +191,10 @@ function createQueryKeyFnExport(queryKey, method) {
     // override key is used to allow the user to override the the queryKey values
     const overrideKey = ts.factory.createParameterDeclaration(undefined, undefined, ts.factory.createIdentifier("queryKey"), QuestionToken, ts.factory.createTypeReferenceNode("Array<unknown>", []));
     return ts.factory.createVariableStatement([ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)], ts.factory.createVariableDeclarationList([
-        ts.factory.createVariableDeclaration(ts.factory.createIdentifier(getQueryKeyFnName(queryKey)), undefined, undefined, ts.factory.createArrowFunction(undefined, undefined, params ? [params, overrideKey] : [], undefined, EqualsOrGreaterThanToken, queryKeyFn(queryKey, method))),
+        ts.factory.createVariableDeclaration(ts.factory.createIdentifier(getQueryKeyFnName(queryKey)), undefined, undefined, ts.factory.createArrowFunction(undefined, undefined, params ? [params, overrideKey] : [overrideKey], undefined, EqualsOrGreaterThanToken, queryKeyFn(queryKey, method))),
     ], ts.NodeFlags.Const));
 }
 function queryKeyFn(queryKey, method) {
-    const params = getRequestParamFromMethod(method);
-    if (!params) {
-        return ts.factory.createArrayLiteralExpression([
-            ts.factory.createIdentifier(queryKey),
-        ]);
-    }
     return ts.factory.createArrayLiteralExpression([
         ts.factory.createIdentifier(queryKey),
         ts.factory.createSpreadElement(ts.factory.createParenthesizedExpression(ts.factory.createBinaryExpression(ts.factory.createIdentifier("queryKey"), ts.factory.createToken(ts.SyntaxKind.QuestionQuestionToken), method.getParameters().length

package/dist/generate.mjs

@@ -12,10 +12,12 @@ export async function generate(options, version) {
         debug: formattedOptions.debug,
         dryRun: false,
         exportCore: true,
-        format: formattedOptions.format,
+        output: {
+            format: formattedOptions.format,
+            lint: formattedOptions.lint,
+            path: openApiOutputPath,
+        },
         input: formattedOptions.input,
-        lint: formattedOptions.lint,
-        output: openApiOutputPath,
         request: formattedOptions.request,
         schemas: {
             export: !formattedOptions.noSchemas,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@7nohe/openapi-react-query-codegen",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "OpenAPI React Query Codegen",
   "bin": {
     "openapi-rq": "dist/cli.mjs"
@@ -31,7 +31,7 @@
   "author": "Daiki Urata (@7nohe)",
   "license": "MIT",
   "dependencies": {
-    "@hey-api/openapi-ts": "0.43.0"
+    "@hey-api/openapi-ts": "0.45.1"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.7.2",
@@ -42,6 +42,7 @@
     "lefthook": "^1.6.10",
     "rimraf": "^5.0.5",
     "ts-morph": "^22.0.0",
+    "ts-node": "^10.9.2",
     "typescript": "^5.3.3",
     "vitest": "^1.5.0"
   },