@sun-asterisk/sungen 3.2.18 → 3.2.19

package/dist/exporters/qa-env-secret-denylist.d.ts

@@ -0,0 +1,43 @@
+/**
+ * Denylist of RESOLVED `${QA_*}` secret values, for redacting runtime failure text
+ * (the CSV/XLSX `Note` column and the dashboard snapshot's `errorMessage`).
+ *
+ * A failed assertion's message carries the credential the runtime already substituted
+ * (`Expected: "<real password>"`), and delivery lifts that message into files that get
+ * committed permanently (qa/deliverables/*.csv, qa/dashboard/history/*.json). Key-based
+ * masking can't help there — the secret appears as a free-standing VALUE — so we build a
+ * value denylist and erase every occurrence.
+ *
+ * Selection = env-var names referenced as `${QA_*}` in the unit's test data, INTERSECTED
+ * with a sensitive-name signal on the ENV VAR NAME: QA_ADMIN_PASSWORD / QA_ACCESS_TOKEN
+ * are denylisted, QA_BASE_URL / QA_ADMIN_EMAIL are not — non-secret values must stay
+ * readable so the deliverable keeps its reproduction value.
+ *
+ * Values resolve like the runtime does (specs-test-data loadEnvQa precedence):
+ * shell/CI env highest > .env.qa.<SUNGEN_ENV> > .env.qa. Reading process.env is
+ * deliberate — on CI (where deliverables are actually committed) the .env.qa file is
+ * gitignored and usually absent; secrets arrive via env, and a parse-file-only denylist
+ * would be empty exactly where it matters. `.env.qa.example` (committed placeholders) is
+ * never read. This module only BUILDS the denylist — values are erased from output,
+ * never rendered into it.
+ */
+export interface QaEnvSecretDenylist {
+    /** Resolved secret values to erase, deduped, longest-first (so a longer secret wins over its substring). */
+    values: string[];
+    /** Sensitive `${QA_*}` names referenced by the unit that resolved to no usable value. */
+    unresolved: string[];
+}
+/**
+ * Build the denylist for one unit from its LOADED test-data map (values still carry the
+ * literal `${QA_*}` refs — delivery never resolves them into cells). `cwd` is the project
+ * root the delivery CLI runs from, where .env.qa files live.
+ */
+export declare function collectQaEnvSecretDenylist(testData: Record<string, string>, cwd?: string): QaEnvSecretDenylist;
+/**
+ * Fail-loud seam: a unit references sensitive `${QA_*}` vars whose values can't be
+ * resolved here, AND the run has failures whose messages may embed those very values
+ * (resolved by the runtime in a different shell, e.g. CI artifacts exported locally).
+ * Silence would mean exporting unredacted secrets without a trace — warn instead.
+ */
+export declare function warnIfRedactionIncomplete(denylist: QaEnvSecretDenylist, hasFailures: boolean, unitLabel: string): void;
+//# sourceMappingURL=qa-env-secret-denylist.d.ts.map

package/dist/exporters/qa-env-secret-denylist.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"qa-env-secret-denylist.d.ts","sourceRoot":"","sources":["../../src/exporters/qa-env-secret-denylist.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAWH,MAAM,WAAW,mBAAmB;IAClC,4GAA4G;IAC5G,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,yFAAyF;IACzF,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,GAAG,GAAE,MAAsB,GAC1B,mBAAmB,CAuBrB;AA0BD;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,mBAAmB,EAC7B,WAAW,EAAE,OAAO,EACpB,SAAS,EAAE,MAAM,GAChB,IAAI,CAUN"}

package/dist/exporters/qa-env-secret-denylist.js

