typed-openapi 1.4.3 → 1.4.5

package/dist/{chunk-5UEEXUUO.js → chunk-52X6V4N5.js}

@@ -66,10 +66,11 @@ var openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }) => {
       return t.union(schema.anyOf.map((prop) => openApiSchemaToTs({ schema: prop, ctx, meta })));
     }
     if (schema.allOf) {
-      if (schema.allOf.length === 1) {
-        return openApiSchemaToTs({ schema: schema.allOf[0], ctx, meta });
-      }
       const types = schema.allOf.map((prop) => openApiSchemaToTs({ schema: prop, ctx, meta }));
+      const { allOf, externalDocs, example, examples, description, title, ...rest } = schema;
+      if (Object.keys(rest).length > 0) {
+        types.push(openApiSchemaToTs({ schema: rest, ctx, meta }));
+      }
       return t.intersection(types);
     }
     const schemaType = schema.type ? schema.type.toLowerCase() : void 0;
@@ -102,6 +103,17 @@ var openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }) => {
       if (schemaType === "number" || schemaType === "integer") return t.number();
       if (schemaType === "null") return t.literal("null");
     }
+    if (!schemaType && schema.enum) {
+      return t.union(schema.enum.map((value) => {
+        if (typeof value === "string") {
+          return t.literal(`"${value}"`);
+        }
+        if (value === null) {
+          return t.literal("null");
+        }
+        return t.literal(value);
+      }));
+    }
     if (schemaType === "array") {
       if (schema.items) {
         let arrayOfType = openApiSchemaToTs({ schema: schema.items, ctx, meta });

package/dist/{chunk-UQGHH67X.js → chunk-F4UA5MLD.js}

@@ -4,7 +4,7 @@ import {
   generateTanstackQueryFile,
   mapOpenApiEndpoints,
   prettify
-} from "./chunk-5UEEXUUO.js";
+} from "./chunk-52X6V4N5.js";
 
 // src/generate-client-files.ts
 import SwaggerParser from "@apidevtools/swagger-parser";

package/dist/cli.js

@@ -1,9 +1,9 @@
 import {
   generateClientFiles
-} from "./chunk-UQGHH67X.js";
+} from "./chunk-F4UA5MLD.js";
 import {
   allowedRuntimes
-} from "./chunk-5UEEXUUO.js";
+} from "./chunk-52X6V4N5.js";
 
 // src/cli.ts
 import { cac } from "cac";

package/dist/index.js

@@ -8,7 +8,7 @@ import {
   openApiSchemaToTs,
   tsFactory,
   unwrap
-} from "./chunk-5UEEXUUO.js";
+} from "./chunk-52X6V4N5.js";
 export {
   createBoxFactory,
   createFactory,

package/dist/node.export.js

@@ -1,9 +1,9 @@
 import {
   generateClientFiles
-} from "./chunk-UQGHH67X.js";
+} from "./chunk-F4UA5MLD.js";
 import {
   prettify
-} from "./chunk-5UEEXUUO.js";
+} from "./chunk-52X6V4N5.js";
 export {
   generateClientFiles,
   prettify

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typed-openapi",
   "type": "module",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "exports": {

package/src/openapi-schema-to-ts.ts

@@ -52,11 +52,11 @@ export const openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }: Openapi
     }
 
     if (schema.allOf) {
-      if (schema.allOf.length === 1) {
-        return openApiSchemaToTs({ schema: schema.allOf[0]!, ctx, meta });
-      }
-
       const types = schema.allOf.map((prop) => openApiSchemaToTs({ schema: prop, ctx, meta }));
+      const {allOf, externalDocs,  example, examples, description, title,  ...rest} = schema
+      if (Object.keys(rest).length > 0) {
+        types.push(openApiSchemaToTs({schema: rest, ctx, meta}))
+      }
       return t.intersection(types);
     }
 
@@ -94,6 +94,18 @@ export const openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }: Openapi
       if (schemaType === "number" || schemaType === "integer") return t.number();
       if (schemaType === "null") return t.literal("null");
     }
+    if (!schemaType && schema.enum) {
+      return t.union(schema.enum.map((value) => {
+        if (typeof value === "string") {
+          return t.literal(`"${value}"`)
+        }
+        if (value === null) {
+          return t.literal("null")
+        }
+        // handle boolean and number literals
+        return t.literal(value)
+      }));
+    }
 
     if (schemaType === "array") {
       if (schema.items) {