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

package/dist/index.cjs

@@ -28,11 +28,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  default: () => src_default
+var index_exports = {};
+__export(index_exports, {
+  default: () => index_default
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/core/generateOpenApiSpec.ts
 var import_node_path4 = __toESM(require("path"), 1);
@@ -121,6 +121,8 @@ async function isDocumentedRoute(routePath2) {
 // src/core/next.ts
 var import_promises3 = __toESM(require("fs/promises"), 1);
 var import_node_path2 = __toESM(require("path"), 1);
+var import_next_openapi_route_handler = require("@omer-x/next-openapi-route-handler");
+var import_zod = require("zod");
 
 // src/utils/generateRandomString.ts
 function generateRandomString(length) {
@@ -159,20 +161,17 @@ function detectMiddlewareName(code2) {
   return match ? match[1] : null;
 }
 
-// src/core/transpile.ts
-var import_typescript = require("typescript");
-
 // src/utils/removeImports.ts
 function removeImports(code2) {
   return code2.replace(/(^import\s+[^;]+;?$|^import\s+[^;]*\sfrom\s.+;?$)/gm, "").replace(/(^import\s+{[\s\S]+?}\s+from\s+["'][^"']+["'];?)/gm, "").trim();
 }
 
 // src/core/transpile.ts
-function fixExports(code2) {
+function fixExportsInCommonJS(code2) {
   const validMethods = ["GET", "POST", "PUT", "PATCH", "DELETE"];
   const exportFixer1 = validMethods.map((method) => `exports.${method} = void 0;
-`);
-  const exportFixer2 = `module.exports = { ${validMethods.map((m) => `${m}: exports.${m}`).join(", ")} }`;
+`).join("\n");
+  const exportFixer2 = `module.exports = { ${validMethods.map((m) => `${m}: exports.${m}`).join(", ")} };`;
   return `${exportFixer1}
 ${code2}
 ${exportFixer2}`;
@@ -180,15 +179,24 @@ ${exportFixer2}`;
 function injectMiddlewareFixer(middlewareName) {
   return `const ${middlewareName} = (handler) => handler;`;
 }
-function transpile(rawCode, routeDefinerName, middlewareName) {
-  const code2 = fixExports(removeImports(rawCode));
+function transpile(isCommonJS, rawCode, middlewareName, transpileModule) {
   const parts = [
-    `import ${routeDefinerName} from '@omer-x/next-openapi-route-handler';`,
-    "import z from 'zod';",
     middlewareName ? injectMiddlewareFixer(middlewareName) : "",
-    code2
+    removeImports(rawCode)
   ];
-  return (0, import_typescript.transpile)(parts.join("\n"));
+  const output = transpileModule(parts.join("\n"), {
+    compilerOptions: {
+      module: isCommonJS ? 3 : 99,
+      target: 99,
+      sourceMap: false,
+      inlineSourceMap: false,
+      inlineSources: false
+    }
+  });
+  if (isCommonJS) {
+    return fixExportsInCommonJS(output.outputText);
+  }
+  return output.outputText;
 }
 
 // src/core/next.ts
@@ -203,22 +211,46 @@ async function findAppFolderPath() {
   }
   return null;
 }
-function safeEval(code, routePath) {
+async function safeEval(code, routePath) {
   try {
-    return eval(code);
+    if (typeof module !== "undefined" && typeof module.exports !== "undefined") {
+      return eval(code);
+    }
+    return await import(
+      /* webpackIgnore: true */
+      `data:text/javascript,${encodeURIComponent(code)}`
+    );
   } catch (error) {
     console.log(`An error occured while evaluating the route exports from "${routePath}"`);
     throw error;
   }
 }
+async function getModuleTranspiler() {
+  if (typeof require === "undefined") {
+    const { transpileModule } = await import(
+      /* webpackIgnore: true */
+      "typescript"
+    );
+    return transpileModule;
+  }
+  return require(
+    /* webpackIgnore: true */
+    "typescript"
+  ).transpileModule;
+}
 async function getRouteExports(routePath2, routeDefinerName, schemas) {
   const rawCode = await import_promises3.default.readFile(routePath2, "utf-8");
   const middlewareName = detectMiddlewareName(rawCode);
-  const code2 = transpile(rawCode, routeDefinerName, middlewareName);
+  const isCommonJS = typeof module !== "undefined" && typeof module.exports !== "undefined";
+  const code2 = transpile(isCommonJS, rawCode, middlewareName, await getModuleTranspiler());
   const fixedCode = Object.keys(schemas).reduce(injectSchemas, code2);
+  global[routeDefinerName] = import_next_openapi_route_handler.defineRoute;
+  global.z = import_zod.z;
   global.schemas = schemas;
-  const result = safeEval(fixedCode, routePath2);
+  const result = await safeEval(fixedCode, routePath2);
   delete global.schemas;
+  delete global[routeDefinerName];
+  delete global.z;
   return result;
 }
 
@@ -272,36 +304,9 @@ function deepEqual(a, b) {
 }
 
 // src/core/zod-to-openapi.ts
-var import_zod_to_json_schema = require("zod-to-json-schema");
-
-// src/utils/zod-schema.ts
-function isFile(schema) {
-  const file = new File([], "nothing.txt");
-  const plainObject = { name: "test", size: 0 };
-  const fileResult = schema.safeParse(file);
-  const objectResult = schema.safeParse(plainObject);
-  return fileResult.success && !objectResult.success;
-}
-
-// src/core/zod-to-openapi.ts
+var import_zod2 = require("zod");
 function convertToOpenAPI(schema, isArray) {
-  const result = (0, import_zod_to_json_schema.zodToJsonSchema)(isArray ? schema.array() : schema, {
-    target: "openApi3",
-    $refStrategy: "none"
-  });
-  if (result.type === "object" && result.properties) {
-    for (const [propName, prop] of Object.entries(schema.shape)) {
-      if (isFile(prop)) {
-        result.properties[propName] = {
-          type: "string",
-          format: "binary",
-          description: prop.description
-          // contentEncoding: "base64", // swagger-ui-react doesn't support this
-        };
-      }
-    }
-  }
-  return result;
+  return import_zod2.z.toJSONSchema(isArray ? schema.array() : schema);
 }
 
 // src/core/mask.ts
@@ -469,7 +474,7 @@ async function generateOpenApiSpec(schemas, {
       securitySchemes
     }
   };
-  return {
+  return JSON.parse(JSON.stringify({
     openapi: "3.1.0",
     info: {
       title: metadata.serviceName,
@@ -480,8 +485,8 @@ async function generateOpenApiSpec(schemas, {
     ...clearUnusedSchemasOption ? clearUnusedSchemas(pathsAndComponents) : pathsAndComponents,
     security,
     tags: []
-  };
+  }));
 }
 
 // src/index.ts
-var src_default = generateOpenApiSpec;
+var index_default = generateOpenApiSpec;

package/dist/index.js

@@ -1,5 +1,12 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // src/core/generateOpenApiSpec.ts
-import path4 from "node:path";
+import path4 from "path";
 import getPackageMetadata from "@omer-x/package-metadata";
 
 // src/utils/object.ts
@@ -35,7 +42,7 @@ function clearUnusedSchemas({
 // src/core/dir.ts
 import { constants } from "fs";
 import fs from "fs/promises";
-import path from "node:path";
+import path from "path";
 import { Minimatch } from "minimatch";
 async function directoryExists(dirPath) {
   try {
@@ -72,7 +79,7 @@ function filterDirectoryItems(rootPath, items, include, exclude) {
 }
 
 // src/core/isDocumentedRoute.ts
-import fs2 from "node:fs/promises";
+import fs2 from "fs/promises";
 async function isDocumentedRoute(routePath2) {
   try {
     const rawCode = await fs2.readFile(routePath2, "utf-8");
@@ -83,8 +90,10 @@ async function isDocumentedRoute(routePath2) {
 }
 
 // src/core/next.ts
-import fs3 from "node:fs/promises";
-import path2 from "node:path";
+import fs3 from "fs/promises";
+import path2 from "path";
+import { defineRoute } from "@omer-x/next-openapi-route-handler";
+import { z } from "zod";
 
 // src/utils/generateRandomString.ts
 function generateRandomString(length) {
@@ -123,20 +132,17 @@ function detectMiddlewareName(code2) {
   return match ? match[1] : null;
 }
 
-// src/core/transpile.ts
-import { transpile as tsTranspile } from "typescript";
-
 // src/utils/removeImports.ts
 function removeImports(code2) {
   return code2.replace(/(^import\s+[^;]+;?$|^import\s+[^;]*\sfrom\s.+;?$)/gm, "").replace(/(^import\s+{[\s\S]+?}\s+from\s+["'][^"']+["'];?)/gm, "").trim();
 }
 
 // src/core/transpile.ts
-function fixExports(code2) {
+function fixExportsInCommonJS(code2) {
   const validMethods = ["GET", "POST", "PUT", "PATCH", "DELETE"];
   const exportFixer1 = validMethods.map((method) => `exports.${method} = void 0;
-`);
-  const exportFixer2 = `module.exports = { ${validMethods.map((m) => `${m}: exports.${m}`).join(", ")} }`;
+`).join("\n");
+  const exportFixer2 = `module.exports = { ${validMethods.map((m) => `${m}: exports.${m}`).join(", ")} };`;
   return `${exportFixer1}
 ${code2}
 ${exportFixer2}`;
@@ -144,15 +150,24 @@ ${exportFixer2}`;
 function injectMiddlewareFixer(middlewareName) {
   return `const ${middlewareName} = (handler) => handler;`;
 }
-function transpile(rawCode, routeDefinerName, middlewareName) {
-  const code2 = fixExports(removeImports(rawCode));
+function transpile(isCommonJS, rawCode, middlewareName, transpileModule) {
   const parts = [
-    `import ${routeDefinerName} from '@omer-x/next-openapi-route-handler';`,
-    "import z from 'zod';",
     middlewareName ? injectMiddlewareFixer(middlewareName) : "",
-    code2
+    removeImports(rawCode)
   ];
-  return tsTranspile(parts.join("\n"));
+  const output = transpileModule(parts.join("\n"), {
+    compilerOptions: {
+      module: isCommonJS ? 3 : 99,
+      target: 99,
+      sourceMap: false,
+      inlineSourceMap: false,
+      inlineSources: false
+    }
+  });
+  if (isCommonJS) {
+    return fixExportsInCommonJS(output.outputText);
+  }
+  return output.outputText;
 }
 
 // src/core/next.ts
@@ -167,22 +182,46 @@ async function findAppFolderPath() {
   }
   return null;
 }
-function safeEval(code, routePath) {
+async function safeEval(code, routePath) {
   try {
-    return eval(code);
+    if (typeof module !== "undefined" && typeof module.exports !== "undefined") {
+      return eval(code);
+    }
+    return await import(
+      /* webpackIgnore: true */
+      `data:text/javascript,${encodeURIComponent(code)}`
+    );
   } catch (error) {
     console.log(`An error occured while evaluating the route exports from "${routePath}"`);
     throw error;
   }
 }
+async function getModuleTranspiler() {
+  if (typeof __require === "undefined") {
+    const { transpileModule } = await import(
+      /* webpackIgnore: true */
+      "typescript"
+    );
+    return transpileModule;
+  }
+  return __require(
+    /* webpackIgnore: true */
+    "typescript"
+  ).transpileModule;
+}
 async function getRouteExports(routePath2, routeDefinerName, schemas) {
   const rawCode = await fs3.readFile(routePath2, "utf-8");
   const middlewareName = detectMiddlewareName(rawCode);
-  const code2 = transpile(rawCode, routeDefinerName, middlewareName);
+  const isCommonJS = typeof module !== "undefined" && typeof module.exports !== "undefined";
+  const code2 = transpile(isCommonJS, rawCode, middlewareName, await getModuleTranspiler());
   const fixedCode = Object.keys(schemas).reduce(injectSchemas, code2);
+  global[routeDefinerName] = defineRoute;
+  global.z = z;
   global.schemas = schemas;
-  const result = safeEval(fixedCode, routePath2);
+  const result = await safeEval(fixedCode, routePath2);
   delete global.schemas;
+  delete global[routeDefinerName];
+  delete global.z;
   return result;
 }
 
@@ -207,7 +246,7 @@ function verifyOptions(include, exclude) {
 }
 
 // src/core/getRoutePathName.ts
-import path3 from "node:path";
+import path3 from "path";
 function getRoutePathName(filePath, rootPath) {
   const dirName = path3.dirname(filePath);
   return "/" + path3.relative(rootPath, dirName).replaceAll("[", "{").replaceAll("]", "}").replaceAll("\\", "/");
@@ -236,36 +275,9 @@ function deepEqual(a, b) {
 }
 
 // src/core/zod-to-openapi.ts
-import { zodToJsonSchema } from "zod-to-json-schema";
-
-// src/utils/zod-schema.ts
-function isFile(schema) {
-  const file = new File([], "nothing.txt");
-  const plainObject = { name: "test", size: 0 };
-  const fileResult = schema.safeParse(file);
-  const objectResult = schema.safeParse(plainObject);
-  return fileResult.success && !objectResult.success;
-}
-
-// src/core/zod-to-openapi.ts
+import { z as z2 } from "zod";
 function convertToOpenAPI(schema, isArray) {
-  const result = zodToJsonSchema(isArray ? schema.array() : schema, {
-    target: "openApi3",
-    $refStrategy: "none"
-  });
-  if (result.type === "object" && result.properties) {
-    for (const [propName, prop] of Object.entries(schema.shape)) {
-      if (isFile(prop)) {
-        result.properties[propName] = {
-          type: "string",
-          format: "binary",
-          description: prop.description
-          // contentEncoding: "base64", // swagger-ui-react doesn't support this
-        };
-      }
-    }
-  }
-  return result;
+  return z2.toJSONSchema(isArray ? schema.array() : schema);
 }
 
 // src/core/mask.ts
@@ -433,7 +445,7 @@ async function generateOpenApiSpec(schemas, {
       securitySchemes
     }
   };
-  return {
+  return JSON.parse(JSON.stringify({
     openapi: "3.1.0",
     info: {
       title: metadata.serviceName,
@@ -444,11 +456,11 @@ async function generateOpenApiSpec(schemas, {
     ...clearUnusedSchemasOption ? clearUnusedSchemas(pathsAndComponents) : pathsAndComponents,
     security,
     tags: []
-  };
+  }));
 }
 
 // src/index.ts
-var src_default = generateOpenApiSpec;
+var index_default = generateOpenApiSpec;
 export {
-  src_default as default
+  index_default as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omer-x/next-openapi-json-generator",
-  "version": "1.3.4",
+  "version": "2.0.1",
   "description": "a Next.js plugin to generate OpenAPI documentation from route handlers",
   "keywords": [
     "next.js",
@@ -40,28 +40,28 @@
     }
   },
   "scripts": {
-    "test": "jest",
+    "test": "vitest run --coverage",
+    "test:watch": "vitest --coverage",
     "dev": "tsup --watch",
     "build": "tsup"
   },
+  "peerDependencies": {
+    "@omer-x/next-openapi-route-handler": "^2",
+    "@omer-x/openapi-types": "^1",
+    "zod": "^4",
+    "typescript": "^5"
+  },
   "dependencies": {
     "@omer-x/package-metadata": "^1.0.2",
-    "minimatch": "^10.0.1",
-    "typescript": "^5.7.2",
-    "zod-to-json-schema": "^3.24.1"
+    "minimatch": "^10.0.3"
   },
   "devDependencies": {
-    "@omer-x/eslint-config": "^2.1.2",
-    "@types/node": "^22.10.2",
-    "eslint": "^9.16.0",
-    "semantic-release": "^24.2.0",
-    "ts-jest": "^29.2.5",
-    "ts-node": "^10.9.2",
-    "tsup": "^8.3.5",
-    "zod": "^3.24.1"
-  },
-  "peerDependencies": {
-    "@omer-x/next-openapi-route-handler": "^1",
-    "@omer-x/openapi-types": "^1"
+    "@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"
   }
 }