@fairfox/polly 0.38.0 → 0.38.2

package/dist/tools/visualize/src/cli.js

@@ -4760,7 +4760,7 @@ class StructurizrDSLGenerator {
       }
       const properties = this.getComponentProperties(messageType, firstHandler, contextType);
       componentDefs.push({
-        id: this.toId(componentName),
+        id: this.componentIdForMessageType(messageType, handlers),
         name: componentName,
         description,
         tags,
@@ -4942,8 +4942,8 @@ class StructurizrDSLGenerator {
     }
     for (const api of contextInfo.chromeAPIs) {
       const apiId = this.toId(`chrome_${api}`);
-      for (const [messageType, _handlers] of handlersByType) {
-        const componentId = this.toId(this.toComponentName(messageType));
+      for (const [messageType, handlers] of handlersByType) {
+        const componentId = this.componentIdForMessageType(messageType, handlers);
         const description = this.inferChromeAPIDescription(api, messageType);
         parts.push(`        ${componentId} -> ${apiId} "${description}"`);
       }
@@ -5025,9 +5025,9 @@ class StructurizrDSLGenerator {
   classifyHandlersByType(handlersByType) {
     const stateHandlers = [];
     const queryHandlers = [];
-    for (const [messageType, _handlers] of handlersByType) {
+    for (const [messageType, handlers] of handlersByType) {
       const type = messageType.toLowerCase();
-      const componentId = this.toId(this.toComponentName(messageType));
+      const componentId = this.componentIdForMessageType(messageType, handlers);
       if (this.isStateHandler(type)) {
         stateHandlers.push(componentId);
       } else if (this.isQueryHandler(type)) {
@@ -5288,7 +5288,7 @@ class StructurizrDSLGenerator {
     parts.push(`    dynamic ${scope} "${title}" "${description}" {`);
     let stepCount = 0;
     for (const { handler, contextName: _contextName } of handlers) {
-      const handlerComponentId = this.toId(`${handler.messageType}_handler`);
+      const handlerComponentId = this.componentIdForMessageType(handler.messageType, [handler]);
       const relationships = handler.relationships || [];
       for (const rel of relationships) {
         const toComponent = this.toId(rel.to);
@@ -5599,6 +5599,10 @@ class StructurizrDSLGenerator {
   toComponentName(messageType) {
     return `${messageType.split("_").map((part) => this.capitalize(part.toLowerCase())).join(" ")} Handler`;
   }
+  componentIdForMessageType(messageType, handlers) {
+    const isRest = handlers[0]?.handlerKind === "rest";
+    return this.toId(isRest ? messageType : this.toComponentName(messageType));
+  }
   toId(name) {
     return name.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_|_$/g, "");
   }
@@ -6244,4 +6248,4 @@ main().catch((_error) => {
   process.exit(1);
 });
 
-//# debugId=D8A50515F91A187B64756E2164756E21
+//# debugId=AE16308C36D5CB6E64756E2164756E21