@omer-x/next-openapi-json-generator 2.0.1 → 2.0.3

package/dist/index.cjs

@@ -226,17 +226,17 @@ async function safeEval(code, routePath) {
   }
 }
 async function getModuleTranspiler() {
-  if (typeof require === "undefined") {
-    const { transpileModule } = await import(
+  if (typeof require !== "undefined" && typeof exports !== "undefined") {
+    return require(
       /* webpackIgnore: true */
       "typescript"
-    );
-    return transpileModule;
+    ).transpileModule;
   }
-  return require(
+  const { transpileModule } = await import(
     /* webpackIgnore: true */
     "typescript"
-  ).transpileModule;
+  );
+  return transpileModule;
 }
 async function getRouteExports(routePath2, routeDefinerName, schemas) {
   const rawCode = await import_promises3.default.readFile(routePath2, "utf-8");
@@ -305,8 +305,35 @@ function deepEqual(a, b) {
 
 // src/core/zod-to-openapi.ts
 var import_zod2 = require("zod");
+function fixSchema(schema) {
+  if ("unwrap" in schema && typeof schema.unwrap === "function") {
+    switch (schema._zod.def.type) {
+      case "nullable":
+        return fixSchema(schema.unwrap()).nullable();
+      case "optional":
+        return fixSchema(schema.unwrap()).optional();
+      case "readonly":
+        return fixSchema(schema.unwrap()).readonly();
+      case "array":
+        return fixSchema(schema.unwrap()).array();
+      default:
+        throw new Error(`${schema._zod.def.type} type is not covered in fixSchema (@omer-x/next-openapi-json-generator")`);
+    }
+  }
+  if (schema._zod.def.type === "date") {
+    return import_zod2.z.iso.datetime();
+  }
+  if (schema._zod.def.type === "object") {
+    const { shape } = schema;
+    const entries = Object.entries(shape);
+    const alteredEntries = entries.map(([propName, prop]) => [propName, fixSchema(prop)]);
+    const newShape = Object.fromEntries(alteredEntries);
+    return import_zod2.z.object(newShape);
+  }
+  return schema;
+}
 function convertToOpenAPI(schema, isArray) {
-  return import_zod2.z.toJSONSchema(isArray ? schema.array() : schema);
+  return import_zod2.z.toJSONSchema(fixSchema(isArray ? schema.array() : schema));
 }
 
 // src/core/mask.ts

package/dist/index.js

@@ -197,17 +197,17 @@ async function safeEval(code, routePath) {
   }
 }
 async function getModuleTranspiler() {
-  if (typeof __require === "undefined") {
-    const { transpileModule } = await import(
+  if (typeof __require !== "undefined" && typeof exports !== "undefined") {
+    return __require(
       /* webpackIgnore: true */
       "typescript"
-    );
-    return transpileModule;
+    ).transpileModule;
   }
-  return __require(
+  const { transpileModule } = await import(
     /* webpackIgnore: true */
     "typescript"
-  ).transpileModule;
+  );
+  return transpileModule;
 }
 async function getRouteExports(routePath2, routeDefinerName, schemas) {
   const rawCode = await fs3.readFile(routePath2, "utf-8");
@@ -276,8 +276,35 @@ function deepEqual(a, b) {
 
 // src/core/zod-to-openapi.ts
 import { z as z2 } from "zod";
+function fixSchema(schema) {
+  if ("unwrap" in schema && typeof schema.unwrap === "function") {
+    switch (schema._zod.def.type) {
+      case "nullable":
+        return fixSchema(schema.unwrap()).nullable();
+      case "optional":
+        return fixSchema(schema.unwrap()).optional();
+      case "readonly":
+        return fixSchema(schema.unwrap()).readonly();
+      case "array":
+        return fixSchema(schema.unwrap()).array();
+      default:
+        throw new Error(`${schema._zod.def.type} type is not covered in fixSchema (@omer-x/next-openapi-json-generator")`);
+    }
+  }
+  if (schema._zod.def.type === "date") {
+    return z2.iso.datetime();
+  }
+  if (schema._zod.def.type === "object") {
+    const { shape } = schema;
+    const entries = Object.entries(shape);
+    const alteredEntries = entries.map(([propName, prop]) => [propName, fixSchema(prop)]);
+    const newShape = Object.fromEntries(alteredEntries);
+    return z2.object(newShape);
+  }
+  return schema;
+}
 function convertToOpenAPI(schema, isArray) {
-  return z2.toJSONSchema(isArray ? schema.array() : schema);
+  return z2.toJSONSchema(fixSchema(isArray ? schema.array() : schema));
 }
 
 // src/core/mask.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omer-x/next-openapi-json-generator",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "a Next.js plugin to generate OpenAPI documentation from route handlers",
   "keywords": [
     "next.js",
@@ -53,15 +53,15 @@
   },
   "dependencies": {
     "@omer-x/package-metadata": "^1.0.2",
-    "minimatch": "^10.0.3"
+    "minimatch": "^10.1.1"
   },
   "devDependencies": {
-    "@omer-x/eslint-config": "^2.1.3",
-    "@types/node": "^24.0.14",
-    "@vitest/coverage-v8": "^3.2.4",
-    "eslint": "^9.31.0",
-    "semantic-release": "^24.2.7",
-    "tsup": "^8.5.0",
-    "vitest": "^3.2.4"
+    "@omer-x/eslint-config": "^2.2.6",
+    "@types/node": "^25.0.1",
+    "@vitest/coverage-v8": "^4.0.15",
+    "eslint": "^9.39.2",
+    "semantic-release": "^25.0.2",
+    "tsup": "^8.5.1",
+    "vitest": "^4.0.15"
   }
 }