react-query-lightbase-codegen 3.1.3 → 3.1.5

package/dist/utils.js

@@ -211,6 +211,20 @@ function getTypeFromSchema(schema) {
     }
     // Handle types based on the "type" property
     if ("type" in schema) {
+        // OpenAPI 3.1 "null" type (e.g. in anyOf: [{ $ref: "..." }, { type: "null" }])
+        if (schema.type === "null")
+            return "null";
+        // 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.3",
+	"version": "3.1.5",
 	"license": "MIT",
 	"description": "Generate Axios API clients and React Query options from OpenAPI specifications",
 	"exports": "./dist/index.js",

package/src/utils.ts

@@ -239,6 +239,20 @@ export function getTypeFromSchema(
 
 	// Handle types based on the "type" property
 	if ("type" in schema) {
+		// OpenAPI 3.1 "null" type (e.g. in anyOf: [{ $ref: "..." }, { type: "null" }])
+		if ((schema.type as string) === "null") return "null";
+
+		// 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