@fairfox/polly 0.31.0 → 0.32.0

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

@@ -469,6 +469,7 @@ var init_tla = __esm(() => {
     temporalProperties = [];
     symmetrySets = [];
     resolvedActionNames = new Map;
+    paramDomains = new Map;
     tabSymmetryEnabled = false;
     tabCount = 0;
     moduleName = "UserApp";
@@ -1086,6 +1087,7 @@ var init_tla = __esm(() => {
       this.line("");
     }
     addInit(config, _analysis) {
+      this.deriveParamDomains(config, _analysis);
       this.line("\\* Initial application state");
       this.line("InitialState == [");
       this.indent++;
@@ -1122,10 +1124,66 @@ var init_tla = __esm(() => {
     static inferFieldType(name) {
       return TLAGenerator.BOOL_PARAM_PATTERN.test(name) ? "BOOLEAN" : "Value";
     }
+    flattenStateConfig(config) {
+      const out = new Map;
+      const recurse = (prefix, fc) => {
+        if (this.hasTypeIndicators(fc)) {
+          out.set(this.sanitizeFieldName(prefix), fc);
+          return;
+        }
+        for (const [key, value] of Object.entries(fc)) {
+          if (typeof value !== "object" || value === null)
+            continue;
+          if (key === "item" || key === "element")
+            continue;
+          recurse(`${prefix}_${key}`, value);
+        }
+      };
+      for (const [fieldPath, fc] of Object.entries(config.state)) {
+        if (typeof fc !== "object" || fc === null)
+          continue;
+        recurse(fieldPath, fc);
+      }
+      return out;
+    }
+    deriveParamDomains(config, analysis) {
+      this.paramDomains.clear();
+      const fieldMap = this.flattenStateConfig(config);
+      const provenance = new Map;
+      for (const handler of analysis.handlers) {
+        for (const a of handler.assignments ?? []) {
+          this.recordParamDomain(handler.messageType, a, fieldMap, provenance, config);
+        }
+      }
+    }
+    recordParamDomain(messageType, a, fieldMap, provenance, config) {
+      if (typeof a.value !== "string" || !a.value.startsWith("param:"))
+        return;
+      const paramName = this.sanitizeFieldName(a.value.substring(6));
+      const fieldKey = this.sanitizeFieldName(a.field);
+      const fc = fieldMap.get(fieldKey);
+      if (!fc)
+        return;
+      const tlaType = this.fieldConfigToTLAType(fieldKey, fc, config);
+      if (tlaType === "Value")
+        return;
+      const prior = provenance.get(paramName);
+      if (prior && prior.domain !== tlaType) {
+        throw new Error(`PayloadType conflict: parameter "${paramName}" is written to multiple state fields with incompatible TLA+ domains.
+` + `  - Handler "${prior.msg}" assigns it to field "${prior.field}" with domain ${prior.domain}
+` + `  - Handler "${messageType}" assigns it to field "${a.field}" with domain ${tlaType}
+` + `Either rename one parameter, split the handlers across subsystems, or set both fields to the same domain in your verification config.`);
+      }
+      this.paramDomains.set(paramName, tlaType);
+      provenance.set(paramName, { msg: messageType, field: a.field, domain: tlaType });
+    }
     collectPayloadFields(analysis) {
       const fields = new Map;
       for (const f of ["id", "text", "userId"])
         fields.set(f, "Value");
+      for (const [name, domain] of this.paramDomains) {
+        fields.set(name, domain);
+      }
       for (const handler of analysis.handlers) {
         this.addHandlerParams(handler.parameters, fields);
         this.addPayloadRefsFromHandler(handler, fields);
@@ -1136,9 +1194,17 @@ var init_tla = __esm(() => {
       if (!params)
         return;
       for (const param of params) {
-        if (!TLAGenerator.PAYLOAD_EXCLUDED.has(param) && !fields.has(param)) {
-          fields.set(param, TLAGenerator.inferFieldType(param));
+        if (TLAGenerator.PAYLOAD_EXCLUDED.has(param))
+          continue;
+        const sanitized = this.sanitizeFieldName(param);
+        const configDomain = this.paramDomains.get(sanitized);
+        if (configDomain) {
+          fields.set(param, configDomain);
+          continue;
         }
+        if (fields.has(param))
+          continue;
+        fields.set(param, TLAGenerator.inferFieldType(param));
       }
     }
     collectHandlerTexts(handler) {
@@ -7593,4 +7659,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=D76A624F754502DE64756E2164756E21
+//# debugId=2D8DDA7C0A85F5E664756E2164756E21