add a better error handling in eval

Author: omermecitoglu

src/core/next.ts

@@ -15,22 +15,18 @@ export async function findAppFolderPath() {
   return null;
 }
 
-function advancedEval(code: string) {
-  try {
-    return eval(code);
-  } catch (error) {
-    if (error instanceof ReferenceError) {
-      const refName = error.message.replace("is not defined", "").trim();
-      return advancedEval(code.replace(new RegExp(`\\b${refName}\\b`, "g"), `"${refName}"`));
-    }
-    throw error;
-    // console.error(error);
-    // return {};
-  }
+function injectSchemas(code: string, refName: string) {
+  return code
+    .replace(new RegExp(`\\b${refName}\\.`, "g"), `global.schemas[${refName}].`)
+    .replace(new RegExp(`\\b${refName}\\b`, "g"), `"${refName}"`);
 }
 
-export async function getRouteExports(routePath: string) {
+export async function getRouteExports(routePath: string, schemas: Record<string, unknown>) {
   const content = await fs.readFile(routePath, "utf-8");
   const code = transpile(content);
-  return advancedEval(code) as Record<string, { apiData?: unknown } | undefined>;
+  const fixedCode = Object.keys(schemas).reduce(injectSchemas, code);
+  (global as Record<string, unknown>).schemas = schemas;
+  const result = eval(fixedCode);
+  delete (global as Record<string, unknown>).schemas;
+  return result as Record<string, { apiData?: unknown } | undefined>;
 }

src/core/route.ts

@@ -1,6 +1,6 @@
-import type { PathsObject } from "@omer-x/openapi-types/dist/paths";
+import type { PathsObject } from "@omer-x/openapi-types/paths";
 
-type RouteRecord = {
+export type RouteRecord = {
   method: string,
   path: string,
   apiData: object,

src/core/schema.ts

@@ -1,5 +1,5 @@
 import zodToJsonSchema from "zod-to-json-schema";
-import type { SchemaObject } from "@omer-x/openapi-types/dist/schema";
+import type { SchemaObject } from "@omer-x/openapi-types/schema";
 import type { ZodType } from "zod";
 
 export function bundleSchemas(schemas: Record<string, ZodType>) {

src/index.ts

@@ -1,7 +1,7 @@
 import getPackageMetadata from "@omer-x/package-metadata";
 import { getDirectoryItems } from "./core/dir";
 import { findAppFolderPath, getRouteExports } from "./core/next";
-import { bundlePaths, createRouteRecord } from "./core/route";
+import { type RouteRecord, bundlePaths, createRouteRecord } from "./core/route";
 import { bundleSchemas } from "./core/schema";
 import type { OpenApiDocument } from "@omer-x/openapi-types";
 import type { ZodType } from "zod";
@@ -10,9 +10,9 @@ export default async function generateOpenApiSpec(schemas: Record<string, ZodTyp
   const appFolderPath = await findAppFolderPath();
   if (!appFolderPath) throw new Error("This is not a Next.js application!");
   const routes = await getDirectoryItems(appFolderPath, "route.ts");
-  const validRoutes = [];
+  const validRoutes: RouteRecord[] = [];
   for (const route of routes) {
-    const exportedRouteHandlers = await getRouteExports(route);
+    const exportedRouteHandlers = await getRouteExports(route, schemas);
     for (const [method, routeHandler] of Object.entries(exportedRouteHandlers)) {
       if (!routeHandler || !routeHandler.apiData) continue;
       validRoutes.push(createRouteRecord(