@tim-smart/openapi-gen 0.4.1 → 0.4.2

package/main.js

@@ -34907,9 +34907,10 @@ var make64 = gen2(function* () {
         filterMap2(([key, schema2]) => {
           const fullSchema = getSchema(schema2);
           const isOptional = !required2.includes(key);
+          const [enumNullable, filteredSchema] = filterNullable(fullSchema);
           return toSource(
             importName,
-            schema2,
+            enumNullable ? filteredSchema : schema2,
             currentIdentifier + identifier2(key)
           ).pipe(
             map2(
@@ -34919,7 +34920,7 @@ var make64 = gen2(function* () {
                 key,
                 source,
                 isOptional,
-                isNullable: "nullable" in fullSchema && fullSchema.nullable === true || "default" in fullSchema && fullSchema.default === null,
+                isNullable: enumNullable || "nullable" in fullSchema && fullSchema.nullable === true || "default" in fullSchema && fullSchema.default === null,
                 default: fullSchema.default
               })
             )
@@ -34985,8 +34986,21 @@ var make64 = gen2(function* () {
         topLevel
       );
     } else if ("anyOf" in schema || "oneOf" in schema) {
+      let itemSchemas = "anyOf" in schema ? schema.anyOf : schema.oneOf;
+      let typePrimitives = 0;
+      const constItems = empty2();
+      for (const item of itemSchemas) {
+        if ("type" in item && item.type !== "null") {
+          typePrimitives++;
+        } else if ("const" in item) {
+          constItems.push(item);
+        }
+      }
+      if (typePrimitives <= 1 && constItems.length > 0 && constItems.length + typePrimitives === itemSchemas.length) {
+        itemSchemas = constItems;
+      }
       const items = pipe(
-        "anyOf" in schema ? schema.anyOf : schema.oneOf,
+        itemSchemas,
         filterMap2(
           (_) => toSource(importName, _, currentIdentifier + "Enum").pipe(
             map2(
@@ -35099,12 +35113,12 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
     supportsTopLevel({ isClass, isEnum }) {
       return isClass || isEnum;
     },
-    onTopLevel({ importName, schema, name: name2, source, isClass }) {
+    onTopLevel({ importName, schema, name: name2, source, isClass, description }) {
       const isObject2 = "properties" in schema;
       if (!isObject2 || !isClass) {
-        return `export class ${name2} extends ${source} {}`;
+        return `${toComment(description)}export class ${name2} extends ${source} {}`;
       }
-      return `export class ${name2} extends ${importName}.Class<${name2}>("${name2}")(${source}) {}`;
+      return `${toComment(description)}export class ${name2} extends ${importName}.Class<${name2}>("${name2}")(${source}) {}`;
     },
     propertySeparator: ",\n  ",
     onProperty: (options3) => {
@@ -35112,7 +35126,7 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
         options3.importName,
         options3
       )(options3.source);
-      return `"${options3.key}": ${source}`;
+      return `${toComment(options3.description)}"${options3.key}": ${source}`;
     },
     onRef({ name: name2 }) {
       return name2;
@@ -35163,12 +35177,12 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
       const modifiers = [];
       if (minimum !== void 0) {
         modifiers.push(
-          `${importName}.greaterThan${exclusiveMinimum ? "" : "OrEqualTo"}(${schema.minimum})`
+          `${importName}.greaterThan${exclusiveMinimum ? "" : "OrEqualTo"}(${minimum})`
         );
       }
       if (maximum !== void 0) {
         modifiers.push(
-          `${importName}.lessThan${exclusiveMaximum ? "" : "OrEqualTo"}(${schema.maximum})`
+          `${importName}.lessThan${exclusiveMaximum ? "" : "OrEqualTo"}(${maximum})`
         );
       }
       return `${importName}.${schema.type === "integer" ? "Int" : "Number"}${pipeSource(modifiers)}`;
@@ -35184,7 +35198,7 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
       return `${importName}.${nonEmpty ? "NonEmpty" : ""}Array(${item})${pipeSource(modifiers)}`;
     },
     onUnion({ importName, items }) {
-      return `${importName}.Union(${items.map((_) => _.source).join(", ")})`;
+      return `${importName}.Union(${items.map((_) => `${toComment(_.description)}${_.source}`).join(",\n")})`;
     }
   });
 });
@@ -35247,7 +35261,9 @@ export type ${name2} = (typeof ${name2})[keyof typeof ${name2}];` : `${toComment
 );
 var toComment = match2({
   onNone: () => "",
-  onSome: (description) => `/** ${description} */
+  onSome: (description) => `/**
+* ${description.split("\n").join("\n* ")}
+*/
 `
 });
 function mergeSchemas(self, other) {
@@ -35311,6 +35327,28 @@ function resolveRef(schema, context7, recursive = false) {
   }
   return { name: name2, schema: resolveAllOf(current, context7, recursive) };
 }
+function filterNullable(schema) {
+  if ("oneOf" in schema || "anyOf" in schema) {
+    const items = schema.oneOf ?? schema.anyOf;
+    const prop = "oneOf" in schema ? "oneOf" : "anyOf";
+    let isNullable2 = false;
+    let otherItems = empty2();
+    for (const item of items) {
+      if ("type" in item && item.type === "null") {
+        isNullable2 = true;
+      } else if ("const" in item && item.const === null) {
+        isNullable2 = true;
+      } else {
+        otherItems.push(item);
+      }
+    }
+    return [
+      isNullable2,
+      { ...schema, [prop]: otherItems }
+    ];
+  }
+  return [false, schema];
+}
 
 // src/OpenApi.ts
 var import_swagger2openapi = __toESM(require_swagger2openapi());

package/package.json

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