@fairfox/polly 0.15.4 → 0.15.5

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

@@ -370,6 +370,7 @@ class TLAGenerator {
   extractedInvariants = [];
   temporalProperties = [];
   symmetrySets = [];
+  resolvedActionNames = new Map;
   constructor(options) {
     this.options = options;
   }
@@ -1024,8 +1025,9 @@ class TLAGenerator {
       this.generateNoValidHandlersStub();
       return;
     }
+    this.resolveActionNamesForHandlers(validHandlers);
     const handlersByType = this.groupHandlersByType(validHandlers);
-    this.generateHandlerActions(handlersByType, config, analysis.stateConstraints);
+    this.generateHandlerActions(handlersByType, config, analysis.stateConstraints ?? []);
     this.generateStateTransitionDispatcher(handlersByType);
   }
   generateNoHandlersStub() {
@@ -1093,7 +1095,7 @@ class TLAGenerator {
       const msgType = messageTypes[i];
       if (!msgType)
         continue;
-      const actionName = this.messageTypeToActionName(msgType);
+      const actionName = this.getResolvedActionName(msgType);
       if (i === 0) {
         this.line(`IF msgType = "${msgType}" THEN ${actionName}(ctx)`);
         if (messageTypes.length === 1) {
@@ -1110,7 +1112,7 @@ class TLAGenerator {
     this.line("");
   }
   generateHandlerAction(messageType, handlers, config, stateConstraints) {
-    const actionName = this.messageTypeToActionName(messageType);
+    const actionName = this.getResolvedActionName(messageType);
     this.line(`\\* Handler for ${messageType}`);
     this.line(`${actionName}(ctx) ==`);
     this.indent++;
@@ -1551,6 +1553,47 @@ class TLAGenerator {
     }
     return `Handle${messageType.split("_").map((part) => part.charAt(0).toUpperCase() + part.slice(1).toLowerCase()).join("")}`;
   }
+  resolveActionNamesForHandlers(handlers) {
+    this.resolvedActionNames.clear();
+    const actionNameToMessageTypes = this.groupHandlersByActionName(handlers);
+    this.resolveCollisions(actionNameToMessageTypes);
+  }
+  groupHandlersByActionName(handlers) {
+    const actionNameToMessageTypes = new Map;
+    for (const handler of handlers) {
+      const baseActionName = this.messageTypeToActionName(handler.messageType);
+      if (!actionNameToMessageTypes.has(baseActionName)) {
+        actionNameToMessageTypes.set(baseActionName, []);
+      }
+      const existing = actionNameToMessageTypes.get(baseActionName);
+      if (existing && !existing.some((e) => e.messageType === handler.messageType)) {
+        existing.push({ messageType: handler.messageType, origin: handler.origin });
+      }
+    }
+    return actionNameToMessageTypes;
+  }
+  resolveCollisions(actionNameToMessageTypes) {
+    for (const [baseActionName, messageTypes] of actionNameToMessageTypes.entries()) {
+      if (messageTypes.length === 1) {
+        const entry = messageTypes[0];
+        if (entry) {
+          this.resolvedActionNames.set(entry.messageType, baseActionName);
+        }
+        continue;
+      }
+      for (const entry of messageTypes) {
+        const resolvedName = entry.origin === "stateHandler" ? baseActionName.replace(/^Handle/, "HandleFn") : baseActionName;
+        this.resolvedActionNames.set(entry.messageType, resolvedName);
+      }
+    }
+  }
+  getResolvedActionName(messageType) {
+    const resolved = this.resolvedActionNames.get(messageType);
+    if (resolved) {
+      return resolved;
+    }
+    return this.messageTypeToActionName(messageType);
+  }
   assignmentValueToTLA(value) {
     if (typeof value === "boolean") {
       return value ? "TRUE" : "FALSE";
@@ -3777,7 +3820,8 @@ class HandlerExtractor {
         file: filePath,
         line
       },
-      relationships
+      relationships,
+      origin: "event"
     };
   }
   extractAssignments(funcNode, assignments) {
@@ -4444,7 +4488,8 @@ class HandlerExtractor {
               assignments: [],
               preconditions: [],
               postconditions: [],
-              location: { file: filePath, line }
+              location: { file: filePath, line },
+              origin: "event"
             });
           }
         }
@@ -5132,7 +5177,8 @@ class HandlerExtractor {
         location: {
           file: filePath,
           line: func.getStartLineNumber()
-        }
+        },
+        origin: "stateHandler"
       });
     }
     for (const varStmt of sourceFile.getVariableStatements()) {
@@ -5166,7 +5212,8 @@ class HandlerExtractor {
           location: {
             file: filePath,
             line: decl.getStartLineNumber()
-          }
+          },
+          origin: "stateHandler"
         });
       }
     }
@@ -6111,4 +6158,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=143C5A4485F127EB64756E2164756E21
+//# debugId=940EA504112DF08B64756E2164756E21