@apiquest/fracture 1.0.2 → 1.0.4

package/src/TestCounter.ts

@@ -1,109 +1,109 @@
-import type { Collection, CollectionItem, Request, Folder } from '@apiquest/types';
-import { ScriptValidator } from './ScriptValidator.js';
-import type { PluginManager } from './PluginManager.js';
-import { Logger } from './Logger.js';
-
-/**
- * Counts total expected tests in a collection for deterministic test reporting
- */
-export class TestCounter {
-  private logger: Logger;
-
-  constructor(
-    private readonly pluginManager: PluginManager,
-    baseLogger?: Logger
-  ) {
-    this.logger = baseLogger?.createLogger('TestCounter') ?? new Logger('TestCounter');
-  }
-
-  /**
-   * Count total expected tests in collection
-   * - Counts quest.test() calls in all scripts
-   * - Multiplies by iteration count
-   * - Returns -1 if collection has dynamic plugin events (can't determine count)
-   * @returns Total expected test count, or -1 if dynamic
-   */
-  countTests(collection: Collection): number {
-    let totalTests = 0;
-    let hasDynamicTests = false;
-
-    this.logger.debug(`Counting tests for collection: ${collection.info.name}`);
-
-    // Note: collectionPre/Post and folderPre/Post scripts CANNOT have tests (validation catches this)
-    // Only preRequestScript and postRequestScript can have tests
-
-    // Helper to walk tree and count tests for each REQUEST with inherited scripts
-    const countRequestTests = (item: CollectionItem, inheritedPreRequest: string[], inheritedPostRequest: string[]): void => {
-      if (item.type === 'folder') {
-        const folder = item;
-
-        // Build inherited script chain (scripts STACK, not override)
-        const newInheritedPre = (folder.preRequestScript !== null && folder.preRequestScript !== undefined && folder.preRequestScript.length > 0)
-          ? [...inheritedPreRequest, folder.preRequestScript]
-          : inheritedPreRequest;
-        const newInheritedPost = (folder.postRequestScript !== null && folder.postRequestScript !== undefined && folder.postRequestScript.length > 0)
-          ? [...inheritedPostRequest, folder.postRequestScript]
-          : inheritedPostRequest;
-
-        // Recursively process folder contents
-        for (const child of folder.items) {
-          countRequestTests(child, newInheritedPre, newInheritedPost);
-        }
-      } else {
-        // Request - count ALL scripts in execution chain for THIS request
-        const request = item;
-        
-        // Inherited postRequestScripts (collection and all ancestor folders) - they STACK
-        for (const script of inheritedPostRequest) {
-          totalTests += ScriptValidator.countTests(script);
-        }
-
-        // Request-level postRequestScript (this is where tests are!)
-        if (request.postRequestScript !== null && request.postRequestScript !== undefined && request.postRequestScript.length > 0) {
-          totalTests += ScriptValidator.countTests(request.postRequestScript);
-        }
-
-        // Plugin event scripts
-        if (request.data.scripts !== null && request.data.scripts !== undefined && Array.isArray(request.data.scripts)) {
-          const protocolPlugin = this.pluginManager.getPlugin(collection.protocol);
-          if (protocolPlugin?.events !== null && protocolPlugin?.events !== undefined) {
-            for (const script of request.data.scripts) {
-              const eventDef = protocolPlugin.events.find(e => e.name === script.event);
-              if (eventDef?.canHaveTests === true) {
-                const expectedMessages = ScriptValidator.extractExpectedMessages(
-                  (request.preRequestScript !== null && request.preRequestScript !== undefined && request.preRequestScript.length > 0) ? request.preRequestScript : ''
-                );
-                
-                if (expectedMessages !== null) {
-                  const testsPerEvent = ScriptValidator.countTests(script.script);
-                  totalTests += testsPerEvent * expectedMessages;
-                } else {
-                  hasDynamicTests = true;
-                }
-              }
-            }
-          }
-        }
-      }
-    };
-
-    // Process all items with collection-level inherited scripts
-    const collectionPre = (collection.preRequestScript !== null && collection.preRequestScript !== undefined && collection.preRequestScript.length > 0) ? [collection.preRequestScript] : [];
-    const collectionPost = (collection.postRequestScript !== null && collection.postRequestScript !== undefined && collection.postRequestScript.length > 0) ? [collection.postRequestScript] : [];
-    
-    for (const item of collection.items) {
-      countRequestTests(item, collectionPre, collectionPost);
-    }
-
-    // Multiply by iteration count
-    const iterationCount = (collection.testData?.length !== null && collection.testData?.length !== undefined && collection.testData.length > 0) ? collection.testData.length : 1;
-    totalTests *= iterationCount;
-
-    const result = hasDynamicTests ? -1 : totalTests;
-    if (hasDynamicTests) {
-      this.logger.debug('Dynamic test count detected; returning -1');
-    }
-    this.logger.debug(`Expected test count resolved: ${result}`);
-    return result;
-  }
-}
+import type { Collection, CollectionItem, Request, Folder } from '@apiquest/types';
+import { ScriptValidator } from './ScriptValidator.js';
+import type { PluginManager } from './PluginManager.js';
+import { Logger } from './Logger.js';
+
+/**
+ * Counts total expected tests in a collection for deterministic test reporting
+ */
+export class TestCounter {
+  private logger: Logger;
+
+  constructor(
+    private readonly pluginManager: PluginManager,
+    baseLogger?: Logger
+  ) {
+    this.logger = baseLogger?.createLogger('TestCounter') ?? new Logger('TestCounter');
+  }
+
+  /**
+   * Count total expected tests in collection
+   * - Counts quest.test() calls in all scripts
+   * - Multiplies by iteration count
+   * - Returns -1 if collection has dynamic plugin events (can't determine count)
+   * @returns Total expected test count, or -1 if dynamic
+   */
+  countTests(collection: Collection): number {
+    let totalTests = 0;
+    let hasDynamicTests = false;
+
+    this.logger.debug(`Counting tests for collection: ${collection.info.name}`);
+
+    // Note: collectionPre/Post and folderPre/Post scripts CANNOT have tests (validation catches this)
+    // Only preRequestScript and postRequestScript can have tests
+
+    // Helper to walk tree and count tests for each REQUEST with inherited scripts
+    const countRequestTests = (item: CollectionItem, inheritedPreRequest: string[], inheritedPostRequest: string[]): void => {
+      if (item.type === 'folder') {
+        const folder = item;
+
+        // Build inherited script chain (scripts STACK, not override)
+        const newInheritedPre = (folder.preRequestScript !== null && folder.preRequestScript !== undefined && folder.preRequestScript.length > 0)
+          ? [...inheritedPreRequest, folder.preRequestScript]
+          : inheritedPreRequest;
+        const newInheritedPost = (folder.postRequestScript !== null && folder.postRequestScript !== undefined && folder.postRequestScript.length > 0)
+          ? [...inheritedPostRequest, folder.postRequestScript]
+          : inheritedPostRequest;
+
+        // Recursively process folder contents
+        for (const child of folder.items) {
+          countRequestTests(child, newInheritedPre, newInheritedPost);
+        }
+      } else {
+        // Request - count ALL scripts in execution chain for THIS request
+        const request = item;
+        
+        // Inherited postRequestScripts (collection and all ancestor folders) - they STACK
+        for (const script of inheritedPostRequest) {
+          totalTests += ScriptValidator.countTests(script);
+        }
+
+        // Request-level postRequestScript (this is where tests are!)
+        if (request.postRequestScript !== null && request.postRequestScript !== undefined && request.postRequestScript.length > 0) {
+          totalTests += ScriptValidator.countTests(request.postRequestScript);
+        }
+
+        // Plugin event scripts
+        if (request.data.scripts !== null && request.data.scripts !== undefined && Array.isArray(request.data.scripts)) {
+          const protocolPlugin = this.pluginManager.getPlugin(collection.protocol);
+          if (protocolPlugin?.events !== null && protocolPlugin?.events !== undefined) {
+            for (const script of request.data.scripts) {
+              const eventDef = protocolPlugin.events.find(e => e.name === script.event);
+              if (eventDef?.canHaveTests === true) {
+                const expectedMessages = ScriptValidator.extractExpectedMessages(
+                  (request.preRequestScript !== null && request.preRequestScript !== undefined && request.preRequestScript.length > 0) ? request.preRequestScript : ''
+                );
+                
+                if (expectedMessages !== null) {
+                  const testsPerEvent = ScriptValidator.countTests(script.script);
+                  totalTests += testsPerEvent * expectedMessages;
+                } else {
+                  hasDynamicTests = true;
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+
+    // Process all items with collection-level inherited scripts
+    const collectionPre = (collection.preRequestScript !== null && collection.preRequestScript !== undefined && collection.preRequestScript.length > 0) ? [collection.preRequestScript] : [];
+    const collectionPost = (collection.postRequestScript !== null && collection.postRequestScript !== undefined && collection.postRequestScript.length > 0) ? [collection.postRequestScript] : [];
+    
+    for (const item of collection.items) {
+      countRequestTests(item, collectionPre, collectionPost);
+    }
+
+    // Multiply by iteration count
+    const iterationCount = (collection.testData?.length !== null && collection.testData?.length !== undefined && collection.testData.length > 0) ? collection.testData.length : 1;
+    totalTests *= iterationCount;
+
+    const result = hasDynamicTests ? -1 : totalTests;
+    if (hasDynamicTests) {
+      this.logger.debug('Dynamic test count detected; returning -1');
+    }
+    this.logger.debug(`Expected test count resolved: ${result}`);
+    return result;
+  }
+}

package/src/VariableResolver.ts

@@ -1,114 +1,114 @@
-import type { ExecutionContext, IterationData } from '@apiquest/types';
-import { extractValue, isNullOrEmpty } from './utils.js';
-import { Logger } from './Logger.js';
-
-export class VariableResolver {
-  private logger: Logger;
-
-  constructor(baseLogger?: Logger) {
-    this.logger = baseLogger?.createLogger('VariableResolver') ?? new Logger('VariableResolver');
-  }
-
-  /**
-   * Resolve {{variables}} in a template string
-   * Priority: iteration data > local > collection > environment > global
-   */
-  resolve(template: string, context: ExecutionContext): string {
-    if (isNullOrEmpty(template) || typeof template !== 'string') {
-      return template;
-    }
-
-    // Find all {{variable}} patterns
-    const variableCount = (template.match(/\{\{([^}]+)\}\}/g) ?? []).length;
-    if (variableCount > 0) {
-      this.logger.trace(`Resolving ${variableCount} variable(s) in template`);
-    }
-
-    return template.replace(/\{\{([^}]+)\}\}/g, (match: string, varName: string) => {
-      const trimmedName = varName.trim();
-      const value = this.getVariable(trimmedName, context);
-      
-      if (value !== null && value !== undefined) {
-        this.logger.trace(`Resolved {{${trimmedName}}} -> ${typeof value === 'string' && value.length > 50 ? value.substring(0, 50) + '...' : value}`);
-        return String(value);
-      } else {
-        this.logger.trace(`Variable {{${trimmedName}}} not found, keeping placeholder`);
-        return match;
-      }
-    });
-  }
-
-  /**
-   * Resolve all values in an object (recursively)
-   */
-  resolveAll(obj: unknown, context: ExecutionContext): unknown {
-    if (obj === null || obj === undefined) {
-      return obj;
-    }
-
-    if (typeof obj === 'string') {
-      return this.resolve(obj, context);
-    }
-
-    if (Array.isArray(obj)) {
-      return obj.map(item => this.resolveAll(item, context));
-    }
-
-    if (typeof obj === 'object') {
-      const resolved: Record<string, unknown> = {};
-      for (const [key, value] of Object.entries(obj)) {
-        resolved[key] = this.resolveAll(value, context);
-      }
-      return resolved;
-    }
-
-    return obj;
-  }
-
-  /**
-   * Get variable value with cascading priority
-   * Priority: iteration data > scope stack (innermost to outermost) > collection > environment > global
-   */
-  private getVariable(name: string, context: ExecutionContext): unknown {
-    // 1. Iteration data (highest priority)
-    const currentIterationData = context.iterationData?.[context.iterationCurrent - 1];
-    if (currentIterationData !== null && currentIterationData !== undefined && name in currentIterationData) {
-      this.logger.trace(`Variable '${name}' found in iteration data`);
-      return currentIterationData[name];
-    }
-
-    // 2. Scope stack (hierarchical scope variables - search from innermost to outermost)
-    // This represents quest.scope.variables which flows through the script inheritance chain
-    if (context.scopeStack !== null && context.scopeStack !== undefined && context.scopeStack.length > 0) {
-      // Search from top of stack (most specific) to bottom (least specific)
-      for (let i = context.scopeStack.length - 1; i >= 0; i--) {
-        const frame = context.scopeStack[i];
-        if (name in frame.vars) {
-          this.logger.trace(`Variable '${name}' found in scope stack (frame ${context.scopeStack.length - 1 - i})`);
-          return frame.vars[name];
-        }
-      }
-    }
-
-    // 3. Collection variables
-    if (name in context.collectionVariables) {
-      this.logger.trace(`Variable '${name}' found in collection variables`);
-      return extractValue(context.collectionVariables[name]);
-    }
-
-    // 4. Environment variables
-    if (context.environment !== null && context.environment !== undefined && name in context.environment.variables) {
-      this.logger.trace(`Variable '${name}' found in environment variables`);
-      return extractValue(context.environment.variables[name]);
-    }
-
-    // 5. Global variables (lowest priority)
-    if (name in context.globalVariables) {
-      this.logger.trace(`Variable '${name}' found in global variables`);
-      return extractValue(context.globalVariables[name]);
-    }
-
-    this.logger.trace(`Variable '${name}' not found in any scope`);
-    return null;
-  }
-}
+import type { ExecutionContext, IterationData } from '@apiquest/types';
+import { extractValue, isNullOrEmpty } from './utils.js';
+import { Logger } from './Logger.js';
+
+export class VariableResolver {
+  private logger: Logger;
+
+  constructor(baseLogger?: Logger) {
+    this.logger = baseLogger?.createLogger('VariableResolver') ?? new Logger('VariableResolver');
+  }
+
+  /**
+   * Resolve {{variables}} in a template string
+   * Priority: iteration data > local > collection > environment > global
+   */
+  resolve(template: string, context: ExecutionContext): string {
+    if (isNullOrEmpty(template) || typeof template !== 'string') {
+      return template;
+    }
+
+    // Find all {{variable}} patterns
+    const variableCount = (template.match(/\{\{([^}]+)\}\}/g) ?? []).length;
+    if (variableCount > 0) {
+      this.logger.trace(`Resolving ${variableCount} variable(s) in template`);
+    }
+
+    return template.replace(/\{\{([^}]+)\}\}/g, (match: string, varName: string) => {
+      const trimmedName = varName.trim();
+      const value = this.getVariable(trimmedName, context);
+      
+      if (value !== null && value !== undefined) {
+        this.logger.trace(`Resolved {{${trimmedName}}} -> ${typeof value === 'string' && value.length > 50 ? value.substring(0, 50) + '...' : value}`);
+        return String(value);
+      } else {
+        this.logger.trace(`Variable {{${trimmedName}}} not found, keeping placeholder`);
+        return match;
+      }
+    });
+  }
+
+  /**
+   * Resolve all values in an object (recursively)
+   */
+  resolveAll(obj: unknown, context: ExecutionContext): unknown {
+    if (obj === null || obj === undefined) {
+      return obj;
+    }
+
+    if (typeof obj === 'string') {
+      return this.resolve(obj, context);
+    }
+
+    if (Array.isArray(obj)) {
+      return obj.map(item => this.resolveAll(item, context));
+    }
+
+    if (typeof obj === 'object') {
+      const resolved: Record<string, unknown> = {};
+      for (const [key, value] of Object.entries(obj)) {
+        resolved[key] = this.resolveAll(value, context);
+      }
+      return resolved;
+    }
+
+    return obj;
+  }
+
+  /**
+   * Get variable value with cascading priority
+   * Priority: iteration data > scope stack (innermost to outermost) > collection > environment > global
+   */
+  private getVariable(name: string, context: ExecutionContext): unknown {
+    // 1. Iteration data (highest priority)
+    const currentIterationData = context.iterationData?.[context.iterationCurrent - 1];
+    if (currentIterationData !== null && currentIterationData !== undefined && name in currentIterationData) {
+      this.logger.trace(`Variable '${name}' found in iteration data`);
+      return currentIterationData[name];
+    }
+
+    // 2. Scope stack (hierarchical scope variables - search from innermost to outermost)
+    // This represents quest.scope.variables which flows through the script inheritance chain
+    if (context.scopeStack !== null && context.scopeStack !== undefined && context.scopeStack.length > 0) {
+      // Search from top of stack (most specific) to bottom (least specific)
+      for (let i = context.scopeStack.length - 1; i >= 0; i--) {
+        const frame = context.scopeStack[i];
+        if (name in frame.vars) {
+          this.logger.trace(`Variable '${name}' found in scope stack (frame ${context.scopeStack.length - 1 - i})`);
+          return frame.vars[name];
+        }
+      }
+    }
+
+    // 3. Collection variables
+    if (name in context.collectionVariables) {
+      this.logger.trace(`Variable '${name}' found in collection variables`);
+      return extractValue(context.collectionVariables[name]);
+    }
+
+    // 4. Environment variables
+    if (context.environment !== null && context.environment !== undefined && name in context.environment.variables) {
+      this.logger.trace(`Variable '${name}' found in environment variables`);
+      return extractValue(context.environment.variables[name]);
+    }
+
+    // 5. Global variables (lowest priority)
+    if (name in context.globalVariables) {
+      this.logger.trace(`Variable '${name}' found in global variables`);
+      return extractValue(context.globalVariables[name]);
+    }
+
+    this.logger.trace(`Variable '${name}' not found in any scope`);
+    return null;
+  }
+}