typed-openapi 0.1.3 → 0.1.5

package/dist/{chunk-E7HJBSR2.js → chunk-RMN2CYTB.js}

@@ -136,10 +136,7 @@ var openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }) => {
           }
           const isRequired = Boolean(isPartial ? true : hasRequiredArray ? schema.required?.includes(prop) : false);
           const isOptional = !isPartial && !isRequired;
-          return [
-            `${wrapWithQuotesIfNeeded(prop)}${isOptional ? "?" : ""}`,
-            isOptional ? t.optional(propType) : propType
-          ];
+          return [`${wrapWithQuotesIfNeeded(prop)}`, isOptional ? t.optional(propType) : propType];
         })
       );
       const objectType = additionalProperties ? t.intersection([t.object(props), additionalProperties]) : t.object(props);
@@ -149,7 +146,13 @@ var openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }) => {
       return t.unknown();
     throw new Error(`Unsupported schema type: ${schemaType}`);
   };
-  return getTs();
+  let output = getTs();
+  if (!isReferenceObject(schema)) {
+    if (schema.nullable) {
+      output = t.union([output, t.reference("null")]);
+    }
+  }
+  return output;
 };
 
 // src/box.ts
@@ -687,7 +690,11 @@ var tsFactory = createFactory({
   any: () => "any",
   never: () => "never",
   object: (props) => {
-    const propsString = Object.entries(props).map(([prop, type2]) => `${wrapWithQuotesIfNeeded(prop)}: ${unwrap(type2)}`).join(", ");
+    const propsString = Object.entries(props).map(
+      ([prop, type2]) => `${wrapWithQuotesIfNeeded(prop)}${typeof type2 !== "string" && Box.isOptional(type2) ? "?" : ""}: ${unwrap(
+        type2
+      )}`
+    ).join(", ");
     return `{ ${propsString} }`;
   }
 });
@@ -720,16 +727,21 @@ var mapOpenApiEndpoints = (doc) => {
         (acc, paramOrRef) => {
           const param = refs.unwrap(paramOrRef);
           const schema = openApiSchemaToTs({ schema: refs.unwrap(param.schema ?? {}), ctx });
-          lists.query.push(param);
           if (param.required)
             endpoint.meta.areParametersRequired = true;
           endpoint.meta.hasParameters = true;
-          if (param.in === "query")
+          if (param.in === "query") {
+            lists.query.push(param);
             acc.query[param.name] = schema;
-          if (param.in === "path")
+          }
+          if (param.in === "path") {
+            lists.path.push(param);
             acc.path[param.name] = schema;
-          if (param.in === "header")
+          }
+          if (param.in === "header") {
+            lists.header.push(param);
             acc.header[param.name] = schema;
+          }
           return acc;
         },
         { query: {}, path: {}, header: {} }

package/dist/cli.cjs

@@ -31,7 +31,7 @@ var import_promises = require("fs/promises");
 
 // package.json
 var name = "typed-openapi";
-var version = "0.1.3";
+var version = "0.1.5";
 
 // src/generator.ts
 var import_server2 = require("pastable/server");
@@ -214,10 +214,7 @@ var openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }) => {
           }
           const isRequired = Boolean(isPartial ? true : hasRequiredArray ? schema.required?.includes(prop) : false);
           const isOptional = !isPartial && !isRequired;
-          return [
-            `${wrapWithQuotesIfNeeded(prop)}${isOptional ? "?" : ""}`,
-            isOptional ? t.optional(propType) : propType
-          ];
+          return [`${wrapWithQuotesIfNeeded(prop)}`, isOptional ? t.optional(propType) : propType];
         })
       );
       const objectType = additionalProperties ? t.intersection([t.object(props), additionalProperties]) : t.object(props);
@@ -227,7 +224,13 @@ var openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }) => {
       return t.unknown();
     throw new Error(`Unsupported schema type: ${schemaType}`);
   };
-  return getTs();
+  let output = getTs();
+  if (!isReferenceObject(schema)) {
+    if (schema.nullable) {
+      output = t.union([output, t.reference("null")]);
+    }
+  }
+  return output;
 };
 
 // src/box.ts
