@eventcatalog/generator-openapi 7.6.4 → 7.7.0

package/dist/index.js

@@ -1594,9 +1594,9 @@ var buildService = (serviceOptions, document2, generateMarkdown) => {
 // src/utils/openapi.ts
 var import_swagger_parser = __toESM(require("@apidevtools/swagger-parser"));
 var DEFAULT_MESSAGE_TYPE = "query";
-async function getSchemasByOperationId(filePath, operationId) {
+async function getSchemasByOperationId(filePath, operationId, parsedDocument) {
   try {
-    const api = await import_swagger_parser.default.dereference(filePath);
+    const api = parsedDocument || await import_swagger_parser.default.dereference(filePath);
     const schemas = {
       parameters: [],
       requestBody: null,
@@ -1617,7 +1617,8 @@ async function getSchemasByOperationId(filePath, operationId) {
             for (const [statusCode, response] of Object.entries(typedOperation.responses)) {
               if (response.content) {
                 const contentType = Object.keys(response.content)[0];
-                schemas.responses[statusCode] = response.content[contentType].schema || response.content[contentType];
+                const schemaOrContent = response.content[contentType].schema || response.content[contentType];
+                schemas.responses[statusCode] = { ...schemaOrContent };
                 schemas.responses[statusCode].isSchema = !!response.content[contentType].schema;
               }
             }
@@ -1645,9 +1646,9 @@ function getDeprecatedValues(openAPIOperation) {
   }
   return deprecated;
 }
-async function getOperationsByType(openApiPath, httpMethodsToMessages) {
+async function getOperationsByType(openApiPath, httpMethodsToMessages, parsedDocument) {
   try {
-    const api = await import_swagger_parser.default.validate(openApiPath);
+    const api = parsedDocument || await import_swagger_parser.default.validate(openApiPath);
     const operations = [];
     for (const path4 in api.paths) {
       const pathItem = api.paths[path4];
@@ -1815,7 +1816,7 @@ var getSummary2 = (message2) => {
   return escapeSpecialCharactersThatBreakMarkdown(eventCatalogMessageSummary);
 };
 var buildMessage = async (pathToFile, document2, operation, generateMarkdown, messageIdConfig, serviceId, serviceVersion) => {
-  const requestBodiesAndResponses = await getSchemasByOperationId(pathToFile, operation.operationId);
+  const requestBodiesAndResponses = await getSchemasByOperationId(pathToFile, operation.operationId, document2);
   const extensions = operation.extensions || {};
   const operationTags = operation.tags.map((badge) => ({
     content: `tag:${badge}`,
@@ -4072,7 +4073,7 @@ var import_node_path = require("path");
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-openapi",
-  version: "7.6.4",
+  version: "7.7.0",
   description: "OpenAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -4185,6 +4186,32 @@ var isVersionLessThan = (version, givenVersion) => {
 var toUniqueArray = (array) => {
   return array.filter((item, index, self) => index === self.findIndex((t) => t.id === item.id && t.version === item.version));
 };
+var fetchAuthenticatedSpec = async (specUrl, headers) => {
+  const response = await fetch(specUrl, { method: "GET", headers });
+  if (!response.ok) {
+    throw new Error(`Failed to fetch file: ${specUrl}, status: ${response.status}`);
+  }
+  const content = await response.text();
+  const contentType = response.headers.get("content-type") || "";
+  if (contentType.includes("json")) {
+    return JSON.parse(content);
+  }
+  if (contentType.includes("yaml")) {
+    return import_js_yaml.default.load(content);
+  }
+  try {
+    return JSON.parse(content);
+  } catch {
+    return import_js_yaml.default.load(content);
+  }
+};
+var mergeOpenApiIntoSpecifications = (existingSpecs, openapiFileName) => {
+  if (Array.isArray(existingSpecs)) {
+    return [...existingSpecs.filter((spec) => spec.type !== "openapi"), { type: "openapi", path: openapiFileName }];
+  }
+  const { openapiPath: _, ...rest } = existingSpecs || {};
+  return { openapiPath: openapiFileName, ...rest };
+};
 var index_default = async (_, options) => {
   if (!process.env.PROJECT_DIR) {
     process.env.PROJECT_DIR = process.cwd();
@@ -4211,8 +4238,17 @@ var index_default = async (_, options) => {
     const specFiles = Array.isArray(serviceSpec.path) ? serviceSpec.path : [serviceSpec.path];
     const specs = specFiles.map(async (specFile) => {
       try {
-        await import_swagger_parser2.default.validate(specFile);
-        const document2 = await import_swagger_parser2.default.dereference(specFile);
+        const isUrl = specFile.startsWith("http");
+        const hasHeaders = serviceSpec.headers && Object.keys(serviceSpec.headers).length > 0;
+        let document2;
+        if (isUrl && hasHeaders) {
+          const parsedSpec = await fetchAuthenticatedSpec(specFile, serviceSpec.headers);
+          await import_swagger_parser2.default.validate(parsedSpec);
+          document2 = await import_swagger_parser2.default.dereference(parsedSpec);
+        } else {
+          await import_swagger_parser2.default.validate(specFile);
+          document2 = await import_swagger_parser2.default.dereference(specFile);
+        }
         return {
           document: document2,
           path: specFile,
@@ -4323,16 +4359,14 @@ Processing domain: ${domainName} (v${domainVersion})`));
         serviceAttachments = latestServiceInCatalog.attachments || null;
         serviceWritesTo = latestServiceInCatalog.writesTo || [];
         serviceReadsFrom = latestServiceInCatalog.readsFrom || [];
-        serviceSpecifications = {
-          ...serviceSpecifications,
-          ...persistPreviousSpecificationFiles ? latestServiceInCatalog.specifications : {}
-        };
+        if (persistPreviousSpecificationFiles && latestServiceInCatalog.specifications) {
+          serviceSpecifications = mergeOpenApiIntoSpecifications(latestServiceInCatalog.specifications, service.schemaPath);
+        }
         if (latestServiceInCatalog.version === version) {
           receives = latestServiceInCatalog.receives ? (
             // @ts-ignore
             toUniqueArray([...latestServiceInCatalog.receives, ...receives])
           ) : receives;
-          console.log("MEOW", "HELLO", latestServiceInCatalog.writesTo, serviceWritesTo);
           serviceWritesTo = latestServiceInCatalog.writesTo ? toUniqueArray([...latestServiceInCatalog.writesTo, ...configuredWritesTo]) : configuredWritesTo;
           serviceReadsFrom = latestServiceInCatalog.readsFrom ? toUniqueArray([...latestServiceInCatalog.readsFrom, ...configuredReadsFrom]) : configuredReadsFrom;
         }
@@ -4380,7 +4414,7 @@ Processing domain: ${domainName} (v${domainVersion})`));
   }
 };
 var processMessagesForOpenAPISpec = async (pathToSpec, document2, servicePath, options) => {
-  const operations = await getOperationsByType(pathToSpec, options.httpMethodsToMessages);
+  const operations = await getOperationsByType(pathToSpec, options.httpMethodsToMessages, document2);
   const sidebarBadgeType = options.sidebarBadgeType || "HTTP_METHOD";
   const version = options.serviceVersion || document2.info.version;
   const preserveExistingMessages = options.preserveExistingMessages ?? true;
@@ -4506,7 +4540,11 @@ var getParsedSpecFile = (service, document2) => {
 var getRawSpecFile = async (service) => {
   const specPath = service.path;
   if (specPath.startsWith("http")) {
-    const file = await fetch(specPath, { method: "GET" });
+    const fetchOptions = { method: "GET" };
+    if (service.headers && Object.keys(service.headers).length > 0) {
+      fetchOptions.headers = service.headers;
+    }
+    const file = await fetch(specPath, fetchOptions);
     if (!file.ok) {
       throw new Error(`Failed to fetch file: ${specPath}, status: ${file.status}`);
     }