@sungen/driver-ui 3.2.32 → 3.2.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sungen/driver-ui",
-  "version": "3.2.32",
+  "version": "3.2.34",
   "description": "Sungen UI capability (Playwright) — step patterns, viewpoint gate, and phase hooks. Plugs into @sun-asterisk/sungen via the capability SPI.",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -13,7 +13,7 @@
   "author": "eqe team (engineer & quality) — Sun Asterisk",
   "license": "MIT",
   "dependencies": {
-    "@sun-asterisk/sungen": "3.2.32"
+    "@sun-asterisk/sungen": "3.2.34"
   },
   "peerDependencies": {
     "@playwright/test": "^1.57.0"

package/src/patterns/assertion-patterns.ts

@@ -65,11 +65,7 @@ export const assertionPatterns: StepPattern[] = [
     resolver: (step, context): StepTemplateData => {
       let dataValue = step.selectorRef || '';
       if (step.dataRef) {
-        try {
-          dataValue = context.dataResolver.resolveData(step.dataRef, context.featureName);
-        } catch {
-          dataValue = `\${${step.dataRef}}`;
-        }
+        dataValue = context.dataResolver.resolveData(step.dataRef, context.featureName);
       }
       return {
         templateName: 'alert-text-assertion',
@@ -92,11 +88,7 @@ export const assertionPatterns: StepPattern[] = [
       (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}}`;
-      }
+      dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
 
       // getByRole('row') includes header row as nth(0), so Gherkin nth=1 maps to locator nth(1)
       const rowNth = step.nth || 1;
@@ -138,6 +130,8 @@ export const assertionPatterns: StepPattern[] = [
       // step is a URL-only oracle, which a client-side router can satisfy for a few hundred
       // milliseconds before a guard bounces the user away (#662).
       let anchor: Record<string, unknown> | undefined;
+      // The page entry's `query: any` (#748) — set below, once the entry is known to BE a page.
+      let ignoreQuery = false;
 
       // If selector is present, extract path from selector's value attribute
       if (step.selectorRef) {
@@ -155,6 +149,10 @@ export const assertionPatterns: StepPattern[] = [
           // the feature path rather than compiling `toHaveURL(/button/)`.
           path = resolved.selectorType === 'page' ? (resolved.value || fallbackPath) : fallbackPath;
           if (resolved.selectorType === 'page' && resolved.anchor) anchor = { ...resolved.anchor };
+          // `query: any` — the query is not part of this page's identity (#748). Gated on the entry
+          // KIND for the same reason `value` and `anchor` are: a key collision can hand back a
+          // non-page entry, and reading a stray field off it would silently weaken the assertion.
+          if (resolved.selectorType === 'page' && resolved.query === 'any') ignoreQuery = true;
         } catch (error) {
           // Fallback to feature path if selector not found
           path = fallbackPath;
@@ -167,11 +165,7 @@ export const assertionPatterns: StepPattern[] = [
       // has asserted it since issue #464; this is the same assertion, so it asserts the same way.
       let query = '';
       if (step.dataRef) {
-        try {
-          query = context.dataResolver.resolveData(step.dataRef, context.featureName);
-        } catch {
-          query = `\${${step.dataRef}}`;
-        }
+        query = context.dataResolver.resolveData(step.dataRef, context.featureName);
       }
       // Convert path to regex-safe string (dynamic :id segments → [^/]+ wildcard). An ABSOLUTE
       // page value also yields a host pattern: matching only the path let this assertion pass on
@@ -183,7 +177,7 @@ export const assertionPatterns: StepPattern[] = [
         templateName: 'page-assertion',
         // `dataRef` rides along so a runtime failure can name the test-data key an author must go
         // fix — an empty/absent value is otherwise the hardest kind of red to trace.
-        data: { pathRegex, hostRegex, query, dataRef: step.dataRef || '', anchor },
+        data: { pathRegex, hostRegex, query, dataRef: step.dataRef || '', anchor, ignoreQuery },
         comment: step.selectorRef ? `Assert on ${step.selectorRef} page${withSuffix}` : `Assert on page${withSuffix}`,
       };
     },
@@ -211,11 +205,7 @@ export const assertionPatterns: StepPattern[] = [
       } catch (error) {}
 
       let dataValue: string;
-      try {
-        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-      } catch (error) {
-        dataValue = `\${${step.dataRef}}`;
-      }
+      dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
 
       const escapedVariable = dataValue.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
 
@@ -284,11 +274,7 @@ export const assertionPatterns: StepPattern[] = [
       } catch (error) {}
 
       let dataValue: string;
-      try {
-        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-      } catch (error) {
-        dataValue = `\${${step.dataRef}}`;
-      }
+      dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
 
       const escapedVariable = dataValue.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
 
@@ -359,11 +345,7 @@ export const assertionPatterns: StepPattern[] = [
       } catch (error) {}
 
       let dataValue: string;
-      try {
-        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-      } catch (error) {
-        dataValue = `\${${step.dataRef}}`;
-      }
+      dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
 
       // "selected" mirrors selected-assertion: checkbox/radio/switch roles have no
       // aria-selected — their state is `checked`; other targets probe at runtime.
@@ -419,11 +401,7 @@ export const assertionPatterns: StepPattern[] = [
 
       // Resolve data variable value
       let dataValue: string;
-      try {
-        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-      } catch (error) {
-        dataValue = `\${${step.dataRef}}`;
-      }
+      dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
 
       // Resolve selector from YAML with feature context
       let resolved: any = {};
@@ -535,9 +513,15 @@ export const assertionPatterns: StepPattern[] = [
         const label = resolved.value !== undefined && resolved.value.trim() === ''
           ? undefined
           : step.selectorRef;
+        // The locator here is built from the CAPTION, not from `resolved` — the common case has no
+        // selectors.yaml entry at all, so `resolved` is `{}` and carries nothing. The scope
+        // therefore comes off the context, which `withParentScope` sets whether or not the entry
+        // lookup succeeded; without it `… in [Education Card 6] card` was dropped silently and the
+        // assertion read whichever card the page happened to render first (#747).
         const code = context.templateEngine.renderStep('label-value-assertion', {
           label,
           dataValue,
+          parentLocator: context.parentLocator,
         });
         return {
           code,
@@ -564,6 +548,9 @@ export const assertionPatterns: StepPattern[] = [
           name: hasName ? resolved.name : dataValue,
           exact: resolved.exact || false,
           nth: resolved.nth,
+          // Rebuilt field by field rather than spread from `resolved`, so the scope `withParentScope`
+          // stamped there never arrives — the label branch's twin defect (#747).
+          parentLocator: resolved.parentLocator ?? context.parentLocator,
         });
         return {
           code,
@@ -865,11 +852,7 @@ export const assertionPatterns: StepPattern[] = [
     resolver: (step, context): StepTemplateData => {
       // Resolve data reference to actual value
       let dataValue: string;
-      try {
-        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-      } catch (error) {
-        dataValue = `\${${step.dataRef}}`;
-      }
+      dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
 
       return {
         templateName: 'visible-assertion',
@@ -895,13 +878,9 @@ export const assertionPatterns: StepPattern[] = [
       if (match) {
         expectedCount = parseInt(match[1]);
       } else if (step.dataRef) {
-        try {
-          const resolvedData = context.dataResolver.resolveData(step.dataRef, context.featureName);
-          const parsed = parseInt(resolvedData);
-          expectedCount = isNaN(parsed) ? 1 : parsed;
-        } catch {
-          expectedCount = `\${${step.dataRef}}`;
-        }
+        const resolvedData = context.dataResolver.resolveData(step.dataRef, context.featureName);
+        const parsed = parseInt(resolvedData);
+        expectedCount = isNaN(parsed) ? 1 : parsed;
       }
 
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
@@ -926,13 +905,9 @@ export const assertionPatterns: StepPattern[] = [
         expectedCount = parseInt(match[1]);
       } else if (step.dataRef) {
         // Resolve data reference: "count {{number_items}}"
-        try {
-          const resolvedData = context.dataResolver.resolveData(step.dataRef, context.featureName);
-          const parsed = parseInt(resolvedData);
-          expectedCount = isNaN(parsed) ? 1 : parsed;
-        } catch {
-          expectedCount = `\${${step.dataRef}}`;
-        }
+        const resolvedData = context.dataResolver.resolveData(step.dataRef, context.featureName);
+        const parsed = parseInt(resolvedData);
+        expectedCount = isNaN(parsed) ? 1 : parsed;
       }
 
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);

package/src/patterns/form-patterns.ts

@@ -20,11 +20,7 @@ export const formPatterns: StepPattern[] = [
 
       let fileName: string;
       if (step.dataRef) {
-        try {
-          fileName = context.dataResolver.resolveData(step.dataRef, context.featureName);
-        } catch (error) {
-          fileName = `\${${step.dataRef}}`;
-        }
+        fileName = context.dataResolver.resolveData(step.dataRef, context.featureName);
       } else {
         fileName = step.value!;
       }
@@ -46,11 +42,7 @@ export const formPatterns: StepPattern[] = [
 
       let value: string;
       if (step.dataRef) {
-        try {
-          value = context.dataResolver.resolveData(step.dataRef, context.featureName);
-        } catch (error) {
-          value = `\${${step.dataRef}}`;
-        }
+        value = context.dataResolver.resolveData(step.dataRef, context.featureName);
       } else {
         value = step.value!;
       }
@@ -169,11 +161,7 @@ export const formPatterns: StepPattern[] = [
 
       let value: string;
       if (step.dataRef) {
-        try {
-          value = context.dataResolver.resolveData(step.dataRef, context.featureName);
-        } catch (error) {
-          value = `\${${step.dataRef}}`;
-        }
+        value = context.dataResolver.resolveData(step.dataRef, context.featureName);
       } else {
         value = step.value!;
       }

package/src/patterns/interaction-patterns.ts

@@ -163,11 +163,7 @@ export const interactionPatterns: StepPattern[] = [
       !!step.dataRef,
     resolver: (step, context) => {
       let fillValue: string;
-      try {
-        fillValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-      } catch {
-        fillValue = `\${${step.dataRef}}`;
-      }
+      fillValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
       return {
         templateName: 'alert-fill-action',
         data: { fillValue },
@@ -221,11 +217,7 @@ export const interactionPatterns: StepPattern[] = [
       if (step.value) {
         dataValue = step.value;
       } else {
-        try {
-          dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-        } catch {
-          dataValue = `\${${step.dataRef}}`;
-        }
+        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
       }
       const { name: _name, ...resolvedWithoutName } = resolved;
 
@@ -261,11 +253,7 @@ export const interactionPatterns: StepPattern[] = [
       }
 
       let dataValue: string;
-      try {
-        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-      } catch (error) {
-        dataValue = `\${${step.dataRef}}`;
-      }
+      dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
 
       let actionMethod = 'click';
       if (step.text.includes('hover')) actionMethod = 'hover';
@@ -341,11 +329,7 @@ export const interactionPatterns: StepPattern[] = [
       if (step.value) {
         dataValue = step.value;
       } else {
-        try {
-          dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-        } catch {
-          dataValue = `\${${step.dataRef}}`;
-        }
+        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
       }
 
       const { name: _name, ...resolvedWithoutName } = resolved;
@@ -412,11 +396,7 @@ export const interactionPatterns: StepPattern[] = [
       if (step.value) {
         dataValue = step.value;
       } else {
-        try {
-          dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-        } catch {
-          dataValue = `\${${step.dataRef}}`;
-        }
+        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
       }
 
       const { name: _name, ...resolvedWithoutName } = resolved;
@@ -453,11 +433,7 @@ export const interactionPatterns: StepPattern[] = [
       (step.text.includes('clicks') || step.text.includes('click')) && !step.selectorRef && !!step.dataRef,
     resolver: (step, context) => {
       let value: string;
-      try {
-        value = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-      } catch (error) {
-        value = `\${${step.dataRef}}`;
-      }
+      value = context.dataResolver.resolveData(step.dataRef!, context.featureName);
 
       return {
         templateName: 'click-action',
@@ -503,11 +479,7 @@ export const interactionPatterns: StepPattern[] = [
       const role = elementKeywordToRole(step.text)!;
 
       let dataValue: string;
-      try {
-        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-      } catch (error) {
-        dataValue = `\${${step.dataRef}}`;
-      }
+      dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
 
       const state = extractWaitState(step.text);
 
@@ -597,11 +569,7 @@ export const interactionPatterns: StepPattern[] = [
       const resolved = context.selectorResolver.resolveSelector(step.selectorRef!, undefined, step.elementType, step.nth);
 
       let dataValue: string;
-      try {
-        dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
-      } catch (error) {
-        dataValue = `\${${step.dataRef}}`;
-      }
+      dataValue = context.dataResolver.resolveData(step.dataRef!, context.featureName);
 
       const state = extractWaitState(step.text);
 

package/src/patterns/navigation-patterns.ts

@@ -44,6 +44,10 @@ export const navigationPatterns: StepPattern[] = [
         ? `/${step.selectorRef}/`
         : (context.featurePath || '/');
       let path = pathFallback;
+      // The page entry's `query: any` (#748) — the twin of the `see [X] page` reading. These two
+      // resolvers have drifted apart twice; a rule one honours and the other does not is exactly
+      // that drift, so it is read here on the same line as the path.
+      let ignoreQuery = false;
 
       if (step.selectorRef) {
         try {
@@ -57,6 +61,7 @@ export const navigationPatterns: StepPattern[] = [
           // documented fallback. These two resolvers have drifted apart twice already; keep them
           // spelling the same rule.
           path = resolved.selectorType === 'page' ? (resolved.value || pathFallback) : pathFallback;
+          if (resolved.selectorType === 'page' && resolved.query === 'any') ignoreQuery = true;
         } catch (error) {
           path = pathFallback;
         }
@@ -71,11 +76,7 @@ export const navigationPatterns: StepPattern[] = [
       // Runtime mode resolves to a __SUNGEN_TD$…$__ marker → `path + testData.get(...)`.
       let query = '';
       if (step.dataRef) {
-        try {
-          query = context.dataResolver.resolveData(step.dataRef, context.featureName);
-        } catch {
-          query = `\${${step.dataRef}}`;
-        }
+        query = context.dataResolver.resolveData(step.dataRef, context.featureName);
       }
       const withSuffix = step.dataRef ? ` with ${step.dataRef}` : '';
 
@@ -91,7 +92,7 @@ export const navigationPatterns: StepPattern[] = [
           templateName: 'route-assertion',
           // `dataRef` rides along so a runtime failure names the test-data key (see the `see` twin).
           // An absolute page value also carries a host pattern — see urlToPatternParts.
-          data: { ...urlToPatternParts(path), query, dataRef: step.dataRef || '' },
+          data: { ...urlToPatternParts(path), query, dataRef: step.dataRef || '', ignoreQuery },
           comment: step.selectorRef ? `Assert on ${step.selectorRef} page${withSuffix}` : `Assert page route`,
         };
       }

package/src/utils/row-index.ts

@@ -24,12 +24,11 @@ export function rowIndexExpr(
   const varMatch = rowToken.match(/^\{\{([^}]+)\}\}$/);
   if (!varMatch) return String(Number(rowToken) + offset);
 
-  let expr: string;
-  try {
-    expr = context.dataResolver.resolveData(varMatch[1].trim(), context.featureName);
-  } catch {
-    expr = `\${${varMatch[1].trim()}}`;
-  }
+  // No fallback to the placeholder text. This value is spliced RAW into `.nth({{{rowIndexExpr}}})`,
+  // so `${n}` landed as a bare expression outside any template literal — a syntax error that took
+  // the whole spec file at parse time, not just the step, and named nothing useful. The throw
+  // reaches StepMapper.mapStep and becomes SG-E038 against this step alone (#781).
+  const expr: string = context.dataResolver.resolveData(varMatch[1].trim(), context.featureName);
   if (/^\d+$/.test(expr)) return String(Number(expr) + offset); // inline-data mode
   if (offset === 0) return expr;
   return offset > 0 ? `${expr} + ${offset}` : `${expr} - ${-offset}`;