@tim-smart/openapi-gen 0.4.5 → 0.4.7

package/main.js

@@ -34825,9 +34825,10 @@ var make64 = gen2(function* () {
   const refStore = /* @__PURE__ */ new Map();
   function cleanupSchema(schema) {
     if ("type" in schema && Array.isArray(schema.type) && schema.type.includes("null")) {
+      const type2 = schema.type.filter((_) => _ !== "null");
       schema = {
         ...schema,
-        type: schema.type.filter((_) => _ !== "null"),
+        type: type2.length === 1 ? type2[0] : type2,
         nullable: true
       };
     }
@@ -34949,7 +34950,7 @@ var make64 = gen2(function* () {
     if ("$ref" in raw) {
       return refStore.get(raw.$ref) ?? raw;
     }
-    return raw;
+    return cleanupSchema(raw);
   };
   const flattenAllOf = (schema) => {
     if ("allOf" in schema) {
@@ -34968,9 +34969,6 @@ var make64 = gen2(function* () {
   const transformer = yield* JsonSchemaTransformer;
   const toSource = (importName, schema, currentIdentifier, topLevel = false) => {
     schema = cleanupSchema(schema);
-    if (currentIdentifier.startsWith("FunctionCall")) {
-      console.error(schema, currentIdentifier);
-    }
     if ("properties" in schema) {
       const obj = schema;
       const required2 = obj.required ?? [];
@@ -34978,6 +34976,7 @@ var make64 = gen2(function* () {
         Object.entries(obj.properties ?? {}),
         filterMap2(([key, schema2]) => {
           const fullSchema = getSchema(schema2);
+          schema2 = cleanupSchema(schema2);
           const isOptional = !required2.includes(key);
           const [enumNullable, filteredSchema] = filterNullable(fullSchema);
           return toSource(
@@ -35121,7 +35120,7 @@ var make64 = gen2(function* () {
           return some2(transformer.onBoolean({ importName }));
         }
         case "array": {
-          const nonEmpty = typeof schema.minItems === "number" && schema.minItems === 1 && schema.maxItems === void 0;
+          const nonEmpty = typeof schema.minItems === "number" && schema.minItems > 0;
           return toSource(
             importName,
             itemsSchema(schema.items),
@@ -35261,7 +35260,7 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
     },
     onArray({ importName, schema, item, nonEmpty }) {
       const modifiers = [];
-      if ("minItems" in schema && !nonEmpty) {
+      if ("minItems" in schema && nonEmpty) {
         modifiers.push(`${importName}.minItems(${schema.minItems})`);
       }
       if ("maxItems" in schema) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tim-smart/openapi-gen",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "Generate Effect http clients from OpenAPI specs",
   "bin": "main.js",
   "repository": {