@fairfox/polly 0.18.0 → 0.19.0

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

@@ -429,13 +429,22 @@ async function generateSubsystemTLA(_subsystemName, subsystem, config, analysis)
       temporalConstraints: filteredConfig.tier2.temporalConstraints.filter((tc) => handlerNames.has(tc.before) && handlerNames.has(tc.after))
     };
   }
+  const subsystemFieldPatterns = subsystem.state.map((field) => {
+    const dotIdx = field.indexOf(".");
+    if (dotIdx >= 0) {
+      return `${field.substring(0, dotIdx)}.value.${field.substring(dotIdx + 1)}`;
+    }
+    return `${field}.value`;
+  });
+  const filteredGlobalStateConstraints = (analysis.globalStateConstraints ?? []).filter((constraint) => subsystemFieldPatterns.some((pattern) => constraint.expression.includes(pattern)));
   const filteredAnalysis = {
     ...analysis,
     messageTypes: analysis.messageTypes.filter((mt) => handlerNames.has(mt)),
-    handlers: analysis.handlers.filter((h) => handlerNames.has(h.messageType))
+    handlers: analysis.handlers.filter((h) => handlerNames.has(h.messageType)),
+    globalStateConstraints: filteredGlobalStateConstraints
   };
   const generator = new TLAGenerator;
