@fairfox/polly 0.3.4 → 0.3.8

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

@@ -730,11 +730,7 @@ class HandlerExtractor {
   typeGuardCache;
   constructor(tsConfigPath) {
     this.project = new Project({
-      tsConfigFilePath: tsConfigPath,
-      compilerOptions: {
-        allowImportingTsExtensions: true,
-        moduleResolution: 99
-      }
+      tsConfigFilePath: tsConfigPath
     });
     this.typeGuardCache = new WeakMap;
   }
@@ -791,8 +787,12 @@ class HandlerExtractor {
         handlers.push(...mapHandlers);
       }
       if (Node.isIfStatement(node)) {
-        const typeGuardHandlers = this.extractTypeGuardHandlers(node, context, filePath);
-        handlers.push(...typeGuardHandlers);
+        const parent = node.getParent();
+        const isElseIf = parent && Node.isIfStatement(parent);
+        if (!isElseIf) {
+          const typeGuardHandlers = this.extractTypeGuardHandlers(node, context, filePath);
+          handlers.push(...typeGuardHandlers);
+        }
       }
     });
     return handlers;
@@ -1094,9 +1094,8 @@ class HandlerExtractor {
     const typeGuards = new Map;
     sourceFile.forEachDescendant((node) => {
       if (Node.isFunctionDeclaration(node) || Node.isFunctionExpression(node) || Node.isArrowFunction(node)) {
-        const returnType = node.getReturnType();
-        const returnTypeText = returnType.getText();
-        if (/is\s+\w+/.test(returnTypeText)) {
+        const returnTypeNode = node.getReturnTypeNode();
+        if (returnTypeNode && Node.isTypePredicate(returnTypeNode)) {
           let functionName;
           if (Node.isFunctionDeclaration(node)) {
             functionName = node.getName();
@@ -1112,10 +1111,10 @@ class HandlerExtractor {
             }
           }
           if (functionName) {
+            const typeNode = returnTypeNode.getTypeNode();
             let messageType = null;
-            const typeMatch = returnTypeText.match(/is\s+(\w+)/);
-            if (typeMatch) {
-              const typeName = typeMatch[1];
+            if (typeNode) {
+              const typeName = typeNode.getText();
               messageType = this.extractMessageTypeFromTypeName(typeName);
             }
             if (!messageType) {
@@ -1149,34 +1148,38 @@ class HandlerExtractor {
       }
       for (const def of definitions) {
         if (Node.isFunctionDeclaration(def) || Node.isFunctionExpression(def) || Node.isArrowFunction(def)) {
-          const returnType = def.getReturnType();
-          const returnTypeText = returnType.getText();
+          const returnTypeNode = def.getReturnTypeNode();
           if (process.env.POLLY_DEBUG) {
-            console.log(`[DEBUG] Function ${funcName} return type: ${returnTypeText}`);
+            const returnType = def.getReturnType().getText();
+            console.log(`[DEBUG] Function ${funcName} return type (resolved): ${returnType}`);
+            console.log(`[DEBUG] Has return type node: ${!!returnTypeNode}`);
+            console.log(`[DEBUG] Is type predicate node: ${returnTypeNode && Node.isTypePredicate(returnTypeNode)}`);
           }
-          if (/is\s+\w+/.test(returnTypeText)) {
-            const typeMatch = returnTypeText.match(/is\s+(\w+)/);
-            if (typeMatch) {
-              const typeName = typeMatch[1];
+          if (returnTypeNode && Node.isTypePredicate(returnTypeNode)) {
+            const typeNode = returnTypeNode.getTypeNode();
+            if (typeNode) {
+              const typeName = typeNode.getText();
               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 (messageType) {
                 if (process.env.POLLY_DEBUG) {
-                  console.log(`[DEBUG] Resolved ${funcName} → ${messageType} (from body)`);
+                  console.log(`[DEBUG] Resolved ${funcName} → ${messageType} (from AST type predicate)`);
                 }
                 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) {
@@ -2382,4 +2385,4 @@ Stack trace:`, COLORS.gray));
   process.exit(1);
 });
 
-//# debugId=51714DF41A65879964756E2164756E21
+//# debugId=EE34F5E282168E7C64756E2164756E21