@@ -725,7 +728,11 @@ var tsFactory = createFactory({
   any: () => "any",
   never: () => "never",
   object: (props) => {
-    const propsString = Object.entries(props).map(([prop, type3]) => `${wrapWithQuotesIfNeeded(prop)}: ${unwrap(type3)}`).join(", ");
+    const propsString = Object.entries(props).map(
+      ([prop, type3]) => `${wrapWithQuotesIfNeeded(prop)}${typeof type3 !== "string" && Box.isOptional(type3) ? "?" : ""}: ${unwrap(
+        type3
+      )}`
+    ).join(", ");
     return `{ ${propsString} }`;
   }
 });
@@ -757,16 +764,21 @@ var mapOpenApiEndpoints = (doc) => {
         (acc, paramOrRef) => {
           const param = refs.unwrap(paramOrRef);
           const schema = openApiSchemaToTs({ schema: refs.unwrap(param.schema ?? {}), ctx });
-          lists.query.push(param);
           if (param.required)
             endpoint.meta.areParametersRequired = true;
           endpoint.meta.hasParameters = true;
-          if (param.in === "query")
+          if (param.in === "query") {
+            lists.query.push(param);
             acc.query[param.name] = schema;
-          if (param.in === "path")
+          }
+          if (param.in === "path") {
+            lists.path.push(param);
             acc.path[param.name] = schema;
-          if (param.in === "header")
+          }
+          if (param.in === "header") {
+            lists.header.push(param);
             acc.header[param.name] = schema;
+          }
           return acc;
         },
         { query: {}, path: {}, header: {} }

package/dist/cli.js

@@ -2,7 +2,7 @@ import {
   allowedRuntimes,
   generateFile,
   mapOpenApiEndpoints
-} from "./chunk-E7HJBSR2.js";
+} from "./chunk-RMN2CYTB.js";
 
 // src/cli.ts
 import SwaggerParser from "@apidevtools/swagger-parser";
@@ -13,7 +13,7 @@ import { writeFile } from "fs/promises";
 
 // package.json
 var name = "typed-openapi";
-var version = "0.1.3";
+var version = "0.1.5";
 
 // src/cli.ts
 var cwd = process.cwd();

package/dist/index.cjs

@@ -179,10 +179,7 @@ var openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }) => {
           }
           const isRequired = Boolean(isPartial ? true : hasRequiredArray ? schema.required?.includes(prop) : false);
           const isOptional = !isPartial && !isRequired;
-          return [
-            `${wrapWithQuotesIfNeeded(prop)}${isOptional ? "?" : ""}`,
-            isOptional ? t.optional(propType) : propType
-          ];
+          return [`${wrapWithQuotesIfNeeded(prop)}`, isOptional ? t.optional(propType) : propType];
         })
       );
       const objectType = additionalProperties ? t.intersection([t.object(props), additionalProperties]) : t.object(props);
@@ -192,7 +189,13 @@ var openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }) => {
       return t.unknown();
     throw new Error(`Unsupported schema type: ${schemaType}`);
   };
-  return getTs();
+  let output = getTs();
+  if (!isReferenceObject(schema)) {
+    if (schema.nullable) {
+      output = t.union([output, t.reference("null")]);
+    }
+  }
+  return output;
 };
 
 // src/box.ts
@@ -733,7 +736,11 @@ var tsFactory = createFactory({
   any: () => "any",
   never: () => "never",
   object: (props) => {
-    const propsString = Object.entries(props).map(([prop, type2]) => `${wrapWithQuotesIfNeeded(prop)}: ${unwrap(type2)}`).join(", ");
+    const propsString = Object.entries(props).map(
+      ([prop, type2]) => `${wrapWithQuotesIfNeeded(prop)}${typeof type2 !== "string" && Box.isOptional(type2) ? "?" : ""}: ${unwrap(
+        type2
+      )}`
+    ).join(", ");
     return `{ ${propsString} }`;
   }
 });
