@omer-x/next-openapi-json-generator 1.1.2 → 1.2.1

package/dist/index.cjs

@@ -35,8 +35,39 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/core/generateOpenApiSpec.ts
+var import_node_path4 = __toESM(require("path"), 1);
 var import_package_metadata = __toESM(require("@omer-x/package-metadata"), 1);
 
+// src/utils/object.ts
+function omit(object, ...keys) {
+  return Object.fromEntries(Object.entries(object).filter(([key]) => !keys.includes(key)));
+}
+
+// src/core/clearUnusedSchemas.ts
+function countReferences(schemaName, source) {
+  return (source.match(new RegExp(`"#/components/schemas/${schemaName}"`, "g")) ?? []).length;
+}
+function clearUnusedSchemas({
+  paths,
+  components
+}) {
+  if (!components.schemas) return { paths, components };
+  const stringifiedPaths = JSON.stringify(paths);
+  const stringifiedSchemas = Object.fromEntries(Object.entries(components.schemas).map(([schemaName, schema]) => {
+    return [schemaName, JSON.stringify(schema)];
+  }));
+  return {
+    paths,
+    components: {
+      ...components,
+      schemas: Object.fromEntries(Object.entries(components.schemas).filter(([schemaName]) => {
+        const otherSchemas = omit(stringifiedSchemas, schemaName);
+        return countReferences(schemaName, stringifiedPaths) > 0 || countReferences(schemaName, Object.values(otherSchemas).join("")) > 0;
+      }))
+    }
+  };
+}
+
 // src/core/dir.ts
 var import_fs = require("fs");
 var import_promises = __toESM(require("fs/promises"), 1);
@@ -46,7 +77,7 @@ async function directoryExists(dirPath) {
   try {
     await import_promises.default.access(dirPath, import_fs.constants.F_OK);
     return true;
-  } catch (err) {
+  } catch {
     return false;
   }
 }
