k6-cucumber-steps 2.0.6 → 2.0.8-alpha.0

package/README.md

@@ -16,17 +16,57 @@ Run [k6](https://k6.io/) performance/load tests using [Cucumber](https://cucumbe
 
 ---
 
+## 📚 Step Definitions Documentation
+
+All step definitions are fully documented and available in multiple formats:
+
+### 1. TypeDoc API Documentation
+Interactive HTML documentation with search and navigation:
+
+**Online:** [View TypeDoc Documentation](https://qapaschale.github.io/k6-cucumber-steps/docs/)
+
+**Locally:**
+```bash
+# Generate documentation
+npm run docs
+
+# View in browser
+npm run docs:serve
+```
+
+### 2. Step Metadata (JSON)
+When you initialize a project, a `steps/metadata.json` file is generated containing:
+- All available step patterns
+- Function names and parameters
+- Categories (HTTP, Browser, Assertions, etc.)
+- Descriptions for each step
+
+### 3. TypeScript Type Definitions
+The `src/steps.d.ts` file provides:
+- Full TypeScript type definitions
+- JSDoc comments with examples
+- IntelliSense support in IDEs
+
+### 4. README Reference
+See the [Step Definitions Reference](#step-definitions-reference) section below for common usage examples.
+
+---
+
 ## ✨ Features
 
 - ✅ Cucumber + Gherkin for writing k6 tests
   to generate JSON and HTML reports.
 - ✅ Flexible configuration through Cucumber data tables.
 - ✅ Support for JSON body parsing and escaping
-- ✅ Dynamic request body generation using environment variables, Faker templates, and JSON file includes.
+- ✅ **Environment Variable Support**: Dynamic request body generation using `{{VARIABLE_NAME}}` placeholders
+- ✅ **Enhanced Auth Storage**: Store tokens with aliases for cross-scenario reuse
 - ✅ `.env` + `K6.env`-style variable resolution (`{{API_KEY}}`)
 - ✅ Support for headers, query params, stages
 - ✅ Supports multiple authentication types: API key, Bearer token, Basic Auth, and No Auth.
-
+- ✅ **Extended HTTP Methods**: GET, POST, PUT, PATCH with body support
+- ✅ **Response Time Assertions**: Validate API performance with millisecond/second thresholds
+- ✅ **Property Validation**: Deep nested property checks, boolean assertions, empty checks
+- ✅ **Alias System**: Store and compare response values across scenarios
 - ✅ Clean-up of temporary k6 files after execution
 - ✅ Built-in support for **distributed load testing** with stages
 - ✅ TypeScript-first 🧡
@@ -39,6 +79,87 @@ Run [k6](https://k6.io/) performance/load tests using [Cucumber](https://cucumbe
 - 🛠 **JS & TS Support**: Generate your project in pure JavaScript or TypeScript.
 - 📊 **Metric Segmentation**: Scenarios are wrapped in k6 `group()` blocks for cleaner reporting.
 
+## 🆕 What's New in v2.0.8
+
+### ⚠️ Breaking Change: Step Definition Prefix
+
+All step definitions now use the **`k6` prefix** to avoid conflicts with other step libraries and make it clear these are k6-specific steps.
+
+**Before:**
+```gherkin
+Given the base URL is "{{API_BASE_URL}}"
+When I make a GET request to "/users/1"
+```
+
+**After:**
+```gherkin
+Given the k6 base URL is "{{API_BASE_URL}}"
+When I k6 make a GET request to "/users/1"
+```
+
+### 🌍 Environment Variable Support
+
+Replace placeholders in your tests using `{{VARIABLE_NAME}}` syntax. Values are resolved from:
+- `__ENV` (k6 environment variables)
+- `K6_*` prefixed variables
+- Global context variables
+
+```gherkin
+Background:
+  Given the k6 base URL is "{{API_BASE_URL}}"
+
+Scenario: Login with environment credentials
+  When I k6 authenticate with the following url and request body as "user":
+    | endpoint | userName            | password            |
+    | /login   | {{TEST_USER_USERNAME}} | {{TEST_USER_PASSWORD}} |
+```
+
+### 🔐 Enhanced Alias System
+
+Store response data with custom aliases and reuse across scenarios:
+
+```gherkin
+Scenario: Store and reuse values
+  When I k6 make a POST request to "/login"
+  And I k6 store response "data.accessToken" as "authToken"
+  Then the k6 alias "authToken" should not be empty
+
+Scenario: Compare against stored values
+  Then the k6 response property "userName" should be alias "expectedUsername"
+  And the k6 response property "message" should contain alias "expectedMessage"
+```
+
+### 📝 New Assertion Steps
+
+| Step | Description | Example |
+|------|-------------|---------|
+| `theResponsePropertyShouldNotBeEmpty` | Validate property has a value | `Then the k6 response property "data.token" should not be empty` |
+| `theResponsePropertyShouldBeTrue/False` | Boolean assertions | `Then the k6 response property "success" should be true` |
+| `theResponsePropertyShouldHaveProperty` | Check nested properties | `Then the k6 response property "data" should have property "user"` |
+| `theResponseTimeShouldBeLessThan...` | Performance assertions | `Then the k6 response time should be less than "500" milliseconds` |
+| `theAliasShouldNotBeEmpty` | Validate stored aliases | `Then the k6 alias "authToken" should not be empty` |
+| `theAliasShouldBeEqualTo` | Compare alias to value | `Then the k6 alias "username" should be equal to "test_user"` |
+
+### 🌐 Extended HTTP Support
+
+- **PUT requests**: `When I k6 make a PUT request to "/users/1"`
+- **PUT with body**: `When I k6 make a PUT request to "/users/1" with body:`
+- **PATCH requests**: `When I k6 make a PATCH request to "/api/settings"`
+- **PATCH with body**: `When I k6 make a PATCH request to "/api/settings" with body:`
+
+### 🖨️ Debug Helpers
+
+```gherkin
+And I k6 print alias "authToken"      # Print a specific alias
+And I k6 print all aliases            # Print all stored aliases
+```
+
+### 🧹 Utility Steps
+
+```gherkin
+Given I k6 clear auth token           # Remove Authorization header
+```
+
 ## ✨ New: Hybrid Performance Testing
 
 You can now combine **Protocol-level (HTTP)** load testing and **Browser-level (Web Vitals)** testing in a single Gherkin suite.
@@ -137,6 +258,54 @@ For projects where you prefer to run single features directly.
 
 ---
 
+## 🔐 Environment Variables Support
+
+The generated project includes `dotenv-cli` for easy environment variable management.
+
+### Using .env file
+
+1. Create a `.env` file in your project root:
+```bash
+API_BASE_URL=https://api.example.com
+AUTH_BASE_URL=https://auth.example.com
+TEST_USER_USERNAME=myuser
+TEST_USER_PASSWORD=mypassword
+POST_TITLE=My Test Post
+CLIENT_ID=my-client-id
+CLIENT_SECRET=my-secret
+```
+
+2. Run tests with environment variables:
+```bash
+# Using dotenv-cli to load .env file
+npx dotenv-cli -- k6 run generated/test.generated.ts
+
+# Or add to your package.json scripts:
+"test:env": "dotenv-cli -- k6 run generated/test.generated.ts"
+```
+
+### Using K6_ prefixed variables
+
+You can also use `K6_` prefixed environment variables directly:
+```bash
+K6_API_BASE_URL=https://api.example.com k6 run generated/test.generated.ts
+```
+
+### In your feature files
+
+Use `{{VARIABLE_NAME}}` syntax to reference environment variables:
+```gherkin
+Background:
+  Given the k6 base URL is "{{API_BASE_URL}}"
+
+Scenario: Login with environment credentials
+  When I k6 authenticate with the following url and request body as "user":
+    | endpoint | userName            | password            |
+    | /login   | {{TEST_USER_USERNAME}} | {{TEST_USER_PASSWORD}} |
+```
+
+---
+
 ## 🔑 Advanced Authentication Flow
 
 We now support **Dynamic Handshake Authentication**. You can log in once in an initial scenario, store the token, and all subsequent scenarios will automatically be authenticated.
@@ -188,14 +357,23 @@ Scenario: Login and Save Session
 
 ```
 
+<a name="step-definitions-reference"></a>
 ## 🧼 Step Definitions Reference
 
 | Step Example                          | Layer   | Description                  |
 | ------------------------------------- | ------- | ---------------------------- |
-| `When I make a GET request to "/api"` | API     | Standard HTTP request.       |
-| `When I navigate to the "/home" page` | Browser | Opens URL in Chromium.       |
-| `And I click the button ".submit"`    | Browser | Interacts with DOM elements. |
-| `And I store "path" in "file.json"`   | Both    | Dynamic data persistence.    |
+| `When I k6 make a GET request to "/api"` | API     | Standard HTTP request.       |
+| `When I k6 make a POST request to "/api"` | API    | Create resource with stored body |
+| `When I k6 make a PUT request to "/api"` | API     | Update resource with stored body |
+| `When I k6 make a PATCH request to "/api"` | API   | Partial update with stored body |
+| `When I k6 navigate to the "/home" page` | Browser | Opens URL in Chromium.       |
+| `And I k6 click the button ".submit"`    | Browser | Interacts with DOM elements. |
+| `And I k6 store "path" in "file.json"`   | Both    | Dynamic data persistence.    |
+| `And I k6 store response "data.token" as "authToken"` | API | Store response with alias |
+| `Then the k6 response property "id" should be "123"` | API | Validate property value |
+| `Then the k6 response property "success" should be true` | API | Boolean assertion |
+| `Then the k6 response time should be less than "500" milliseconds` | API | Performance check |
+| `Then the k6 alias "authToken" should not be empty` | API | Validate stored alias |
 
 ---
 
@@ -216,13 +394,126 @@ Every test run now produces a rich HTML dashboard. Your scenarios are grouped na
 ### Authentication Steps
 
 ```gherkin
-When I authenticate with the following url and request body as "standard_user":
+When I k6 authenticate with the following url and request body as "standard_user":
 | endpoint | username      | password    |
     | /login   | paschal_qa    | pass123     |
-And I am authenticated as a "standard_user" # Lookups token from memory
+And I k6 am authenticated as a "standard_user" # Lookups token from memory
+```
+
+### Environment Variable Steps
+
+```gherkin
+Background:
+  Given the k6 base URL is "{{API_BASE_URL}}"  # Resolves from __ENV or .env
+
+Scenario: Use environment variables in request body
+  Given I k6 have the following post data:
+    """
+    {
+      "username": "{{TEST_USER_USERNAME}}",
+      "password": "{{TEST_USER_PASSWORD}}"
+    }
+    """
+```
+
+### Payload JSON File Steps
+
+Load request body from a JSON file with support for both environment variables and aliases.
+
+```gherkin
+Scenario: Use payload.json file with env vars and aliases
+  # First, store a token as an alias
+  When I k6 authenticate with the following url and request body as "user":
+    | endpoint | username | password |
+    | /login   | testuser | pass123  |
+  And I k6 store response "accessToken" as "authToken"
+  
+  # Load payload from file (supports {{VARIABLE_NAME}} and {{alias:NAME}})
+  Given I k6 use payload json from file "payload.json"
+  When I k6 make a POST request to "/api/users"
+  
+  # Or combine loading and request in one step
+  When I k6 make a POST request to "/api/users" with payload from "data/create-user.json"
+```
+
+**File Resolution Order:**
+1. `data/{fileName}` if exists
+2. `{fileName}` in project root if exists  
+3. `payload.json` in project root as fallback
+
+**Template Syntax:**
+- `{{VARIABLE_NAME}}` - Replaced with environment variable value
+- `{{alias:NAME}}` - Replaced with stored alias value
+
+**Example payload.json:**
+```json
+{
+  "title": "{{POST_TITLE}}",
+  "author": "{{alias:username}}",
+  "token": "{{alias:authToken}}",
+  "body": "Content with {{VARIABLE_NAME}} support"
+}
+```
+
+### Alias & Storage Steps
+
+```gherkin
+Scenario: Store and reuse values
+  When I k6 make a POST request to "/login"
+  And I k6 store response "data.accessToken" as "authToken"
+  Then the k6 alias "authToken" should not be empty
+
+  # Compare response against stored alias
+  Then the k6 response property "userName" should be alias "expectedUsername"
+
+  # Debug: print stored values
+  And I k6 print alias "authToken"
+  And I k6 print all aliases
+```
+
+### Response Assertion Steps
+
+```gherkin
+# Property validation
+Then the k6 response property "data.id" should be "123"
+Then the k6 response property "data.token" should not be empty
+Then the k6 response property "success" should be true
+Then the k6 response property "deleted" should be false
+Then the k6 response property "user" should have property "email"
+Then the k6 response property "message" should contain "success"
+
+# Performance assertions
+Then the k6 response time should be less than "500" milliseconds
+Then the k6 response time should be less than "2" seconds
+
+# Alias comparisons
+Then the k6 alias "authToken" should not be empty
+Then the k6 alias "username" should be equal to "test_user"
+Then the k6 response property "token" should be alias "expectedToken"
+```
+
+### HTTP Request Steps
+
+```gherkin
+# GET requests
+When I k6 make a GET request to "/users/1"
+When I k6 make a GET request to "/users/1" with headers:
+  | Authorization | Content-Type     |
+  | Bearer abc123 | application/json |
+
+# POST requests
+When I k6 make a POST request to "/users"
+
+# PUT requests
+When I k6 make a PUT request to "/users/1"
+When I k6 make a PUT request to "/users/1" with body:
+
+# PATCH requests
+When I k6 make a PATCH request to "/settings"
+When I k6 make a PATCH request to "/settings" with body:
 ```
 
-### sample features
+### Sample Features
 
 ```gherkin
 @smoke @vus:10 @duration:1m

package/dist/cli.js

@@ -30,6 +30,7 @@ commander_1.program
     .description("Generate k6 scripts from feature files")
     .option("-f, --features <path>", "Path to feature files", "./features")
     .option("-o, --output <path>", "Output path for generated scripts", "./generated")
+    .option("--exclude-tags <tags>", "Exclude scenarios by tags (comma-separated)")
     .option("-l, --lang <language>", "Output language (js or ts)", "ts")
     .option("--tags <tags>", "Filter scenarios by tags")
     .action(async (options) => {
@@ -38,12 +39,19 @@ commander_1.program
 async function generateK6Scripts(options) {
     console.log("Generating k6 scripts from feature files...");
     const parser = new feature_parser_1.FeatureParser();
-    const features = await parser.loadAndParseFeatures(options.features);
-    // Filter by tags if provided
+    const features = await parser.loadAndParseFeatures(options.features || "./features");
+    // Include by tags
     if (options.tags) {
-        const tagFilters = options.tags.split(",");
+        const includeTags = options.tags.split(",").map(t => t.trim()).filter(t => t);
         features.forEach((feature) => {
-            feature.scenarios = feature.scenarios.filter((scenario) => tagFilters.some((filter) => scenario.tags.includes(filter)));
+            feature.scenarios = feature.scenarios.filter((scenario) => includeTags.some(tag => scenario.tags.includes(tag)));
+        });
+    }
+    // Exclude by tags
+    if (options.excludeTags) {
+        const excludeTags = options.excludeTags.split(",").map(t => t.trim()).filter(t => t);
+        features.forEach((feature) => {
+            feature.scenarios = feature.scenarios.filter((scenario) => !excludeTags.some(tag => scenario.tags.includes(tag)));
         });
     }
     // Flatten all scenarios
@@ -52,16 +60,17 @@ async function generateK6Scripts(options) {
     const generator = new k6_script_generator_1.K6ScriptGenerator();
     const config = {
         language: options.lang,
-        featuresDir: options.features,
-        outputDir: options.output,
+        featuresDir: options.features || "./features",
+        outputDir: options.output || "./generated",
         includeHtmlReporter: true,
         author: "Enyimiri Chetachi Paschal (qaPaschalE)",
         version: packageJson.version,
     };
     const k6Script = generator.generateK6File(allScenarios, metadata, config);
+    const outputDir = options.output || "./generated";
     // Ensure output directory exists
-    if (!fs_1.default.existsSync(options.output)) {
-        fs_1.default.mkdirSync(options.output, { recursive: true });
+    if (!fs_1.default.existsSync(outputDir)) {
+        fs_1.default.mkdirSync(outputDir, { recursive: true });
     }
     const outputFile = `${options.output}/test.generated.${options.lang}`;
     fs_1.default.writeFileSync(outputFile, k6Script);

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/generators/k6-script.generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"k6-script.generator.d.ts","sourceRoot":"","sources":["../../src/generators/k6-script.generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAErE,qBAAa,iBAAiB;IAC5B,cAAc,CACZ,SAAS,EAAE,QAAQ,EAAE,EACrB,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,MAAM,EAAE,aAAa,GACpB,MAAM;IAqGT,OAAO,CAAC,eAAe;IAuBvB,OAAO,CAAC,eAAe;IA8FvB,OAAO,CAAC,eAAe;IAuBvB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,oBAAoB;CAiG7B"}
+{"version":3,"file":"k6-script.generator.d.ts","sourceRoot":"","sources":["../../src/generators/k6-script.generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACrE,qBAAa,iBAAiB;IAC5B,cAAc,CACZ,SAAS,EAAE,QAAQ,EAAE,EACrB,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,MAAM,EAAE,aAAa,GACpB,MAAM;IAiGT,OAAO,CAAC,eAAe;IA6BvB,OAAO,CAAC,eAAe;IA8FvB,OAAO,CAAC,eAAe;IAuBvB,OAAO,CAAC,iBAAiB;IAyBzB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,oBAAoB;CAuG7B"}

package/dist/generators/k6-script.generator.js

@@ -12,18 +12,16 @@ globalThis.lastResponse = globalThis.lastResponse || {};
 `;
         const imports = this.generateImports(config, metadata);
         const options = this.generateOptions(metadata);
-        const testFunction = this.generateTestFunction(scenarios, metadata);
-        // ✅ Resolve teardown based on config.language NOW (in Node.js)
+        const testFunction = this.generateTestFunction(scenarios, metadata, config);
+        // ✅ Simplified teardown: just return the tokens (no globalThis needed)
         const teardownFn = config.language === "ts"
             ? `export function teardown(tokensFromDefault: Record<string, any>) {
-  // Capture return value from default function
-  globalThis.exportedTokens = tokensFromDefault;
+  return tokensFromDefault;
 }`
             : `export function teardown(tokensFromDefault) {
-  // Capture return value from default function
-  globalThis.exportedTokens = tokensFromDefault;
+  return tokensFromDefault;
 }`;
-        // ✅ Resolve handleSummary based on config.language NOW
+        // ✅ handleSummary already uses data.teardown_data — no change needed
         const handleSummaryFn = config.language === "ts"
             ? `export function handleSummary(data: any): Record<string, any> {
   const reports: Record<string, any> = {
@@ -34,18 +32,18 @@ globalThis.lastResponse = globalThis.lastResponse || {};
 
   console.log('--- Summary File Write Audit ---');
   
-  let tokens = data.teardown_data || globalThis.exportedTokens || globalThis.savedTokens || {};
-  if (data.setup_data && !Object.keys(tokens).length) {
-    tokens = data.setup_data;
-  }
-
+  const tokens = data.teardown_data || {};
   const keys = Object.keys(tokens).filter(k => k.endsWith('.json'));
   console.log('Tokens found:', keys.length > 0 ? keys.join(', ') : 'None');
 
   for (const [path, tokenValue] of Object.entries(tokens)) {
     if (path.endsWith('.json')) {
       const fullPath = path.startsWith('./') ? path : \`./\${path}\`;
-      reports[fullPath] = JSON.stringify(typeof tokenValue === 'string' ? { access_token: tokenValue } : tokenValue, null, 2);
+      reports[fullPath] = JSON.stringify(
+        typeof tokenValue === 'string' ? { access_token: tokenValue } : tokenValue,
+        null,
+        2
+      );
       console.log(\`✅ Writing: \${fullPath}\`);
     }
   }
@@ -61,25 +59,24 @@ globalThis.lastResponse = globalThis.lastResponse || {};
 
   console.log('--- Summary File Write Audit ---');
   
-  let tokens = data.teardown_data || globalThis.exportedTokens || globalThis.savedTokens || {};
-  if (data.setup_data && !Object.keys(tokens).length) {
-    tokens = data.setup_data;
-  }
-
+  const tokens = data["root_group::teardown"] || {};
   const keys = Object.keys(tokens).filter(k => k.endsWith('.json'));
   console.log('Tokens found:', keys.length > 0 ? keys.join(', ') : 'None');
 
   for (const [path, tokenValue] of Object.entries(tokens)) {
     if (path.endsWith('.json')) {
-      const fullPath = path.startsWith('./') ? path : \`./\${path}\`;
-      reports[fullPath] = JSON.stringify(typeof tokenValue === 'string' ? { access_token: tokenValue } : tokenValue, null, 2);
-      console.log(\`✅ Writing: \${fullPath}\`);
+      // ✅ Use path directly — no ./ prefix
+      reports[path] = JSON.stringify(
+        typeof tokenValue === 'string' ? { access_token: tokenValue } : tokenValue,
+        null,
+        2
+      );
+      console.log(\`✅ Writing: \${path}\`);
     }
   }
 
   return reports;
 }`;
-        // ✅ Now embed the resolved strings into the final output
         return `
 ${header}
 ${imports}
@@ -87,7 +84,6 @@ ${imports}
 ${options}
 
 export function setup() {
-  // We must return an object here to initialize the "data" channel
   return { v: Date.now() };
 }
 
@@ -98,19 +94,28 @@ ${teardownFn}
 ${handleSummaryFn}
 `;
     }
-    generateImports(config, metadata) {
+    generateImports(config, meta) {
         const ext = config.language === "ts" ? "ts" : "js";
-        const hasBrowser = metadata.some((m) => m.tags?.includes("browser"));
+        const hasBrowser = meta.some(m => m.tags?.includes("browser")); // ← now used!
         const baseImports = [
             'import http from "k6/http";',
             'import { check, sleep, group } from "k6";',
-            'import { htmlReport } from "https://raw.githubusercontent.com/benc-uk/k6-reporter/main/dist/bundle.js";',
-            'import { textSummary } from "https://jslib.k6.io/k6-summary/0.1.0/index.js";',
         ];
+        // Add @ts-ignore for remote modules in TS mode
+        if (config.language === "ts") {
+            baseImports.push('// @ts-ignore: k6 resolves remote modules at runtime');
+            baseImports.push('import { htmlReport } from "https://raw.githubusercontent.com/benc-uk/k6-reporter/main/dist/bundle.js";');
+            baseImports.push('// @ts-ignore: k6 resolves remote modules at runtime');
+            baseImports.push('import { textSummary } from "https://jslib.k6.io/k6-summary/0.1.0/index.js";');
+        }
+        else {
+            baseImports.push('import { htmlReport } from "https://raw.githubusercontent.com/benc-uk/k6-reporter/main/dist/bundle.js";');
+            baseImports.push('import { textSummary } from "https://jslib.k6.io/k6-summary/0.1.0/index.js";');
+        }
         if (hasBrowser) {
             baseImports.push('import { browser } from "k6/browser";');
         }
-        baseImports.push(`import * as steps from "../steps/sample.steps.${ext}"; `);
+        baseImports.push(`import * as steps from "../steps/sample.steps.${ext}";`);
         return baseImports.join("\n");
     }
     generateOptions(metadata) {
@@ -233,6 +238,14 @@ ${handleSummaryFn}
             .replace(/[^a-zA-Z0-9\s]/g, " ")
             .trim();
         const words = clean.split(/\s+/).filter(w => w);
+        // Check if the step starts with "k6" or contains "k6" as a keyword
+        // If text contains "k6", move it to the front
+        const k6Index = words.findIndex(w => w.toLowerCase() === 'k6');
+        if (k6Index > 0) {
+            // Remove 'k6' from its position and put it at the front
+            const k6Word = words.splice(k6Index, 1)[0];
+            words.unshift(k6Word);
+        }
         return words.map((w, i) => i === 0 ? w.toLowerCase() : w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join("");
     }
     extractArguments(text) {
@@ -242,7 +255,7 @@ ${handleSummaryFn}
         return matches.join(", ");
     }
     // Inside K6ScriptGenerator.ts
-    generateTestFunction(scenarios, metadata) {
+    generateTestFunction(scenarios, metadata, config) {
         const hasAnyBrowser = metadata.some((m) => m.tags?.includes("browser"));
         const lines = [];
         // Open browser if any scenario uses it
@@ -252,7 +265,7 @@ ${handleSummaryFn}
             lines.push(`  page = await browser.newPage();`);
             lines.push(`  console.log('Browser page opened once for all scenarios');`);
             // Set fallback base URL only if needed
-            lines.push(`  steps.theBaseUrlIs("https://demoqa.com");`);
+            lines.push(`  steps.k6TheBaseUrlIs("https://demoqa.com");`);
             lines.push(`  console.log('Fallback baseUrl set to:', globalThis.baseUrl || 'not set');`);
             lines.push(``);
         }
@@ -271,7 +284,7 @@ ${handleSummaryFn}
                     const args = argsStr ? argsStr.split(/,\s*/).filter(Boolean) : [];
                     const needsPage = [
                         "navigate", "click", "see", "fill", "type", "press", "waitfor", "wait", "locator",
-                        "select", "title", "url", "element", "shouldsee", "shouldnotsee"
+                        "select", "title", "url", "element", "shouldsee", "shouldnotsee", "button", "find"
                     ].some(kw => name.toLowerCase().includes(kw)) &&
                         !["thebaseurlis", "thebaseurl"].some(kw => name.toLowerCase().includes(kw));
                     const params = [];
@@ -286,9 +299,12 @@ ${handleSummaryFn}
                     lines.push(`    ${callPrefix}steps.${name}(${params.join(", ")});`);
                 });
                 lines.push(`  } catch (err) {`);
-                lines.push(`    console.error('Error in ${scenario.name}:', err);`);
-                lines.push(`    console.error('Stack:', err && err.stack ? err.stack : 'No stack');`);
-                lines.push(`  }`);
+                const stackAccessCode = config.language === "ts"
+                    ? "(err as any)?.stack || 'No stack'"
+                    : "err?.stack || 'No stack'";
+                lines.push(`      console.error('Error in ${scenario.name}:', err);`);
+                lines.push(`      console.error('Stack:', ${stackAccessCode});`);
+                lines.push(`    }`);
             }
             else {
                 // Non-browser (HTTP/API) steps
@@ -325,7 +341,9 @@ ${handleSummaryFn}
         return `
 export default async function () {
 ${lines.join("\n")}
-  return globalThis.savedTokens;
+console.log('🔍 Final savedTokens:', JSON.stringify(globalThis.savedTokens));
+
+  return globalThis.savedTokens || {};
 }`;
     }
 }