react-query-lightbase-codegen 3.1.2 → 3.1.4

package/dist/utils.js

@@ -201,23 +201,27 @@ function getTypeFromSchema(schema) {
     // Handle enums as union types
     if ("enum" in schema && schema.enum) {
         // Filter out null/undefined enum values (some specs include null for nullable enums)
-        const hasNull = schema.enum.some((e) => e === null);
+        const enumValues = Object.values(schema.enum);
+        const hasNull = enumValues.some((e) => e === null);
         const nullSuffix = hasNull ? " | null" : "";
-        if (Object.values(schema.enum)?.length > 0) {
-            const values = Object.values(schema.enum)
-                .filter((e) => e != null)
-                .map((e) => (typeof e === "string" ? `'${e}'` : e));
-            if (values.length === 0)
-                return `unknown${nullable}`;
-            return values.join(" | ") + nullSuffix + nullable;
-        }
-        const values = schema.enum.filter((e) => e != null).map((e) => (typeof e === "string" ? `'${e}'` : e));
+        const values = enumValues.filter((e) => e != null).map((e) => (typeof e === "string" ? `'${e}'` : e));
         if (values.length === 0)
             return `unknown${nullable}`;
         return values.join(" | ") + nullSuffix + nullable;
     }
     // Handle types based on the "type" property
     if ("type" in schema) {
+        // OpenAPI 3.1 supports type as an array, e.g. ["string", "null"]
+        if (Array.isArray(schema.type)) {
+            const types = schema.type.filter((t) => t !== "null");
+            const hasNull = schema.type.includes("null");
+            const nullSuffix = hasNull ? " | null" : "";
+            if (types.length === 0)
+                return `unknown${nullable}`;
+            // Resolve each type individually by recursing with a single-type schema
+            const resolved = types.map((t) => getTypeFromSchema({ ...schema, type: t }));
+            return resolved.filter(Boolean).join(" | ") + nullSuffix + nullable;
+        }
         switch (schema.type) {
             case "string":
                 // Special case for binary format strings

package/package.json

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

package/src/utils.ts

@@ -229,22 +229,27 @@ export function getTypeFromSchema(
 	// Handle enums as union types
 	if ("enum" in schema && schema.enum) {
 		// Filter out null/undefined enum values (some specs include null for nullable enums)
-		const hasNull = schema.enum.some((e) => e === null);
+		const enumValues = Object.values(schema.enum);
+		const hasNull = enumValues.some((e) => e === null);
 		const nullSuffix = hasNull ? " | null" : "";
-		if (Object.values(schema.enum)?.length > 0) {
-			const values = Object.values(schema.enum)
-				.filter((e) => e != null)
-				.map((e) => (typeof e === "string" ? `'${e}'` : e));
-			if (values.length === 0) return `unknown${nullable}`;
-			return values.join(" | ") + nullSuffix + nullable;
-		}
-		const values = schema.enum.filter((e) => e != null).map((e) => (typeof e === "string" ? `'${e}'` : e));
+		const values = enumValues.filter((e) => e != null).map((e) => (typeof e === "string" ? `'${e}'` : e));
 		if (values.length === 0) return `unknown${nullable}`;
 		return values.join(" | ") + nullSuffix + nullable;
 	}
 
 	// Handle types based on the "type" property
 	if ("type" in schema) {
+		// OpenAPI 3.1 supports type as an array, e.g. ["string", "null"]
+		if (Array.isArray(schema.type)) {
+			const types = (schema.type as string[]).filter((t) => t !== "null");
+			const hasNull = (schema.type as string[]).includes("null");
+			const nullSuffix = hasNull ? " | null" : "";
+			if (types.length === 0) return `unknown${nullable}`;
+			// Resolve each type individually by recursing with a single-type schema
+			const resolved = types.map((t) => getTypeFromSchema({ ...schema, type: t } as OpenAPIV3.SchemaObject));
+			return resolved.filter(Boolean).join(" | ") + nullSuffix + nullable;
+		}
+
 		switch (schema.type) {
 			case "string":
 				// Special case for binary format strings