@acrool/rtk-query-codegen-openapi 1.4.0-alpha.1 → 1.4.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acrool/rtk-query-codegen-openapi",
-  "version": "1.4.0-alpha.1",
+  "version": "1.4.0-alpha.2",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "lib/index.mjs",

package/src/generators/common-types-generator.ts

@@ -18,12 +18,61 @@ export interface IRequestConfig {
   timeout?: number;
 }
 
-export type IRestFulEndpointsQueryReturn<TVariables> = TVariables extends void ? 
-  void | {fetchOptions?: IRequestConfig;}: 
+export type IRestFulEndpointsQueryReturn<TVariables> = TVariables extends void ?
+  void | {fetchOptions?: IRequestConfig;}:
   {
       variables: TVariables;
       fetchOptions?: IRequestConfig;
   };
+
+export type UseSimpleQuery<TRes, TArg = void> = (
+  arg: TArg,
+  options?: {
+    skip?: boolean;
+    pollingInterval?: number;
+    refetchOnMountOrArgChange?: boolean | number;
+    refetchOnFocus?: boolean;
+    refetchOnReconnect?: boolean;
+  }
+) => {
+  data: TRes | undefined;
+  currentData: TRes | undefined;
+  isLoading: boolean;
+  isFetching: boolean;
+  isSuccess: boolean;
+  isError: boolean;
+  isUninitialized: boolean;
+  error: unknown;
+  refetch: () => void;
+};
+
+export type UseSimpleMutation<TRes, TArg = void> = () => [
+  (arg: TArg) => {unwrap: () => Promise<TRes>} & PromiseLike<{data: TRes} | {error: unknown}>,
+  {
+    data: TRes | undefined;
+    isLoading: boolean;
+    isSuccess: boolean;
+    isError: boolean;
+    isUninitialized: boolean;
+    error: unknown;
+    reset: () => void;
+  }
+];
+
+export type UseSimpleLazyQuery<TRes, TArg = void> = () => [
+  (arg: TArg, preferCacheValue?: boolean) => void,
+  {
+    data: TRes | undefined;
+    currentData: TRes | undefined;
+    isLoading: boolean;
+    isFetching: boolean;
+    isSuccess: boolean;
+    isError: boolean;
+    isUninitialized: boolean;
+    error: unknown;
+  },
+  {lastArg: TArg | undefined}
+];
 `;
 
 }

package/src/generators/rtk-query-generator.ts

@@ -116,10 +116,45 @@ ${paramsLines}
 `
     : '';
 
+  // 判斷是否有 query / lazy query / mutation，決定需要導入哪些簡化型別
+  const hasQuery = endpointInfos.some(info => info.isQuery);
+  const hasLazyQuery = hasQuery && !!options.useLazyQueries;
+  const hasMutation = endpointInfos.some(info => !info.isQuery);
+
+  const simpleTypeImports: string[] = [];
+  if (hasQuery) simpleTypeImports.push('UseSimpleQuery');
+  if (hasMutation) simpleTypeImports.push('UseSimpleMutation');
+  if (hasLazyQuery) simpleTypeImports.push('UseSimpleLazyQuery');
+
+  const simpleTypeImportStatement = simpleTypeImports.length > 0
+    ? `import type { ${simpleTypeImports.join(', ')} } from "../common-types";\n`
+    : '';
+
+  // 生成逐個導出（使用 as 切斷型別推導鏈）
+  const hookExports = endpointInfos.map(info => {
+    const capitalizedOperationName = info.operationName.charAt(0).toUpperCase() + info.operationName.slice(1);
+    const argType = info.isVoidArg ? 'void' : `${httpClientTypeName}<${info.argTypeName}>`;
+    const lines: string[] = [];
+
+    if (info.isQuery) {
+      const regularHook = `use${capitalizedOperationName}Query`;
+      lines.push(`export const ${regularHook} = injectedRtkApi.${regularHook} as UseSimpleQuery<${info.responseTypeName}, ${argType}>;`);
+      if (options.useLazyQueries) {
+        const lazyHook = `useLazy${capitalizedOperationName}Query`;
+        lines.push(`export const ${lazyHook} = injectedRtkApi.${lazyHook} as UseSimpleLazyQuery<${info.responseTypeName}, ${argType}>;`);
+      }
+    } else {
+      const mutationHook = `use${capitalizedOperationName}Mutation`;
+      lines.push(`export const ${mutationHook} = injectedRtkApi.${mutationHook} as UseSimpleMutation<${info.responseTypeName}, ${argType}>;`);
+    }
+
+    return lines.join('\n');
+  }).join('\n');
+
   return `/* eslint-disable */
 // [Warning] Generated automatically - do not edit manually
 
-${apiImport}${httpClientImport}${tagTypesImport}
+${apiImport}${httpClientImport}${tagTypesImport}${simpleTypeImportStatement}
 ${typeImportStatement}
 
 
@@ -129,25 +164,7 @@ ${endpoints}
     }),
 });
 
-export const {
-${endpointInfos.map(info => {
-    const capitalizedOperationName = info.operationName.charAt(0).toUpperCase() + info.operationName.slice(1);
-    if (info.isQuery) {
-      // For queries, generate both regular and lazy hooks if useLazyQueries is enabled
-      const regularHook = `use${capitalizedOperationName}Query`;
-      if (options.useLazyQueries) {
-        const lazyHook = `useLazy${capitalizedOperationName}Query`;
-        return `  ${regularHook},\n  ${lazyHook},`;
-      } else {
-        return `  ${regularHook},`;
-      }
-    } else {
-      // For mutations, only generate regular hook
-      const mutationHook = `use${capitalizedOperationName}Mutation`;
-      return `  ${mutationHook},`;
-    }
-  }).join('\n')}
-} = injectedRtkApi;
+${hookExports}
 
 export default injectedRtkApi;
 `;