@@ -91,6 +122,33 @@ async function isDocumentedRoute(routePath2) {
 var import_promises3 = __toESM(require("fs/promises"), 1);
 var import_node_path2 = __toESM(require("path"), 1);
 
+// src/core/injectSchemas.ts
+function generateRandomString(length) {
+  return [...Array(length)].map(() => Math.random().toString(36)[2]).join("");
+}
+function preserveStrings(code2) {
+  let replacements = {};
+  const output = code2.replace(/(['"`])([^'`"]+)\1/g, (replacedString) => {
+    const replacementId = generateRandomString(32);
+    replacements = {
+      ...replacements,
+      [replacementId]: replacedString
+    };
+    return `<@~${replacementId}~@>`;
+  });
+  return { output, replacements };
+}
+function restoreStrings(code2, replacements) {
+  return code2.replace(/<@~(.*?)~@>/g, (_, replacementId) => {
+    return replacements[replacementId];
+  });
+}
+function injectSchemas(code2, refName) {
+  const { output: preservedCode, replacements } = preserveStrings(code2);
+  const preservedCodeWithSchemasInjected = preservedCode.replace(new RegExp(`\\b${refName}\\.`, "g"), `global.schemas[${refName}].`).replace(new RegExp(`\\b${refName}\\b`, "g"), `"${refName}"`);
+  return restoreStrings(preservedCodeWithSchemasInjected, replacements);
+}
+
 // src/core/middleware.ts
 function detectMiddlewareName(code2) {
   const match = code2.match(/middleware:\s*(\w+)/);
@@ -99,9 +157,13 @@ function detectMiddlewareName(code2) {
 
 // src/core/transpile.ts
 var import_typescript = require("typescript");
+
+// src/utils/removeImports.ts
 function removeImports(code2) {
-  return code2.replace(/^import\s.+\sfrom\s.+;?$/gm, "").trim();
+  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) {
   const validMethods = ["GET", "POST", "PUT", "PATCH", "DELETE"];
   const exportFixer1 = validMethods.map((method) => `exports.${method} = void 0;
@@ -137,9 +199,6 @@ async function findAppFolderPath() {
   }
   return null;
 }
-function injectSchemas(code2, refName) {
-  return code2.replace(new RegExp(`\\b${refName}\\.`, "g"), `global.schemas[${refName}].`).replace(new RegExp(`\\b${refName}\\b`, "g"), `"${refName}"`);
-}
 function safeEval(code, routePath) {
   try {
     return eval(code);
@@ -154,12 +213,8 @@ async function getRouteExports(routePath2, routeDefinerName, schemas) {
   const code2 = transpile(rawCode, routeDefinerName, middlewareName);
   const fixedCode = Object.keys(schemas).reduce(injectSchemas, code2);
   global.schemas = schemas;
-  if (middlewareName) {
-  }
   const result = safeEval(fixedCode, routePath2);
   delete global.schemas;
-  if (middlewareName) {
-  }
   return result;
 }
 
@@ -183,6 +238,13 @@ function verifyOptions(include, exclude) {
   };
 }
 
+// src/core/getRoutePathName.ts
+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("\\", "/");
+}
+
 // src/utils/deepEqual.ts
 function deepEqual(a, b) {
   if (typeof a !== typeof b) return false;
@@ -327,9 +389,6 @@ function maskOperationSchemas(operation, storedSchemas) {
 }
 
 // src/core/route.ts
-function getRoutePathName(filePath, rootPath) {
-  return filePath.replace(rootPath, "").replace("[", "{").replace("]", "}").replaceAll("\\", "/").replace("/route.ts", "");
-}
 function createRouteRecord(method, filePath, rootPath, apiData) {
   return {
     method: method.toLocaleLowerCase(),
@@ -366,13 +425,18 @@ function bundleSchemas(schemas) {
 async function generateOpenApiSpec(schemas, {
   include: includeOption = [],
   exclude: excludeOption = [],
-  routeDefinerName = "defineRoute"
+  routeDefinerName = "defineRoute",
+  rootPath: additionalRootPath,
+  servers,
+  security,
+  securitySchemes
 } = {}) {
   const verifiedOptions = verifyOptions(includeOption, excludeOption);
   const appFolderPath = await findAppFolderPath();
   if (!appFolderPath) throw new Error("This is not a Next.js application!");
-  const routes = await getDirectoryItems(appFolderPath, "route.ts");
-  const verifiedRoutes = filterDirectoryItems(appFolderPath, routes, verifiedOptions.include, verifiedOptions.exclude);
+  const rootPath = additionalRootPath ? import_node_path4.default.resolve(appFolderPath, "./" + additionalRootPath) : appFolderPath;
+  const routes = await getDirectoryItems(rootPath, "route.ts");
+  const verifiedRoutes = filterDirectoryItems(rootPath, routes, verifiedOptions.include, verifiedOptions.exclude);
   const validRoutes = [];
   for (const route of verifiedRoutes) {
     const isDocumented = await isDocumentedRoute(route);
@@ -383,22 +447,28 @@ async function generateOpenApiSpec(schemas, {
       validRoutes.push(createRouteRecord(
         method.toLocaleLowerCase(),
         route,
-        appFolderPath,
+        rootPath,
         routeHandler.apiData
       ));
     }
   }
   const metadata = (0, import_package_metadata.default)();
+  const pathsAndComponents = {
+    paths: bundlePaths(validRoutes, schemas),
+    components: {
+      schemas: bundleSchemas(schemas),
+      securitySchemes
+    }
+  };
   return {
     openapi: "3.1.0",
     info: {
       title: metadata.serviceName,
       version: metadata.version
     },
-    paths: bundlePaths(validRoutes, schemas),
-    components: {
-      schemas: bundleSchemas(schemas)
-    },
+    servers,
+    ...clearUnusedSchemas(pathsAndComponents),
+    security,
     tags: []
   };
 }

package/dist/index.d.cts

@@ -1,11 +1,17 @@
 import { OpenApiDocument } from '@omer-x/openapi-types';
+import { ComponentsObject } from '@omer-x/openapi-types/components';
+import { ServerObject } from '@omer-x/openapi-types/server';
 import { ZodType } from 'zod';
 
 type GeneratorOptions = {
     include?: string[];
     exclude?: string[];
     routeDefinerName?: string;
+    rootPath?: string;
+    servers?: ServerObject[];
+    security?: OpenApiDocument["security"];
+    securitySchemes?: ComponentsObject["securitySchemes"];
 };
-declare function generateOpenApiSpec(schemas: Record<string, ZodType>, { include: includeOption, exclude: excludeOption, routeDefinerName, }?: GeneratorOptions): Promise<Omit<OpenApiDocument, "components"> & Required<Pick<OpenApiDocument, "components">>>;
+declare function generateOpenApiSpec(schemas: Record<string, ZodType>, { include: includeOption, exclude: excludeOption, routeDefinerName, rootPath: additionalRootPath, servers, security, securitySchemes, }?: GeneratorOptions): Promise<Omit<OpenApiDocument, "components"> & Required<Pick<OpenApiDocument, "components">>>;
 
 export { generateOpenApiSpec as default };

package/dist/index.d.ts

@@ -1,11 +1,17 @@
 import { OpenApiDocument } from '@omer-x/openapi-types';
+import { ComponentsObject } from '@omer-x/openapi-types/components';
+import { ServerObject } from '@omer-x/openapi-types/server';
 import { ZodType } from 'zod';
 
 type GeneratorOptions = {
     include?: string[];
     exclude?: string[];
     routeDefinerName?: string;
+    rootPath?: string;
+    servers?: ServerObject[];
+    security?: OpenApiDocument["security"];
+    securitySchemes?: ComponentsObject["securitySchemes"];
 };
-declare function generateOpenApiSpec(schemas: Record<string, ZodType>, { include: includeOption, exclude: excludeOption, routeDefinerName, }?: GeneratorOptions): Promise<Omit<OpenApiDocument, "components"> & Required<Pick<OpenApiDocument, "components">>>;
+declare function generateOpenApiSpec(schemas: Record<string, ZodType>, { include: includeOption, exclude: excludeOption, routeDefinerName, rootPath: additionalRootPath, servers, security, securitySchemes, }?: GeneratorOptions): Promise<Omit<OpenApiDocument, "components"> & Required<Pick<OpenApiDocument, "components">>>;
 
 export { generateOpenApiSpec as default };

package/dist/index.js

@@ -1,6 +1,37 @@
 // src/core/generateOpenApiSpec.ts
+import path4 from "node:path";
 import getPackageMetadata from "@omer-x/package-metadata";
 
+// src/utils/object.ts
+function omit(object, ...keys) {
+  return Object.fromEntries(Object.entries(object).filter(([key]) => !keys.includes(key)));
+}
+
+// src/core/clearUnusedSchemas.ts
+function countReferences(schemaName, source) {
+  return (source.match(new RegExp(`"#/components/schemas/${schemaName}"`, "g")) ?? []).length;
+}
+function clearUnusedSchemas({
+  paths,
+  components
+}) {
+  if (!components.schemas) return { paths, components };
+  const stringifiedPaths = JSON.stringify(paths);
+  const stringifiedSchemas = Object.fromEntries(Object.entries(components.schemas).map(([schemaName, schema]) => {
+    return [schemaName, JSON.stringify(schema)];
+  }));
+  return {
+    paths,
+    components: {
+      ...components,
+      schemas: Object.fromEntries(Object.entries(components.schemas).filter(([schemaName]) => {
+        const otherSchemas = omit(stringifiedSchemas, schemaName);
+        return countReferences(schemaName, stringifiedPaths) > 0 || countReferences(schemaName, Object.values(otherSchemas).join("")) > 0;
+      }))
+    }
+  };
+}
+
 // src/core/dir.ts
 import { constants } from "fs";
 import fs from "fs/promises";
@@ -10,7 +41,7 @@ async function directoryExists(dirPath) {
   try {
     await fs.access(dirPath, constants.F_OK);
     return true;
-  } catch (err) {
+  } catch {
     return false;
   }
 }
@@ -55,6 +86,33 @@ async function isDocumentedRoute(routePath2) {
 import fs3 from "node:fs/promises";
 import path2 from "node:path";
 
+// src/core/injectSchemas.ts
+function generateRandomString(length) {
+  return [...Array(length)].map(() => Math.random().toString(36)[2]).join("");
+}
+function preserveStrings(code2) {
+  let replacements = {};
+  const output = code2.replace(/(['"`])([^'`"]+)\1/g, (replacedString) => {
+    const replacementId = generateRandomString(32);
+    replacements = {
+      ...replacements,
+      [replacementId]: replacedString
+    };
+    return `<@~${replacementId}~@>`;
+  });
+  return { output, replacements };
+}
+function restoreStrings(code2, replacements) {
+  return code2.replace(/<@~(.*?)~@>/g, (_, replacementId) => {
+    return replacements[replacementId];
+  });
+}
+function injectSchemas(code2, refName) {
+  const { output: preservedCode, replacements } = preserveStrings(code2);
+  const preservedCodeWithSchemasInjected = preservedCode.replace(new RegExp(`\\b${refName}\\.`, "g"), `global.schemas[${refName}].`).replace(new RegExp(`\\b${refName}\\b`, "g"), `"${refName}"`);
+  return restoreStrings(preservedCodeWithSchemasInjected, replacements);
+}
+
 // src/core/middleware.ts
 function detectMiddlewareName(code2) {
   const match = code2.match(/middleware:\s*(\w+)/);
@@ -63,9 +121,13 @@ function detectMiddlewareName(code2) {
 
 // src/core/transpile.ts
 import { transpile as tsTranspile } from "typescript";
+
+// src/utils/removeImports.ts
 function removeImports(code2) {
-  return code2.replace(/^import\s.+\sfrom\s.+;?$/gm, "").trim();
+  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) {
   const validMethods = ["GET", "POST", "PUT", "PATCH", "DELETE"];
   const exportFixer1 = validMethods.map((method) => `exports.${method} = void 0;
@@ -101,9 +163,6 @@ async function findAppFolderPath() {
   }
   return null;
 }
-function injectSchemas(code2, refName) {
-  return code2.replace(new RegExp(`\\b${refName}\\.`, "g"), `global.schemas[${refName}].`).replace(new RegExp(`\\b${refName}\\b`, "g"), `"${refName}"`);
-}
 function safeEval(code, routePath) {
   try {
     return eval(code);
@@ -118,12 +177,8 @@ async function getRouteExports(routePath2, routeDefinerName, schemas) {
   const code2 = transpile(rawCode, routeDefinerName, middlewareName);
   const fixedCode = Object.keys(schemas).reduce(injectSchemas, code2);
   global.schemas = schemas;
-  if (middlewareName) {
-  }
   const result = safeEval(fixedCode, routePath2);
   delete global.schemas;
-  if (middlewareName) {
-  }
   return result;
 }
 
@@ -147,6 +202,13 @@ function verifyOptions(include, exclude) {
   };
 }
 
+// src/core/getRoutePathName.ts
+import path3 from "node:path";
+function getRoutePathName(filePath, rootPath) {
+  const dirName = path3.dirname(filePath);
+  return "/" + path3.relative(rootPath, dirName).replaceAll("[", "{").replaceAll("]", "}").replaceAll("\\", "/");
+}
+
 // src/utils/deepEqual.ts
 function deepEqual(a, b) {
   if (typeof a !== typeof b) return false;
@@ -291,9 +353,6 @@ function maskOperationSchemas(operation, storedSchemas) {
 }
 
 // src/core/route.ts
-function getRoutePathName(filePath, rootPath) {
-  return filePath.replace(rootPath, "").replace("[", "{").replace("]", "}").replaceAll("\\", "/").replace("/route.ts", "");
-}
 function createRouteRecord(method, filePath, rootPath, apiData) {
   return {
     method: method.toLocaleLowerCase(),
@@ -330,13 +389,18 @@ function bundleSchemas(schemas) {
 async function generateOpenApiSpec(schemas, {
   include: includeOption = [],
   exclude: excludeOption = [],
-  routeDefinerName = "defineRoute"
+  routeDefinerName = "defineRoute",
+  rootPath: additionalRootPath,
+  servers,
+  security,
+  securitySchemes
 } = {}) {
   const verifiedOptions = verifyOptions(includeOption, excludeOption);
   const appFolderPath = await findAppFolderPath();
   if (!appFolderPath) throw new Error("This is not a Next.js application!");
-  const routes = await getDirectoryItems(appFolderPath, "route.ts");
-  const verifiedRoutes = filterDirectoryItems(appFolderPath, routes, verifiedOptions.include, verifiedOptions.exclude);
+  const rootPath = additionalRootPath ? path4.resolve(appFolderPath, "./" + additionalRootPath) : appFolderPath;
+  const routes = await getDirectoryItems(rootPath, "route.ts");
+  const verifiedRoutes = filterDirectoryItems(rootPath, routes, verifiedOptions.include, verifiedOptions.exclude);
   const validRoutes = [];
   for (const route of verifiedRoutes) {
     const isDocumented = await isDocumentedRoute(route);
@@ -347,22 +411,28 @@ async function generateOpenApiSpec(schemas, {
       validRoutes.push(createRouteRecord(
         method.toLocaleLowerCase(),
         route,
-        appFolderPath,
+        rootPath,
         routeHandler.apiData
       ));
     }
   }
   const metadata = getPackageMetadata();
+  const pathsAndComponents = {
+    paths: bundlePaths(validRoutes, schemas),
+    components: {
+      schemas: bundleSchemas(schemas),
+      securitySchemes
+    }
+  };
   return {
     openapi: "3.1.0",
     info: {
       title: metadata.serviceName,
       version: metadata.version
     },
-    paths: bundlePaths(validRoutes, schemas),
-    components: {
-      schemas: bundleSchemas(schemas)
-    },
+    servers,
+    ...clearUnusedSchemas(pathsAndComponents),
+    security,
     tags: []
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omer-x/next-openapi-json-generator",
-  "version": "1.1.2",
+  "version": "1.2.1",
   "description": "a Next.js plugin to generate OpenAPI documentation from route handlers",
   "keywords": [
     "next.js",
@@ -48,20 +48,20 @@
     "@omer-x/package-metadata": "^1.0.0",
     "minimatch": "^10.0.1",
     "typescript": "^5.6.3",
-    "zod-to-json-schema": "^3.23.3"
+    "zod-to-json-schema": "^3.23.5"
   },
   "devDependencies": {
-    "@omer-x/eslint-config": "^1.0.7",
-    "@omer-x/openapi-types": "^0.2.1",
-    "@types/node": "^22.7.9",
-    "eslint": "^8.57.1",
-    "semantic-release": "^24.1.3",
+    "@omer-x/eslint-config": "^2.0.2",
+    "@types/node": "^22.8.4",
+    "eslint": "^9.13.0",
+    "semantic-release": "^24.2.0",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
-    "tsup": "^8.3.0",
+    "tsup": "^8.3.5",
     "zod": "^3.23.8"
   },
   "peerDependencies": {
-    "@omer-x/next-openapi-route-handler": "^1"
+    "@omer-x/next-openapi-route-handler": "^1",
+    "@omer-x/openapi-types": "^1"
   }
 }