@sun-asterisk/sungen 1.0.20 → 1.0.21

package/src/core/validator/selector-validator.ts

@@ -8,10 +8,11 @@ import * as path from 'path';
 import yaml from 'yaml';
 import { ValidationIssue } from './index';
 import { SelectorResolver } from '../../generators/test-generator/utils/selector-resolver';
+import { VALID_SELECTOR_TYPES, SelectorType } from '../../utils/selector-types';
 
 interface SelectorEntry {
   selector?: string;
-  type?: 'placeholder' | 'role' | 'testid' | 'label' | 'text' | 'page';
+  type?: SelectorType;
   value?: string;
   name?: string;
   nth?: number;
@@ -19,7 +20,7 @@ interface SelectorEntry {
 
 type SelectorFile = Record<string, SelectorEntry>;
 
-const VALID_TYPES = ['placeholder', 'role', 'testid', 'label', 'text', 'page'];
+const VALID_TYPES = VALID_SELECTOR_TYPES;
 
 export class SelectorValidator {
   private screenName: string;

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

@@ -8,10 +8,11 @@ import path from 'path';
 import yaml from 'yaml';
 import { glob } from 'glob';
 import { SelectorResolver } from '../test-generator/utils/selector-resolver';
+import { SelectorType } from '../../utils/selector-types';
 
 export interface ScaffoldElement {
   locator: string;
-  type: 'placeholder' | 'role' | 'text' | 'label' | 'page' | 'testid';
+  type: SelectorType;
   value: string;
   name?: string;       // For role type (accessible name), or label text
   nth: number;
@@ -176,6 +177,9 @@ export class ScaffoldGenerator {
     if (/^element\b/.test(lowerText) || /^\d*\s*element\b/.test(lowerText)) {
       return 'element';
     }
+    if (/^(column|columnheader)\b/.test(lowerText) || /^\d*\s*(column|columnheader)\b/.test(lowerText)) {
+      return 'column';
+    }
     if (/^(logo|image|img|icon)\b/.test(lowerText) || /^\d*\s*(logo|image|img|icon)\b/.test(lowerText)) {
       return 'img';
     }
@@ -395,9 +399,19 @@ export class ScaffoldGenerator {
         };
 
       case 'see':
+        // Column type: used for table column cell assertions, no DOM selector needed
+        if (targetType === 'column') {
+          return {
+            locator: '',
+            type: 'column',
+            value: element.rawText,
+            nth,
+          };
+        }
+
         // For assertions - respect targetType for role-based elements
         if (targetType === 'img' || targetType === 'button' || targetType === 'link' ||
-            targetType === 'checkbox' || targetType === 'radio' || targetType === 'heading' || targetType === 'dialog') {
+            targetType === 'checkbox' || targetType === 'radio' || targetType === 'heading' || targetType === 'dialog' || targetType === 'dropdown') {
           const seeRoleValue = this.getRoleValue(targetType);
           return {
             locator: '',
@@ -469,6 +483,8 @@ export class ScaffoldGenerator {
         return 'heading';
       case 'dialog':
         return 'dialog';
+      case 'dropdown':
+        return 'button';
       default:
         return 'button'; // Default to button
     }
@@ -643,6 +659,11 @@ export class ScaffoldGenerator {
       const enriched: ScaffoldResult = { ...scaffold };
 
       for (const [key, scaffoldElement] of Object.entries(enriched)) {
+        // Column-type elements use header text matching, skip live-scan enrichment
+        if (scaffoldElement.type === 'column') continue;
+        // Target elements (empty value) are matched by data value at runtime, skip enrichment
+        if (!scaffoldElement.value && !scaffoldElement.name) continue;
+
         // Try exact key first, then base key without --N suffix or --type suffix
         let liveElement = elements[key];
         if (!liveElement && key.includes('--')) {

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

@@ -0,0 +1,2 @@
+await {{> locator}}.click();
+await page.getByText('{{selectValue}}', { exact: true }).first().click();

package/src/generators/test-generator/adapters/playwright/templates/steps/actions/wait-for-role-with-data.hbs

@@ -0,0 +1 @@
+await page.getByRole('{{role}}').filter({ hasText: '{{escapeQuotes dataValue}}' }).waitFor({ state: '{{state}}' });

package/src/generators/test-generator/adapters/playwright/templates/steps/actions/wait-for-role.hbs

@@ -0,0 +1 @@
+await page.getByRole('{{role}}').waitFor({ state: '{{state}}' });

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/checked-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeChecked();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeChecked();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/column-cell-assertion.hbs

@@ -0,0 +1,3 @@
+await page.waitForLoadState('networkidle');
+const {{columnIndexVar}} = (await page.getByRole('columnheader').allTextContents()).findIndex(h => h.includes('{{columnName}}'));
+await expect(page.getByRole('row').nth({{rowNth}}).getByRole('cell').nth({{columnIndexVar}})).toHaveText('{{dataValue}}');

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/contain-text-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toContainText('{{expectedText}}');
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toContainText('{{expectedText}}');

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/count-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toHaveCount({{expectedCount}});
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toHaveCount({{expectedCount}});

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

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeDisabled();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeDisabled();

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

@@ -1 +1,2 @@
-await expect({{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}).toBeDisabled();
+await page.waitForLoadState('networkidle');
+await expect({{> locator-base}}.filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{> locator-nth}}).toBeDisabled();

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

@@ -1,5 +1,6 @@
+await page.waitForLoadState('networkidle');
 {{#if name}}
-await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();
+await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();
 {{else}}
-await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();
-{{/if}}
+await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: /^{{escapeRegex 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

@@ -1 +1,2 @@
-await expect(page.getByText('{{escapeQuotes selectorRef}}').filter({ hasText: {{#if (eq selectorValue "")}}/.*{{escapeRegex dataValue}}$/{{else}}'{{escapeQuotes dataValue}}'{{/if}} }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();
+await page.waitForLoadState('networkidle');
+await expect(page.getByText('{{escapeQuotes selectorRef}}').filter({ hasText: {{#if (eq selectorValue "")}}/.*{{escapeRegex dataValue}}$/{{else}}'{{escapeQuotes dataValue}}'{{/if}} }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/empty-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeEmpty();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeEmpty();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/enabled-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeEnabled();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeEnabled();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/focused-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeFocused();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeFocused();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/have-text-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toHaveText('{{expectedText}}');
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toHaveText('{{expectedText}}');

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

@@ -0,0 +1,2 @@
+await page.waitForLoadState('networkidle');
+await expect(page.getByRole('dialog').getByRole('heading', { name: '{{escapeQuotes dataValue}}' })).toBeHidden();

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

@@ -1 +1,2 @@
-await expect({{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}).toBeHidden();
+await page.waitForLoadState('networkidle');
+await expect({{> locator-base}}.filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{> locator-nth}}).toBeHidden();

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

@@ -1,5 +1,6 @@
+await page.waitForLoadState('networkidle');
 {{#if name}}
-await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();
+await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();
 {{else}}
-await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();
-{{/if}}
+await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: /^{{escapeRegex 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

@@ -1 +1,2 @@
-await expect(page.getByText('{{escapeQuotes selectorRef}}').filter({ hasText: {{#if (eq selectorValue "")}}/.*{{escapeRegex dataValue}}$/{{else}}'{{escapeQuotes dataValue}}'{{/if}} }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();
+await page.waitForLoadState('networkidle');
+await expect(page.getByText('{{escapeQuotes selectorRef}}').filter({ hasText: {{#if (eq selectorValue "")}}/.*{{escapeRegex dataValue}}$/{{else}}'{{escapeQuotes dataValue}}'{{/if}} }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();

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

@@ -1 +1,2 @@
+await page.waitForLoadState('networkidle');
 await expect({{> locator}}).toBeHidden();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/list-item-count-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}.getByRole('listitem')).toHaveCount({{expectedCount}});
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}.getByRole('listitem')).toHaveCount({{expectedCount}});

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/not-checked-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeChecked({ checked: false });
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeChecked({ checked: false });

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/page-assertion.hbs

@@ -1 +1,2 @@
+await page.waitForLoadState('networkidle');
 await expect(page).toHaveURL(/{{pathRegex}}/);

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

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeVisible();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeVisible();

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

@@ -0,0 +1,2 @@
+await page.waitForLoadState('networkidle');
+await expect(page.getByRole('dialog').getByRole('heading', { name: '{{escapeQuotes dataValue}}' })).toBeVisible();

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

@@ -1 +1,2 @@
-await expect({{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}).toBeVisible();
+await page.waitForLoadState('networkidle');
+await expect({{> locator-base}}.filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{> locator-nth}}).toBeVisible();

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

@@ -1,9 +1,10 @@
+await page.waitForLoadState('networkidle');
 {{#if name}}
 {{#if dataValue}}
-await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();
+await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();
 {{else}}
 await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();
 {{/if}}
 {{else}}
-await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();
-{{/if}}
+await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();
+{{/if}}

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

@@ -1 +1,2 @@
-await expect(page.getByText('{{escapeQuotes value}}').filter({ hasText: '{{escapeQuotes dataValue}}' })).toBeVisible();
+await page.waitForLoadState('networkidle');
+await expect(page.getByText('{{escapeQuotes value}}').filter({ hasText: /^{{escapeRegex dataValue}}$/ })).toBeVisible();

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

@@ -1 +1,2 @@
+await page.waitForLoadState('networkidle');
 await expect(page.getByText('{{escapeQuotes selectorValue}}').filter({ hasText: /.*{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();

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

@@ -1 +1 @@
-await page.goto('{{#if baseURL}}{{baseURL}}{{/if}}{{path}}');
+await page.goto('{{#if baseURL}}{{baseURL}}{{/if}}{{path}}', { waitUntil: 'networkidle' });

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

@@ -1 +1 @@
-await {{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}.waitFor({ state: '{{state}}' });
+await {{> locator-base}}.filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{> locator-nth}}.waitFor({ state: '{{state}}' });

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

@@ -1,11 +1,45 @@
 import { ParsedStep } from '../../gherkin-parser';
-import { StepPattern } from './types';
+import { StepPattern, StepTemplateData } from './types';
 
 /**
  * Assertion patterns: visibility, text content, state, attributes
  * Uses template engine for framework-agnostic code generation
  */
 export const assertionPatterns: StepPattern[] = [
+  // Column cell assertion: "see [Department] column 1 with {{value}}" -> check table cell text
+  {
+    name: 'column-cell-assertion',
+    matcher: (step: ParsedStep) =>
+      (step.text.includes('should see') || step.text.match(/\b(see|sees)\s+\[/)) &&
+      !!step.selectorRef &&
+      !!step.dataRef &&
+      (step.elementType === 'column' || step.elementType === 'columnheader'),
+    resolver: (step, context): StepTemplateData => {
+      let dataValue: string;
+      try {
+        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
+      } catch (error) {
+        dataValue = `\${${step.dataRef}}`;
+      }
+
+      // getByRole('row') includes header row as nth(0), so Gherkin nth=1 maps to locator nth(1)
+      const rowNth = step.nth || 1;
+      // Create a safe variable name from column name
+      const columnIndexVar = `colIndex${step.selectorRef!.replace(/[^a-zA-Z0-9]/g, '')}`;
+
+      return {
+        templateName: 'column-cell-assertion',
+        data: {
+          columnName: step.selectorRef,
+          rowNth,
+          columnIndexVar,
+          dataValue,
+        },
+        comment: `Assert ${step.selectorRef} column row ${step.nth || 1} has text ${step.dataRef}`,
+      };
+    },
+    priority: 15,  // Higher than all other assertion patterns
+  },
   // Page assertion pattern: "see [home] page" -> check URL matches selector value
   {
     name: 'page-assertion',
@@ -14,9 +48,9 @@ export const assertionPatterns: StepPattern[] = [
        step.text.includes('see') ||
        step.text.includes('sees')) &&
       step.elementType === 'page',
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       let path = step.featurePath || '/';
-      
+
       // If selector is present, extract path from selector's value attribute
       if (step.selectorRef) {
         try {
@@ -33,12 +67,12 @@ export const assertionPatterns: StepPattern[] = [
           path = step.featurePath || '/';
         }
       }
-      
+
       // Convert path to regex-safe string
       const pathRegex = path.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
-      const code = context.templateEngine.renderStep('page-assertion', { pathRegex });
       return {
-        code,
+        templateName: 'page-assertion',
+        data: { pathRegex },
         comment: step.selectorRef ? `Assert on ${step.selectorRef} page` : `Assert on page`,
       };
     },
@@ -81,6 +115,14 @@ export const assertionPatterns: StepPattern[] = [
       }
 
       if (resolved.strategy === 'role' && resolved.role) {
+        // Dialog role: check heading inside dialog instead of filter on full text content
+        if (resolved.role === 'dialog') {
+          const code = context.templateEngine.renderStep('hidden-dialog-heading-assertion', {
+            dataValue,
+          });
+          return { code, comment: `Assert ${step.selectorRef} dialog hidden with heading ${step.dataRef}` };
+        }
+
         const code = context.templateEngine.renderStep('hidden-with-role-variable-assertion', {
           role: resolved.role,
           name: resolved.name && resolved.name.trim() ? resolved.name : undefined,
@@ -223,6 +265,17 @@ export const assertionPatterns: StepPattern[] = [
 
       // Check if it's a role-based selector with data
       if (resolved.strategy === 'role' && resolved.role) {
+        // Dialog role: check heading inside dialog instead of filter on full text content
+        if (resolved.role === 'dialog') {
+          const code = context.templateEngine.renderStep('visible-dialog-heading-assertion', {
+            dataValue,
+          });
+          return {
+            code,
+            comment: `Assert ${step.selectorRef} dialog with heading ${step.dataRef}`,
+          };
+        }
+
         const hasName = resolved.name && resolved.name.trim();
         // For img role: images have no text content, so put dataValue in name instead of filter
         const isImgRole = resolved.role === 'img';
@@ -278,11 +331,11 @@ export const assertionPatterns: StepPattern[] = [
        step.text.includes('should see') ||
        step.text.match(/\b(see|sees)\s+\[/)) &&
       !!step.selectorRef,
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       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,
+        templateName: 'visible-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef },
         comment: `Assert ${step.selectorRef} is visible`,
       };
     },
@@ -294,11 +347,11 @@ export const assertionPatterns: StepPattern[] = [
     matcher: (step: ParsedStep) =>
       /\b(see|sees)\s+\[/.test(step.text) && /\bis hidden\b/.test(step.text) &&
       !step.dataRef && !!step.selectorRef,
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
-      const code = context.templateEngine.renderStep('is-hidden-assertion', { ...resolved, selectorRef: step.selectorRef });
       return {
-        code,
+        templateName: 'is-hidden-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef },
         comment: `Assert ${step.selectorRef} is not visible`,
       };
     },
@@ -308,11 +361,11 @@ export const assertionPatterns: StepPattern[] = [
     name: 'should-be-enabled',
     matcher: (step: ParsedStep) =>
       /\b(see|sees)\s+\[/.test(step.text) && /\bis enabled\b/.test(step.text) && !!step.selectorRef,
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       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,
+        templateName: 'enabled-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef },
         comment: `Assert ${step.selectorRef} is enabled`,
       };
     },
@@ -322,11 +375,11 @@ export const assertionPatterns: StepPattern[] = [
     name: 'should-be-disabled',
     matcher: (step: ParsedStep) =>
       /\b(see|sees)\s+\[/.test(step.text) && /\bis disabled\b/.test(step.text) && !!step.selectorRef,
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       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,
+        templateName: 'disabled-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef },
         comment: `Assert ${step.selectorRef} is disabled`,
       };
     },
@@ -336,15 +389,12 @@ export const assertionPatterns: StepPattern[] = [
     name: 'should-contain-text',
     matcher: (step: ParsedStep) =>
       step.text.includes('should contain') && !!step.selectorRef && !!(step.value || step.dataRef),
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       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,
-        expectedText,
-      });
       return {
-        code,
+        templateName: 'contain-text-assertion',
+        data: { ...resolved, expectedText },
         comment: `Assert ${step.selectorRef} contains "${step.value || step.dataRef}"`,
       };
     },
@@ -354,15 +404,12 @@ export const assertionPatterns: StepPattern[] = [
     name: 'should-have-text',
     matcher: (step: ParsedStep) =>
       step.text.includes('should have text') && !!step.selectorRef && !!(step.value || step.dataRef),
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       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,
-        expectedText,
-      });
       return {
-        code,
+        templateName: 'have-text-assertion',
+        data: { ...resolved, expectedText },
         comment: `Assert ${step.selectorRef} has text "${step.value || step.dataRef}"`,
       };
     },
@@ -372,11 +419,11 @@ export const assertionPatterns: StepPattern[] = [
     name: 'is-empty',
     matcher: (step: ParsedStep) =>
       /\b(see|sees)\s+\[/.test(step.text) && /\bis empty\b/.test(step.text) && !!step.selectorRef,
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       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,
+        templateName: 'empty-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef },
         comment: `Assert ${step.selectorRef} is empty`,
       };
     },
@@ -386,11 +433,11 @@ export const assertionPatterns: StepPattern[] = [
     name: 'is-checked',
     matcher: (step: ParsedStep) =>
       /\b(see|sees)\s+\[/.test(step.text) && /\bis checked\b/.test(step.text) && !!step.selectorRef,
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       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,
+        templateName: 'checked-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef },
         comment: `Assert ${step.selectorRef} is checked`,
       };
     },
@@ -400,11 +447,11 @@ export const assertionPatterns: StepPattern[] = [
     name: 'is-unchecked',
     matcher: (step: ParsedStep) =>
       /\b(see|sees)\s+\[/.test(step.text) && /\bis unchecked\b/.test(step.text) && !!step.selectorRef,
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       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,
+        templateName: 'not-checked-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef },
         comment: `Assert ${step.selectorRef} is unchecked`,
       };
     },
@@ -414,11 +461,11 @@ export const assertionPatterns: StepPattern[] = [
     name: 'is-focused',
     matcher: (step: ParsedStep) =>
       /\b(see|sees)\s+\[/.test(step.text) && /\bis focused\b/.test(step.text) && !!step.selectorRef,
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       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,
+        templateName: 'focused-assertion',
+        data: { ...resolved, selectorRef: step.selectorRef },
         comment: `Assert ${step.selectorRef} is focused`,
       };
     },
@@ -431,7 +478,7 @@ export const assertionPatterns: StepPattern[] = [
        step.text.match(/\b(see|sees)\b/)) &&
       !step.selectorRef &&
       !!step.dataRef,
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       // Resolve data reference to actual value
       let dataValue: string;
       try {
@@ -440,14 +487,13 @@ export const assertionPatterns: StepPattern[] = [
         dataValue = `\${${step.dataRef}}`;
       }
 
-      const code = context.templateEngine.renderStep('visible-assertion', {
-        strategy: 'text',
-        value: dataValue,
-        nth: 0,
-      });
-
       return {
-        code,
+        templateName: 'visible-assertion',
+        data: {
+          strategy: 'text',
+          value: dataValue,
+          nth: 0,
+        },
         comment: `Assert ${step.dataRef} is visible`,
       };
     },
@@ -459,7 +505,7 @@ export const assertionPatterns: StepPattern[] = [
       step.text.includes('should have') && step.text.includes('count') &&
       !!step.selectorRef && step.text.includes('items') &&
       (step.elementType === 'list' || step.elementType === 'list-item' || step.elementType === 'listitem'),
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       let expectedCount: number | string = 1;
 
       const match = step.text.match(/count\s+(\d+)/);
@@ -476,12 +522,9 @@ export const assertionPatterns: StepPattern[] = [
       }
 
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
-      const code = context.templateEngine.renderStep('list-item-count-assertion', {
-        ...resolved,
-        expectedCount,
-      });
       return {
-        code,
+        templateName: 'list-item-count-assertion',
+        data: { ...resolved, expectedCount },
         comment: `Assert ${step.selectorRef} list has ${expectedCount} items`,
       };
     },
@@ -491,7 +534,7 @@ export const assertionPatterns: StepPattern[] = [
     name: 'should-have-count',
     matcher: (step: ParsedStep) =>
       step.text.includes('should have') && step.text.includes('count') && !!step.selectorRef,
-    generator: (step, context) => {
+    resolver: (step, context): StepTemplateData => {
       let expectedCount: number | string = 1;
 
       // Try literal digit first: "count 10"
@@ -510,12 +553,9 @@ export const assertionPatterns: StepPattern[] = [
       }
 
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
-      const code = context.templateEngine.renderStep('count-assertion', {
-        ...resolved,
-        expectedCount,
-      });
       return {
-        code,
+        templateName: 'count-assertion',
+        data: { ...resolved, expectedCount },
         comment: `Assert ${step.selectorRef} has count ${expectedCount}`,
       };
     },