refactor: improve type handling and formatting in generators

This commit includes:
- Enhanced type handling in the Axios and React Query generators by utilizing `sanitizeTypeName` for type names.
- Updated the response type determination in the Axios method to handle unknown responses more gracefully.
- Ensured consistent formatting in `package.json` for better readability.

Author: owinter86

package.json

@@ -4,10 +4,7 @@
 	"license": "MIT",
 	"description": "Generate Axios API clients and React Query options from OpenAPI specifications",
 	"exports": "./dist/index.js",
-	"files": [
-		"src",
-		"dist"
-	],
+	"files": ["src", "dist"],
 	"author": {
 		"name": "Oliver Winter",
 		"email": "[email protected]"

src/generator/clientGenerator.ts

@@ -109,8 +109,11 @@ function generateAxiosMethod(operation: OperationInfo, spec: OpenAPIV3.Document)
 	}
 
 	// Get response type from 2xx response
-	const successResponse = Object.entries(responses).find(([code]) => code.startsWith("2"));
-	const responseType = successResponse ? `T.${`${namedType}Response${successResponse[0]}`}` : "any";
+
+	const responseType =
+		responseDetails?.[0] && "content" in responseDetails[1]
+			? `T.${`${namedType}Response${responseDetails[0]}`}`
+			: "unknown";
 
 	const urlWithParams = urlParams.length > 0 ? `\`${path.replace(/{(\w+)}/g, "${data.$1}")}\`` : `"${path}"`;
 

src/generator/reactQueryGenerator.ts

@@ -1,5 +1,5 @@
 import type { OpenAPIV3 } from "openapi-types";
-import { camelCase, specTitle } from "../utils";
+import { camelCase, sanitizeTypeName, specTitle } from "../utils";
 import type { OperationInfo } from "./clientGenerator";
 
 function generateQueryOptions(operation: OperationInfo, spec: OpenAPIV3.Document): string {
@@ -35,7 +35,7 @@ function generateQueryOptions(operation: OperationInfo, spec: OpenAPIV3.Document
 			: []),
 	];
 
-	const namedQueryOptions = `get${operationId}QueryOptions`;
+	const namedQueryOptions = camelCase(`get${operationId}QueryOptions`);
 	const namedQuery = camelCase(`${operationId}`);
 
 	return `
@@ -64,7 +64,7 @@ export function generateReactQuery(spec: OpenAPIV3.Document): string {
 			operations.push({
 				method: method,
 				path,
-				operationId: `${operation.operationId || `${path.replace(/\W+/g, "_")}`}`,
+				operationId: sanitizeTypeName(`${operation.operationId || `${path.replace(/\W+/g, "_")}`}`),
 				summary: operation.summary,
 				description: operation.description,
 				parameters: [

src/generator/schemaGenerator.ts

@@ -38,7 +38,7 @@ function getTypeFromSchema(
 			return "boolean";
 		case "array": {
 			const itemType = getTypeFromSchema(schema.items, context);
-			return `Array<${itemType}>`;
+			return `Array<${sanitizeTypeName(itemType)}>`;
 		}
 		case "object":
 			if (schema.properties) {
@@ -78,8 +78,8 @@ function generateTypeDefinition(
 	const isInterface = !("$ref" in schema) && schema.type === "object" && schema.properties;
 
 	return isInterface
-		? `${description}export interface ${name} ${typeValue}\n\n`
-		: `${description}export type ${name} = ${typeValue}\n\n`;
+		? `${description}export interface ${sanitizeTypeName(name)} ${typeValue}\n\n`
+		: `${description}export type ${sanitizeTypeName(name)} = ${typeValue}\n\n`;
 }
 
 /**
@@ -108,16 +108,14 @@ export function generateTypeDefinitions(spec: OpenAPIV3.Document): string {
 
 				const operationObject = operation as OpenAPIV3.OperationObject;
 				if (!operationObject) continue;
-				const operationId = pascalCase(
-					`${sanitizeTypeName(operationObject.operationId || `${path.replace(/\W+/g, "_")}`)}`
-				);
+				const operationId = `${sanitizeTypeName(operationObject.operationId || `${path.replace(/\W+/g, "_")}`)}`;
 
 				// Generate request body type
 				if (operationObject.requestBody) {
 					const content = (operationObject.requestBody as OpenAPIV3.RequestBodyObject).content;
 					const jsonContent = content["application/json"] || content["multipart/form-data"];
 					if (jsonContent?.schema) {
-						const typeName = sanitizeTypeName(`${operationId}Request`);
+						const typeName = `${operationId}Request`;
 						output += generateTypeDefinition(typeName, jsonContent.schema as OpenAPIV3.SchemaObject, context);
 					}
 				}
@@ -128,7 +126,7 @@ export function generateTypeDefinitions(spec: OpenAPIV3.Document): string {
 						const responseObj = response as OpenAPIV3.ResponseObject;
 						const content = responseObj.content?.["application/json"];
 						if (content?.schema) {
-							const typeName = sanitizeTypeName(`${operationId}Response${code}`);
+							const typeName = `${operationId}Response${code}`;
 							output += generateTypeDefinition(typeName, content.schema as OpenAPIV3.SchemaObject, context);
 						}
 					}

src/utils.ts

@@ -46,7 +46,7 @@ export function sanitizePropertyName(name: string): string {
  * @returns The sanitized type name with invalid characters replaced by underscores
  */
 export function sanitizeTypeName(name: string): string {
-	return name.replace(/[^a-zA-Z0-9_]/g, "_").replace(/_+$/, "");
+	return pascalCase(name.replace(/[^a-zA-Z0-9_]/g, "_").replace(/_+$/, ""));
 }
 
 export function specTitle(spec: OpenAPIV3.Document): string {