@fairfox/polly 0.32.0 → 0.34.0

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

@@ -1421,12 +1421,23 @@ var init_tla = __esm(() => {
     emitPostconditions(postconditions) {
       for (const postcondition of postconditions) {
         const tlaExpr = this.tsExpressionToTLA(postcondition.expression, true);
-        const comment = postcondition.message ? ` \\* ${postcondition.message}` : "";
-        this.line(`/\\ ${tlaExpr}${comment}`);
+        const message = postcondition.message ?? "ensures failed";
+        const escapedMessage = message.replace(/"/g, "\\\"");
+        this.line(`/\\ Assert(${tlaExpr}, "${escapedMessage}")`);
       }
     }
     processAssignments(assignments, state) {
-      return assignments.filter((a) => this.shouldIncludeAssignment(a, state)).map((a) => this.mapNullAssignment(a, state));
+      return assignments.filter((a) => this.isFieldModeled(a.field, state)).filter((a) => this.shouldIncludeAssignment(a, state)).map((a) => this.mapNullAssignment(a, state));
+    }
+    isFieldModeled(field, state) {
+      const sanitized = this.sanitizeFieldName(field);
+      const fakeConfig = {
+        state,
+        messages: { maxInFlight: null },
+        onBuild: "warn",
+        onRelease: "warn"
+      };
+      return this.flattenStateConfig(fakeConfig).has(sanitized);
     }
     shouldIncludeAssignment(assignment, state) {
       if (assignment.value !== null)
@@ -5230,15 +5241,7 @@ class HandlerExtractor {
   }
   extractPropertyAssignment(prop, assignments, signalName) {
     if (Node2.isPropertyAssignment(prop)) {
-      const name = prop.getName();
-      const initializer = prop.getInitializer();
-      if (!name || !initializer)
-        return;
-      const value = this.extractValue(initializer);
-      if (value === undefined)
-        return;
-      const field = signalName ? `${signalName}_${name}` : name;
-      assignments.push({ field, value });
+      this.extractRegularPropertyAssignment(prop, assignments, signalName);
       return;
     }
     if (Node2.isShorthandPropertyAssignment(prop)) {
@@ -5251,6 +5254,37 @@ class HandlerExtractor {
       }
     }
   }
+  extractRegularPropertyAssignment(prop, assignments, signalName) {
+    if (!Node2.isPropertyAssignment(prop))
+      return;
+    const name = prop.getName();
+    const initializer = prop.getInitializer();
+    if (!name || !initializer)
+      return;
+    const field = signalName ? `${signalName}_${name}` : name;
+    const value = this.extractValue(initializer);
+    if (value !== undefined) {
+      assignments.push({ field, value });
+      return;
+    }
+    const paramName = this.extractPayloadPropertyParam(initializer);
+    if (paramName !== null) {
+      assignments.push({ field, value: `param:${paramName}` });
+    }
+  }
+  extractPayloadPropertyParam(initializer) {
+    if (!Node2.isPropertyAccessExpression(initializer))
+      return null;
+    const parts = this.getPropertyPath(initializer).split(".");
+    if (parts.length !== 2)
+      return null;
+    const [paramName, fieldName] = parts;
+    if (paramName === undefined || fieldName === undefined)
+      return null;
+    if (!this.currentFunctionParams.includes(paramName))
+      return null;
+    return fieldName;
+  }
   extractElementAccessAssignment(left, right, assignments) {
     if (!Node2.isElementAccessExpression(left))
       return;
@@ -7659,4 +7693,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=2D8DDA7C0A85F5E664756E2164756E21
+//# debugId=BB9760A4D35CDBCE64756E2164756E21