@7nohe/openapi-react-query-codegen 2.0.0-beta.3 → 2.0.0

package/dist/common.mjs

@@ -160,9 +160,11 @@ export function createQueryKeyExport({ methodName, queryKey, }) {
         ts.factory.createVariableDeclaration(ts.factory.createIdentifier(queryKey), undefined, undefined, ts.factory.createStringLiteral(`${capitalizeFirstLetter(methodName)}`)),
     ], ts.NodeFlags.Const));
 }
-export function createQueryKeyFnExport(queryKey, method, type = "query") {
+export function createQueryKeyFnExport(queryKey, method, type = "query", modelNames = []) {
     // Mutation keys don't require clientOptions
-    const params = type === "query" ? getRequestParamFromMethod(method) : null;
+    const params = type === "query"
+        ? getRequestParamFromMethod(method, undefined, modelNames)
+        : null;
     // override key is used to allow the user to override the the queryKey values
     const overrideKey = ts.factory.createParameterDeclaration(undefined, undefined, ts.factory.createIdentifier(type === "query" ? "queryKey" : "mutationKey"), QuestionToken, ts.factory.createTypeReferenceNode("Array<unknown>", []));
     return ts.factory.createVariableStatement([ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)], ts.factory.createVariableDeclarationList([

package/dist/createImports.mjs

@@ -32,6 +32,7 @@ export const createImports = ({ project, client, }) => {
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("UseQueryOptions")),
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("UseMutationOptions")),
             ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("UseMutationResult")),
+            ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("UseSuspenseQueryOptions")),
         ])), ts.factory.createStringLiteral("@tanstack/react-query"), undefined),
         ts.factory.createImportDeclaration(undefined, ts.factory.createImportClause(false, undefined, ts.factory.createNamedImports([
             // import all class names from service file

package/dist/createUseQuery.mjs

@@ -13,6 +13,10 @@ const createApiResponseType = ({ methodName, client, }) => {
      */
     const apiResponse = ts.factory.createTypeAliasDeclaration([ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)], ts.factory.createIdentifier(`${capitalizeFirstLetter(methodName)}DefaultResponse`), undefined, awaitedResponseDataType);
     const responseDataType = ts.factory.createTypeParameterDeclaration(undefined, TData.text, undefined, ts.factory.createTypeReferenceNode(BuildCommonTypeName(apiResponse.name)));
+    // Response data type for suspense - wrap with NonNullable to exclude undefined
+    const suspenseResponseDataType = ts.factory.createTypeParameterDeclaration(undefined, TData.text, undefined, ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("NonNullable"), [
+        ts.factory.createTypeReferenceNode(BuildCommonTypeName(apiResponse.name)),
+    ]));
     const responseErrorType = ts.factory.createTypeParameterDeclaration(undefined, TError.text, undefined, client === "@hey-api/client-axios"
         ? ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("AxiosError"), [
             ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(`${capitalizeFirstLetter(methodName)}Error`)),
@@ -31,6 +35,12 @@ const createApiResponseType = ({ methodName, client, }) => {
          * MyClassMethodDefaultResponse
          */
         responseDataType,
+        /**
+         * ResponseDataType for suspense - wrap with NonNullable to exclude undefined
+         *
+         * NonNullable<MyClassMethodDefaultResponse>
+         */
+        suspenseResponseDataType,
         /**
          * ErrorDataType
          *
@@ -76,6 +86,7 @@ function createQueryHook({ queryString, suffix, responseDataType, responseErrorT
         throw new Error("pageParam and nextPageParam are required for infinite queries");
     }
     const isInfiniteQuery = queryString === "useInfiniteQuery";
+    const isSuspenseQuery = queryString === "useSuspenseQuery";
     const responseDataTypeRef = responseDataType.default;
     const responseDataTypeIdentifier = responseDataTypeRef.typeName;
     const hookExport = ts.factory.createVariableStatement([ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)], ts.factory.createVariableDeclarationList([
@@ -93,7 +104,9 @@ function createQueryHook({ queryString, suffix, responseDataType, responseErrorT
             ts.factory.createParameterDeclaration(undefined, undefined, ts.factory.createIdentifier("options"), ts.factory.createToken(ts.SyntaxKind.QuestionToken), ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("Omit"), [
                 ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(isInfiniteQuery
                     ? "UseInfiniteQueryOptions"
-                    : "UseQueryOptions"), [
+                    : isSuspenseQuery
+                        ? "UseSuspenseQueryOptions"
+                        : "UseQueryOptions"), [
                     ts.factory.createTypeReferenceNode(TData),
                     ts.factory.createTypeReferenceNode(TError),
                 ]),
@@ -153,7 +166,7 @@ function createQueryHook({ queryString, suffix, responseDataType, responseErrorT
 export const createUseQuery = ({ functionDescription: { method, jsDoc }, client, pageParam, nextPageParam, initialPageParam, paginatableMethods, modelNames, }) => {
     const methodName = getNameFromVariable(method);
     const queryKey = createQueryKeyFromMethod({ method });
-    const { apiResponse: defaultApiResponse, responseDataType, responseErrorType, } = createApiResponseType({
+    const { apiResponse: defaultApiResponse, responseDataType, suspenseResponseDataType, responseErrorType, } = createApiResponseType({
         methodName,
         client,
     });
@@ -171,7 +184,7 @@ export const createUseQuery = ({ functionDescription: { method, jsDoc }, client,
     const suspenseQueryHook = createQueryHook({
         queryString: "useSuspenseQuery",
         suffix: "Suspense",
-        responseDataType,
+        responseDataType: suspenseResponseDataType,
         responseErrorType,
         requestParams,
         method,
@@ -203,7 +216,7 @@ export const createUseQuery = ({ functionDescription: { method, jsDoc }, client,
         methodName,
         queryKey,
     });
-    const queryKeyFn = createQueryKeyFnExport(queryKey, method);
+    const queryKeyFn = createQueryKeyFnExport(queryKey, method, "query", modelNames);
     return {
         apiResponse: defaultApiResponse,
         returnType: returnTypeExport,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@7nohe/openapi-react-query-codegen",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0",
   "description": "OpenAPI React Query Codegen",
   "bin": {
     "openapi-rq": "dist/cli.mjs"