@tim-smart/openapi-gen 0.3.3 → 0.3.5

package/main.js

@@ -29405,7 +29405,7 @@ var make65 = gen2(function* () {
           current = current[key];
         }
         refStore.set(schema.$ref, current);
-        addRefs(current, "properties" in current ? name2 : void 0);
+        addRefs(current, name2);
         store.set(name2, current);
         if (!asStruct2) {
           classes.add(name2);
@@ -29416,16 +29416,22 @@ var make65 = gen2(function* () {
         );
       } else if ("type" in schema && schema.type === "array") {
         if (Array.isArray(schema.items)) {
-          schema.items.forEach((s) => addRefs(s, childName));
+          schema.items.forEach((s) => addRefs(s, void 0));
         } else if (schema.items) {
-          addRefs(schema.items, childName);
+          addRefs(schema.items, void 0);
         }
       } else if ("allOf" in schema) {
-        schema.allOf.forEach((s) => addRefs(s, childName));
+        schema.allOf.forEach(
+          (s) => addRefs(s, childName ? childName + "Enum" : void 0)
+        );
       } else if ("anyOf" in schema) {
-        schema.anyOf.forEach((s) => addRefs(s, childName));
+        schema.anyOf.forEach(
+          (s) => addRefs(s, childName ? childName + "Enum" : void 0)
+        );
       } else if ("oneOf" in schema) {
-        schema.oneOf.forEach((s) => addRefs(s, childName));
+        schema.oneOf.forEach(
+          (s) => addRefs(s, childName ? childName + "Enum" : void 0)
+        );
       } else if ("enum" in schema) {
         if (childName !== void 0) {
           store.set(childName, schema);
@@ -29471,7 +29477,7 @@ var make65 = gen2(function* () {
             map(
               applyAnnotations(S, {
                 isOptional,
-                isNullable: "nullable" in fullSchema && fullSchema.nullable === true,
+                isNullable: "nullable" in fullSchema && fullSchema.nullable === true || "default" in fullSchema && fullSchema.default === null,
                 default: fullSchema.default
               })
             ),
@@ -29497,7 +29503,7 @@ var make65 = gen2(function* () {
       }
       const items = schema.enum.map((_) => JSON.stringify(_)).join(", ");
       return some2(`${S}.Literal(${items})`);
-    } else if ("type" in schema) {
+    } else if ("type" in schema && schema.type) {
       switch (schema.type) {
         case "string": {
           const modifiers = [];
@@ -29570,7 +29576,7 @@ var make65 = gen2(function* () {
     } else if ("allOf" in schema) {
       const sources = pipe(
         schema.allOf,
-        filterMap2((_) => toSource(S, _, currentIdentifier))
+        filterMap2((_) => toSource(S, _, currentIdentifier + "Enum"))
       );
       if (sources.length === 0) {
         return none2();
@@ -29586,7 +29592,7 @@ var make65 = gen2(function* () {
     } else if ("anyOf" in schema || "oneOf" in schema) {
       const sources = pipe(
         "anyOf" in schema ? schema.anyOf : schema.oneOf,
-        filterMap2((_) => toSource(S, _, currentIdentifier))
+        filterMap2((_) => toSource(S, _, currentIdentifier + "Enum"))
       );
       if (sources.length === 0) return none2();
       else if (sources.length === 1) return some2(sources[0]);
@@ -29595,6 +29601,9 @@ var make65 = gen2(function* () {
     return none2();
   };
   const applyAnnotations = (S, options3) => (source) => {
+    if (options3.isNullable && options3.default === null) {
+      return `${S}.optionalWith(${source}, { nullable: true, default: () => null })`;
+    }
     const defaultSource = options3.default !== void 0 && options3.default !== null ? `() => ${JSON.stringify(options3.default)} as const` : void 0;
     if (options3.isOptional) {
       return defaultSource ? `${S}.optionalWith(${source}, { nullable: true, default: ${defaultSource} })` : `${S}.optionalWith(${source}, { nullable: true })`;
@@ -29857,7 +29866,7 @@ var operationToImpl = (operation) => {
     }
     if (operation.headers.length > 0) {
       const props = operation.headers.map(
-        (param) => `"${param}": ${varName}["${param}"]`
+        (param) => `"${param}": ${varName}["${param}"] ?? undefined`
       );
       pipeline.push(`HttpClientRequest.setHeaders({ ${props.join(", ")} })`);
     }

package/package.json

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