@fairfox/polly 0.5.2 → 0.6.0

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

@@ -27,7 +27,7 @@ class TLAGenerator {
     this.lines = [];
     this.indent = 0;
     const spec = this.generateSpec(config, analysis);
-    const cfg = this.generateConfig(config, analysis);
+    const cfg = this.generateConfig(config);
     return { spec, cfg };
   }
   generateSpec(config, analysis) {
@@ -35,7 +35,7 @@ class TLAGenerator {
     this.indent = 0;
     this.addHeader();
     this.addExtends();
-    this.addConstants(config, analysis);
+    this.addConstants(config);
     this.addMessageTypes(config, analysis);
     this.addStateType(config, analysis);
     this.addVariables();
@@ -48,7 +48,7 @@ class TLAGenerator {
     return this.lines.join(`
 `);
   }
-  generateConfig(config, analysis) {
+  generateConfig(config) {
     const lines = [];
     lines.push("SPECIFICATION UserSpec");
     lines.push("");
@@ -107,8 +107,8 @@ class TLAGenerator {
     this.line("EXTENDS MessageRouter");
     this.line("");
   }
-  addConstants(config, analysis) {
-    const hasCustomConstants = Object.entries(config.state).some(([field, fieldConfig]) => {
+  addConstants(config) {
+    const hasCustomConstants = Object.entries(config.state).some(([_, fieldConfig]) => {
       if (typeof fieldConfig !== "object" || fieldConfig === null)
         return false;
       return "maxLength" in fieldConfig && fieldConfig.maxLength !== null || "max" in fieldConfig && fieldConfig.max !== null || "maxSize" in fieldConfig && fieldConfig.maxSize !== null;
@@ -140,7 +140,7 @@ class TLAGenerator {
     this.indent--;
     this.line("");
   }
-  addStateType(config, analysis) {
+  addStateType(config, _analysis) {
     this.line("\\* Generic value type for sequences and maps");
     this.line("\\* Bounded to allow model checking");
     this.line('Value == {"v1", "v2", "v3"}');
@@ -169,7 +169,7 @@ class TLAGenerator {
     this.line("]");
     this.line("");
   }
-  addMessageTypes(config, analysis) {
+  addMessageTypes(_config, analysis) {
     if (analysis.messageTypes.length === 0) {
       return;
     }
@@ -186,7 +186,7 @@ class TLAGenerator {
     this.line("allVars == <<ports, messages, pendingRequests, delivered, routingDepth, time, contextStates>>");
     this.line("");
   }
-  addInit(config, analysis) {
+  addInit(config, _analysis) {
     this.line("\\* Initial application state");
     this.line("InitialState == [");
     this.indent++;
@@ -247,6 +247,8 @@ class TLAGenerator {
     const messageTypes = Array.from(handlersByType.keys());
     for (let i = 0;i < messageTypes.length; i++) {
       const msgType = messageTypes[i];
+      if (!msgType)
+        continue;
       const actionName = this.messageTypeToActionName(msgType);
       if (i === 0) {
         this.line(`IF msgType = "${msgType}" THEN ${actionName}(ctx)`);
@@ -304,6 +306,8 @@ class TLAGenerator {
       this.indent++;
       for (let i = 0;i < validAssignments.length; i++) {
         const assignment = validAssignments[i];
+        if (!assignment || assignment.value === undefined)
+          continue;
         const fieldName = this.sanitizeFieldName(assignment.field);
         const value = this.assignmentValueToTLA(assignment.value);
         const suffix = i < validAssignments.length - 1 ? "," : "";
@@ -325,10 +329,10 @@ class TLAGenerator {
   tsExpressionToTLA(expr, isPrimed = false) {
     let tla = expr;
     const statePrefix = isPrimed ? "contextStates'[ctx]" : "contextStates[ctx]";
-    tla = tla.replace(/state\.([a-zA-Z_][a-zA-Z0-9_.]*)/g, (match, path2) => {
+    tla = tla.replace(/state\.([a-zA-Z_][a-zA-Z0-9_.]*)/g, (_match, path2) => {
       return `${statePrefix}.${this.sanitizeFieldName(path2)}`;
     });
-    tla = tla.replace(/payload\.([a-zA-Z_][a-zA-Z0-9_.]*)/g, (match, path2) => {
+    tla = tla.replace(/payload\.([a-zA-Z_][a-zA-Z0-9_.]*)/g, (_match, path2) => {
       return `payload.${this.sanitizeFieldName(path2)}`;
     });
     tla = tla.replace(/===/g, "=");
@@ -366,7 +370,7 @@ class TLAGenerator {
     }
     return "NULL";
   }
-  addRouteWithHandlers(config, analysis) {
+  addRouteWithHandlers(_config, analysis) {
     this.line("\\* =============================================================================");
     this.line("\\* Message Routing with State Transitions");
     this.line("\\* =============================================================================");
@@ -401,7 +405,7 @@ class TLAGenerator {
     this.indent--;
     this.line("");
   }
-  addNext(config, analysis) {
+  addNext(_config, analysis) {
     this.line("\\* Next state relation (extends MessageRouter)");
     this.line("UserNext ==");
     this.indent++;
@@ -426,7 +430,7 @@ class TLAGenerator {
     this.line("UserSpec == UserInit /\\ [][UserNext]_allVars /\\ WF_allVars(UserNext)");
     this.line("");
   }
-  addInvariants(config, analysis) {
+  addInvariants(_config, _analysis) {
     this.line("\\* =============================================================================");
     this.line("\\* Application Invariants");
     this.line("\\* =============================================================================");
@@ -450,7 +454,7 @@ class TLAGenerator {
     this.line("");
     this.line("=============================================================================");
   }
-  fieldConfigToTLAType(fieldPath, fieldConfig, config) {
+  fieldConfigToTLAType(_fieldPath, fieldConfig, _config) {
     if ("type" in fieldConfig) {
       if (fieldConfig.type === "boolean") {
         return "BOOLEAN";
@@ -461,11 +465,9 @@ class TLAGenerator {
       }
     }
     if ("maxLength" in fieldConfig) {
-      const constName = this.fieldToConstName(fieldPath);
       return `Seq(Value)`;
     }
     if ("min" in fieldConfig && "max" in fieldConfig) {
-      const constName = this.fieldToConstName(fieldPath);
       const min = fieldConfig.min || 0;
       const max = fieldConfig.max || 100;
       return `${min}..${max}`;
@@ -538,7 +540,6 @@ import * as fs2 from "node:fs";
 import * as path2 from "node:path";
 
 class DockerRunner {
-  containerName = "web-ext-tla-verify";
   async isDockerAvailable() {
     try {
       const result = await this.runCommand("docker", ["--version"]);
@@ -609,8 +610,8 @@ class DockerRunner {
     return {
       success: true,
       stats: {
-        statesGenerated: statesMatch ? Number.parseInt(statesMatch[1]) : 0,
-        distinctStates: distinctMatch ? Number.parseInt(distinctMatch[1]) : 0
+        statesGenerated: statesMatch?.[1] ? Number.parseInt(statesMatch[1]) : 0,
+        distinctStates: distinctMatch?.[1] ? Number.parseInt(distinctMatch[1]) : 0
       },
       output
     };
@@ -635,7 +636,7 @@ class DockerRunner {
   }
   extractError(output) {
     const errorMatch = output.match(/Error: (.*?)(?:\n|$)/);
-    if (errorMatch) {
+    if (errorMatch?.[1]) {
       return errorMatch[1];
     }
     if (output.includes("Parse Error")) {
@@ -723,7 +724,7 @@ import * as path3 from "node:path";
 import { Project as Project2 } from "ts-morph";
 
 // vendor/analysis/src/extract/handlers.ts
-import { Project, SyntaxKind as SyntaxKind2, Node as Node2 } from "ts-morph";
+import { Project, SyntaxKind, Node as Node2 } from "ts-morph";
 
 // vendor/analysis/src/extract/relationships.ts
 import { Node } from "ts-morph";
@@ -826,7 +827,7 @@ class RelationshipExtractor {
       const objectExpr = expr.getExpression();
       const objectName = objectExpr.getText();
       const methodName = expr.getName();
-      targetComponent = this.inferComponentFromCall(objectName, methodName);
+      targetComponent = this.inferComponentFromCall(objectName);
       if (!targetComponent) {
         return null;
       }
@@ -857,7 +858,7 @@ class RelationshipExtractor {
       rootObject = rootObject.getExpression();
     }
     const objectName = rootObject.getText();
-    const targetComponent = this.inferComponentFromCall(objectName, methodName);
+    const targetComponent = this.inferComponentFromCall(objectName);
     if (!targetComponent) {
       return null;
     }
@@ -894,7 +895,7 @@ class RelationshipExtractor {
   }
   extractFromFetchCall(callExpr, handlerName) {
     const args = callExpr.getArguments();
-    if (args.length === 0) {
+    if (args.length === 0 || !args[0]) {
       return null;
     }
     const urlArg = args[0].getText();
@@ -913,7 +914,7 @@ class RelationshipExtractor {
       evidence: [`fetch() call to: ${urlArg}`]
     };
   }
-  inferComponentFromCall(objectName, methodName) {
+  inferComponentFromCall(objectName) {
     const mappings = {
       db: "db_client",
       database: "database",
@@ -990,7 +991,7 @@ class RelationshipExtractor {
           }
           if (modulePath.includes("/service") || modulePath.includes("/services")) {
             const match = modulePath.match(/\/([^/]+)\.ts$/);
-            if (match) {
+            if (match && match[1]) {
               return this.toComponentId(match[1]);
             }
           }
@@ -1075,7 +1076,7 @@ class HandlerExtractor {
     const handlers = [];
     const messageTypes = new Set;
     const sourceFiles = this.project.getSourceFiles();
-    if (process.env.POLLY_DEBUG) {
+    if (process.env["POLLY_DEBUG"]) {
       console.log(`[DEBUG] Loaded ${sourceFiles.length} source files`);
       if (sourceFiles.length <= 20) {
         for (const sf of sourceFiles) {
@@ -1090,7 +1091,7 @@ class HandlerExtractor {
         messageTypes.add(handler.messageType);
       }
     }
-    if (process.env.POLLY_DEBUG) {
+    if (process.env["POLLY_DEBUG"]) {
       console.log(`[DEBUG] Total handlers extracted: ${handlers.length}`);
     }
     return {
@@ -1207,7 +1208,7 @@ class HandlerExtractor {
   extractVerificationConditions(funcNode, preconditions, postconditions) {
     const body = funcNode.getBody();
     const statements = Node2.isBlock(body) ? body.getStatements() : [body];
-    statements.forEach((statement, index) => {
+    statements.forEach((statement) => {
       if (Node2.isExpressionStatement(statement)) {
         const expr = statement.getExpression();
         if (Node2.isCallExpression(expr)) {
@@ -1271,13 +1272,13 @@ class HandlerExtractor {
     if (Node2.isNumericLiteral(node)) {
       return node.getLiteralValue();
     }
-    if (node.getKind() === SyntaxKind2.TrueKeyword) {
+    if (node.getKind() === SyntaxKind.TrueKeyword) {
       return true;
     }
-    if (node.getKind() === SyntaxKind2.FalseKeyword) {
+    if (node.getKind() === SyntaxKind.FalseKeyword) {
       return false;
     }
-    if (node.getKind() === SyntaxKind2.NullKeyword) {
+    if (node.getKind() === SyntaxKind.NullKeyword) {
       return null;
     }
     return;
@@ -1360,7 +1361,7 @@ class HandlerExtractor {
         typeGuards = this.findTypePredicateFunctions(sourceFile);
         this.typeGuardCache.set(sourceFile, typeGuards);
       }
-      if (process.env.POLLY_DEBUG) {
+      if (process.env["POLLY_DEBUG"]) {
         console.log(`[DEBUG] File: ${sourceFile.getBaseName()}`);
         console.log(`[DEBUG] Local type guards found: ${typeGuards.size}`);
         if (typeGuards.size > 0) {
@@ -1374,7 +1375,7 @@ class HandlerExtractor {
         const handler = this.extractHandlerFromIfClause(currentIf, typeGuards, context, filePath);
         if (handler) {
           handlers.push(handler);
-          if (process.env.POLLY_DEBUG) {
+          if (process.env["POLLY_DEBUG"]) {
             console.log(`[DEBUG] Found handler: ${handler.messageType} at line ${handler.location.line}`);
           }
         }
@@ -1386,7 +1387,7 @@ class HandlerExtractor {
         }
       }
     } catch (error) {
-      if (process.env.POLLY_DEBUG) {
+      if (process.env["POLLY_DEBUG"]) {
         console.log(`[DEBUG] Error in extractTypeGuardHandlers: ${error}`);
       }
     }
@@ -1394,7 +1395,8 @@ class HandlerExtractor {
   }
   extractHandlerFromIfClause(ifNode, typeGuards, context, filePath) {
     try {
-      const condition = ifNode.getExpression();
+      const ifStmt = ifNode;
+      const condition = ifStmt.getExpression();
       if (!Node2.isCallExpression(condition)) {
         return null;
       }
@@ -1403,32 +1405,32 @@ class HandlerExtractor {
       if (Node2.isIdentifier(funcExpr)) {
         funcName = funcExpr.getText();
       }
-      if (process.env.POLLY_DEBUG && 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) {
+        if (process.env["POLLY_DEBUG"]) {
           console.log(`[DEBUG] Found in local type guards: ${funcName} → ${messageType}`);
         }
       } else if (Node2.isIdentifier(funcExpr)) {
-        if (process.env.POLLY_DEBUG) {
+        if (process.env["POLLY_DEBUG"]) {
           console.log(`[DEBUG] Not found locally, trying import resolution for: ${funcName}`);
         }
-        messageType = this.resolveImportedTypeGuard(funcExpr);
+        messageType = this.resolveImportedTypeGuard(funcExpr) ?? undefined;
       }
       if (!messageType) {
-        if (process.env.POLLY_DEBUG && funcName) {
+        if (process.env["POLLY_DEBUG"] && funcName) {
           console.log(`[DEBUG] Could not resolve message type for: ${funcName}`);
         }
         return null;
       }
-      const line = ifNode.getStartLineNumber();
-      const sourceFile = ifNode.getSourceFile();
+      const line = ifStmt.getStartLineNumber();
+      const sourceFile = ifStmt.getSourceFile();
       const handlerName = `${messageType}_handler`;
       let relationships = undefined;
-      const thenStatement = ifNode.getThenStatement();
+      const thenStatement = ifStmt.getThenStatement();
       if (thenStatement) {
         const detectedRelationships = this.relationshipExtractor.extractFromHandler(thenStatement, sourceFile, handlerName);
         if (detectedRelationships.length > 0) {
@@ -1481,7 +1483,7 @@ class HandlerExtractor {
                 const bodyText = body.getText();
                 const typeValueMatch = bodyText.match(/\.type\s*===?\s*['"](\w+)['"]/);
                 if (typeValueMatch) {
-                  messageType = typeValueMatch[1];
+                  messageType = typeValueMatch[1] ?? null;
                 }
               }
             }
@@ -1499,7 +1501,7 @@ class HandlerExtractor {
       const funcName = identifier.getText();
       const definitions = identifier.getDefinitionNodes();
       if (definitions.length === 0) {
-        if (process.env.POLLY_DEBUG) {
+        if (process.env["POLLY_DEBUG"]) {
           console.log(`[DEBUG] No definitions found for imported function: ${funcName}`);
         }
         return null;
@@ -1507,7 +1509,7 @@ class HandlerExtractor {
       for (const def of definitions) {
         if (Node2.isFunctionDeclaration(def) || Node2.isFunctionExpression(def) || Node2.isArrowFunction(def)) {
           const returnTypeNode = def.getReturnTypeNode();
-          if (process.env.POLLY_DEBUG) {
+          if (process.env["POLLY_DEBUG"]) {
             const returnType = def.getReturnType().getText();
             console.log(`[DEBUG] Function ${funcName} return type (resolved): ${returnType}`);
             console.log(`[DEBUG] Has return type node: ${!!returnTypeNode}`);
@@ -1519,7 +1521,7 @@ class HandlerExtractor {
               const typeName = typeNode.getText();
               const messageType = this.extractMessageTypeFromTypeName(typeName);
               if (messageType) {
-                if (process.env.POLLY_DEBUG) {
+                if (process.env["POLLY_DEBUG"]) {
                   console.log(`[DEBUG] Resolved ${funcName} → ${messageType} (from AST type predicate)`);
                 }
                 return messageType;
@@ -1531,8 +1533,8 @@ class HandlerExtractor {
             const bodyText = body.getText();
             const typeValueMatch = bodyText.match(/\.type\s*===?\s*['"](\w+)['"]/);
             if (typeValueMatch) {
-              const messageType = typeValueMatch[1];
-              if (process.env.POLLY_DEBUG) {
+              const messageType = typeValueMatch[1] ?? null;
+              if (process.env["POLLY_DEBUG"]) {
                 console.log(`[DEBUG] Resolved ${funcName} → ${messageType} (from body)`);
               }
               return messageType;
@@ -1541,7 +1543,7 @@ class HandlerExtractor {
         }
       }
     } catch (error) {
-      if (process.env.POLLY_DEBUG) {
+      if (process.env["POLLY_DEBUG"]) {
         console.log(`[DEBUG] Error resolving imported type guard: ${error}`);
       }
     }
@@ -1596,7 +1598,7 @@ class TypeExtractor {
     const stateType = stateFilePath ? this.extractStateType(stateFilePath) : this.findStateType();
     const messageTypes = this.findMessageTypes();
     const fields = stateType ? this.analyzeFields(stateType) : [];
-    const configFilePath = this.project.getCompilerOptions().configFilePath;
+    const configFilePath = this.project.getCompilerOptions()["configFilePath"];
     const tsConfigPath = typeof configFilePath === "string" ? configFilePath : "tsconfig.json";
     const handlerExtractor = new HandlerExtractor(tsConfigPath);
     const handlerAnalysis = handlerExtractor.extractHandlers();
@@ -1724,10 +1726,13 @@ class TypeExtractor {
     }
     if (type.isObject()) {
       const properties = {};
-      for (const prop of type.getProperties()) {
-        const propName = prop.getName();
-        const propType = prop.getTypeAtLocation(this.project.getSourceFiles()[0]);
-        properties[propName] = this.convertType(propType, propName);
+      const sourceFile = this.project.getSourceFiles()[0];
+      if (sourceFile) {
+        for (const prop of type.getProperties()) {
+          const propName = prop.getName();
+          const propType = prop.getTypeAtLocation(sourceFile);
+          properties[propName] = this.convertType(propType, propName);
+        }
       }
       return {
         name,
@@ -1780,7 +1785,7 @@ class TypeExtractor {
       analysis.confidence = "low";
       analysis.suggestions.push("Choose maxLength: 5 (fast), 10 (balanced), or 20 (thorough)");
       analysis.bounds.maxLength = undefined;
-      const foundBound = this.findArrayBound(path);
+      const foundBound = this.findArrayBound();
       if (foundBound) {
         analysis.confidence = "medium";
         analysis.evidence.push(`Found array check: ${foundBound.evidence}`);
@@ -1793,7 +1798,7 @@ class TypeExtractor {
       analysis.suggestions.push("Provide min and max values based on your application logic");
       analysis.bounds.min = undefined;
       analysis.bounds.max = undefined;
-      const foundBound = this.findNumberBound(path);
+      const foundBound = this.findNumberBound();
       if (foundBound) {
         analysis.confidence = "high";
         analysis.evidence.push(`Found comparison: ${foundBound.evidence}`);
@@ -1815,10 +1820,10 @@ class TypeExtractor {
     }
     return analysis;
   }
-  findArrayBound(path) {
+  findArrayBound() {
     return null;
   }
-  findNumberBound(path) {
+  findNumberBound() {
     return null;
   }
 }
@@ -1866,7 +1871,7 @@ class ConfigGenerator {
     this.line("");
   }
   addExport() {
-    this.line("export default defineVerification({");
+    this.line("export const verificationConfig = defineVerification({");
     this.indent++;
   }
   closeExport() {
@@ -1878,6 +1883,8 @@ class ConfigGenerator {
     this.indent++;
     for (let i = 0;i < fields.length; i++) {
       const field = fields[i];
+      if (!field)
+        continue;
       if (i > 0) {
         this.line("");
       }
@@ -2174,13 +2181,13 @@ class ConfigValidator {
         const lineNumber = source.substring(0, position).split(`
 `).length;
         const line = lines[lineNumber - 1];
-        const fieldMatch = line.match(/"([^"]+)":\s*{/);
+        const fieldMatch = line?.match(/"([^"]+)":\s*{/);
         const fieldName = fieldMatch ? fieldMatch[1] : "unknown";
         locations.push({
           line: lineNumber,
           column: match.index - source.lastIndexOf(`
 `, position),
-          context: fieldName
+          context: fieldName ?? "unknown"
         });
       }
       this.issues.push({
@@ -2216,7 +2223,7 @@ class ConfigValidator {
   loadConfig(configPath) {
     delete __require.cache[__require.resolve(path.resolve(configPath))];
     const module = __require(path.resolve(configPath));
-    return module.default || module;
+    return module.verificationConfig || module.default || module;
   }
   validateConfig(config) {
     this.findNullPlaceholders(config.state, "state");
@@ -2273,7 +2280,7 @@ class ConfigValidator {
         });
       }
     }
-    if (config.messages.maxTabs !== null) {
+    if (config.messages.maxTabs !== null && config.messages.maxTabs !== undefined) {
       if (config.messages.maxTabs < 1) {
         this.issues.push({
           type: "invalid_value",
@@ -2374,7 +2381,7 @@ function validateConfig(configPath) {
 }
 
 // vendor/verify/src/cli.ts
-var __dirname = "/Users/AJT/projects/polly/packages/polly/vendor/verify/src";
+var __dirname = "/Users/AJT/projects/polly/vendor/verify/src";
 var COLORS = {
   reset: "\x1B[0m",
   red: "\x1B[31m",
@@ -2448,7 +2455,7 @@ async function setupCommand() {
         table.push([field.path, field.type.kind, status]);
       }
       for (const row of table) {
-        console.log(`   ${row[0].padEnd(32)} ${row[1].padEnd(22)} ${row[2]}`);
+        console.log(`   ${row[0]?.padEnd(32) ?? ""} ${row[1]?.padEnd(22) ?? ""} ${row[2] ?? ""}`);
       }
     }
     const configContent = generateConfig(analysis);
@@ -2565,9 +2572,9 @@ async function verifyCommand() {
 async function runFullVerification(configPath) {
   const { generateTLA: generateTLA2 } = await Promise.resolve().then(() => exports_tla);
   const { DockerRunner: DockerRunner2 } = await Promise.resolve().then(() => (init_docker(), exports_docker));
-  delete __require.cache[__require.resolve(path3.resolve(configPath))];
-  const configModule = __require(path3.resolve(configPath));
-  const config = configModule.default || configModule;
+  const resolvedPath = path3.resolve(configPath);
+  const configModule = await import(`file://${resolvedPath}?t=${Date.now()}`);
+  const config = configModule.default;
   console.log(color("\uD83D\uDCCA Analyzing codebase...", COLORS.blue));
   const tsConfigPath = findTsConfig();
   if (!tsConfigPath) {
@@ -2743,4 +2750,4 @@ Stack trace:`, COLORS.gray));
   process.exit(1);
 });
 
-//# debugId=C40ED4F55177D0FC64756E2164756E21
+//# debugId=C7C70A8E076468AA64756E2164756E21