react-query-lightbase-codegen 2.1.4 → 2.2.1

package/dist/generator/clientGenerator.js

@@ -33,7 +33,9 @@ function generateAxiosMethod(operation, spec) {
         const [code, response] = responseDetails;
         const responseObj = response;
         const desc = "description" in responseObj ? responseObj.description : "";
-        const contentType = responseObj.content?.["application/json"]?.schema;
+        const contentType = responseObj.content?.["application/ld+json"]?.schema ??
+            responseObj.content?.["application/json"]?.schema ??
+            responseObj.content?.["application/octet-stream"]?.schema;
         const typeName = (0, utils_1.pascalCase)(`${operationId}Response${code}`);
         if (contentType) {
             if (desc) {
@@ -52,9 +54,12 @@ function generateAxiosMethod(operation, spec) {
     const formDataSchema = isFormData
         ? resolveSchema(requestBody.content["multipart/form-data"].schema, spec)
         : undefined;
-    const requestBodySchema = requestBody?.content?.["application/json"]?.schema
-        ? resolveSchema(requestBody.content["application/json"].schema, spec)
+    const content = requestBody && "content" in requestBody
+        ? (requestBody.content?.["application/ld+json"]?.schema ??
+            requestBody.content?.["application/json"]?.schema ??
+            requestBody.content?.["application/octet-stream"]?.schema)
         : undefined;
+    const requestBodySchema = content ? resolveSchema(content, spec) : undefined;
     // Build data type parts
     const dataProps = [];
     // Add path and query parameters
@@ -101,7 +106,7 @@ function generateAxiosMethod(operation, spec) {
         requestBodySchema?.properties
             ? `const bodyData = {
 				${Object.entries(requestBodySchema.properties)
-                .map(([key]) => `${key}: data.${key}`)
+                .map(([key]) => `["${key}"]: data["${key}"]`)
                 .join(",\n				")}
 			};`
             : "",

package/dist/generator/reactQueryGenerator.js

@@ -14,11 +14,16 @@ function generateQueryOptions(operation, spec) {
         }
         return schema.required?.map((p) => `'${p}'`) || [];
     };
+    const content = requestBody && "content" in requestBody
+        ? (requestBody.content?.["application/ld+json"]?.schema ??
+            requestBody.content?.["application/json"]?.schema ??
+            requestBody.content?.["application/octet-stream"]?.schema)
+        : undefined;
     // Get required parameter names from both parameters and request body
     const requiredParams = [
         ...(parameters?.filter((p) => p.required).map((p) => `'${p.name}'`) || []),
-        ...(requestBody && "content" in requestBody && requestBody.content?.["application/json"]?.schema
-            ? getRequiredFields(requestBody.content["application/json"].schema, {
+        ...(content
+            ? getRequiredFields(content, {
                 schemas: spec.components?.schemas || {},
             })
             : []),

package/dist/generator/schemaGenerator.js

@@ -12,24 +12,25 @@ function getTypeFromSchema(schema, context) {
         const refType = schema.$ref.split("/").pop();
         return (0, utils_1.sanitizeTypeName)(refType);
     }
+    const nullable = schema.nullable ? " | null" : "";
     // Handle enum types properly
     if (schema.enum) {
-        return schema.enum.map((e) => (typeof e === "string" ? `'${e}'` : e)).join(" | ");
+        return schema.enum.map((e) => (typeof e === "string" ? `'${e}'` : e)).join(" | ") + nullable;
     }
     switch (schema.type) {
         case "string":
             if ("format" in schema && schema.format === "binary") {
-                return "string | { name?: string; type?: string; uri: string }";
+                return `string | { name?: string; type?: string; uri: string }${nullable}`;
             }
-            return "string";
+            return `string${nullable}`;
         case "number":
         case "integer":
-            return "number";
+            return `number${nullable}`;
         case "boolean":
-            return "boolean";
+            return `boolean${nullable}`;
         case "array": {
             const itemType = getTypeFromSchema(schema.items, context);
-            return `Array<${itemType}>`;
+            return `Array<${itemType}>${nullable}`;
         }
         case "object":
             if (schema.properties) {
@@ -41,17 +42,17 @@ function getTypeFromSchema(schema, context) {
                     return `  ${safeName}${isRequired ? "" : "?"}: ${propertyType};`;
                 })
                     .join("\n");
-                return `{\n${properties}\n}`;
+                return `{${properties}\n}${nullable}`;
             }
             if (schema.additionalProperties) {
                 const valueType = typeof schema.additionalProperties === "boolean"
                     ? "any"
                     : getTypeFromSchema(schema.additionalProperties, context);
-                return `Record<string, ${valueType}>`;
+                return `Record<string, ${valueType}>${nullable}`;
             }
-            return "Record<string, any>";
+            return `Record<string, any>${nullable}`;
         default:
-            return "any";
+            return `any${nullable}`;
     }
 }
 function generateTypeDefinition(name, schema, context) {
@@ -93,7 +94,10 @@ function generateTypeDefinitions(spec) {
                 // Generate request body type
                 if (operationObject.requestBody) {
                     const content = operationObject.requestBody.content;
-                    const jsonContent = content["application/json"] || content["multipart/form-data"];
+                    const jsonContent = content["application/ld+json"] ??
+                        content["application/json"] ??
+                        content["multipart/form-data"] ??
+                        content["application/octet-stream"];
                     if (jsonContent?.schema) {
                         const typeName = `${operationId}Request`;
                         output += generateTypeDefinition(typeName, jsonContent.schema, context);
@@ -103,7 +107,9 @@ function generateTypeDefinitions(spec) {
                 if (operationObject.responses) {
                     for (const [code, response] of Object.entries(operationObject.responses)) {
                         const responseObj = response;
-                        const content = responseObj.content?.["application/json"];
+                        const content = responseObj.content?.["application/ld+json"] ??
+                            responseObj.content?.["application/json"] ??
+                            responseObj.content?.["application/octet-stream"];
                         if (content?.schema) {
                             const typeName = `${operationId}Response${code}`;
                             output += generateTypeDefinition(typeName, content.schema, context);

package/package.json

@@ -1,13 +1,10 @@
 {
 	"name": "react-query-lightbase-codegen",
-	"version": "2.1.4",
+	"version": "2.2.1",
 	"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": "owinter86@gmail.com"

package/src/generator/clientGenerator.ts

@@ -50,7 +50,11 @@ function generateAxiosMethod(operation: OperationInfo, spec: OpenAPIV3.Document)
 		const [code, response] = responseDetails;
 		const responseObj = response as OpenAPIV3.ResponseObject;
 		const desc = "description" in responseObj ? responseObj.description : "";
-		const contentType = responseObj.content?.["application/json"]?.schema;
+		const contentType =
+			responseObj.content?.["application/ld+json"]?.schema ??
+			responseObj.content?.["application/json"]?.schema ??
+			responseObj.content?.["application/octet-stream"]?.schema;
+
 		const typeName = pascalCase(`${operationId}Response${code}`);
 
 		if (contentType) {
@@ -74,9 +78,14 @@ function generateAxiosMethod(operation: OperationInfo, spec: OpenAPIV3.Document)
 		? resolveSchema(requestBody.content["multipart/form-data"].schema, spec)
 		: undefined;
 
-	const requestBodySchema = requestBody?.content?.["application/json"]?.schema
-		? resolveSchema(requestBody.content["application/json"].schema, spec)
-		: undefined;
+	const content =
+		requestBody && "content" in requestBody
+			? (requestBody.content?.["application/ld+json"]?.schema ??
+				requestBody.content?.["application/json"]?.schema ??
+				requestBody.content?.["application/octet-stream"]?.schema)
+			: undefined;
+
+	const requestBodySchema = content ? resolveSchema(content, spec) : undefined;
 
 	// Build data type parts
 	const dataProps: string[] = [];
@@ -129,7 +138,7 @@ function generateAxiosMethod(operation: OperationInfo, spec: OpenAPIV3.Document)
 		requestBodySchema?.properties
 			? `const bodyData = {
 				${Object.entries(requestBodySchema.properties)
-					.map(([key]) => `${key}: data.${key}`)
+					.map(([key]) => `["${key}"]: data["${key}"]`)
 					.join(",\n				")}
 			};`
 			: "",

package/src/generator/reactQueryGenerator.ts

@@ -20,11 +20,17 @@ function generateQueryOptions(operation: OperationInfo, spec: OpenAPIV3.Document
 		return schema.required?.map((p) => `'${p}'`) || [];
 	};
 
+	const content =
+		requestBody && "content" in requestBody
+			? (requestBody.content?.["application/ld+json"]?.schema ??
+				requestBody.content?.["application/json"]?.schema ??
+				requestBody.content?.["application/octet-stream"]?.schema)
+			: undefined;
 	// Get required parameter names from both parameters and request body
 	const requiredParams = [
 		...(parameters?.filter((p) => p.required).map((p) => `'${p.name}'`) || []),
-		...(requestBody && "content" in requestBody && requestBody.content?.["application/json"]?.schema
-			? getRequiredFields(requestBody.content["application/json"].schema, {
+		...(content
+			? getRequiredFields(content, {
 					schemas: (spec.components?.schemas as { [key: string]: OpenAPIV3.SchemaObject }) || {},
 				})
 			: []),

package/src/generator/schemaGenerator.ts

@@ -1,5 +1,5 @@
 import type { OpenAPIV3 } from "openapi-types";
-import { pascalCase, sanitizePropertyName, sanitizeTypeName } from "../utils";
+import { sanitizePropertyName, sanitizeTypeName } from "../utils";
 
 interface SchemaContext {
 	schemas: { [key: string]: OpenAPIV3.SchemaObject };
@@ -19,26 +19,28 @@ function getTypeFromSchema(
 		const refType = schema.$ref.split("/").pop();
 		return sanitizeTypeName(refType as string);
 	}
+	const nullable = schema.nullable ? " | null" : "";
 
 	// Handle enum types properly
 	if (schema.enum) {
-		return schema.enum.map((e) => (typeof e === "string" ? `'${e}'` : e)).join(" | ");
+		return schema.enum.map((e) => (typeof e === "string" ? `'${e}'` : e)).join(" | ") + nullable;
 	}
 
 	switch (schema.type) {
 		case "string":
 			if ("format" in schema && schema.format === "binary") {
-				return "string | { name?: string; type?: string; uri: string }";
+				return `string | { name?: string; type?: string; uri: string }${nullable}`;
 			}
-			return "string";
+
+			return `string${nullable}`;
 		case "number":
 		case "integer":
-			return "number";
+			return `number${nullable}`;
 		case "boolean":
-			return "boolean";
+			return `boolean${nullable}`;
 		case "array": {
 			const itemType = getTypeFromSchema(schema.items, context);
-			return `Array<${itemType}>`;
+			return `Array<${itemType}>${nullable}`;
 		}
 		case "object":
 			if (schema.properties) {
@@ -50,18 +52,18 @@ function getTypeFromSchema(
 						return `  ${safeName}${isRequired ? "" : "?"}: ${propertyType};`;
 					})
 					.join("\n");
-				return `{\n${properties}\n}`;
+				return `{${properties}\n}${nullable}`;
 			}
 			if (schema.additionalProperties) {
 				const valueType =
 					typeof schema.additionalProperties === "boolean"
 						? "any"
 						: getTypeFromSchema(schema.additionalProperties, context);
-				return `Record<string, ${valueType}>`;
+				return `Record<string, ${valueType}>${nullable}`;
 			}
-			return "Record<string, any>";
+			return `Record<string, any>${nullable}`;
 		default:
-			return "any";
+			return `any${nullable}`;
 	}
 }
 
@@ -113,7 +115,11 @@ export function generateTypeDefinitions(spec: OpenAPIV3.Document): string {
 				// Generate request body type
 				if (operationObject.requestBody) {
 					const content = (operationObject.requestBody as OpenAPIV3.RequestBodyObject).content;
-					const jsonContent = content["application/json"] || content["multipart/form-data"];
+					const jsonContent =
+						content["application/ld+json"] ??
+						content["application/json"] ??
+						content["multipart/form-data"] ??
+						content["application/octet-stream"];
 					if (jsonContent?.schema) {
 						const typeName = `${operationId}Request`;
 						output += generateTypeDefinition(typeName, jsonContent.schema as OpenAPIV3.SchemaObject, context);
@@ -124,7 +130,10 @@ export function generateTypeDefinitions(spec: OpenAPIV3.Document): string {
 				if (operationObject.responses) {
 					for (const [code, response] of Object.entries(operationObject.responses)) {
 						const responseObj = response as OpenAPIV3.ResponseObject;
-						const content = responseObj.content?.["application/json"];
+						const content =
+							responseObj.content?.["application/ld+json"] ??
+							responseObj.content?.["application/json"] ??
+							responseObj.content?.["application/octet-stream"];
 						if (content?.schema) {
 							const typeName = `${operationId}Response${code}`;
 							output += generateTypeDefinition(typeName, content.schema as OpenAPIV3.SchemaObject, context);