@@ -0,0 +1,143 @@
+"use strict";
+/**
+ * Denylist of RESOLVED `${QA_*}` secret values, for redacting runtime failure text
+ * (the CSV/XLSX `Note` column and the dashboard snapshot's `errorMessage`).
+ *
+ * A failed assertion's message carries the credential the runtime already substituted
+ * (`Expected: "<real password>"`), and delivery lifts that message into files that get
+ * committed permanently (qa/deliverables/*.csv, qa/dashboard/history/*.json). Key-based
+ * masking can't help there — the secret appears as a free-standing VALUE — so we build a
+ * value denylist and erase every occurrence.
+ *
+ * Selection = env-var names referenced as `${QA_*}` in the unit's test data, INTERSECTED
+ * with a sensitive-name signal on the ENV VAR NAME: QA_ADMIN_PASSWORD / QA_ACCESS_TOKEN
+ * are denylisted, QA_BASE_URL / QA_ADMIN_EMAIL are not — non-secret values must stay
+ * readable so the deliverable keeps its reproduction value.
+ *
+ * Values resolve like the runtime does (specs-test-data loadEnvQa precedence):
+ * shell/CI env highest > .env.qa.<SUNGEN_ENV> > .env.qa. Reading process.env is
+ * deliberate — on CI (where deliverables are actually committed) the .env.qa file is
+ * gitignored and usually absent; secrets arrive via env, and a parse-file-only denylist
+ * would be empty exactly where it matters. `.env.qa.example` (committed placeholders) is
+ * never read. This module only BUILDS the denylist — values are erased from output,
+ * never rendered into it.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.collectQaEnvSecretDenylist = collectQaEnvSecretDenylist;
+exports.warnIfRedactionIncomplete = warnIfRedactionIncomplete;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+// Sensitive-name signal shared with the API exporter's key/body-field classifier —
+// here it is applied to the ENV VAR NAME (QA_ACCESS_TOKEN), not the yaml key.
+const api_testcase_formatter_1 = require("./api-testcase-formatter");
+/** `${QA_*}` env reference — same shape the runtime resolver allowlists (uppercase, QA_ prefix). */
+const QA_ENV_REF = /\$\{(QA_[A-Z0-9_]+)\}/g;
+/**
+ * Build the denylist for one unit from its LOADED test-data map (values still carry the
+ * literal `${QA_*}` refs — delivery never resolves them into cells). `cwd` is the project
+ * root the delivery CLI runs from, where .env.qa files live.
+ */
+function collectQaEnvSecretDenylist(testData, cwd = process.cwd()) {
+    const referenced = new Set();
+    for (const v of Object.values(testData)) {
+        if (typeof v !== 'string')
+            continue;
+        for (const m of v.matchAll(QA_ENV_REF))
+            referenced.add(m[1]);
+    }
+    const sensitive = [...referenced].filter((n) => api_testcase_formatter_1.SENSITIVE_NAME.test(n));
+    if (sensitive.length === 0)
+        return { values: [], unresolved: [] };
+    const fileEnv = readEnvQaFiles(cwd);
+    const values = [];
+    const unresolved = [];
+    for (const name of sensitive) {
+        const v = process.env[name] !== undefined ? process.env[name] : fileEnv[name];
+        // Values shorter than 3 chars are unusable as a denylist entry (they'd mask
+        // coincidental text); treat them as unresolved so coverage gaps stay visible.
+        if (typeof v === 'string' && v.length >= 3)
+            values.push(v);
+        else
+            unresolved.push(name);
+    }
+    return {
+        values: [...new Set(values)].sort((a, b) => b.length - a.length),
+        unresolved,
+    };
+}
+/**
+ * Read .env.qa files into a local map (never mutating process.env), with the runtime's
+ * precedence: first file that sets a key wins, and `.env.qa.<SUNGEN_ENV>` is read before
+ * the base `.env.qa`. Callers give process.env priority over everything here.
+ */
+function readEnvQaFiles(cwd) {
+    const out = {};
+    const env = process.env.SUNGEN_ENV;
+    for (const name of [env ? `.env.qa.${env}` : '', '.env.qa']) {
+        // .env.qa.example is a committed placeholder file, never a source of real values.
+        if (!name || name === '.env.qa.example')
+            continue;
+        const p = path.join(cwd, name);
+        if (!fs.existsSync(p))
+            continue;
+        for (const line of fs.readFileSync(p, 'utf-8').split('\n')) {
+            const m = line.match(/^\s*([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*?)\s*$/);
+            if (m && out[m[1]] === undefined)
+                out[m[1]] = m[2].replace(/^["']|["']$/g, '');
+        }
+    }
+    return out;
+}
+/** Keys already warned about, so per-variant exporter loops don't repeat themselves. */
+const warnedUnits = new Set();
+/**
+ * Fail-loud seam: a unit references sensitive `${QA_*}` vars whose values can't be
+ * resolved here, AND the run has failures whose messages may embed those very values
+ * (resolved by the runtime in a different shell, e.g. CI artifacts exported locally).
+ * Silence would mean exporting unredacted secrets without a trace — warn instead.
+ */
+function warnIfRedactionIncomplete(denylist, hasFailures, unitLabel) {
+    if (!hasFailures || denylist.unresolved.length === 0)
+        return;
+    const key = `${unitLabel}:${denylist.unresolved.join(',')}`;
+    if (warnedUnits.has(key))
+        return;
+    warnedUnits.add(key);
+    console.warn(`⚠ [${unitLabel}] redaction coverage incomplete: ${denylist.unresolved.join(', ')} ` +
+        'referenced in test-data but not resolvable here — failure notes in the deliverable ' +
+        'may contain unredacted secret values. Set the variable(s) in the shell/CI env or .env.qa before exporting.');
+}
+//# sourceMappingURL=qa-env-secret-denylist.js.map

package/dist/exporters/qa-env-secret-denylist.js.map

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

package/dist/exporters/scenario-merger.d.ts

@@ -28,27 +28,34 @@ export interface MergedScenario {
     /** Matched compiled test from .spec.ts, or null if not compiled. */
     spec: SpecTest | null;
     /**
-     * When/Then/Given steps with any `@extend:<name>` chain pre-resolved
-     * against the matching `@steps:<name>` base scenario (its steps are
-     * prepended). Use these for surfaces that show the test case text
-     * (dashboard Steps section) so we get the canonical feature wording
-     * without re-parsing compiled spec.ts comments.
+     * Feature Background steps, kept separate from `resolvedSteps` so the
+     * exporters render them in the Pre-condition column. Inlining them into
+     * Steps shifted the step numbering against the .feature source, which made
+     * QA's Gherkin-vs-export review a manual re-mapping exercise.
      */
-    resolvedWhenSteps: string[];
-    resolvedThenSteps: string[];
-    resolvedGivenSteps: string[];
+    resolvedBackgroundSteps: OrderedStep[];
     /**
      * Steps section for display, in chronological order:
-     *   Background (all) → @extend base (all incl. its Then) → own up to the
-     *   first `Then`. Base's `Then` stays here because it's mid-flow setup,
-     *   not the scenario's final assertion.
+     *   @extend base (all incl. its Then) → own given/when-bucket steps.
+     *   Base's `Then` stays here because it's mid-flow setup, not the
+     *   scenario's final assertion. Background is NOT included — it renders
+     *   as Pre-condition (see `resolvedBackgroundSteps`).
      */
     resolvedSteps: OrderedStep[];
     /**
-     * Expected results — own scenario's first `Then` onwards. Empty when the
-     * scenario has no `Then`.
+     * Expected results — own scenario's then-bucket steps (a `When` after a
+     * `Then` starts a new action and goes back to Steps; an `And` follows its
+     * preceding explicit keyword). Empty when the scenario has no `Then`.
      */
     resolvedExpected: OrderedStep[];
+    /**
+     * Count of anchor-eligible action lines (@extend base + own given/when
+     * steps). This — NOT the rendered Steps length — is the reference for the
+     * "is any assertion mid-flow?" check in groupExpectedByAnchor: manual-comment
+     * steps are appended to resolvedSteps but never participate in anchoring,
+     * so counting them would falsely mark @manual scenarios as interleaved.
+     */
+    resolvedAnchorActionCount: number;
 }
 /**
  * Merge features and spec data, excluding base @steps and scaffold scenarios.

package/dist/exporters/scenario-merger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scenario-merger.d.ts","sourceRoot":"","sources":["../../src/exporters/scenario-merger.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAIjG;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG;IAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAAC,QAAQ,EAAE,WAAW,EAAE,CAAA;CAAE,CAwBzG;AAED,MAAM,WAAW,cAAc;IAC7B,sCAAsC;IACtC,OAAO,EAAE,gBAAgB,CAAC;IAE1B,oEAAoE;IACpE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEtB;;;;;;OAMG;IACH,iBAAiB,EAAG,MAAM,EAAE,CAAC;IAC7B,iBAAiB,EAAG,MAAM,EAAE,CAAC;IAC7B,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;;OAKG;IACH,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,EAAE,WAAW,EAAE,CAAC;CACjC;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,YAAY,GACjB,cAAc,EAAE,CAkElB"}
+{"version":3,"file":"scenario-merger.d.ts","sourceRoot":"","sources":["../../src/exporters/scenario-merger.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAIjG;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG;IAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAAC,QAAQ,EAAE,WAAW,EAAE,CAAA;CAAE,CAwBzG;AAED,MAAM,WAAW,cAAc;IAC7B,sCAAsC;IACtC,OAAO,EAAE,gBAAgB,CAAC;IAE1B,oEAAoE;IACpE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,uBAAuB,EAAE,WAAW,EAAE,CAAC;IACvC;;;;;;OAMG;IACH,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B;;;;OAIG;IACH,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC;;;;;;OAMG;IACH,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,YAAY,GACjB,cAAc,EAAE,CAwElB"}

package/dist/exporters/scenario-merger.js

@@ -69,19 +69,40 @@ function mergeFeatureAndSpec(feature, spec) {
             continue; // skip @steps base scenarios
         if ((0, feature_parser_1.isSampleScaffoldScenario)(scenario))
             continue; // skip default sample
-        const specTest = findMatchingSpecTest(scenario, spec.tests);
+        const specTest = findMatchingSpecTest(scenario, spec.tests, feature.scenarios);
         const base = scenario.extendsName ? stepsBaseByName.get(scenario.extendsName) : undefined;
         // Order of execution for a runnable scenario:
-        //   1. Feature Background (once) — all buckets are setup, stay in Steps.
+        //   1. Feature Background (once) — setup state, rendered as Pre-condition
+        //      so Steps numbering stays aligned with the .feature scenario.
         //   2. @extend base scenario's own steps (if any) — *including* its Then,
         //      because the base's Then is a mid-flow assertion, not the scenario's
         //      final verification.
-        //   3. This scenario's own steps in original sequence, split at the
-        //      first `Then`: pre-Then → Steps, Then-onwards → Expected results.
+        //   3. This scenario's own steps, partitioned by BUCKET (not by position):
+        //      given/when → Steps, then → Expected results. A positional split at
+        //      the first `Then` broke interleaved scenarios (When → Then → When →
+        //      Then …): every later `When` action was exported as an "expected
+        //      result". classifySteps already resolves `And` to its preceding
+        //      explicit keyword, so an `And` after `Then` stays an assertion and
+        //      an `And` after `When` stays an action. Relative order is preserved
+        //      within each column.
+        //      Each assertion also records its ANCHOR — the 1-based index of the
+        //      last action before it in the rendered Steps column (@extend base
+        //      steps count toward the numbering; Background does not, it renders
+        //      as Pre-condition). The exporters use anchors to append
+        //      "— after step N" when a scenario interleaves actions and
+        //      assertions, restoring the correspondence the 2-column layout loses.
         const ownOrdered = scenario.orderedSteps;
-        const firstThenIdx = ownOrdered.findIndex((s) => s.bucket === 'then');
-        const ownPreThen = firstThenIdx >= 0 ? ownOrdered.slice(0, firstThenIdx) : ownOrdered;
-        const ownPostThen = firstThenIdx >= 0 ? ownOrdered.slice(firstThenIdx) : [];
+        const baseLen = base?.orderedSteps.length ?? 0;
+        const ownActions = [];
+        const ownAssertions = [];
+        for (const s of ownOrdered) {
+            if (s.bucket === 'then') {
+                ownAssertions.push({ ...s, anchorStep: baseLen + ownActions.length });
+            }
+            else {
+                ownActions.push(s);
+            }
+        }
         // A @manual scenario carries no Gherkin steps — its tester procedure lives in the
         // `# Tester verifies:` comment block. Parse it into Steps (Setup/Action) + Expected
         // (Observable/Oracle) so the delivery report shows the real manual procedure, not
@@ -92,48 +113,52 @@ function mergeFeatureAndSpec(feature, spec) {
         result.push({
             feature: scenario,
             spec: specTest,
-            resolvedWhenSteps: [
-                ...feature.backgroundWhenSteps,
-                ...(base?.rawWhenSteps ?? []),
-                ...scenario.rawWhenSteps,
-            ],
-            resolvedThenSteps: [
-                ...feature.backgroundThenSteps,
-                ...(base?.rawThenSteps ?? []),
-                ...scenario.rawThenSteps,
-            ],
-            resolvedGivenSteps: [
-                ...feature.backgroundGivenSteps,
-                ...(base?.rawGivenSteps ?? []),
-                ...scenario.rawGivenSteps,
-            ],
+            resolvedBackgroundSteps: feature.backgroundOrderedSteps,
             resolvedSteps: [
-                ...feature.backgroundOrderedSteps,
                 ...(base?.orderedSteps ?? []),
-                ...ownPreThen,
+                ...ownActions,
                 ...manualParsed.steps,
             ],
-            resolvedExpected: [...ownPostThen, ...manualParsed.expected],
+            resolvedExpected: [...ownAssertions, ...manualParsed.expected],
+            resolvedAnchorActionCount: baseLen + ownActions.length,
         });
     }
     return result;
 }
+/** `@manual` / `@manual:<reason>` — a manual scenario has no automated test by definition. */
+function isManualScenario(scenario) {
+    return scenario.tags.some((t) => t === '@manual' || t.startsWith('@manual:'));
+}
 /**
  * Find the spec test that corresponds to a given feature scenario.
  * Match by scenario title (exact match on the scenario name).
+ *
+ * The VP-ID fallback exists only to survive small TITLE drift between compile
+ * and export — it must never RE-ASSIGN a result to a different scenario. Field
+ * report: a feature carried the same VP id on many scenarios (VP-NAV-001 ×14,
+ * mixing @manual and automated); the old first-match fallback attached an
+ * automated sibling's executed result to every @manual sibling, so 7 testcases
+ * nobody ever ran shipped as "Passed" in the client deliverable. Two guards:
+ *   1. a @manual scenario never matches ANY test;
+ *   2. the fallback applies only when the vpId is UNIQUE on both sides —
+ *      exactly one test AND exactly one automatable scenario carry it.
+ * Ambiguity → null → the row reports an honest "Pending".
  */
-function findMatchingSpecTest(scenario, tests) {
+function findMatchingSpecTest(scenario, tests, allScenarios) {
+    if (isManualScenario(scenario))
+        return null;
     // Exact title match
     const exact = tests.find((t) => t.scenarioName === scenario.name);
     if (exact)
         return exact;
-    // Fallback: match by VP-ID prefix (ignore trailing text differences)
+    // Fallback: match by VP-ID prefix — only when unique both ways (see above).
     const vpMatch = scenario.name.match(feature_parser_2.SCENARIO_ID);
     if (vpMatch) {
         const vpId = vpMatch[1];
-        const byVp = tests.find((t) => t.vpId === vpId);
-        if (byVp)
-            return byVp;
+        const testsWithVp = tests.filter((t) => t.vpId === vpId);
+        const scenariosWithVp = allScenarios.filter((s) => !isManualScenario(s) && s.name.match(feature_parser_2.SCENARIO_ID)?.[1] === vpId);
+        if (testsWithVp.length === 1 && scenariosWithVp.length === 1)
+            return testsWithVp[0];
     }
     return null;
 }

package/dist/exporters/scenario-merger.js.map

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

package/dist/exporters/step-formatter.d.ts

@@ -1,18 +1,9 @@
 /**
- * Convert raw Gherkin step text OR generated .spec.ts comment lines into
- * concise, numbered natural language for the CSV Steps/Expected columns.
+ * Convert raw Gherkin step text into concise natural language for the
+ * CSV Steps/Expected columns.
  *
  * Deterministic — no AI calls.
  */
-/**
- * Format a list of raw step lines for the Steps / Expected Results columns.
- *
- * - 0 lines → empty string
- * - 1 line  → the line verbatim (no "1. " prefix — avoids Google Sheets clutter)
- * - ≥ 2     → each line on its own row, "1. ", "2. ", … prefixes, newline-joined
- *             so spreadsheet cells auto-wrap one step per visual line.
- */
-export declare function formatNumberedSteps(lines: string[]): string;
 /**
  * Strip the leading actor (`User `) from a raw Gherkin step and capitalise
  * the first letter. Brackets `[ref]`, `{{var}}` placeholders and element
@@ -27,34 +18,52 @@ export declare function stripActor(raw: string): string;
  */
 export declare function keepActor(raw: string): string;
 /**
- * Number a list of raw feature steps. Mirrors `formatNumberedSteps` but
- * preserves the original Gherkin punctuation (no bracket-to-quote conversion).
- * The mapper picks between `stripActor` (When/Then) and `keepActor`
- * (Given) so the actor word matches the step's grammatical role.
- * Use this for feature-direct rendering (dashboard + delivery).
- */
-export declare function formatFeatureSteps(lines: string[], mapper?: (s: string) => string): string;
-/**
- * Clean a raw step line (either Gherkin text or .spec.ts comment).
+ * Group formatted Expected-results lines by their anchor step.
+ *
+ * Single source of truth for the anchor rendering (used by csv-exporter AND
+ * json-exporter so the delivery sheet and the dashboard cannot drift). Final
+ * format per user review 2026-08-06:
+ *
+ *   - When assertions verify DIFFERENT moments (more than one distinct
+ *     anchor, or the single anchor is not the final action), the cell is
+ *     rendered as groups — a "— after step N" header line (anchor 0 →
+ *     "— before step 1") followed by that group's assertions. Within a
+ *     group, lines are numbered 1..k only when the group has more than one
+ *     assertion; a lone assertion stays bare.
+ *   - When ALL assertions verify the final action (the common shape — every
+ *     Then after the last When), no headers appear and the caller renders
+ *     the plain 1..M checklist exactly as before the anchor feature.
+ *   - Pure-assertion scenarios (actionCount 0) and manual-comment entries
+ *     (no anchor) never produce headers; unanchored entries trail as their
+ *     own headerless group.
+ *
+ * `grouped` tells the caller headers were emitted, so it can force-number
+ * the Steps cell even when it has a single line (headers reference step
+ * numbers QA must be able to see) and must join the lines verbatim instead
+ * of applying checklist numbering.
  *
- * Handles patterns like:
- *   "User click [login] button"              → "Click 'login' button"
- *   "User fill [Email] field with {{email}}" → "Fill 'Email' field with {{email}}"
- *   "Click Signature 2025 Creator"           → "Click 'Signature 2025 Creator'"
- *   "Assert title error has text err_xxx"    → "Title error has text err_xxx"
- *   "Open awards page"                       → "Open awards page"
+ * Anchors are computed against the merger's action list; formatted gherkin
+ * lines are never empty (keepActor/stripActor on non-empty text), so the
+ * rendered numbering cannot drift from the anchor indices.
  */
-export declare function cleanStepLine(raw: string): string;
+export declare function groupExpectedByAnchor(entries: Array<{
+    text: string;
+    anchorStep?: number;
+}>, actionCount: number): {
+    lines: string[];
+    grouped: boolean;
+};
 /**
- * Pre-condition — login/auth context only.
+ * Pre-condition — login/auth context + feature Background steps.
  *
  *   `@auth:user`   → `Logged in as user`
  *   `@no-auth`     → `Not authenticated`
- *   (no auth tag)  → empty string
+ *   (no auth tag)  → no auth line
  *
- * Background and Given steps are no longer echoed here — they're rendered as
- * the first entries in the Steps list so the chain of actions reads as one
- * uninterrupted sequence.
+ * `backgroundLines` (formatted feature Background steps) follow the auth
+ * line, one per line. Background belongs here rather than in Steps: inlining
+ * it shifted the Steps numbering against the .feature scenario, forcing QA
+ * to re-map step numbers between Gherkin and the exported sheet.
  */
-export declare function formatPrecondition(authRole: string | null, _givenLines?: string[]): string;
+export declare function formatPrecondition(authRole: string | null, backgroundLines?: string[]): string;
 //# sourceMappingURL=step-formatter.d.ts.map

package/dist/exporters/step-formatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"step-formatter.d.ts","sourceRoot":"","sources":["../../src/exporters/step-formatter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAK3D;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG9C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG7C;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,GAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAmB,GAAG,MAAM,CAKtG;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAoBjD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,GAAE,MAAM,EAAO,GAAG,MAAM,CAI9F"}
+{"version":3,"file":"step-formatter.d.ts","sourceRoot":"","sources":["../../src/exporters/step-formatter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG9C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG7C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,EACrD,WAAW,EAAE,MAAM,GAClB;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAyBvC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,eAAe,GAAE,MAAM,EAAO,GAAG,MAAM,CAMlG"}