@fairfox/polly 0.15.7 → 0.15.8

package/dist/tools/verify/specs/tla/MessageRouter.cfg

@@ -4,7 +4,7 @@ SPECIFICATION Spec
 CONSTANTS
     Contexts = {background, content, popup}
     MaxMessages = 4
-    MaxTabId = 2
+    Tabs = {0, 1, 2}
     TimeoutLimit = 3
 
 \* Invariants to check

package/dist/tools/verify/specs/tla/MessageRouter.tla

@@ -19,7 +19,7 @@ EXTENDS Integers, Sequences, FiniteSets, TLC
 CONSTANTS
     Contexts,           \* Set of all contexts: {"background", "content", "popup", ...}
     MaxMessages,        \* Bound on number of messages (for model checking)
-    MaxTabId,           \* Maximum tab ID
+    Tabs,               \* Set of tab identifiers (integers or model values for symmetry)
     TimeoutLimit        \* Message timeout threshold
 
 VARIABLES
@@ -156,7 +156,7 @@ TimeoutMessage(msgIndex) ==
 Next ==
     \/ \E c \in Contexts : ConnectPort(c)
     \/ \E c \in Contexts : DisconnectPort(c)
-    \/ \E src \in Contexts : \E targetSet \in (SUBSET Contexts \ {{}}) : \E tab \in 0..MaxTabId : \E msgType \in {"msg1", "msg2"} : SendMessage(src, targetSet, tab, msgType)
+    \/ \E src \in Contexts : \E targetSet \in (SUBSET Contexts \ {{}}) : \E tab \in Tabs : \E msgType \in {"msg1", "msg2"} : SendMessage(src, targetSet, tab, msgType)
     \/ \E i \in 1..Len(messages) : RouteMessage(i)
     \/ CompleteRouting
     \/ \E i \in 1..Len(messages) : TimeoutMessage(i)

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

@@ -603,12 +603,15 @@ class TLAGenerator {
       for (let i = 0;i < this.tabCount; i++) {
         lines.push(`  Tab${i} = Tab${i}`);
       }
+      const tabValues = Array.from({ length: this.tabCount }, (_, i) => `Tab${i}`).join(", ");
+      lines.push(`  Tabs = {${tabValues}}`);
     } else if ("maxTabs" in messages && messages.maxTabs !== undefined) {
-      lines.push(`  MaxTabId = ${messages.maxTabs}`);
+      const tabValues = Array.from({ length: messages.maxTabs + 1 }, (_, i) => i).join(", ");
+      lines.push(`  Tabs = {${tabValues}}`);
     } else if (hasProjectConstant) {
-      lines.push("  MaxTabId = 0");
+      lines.push("  Tabs = {0}");
     } else {
-      lines.push("  MaxTabId = 1");
+      lines.push("  Tabs = {0, 1}");
     }
     lines.push("  TimeoutLimit = 3");
   }
@@ -954,8 +957,6 @@ class TLAGenerator {
     this.line(tabConstants.join(", "));
     this.indent--;
     this.line("");
-    this.line(`Tabs == {${tabConstants.join(", ")}}`);
-    this.line("");
     this.line("TabSymmetry == Permutations(Tabs)");
     this.line("");
     const hasMessageSymmetry = this.symmetrySets.length > 0 && this.symmetrySets[0] === "Symmetry";
@@ -1724,8 +1725,7 @@ class TLAGenerator {
     if (hasValidHandlers) {
       this.line("\\/ \\E c \\in Contexts : ConnectPort(c) /\\ UNCHANGED <<contextStates, payload>>");
       this.line("\\/ \\E c \\in Contexts : DisconnectPort(c) /\\ UNCHANGED <<contextStates, payload>>");
-      const tabSet = this.tabSymmetryEnabled ? "Tabs" : "0..MaxTabId";
-      this.line(`\\/ \\E src \\in Contexts : \\E targetSet \\in (SUBSET Contexts \\ {{}}) : \\E tab \\in ${tabSet} : \\E msgType \\in UserMessageTypes :`);
+      this.line("\\/ \\E src \\in Contexts : \\E targetSet \\in (SUBSET Contexts \\ {{}}) : \\E tab \\in Tabs : \\E msgType \\in UserMessageTypes :");
       this.indent++;
       this.line("SendMessage(src, targetSet, tab, msgType) /\\ UNCHANGED <<contextStates, payload>>");
       this.indent--;
@@ -6234,4 +6234,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=A9938BA1A7CCD3B464756E2164756E21
+//# debugId=30BEA370D0E300CD64756E2164756E21