@fairfox/polly 0.12.4 → 0.13.1

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

@@ -1943,6 +1943,10 @@ class DockerRunner {
     if (!fs3.existsSync(cfgPath)) {
       throw new Error(`Config file not found: ${cfgPath}`);
     }
+    const statesDir = path3.join(specDir, "states");
+    if (fs3.existsSync(statesDir)) {
+      fs3.rmSync(statesDir, { recursive: true, force: true });
+    }
     const args = [
       "run",
       "--rm",
@@ -1952,6 +1956,7 @@ class DockerRunner {
       "tlc",
       "-workers",
       `${options?.workers || 1}`,
+      "-cleanup",
       `${specName}.tla`
     ];
     const result = await this.runCommand("docker", args, {
@@ -3579,17 +3584,25 @@ class HandlerExtractor {
     const assignments = [];
     const preconditions = [];
     const postconditions = [];
+    let actualHandler = null;
     if (Node2.isArrowFunction(handlerArg) || Node2.isFunctionExpression(handlerArg)) {
-      this.extractAssignments(handlerArg, assignments);
-      this.extractVerificationConditions(handlerArg, preconditions, postconditions);
-      this.checkAsyncMutations(handlerArg, messageType);
+      actualHandler = handlerArg;
+    } else if (Node2.isIdentifier(handlerArg)) {
+      actualHandler = this.resolveFunctionReference(handlerArg);
+    }
+    if (actualHandler) {
+      this.extractAssignments(actualHandler, assignments);
+      this.extractVerificationConditions(actualHandler, preconditions, postconditions);
+      if (Node2.isArrowFunction(actualHandler) || Node2.isFunctionExpression(actualHandler)) {
+        this.checkAsyncMutations(actualHandler, messageType);
+      }
     }
     const line = callExpr.getStartLineNumber();
     const sourceFile = callExpr.getSourceFile();
     const handlerName = `${messageType}_handler`;
     let relationships;
-    if (Node2.isArrowFunction(handlerArg) || Node2.isFunctionExpression(handlerArg)) {
-      const detectedRelationships = this.relationshipExtractor.extractFromHandler(handlerArg, sourceFile, handlerName);
+    if (actualHandler) {
+      const detectedRelationships = this.relationshipExtractor.extractFromHandler(actualHandler, sourceFile, handlerName);
       if (detectedRelationships.length > 0) {
         relationships = detectedRelationships;
       }
@@ -3693,11 +3706,24 @@ class HandlerExtractor {
       }
     }
   }
+  getUnaryOperatorText(operator) {
+    if (typeof operator === "number") {
+      if (operator === SyntaxKind.PlusPlusToken)
+        return "++";
+      if (operator === SyntaxKind.MinusMinusToken)
+        return "--";
+      return null;
+    }
+    if (operator && typeof operator === "object" && "getText" in operator) {
+      return operator.getText();
+    }
+    return null;
+  }
   extractUnaryExpressionAssignment(node, assignments) {
     if (!Node2.isPostfixUnaryExpression(node) && !Node2.isPrefixUnaryExpression(node))
       return;
     const operator = node.getOperatorToken();
-    const operatorText = operator.toString();
+    const operatorText = this.getUnaryOperatorText(operator);
     if (operatorText !== "++" && operatorText !== "--")
       return;
     const operand = node.getOperand();
@@ -3789,7 +3815,7 @@ class HandlerExtractor {
   }
   extractVerificationConditions(funcNode, preconditions, postconditions) {
     const body = funcNode.getBody();
-    const statements = Node2.isBlock(body) ? body.getStatements() : [body];
+    const statements = Node2.isBlock(body) ? body.getStatements() : body ? [body] : [];
     for (const statement of statements) {
       this.processStatementForConditions(statement, preconditions, postconditions);
     }
@@ -3909,10 +3935,14 @@ class HandlerExtractor {
     const handlers = [];
     try {
       const initializer = varDecl.getInitializer();
-      if (!this.isHandlerMapInitializer(initializer, varDecl)) {
+      if (!initializer) {
         return handlers;
       }
-      const properties = initializer.getProperties();
+      const objectLiteral = this.getHandlerMapObject(initializer, varDecl);
+      if (!objectLiteral) {
+        return handlers;
+      }
+      const properties = objectLiteral.getProperties();
       for (const prop of properties) {
         const handler = this.extractHandlerFromProperty(prop, context, filePath);
         if (handler) {
@@ -3922,12 +3952,16 @@ class HandlerExtractor {
     } catch (_error) {}
     return handlers;
   }
-  isHandlerMapInitializer(initializer, varDecl) {
-    if (!initializer || !Node2.isObjectLiteralExpression(initializer)) {
-      return false;
+  getHandlerMapObject(initializer, varDecl) {
+    if (Node2.isObjectLiteralExpression(initializer)) {
+      if (this.isHandlerMapName(varDecl.getName())) {
+        return initializer;
+      }
     }
-    const varName = varDecl.getName().toLowerCase();
-    return /(handler|listener|callback|event)s?/.test(varName);
+    return null;
+  }
+  isHandlerMapName(varName) {
+    return /(handler|listener|callback|event)s?/.test(varName.toLowerCase());
   }
   extractHandlerFromProperty(prop, context, filePath) {
     if (!Node2.isPropertyAssignment(prop)) {
@@ -3938,13 +3972,29 @@ class HandlerExtractor {
     if (!messageType) {
       return null;
     }
+    const value = prop.getInitializer();
+    const assignments = [];
+    const preconditions = [];
+    const postconditions = [];
+    if (value) {
+      if (Node2.isArrowFunction(value) || Node2.isFunctionExpression(value)) {
+        this.extractAssignments(value, assignments);
+        this.extractVerificationConditions(value, preconditions, postconditions);
+      } else if (Node2.isIdentifier(value)) {
+        const referencedFunction = this.resolveFunctionReference(value);
+        if (referencedFunction) {
+          this.extractAssignments(referencedFunction, assignments);
+          this.extractVerificationConditions(referencedFunction, preconditions, postconditions);
+        }
+      }
+    }
     const line = prop.getStartLineNumber();
     return {
       messageType,
       node: context,
-      assignments: [],
-      preconditions: [],
-      postconditions: [],
+      assignments,
+      preconditions,
+      postconditions,
       location: { file: filePath, line }
     };
   }
@@ -3957,6 +4007,26 @@ class HandlerExtractor {
     }
     return null;
   }
+  resolveFunctionReference(identifier) {
+    if (!Node2.isIdentifier(identifier)) {
+      return null;
+    }
+    try {
+      const definitions = identifier.getDefinitionNodes();
+      for (const def of definitions) {
+        if (Node2.isFunctionDeclaration(def)) {
+          return def;
+        }
+        if (Node2.isVariableDeclaration(def)) {
+          const initializer = def.getInitializer();
+          if (initializer && (Node2.isArrowFunction(initializer) || Node2.isFunctionExpression(initializer))) {
+            return initializer;
+          }
+        }
+      }
+    } catch (_error) {}
+    return null;
+  }
   extractTypeGuardHandlers(ifNode, context, filePath) {
     const handlers = [];
     try {
@@ -5323,4 +5393,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=7CAD4356DD5A25CD64756E2164756E21
+//# debugId=10C305880072C68964756E2164756E21