typed-openapi 2.2.2 → 2.2.4

package/dist/{chunk-4VZOXNI4.js → chunk-62WASHT2.js}

@@ -5,7 +5,7 @@ import {
   generateFile,
   generateTanstackQueryFile,
   mapOpenApiEndpoints
-} from "./chunk-L5G4LNMY.js";
+} from "./chunk-ZM3UP6UJ.js";
 import {
   prettify
 } from "./chunk-KAEXXJ7X.js";

package/dist/{chunk-L5G4LNMY.js → chunk-ZM3UP6UJ.js}

@@ -132,7 +132,7 @@ var openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }) => {
     }
     if (schemaType === "object" || schema.properties || schema.additionalProperties) {
       if (!schema.properties) {
-        if (schema.additionalProperties && !isReferenceObject(schema.additionalProperties) && typeof schema.additionalProperties !== "boolean" && schema.additionalProperties.type) {
+        if (schema.additionalProperties && !isReferenceObject(schema.additionalProperties) && typeof schema.additionalProperties !== "boolean") {
           const valueSchema = openApiSchemaToTs({ schema: schema.additionalProperties, ctx, meta });
           return t.literal(`Record<string, ${valueSchema.value}>`);
         }
@@ -170,12 +170,20 @@ var openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }) => {
       const objectType = additionalProperties ? t.intersection([t.object(props), additionalProperties]) : t.object(props);
       return isPartial ? t.reference("Partial", [objectType]) : objectType;
     }
-    if (!schemaType) return t.unknown();
+    if (!schemaType) {
+      const nullableKey = Object.keys(schema).filter(
+        (key) => !["nullable"].includes(key)
+      );
+      if (nullableKey.length === 0 && schema.nullable) {
+        return t.literal("null");
+      }
+      return t.unknown();
+    }
     throw new Error(`Unsupported schema type: ${schemaType}`);
   };
   let output = getTs();
   if (!isReferenceObject(schema)) {
-    if (schema.nullable) {
+    if (schema.nullable && output.value !== "null") {
       output = t.union([output, t.literal("null")]);
     }
   }

package/dist/cli.js

@@ -1,9 +1,9 @@
 import {
   generateClientFiles
-} from "./chunk-4VZOXNI4.js";
+} from "./chunk-62WASHT2.js";
 import {
   allowedRuntimes
-} from "./chunk-L5G4LNMY.js";
+} from "./chunk-ZM3UP6UJ.js";
 import "./chunk-KAEXXJ7X.js";
 
 // src/cli.ts

package/dist/index.js

@@ -8,7 +8,7 @@ import {
   openApiSchemaToTs,
   tsFactory,
   unwrap
-} from "./chunk-L5G4LNMY.js";
+} from "./chunk-ZM3UP6UJ.js";
 import "./chunk-KAEXXJ7X.js";
 export {
   createBoxFactory,

package/dist/node.export.js

@@ -1,7 +1,7 @@
 import {
   generateClientFiles
-} from "./chunk-4VZOXNI4.js";
-import "./chunk-L5G4LNMY.js";
+} from "./chunk-62WASHT2.js";
+import "./chunk-ZM3UP6UJ.js";
 import "./chunk-KAEXXJ7X.js";
 export {
   generateClientFiles

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typed-openapi",
   "type": "module",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "exports": {
@@ -34,7 +34,7 @@
     "@types/node": "^22.15.17",
     "@types/prettier": "3.0.0",
     "msw": "2.10.5",
-    "tstyche": "4.3.0",
+    "tstyche": "5.0.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
     "vitest": "^3.1.3",

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

@@ -126,8 +126,7 @@ export const openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }: Openapi
         if (
           schema.additionalProperties &&
           !isReferenceObject(schema.additionalProperties) &&
-          typeof schema.additionalProperties !== "boolean" &&
-          schema.additionalProperties.type
+          typeof schema.additionalProperties !== "boolean"
         ) {
           const valueSchema = openApiSchemaToTs({ schema: schema.additionalProperties, ctx, meta });
           return t.literal(`Record<string, ${valueSchema.value}>`);
@@ -181,7 +180,17 @@ export const openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }: Openapi
       return isPartial ? t.reference("Partial", [objectType]) : objectType;
     }
 
-    if (!schemaType) return t.unknown();
+    if (!schemaType) {
+      const nullableKey = Object.keys(schema).filter(
+        key => !['nullable'].includes(key)
+      );
+
+      if (nullableKey.length === 0 && (schema as LibSchemaObject).nullable) {
+        return t.literal("null");
+      }
+
+      return t.unknown();
+    }
 
     throw new Error(`Unsupported schema type: ${schemaType}`);
   };
@@ -189,7 +198,7 @@ export const openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }: Openapi
   let output = getTs();
   if (!isReferenceObject(schema)) {
     // OpenAPI 3.1 does not have nullable, but OpenAPI 3.0 does
-    if ((schema as LibSchemaObject).nullable) {
+    if ((schema as LibSchemaObject).nullable && output.value !== "null") {
       output = t.union([output, t.literal("null")]);
     }
   }