react-query-lightbase-codegen 2.5.9 → 2.5.11

package/dist/generator/reactQueryGenerator.js

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateReactQuery = generateReactQuery;
 const utils_1 = require("../utils");
+function resolveSchema(schema, spec) {
+    if (!schema)
+        return undefined;
+    if ("$ref" in schema) {
+        const index = schema.$ref.split("/").pop();
+        return spec.components?.schemas?.[index];
+    }
+    return schema;
+}
 function generateQueryOptions(operation, spec) {
     const { operationId, parameters, requestBody, method } = operation;
     const hasData = (parameters && parameters.length > 0) || operation.requestBody;
@@ -19,6 +28,12 @@ function generateQueryOptions(operation, spec) {
             requestBody.content?.["application/json"]?.schema ??
             requestBody.content?.["application/octet-stream"]?.schema)
         : undefined;
+    const requestBodySchema = content ? resolveSchema(content, spec) : undefined;
+    // Check if request body is a primitive type (string, number, boolean)
+    const isPrimitiveRequestBody = requestBodySchema &&
+        !requestBodySchema.properties &&
+        !requestBodySchema.type?.includes("object") &&
+        !requestBodySchema.type?.includes("array");
     // Get required parameter names from both parameters and request body
     const requiredParams = [
         ...(parameters?.filter((p) => p.required).map((p) => `'${p.name}'`) || []),
@@ -35,15 +50,34 @@ function generateQueryOptions(operation, spec) {
     ];
     const namedQueryOptions = (0, utils_1.camelCase)(`get${operationId}QueryOptions`);
     const namedQuery = (0, utils_1.camelCase)(`${operationId}`);
+    // Handle destructuring based on whether we have primitive request body
+    const destructuringLine = hasData
+        ? isPrimitiveRequestBody
+            ? "const { axiosConfig, data } = props || {};"
+            : "const { axiosConfig, ...params } = props || {};"
+        : "const { axiosConfig } = props || {};";
+    const paramsVariable = hasData ? (isPrimitiveRequestBody ? "data" : "params") : "";
+    const queryKeyParams = hasData ? paramsVariable : "";
+    const functionCall = hasData
+        ? isPrimitiveRequestBody
+            ? "{data, axiosConfig}"
+            : "{...params, axiosConfig}"
+        : "{axiosConfig}";
+    // Handle enabled logic based on request body type
+    const enabledLogic = hasData
+        ? isPrimitiveRequestBody
+            ? "!!data"
+            : `hasDefinedProps(${paramsVariable}, ${requiredParams.join(", ")})`
+        : "true";
     return `
 export const ${namedQueryOptions} = ( 
   ${hasData ? `props: Partial<Parameters<typeof apiClient.${namedQuery}>[0]>` : `props?: Partial<Parameters<typeof apiClient.${namedQuery}>[0]>`}
 ) => {
-  ${hasData ? "const { axiosConfig, ...params } = props || {};" : "const { axiosConfig } = props || {};"}
-  const enabled = ${hasData ? `hasDefinedProps(params, ${requiredParams.join(", ")})` : "true"};
+  ${destructuringLine}
+  const enabled = ${enabledLogic};
   return queryOptions({
-    queryKey: ['${(0, utils_1.camelCase)(operationId)}', ${hasData ? "params" : ""}],
-    queryFn: enabled ? () => apiClient.${namedQuery}(${hasData ? "{...params, axiosConfig}" : "{axiosConfig}"}) : skipToken,
+    queryKey: ['${(0, utils_1.camelCase)(operationId)}', ${queryKeyParams}],
+    queryFn: enabled ? () => apiClient.${namedQuery}(${functionCall}) : skipToken,
   });
 };`;
 }

package/dist/utils.d.ts

@@ -40,6 +40,7 @@ export declare function specTitle(spec: OpenAPIV3.Document): string;
  * - References ($ref) by extracting the type name
  * - Nullable types by appending "| null"
  * - Enums by creating union types of the values
+ * - OneOf schemas as union types
  * - Basic types (string, number, boolean)
  * - Binary format strings as a union with file metadata object
  * - Arrays by recursively getting the item type

package/dist/utils.js

@@ -65,6 +65,7 @@ function specTitle(spec) {
  * - References ($ref) by extracting the type name
  * - Nullable types by appending "| null"
  * - Enums by creating union types of the values
+ * - OneOf schemas as union types
  * - Basic types (string, number, boolean)
  * - Binary format strings as a union with file metadata object
  * - Arrays by recursively getting the item type
@@ -94,6 +95,13 @@ function getTypeFromSchema(schema) {
         }
         return schema.enum.map((e) => (typeof e === "string" ? `'${e}'` : e)).join(" | ") + nullable;
     }
+    // Handle oneOf as union types
+    if ("oneOf" in schema && schema.oneOf) {
+        const unionTypes = schema.oneOf
+            .map((subSchema) => getTypeFromSchema(subSchema))
+            .filter((type) => type !== undefined);
+        return unionTypes.length > 0 ? `${unionTypes.join(" | ")}${nullable}` : `any${nullable}`;
+    }
     // Handle types based on the "type" property
     if ("type" in schema) {
         switch (schema.type) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "react-query-lightbase-codegen",
-	"version": "2.5.9",
+	"version": "2.5.11",
 	"license": "MIT",
 	"description": "Generate Axios API clients and React Query options from OpenAPI specifications",
 	"exports": "./dist/index.js",

package/src/generator/reactQueryGenerator.ts

@@ -2,6 +2,18 @@ import type { OpenAPIV3 } from "openapi-types";
 import { camelCase, sanitizeTypeName, specTitle } from "../utils";
 import type { OperationInfo } from "./clientGenerator";
 
+function resolveSchema(
+	schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject | undefined,
+	spec: OpenAPIV3.Document
+): OpenAPIV3.SchemaObject | undefined {
+	if (!schema) return undefined;
+	if ("$ref" in schema) {
+		const index = schema.$ref.split("/").pop();
+		return spec.components?.schemas?.[index as string] as OpenAPIV3.SchemaObject;
+	}
+	return schema;
+}
+
 function generateQueryOptions(operation: OperationInfo, spec: OpenAPIV3.Document): string {
 	const { operationId, parameters, requestBody, method } = operation;
 
@@ -26,6 +38,16 @@ function generateQueryOptions(operation: OperationInfo, spec: OpenAPIV3.Document
 				requestBody.content?.["application/json"]?.schema ??
 				requestBody.content?.["application/octet-stream"]?.schema)
 			: undefined;
+
+	const requestBodySchema = content ? resolveSchema(content, spec) : undefined;
+
+	// Check if request body is a primitive type (string, number, boolean)
+	const isPrimitiveRequestBody =
+		requestBodySchema &&
+		!requestBodySchema.properties &&
+		!requestBodySchema.type?.includes("object") &&
+		!requestBodySchema.type?.includes("array");
+
 	// Get required parameter names from both parameters and request body
 	const requiredParams = [
 		...(parameters?.filter((p) => p.required).map((p) => `'${p.name}'`) || []),
@@ -44,15 +66,39 @@ function generateQueryOptions(operation: OperationInfo, spec: OpenAPIV3.Document
 	const namedQueryOptions = camelCase(`get${operationId}QueryOptions`);
 	const namedQuery = camelCase(`${operationId}`);
 
+	// Handle destructuring based on whether we have primitive request body
+	const destructuringLine = hasData
+		? isPrimitiveRequestBody
+			? "const { axiosConfig, data } = props || {};"
+			: "const { axiosConfig, ...params } = props || {};"
+		: "const { axiosConfig } = props || {};";
+
+	const paramsVariable = hasData ? (isPrimitiveRequestBody ? "data" : "params") : "";
+
+	const queryKeyParams = hasData ? paramsVariable : "";
+
+	const functionCall = hasData
+		? isPrimitiveRequestBody
+			? "{data, axiosConfig}"
+			: "{...params, axiosConfig}"
+		: "{axiosConfig}";
+
+	// Handle enabled logic based on request body type
+	const enabledLogic = hasData
+		? isPrimitiveRequestBody
+			? "!!data"
+			: `hasDefinedProps(${paramsVariable}, ${requiredParams.join(", ")})`
+		: "true";
+
 	return `
 export const ${namedQueryOptions} = ( 
   ${hasData ? `props: Partial<Parameters<typeof apiClient.${namedQuery}>[0]>` : `props?: Partial<Parameters<typeof apiClient.${namedQuery}>[0]>`}
 ) => {
-  ${hasData ? "const { axiosConfig, ...params } = props || {};" : "const { axiosConfig } = props || {};"}
-  const enabled = ${hasData ? `hasDefinedProps(params, ${requiredParams.join(", ")})` : "true"};
+  ${destructuringLine}
+  const enabled = ${enabledLogic};
   return queryOptions({
-    queryKey: ['${camelCase(operationId)}', ${hasData ? "params" : ""}],
-    queryFn: enabled ? () => apiClient.${namedQuery}(${hasData ? "{...params, axiosConfig}" : "{axiosConfig}"}) : skipToken,
+    queryKey: ['${camelCase(operationId)}', ${queryKeyParams}],
+    queryFn: enabled ? () => apiClient.${namedQuery}(${functionCall}) : skipToken,
   });
 };`;
 }

package/src/utils.ts

@@ -64,6 +64,7 @@ export function specTitle(spec: OpenAPIV3.Document): string {
  * - References ($ref) by extracting the type name
  * - Nullable types by appending "| null"
  * - Enums by creating union types of the values
+ * - OneOf schemas as union types
  * - Basic types (string, number, boolean)
  * - Binary format strings as a union with file metadata object
  * - Arrays by recursively getting the item type
@@ -99,6 +100,14 @@ export function getTypeFromSchema(
 		return schema.enum.map((e) => (typeof e === "string" ? `'${e}'` : e)).join(" | ") + nullable;
 	}
 
+	// Handle oneOf as union types
+	if ("oneOf" in schema && schema.oneOf) {
+		const unionTypes = schema.oneOf
+			.map((subSchema) => getTypeFromSchema(subSchema))
+			.filter((type): type is string => type !== undefined);
+		return unionTypes.length > 0 ? `${unionTypes.join(" | ")}${nullable}` : `any${nullable}`;
+	}
+
 	// Handle types based on the "type" property
 	if ("type" in schema) {
 		switch (schema.type) {