@acrool/rtk-query-codegen-openapi 1.1.0 → 1.1.2

package/lib/index.js

@@ -767,7 +767,7 @@ function generateRequestTypeContent(endpoint, operationDefinitions, schemaTypeMa
   if (operationDef?.operation?.requestBody) {
     const requestBody = operationDef.operation.requestBody;
     const content = requestBody.content;
-    const jsonContent = content["application/json"];
+    const jsonContent = content["application/json"] || content["*/*"];
     const formContent = content["multipart/form-data"] || content["application/x-www-form-urlencoded"];
     if (jsonContent?.schema) {
       const bodyType = getTypeFromSchema(jsonContent.schema, schemaTypeMap, 1);
@@ -776,7 +776,13 @@ function generateRequestTypeContent(endpoint, operationDefinitions, schemaTypeMa
       const bodyType = getTypeFromSchema(formContent.schema, schemaTypeMap, 1);
       properties.push(`  body: ${bodyType};`);
     } else {
-      properties.push(`  body?: any; // Request body from OpenAPI`);
+      const firstContent = Object.values(content)[0];
+      if (firstContent?.schema) {
+        const bodyType = getTypeFromSchema(firstContent.schema, schemaTypeMap, 1);
+        properties.push(`  body: ${bodyType};`);
+      } else {
+        properties.push(`  body?: any; // Request body from OpenAPI`);
+      }
     }
   }
   if (properties.length === 0) {
@@ -793,7 +799,7 @@ function generateResponseTypeContent(endpoint, operationDefinitions, schemaTypeM
   if (operationDef?.operation?.responses) {
     const successResponse = operationDef.operation.responses["200"] || operationDef.operation.responses["201"];
     if (successResponse?.content) {
-      const jsonContent = successResponse.content["application/json"];
+      const jsonContent = successResponse.content["application/json"] || successResponse.content["*/*"] || Object.values(successResponse.content)[0];
       if (jsonContent?.schema) {
         const responseProps = parseSchemaProperties(jsonContent.schema, schemaTypeMap);
         properties.push(...responseProps);
@@ -816,10 +822,12 @@ function parseSchemaProperties(schema, schemaTypeMap = {}) {
       const isRequired = required.includes(propName);
       const optional = isRequired ? "" : "?";
       const propType = getTypeFromSchema(propSchema, schemaTypeMap, 1);
-      const description = propSchema.description ? ` // ${propSchema.description}` : "";
       const needsQuotes = /[^a-zA-Z0-9_$]/.test(propName);
       const quotedPropName = needsQuotes ? `"${propName}"` : propName;
-      properties.push(`  ${quotedPropName}${optional}: ${propType};${description}`);
+      if (propSchema.description) {
+        properties.push(`  /** ${propSchema.description} */`);
+      }
+      properties.push(`  ${quotedPropName}${optional}: ${propType};`);
     });
   }
   return properties;
@@ -863,22 +871,34 @@ function getTypeFromSchema(schema, schemaTypeMap = {}, indentLevel = 0) {
       if (schema.properties) {
         const entries = Object.entries(schema.properties);
         if (entries.length === 0) {
-          baseType = "{}";
+          if (schema.additionalProperties) {
+            const valueType = schema.additionalProperties === true ? "any" : getTypeFromSchema(schema.additionalProperties, schemaTypeMap, indentLevel);
+            baseType = `Record<string, ${valueType}>`;
+          } else {
+            baseType = "{}";
+          }
         } else {
           const nextIndent = "  ".repeat(indentLevel + 1);
           const currentIndent = "  ".repeat(indentLevel);
-          const props = entries.map(([key, propSchema]) => {
+          const props = [];
+          entries.forEach(([key, propSchema]) => {
             const required = schema.required || [];
             const optional = required.includes(key) ? "" : "?";
             const type = getTypeFromSchema(propSchema, schemaTypeMap, indentLevel + 1);
             const needsQuotes = /[^a-zA-Z0-9_$]/.test(key);
             const quotedKey = needsQuotes ? `"${key}"` : key;
-            return `${nextIndent}${quotedKey}${optional}: ${type};`;
-          }).join("\n");
+            if (propSchema.description) {
+              props.push(`${nextIndent}/** ${propSchema.description} */`);
+            }
+            props.push(`${nextIndent}${quotedKey}${optional}: ${type};`);
+          });
           baseType = `{
-${props}
+${props.join("\n")}
 ${currentIndent}}`;
         }
+      } else if (schema.additionalProperties) {
+        const valueType = schema.additionalProperties === true ? "any" : getTypeFromSchema(schema.additionalProperties, schemaTypeMap, indentLevel);
+        baseType = `Record<string, ${valueType}>`;
       } else {
         baseType = "any";
       }
@@ -942,10 +962,10 @@ ${paramsLines}
     ])
   ].filter((type) => type !== "VoidApiArg");
   const typeImportStatement = typeImports.length > 0 ? `import type { ${typeImports.join(", ")} } from "./types";` : "";
-  const apiImport = options.apiConfiguration ? `import {${options.apiConfiguration.importName} as api } from "${options.apiConfiguration.file.replace(/\.ts$/, "")}";
+  const apiImport = options.apiConfiguration ? `import {${options.apiConfiguration.importName} as api} from "${options.apiConfiguration.file.replace(/\.ts$/, "")}";
 ` : `import {baseApi as api} from "../../../library/redux/baseApi";
 `;
-  const httpClientImport = options.httpClient ? `import {${options.httpClient.importReturnTypeName || options.httpClient.importName}} from "${options.httpClient.file}";
+  const httpClientImport = options.httpClient ? `import {${options.httpClient.importReturnTypeName}} from "${options.httpClient.file}";
 ` : `import {IRestFulEndpointsQueryReturn} from "@acrool/react-fetcher";
 `;
   return `/* eslint-disable */
@@ -987,7 +1007,7 @@ export default injectedRtkApi;
 // src/generators/rtk-enhance-endpoints-generator.ts
 init_cjs_shims();
 function generateRtkEnhanceEndpointsFile(endpointInfos, options) {
-  const { groupKey } = options;
+  const { groupKey, cacheTagTypes } = options;
   const endpointConfigs = endpointInfos.map((info) => {
     if (info.isQuery) {
       return `    ${info.operationName}: {
@@ -999,12 +1019,17 @@ function generateRtkEnhanceEndpointsFile(endpointInfos, options) {
     },`;
     }
   }).join("\n");
-  return `/* eslint-disable */
+  let importStatements = `/* eslint-disable */
 // [Warning] Generated automatically - do not edit manually
 
-import { ECacheTagTypes } from "@/store/tagTypes";
-import api from "./query.generated";
-
+`;
+  if (cacheTagTypes) {
+    importStatements += `import { ${cacheTagTypes.importReturnTypeName} } from "${cacheTagTypes.file}";
+`;
+  }
+  importStatements += `import api from "./query.generated";
+`;
+  return `${importStatements}
 const enhancedApi = api.enhanceEndpoints({
   endpoints: {
 ${endpointConfigs}