typed-openapi 0.1.2 → 0.1.4

package/dist/cli.cjs

@@ -31,7 +31,7 @@ var import_promises = require("fs/promises");
 
 // package.json
 var name = "typed-openapi";
-var version = "0.1.1";
+var version = "0.1.4";
 
 // 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} }`;
   }
 });