-  return await generator.generate(filteredConfig, filteredAnalysis);
+  return await generator.generate(filteredConfig, filteredAnalysis, `UserApp_${_subsystemName}`);
 }
 var TLAValidationError, TLAGenerator;
 var init_tla = __esm(() => {
@@ -458,6 +467,7 @@ var init_tla = __esm(() => {
     resolvedActionNames = new Map;
     tabSymmetryEnabled = false;
     tabCount = 0;
+    moduleName = "UserApp";
     constructor(options) {
       this.options = options;
     }
@@ -467,7 +477,10 @@ var init_tla = __esm(() => {
       }
       return /^[a-zA-Z][a-zA-Z0-9_]*$/.test(s);
     }
-    async generate(config, analysis) {
+    async generate(config, analysis, moduleName) {
+      if (moduleName) {
+        this.moduleName = moduleName;
+      }
       this.validateInputs(config, analysis);
       this.extractInvariantsIfEnabled();
       this.generateTemporalPropertiesIfEnabled(analysis);
@@ -757,7 +770,7 @@ var init_tla = __esm(() => {
       }
     }
     addHeader() {
-      this.line("------------------------- MODULE UserApp -------------------------");
+      this.line(`------------------------- MODULE ${this.moduleName} -------------------------`);
       this.line("(*");
       this.line("  Auto-generated TLA+ specification for web extension");
       this.line("  ");
@@ -1362,19 +1375,61 @@ var init_tla = __esm(() => {
       return assignment;
     }
     emitStateUpdates(validAssignments, preconditions) {
-      if (validAssignments.length > 0) {
-        const exceptClauses = validAssignments.map((a) => {
+      if (validAssignments.length === 0) {
+        if (preconditions.length === 0) {
+          this.line("\\* No state changes in handler");
+        }
+        this.line("/\\ UNCHANGED contextStates");
+        return true;
+      }
+      const ndetAssignments = [];
+      const detAssignments = [];
+      for (const a of validAssignments) {
+        if (typeof a.value === "string" && a.value.startsWith("NDET:")) {
+          ndetAssignments.push({ field: a.field, value: a.value });
+        } else {
+          detAssignments.push(a);
+        }
+      }
+      if (ndetAssignments.length === 0) {
+        const exceptClauses = detAssignments.map((a) => {
           const tlaValue = this.assignmentValueToTLA(a.value);
           return `![ctx].${this.sanitizeFieldName(a.field)} = ${tlaValue}`;
         });
         this.line(`/\\ contextStates' = [contextStates EXCEPT ${exceptClauses.join(", ")}]`);
         return false;
       }
-      if (preconditions.length === 0) {
-        this.line("\\* No state changes in handler");
+      this.emitNDETStateUpdates(ndetAssignments, detAssignments);
+      return false;
+    }
+    emitNDETStateUpdates(ndetAssignments, detAssignments) {
+      const detExceptClauses = detAssignments.map((a) => {
+        const tlaValue = this.assignmentValueToTLA(a.value);
+        return `![ctx].${this.sanitizeFieldName(a.field)} = ${tlaValue}`;
+      });
+      const ndetExceptClauses = [];
+      const quantifierOpeners = [];
+      for (const a of ndetAssignments) {
+        const fieldName = this.sanitizeFieldName(a.field);
+        const fieldRef = `contextStates[ctx].${fieldName}`;
+        if (a.value === "NDET:FILTER") {
+          quantifierOpeners.push(`/\\ \\E newLen_${fieldName} \\in 0..Len(${fieldRef}) :`);
+          ndetExceptClauses.push(`![ctx].${fieldName} = SubSeq(@, 1, newLen_${fieldName})`);
+        } else if (a.value === "NDET:MAP") {
+          quantifierOpeners.push(`/\\ \\E mapIdx_${fieldName} \\in 1..Len(${fieldRef}) :`);
+          quantifierOpeners.push(`\\E mapVal_${fieldName} \\in Value :`);
+          ndetExceptClauses.push(`![ctx].${fieldName} = [@ EXCEPT ![mapIdx_${fieldName}] = mapVal_${fieldName}]`);
+        }
+      }
+      for (const opener of quantifierOpeners) {
+        this.line(opener);
+        this.indent++;
+      }
+      const allExceptClauses = [...detExceptClauses, ...ndetExceptClauses];
+      this.line(`/\\ contextStates' = [contextStates EXCEPT ${allExceptClauses.join(", ")}]`);
+      for (const _opener of quantifierOpeners) {
+        this.indent--;
       }
-      this.line("/\\ UNCHANGED contextStates");
-      return true;
     }
     tsExpressionToTLA(expr, isPrimed = false) {
       if (!expr || typeof expr !== "string") {
@@ -1787,6 +1842,9 @@ var init_tla = __esm(() => {
         return "NULL";
       }
       if (typeof value === "string") {
+        if (value.startsWith("NDET:")) {
+          throw new Error(`NDET marker "${value}" reached assignmentValueToTLA — should have been partitioned in emitStateUpdates`);
+        }
         if (value.startsWith("param:")) {
           const paramName = value.substring(6);
           return `payload.${this.sanitizeFieldName(paramName)}`;
@@ -4705,7 +4763,9 @@ class HandlerExtractor {
       return;
     if (this.tryExtractSetConstructorPattern(fieldPath, right, assignments))
       return;
-    this.tryExtractMapConstructorPattern(fieldPath, right, assignments);
+    if (this.tryExtractMapConstructorPattern(fieldPath, right, assignments))
+      return;
+    this.tryExtractSignalDirectValuePattern(fieldPath, right, assignments);
   }
   tryExtractStateFieldPattern(fieldPath, right, assignments) {
     if (!fieldPath.startsWith("state."))
@@ -4824,6 +4884,25 @@ class HandlerExtractor {
     }
     return true;
   }
+  tryExtractSignalDirectValuePattern(fieldPath, right, assignments) {
+    if (!fieldPath.endsWith(".value"))
+      return false;
+    const signalName = fieldPath.slice(0, -6);
+    const literalValue = this.extractValue(right);
+    if (literalValue !== undefined) {
+      assignments.push({ field: signalName, value: literalValue });
+      return true;
+    }
+    if (Node2.isPropertyAccessExpression(right)) {
+      const rightPath = this.getPropertyPath(right);
+      const parts = rightPath.split(".");
+      if (parts.length === 2 && parts[0] !== undefined && parts[1] !== undefined && this.currentFunctionParams.includes(parts[0])) {
+        assignments.push({ field: signalName, value: `param:${parts[1]}` });
+        return true;
+      }
+    }
+    return false;
+  }
   extractSetOperation(newExpr, fieldPath, signalName) {
     const args = newExpr.getArguments();
     if (args.length === 0) {
@@ -4940,11 +5019,11 @@ class HandlerExtractor {
       return null;
     switch (methodName) {
       case "filter":
-        return { field: signalName, value: "SelectSeq(@, LAMBDA t: TRUE)" };
+        return { field: signalName, value: "NDET:FILTER" };
       case "map":
-        return { field: signalName, value: "[i \\in DOMAIN @ |-> @[i]]" };
+        return { field: signalName, value: "NDET:MAP" };
       case "slice":
-        return { field: signalName, value: "SubSeq(@, 1, Len(@))" };
+        return { field: signalName, value: "NDET:FILTER" };
       case "concat":
         return { field: signalName, value: "@ \\o <<payload>>" };
       case "reverse":
@@ -7343,4 +7422,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=7EE824400DEB8F7564756E2164756E21
+//# debugId=E5DA6950FD1E0C7764756E2164756E21