@fairfox/polly 0.76.0 → 0.77.0

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

@@ -811,6 +811,9 @@ var init_tla = __esm(() => {
       }
       return /^[a-zA-Z][a-zA-Z0-9_]*$/.test(s);
     }
+    canRepresentAsTLAAction(s) {
+      return typeof s === "string" && /[a-zA-Z]/.test(s) && !/[{}();<>=]/.test(s);
+    }
     async generate(config, analysis, moduleName) {
       if (moduleName) {
         this.moduleName = moduleName;
@@ -917,8 +920,8 @@ var init_tla = __esm(() => {
     }
     validateInputs(_config, analysis) {
       for (const messageType of analysis.messageTypes) {
-        if (!this.isValidTLAIdentifier(messageType)) {
-          throw new Error(`Invalid message type '${messageType}'. TLA+ identifiers must start with a letter and contain only letters, digits, and underscores.`);
+        if (!this.canRepresentAsTLAAction(messageType)) {
+          throw new Error(`Unrepresentable message type '${messageType}'. A message type must contain at least one letter so it can be sanitized into a TLA+ action name.`);
         }
       }
     }
@@ -1346,16 +1349,16 @@ var init_tla = __esm(() => {
       let validMessageTypes = [];
       const invalidMessageTypes = [];
       for (const msgType of analysis.messageTypes) {
-        if (this.isValidTLAIdentifier(msgType)) {
+        if (this.canRepresentAsTLAAction(msgType)) {
           validMessageTypes.push(msgType);
         } else {
           invalidMessageTypes.push(msgType);
         }
       }
       if (invalidMessageTypes.length > 0 && process.env["POLLY_DEBUG"]) {
-        console.log(`[WARN] [TLAGenerator] Filtered out ${invalidMessageTypes.length} invalid message type(s):`);
+        console.log(`[WARN] [TLAGenerator] Dropped ${invalidMessageTypes.length} unrepresentable message type(s):`);
         for (const invalid of invalidMessageTypes) {
-          console.log(`[WARN]   - "${invalid}" (not a valid TLA+ identifier)`);
+          console.log(`[WARN]   - "${invalid}" (no letter to form a TLA+ action name)`);
         }
       }
       if (process.env["POLLY_DEBUG"]) {
@@ -1762,7 +1765,7 @@ var init_tla = __esm(() => {
       const validHandlers = [];
       const invalidHandlers = [];
       for (const handler of handlers) {
-        if (this.isValidTLAIdentifier(handler.messageType)) {
+        if (this.canRepresentAsTLAAction(handler.messageType)) {
           validHandlers.push(handler);
         } else {
           invalidHandlers.push(handler);
@@ -1773,7 +1776,7 @@ var init_tla = __esm(() => {
     logInvalidHandlers(invalidHandlers) {
       if (invalidHandlers.length === 0 || !process.env["POLLY_DEBUG"])
         return;
-      console.log(`[WARN] [TLAGenerator] Filtered out ${invalidHandlers.length} handler(s) with invalid message types:`);
+      console.log(`[WARN] [TLAGenerator] Dropped ${invalidHandlers.length} handler(s) with unrepresentable message types:`);
       for (const handler of invalidHandlers) {
         console.log(`[WARN]   - "${handler.messageType}" at ${handler.location.file}:${handler.location.line}`);
       }
@@ -2488,19 +2491,31 @@ var init_tla = __esm(() => {
     }
     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);
-          }
+        const single = messageTypes.length === 1 ? messageTypes[0] : undefined;
+        if (single) {
+          this.resolvedActionNames.set(single.messageType, baseActionName);
           continue;
         }
-        for (const entry of messageTypes) {
-          const resolvedName = entry.origin === "stateHandler" ? baseActionName.replace(/^Handle/, "HandleFn") : baseActionName;
-          this.resolvedActionNames.set(entry.messageType, resolvedName);
-        }
+        this.resolveCollidingGroup(baseActionName, messageTypes);
       }
     }
+    resolveCollidingGroup(baseActionName, messageTypes) {
+      const usedNames = new Set;
+      for (const entry of messageTypes) {
+        const originName = entry.origin === "stateHandler" ? baseActionName.replace(/^Handle/, "HandleFn") : baseActionName;
+        this.resolvedActionNames.set(entry.messageType, this.uniquify(originName, usedNames));
+      }
+    }
+    uniquify(name, used) {
+      let candidate = name;
+      let suffix = 2;
+      while (used.has(candidate)) {
+        candidate = `${name}_${suffix}`;
+        suffix++;
+      }
+      used.add(candidate);
+      return candidate;
+    }
     getResolvedActionName(messageType) {
       const resolved = this.resolvedActionNames.get(messageType);
       if (resolved) {
@@ -2618,7 +2633,7 @@ var init_tla = __esm(() => {
       this.line("\\* Next state relation (extends MessageRouter)");
       this.line("UserNext ==");
       this.indent++;
-      const hasValidHandlers = analysis.handlers.some((h) => this.isValidTLAIdentifier(h.messageType));
+      const hasValidHandlers = analysis.handlers.some((h) => this.canRepresentAsTLAAction(h.messageType));
       if (hasValidHandlers) {
         const userPayload = this.unchangedUserStates(undefined, ["payload"]);
         this.line(`\\/ \\E c \\in Contexts : ConnectPort(c) /\\ ${userPayload}`);
@@ -4947,7 +4962,7 @@ class HandlerExtractor {
           const exists = handlers.some((h) => h.messageType === handler.messageType && h.location.file === handler.location.file);
           if (!exists) {
             handlers.push(handler);
-            if (this.isValidTLAIdentifier(handler.messageType)) {
+            if (this.canRepresentAsTLAAction(handler.messageType)) {
               messageTypes.add(handler.messageType);
             } else {
               invalidMessageTypes.add(handler.messageType);
@@ -5057,7 +5072,7 @@ class HandlerExtractor {
       const syntheticHandlers = this.createResourceHandlers(resource, context);
       for (const handler of syntheticHandlers) {
         handlers.push(handler);
-        if (this.isValidTLAIdentifier(handler.messageType)) {
+        if (this.canRepresentAsTLAAction(handler.messageType)) {
           messageTypes.add(handler.messageType);
         } else {
           invalidMessageTypes.add(handler.messageType);
@@ -5119,7 +5134,7 @@ class HandlerExtractor {
   }
   categorizeHandlerMessageTypes(handlers, messageTypes, invalidMessageTypes) {
     for (const handler of handlers) {
-      if (this.isValidTLAIdentifier(handler.messageType)) {
+      if (this.canRepresentAsTLAAction(handler.messageType)) {
         messageTypes.add(handler.messageType);
       } else {
         invalidMessageTypes.add(handler.messageType);
@@ -5134,11 +5149,8 @@ class HandlerExtractor {
       console.log(`[DEBUG] Filtered ${invalidCount} invalid message type(s) from handlers`);
     }
   }
-  isValidTLAIdentifier(s) {
-    if (!s || s.length === 0) {
-      return false;
-    }
-    return /^[a-zA-Z][a-zA-Z0-9_]*$/.test(s);
+  canRepresentAsTLAAction(s) {
+    return typeof s === "string" && /[a-zA-Z]/.test(s) && !/[{}();<>=]/.test(s);
   }
   extractFromFile(sourceFile) {
     const handlers = [];
@@ -7163,47 +7175,44 @@ class TypeExtractor {
   }
   filterAndLogMessageTypes(messageTypes, handlerMessageTypes) {
     const allMessageTypes = Array.from(new Set([...messageTypes, ...handlerMessageTypes]));
-    const validMessageTypes = [];
-    const invalidMessageTypes = [];
+    const keptMessageTypes = [];
+    const droppedMessageTypes = [];
     for (const msgType of allMessageTypes) {
-      if (this.isValidTLAIdentifier(msgType)) {
-        validMessageTypes.push(msgType);
+      if (this.canRepresentAsTLAAction(msgType)) {
+        keptMessageTypes.push(msgType);
       } else {
-        invalidMessageTypes.push(msgType);
+        droppedMessageTypes.push(msgType);
       }
     }
-    this.logInvalidMessageTypes(invalidMessageTypes);
-    return validMessageTypes;
+    this.logDroppedMessageTypes(droppedMessageTypes);
+    return keptMessageTypes;
   }
-  logInvalidMessageTypes(invalidMessageTypes) {
-    if (invalidMessageTypes.length === 0 || !process.env["POLLY_DEBUG"])
+  logDroppedMessageTypes(droppedMessageTypes) {
+    if (droppedMessageTypes.length === 0)
       return;
-    console.log(`[WARN] Filtered out ${invalidMessageTypes.length} invalid message type(s):`);
-    for (const invalid of invalidMessageTypes) {
-      console.log(`[WARN]   - "${invalid}" (not a valid TLA+ identifier)`);
+    console.log(`[WARN] Dropped ${droppedMessageTypes.length} unrepresentable message type(s) (no letter to form a TLA+ action name):`);
+    for (const dropped of droppedMessageTypes) {
+      console.log(`[WARN]   - "${dropped}"`);
     }
   }
   filterAndLogHandlers(handlers) {
-    const validHandlers = handlers.filter((h) => this.isValidTLAIdentifier(h.messageType));
-    this.logInvalidHandlers(handlers, validHandlers);
-    return validHandlers;
+    const keptHandlers = handlers.filter((h) => this.canRepresentAsTLAAction(h.messageType));
+    this.logDroppedHandlers(handlers, keptHandlers);
+    return keptHandlers;
   }
-  logInvalidHandlers(allHandlers, validHandlers) {
-    const filteredHandlerCount = allHandlers.length - validHandlers.length;
-    if (filteredHandlerCount === 0 || !process.env["POLLY_DEBUG"])
+  logDroppedHandlers(allHandlers, keptHandlers) {
+    const droppedHandlerCount = allHandlers.length - keptHandlers.length;
+    if (droppedHandlerCount === 0)
       return;
-    console.log(`[WARN] Filtered out ${filteredHandlerCount} handler(s) with invalid message types:`);
+    console.log(`[WARN] Dropped ${droppedHandlerCount} handler(s) with unrepresentable message types:`);
     for (const handler of allHandlers) {
-      if (!this.isValidTLAIdentifier(handler.messageType)) {
+      if (!this.canRepresentAsTLAAction(handler.messageType)) {
         console.log(`[WARN]   - Handler for "${handler.messageType}" at ${handler.location.file}:${handler.location.line}`);
       }
     }
   }
-  isValidTLAIdentifier(s) {
-    if (!s || s.length === 0) {
-      return false;
-    }
-    return /^[a-zA-Z][a-zA-Z0-9_]*$/.test(s);
+  canRepresentAsTLAAction(s) {
+    return typeof s === "string" && /[a-zA-Z]/.test(s) && !/[{}();<>=]/.test(s);
   }
   extractStateType(filePath) {
     const sourceFile = this.project.getSourceFile(filePath);
@@ -8364,4 +8373,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=F1AE4F074F9AD2C964756E2164756E21
+//# debugId=CD834265BD94F24164756E2164756E21