@fairfox/polly 0.3.1 → 0.3.4

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

@@ -730,7 +730,11 @@ class HandlerExtractor {
   typeGuardCache;
   constructor(tsConfigPath) {
     this.project = new Project({
-      tsConfigFilePath: tsConfigPath
+      tsConfigFilePath: tsConfigPath,
+      compilerOptions: {
+        allowImportingTsExtensions: true,
+        moduleResolution: 99
+      }
     });
     this.typeGuardCache = new WeakMap;
   }
@@ -738,6 +742,14 @@ class HandlerExtractor {
     const handlers = [];
     const messageTypes = new Set;
     const sourceFiles = this.project.getSourceFiles();
+    if (process.env.POLLY_DEBUG) {
+      console.log(`[DEBUG] Loaded ${sourceFiles.length} source files`);
+      if (sourceFiles.length <= 20) {
+        for (const sf of sourceFiles) {
+          console.log(`[DEBUG]   - ${sf.getFilePath()}`);
+        }
+      }
+    }
     for (const sourceFile of sourceFiles) {
       const fileHandlers = this.extractFromFile(sourceFile);
       handlers.push(...fileHandlers);
@@ -745,6 +757,9 @@ class HandlerExtractor {
         messageTypes.add(handler.messageType);
       }
     }
+    if (process.env.POLLY_DEBUG) {
+      console.log(`[DEBUG] Total handlers extracted: ${handlers.length}`);
+    }
     return {
       handlers,
       messageTypes
@@ -998,14 +1013,23 @@ class HandlerExtractor {
         typeGuards = this.findTypePredicateFunctions(sourceFile);
         this.typeGuardCache.set(sourceFile, typeGuards);
       }
-      if (typeGuards.size === 0) {
-        return handlers;
+      if (process.env.POLLY_DEBUG) {
+        console.log(`[DEBUG] File: ${sourceFile.getBaseName()}`);
+        console.log(`[DEBUG] Local type guards found: ${typeGuards.size}`);
+        if (typeGuards.size > 0) {
+          for (const [name, type] of typeGuards.entries()) {
+            console.log(`[DEBUG]   - ${name} → ${type}`);
+          }
+        }
       }
       let currentIf = ifNode;
       while (currentIf) {
         const handler = this.extractHandlerFromIfClause(currentIf, typeGuards, context, filePath);
         if (handler) {
           handlers.push(handler);
+          if (process.env.POLLY_DEBUG) {
+            console.log(`[DEBUG] Found handler: ${handler.messageType} at line ${handler.location.line}`);
+          }
         }
         const elseStatement = currentIf.getElseStatement();
         if (elseStatement && Node.isIfStatement(elseStatement)) {
@@ -1014,7 +1038,11 @@ class HandlerExtractor {
           break;
         }
       }
-    } catch (error) {}
+    } catch (error) {
+      if (process.env.POLLY_DEBUG) {
+        console.log(`[DEBUG] Error in extractTypeGuardHandlers: ${error}`);
+      }
+    }
     return handlers;
   }
   extractHandlerFromIfClause(ifNode, typeGuards, context, filePath) {
@@ -1028,10 +1056,27 @@ class HandlerExtractor {
       if (Node.isIdentifier(funcExpr)) {
         funcName = funcExpr.getText();
       }
-      if (!funcName || !typeGuards.has(funcName)) {
+      if (process.env.POLLY_DEBUG && funcName) {
+        console.log(`[DEBUG] Processing if condition with function: ${funcName}`);
+      }
+      let messageType = undefined;
+      if (funcName && typeGuards.has(funcName)) {
+        messageType = typeGuards.get(funcName);
+        if (process.env.POLLY_DEBUG) {
+          console.log(`[DEBUG] Found in local type guards: ${funcName} → ${messageType}`);
+        }
+      } else if (Node.isIdentifier(funcExpr)) {
+        if (process.env.POLLY_DEBUG) {
+          console.log(`[DEBUG] Not found locally, trying import resolution for: ${funcName}`);
+        }
+        messageType = this.resolveImportedTypeGuard(funcExpr);
+      }
+      if (!messageType) {
+        if (process.env.POLLY_DEBUG && funcName) {
+          console.log(`[DEBUG] Could not resolve message type for: ${funcName}`);
+        }
         return null;
       }
-      const messageType = typeGuards.get(funcName);
       const line = ifNode.getStartLineNumber();
       return {
         messageType,
@@ -1092,6 +1137,55 @@ class HandlerExtractor {
     });
     return typeGuards;
   }
+  resolveImportedTypeGuard(identifier) {
+    try {
+      const funcName = identifier.getText();
+      const definitions = identifier.getDefinitionNodes();
+      if (definitions.length === 0) {
+        if (process.env.POLLY_DEBUG) {
+          console.log(`[DEBUG] No definitions found for imported function: ${funcName}`);
+        }
+        return null;
+      }
+      for (const def of definitions) {
+        if (Node.isFunctionDeclaration(def) || Node.isFunctionExpression(def) || Node.isArrowFunction(def)) {
+          const returnType = def.getReturnType();
+          const returnTypeText = returnType.getText();
+          if (process.env.POLLY_DEBUG) {
+            console.log(`[DEBUG] Function ${funcName} return type: ${returnTypeText}`);
+          }
+          if (/is\s+\w+/.test(returnTypeText)) {
+            const typeMatch = returnTypeText.match(/is\s+(\w+)/);
+            if (typeMatch) {
+              const typeName = typeMatch[1];
+              const messageType = this.extractMessageTypeFromTypeName(typeName);
+              if (process.env.POLLY_DEBUG) {
+                console.log(`[DEBUG] Resolved ${funcName} → ${messageType}`);
+              }
+              return messageType;
+            }
+            const body = def.getBody();
+            if (body) {
+              const bodyText = body.getText();
+              const typeValueMatch = bodyText.match(/\.type\s*===?\s*['"](\w+)['"]/);
+              if (typeValueMatch) {
+                const messageType = typeValueMatch[1];
+                if (process.env.POLLY_DEBUG) {
+                  console.log(`[DEBUG] Resolved ${funcName} → ${messageType} (from body)`);
+                }
+                return messageType;
+              }
+            }
+          }
+        }
+      }
+    } catch (error) {
+      if (process.env.POLLY_DEBUG) {
+        console.log(`[DEBUG] Error resolving imported type guard: ${error}`);
+      }
+    }
+    return null;
+  }
   extractMessageTypeFromTypeName(typeName) {
     const messageType = typeName.replace(/Message$/, "").replace(/Event$/, "").replace(/Request$/, "").replace(/Command$/, "").replace(/Query$/, "").toLowerCase();
     return messageType;
@@ -2288,4 +2382,4 @@ Stack trace:`, COLORS.gray));
   process.exit(1);
 });
 
-//# debugId=5E943FE5FB56B58764756E2164756E21
+//# debugId=51714DF41A65879964756E2164756E21