@sun-asterisk/sungen 1.0.15 → 1.0.16

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

@@ -52,7 +52,7 @@ export const assertionPatterns: StepPattern[] = [
       !!step.selectorRef &&
       !!step.dataRef &&
       step.text.includes('with') &&
-      /\bhidden\b/.test(step.text),
+      /\bis hidden\b/.test(step.text),
     generator: (step, context) => {
       let resolved: any = {};
       try {
@@ -99,8 +99,10 @@ export const assertionPatterns: StepPattern[] = [
       }
 
       const code = context.templateEngine.renderStep('hidden-with-variable-assertion', {
-        variable: escapedVariable,
         selectorRef: step.selectorRef,
+        selectorValue: resolved.value || '',
+        dataValue,
+        nth: resolved.nth || 0,
       });
       return { code, comment: `Assert ${step.selectorRef} hidden with ${step.dataRef}` };
     },
@@ -114,7 +116,7 @@ export const assertionPatterns: StepPattern[] = [
       !!step.selectorRef &&
       !!step.dataRef &&
       step.text.includes('with') &&
-      /\bdisabled\b/.test(step.text),
+      /\bis disabled\b/.test(step.text),
     generator: (step, context) => {
       let resolved: any = {};
       try {
@@ -161,8 +163,10 @@ export const assertionPatterns: StepPattern[] = [
       }
 
       const code = context.templateEngine.renderStep('disabled-with-variable-assertion', {
-        variable: escapedVariable,
         selectorRef: step.selectorRef,
+        selectorValue: resolved.value || '',
+        dataValue,
+        nth: resolved.nth || 0,
       });
       return { code, comment: `Assert ${step.selectorRef} disabled with ${step.dataRef}` };
     },
@@ -250,7 +254,10 @@ export const assertionPatterns: StepPattern[] = [
       } else {
         // Empty selector - use variable only
         const code = context.templateEngine.renderStep('visible-with-variable-assertion', {
-          variable: escapedVariable
+          selectorRef: step.selectorRef,
+          selectorValue: resolved.value || '',
+          dataValue,
+          nth: resolved.nth || 0,
         });
         return {
           code,
@@ -258,46 +265,7 @@ export const assertionPatterns: StepPattern[] = [
         };
       }
     },
-    priority: 13,  // HIGHEST priority - match before should-be-visible-with-value
-  },
-  {
-    name: 'should-be-visible-with-value',
-    matcher: (step: ParsedStep) =>
-      (step.text.includes('should see') ||
-       step.text.match(/\b(see|sees)\s+\[/)) &&
-      !!step.selectorRef &&
-      !!step.dataRef &&
-      step.text.includes('with'),
-    generator: (step, context) => {
-      const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
-
-      // Resolve the data value
-      let dataValue: string;
-      try {
-        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-      } catch (error) {
-        dataValue = `\${${step.dataRef}}`;
-      }
-
-      // Container types (row, list-item/listitem) use .filter({ hasText }) instead of regex
-      const filterTypes = ['row', 'listitem', 'list-item'];
-      const normalizedType = step.elementType || '';
-      const useFilter = filterTypes.includes(normalizedType) || filterTypes.includes(resolved.role || '');
-
-      // When using .filter({ hasText }), name is redundant — data value identifies the element
-      const templateData = useFilter
-        ? { ...(() => { const { name: _n, ...rest } = resolved; return rest; })(), dataValue, dataRef: step.dataRef }
-        : { ...resolved, dataValue, dataRef: step.dataRef };
-
-      const templateName = useFilter ? 'visible-with-filter-assertion' : 'visible-with-value-assertion';
-      const code = context.templateEngine.renderStep(templateName, templateData);
-
-      return {
-        code,
-        comment: `Assert ${step.selectorRef} with value ${step.dataRef}`,
-      };
-    },
-    priority: 11, // Lower than see-with-variable (13) so variable-only pattern matches first
+    priority: 13,
   },
   {
     name: 'should-be-visible',
@@ -318,15 +286,14 @@ export const assertionPatterns: StepPattern[] = [
     priority: 10,
   },
   {
-    name: 'should-not-be-visible',
+    name: 'is-hidden',
+    // "see [target] is hidden" — no variable version; with-variable handled by see-with-variable-hidden
     matcher: (step: ParsedStep) =>
-      (step.text.includes('should not be visible') || 
-       step.text.includes('should be hidden') ||
-       step.text.includes('should not see')) && 
-      !!step.selectorRef,
+      /\b(see|sees)\s+\[/.test(step.text) && /\bis hidden\b/.test(step.text) &&
+      !step.dataRef && !!step.selectorRef,
     generator: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
-      const code = context.templateEngine.renderStep('not-visible-assertion', { ...resolved, selectorRef: step.selectorRef });
+      const code = context.templateEngine.renderStep('is-hidden-assertion', { ...resolved, selectorRef: step.selectorRef });
       return {
         code,
         comment: `Assert ${step.selectorRef} is not visible`,
@@ -337,7 +304,7 @@ export const assertionPatterns: StepPattern[] = [
   {
     name: 'should-be-enabled',
     matcher: (step: ParsedStep) =>
-      step.text.includes('should be enabled') && !!step.selectorRef,
+      /\b(see|sees)\s+\[/.test(step.text) && /\bis enabled\b/.test(step.text) && !!step.selectorRef,
     generator: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('enabled-assertion', { ...resolved, selectorRef: step.selectorRef });
@@ -346,12 +313,12 @@ export const assertionPatterns: StepPattern[] = [
         comment: `Assert ${step.selectorRef} is enabled`,
       };
     },
-    priority: 9,
+    priority: 11,
   },
   {
     name: 'should-be-disabled',
     matcher: (step: ParsedStep) =>
-      step.text.includes('should be disabled') && !!step.selectorRef,
+      /\b(see|sees)\s+\[/.test(step.text) && /\bis disabled\b/.test(step.text) && !!step.selectorRef,
     generator: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('disabled-assertion', { ...resolved, selectorRef: step.selectorRef });
@@ -360,7 +327,7 @@ export const assertionPatterns: StepPattern[] = [
         comment: `Assert ${step.selectorRef} is disabled`,
       };
     },
-    priority: 9,
+    priority: 11,
   },
   {
     name: 'should-contain-text',
@@ -399,9 +366,9 @@ export const assertionPatterns: StepPattern[] = [
     priority: 10,
   },
   {
-    name: 'should-be-empty',
+    name: 'is-empty',
     matcher: (step: ParsedStep) =>
-      step.text.includes('should be empty') && !!step.selectorRef,
+      /\b(see|sees)\s+\[/.test(step.text) && /\bis empty\b/.test(step.text) && !!step.selectorRef,
     generator: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('empty-assertion', { ...resolved, selectorRef: step.selectorRef });
@@ -410,12 +377,12 @@ export const assertionPatterns: StepPattern[] = [
         comment: `Assert ${step.selectorRef} is empty`,
       };
     },
-    priority: 8,
+    priority: 11,
   },
   {
-    name: 'should-be-checked',
+    name: 'is-checked',
     matcher: (step: ParsedStep) =>
-      step.text.includes('should be checked') && !!step.selectorRef,
+      /\b(see|sees)\s+\[/.test(step.text) && /\bis checked\b/.test(step.text) && !!step.selectorRef,
     generator: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('checked-assertion', { ...resolved, selectorRef: step.selectorRef });
@@ -424,12 +391,12 @@ export const assertionPatterns: StepPattern[] = [
         comment: `Assert ${step.selectorRef} is checked`,
       };
     },
-    priority: 8,
+    priority: 11,
   },
   {
-    name: 'should-be-unchecked',
+    name: 'is-unchecked',
     matcher: (step: ParsedStep) =>
-      step.text.includes('should be unchecked') && !!step.selectorRef,
+      /\b(see|sees)\s+\[/.test(step.text) && /\bis unchecked\b/.test(step.text) && !!step.selectorRef,
     generator: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('not-checked-assertion', { ...resolved, selectorRef: step.selectorRef });
@@ -438,12 +405,12 @@ export const assertionPatterns: StepPattern[] = [
         comment: `Assert ${step.selectorRef} is unchecked`,
       };
     },
-    priority: 8,
+    priority: 11,
   },
   {
-    name: 'should-be-focused',
+    name: 'is-focused',
     matcher: (step: ParsedStep) =>
-      step.text.includes('should be focused') && !!step.selectorRef,
+      /\b(see|sees)\s+\[/.test(step.text) && /\bis focused\b/.test(step.text) && !!step.selectorRef,
     generator: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       const code = context.templateEngine.renderStep('focused-assertion', { ...resolved, selectorRef: step.selectorRef });
@@ -452,7 +419,7 @@ export const assertionPatterns: StepPattern[] = [
         comment: `Assert ${step.selectorRef} is focused`,
       };
     },
-    priority: 7,
+    priority: 11,
   },
   {
     name: 'see-data-text',

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

@@ -32,11 +32,11 @@ function elementKeywordToRole(text: string): string | null {
  * Uses template engine for framework-agnostic code generation
  */
 export const interactionPatterns: StepPattern[] = [
-  // NEW: Target element with variable pattern
+  // Unknown element with variable pattern (selector value is empty, identified by filter)
   // Matches: "When User click [target order] row with {{order_name}}"
-  // Generates: await page.getByText(/value of target.order.*value of order_name/).click();
+  // Generates: await page.getByText('').filter({ hasText: /.*value of order_name$/ }).click();
   {
-    name: 'target-element-action',
+    name: 'unknown-element-action',
     matcher: (step: ParsedStep) => {
       // Check if selectorRef starts with "target " (target element indicator)
       const isTargetElement = step.selectorRef && /^target\s/i.test(step.selectorRef);
@@ -71,8 +71,6 @@ export const interactionPatterns: StepPattern[] = [
         dataValue = `\${${step.dataRef}}`;
       }
 
-      const escapedVariable = dataValue.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
-
       // Determine the action method (click, hover, etc.)
       let actionMethod = 'click';
       if (step.text.includes('hover')) {
@@ -81,13 +79,9 @@ export const interactionPatterns: StepPattern[] = [
         actionMethod = 'dblclick';
       }
 
-      // Build regex pattern: combine selector value + variable
-      const regexPattern = selectorValue && selectorValue.trim()
-        ? `${selectorValue.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&')}.*${escapedVariable}`
-        : `.*${escapedVariable}`;
-
-      const code = context.templateEngine.renderStep('target-element-action', {
-        pattern: regexPattern,
+      const code = context.templateEngine.renderStep('unknown-element-action', {
+        selectorValue,
+        dataValue,
         action: actionMethod,
         nth,
       });
@@ -156,7 +150,8 @@ export const interactionPatterns: StepPattern[] = [
   {
     name: 'double-click',
     matcher: (step: ParsedStep) =>
-      step.text.includes('double') && step.text.includes('clicks') && !!step.selectorRef,
+      (step.text.includes('double click') || step.text.includes('double-click') ||
+       (step.text.includes('double') && step.text.includes('clicks'))) && !!step.selectorRef,
     generator: (step, context) => {
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
       

package/src/generators/test-generator/template-engine.ts

@@ -22,11 +22,13 @@ export class TemplateEngine {
     });
 
     Handlebars.registerHelper('escapeQuotes', function(text: string) {
-      return text.replace(/'/g, "\\'");
+      if (text == null) return '';
+      return String(text).replace(/'/g, "\\'");
     });
 
     Handlebars.registerHelper('escapeRegex', function(text: string) {
-      return text.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
+      if (text == null) return '';
+      return String(text).replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
     });
 
     // Comparison helpers for conditional logic

package/src/generators/test-generator/utils/selector-resolver.ts

@@ -283,7 +283,7 @@ export class SelectorResolver {
    * NOTE: textbox/textarea must precede "text" to prevent partial matching.
    */
   static extractNthFromStep(afterElement: string): number {
-    const nthRegex = /^\s*(?:field|button|textbox|textarea|text|link|input|element|item|logo|image|img|icon|raw|table|columnheader|list|listitem|row|checkbox|radio|dropdown|select|uploader)?\s*(\d+)\b/i;
+    const nthRegex = /^\s*(?:field|button|textbox|textarea|text|link|input|element|item|logo|image|img|icon|raw|table|columnheader|list|listitem|row|checkbox|radio|dropdown|select|uploader|heading|header)?\s*(\d+)\b/i;
     const match = nthRegex.exec(afterElement);
     return match ? parseInt(match[1], 10) : 0;
   }
@@ -348,6 +348,7 @@ export class SelectorResolver {
       'row': () => ({ strategy: 'role', role: 'row', name: label, value: 'row', nth: 0 }),
       'table': () => ({ strategy: 'role', role: 'table', name: label, value: 'table', nth: 0 }),
       'columnheader': () => ({ strategy: 'role', role: 'columnheader', name: label, value: 'columnheader', nth: 0 }),
+      'heading': () => ({ strategy: 'role', role: 'heading', name: label, value: 'heading', nth: 0 }),
       'list': () => ({ strategy: 'role', role: 'list', name: label, value: 'list', nth: 0 }),
       'listitem': () => ({ strategy: 'role', role: 'listitem', value: 'listitem', nth: 0 }),
     };
@@ -366,9 +367,10 @@ export class SelectorResolver {
       // Text-like aliases → "text"
       'title': 'text',
       'label': 'text',
-      'heading': 'text',
-      'header': 'text',
       'caption': 'text',
+      // Heading aliases → "heading" (role-based)
+      'heading': 'heading',
+      'header': 'heading',
       'message': 'text',
       // Table-related aliases
       'column': 'columnheader',

package/src/input/cli-adapter.ts

@@ -36,7 +36,7 @@ export class CLIAdapter implements InputAdapter {
     program
       .name('sungen')
       .description('AI-Native E2E Test Generator - Generate Playwright tests from Gherkin features')
-      .version('1.0.15');
+      .version('1.0.16');
 
     // Global options
     program

package/dist/generators/test-generator/adapters/playwright/templates/steps/actions/target-element-action.hbs

@@ -1 +0,0 @@
-await page.getByText(/{{pattern}}/i{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}}){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}.{{action}}();

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

@@ -1 +0,0 @@
-await expect({{> locator}}).not.toBeVisible();

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

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

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

@@ -1 +0,0 @@
-await page.goto('{{path}}');

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

@@ -1 +0,0 @@
-await page.getByText(/{{pattern}}/i{{#if (shouldUseExact selectorRef)}}, { exact: true }{{/if}}){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}.{{action}}();

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

@@ -1 +0,0 @@
-await expect({{> locator}}).not.toBeVisible();

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

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

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

@@ -1 +0,0 @@
-await page.goto('{{path}}');