@fairfox/polly 0.7.0 → 0.7.1

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

@@ -3715,11 +3715,24 @@ class TypeExtractor {
     const stateType = stateFilePath ? this.extractStateType(stateFilePath) : this.findStateType();
     const messageTypes = this.findMessageTypes();
     const fields = stateType ? this.analyzeFields(stateType) : [];
+    const handlerAnalysis = this.extractHandlerAnalysis();
+    const validMessageTypes = this.filterAndLogMessageTypes(messageTypes, handlerAnalysis.messageTypes);
+    const validHandlers = this.filterAndLogHandlers(handlerAnalysis.handlers);
+    return {
+      stateType,
+      messageTypes: validMessageTypes,
+      fields,
+      handlers: validHandlers
+    };
+  }
+  extractHandlerAnalysis() {
     const configFilePath = this.project.getCompilerOptions()["configFilePath"];
     const tsConfigPath = typeof configFilePath === "string" ? configFilePath : "tsconfig.json";
     const handlerExtractor = new HandlerExtractor(tsConfigPath);
-    const handlerAnalysis = handlerExtractor.extractHandlers();
-    const allMessageTypes = Array.from(new Set([...messageTypes, ...handlerAnalysis.messageTypes]));
+    return handlerExtractor.extractHandlers();
+  }
+  filterAndLogMessageTypes(messageTypes, handlerMessageTypes) {
+    const allMessageTypes = Array.from(new Set([...messageTypes, ...handlerMessageTypes]));
     const validMessageTypes = [];
     const invalidMessageTypes = [];
     for (const msgType of allMessageTypes) {
@@ -3729,18 +3742,32 @@ class TypeExtractor {
         invalidMessageTypes.push(msgType);
       }
     }
-    if (invalidMessageTypes.length > 0 && process.env["POLLY_DEBUG"]) {
-      console.log(`[WARN] Filtered out ${invalidMessageTypes.length} invalid message type(s):`);
-      for (const invalid of invalidMessageTypes) {
-        console.log(`[WARN]   - "${invalid}" (not a valid TLA+ identifier)`);
+    this.logInvalidMessageTypes(invalidMessageTypes);
+    return validMessageTypes;
+  }
+  logInvalidMessageTypes(invalidMessageTypes) {
+    if (invalidMessageTypes.length === 0 || !process.env["POLLY_DEBUG"])
+      return;
+    console.log(`[WARN] Filtered out ${invalidMessageTypes.length} invalid message type(s):`);
+    for (const invalid of invalidMessageTypes) {
+      console.log(`[WARN]   - "${invalid}" (not a valid TLA+ identifier)`);
+    }
+  }
+  filterAndLogHandlers(handlers) {
+    const validHandlers = handlers.filter((h) => this.isValidTLAIdentifier(h.messageType));
+    this.logInvalidHandlers(handlers, validHandlers);
+    return validHandlers;
+  }
+  logInvalidHandlers(allHandlers, validHandlers) {
+    const filteredHandlerCount = allHandlers.length - validHandlers.length;
+    if (filteredHandlerCount === 0 || !process.env["POLLY_DEBUG"])
+      return;
+    console.log(`[WARN] Filtered out ${filteredHandlerCount} handler(s) with invalid message types:`);
+    for (const handler of allHandlers) {
+      if (!this.isValidTLAIdentifier(handler.messageType)) {
+        console.log(`[WARN]   - Handler for "${handler.messageType}" at ${handler.location.file}:${handler.location.line}`);
       }
     }
-    return {
-      stateType,
-      messageTypes: validMessageTypes,
-      fields,
-      handlers: handlerAnalysis.handlers
-    };
   }
   isValidTLAIdentifier(s) {
     if (!s || s.length === 0) {
@@ -4499,4 +4526,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=0953A65126AAFD2664756E2164756E21
+//# debugId=3B4BC06E615961E764756E2164756E21