@sun-asterisk/sungen 1.0.14 → 1.0.15

package/dist/orchestrator/project-initializer.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sun-asterisk/sungen",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "AI-Native E2E Test Generator - Generate Playwright tests from Gherkin features using AI",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/generators/cli.ts

@@ -52,7 +52,7 @@ const program = new Command();
 program
   .name('qa-generator')
   .description('AI-Native QA Selector DSL Generator')
-  .version('1.0.14');
+  .version('1.0.15');
 
 // ============================================================================
 // Command: discover

package/src/generators/gherkin-parser/index.ts

@@ -3,6 +3,7 @@ import * as Gherkin from '@cucumber/gherkin';
 import * as Messages from '@cucumber/messages';
 import fs from 'fs';
 import path from 'path';
+import { SelectorResolver } from '../test-generator/utils/selector-resolver';
 
 export interface ParsedStep {
   keyword: string; // Given, When, Then, And, But
@@ -11,6 +12,7 @@ export interface ParsedStep {
   dataRef?: string; // Extracted data reference like <valid_user.email>
   value?: string; // Static value if any
   elementType?: string; // Element type after [Selector] e.g., "button", "text", "link", "field"
+  nth?: number; // Positional index from "[Element] field 3" → 3 (0 = not specified)
   featurePath?: string; // NEW: Feature path for page type (e.g., "/", "/dashboard")
 }
 
@@ -141,6 +143,13 @@ export class GherkinParser {
       elementType = finalWordMatch ? finalWordMatch[1].toLowerCase() : undefined;
     }
 
+    // Extract positional index from "[Element] field 3", "[Element] button 2", etc.
+    let nth = 0;
+    if (selectorRef && selectorMatch) {
+      const afterElement = text.slice(selectorMatch.index + selectorMatch[0].length);
+      nth = SelectorResolver.extractNthFromStep(afterElement);
+    }
+
     return {
       keyword: step.keyword.trim(),
       text,
@@ -148,6 +157,7 @@ export class GherkinParser {
       dataRef,
       value,
       elementType,
+      nth,
     };
   }
 

package/src/generators/scaffold-generator/index.ts

@@ -95,14 +95,18 @@ export class ScaffoldGenerator {
       let match: RegExpExecArray | null;
       while ((match = elementRegex.exec(trimmedLine)) !== null) {
         const rawText = match[1];
-        const key = SelectorResolver.generateKey(rawText);
+        const baseKey = SelectorResolver.generateKey(rawText);
 
         // Extract nth index and target type from text after the element reference
         // Matches patterns like: [Email] field 1, [Submit] button 2, [Name] 3
         const afterElement = trimmedLine.slice(match.index + match[0].length);
-        const nth = this.extractNthIndex(afterElement);
+        const nth = SelectorResolver.extractNthFromStep(afterElement);
         const targetType = this.extractTargetType(afterElement, action);
 
+        // Append nth to key so elements at different positions get distinct keys
+        // e.g., [Hãy gửi lời cảm ơn] field 3 → "hay.gui.loi.cam.on--3"
+        const key = nth > 0 ? `${baseKey}--${nth}` : baseKey;
+
         // Check if element starts with "target" (semantic indicator for dynamic content)
         // e.g., [target order], [Target Item] → element should have empty value
         const isTargetElement = /^target\s/i.test(rawText);
@@ -153,12 +157,21 @@ export class ScaffoldGenerator {
     if (/^field\b/.test(lowerText) || /^\d*\s*field\b/.test(lowerText) || /^input\b/.test(lowerText)) {
       return 'field';
     }
+    if (/^textbox\b/.test(lowerText) || /^\d*\s*textbox\b/.test(lowerText)) {
+      return 'textbox';
+    }
+    if (/^textarea\b/.test(lowerText) || /^\d*\s*textarea\b/.test(lowerText)) {
+      return 'textarea';
+    }
     if (/^text\b/.test(lowerText) || /^\d*\s*text\b/.test(lowerText)) {
       return 'text';
     }
     if (/^label\b/.test(lowerText) || /^\d*\s*label\b/.test(lowerText)) {
       return 'label';
     }
+    if (/^uploader\b/.test(lowerText) || /^\d*\s*uploader\b/.test(lowerText)) {
+      return 'uploader';
+    }
     if (/^element\b/.test(lowerText) || /^\d*\s*element\b/.test(lowerText)) {
       return 'element';
     }
@@ -188,19 +201,6 @@ export class ScaffoldGenerator {
    * Extract nth index from text after element reference
    * e.g., " field 1 with" -> 1, " button 2" -> 2, " row 1" -> 1, " text" -> 0
    */
-  private extractNthIndex(text: string): number {
-    // Match patterns like "field 1", "button 2", "row 1", "text 3", or just a number
-    // The number should come right after optional keywords (field, button, text, link, row, etc.)
-    const nthRegex = /^\s*(?:field|button|text|link|input|element|item|logo|image|img|icon|raw|table|columnheader|list|listitem|row)?\s*(\d+)\b/i;
-    const match = nthRegex.exec(text);
-
-    if (match) {
-      return parseInt(match[1], 10);
-    }
-
-    return 0;
-  }
-
   /**
    * Detect the action type from a Gherkin step line
    */
@@ -337,6 +337,16 @@ export class ScaffoldGenerator {
 
     switch (element.action) {
       case 'fill':
+        // For fill action with uploader type, use label type (file input triggered by label)
+        if (targetType === 'uploader') {
+          return {
+            locator: '',
+            type: 'label',
+            value: element.rawText,
+            nth,
+          };
+        }
+
         // For fill action with label type, use label type
         if (targetType === 'label') {
           return {
@@ -346,13 +356,13 @@ export class ScaffoldGenerator {
             nth,
           };
         }
-        
-        // For fill action, use placeholder type
-        // User should update 'value' with actual placeholder text from inspection
+
+        // For fill action with field/textbox/textarea types, use role-based locator
         return {
           locator: '',
-          type: 'placeholder',
-          value: element.rawText, // TODO: Replace with actual placeholder from inspection
+          type: 'role',
+          value: this.getFillRoleValue(targetType),
+          name: element.rawText,
           nth,
         };
 
@@ -479,6 +489,19 @@ export class ScaffoldGenerator {
     }
   }
 
+  /**
+   * Get ARIA role value for fill actions — all fillable inputs use 'textbox'
+   */
+  private getFillRoleValue(targetType: string): string {
+    switch (targetType) {
+      case 'field':
+      case 'textbox':
+      case 'textarea':
+      default:
+        return 'textbox';
+    }
+  }
+
   /**
    * Generate YAML content from scaffold result
    */

package/src/generators/test-generator/adapters/playwright/templates/steps/actions/click-element-with-text.hbs

@@ -1 +1 @@
-await {{> locator}}.filter({ hasText: '{{escapeQuotes dataValue}}' }).click();
+await {{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}.click();

package/src/generators/test-generator/adapters/playwright/templates/steps/actions/upload-action.hbs

@@ -0,0 +1 @@
+await {{> locator}}.setInputFiles('specs/storage/{{fileName}}');

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/disabled-with-filter-assertion.hbs

@@ -0,0 +1 @@
+await expect({{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}).toBeDisabled();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/disabled-with-role-variable-assertion.hbs

@@ -0,0 +1 @@
+{{#if name}}await expect(page.getByRole('{{role}}', { name: '{{name}}'{{#if (shouldUseExact selectorRef)}}, exact: true{{/if}} }).filter({ hasText: '{{dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();{{else}}await expect(page.getByRole('{{role}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}}).filter({ hasText: '{{dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();{{/if}}

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/disabled-with-variable-assertion.hbs

@@ -0,0 +1 @@
+await expect(page.getByText(/.*{{variable}}/{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}})).toBeDisabled();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/hidden-with-filter-assertion.hbs

@@ -0,0 +1 @@
+await expect({{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}).toBeHidden();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/hidden-with-role-variable-assertion.hbs

@@ -0,0 +1 @@
+{{#if name}}await expect(page.getByRole('{{role}}', { name: '{{name}}'{{#if (shouldUseExact selectorRef)}}, exact: true{{/if}} }).filter({ hasText: '{{dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();{{else}}await expect(page.getByRole('{{role}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}}).filter({ hasText: '{{dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();{{/if}}

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/hidden-with-variable-assertion.hbs

@@ -0,0 +1 @@
+await expect(page.getByText(/.*{{variable}}/{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}})).toBeHidden();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/visible-with-filter-assertion.hbs

@@ -1 +1 @@
-await expect({{> locator}}.filter({ hasText: '{{escapeQuotes dataValue}}' })).toBeVisible();
+await expect({{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}).toBeVisible();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/visible-with-locator-variable-assertion.hbs

@@ -1 +1 @@
-await expect({{> locator}}.filter({ hasText: '{{dataValue}}' })).toBeVisible();
+await expect({{> locator-base}}.filter({ hasText: '{{dataValue}}' }){{> locator-nth}}).toBeVisible();

package/src/generators/test-generator/adapters/playwright/templates/steps/navigation/wait-for-element-with-text.hbs

@@ -0,0 +1 @@
+await {{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}.waitFor({ state: '{{state}}' });

package/src/generators/test-generator/adapters/playwright/templates/steps/partials/locator-base.hbs

@@ -0,0 +1,10 @@
+{{#switch strategy~}}
+  {{~#case 'testid'}}{{> locator-strategies/testid}}{{/case~}}
+  {{~#case 'role'}}{{> locator-strategies/role}}{{/case~}}
+  {{~#case 'placeholder'}}{{> locator-strategies/placeholder}}{{/case~}}
+  {{~#case 'label'}}{{> locator-strategies/label}}{{/case~}}
+  {{~#case 'text'}}{{> locator-strategies/text}}{{/case~}}
+  {{~#case 'locator'}}{{> locator-strategies/locator}}{{/case~}}
+  {{~#case 'id'}}{{> locator-strategies/id}}{{/case~}}
+  {{~#default}}{{> locator-strategies/default}}{{/default~}}
+{{~/switch}}

package/src/generators/test-generator/adapters/playwright/templates/steps/partials/locator-nth.hbs

@@ -0,0 +1 @@
+{{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}

package/src/generators/test-generator/adapters/playwright/templates/steps/partials/locator-strategies/default.hbs

@@ -0,0 +1 @@
+page.locator('{{escapeQuotes selector}}')

package/src/generators/test-generator/adapters/playwright/templates/steps/partials/locator-strategies/id.hbs

@@ -0,0 +1 @@
+page.locator('{{selector}}')

package/src/generators/test-generator/adapters/playwright/templates/steps/partials/locator-strategies/label.hbs

@@ -0,0 +1 @@
+{{pageRoot}}.getByLabel('{{escapeQuotes value}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}})

package/src/generators/test-generator/adapters/playwright/templates/steps/partials/locator-strategies/locator.hbs

@@ -0,0 +1 @@
+page.locator('{{escapeQuotes value}}')

package/src/generators/test-generator/adapters/playwright/templates/steps/partials/locator-strategies/placeholder.hbs

@@ -0,0 +1 @@
+{{pageRoot}}.getByPlaceholder('{{escapeQuotes value}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}})

package/src/generators/test-generator/adapters/playwright/templates/steps/partials/locator-strategies/role.hbs

@@ -0,0 +1 @@
+{{#if name}}{{pageRoot}}.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if (shouldUseExact selectorRef)}}, exact: true{{/if}} }){{else}}{{pageRoot}}.getByRole('{{role}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}}){{/if}}

package/src/generators/test-generator/adapters/playwright/templates/steps/partials/locator-strategies/testid.hbs

@@ -0,0 +1 @@
+{{pageRoot}}.getByTestId('{{value}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}})

package/src/generators/test-generator/adapters/playwright/templates/steps/partials/locator-strategies/text.hbs

@@ -0,0 +1 @@
+{{pageRoot}}.getByText('{{escapeQuotes value}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}})

package/src/generators/test-generator/adapters/playwright/templates/steps/partials/locator.hbs

@@ -1 +1,10 @@
-{{#if (eq strategy 'testid')}}page.getByTestId('{{value}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}}){{else if (eq strategy 'role')}}{{#if name}}page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if (shouldUseExact selectorRef)}}, exact: true{{/if}} }){{else}}page.getByRole('{{role}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}}){{/if}}{{else if (eq strategy 'placeholder')}}page.getByPlaceholder('{{escapeQuotes value}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}}){{else if (eq strategy 'label')}}page.getByLabel('{{escapeQuotes value}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}}){{else if (eq strategy 'text')}}page.getByText('{{escapeQuotes value}}'{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}}){{else if (eq strategy 'locator')}}page.locator('{{escapeQuotes value}}'){{else if (eq strategy 'id')}}page.locator('{{selector}}'){{else}}page.locator('{{escapeQuotes selector}}'){{/if}}{{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}
+{{#switch strategy~}}
+  {{~#case 'testid'}}{{> locator-strategies/testid}}{{/case~}}
+  {{~#case 'role'}}{{> locator-strategies/role}}{{/case~}}
+  {{~#case 'placeholder'}}{{> locator-strategies/placeholder}}{{/case~}}
+  {{~#case 'label'}}{{> locator-strategies/label}}{{/case~}}
+  {{~#case 'text'}}{{> locator-strategies/text}}{{/case~}}
+  {{~#case 'locator'}}{{> locator-strategies/locator}}{{/case~}}
+  {{~#case 'id'}}{{> locator-strategies/id}}{{/case~}}
+  {{~#default}}{{> locator-strategies/default}}{{/default~}}
+{{~/switch}}{{> locator-nth}}

package/src/generators/test-generator/patterns/assertion-patterns.ts

@@ -23,7 +23,8 @@ export const assertionPatterns: StepPattern[] = [
           const resolved = context.selectorResolver.resolveSelector(
             step.selectorRef,
             context.featureName,
-            step.elementType
+            step.elementType,
+            step.nth
           );
           // Use selector's value as the path for URL assertion
           path = resolved.value || path;
@@ -42,6 +43,130 @@ export const assertionPatterns: StepPattern[] = [
       };
     },
     priority: 13,  // Higher priority than general visibility
+  },
+  // Pattern: Then User see [panel] dialog with {{kudo.title}} hidden -> toBeHidden()
+  {
+    name: 'see-with-variable-hidden',
+    matcher: (step: ParsedStep) =>
+      (step.text.includes('should see') || step.text.match(/\b(see|sees)\s+\[/)) &&
+      !!step.selectorRef &&
+      !!step.dataRef &&
+      step.text.includes('with') &&
+      /\bhidden\b/.test(step.text),
+    generator: (step, context) => {
+      let resolved: any = {};
+      try {
+        resolved = context.selectorResolver.resolveSelector(
+          step.selectorRef!,
+          context.featureName,
+          step.elementType,
+          step.nth
+        );
+      } catch (error) {}
+
+      let dataValue: string;
+      try {
+        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
+      } catch (error) {
+        dataValue = `\${${step.dataRef}}`;
+      }
+
+      const escapedVariable = dataValue.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
+
+      if (resolved.strategy === 'locator') {
+        const code = context.templateEngine.renderStep('hidden-with-filter-assertion', {
+          ...resolved, dataValue, nth: resolved.nth || 0,
+        });
+        return { code, comment: `Assert ${step.selectorRef} hidden with ${step.dataRef}` };
+      }
+
+      if (resolved.strategy === 'role' && resolved.role) {
+        const code = context.templateEngine.renderStep('hidden-with-role-variable-assertion', {
+          role: resolved.role,
+          name: resolved.name && resolved.name.trim() ? resolved.name : undefined,
+          dataValue,
+          nth: resolved.nth || 0,
+        });
+        return { code, comment: `Assert ${step.selectorRef} hidden with ${step.dataRef}` };
+      }
+
+      const selectorValue = resolved.value || '';
+      if (selectorValue && selectorValue.trim()) {
+        const code = context.templateEngine.renderStep('hidden-with-filter-assertion', {
+          ...resolved, dataValue, nth: resolved.nth || 0,
+        });
+        return { code, comment: `Assert ${step.selectorRef} hidden with ${step.dataRef}` };
+      }
+
+      const code = context.templateEngine.renderStep('hidden-with-variable-assertion', {
+        variable: escapedVariable,
+        selectorRef: step.selectorRef,
+      });
+      return { code, comment: `Assert ${step.selectorRef} hidden with ${step.dataRef}` };
+    },
+    priority: 14,
+  },
+  // Pattern: Then User see [submit] button with {{label}} disabled -> toBeDisabled()
+  {
+    name: 'see-with-variable-disabled',
+    matcher: (step: ParsedStep) =>
+      (step.text.includes('should see') || step.text.match(/\b(see|sees)\s+\[/)) &&
+      !!step.selectorRef &&
+      !!step.dataRef &&
+      step.text.includes('with') &&
+      /\bdisabled\b/.test(step.text),
+    generator: (step, context) => {
+      let resolved: any = {};
+      try {
+        resolved = context.selectorResolver.resolveSelector(
+          step.selectorRef!,
+          context.featureName,
+          step.elementType,
+          step.nth
+        );
+      } catch (error) {}
+
+      let dataValue: string;
+      try {
+        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
+      } catch (error) {
+        dataValue = `\${${step.dataRef}}`;
+      }
+
+      const escapedVariable = dataValue.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
+
+      if (resolved.strategy === 'locator') {
+        const code = context.templateEngine.renderStep('disabled-with-filter-assertion', {
+          ...resolved, dataValue, nth: resolved.nth || 0,
+        });
+        return { code, comment: `Assert ${step.selectorRef} disabled with ${step.dataRef}` };
+      }
+
+      if (resolved.strategy === 'role' && resolved.role) {
+        const code = context.templateEngine.renderStep('disabled-with-role-variable-assertion', {
+          role: resolved.role,
+          name: resolved.name && resolved.name.trim() ? resolved.name : undefined,
+          dataValue,
+          nth: resolved.nth || 0,
+        });
+        return { code, comment: `Assert ${step.selectorRef} disabled with ${step.dataRef}` };
+      }
+
+      const selectorValue = resolved.value || '';
+      if (selectorValue && selectorValue.trim()) {
+        const code = context.templateEngine.renderStep('disabled-with-filter-assertion', {
+          ...resolved, dataValue, nth: resolved.nth || 0,
+        });
+        return { code, comment: `Assert ${step.selectorRef} disabled with ${step.dataRef}` };
+      }
+
+      const code = context.templateEngine.renderStep('disabled-with-variable-assertion', {
+        variable: escapedVariable,
+        selectorRef: step.selectorRef,
+      });
+      return { code, comment: `Assert ${step.selectorRef} disabled with ${step.dataRef}` };
+    },
+    priority: 14,
   },
     // NEW: Assertion with variable (handles both empty selector and static + variable)
   // Pattern: Then User see [error] message with {{fail_message}}
@@ -61,8 +186,9 @@ export const assertionPatterns: StepPattern[] = [
       try {
         resolved = context.selectorResolver.resolveSelector(
           step.selectorRef!,
-          context.featureName,  // Pass feature context from step context
-          step.elementType
+          context.featureName,
+          step.elementType,
+          step.nth
         );
       } catch (error) {
         // Selector not in YAML or context issue - will use variable-only
@@ -143,7 +269,7 @@ export const assertionPatterns: StepPattern[] = [
       !!step.dataRef &&
       step.text.includes('with'),
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
 
       // Resolve the data value
       let dataValue: string;
@@ -182,7 +308,7 @@ export const assertionPatterns: StepPattern[] = [
        step.text.match(/\b(see|sees)\s+\[/)) &&
       !!step.selectorRef,
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('visible-assertion', { ...resolved, selectorRef: step.selectorRef });
       return {
         code,
@@ -199,7 +325,7 @@ export const assertionPatterns: StepPattern[] = [
        step.text.includes('should not see')) && 
       !!step.selectorRef,
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('not-visible-assertion', { ...resolved, selectorRef: step.selectorRef });
       return {
         code,
@@ -213,7 +339,7 @@ export const assertionPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       step.text.includes('should be enabled') && !!step.selectorRef,
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('enabled-assertion', { ...resolved, selectorRef: step.selectorRef });
       return {
         code,
@@ -227,7 +353,7 @@ export const assertionPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       step.text.includes('should be disabled') && !!step.selectorRef,
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('disabled-assertion', { ...resolved, selectorRef: step.selectorRef });
       return {
         code,
@@ -241,7 +367,7 @@ export const assertionPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       step.text.includes('should contain') && !!step.selectorRef && !!(step.value || step.dataRef),
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const expectedText = step.value || `\${${step.dataRef}}`;
       const code = context.templateEngine.renderStep('contain-text-assertion', {
         ...resolved,
@@ -259,7 +385,7 @@ export const assertionPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       step.text.includes('should have text') && !!step.selectorRef && !!(step.value || step.dataRef),
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const expectedText = step.value || `\${${step.dataRef}}`;
       const code = context.templateEngine.renderStep('have-text-assertion', {
         ...resolved,
@@ -277,7 +403,7 @@ export const assertionPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       step.text.includes('should be empty') && !!step.selectorRef,
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('empty-assertion', { ...resolved, selectorRef: step.selectorRef });
       return {
         code,
@@ -291,7 +417,7 @@ export const assertionPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       step.text.includes('should be checked') && !!step.selectorRef,
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('checked-assertion', { ...resolved, selectorRef: step.selectorRef });
       return {
         code,
@@ -305,7 +431,7 @@ export const assertionPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       step.text.includes('should be unchecked') && !!step.selectorRef,
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('not-checked-assertion', { ...resolved, selectorRef: step.selectorRef });
       return {
         code,
@@ -319,7 +445,7 @@ export const assertionPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       step.text.includes('should be focused') && !!step.selectorRef,
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('focused-assertion', { ...resolved, selectorRef: step.selectorRef });
       return {
         code,
@@ -379,7 +505,7 @@ export const assertionPatterns: StepPattern[] = [
         }
       }
 
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('list-item-count-assertion', {
         ...resolved,
         expectedCount,
@@ -413,7 +539,7 @@ export const assertionPatterns: StepPattern[] = [
         }
       }
 
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('count-assertion', {
         ...resolved,
         expectedCount,

package/src/generators/test-generator/patterns/form-patterns.ts

@@ -7,12 +7,46 @@ import { StepPattern } from './types';
  * Resolvers return metadata, templates handle framework syntax
  */
 export const formPatterns: StepPattern[] = [
+  {
+    name: 'upload-file',
+    matcher: (step: ParsedStep) =>
+      (step.text.includes('fill') || step.text.includes('fills')) &&
+      step.elementType === 'uploader' &&
+      !!step.selectorRef &&
+      !!(step.dataRef || step.value),
+    generator: (step, context) => {
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
+
+      let fileName: string;
+      if (step.dataRef) {
+        try {
+          fileName = context.dataResolver.resolveData(step.dataRef, context.featureName);
+        } catch (error) {
+          fileName = `\${${step.dataRef}}`;
+        }
+      } else {
+        fileName = step.value!;
+      }
+
+      const code = context.templateEngine.renderStep('upload-action', {
+        ...resolved,
+        selectorRef: step.selectorRef,
+        fileName,
+      });
+
+      return {
+        code,
+        comment: `Upload file ${fileName} via ${step.selectorRef}`,
+      };
+    },
+    priority: 12,
+  },
   {
     name: 'fill-input',
     matcher: (step: ParsedStep) =>
       (step.text.includes('fills') || step.text.includes('fill') || step.text.includes('inputs') || step.text.includes('input')) && !!step.selectorRef && !!(step.dataRef || step.value),
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       
       // Resolve data reference to actual value
       let value: string;
@@ -46,7 +80,7 @@ export const formPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       step.text.includes('checks') && !!step.selectorRef,
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       
       const code = context.templateEngine.renderStep('check-action', { ...resolved, selectorRef: step.selectorRef });
       
@@ -62,7 +96,7 @@ export const formPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       step.text.includes('unchecks') && !!step.selectorRef,
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       
       const code = context.templateEngine.renderStep('uncheck-action', { ...resolved, selectorRef: step.selectorRef });
       
@@ -80,7 +114,7 @@ export const formPatterns: StepPattern[] = [
       !!step.selectorRef &&
       !!(step.dataRef || step.value),
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
 
       // Resolve data reference to actual value
       let value: string;
@@ -130,7 +164,7 @@ export const formPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       step.text.includes('clears') && !!step.selectorRef,
     generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType);
+      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       
       const code = context.templateEngine.renderStep('clear-action', { ...resolved, selectorRef: step.selectorRef });