@eventcatalog/generator-asyncapi 6.1.0 → 6.2.0

package/dist/index.mjs

@@ -1538,7 +1538,7 @@ import path3 from "path";
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-asyncapi",
-  version: "6.1.0",
+  version: "6.2.0",
   description: "AsyncAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -1576,10 +1576,10 @@ var package_default = {
   dependencies: {
     "@asyncapi/avro-schema-parser": "3.0.24",
     "@asyncapi/parser": "3.6.0",
-    "@eventcatalog/sdk": "2.17.4",
+    "@eventcatalog/sdk": "2.18.2",
     chalk: "4.1.2",
     "fs-extra": "^11.2.0",
-    glob: "^11.0.0",
+    glob: "^12.0.0",
     "gray-matter": "^4.0.3",
     "js-yaml": "^4.1.0",
     lodash: "^4.17.23",
@@ -4066,6 +4066,26 @@ Failed to verify license key`));
 // src/index.ts
 import { join } from "path";
 var parser = new Parser();
+var safeStringify = (obj, indent) => {
+  const seen = /* @__PURE__ */ new WeakSet();
+  return JSON.stringify(
+    obj,
+    (_key, value) => {
+      if (typeof value === "object" && value !== null) {
+        if (seen.has(value)) {
+          const schemaId = value["x-parser-schema-id"];
+          if (schemaId && typeof schemaId === "string") {
+            return { $ref: `#/components/schemas/${schemaId}` };
+          }
+          return { $ref: "#" };
+        }
+        seen.add(value);
+      }
+      return value;
+    },
+    indent
+  );
+};
 parser.registerSchemaParser(AvroSchemaParser());
 var cliArgs = argv(process.argv.slice(2));
 var optionsSchema = z.object({
@@ -4185,6 +4205,7 @@ var index_default = async (config, options) => {
     addSchemaToQuery,
     addFileToService,
     versionDomain,
+    getResourcePath,
     getSpecificationFilesForService,
     writeChannel,
     getChannel,
@@ -4273,10 +4294,6 @@ var index_default = async (config, options) => {
       markdown: generatedMarkdownForService
     }) : generatedMarkdownForService;
     let styles2 = null;
-    let servicePath = options.domain ? path3.join("../", "domains", options.domain.id, "services", service.id) : path3.join("../", "services", service.id);
-    if (options.writeFilesToRoot) {
-      servicePath = service.id;
-    }
     if (options.domain) {
       const { id: domainId, name: domainName, version: domainVersion, owners: domainOwners } = options.domain;
       const domain = await getDomain(options.domain.id, domainVersion || "latest");
@@ -4306,6 +4323,18 @@ Processing domain: ${domainName} (v${domainVersion})`));
       }
       await addServiceToDomain(domainId, { id: serviceId, version }, domainVersion);
     }
+    let servicePath = path3.join("../", "services", service.id);
+    if (options.domain) {
+      const domainResource = await getResourcePath(process.env.PROJECT_DIR, options.domain.id, options.domain.version);
+      if (domainResource) {
+        servicePath = path3.join("../", domainResource.directory, "services", service.id);
+      } else {
+        servicePath = path3.join("../", "domains", options.domain.id, "services", service.id);
+      }
+    }
+    if (options.writeFilesToRoot) {
+      servicePath = service.id;
+    }
     if (parseChannels) {
       for (const channel of channels) {
         const channelAsJSON = channel.json();
@@ -4435,7 +4464,7 @@ Processing domain: ${domainName} (v${domainVersion})`));
               messageId,
               {
                 fileName: getSchemaFileName(message2),
-                schema: JSON.stringify(schema, null, 4)
+                schema: safeStringify(schema, 4)
               },
               messageVersion,
               { path: cleanedMessagePath }
@@ -4557,7 +4586,7 @@ Finished generating event catalog for AsyncAPI ${serviceId} (v${version})`));
 };
 var getParsedSpecFile = (service, document2) => {
   const isSpecFileJSON = service.path.endsWith(".json");
-  return isSpecFileJSON ? JSON.stringify(document2.meta().asyncapi.parsed, null, 4) : yaml.dump(document2.meta().asyncapi.parsed, { noRefs: true });
+  return isSpecFileJSON ? safeStringify(document2.meta().asyncapi.parsed, 4) : yaml.dump(document2.meta().asyncapi.parsed, { noRefs: true });
 };
 var getRawSpecFile = async (service) => {
   if (service.path.startsWith("http")) {