@@ -765,16 +772,21 @@ var mapOpenApiEndpoints = (doc) => {
         (acc, paramOrRef) => {
           const param = refs.unwrap(paramOrRef);
           const schema = openApiSchemaToTs({ schema: refs.unwrap(param.schema ?? {}), ctx });
-          lists.query.push(param);
           if (param.required)
             endpoint.meta.areParametersRequired = true;
           endpoint.meta.hasParameters = true;
-          if (param.in === "query")
+          if (param.in === "query") {
+            lists.query.push(param);
             acc.query[param.name] = schema;
-          if (param.in === "path")
+          }
+          if (param.in === "path") {
+            lists.path.push(param);
             acc.path[param.name] = schema;
-          if (param.in === "header")
+          }
+          if (param.in === "header") {
+            lists.header.push(param);
             acc.header[param.name] = schema;
+          }
           return acc;
         },
         { query: {}, path: {}, header: {} }

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   openApiSchemaToTs,
   tsFactory,
   unwrap
-} from "./chunk-E7HJBSR2.js";
+} from "./chunk-RMN2CYTB.js";
 export {
   createBoxFactory,
   createFactory,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typed-openapi",
   "type": "module",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "bin": {

package/src/map-openapi-endpoints.ts

@@ -39,14 +39,22 @@ export const mapOpenApiEndpoints = (doc: OpenAPIObject) => {
         (acc, paramOrRef) => {
           const param = refs.unwrap(paramOrRef);
           const schema = openApiSchemaToTs({ schema: refs.unwrap(param.schema ?? {}), ctx });
-          lists.query.push(param);
 
           if (param.required) endpoint.meta.areParametersRequired = true;
           endpoint.meta.hasParameters = true;
 
-          if (param.in === "query") acc.query[param.name] = schema;
-          if (param.in === "path") acc.path[param.name] = schema;
-          if (param.in === "header") acc.header[param.name] = schema;
+          if (param.in === "query") {
+            lists.query.push(param);
+            acc.query[param.name] = schema;
+          }
+          if (param.in === "path") {
+            lists.path.push(param);
+            acc.path[param.name] = schema;
+          }
+          if (param.in === "header") {
+            lists.header.push(param);
+            acc.header[param.name] = schema;
+          }
 
           return acc;
         },

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

@@ -4,6 +4,7 @@ import { createBoxFactory } from "./box-factory";
 import { isReferenceObject } from "./is-reference-object";
 import { AnyBoxDef, OpenapiSchemaConvertArgs } from "./types";
 import { wrapWithQuotesIfNeeded } from "./string-utils";
+import type { SchemaObject } from "openapi3-ts/oas30";
 
 export const openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }: OpenapiSchemaConvertArgs): Box<AnyBoxDef> => {
   const meta = {} as OpenapiSchemaConvertArgs["meta"];
@@ -134,10 +135,7 @@ export const openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }: Openapi
 
           const isRequired = Boolean(isPartial ? true : hasRequiredArray ? schema.required?.includes(prop) : false);
           const isOptional = !isPartial && !isRequired;
-          return [
-            `${wrapWithQuotesIfNeeded(prop)}${isOptional ? "?" : ""}`,
-            isOptional ? t.optional(propType) : propType,
-          ];
+          return [`${wrapWithQuotesIfNeeded(prop)}`, isOptional ? t.optional(propType) : propType];
         }),
       );
 
@@ -153,5 +151,13 @@ export const openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }: Openapi
     throw new Error(`Unsupported schema type: ${schemaType}`);
   };
 
-  return getTs();
+  let output = getTs();
+  if (!isReferenceObject(schema)) {
+    // OpenAPI 3.1 does not have nullable, but OpenAPI 3.0 does
+    if ((schema as any as SchemaObject).nullable) {
+      output = t.union([output, t.reference("null")]);
+    }
+  }
+
+  return output;
 };

package/src/ts-factory.ts

@@ -1,3 +1,4 @@
+import { Box } from "./box";
 import { createFactory, unwrap } from "./box-factory";
 import { wrapWithQuotesIfNeeded } from "./string-utils";
 
@@ -16,7 +17,12 @@ export const tsFactory = createFactory({
   never: () => "never" as const,
   object: (props) => {
     const propsString = Object.entries(props)
-      .map(([prop, type]) => `${wrapWithQuotesIfNeeded(prop)}: ${unwrap(type)}`)
+      .map(
+        ([prop, type]) =>
+          `${wrapWithQuotesIfNeeded(prop)}${typeof type !== "string" && Box.isOptional(type) ? "?" : ""}: ${unwrap(
+            type,
+          )}`,
+      )
       .join(", ");
 
     return `{ ${propsString} }`;