@fairfox/polly 0.34.0 → 0.35.0

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

@@ -339,6 +339,9 @@ class TemporalTLAGenerator {
       case "always":
         lines.push(`${prop.name} == [](${prop.target})`);
         break;
+      case "step-always":
+        lines.push(`${prop.name} == [][${prop.target}]_allVars`);
+        break;
       case "until":
         if (prop.trigger) {
           lines.push(`${prop.name} == (${prop.trigger}) U (${prop.target})`);
@@ -651,6 +654,7 @@ var init_tla = __esm(() => {
       if (this.temporalProperties.length > 0) {
         this.addTemporalProperties();
       }
+      this.line("=============================================================================");
       return this.lines.join(`
 `);
     }
@@ -708,7 +712,7 @@ var init_tla = __esm(() => {
         }
         const tabValues = Array.from({ length: this.tabCount }, (_, i) => `Tab${i}`).join(", ");
         lines.push(`  Tabs = {${tabValues}}`);
-      } else if ("maxTabs" in messages && messages.maxTabs !== undefined) {
+      } else if ("maxTabs" in messages && messages.maxTabs !== undefined && messages.maxTabs !== null) {
         const tabValues = Array.from({ length: messages.maxTabs + 1 }, (_, i) => i).join(", ");
         lines.push(`  Tabs = {${tabValues}}`);
       } else if (hasProjectConstant) {
@@ -804,7 +808,7 @@ var init_tla = __esm(() => {
       if (hasStateConstants) {
         this.generateConstantDeclarations(config.state, false);
       }
-      if (hasPerMessageBounds) {
+      if (hasPerMessageBounds && config.messages.perMessageBounds) {
         for (const [msgType, _bound] of Object.entries(config.messages.perMessageBounds)) {
           const constName = `MaxMessages_${msgType}`;
           this.line(`,${constName}`);
@@ -831,15 +835,15 @@ var init_tla = __esm(() => {
     }
     addFieldConstants(field, fieldConfig, constName, first) {
       let isFirst = first;
-      if ("maxLength" in fieldConfig && fieldConfig.maxLength !== null) {
+      if ("maxLength" in fieldConfig && fieldConfig["maxLength"] !== null) {
         this.line(`${isFirst ? "" : ","}${constName}_MaxLength  \\* Max length for ${field}`);
         isFirst = false;
       }
-      if ("max" in fieldConfig && fieldConfig.max !== null) {
+      if ("max" in fieldConfig && fieldConfig["max"] !== null) {
         this.line(`${isFirst ? "" : ","}${constName}_Max       \\* Max value for ${field}`);
         isFirst = false;
       }
-      if ("maxSize" in fieldConfig && fieldConfig.maxSize !== null) {
+      if ("maxSize" in fieldConfig && fieldConfig["maxSize"] !== null) {
         this.line(`${isFirst ? "" : ","}${constName}_MaxSize   \\* Max size for ${field}`);
         isFirst = false;
       }
@@ -998,7 +1002,6 @@ var init_tla = __esm(() => {
       const messageTypeSet = validMessageTypes.map((t) => `"${t}"`).join(", ");
       this.line(`UserMessageTypes == {${messageTypeSet}}`);
       this.line("");
-      this.filteredMessageTypes = validMessageTypes;
       if (config.messages.symmetry && config.messages.symmetry.length > 0) {
         this.addSymmetrySets(config.messages.symmetry, validMessageTypes);
       }
@@ -1025,6 +1028,8 @@ var init_tla = __esm(() => {
       }
       for (let i = 0;i < validSymmetryGroups.length; i++) {
         const group = validSymmetryGroups[i];
+        if (!group)
+          continue;
         const setName = `SymmetrySet${i + 1}`;
         const setValues = group.map((t) => `"${t}"`).join(", ");
         this.line(`${setName} == {${setValues}}`);
@@ -1038,7 +1043,8 @@ var init_tla = __esm(() => {
         console.log(`[INFO] [TLAGenerator] Symmetry reduction: ${validSymmetryGroups.length} independent symmetry groups ` + `(${validSymmetryGroups.map((g) => g.length).join(", ")} message types)`);
       } else {
         this.line(`Symmetry == Permutations(SymmetrySet1)`);
-        console.log(`[INFO] [TLAGenerator] Symmetry reduction: 1 symmetry group with ${validSymmetryGroups[0].length} message types`);
+        const onlyGroup = validSymmetryGroups[0];
+        console.log(`[INFO] [TLAGenerator] Symmetry reduction: 1 symmetry group with ${onlyGroup?.length ?? 0} message types`);
       }
       this.symmetrySets = ["Symmetry"];
       this.line("");
@@ -1221,11 +1227,12 @@ var init_tla = __esm(() => {
     addPayloadRefsFromHandler(handler, fields) {
       for (const text of this.collectHandlerTexts(handler)) {
         const numMatch = TLAGenerator.NUMERIC_PAYLOAD_PATTERN.exec(text);
-        if (numMatch)
+        if (numMatch?.[1])
           fields.set(numMatch[1], "0..2");
         for (const m of text.matchAll(TLAGenerator.PAYLOAD_REF_PATTERN)) {
-          if (!fields.has(m[1]))
-            fields.set(m[1], TLAGenerator.inferFieldType(m[1]));
+          const name = m[1];
+          if (name && !fields.has(name))
+            fields.set(name, TLAGenerator.inferFieldType(name));
         }
       }
     }
@@ -1404,12 +1411,36 @@ var init_tla = __esm(() => {
       }
       this.emitPreconditions(allPreconditions);
       const validAssignments = this.processAssignments(allAssignments, config.state);
-      const usedUnchanged = this.emitStateUpdates(validAssignments, allPreconditions);
-      if (!usedUnchanged) {
-        this.emitPostconditions(allPostconditions);
-      }
+      this.emitStateUpdates(validAssignments, allPreconditions);
       this.indent--;
       this.line("");
+      this.recordPostconditionProperty(messageType, actionName, allPostconditions);
+    }
+    recordPostconditionProperty(messageType, actionName, postconditions) {
+      if (postconditions.length === 0)
+        return;
+      const predicateClauses = postconditions.map((pc) => this.tsExpressionToTLA(pc.expression, true)).filter((p) => p && p.length > 0).map((p) => p.replace(/\[ctx\]/g, "[target]"));
+      if (predicateClauses.length === 0)
+        return;
+      const conjunction = predicateClauses.length === 1 ? predicateClauses[0] : predicateClauses.map((c) => `        /\\ ${c}`).join(`
+`);
+      const propertyName = `EnsuresAfter_${actionName}`;
+      const messages = postconditions.map((pc) => pc.message).filter((m) => Boolean(m)).join("; ");
+      const target = `
+  \\A m \\in 1..Len(messages) :
+` + `    (messages[m].status = "pending"
+` + `     /\\ messages'[m].status = "delivered"
+` + `     /\\ messages[m].msgType = "${messageType}")
+` + `    => \\A target \\in messages[m].targets :
+` + `         (target \\in Contexts /\\ ports[target] = "connected")
+` + `         =>
+` + (predicateClauses.length === 1 ? `         ${predicateClauses[0]}` : conjunction);
+      this.temporalProperties.push({
+        name: propertyName,
+        description: messages.length > 0 ? `ensures(...) for ${messageType}: ${messages}` : `ensures(...) for ${messageType}`,
+        type: "step-always",
+        target
+      });
     }
     emitPreconditions(preconditions) {
       for (const precondition of preconditions) {
@@ -1418,14 +1449,6 @@ var init_tla = __esm(() => {
         this.line(`/\\ ${tlaExpr}${comment}`);
       }
     }
-    emitPostconditions(postconditions) {
-      for (const postcondition of postconditions) {
-        const tlaExpr = this.tsExpressionToTLA(postcondition.expression, true);
-        const message = postcondition.message ?? "ensures failed";
-        const escapedMessage = message.replace(/"/g, "\\\"");
-        this.line(`/\\ Assert(${tlaExpr}, "${escapedMessage}")`);
-      }
-    }
     processAssignments(assignments, state) {
       return assignments.filter((a) => this.isFieldModeled(a.field, state)).filter((a) => this.shouldIncludeAssignment(a, state)).map((a) => this.mapNullAssignment(a, state));
     }
@@ -1462,7 +1485,7 @@ var init_tla = __esm(() => {
       if ("nullable" in fieldConfig && fieldConfig.nullable)
         return assignment;
       if ("values" in fieldConfig && fieldConfig.values) {
-        const nullValue = fieldConfig.values[fieldConfig.values.length - 1];
+        const nullValue = fieldConfig.values[fieldConfig.values.length - 1] ?? null;
         return { ...assignment, value: nullValue };
       }
       return assignment;
@@ -1673,7 +1696,6 @@ var init_tla = __esm(() => {
       result = result.replace(/(\w+(?:\.\w+)*)\.includes\(([^)]+)\)/g, (_match, arrayRef, item) => {
         return `${item.trim()} \\in ${arrayRef}`;
       });
-      const _indexMap = new Map;
       result = result.replace(/(\w+(?:\.\w+)*)\[(\d+)\]|\]\[(\d+)\]/g, (_match, identPart, index1, index2) => {
         if (identPart) {
           const newIndex2 = Number.parseInt(index1, 10) + 1;
@@ -2070,7 +2092,6 @@ var init_tla = __esm(() => {
       }
       this.line("\\* State constraint to bound state space");
       this.addStateConstraint(config, _analysis);
-      this.line("=============================================================================");
     }
     addTemporalConstraints(constraints) {
       this.line("\\* Tier 2: Temporal constraint invariants");
@@ -2078,6 +2099,8 @@ var init_tla = __esm(() => {
       this.line("");
       for (let i = 0;i < constraints.length; i++) {
         const constraint = constraints[i];
+        if (!constraint)
+          continue;
         const invName = `TemporalConstraint${i + 1}`;
         if (constraint.description) {
           this.line(`\\* ${constraint.description}`);
@@ -2093,9 +2116,8 @@ var init_tla = __esm(() => {
         this.extractedInvariants.push({
           name: invName,
           description: constraint.description || `${constraint.before} must happen before ${constraint.after}`,
-          condition: "",
-          confidence: "high",
-          source: { file: "", line: 0, column: 0 }
+          expression: `${constraint.before} happens-before ${constraint.after}`,
+          location: { file: "", line: 0 }
         });
       }
     }
@@ -2108,7 +2130,7 @@ var init_tla = __esm(() => {
       this.indent++;
       if (needsConjunction) {
         this.line("/\\ Len(messages) <= MaxMessages");
-        if (hasPerMessageBounds) {
+        if (hasPerMessageBounds && config.messages.perMessageBounds) {
           for (const [msgType, _bound] of Object.entries(config.messages.perMessageBounds)) {
             const constName = `MaxMessages_${msgType}`;
             this.line(`/\\ Cardinality({m \\in DOMAIN messages : messages[m].msgType = "${msgType}"}) <= ${constName}`);
@@ -2154,7 +2176,6 @@ var init_tla = __esm(() => {
         this.line(propDef);
         this.line("");
       }
-      this.line("=============================================================================");
     }
     fieldConfigToTLAType(_fieldPath, fieldConfig, _config) {
       const typeResult = this.tryAbstractType(fieldConfig) || this.tryBooleanType(fieldConfig) || this.tryEnumType(fieldConfig) || this.tryArrayType(fieldConfig) || this.tryExplicitNumberType(fieldConfig) || this.tryNumberType(fieldConfig) || this.tryStringType(fieldConfig) || this.tryMapType(fieldConfig);
@@ -6501,6 +6522,8 @@ class HandlerExtractor {
       if (match) {
         const signalName = match[1];
         const fieldName = match[2];
+        if (!signalName)
+          return;
         if (fieldName) {
           signals.push(`${signalName}_${fieldName}`);
         } else {
@@ -7693,4 +7716,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=BB9760A4D35CDBCE64756E2164756E21
+//# debugId=616D5E99FD251E9364756E2164756E21