@spikers/next-openapi-json-generator 2.0.1 → 2.0.3

package/dist/index.cjs

@@ -109,10 +109,14 @@ function filterDirectoryItems(rootPath, items, include, exclude) {
 
 // src/core/isDocumentedRoute.ts
 var import_promises2 = __toESM(require("fs/promises"), 1);
-async function isDocumentedRoute(routePath2) {
+var SUPPORTED_PACKAGE_NAMES = [
+  "@spikers/next-openapi-route-handler",
+  "@omer-x/next-openapi-route-handler"
+];
+async function isDocumentedRoute(routePath) {
   try {
-    const rawCode = await import_promises2.default.readFile(routePath2, "utf-8");
-    return rawCode.includes("@spikers/next-openapi-route-handler");
+    const rawCode = await import_promises2.default.readFile(routePath, "utf-8");
+    return SUPPORTED_PACKAGE_NAMES.some((name) => rawCode.includes(name));
   } catch {
     return false;
   }
@@ -121,7 +125,7 @@ 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_next_openapi_route_handler = require("@spikers/next-openapi-route-handler");
 var import_zod = require("zod");
 
 // src/utils/generateRandomString.ts
@@ -130,9 +134,9 @@ function generateRandomString(length) {
 }
 
 // src/utils/string-preservation.ts
-function preserveStrings(code2) {
+function preserveStrings(code) {
   let replacements = {};
-  const output = code2.replace(/(['"`])((?:\\.|(?!\1).)*)\1/g, (match, quote, content) => {
+  const output = code.replace(/(['"`])((?:\\.|(?!\1).)*)\1/g, (match, quote, content) => {
     const replacementId = generateRandomString(32);
     replacements = {
       ...replacements,
@@ -142,38 +146,38 @@ function preserveStrings(code2) {
   });
   return { output, replacements };
 }
-function restoreStrings(code2, replacements) {
-  return code2.replace(/<@~(.*?)~@>/g, (_, replacementId) => {
+function restoreStrings(code, replacements) {
+  return code.replace(/<@~(.*?)~@>/g, (_, replacementId) => {
     return replacements[replacementId];
   });
 }
 
 // src/core/injectSchemas.ts
-function injectSchemas(code2, refName) {
-  const { output: preservedCode, replacements } = preserveStrings(code2);
+function injectSchemas(code, refName) {
+  const { output: preservedCode, replacements } = preserveStrings(code);
   const preservedCodeWithSchemasInjected = preservedCode.replace(new RegExp(`\\b${refName}\\.`, "g"), `global.schemas[${refName}].`).replace(new RegExp(`\\b${refName}\\b`, "g"), `"${refName}"`).replace(new RegExp(`queryParams:\\s*['"\`]${refName}['"\`]`, "g"), `queryParams: global.schemas["${refName}"]`).replace(new RegExp(`pathParams:\\s*['"\`]${refName}['"\`]`, "g"), `pathParams: global.schemas["${refName}"]`);
   return restoreStrings(preservedCodeWithSchemasInjected, replacements);
 }
 
 // src/core/middleware.ts
-function detectMiddlewareName(code2) {
-  const match = code2.match(/middleware:\s*(\w+)/);
+function detectMiddlewareName(code) {
+  const match = code.match(/middleware:\s*(\w+)/);
   return match ? match[1] : null;
 }
 
 // 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();
+function removeImports(code) {
+  return code.replace(/(^import\s+[^;]+;?$|^import\s+[^;]*\sfrom\s.+;?$)/gm, "").replace(/(^import\s+{[\s\S]+?}\s+from\s+["'][^"']+["'];?)/gm, "").trim();
 }
 
 // src/core/transpile.ts
-function fixExportsInCommonJS(code2) {
+function fixExportsInCommonJS(code) {
   const validMethods = ["GET", "POST", "PUT", "PATCH", "DELETE"];
   const exportFixer1 = validMethods.map((method) => `exports.${method} = void 0;
 `).join("\n");
   const exportFixer2 = `module.exports = { ${validMethods.map((m) => `${m}: exports.${m}`).join(", ")} };`;
   return `${exportFixer1}
-${code2}
+${code}
 ${exportFixer2}`;
 }
 function injectMiddlewareFixer(middlewareName) {
@@ -213,13 +217,12 @@ async function findAppFolderPath() {
 }
 async function safeEval(code, routePath) {
   try {
-    if (typeof module !== "undefined" && typeof module.exports !== "undefined") {
-      return eval(code);
-    }
-    return await import(
-      /* webpackIgnore: true */
-      `data:text/javascript,${encodeURIComponent(code)}`
-    );
+    const exports2 = {};
+    const module2 = { exports: exports2 };
+    const require2 = () => ({});
+    const fn = new Function("exports", "module", "require", code);
+    fn(exports2, module2, require2);
+    return module2.exports;
   } catch (error) {
     console.log(`An error occured while evaluating the route exports from "${routePath}"`);
     throw error;
@@ -238,16 +241,15 @@ async function getModuleTranspiler() {
   );
   return transpileModule;
 }
-async function getRouteExports(routePath2, routeDefinerName, schemas) {
-  const rawCode = await import_promises3.default.readFile(routePath2, "utf-8");
+async function getRouteExports(routePath, routeDefinerName, schemas) {
+  const rawCode = await import_promises3.default.readFile(routePath, "utf-8");
   const middlewareName = detectMiddlewareName(rawCode);
-  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);
+  const code = transpile(true, rawCode, middlewareName, await getModuleTranspiler());
+  const fixedCode = Object.keys(schemas).reduce(injectSchemas, code);
   global[routeDefinerName] = import_next_openapi_route_handler.defineRoute;
   global.z = import_zod.z;
   global.schemas = schemas;
-  const result = await safeEval(fixedCode, routePath2);
+  const result = await safeEval(fixedCode, routePath);
   delete global.schemas;
   delete global[routeDefinerName];
   delete global.z;
@@ -278,7 +280,7 @@ function verifyOptions(include, exclude) {
 var import_node_path3 = __toESM(require("path"), 1);
 function getRoutePathName(filePath, rootPath) {
   const dirName = import_node_path3.default.dirname(filePath);
-  return "/" + import_node_path3.default.relative(rootPath, dirName).replaceAll("[", "{").replaceAll("]", "}").replaceAll("\\", "/");
+  return "/" + import_node_path3.default.relative(rootPath, dirName).replaceAll("[", "{").replaceAll("]", "}").replaceAll("\\", "/").replaceAll(/\([^)]*\)/g, "");
 }
 
 // src/utils/deepEqual.ts

package/dist/index.js

@@ -80,10 +80,14 @@ function filterDirectoryItems(rootPath, items, include, exclude) {
 
 // src/core/isDocumentedRoute.ts
 import fs2 from "fs/promises";
-async function isDocumentedRoute(routePath2) {
+var SUPPORTED_PACKAGE_NAMES = [
+  "@spikers/next-openapi-route-handler",
+  "@omer-x/next-openapi-route-handler"
+];
+async function isDocumentedRoute(routePath) {
   try {
-    const rawCode = await fs2.readFile(routePath2, "utf-8");
-    return rawCode.includes("@spikers/next-openapi-route-handler");
+    const rawCode = await fs2.readFile(routePath, "utf-8");
+    return SUPPORTED_PACKAGE_NAMES.some((name) => rawCode.includes(name));
   } catch {
     return false;
   }
@@ -92,7 +96,7 @@ async function isDocumentedRoute(routePath2) {
 // src/core/next.ts
 import fs3 from "fs/promises";
 import path2 from "path";
-import { defineRoute } from "@omer-x/next-openapi-route-handler";
+import { defineRoute } from "@spikers/next-openapi-route-handler";
 import { z } from "zod";
 
 // src/utils/generateRandomString.ts
@@ -101,9 +105,9 @@ function generateRandomString(length) {
 }
 
 // src/utils/string-preservation.ts
-function preserveStrings(code2) {
+function preserveStrings(code) {
   let replacements = {};
-  const output = code2.replace(/(['"`])((?:\\.|(?!\1).)*)\1/g, (match, quote, content) => {
+  const output = code.replace(/(['"`])((?:\\.|(?!\1).)*)\1/g, (match, quote, content) => {
     const replacementId = generateRandomString(32);
     replacements = {
       ...replacements,
@@ -113,38 +117,38 @@ function preserveStrings(code2) {
   });
   return { output, replacements };
 }
-function restoreStrings(code2, replacements) {
-  return code2.replace(/<@~(.*?)~@>/g, (_, replacementId) => {
+function restoreStrings(code, replacements) {
+  return code.replace(/<@~(.*?)~@>/g, (_, replacementId) => {
     return replacements[replacementId];
   });
 }
 
 // src/core/injectSchemas.ts
-function injectSchemas(code2, refName) {
-  const { output: preservedCode, replacements } = preserveStrings(code2);
+function injectSchemas(code, refName) {
+  const { output: preservedCode, replacements } = preserveStrings(code);
   const preservedCodeWithSchemasInjected = preservedCode.replace(new RegExp(`\\b${refName}\\.`, "g"), `global.schemas[${refName}].`).replace(new RegExp(`\\b${refName}\\b`, "g"), `"${refName}"`).replace(new RegExp(`queryParams:\\s*['"\`]${refName}['"\`]`, "g"), `queryParams: global.schemas["${refName}"]`).replace(new RegExp(`pathParams:\\s*['"\`]${refName}['"\`]`, "g"), `pathParams: global.schemas["${refName}"]`);
   return restoreStrings(preservedCodeWithSchemasInjected, replacements);
 }
 
 // src/core/middleware.ts
-function detectMiddlewareName(code2) {
-  const match = code2.match(/middleware:\s*(\w+)/);
+function detectMiddlewareName(code) {
+  const match = code.match(/middleware:\s*(\w+)/);
   return match ? match[1] : null;
 }
 
 // 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();
+function removeImports(code) {
+  return code.replace(/(^import\s+[^;]+;?$|^import\s+[^;]*\sfrom\s.+;?$)/gm, "").replace(/(^import\s+{[\s\S]+?}\s+from\s+["'][^"']+["'];?)/gm, "").trim();
 }
 
 // src/core/transpile.ts
-function fixExportsInCommonJS(code2) {
+function fixExportsInCommonJS(code) {
   const validMethods = ["GET", "POST", "PUT", "PATCH", "DELETE"];
   const exportFixer1 = validMethods.map((method) => `exports.${method} = void 0;
 `).join("\n");
   const exportFixer2 = `module.exports = { ${validMethods.map((m) => `${m}: exports.${m}`).join(", ")} };`;
   return `${exportFixer1}
-${code2}
+${code}
 ${exportFixer2}`;
 }
 function injectMiddlewareFixer(middlewareName) {
@@ -184,13 +188,12 @@ async function findAppFolderPath() {
 }
 async function safeEval(code, routePath) {
   try {
-    if (typeof module !== "undefined" && typeof module.exports !== "undefined") {
-      return eval(code);
-    }
-    return await import(
-      /* webpackIgnore: true */
-      `data:text/javascript,${encodeURIComponent(code)}`
-    );
+    const exports2 = {};
+    const module = { exports: exports2 };
+    const require2 = () => ({});
+    const fn = new Function("exports", "module", "require", code);
+    fn(exports2, module, require2);
+    return module.exports;
   } catch (error) {
     console.log(`An error occured while evaluating the route exports from "${routePath}"`);
     throw error;
@@ -209,16 +212,15 @@ async function getModuleTranspiler() {
   );
   return transpileModule;
 }
-async function getRouteExports(routePath2, routeDefinerName, schemas) {
-  const rawCode = await fs3.readFile(routePath2, "utf-8");
+async function getRouteExports(routePath, routeDefinerName, schemas) {
+  const rawCode = await fs3.readFile(routePath, "utf-8");
   const middlewareName = detectMiddlewareName(rawCode);
-  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);
+  const code = transpile(true, rawCode, middlewareName, await getModuleTranspiler());
+  const fixedCode = Object.keys(schemas).reduce(injectSchemas, code);
   global[routeDefinerName] = defineRoute;
   global.z = z;
   global.schemas = schemas;
-  const result = await safeEval(fixedCode, routePath2);
+  const result = await safeEval(fixedCode, routePath);
   delete global.schemas;
   delete global[routeDefinerName];
   delete global.z;
@@ -249,7 +251,7 @@ function verifyOptions(include, exclude) {
 import path3 from "path";
 function getRoutePathName(filePath, rootPath) {
   const dirName = path3.dirname(filePath);
-  return "/" + path3.relative(rootPath, dirName).replaceAll("[", "{").replaceAll("]", "}").replaceAll("\\", "/");
+  return "/" + path3.relative(rootPath, dirName).replaceAll("[", "{").replaceAll("]", "}").replaceAll("\\", "/").replaceAll(/\([^)]*\)/g, "");
 }
 
 // src/utils/deepEqual.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spikers/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",
@@ -44,7 +44,7 @@
   },
   "peerDependencies": {
     "@omer-x/json-schema-types": "^1",
-    "@omer-x/next-openapi-route-handler": "^2",
+    "@spikers/next-openapi-route-handler": "^2",
     "@omer-x/openapi-types": "^1",
     "typescript": "^5",
     "zod": "^4"