@fairfox/polly 0.12.4 → 0.13.1

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

@@ -5667,17 +5667,25 @@ class HandlerExtractor {
     const assignments = [];
     const preconditions = [];
     const postconditions = [];
+    let actualHandler = null;
     if (Node4.isArrowFunction(handlerArg) || Node4.isFunctionExpression(handlerArg)) {
-      this.extractAssignments(handlerArg, assignments);
-      this.extractVerificationConditions(handlerArg, preconditions, postconditions);
-      this.checkAsyncMutations(handlerArg, messageType);
+      actualHandler = handlerArg;
+    } else if (Node4.isIdentifier(handlerArg)) {
+      actualHandler = this.resolveFunctionReference(handlerArg);
+    }
+    if (actualHandler) {
+      this.extractAssignments(actualHandler, assignments);
+      this.extractVerificationConditions(actualHandler, preconditions, postconditions);
+      if (Node4.isArrowFunction(actualHandler) || Node4.isFunctionExpression(actualHandler)) {
+        this.checkAsyncMutations(actualHandler, messageType);
+      }
     }
     const line = callExpr.getStartLineNumber();
     const sourceFile = callExpr.getSourceFile();
     const handlerName = `${messageType}_handler`;
     let relationships;
-    if (Node4.isArrowFunction(handlerArg) || Node4.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;
       }
@@ -5781,11 +5789,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 (!Node4.isPostfixUnaryExpression(node) && !Node4.isPrefixUnaryExpression(node))
       return;
     const operator = node.getOperatorToken();
-    const operatorText = operator.toString();
+    const operatorText = this.getUnaryOperatorText(operator);
     if (operatorText !== "++" && operatorText !== "--")
       return;
     const operand = node.getOperand();
@@ -5877,7 +5898,7 @@ class HandlerExtractor {
   }
   extractVerificationConditions(funcNode, preconditions, postconditions) {
     const body = funcNode.getBody();
-    const statements = Node4.isBlock(body) ? body.getStatements() : [body];
+    const statements = Node4.isBlock(body) ? body.getStatements() : body ? [body] : [];
     for (const statement of statements) {
       this.processStatementForConditions(statement, preconditions, postconditions);
     }
@@ -5997,10 +6018,14 @@ class HandlerExtractor {
     const handlers = [];
     try {
       const initializer = varDecl.getInitializer();
-      if (!this.isHandlerMapInitializer(initializer, varDecl)) {
+      if (!initializer) {
+        return handlers;
+      }
+      const objectLiteral = this.getHandlerMapObject(initializer, varDecl);
+      if (!objectLiteral) {
         return handlers;
       }
-      const properties = initializer.getProperties();
+      const properties = objectLiteral.getProperties();
       for (const prop of properties) {
         const handler = this.extractHandlerFromProperty(prop, context, filePath);
         if (handler) {
@@ -6010,12 +6035,16 @@ class HandlerExtractor {
     } catch (_error) {}
     return handlers;
   }
-  isHandlerMapInitializer(initializer, varDecl) {
-    if (!initializer || !Node4.isObjectLiteralExpression(initializer)) {
-      return false;
+  getHandlerMapObject(initializer, varDecl) {
+    if (Node4.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 (!Node4.isPropertyAssignment(prop)) {
@@ -6026,13 +6055,29 @@ class HandlerExtractor {
     if (!messageType) {
       return null;
     }
+    const value = prop.getInitializer();
+    const assignments = [];
+    const preconditions = [];
+    const postconditions = [];
+    if (value) {
+      if (Node4.isArrowFunction(value) || Node4.isFunctionExpression(value)) {
+        this.extractAssignments(value, assignments);
+        this.extractVerificationConditions(value, preconditions, postconditions);
+      } else if (Node4.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 }
     };
   }
@@ -6045,6 +6090,26 @@ class HandlerExtractor {
     }
     return null;
   }
+  resolveFunctionReference(identifier) {
+    if (!Node4.isIdentifier(identifier)) {
+      return null;
+    }
+    try {
+      const definitions = identifier.getDefinitionNodes();
+      for (const def of definitions) {
+        if (Node4.isFunctionDeclaration(def)) {
+          return def;
+        }
+        if (Node4.isVariableDeclaration(def)) {
+          const initializer = def.getInitializer();
+          if (initializer && (Node4.isArrowFunction(initializer) || Node4.isFunctionExpression(initializer))) {
+            return initializer;
+          }
+        }
+      }
+    } catch (_error) {}
+    return null;
+  }
   extractTypeGuardHandlers(ifNode, context, filePath) {
     const handlers = [];
     try {
@@ -9599,4 +9664,4 @@ Goodbye!`);
 }
 main();
 
-//# debugId=8B445D057C1E5F1464756E2164756E21
+//# debugId=EA44B00D786F888B64756E2164756E21