@fairfox/polly 0.6.0 → 0.6.1

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

@@ -1075,6 +1075,7 @@ class HandlerExtractor {
   extractHandlers() {
     const handlers = [];
     const messageTypes = new Set;
+    const invalidMessageTypes = new Set;
     const sourceFiles = this.project.getSourceFiles();
     if (process.env["POLLY_DEBUG"]) {
       console.log(`[DEBUG] Loaded ${sourceFiles.length} source files`);
@@ -1088,17 +1089,30 @@ class HandlerExtractor {
       const fileHandlers = this.extractFromFile(sourceFile);
       handlers.push(...fileHandlers);
       for (const handler of fileHandlers) {
-        messageTypes.add(handler.messageType);
+        if (this.isValidTLAIdentifier(handler.messageType)) {
+          messageTypes.add(handler.messageType);
+        } else {
+          invalidMessageTypes.add(handler.messageType);
+        }
       }
     }
     if (process.env["POLLY_DEBUG"]) {
       console.log(`[DEBUG] Total handlers extracted: ${handlers.length}`);
+      if (invalidMessageTypes.size > 0) {
+        console.log(`[DEBUG] Filtered ${invalidMessageTypes.size} invalid message type(s) from handlers`);
+      }
     }
     return {
       handlers,
       messageTypes
     };
   }
+  isValidTLAIdentifier(s) {
+    if (!s || s.length === 0) {
+      return false;
+    }
+    return /^[a-zA-Z][a-zA-Z0-9_]*$/.test(s);
+  }
   extractFromFile(sourceFile) {
     const handlers = [];
     const filePath = sourceFile.getFilePath();
@@ -1602,13 +1616,35 @@ class TypeExtractor {
     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]));
+    const validMessageTypes = [];
+    const invalidMessageTypes = [];
+    for (const msgType of allMessageTypes) {
+      if (this.isValidTLAIdentifier(msgType)) {
+        validMessageTypes.push(msgType);
+      } else {
+        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)`);
+      }
+    }
     return {
       stateType,
-      messageTypes: Array.from(new Set([...messageTypes, ...handlerAnalysis.messageTypes])),
+      messageTypes: validMessageTypes,
       fields,
       handlers: handlerAnalysis.handlers
     };
   }
+  isValidTLAIdentifier(s) {
+    if (!s || s.length === 0) {
+      return false;
+    }
+    return /^[a-zA-Z][a-zA-Z0-9_]*$/.test(s);
+  }
   extractStateType(filePath) {
     const sourceFile = this.project.getSourceFile(filePath);
     if (!sourceFile) {
@@ -2750,4 +2786,4 @@ Stack trace:`, COLORS.gray));
   process.exit(1);
 });
 
-//# debugId=C7C70A8E076468AA64756E2164756E21
+//# debugId=865A93F68683B62A64756E2164756E21