@sun-asterisk/sungen 2.4.6 → 2.5.1

package/dist/orchestrator/templates/ai-instructions/github-skill-sungen-tc-generation.md

@@ -6,14 +6,25 @@ user-invocable: false
 
 ## Goal
 
-Generate **focused test cases per screen section** with **20+ scenarios per viewpoint**. Output `.feature` + `test-data.yaml` only — selectors are deferred to `/sungen:run-test`.
+Generate **focused test cases per screen section** using a **tier-based approach** for faster results. Output `.feature` + `test-data.yaml` only — selectors are deferred to `/sungen:run-test`.
+
+### Tier System
+
+| Tier | Priority | What to generate | When |
+|---|---|---|---|
+| **Tier 1** (default) | `@critical` + `@high` | Happy paths, required validation, core business rules, security basics | First run of `create-test` |
+| **Tier 2** (expand) | `@normal` + `@low` | UI presence, optional validation, edge cases, cosmetic checks | User runs `create-test` again with "Add viewpoints" mode |
+
+**Round 1 (Tier 1)** targets **~10-15 scenarios per section** — enough to cover critical flows and catch real bugs. This is the default behavior.
+
+**Round 2 (Tier 2)** expands to full coverage when the user explicitly chooses "Add viewpoints" or "Add new sections" update mode. Only then generate `@normal` + `@low` scenarios to fill coverage gaps.
 
 ## Update Mode
 
 When `.feature` already has scenarios, summarize and ask:
-1. **Add new sections** — append, continue numbering
-2. **Add viewpoints** — add to existing sections
-3. **Replace all** — overwrite
+1. **Add new sections** — append new sections with Tier 2 (`@normal` + `@low`) scenarios, continue numbering
+2. **Add viewpoints** — expand existing sections with Tier 2 (`@normal` + `@low`) scenarios
+3. **Replace all** — overwrite with fresh Tier 1 (`@critical` + `@high`) generation
 
 For append: read highest `VP-<CAT>-<NNN>`, continue from next number. Never modify existing scenarios.
 
@@ -28,14 +39,28 @@ Requirements improve every viewpoint: exact error messages for VAL, business rul
 
 If also exploring live page: verify spec vs actual, flag mismatches, capture exact text.
 
+### Figma supplement (`spec_figma.md`)
+
+When `requirements/spec_figma.md` is present alongside `spec.md`, treat it as a **secondary input** with these rules:
+
+- **Never override `spec.md`**: `spec.md` is authoritative for all business rules, field constraints, and behavior. `spec_figma.md` only supplements with visual/text data that `spec.md` may lack.
+- **`## Text Inventory` → literal strings**: use text label values from this section verbatim in `test-data.yaml` (button labels, input placeholders, error messages shown in Figma). Do not paraphrase or invent alternatives.
+- **`## Interaction States` → state coverage checkpoints**: use the listed variants (e.g., empty, loading, error, success) as a checklist for state-coverage scenarios. Only generate scenarios for states that are either (a) confirmed in both `spec.md` and `spec_figma.md`, or (b) explicitly documented in one source without contradiction from the other.
+- **Flag disagreements**: if a field name, label, or behavior in `spec_figma.md` contradicts `spec.md`, insert an HTML comment at the top of the `.feature` file:
+  ```gherkin
+  <!-- FIGMA-SPEC CONFLICT: <brief description> — using spec.md value -->
+  ```
+  Then proceed using the `spec.md` value.
+
 ## Screen Input Sources
 
-**Recommended** (in priority order):
-1. **Figma designs** — use Figma MCP to read design context, screenshots, and component metadata
-2. **UI images** — screenshots or mockups in `qa/screens/<screen>/requirements/ui/`
-3. **`spec.md`** — written specification with sections, fields, validation rules
+**Auto-detect** — the parent command (`create-test`) resolves visual sources before invoking this skill. By the time generation starts, the available sources are already determined:
+- `spec.md` — primary, always read if present
+- `spec_figma.md` — Figma supplement, read if present (PAT flow already completed)
+- `ui/*.png` — visual context, read if present
+- `test-viewpoint.md` — edge cases and known issues, read if present
 
-**Optional**: **Live page scan** via Playwright MCP — useful to verify specs vs actual UI, capture real data (error messages, labels). If auth needed → ask user to log in manually via MCP browser.
+**IMPORTANT:** If `spec_figma.md` exists, do NOT call any `mcp__figma__*` tool. The PAT flow is complete — just read the file.
 
 **Single screen focus**: one URL = one screen. Don't explore sibling paths. Modals on same page = part of this screen.
 
@@ -76,7 +101,9 @@ Apply `sungen-test-design-techniques` to spec-extracted conditions:
 
 Use `sungen-viewpoint` skill for per-pattern checklists across 4 viewpoints: UI/UX, Data & Validate, Logic, Security.
 
-Add scenarios for generic UI coverage that spec didn't explicitly state (empty states, loading states, keyboard nav, hover effects). Skip viewpoints truly N/A.
+**Tier-aware gap filling:**
+- **Tier 1 (first run)**: only add `@critical` and `@high` items from the checklists — core security checks (VP-SEC), required field validation (VP-VAL), key state transitions (VP-LOGIC). Skip `@normal`/`@low` items like hover states, empty states, tooltips.
+- **Tier 2 (expand run)**: add `@normal` + `@low` scenarios — UI presence, optional validation, edge cases, cosmetic checks, keyboard nav, hover effects.
 
 **Validation rule**: capture actual error messages from live page or spec.md. Use `User see {{error_var}}` — never assert just "is visible".
 
@@ -112,30 +139,70 @@ Given User is on [Screen] page
 And User wait for [Page Title] heading is visible
 ```
 
+## Cleanup & Hooks
+
+### Auto-assign `@cleanup:*` tags based on screen sections
+
+After identifying screen sections, add appropriate `@cleanup:*` feature-level tags. These activate base.ts fixtures that auto-clean state between tests.
+
+| Screen has | Add tag | Why |
+|---|---|---|
+| Modal / Dialog / Drawer | `@cleanup:overlay` | Dismiss leftover overlays between tests |
+| Form & Inputs / Search / Filter | `@cleanup:forms` | Clear form fields, reset selects |
+| Long scrollable content | `@cleanup:scroll` | Scroll to top for consistent assertions |
+| Auth tokens / session data in tests | `@cleanup:storage` | Clear sessionStorage |
+| CI/CD or debug-heavy screens | `@screenshot:on-failure` | Auto-capture screenshot on test failure |
+
+**Always add `@cleanup:overlay`** if ANY section opens a dialog (Create/Add, Update/Edit, Delete confirmation). Most CRUD screens need it.
+
+**Always add `@cleanup:forms`** if the screen has inline search, filter dropdowns, or editable forms that persist between tests.
+
+### When to add `@afterEach` hook scenario
+
+Only when `@cleanup:*` tags aren't enough — feature-specific cleanup logic:
+- Reset a dropdown filter to default value (not just clear)
+- Navigate away from a sub-tab back to the main tab
+- Close a specific sidebar panel
+
+```gherkin
+@afterEach
+Scenario: Reset filters to default
+  When User select [Status Filter] dropdown with {{default_status}}
+```
+
+### `@beforeAll` / `@afterAll` — optional, low priority
+
+For one-time setup/teardown. Most screens don't need these.
+
 ## Output Format
 
 **Feature file** — `qa/screens/<screen>/features/<screen>.feature`
 
-**Never use `Background:`.** Use `@steps` + `@extend` for shared setup (see `sungen-gherkin-syntax` skill).
+`Background` is valid for simple shared setup (navigate to page). Use `@steps`/`@extend` for complex flows with scope (dialog, frame).
 
 ```gherkin
 @auth:role
+@cleanup:overlay
+@cleanup:forms
 Feature: <Screen> Screen
 
+  Background:
+    Given User is on [Screen] page
+
   # Shared setup — NO priority tag on @steps
   @steps:open_form
   Scenario: Open form
-    Given User is on [Screen] page
     When User click [Create] button
     Then User see [Form] dialog
 
-  # --- Section: Create User Form ---
+  # --- Section: Create User Form (Tier 1: @critical + @high) ---
 
-  @normal @extend:open_form
-  Scenario: VP-UI-001 Form displays all fields with correct defaults
+  @critical @extend:open_form
+  Scenario: VP-LOGIC-001 Submit form with valid data creates record
     Given User is on [Form] dialog
-    Then User see [Name] field
-    And User see [Submit] button is disabled
+    When User fill [Name] field with {{valid_name}}
+    And User click [Submit] button
+    Then User see {{success_message}} message
 
   @high @extend:open_form
   Scenario: VP-VAL-001 Submit with all empty fields shows errors
@@ -143,11 +210,7 @@ Feature: <Screen> Screen
     When User click [Submit] button
     Then User see [Name error] message with {{name_required_error}}
 
-  # --- Section: User Table ---
-
-  @normal
-  Scenario: VP-UI-010 Table displays all columns
-    Then User see [Name] column in [Users] table
+  # --- Section: User Table (Tier 1: @critical + @high) ---
 
   @high
   Scenario: VP-VAL-010 Table displays correct data
@@ -155,13 +218,15 @@ Feature: <Screen> Screen
       | Name       | Email        |
       | {{name_1}} | {{email_1}}  |
 
-  @high
-  Scenario: VP-VAL-011 Edit button targets correct row
-    Given User see [Target] row in [Users] table with {{name_1}}
-    When User click [Edit] button in [Users] table with {{name_1}}
-    Then User see [Name] field with {{name_1}}
+  @critical
+  Scenario: VP-SEC-010 Unauthorized user cannot access page
+    Given User is not logged in
+    When User navigate to [Screen] page
+    Then User is on [Login] page
 ```
 
+**Tier 2 (expand run)** adds `@normal` + `@low` scenarios like UI field presence, hover states, tooltips, empty states.
+
 ### When to use DataTable vs Row Scope
 
 | Pattern | Use when |
@@ -171,6 +236,18 @@ Feature: <Screen> Screen
 
 **Naming**: `VP-<CATEGORY>-<NNN>` prefix. Scenario name must use the **same element type** as the steps — e.g., if the step uses `dialog`, write "dialog opens" not "modal opens".
 
-**Test data** — `qa/screens/<screen>/test-data/<screen>.yaml`, grouped by section.
+**Test data** — `qa/screens/<screen>/test-data/<screen>.yaml`, grouped by section. Data is loaded **at runtime** — keys become runtime lookups, not hardcoded strings. The same compiled test works across environments.
+
+**Environment-specific data**: For values that differ per environment (credentials, URLs, test users), create `<screen>.<env>.yaml` alongside the base file. Users run `SUNGEN_ENV=staging npx playwright test` to merge overrides. Structure env YAML with the same keys, only including values that change:
+
+```yaml
+# login.yaml (base)
+valid_email: admin@dev.example.com
+valid_password: DevPass123
+
+# login.staging.yaml (override for staging)
+valid_email: admin@staging.example.com
+valid_password: StagingPass456
+```
 
 **Do NOT generate**: `selectors.yaml` (created during run-test), Playwright code (sungen compiles).

package/dist/orchestrator/templates/ai-instructions/github-skill-sungen-tc-review.md

@@ -43,6 +43,8 @@ Score: `(dimensions_covered / 6) * 40`. Validate technique application with `sun
 
 **Classification**: UI = static/always-same appearance. VAL = input validation/errors. LOGIC = behavior/state changes (includes persisted state without When). SEC = auth/permissions.
 
+**Tier-aware scoring**: If the feature file only contains `@critical` + `@high` scenarios (Tier 1), do NOT penalize for missing VP-UI viewpoint — UI scenarios are intentionally deferred to Tier 2. Score "All applicable VP present" based on Tier 1-relevant viewpoints only (VAL, LOGIC, SEC). Note in the review output: *"VP-UI deferred to Tier 2 — run create-test with 'Add viewpoints' to expand."*
+
 ---
 
 ## Quality Rules
@@ -87,6 +89,21 @@ Do NOT mark `@manual` when data is visible in snapshot or documented in spec —
 
 ---
 
+## Unverified Selectors metric
+
+**When to check**: if `qa/screens/<screen>/selectors/<screen>.yaml` exists, count lines matching the pattern `@needs-live-verify`.
+
+| Metric | Source | Scoring impact |
+|---|---|---|
+| Unverified Selectors | Count of `@needs-live-verify` comment lines in `selectors.yaml` | None — non-blocking |
+
+- If count > 0: include the following line in the review report summary (after the score table, before Issues):
+  `⚠ <N> selectors flagged @needs-live-verify — run run-test against live URL when available.`
+- Does NOT reduce the score or block the 60% threshold. The suite can PASS with unverified selectors.
+- If `selectors.yaml` does not exist yet (not yet generated): omit this metric entirely.
+
+---
+
 ## Output Format
 
 ```markdown
@@ -99,6 +116,9 @@ Do NOT mark `@manual` when data is visible in snapshot or documented in spec —
 | Viewpoint | <n> | 30 |
 | **Total** | **<n>%** | **100** |
 
+⚠ <N> selectors flagged @needs-live-verify — run run-test against live URL when available.
+<!-- omit this line if selectors.yaml doesn't exist or @needs-live-verify count = 0 -->
+
 ### Issues
 1. [SYNTAX] ...
 2. [COVERAGE] ...

package/dist/orchestrator/templates/specs-base.d.ts

@@ -1,4 +1,15 @@
 import { expect } from '@playwright/test';
-declare const test: import("@playwright/test").TestType<import("@playwright/test").PlaywrightTestArgs & import("@playwright/test").PlaywrightTestOptions, import("@playwright/test").PlaywrightWorkerArgs & import("@playwright/test").PlaywrightWorkerOptions>;
+type CleanupConfig = {
+    overlay?: boolean;
+    forms?: boolean;
+    scroll?: boolean;
+    storage?: boolean;
+};
+declare const test: import("@playwright/test").TestType<import("@playwright/test").PlaywrightTestArgs & import("@playwright/test").PlaywrightTestOptions & {
+    autoCleanup: CleanupConfig;
+    screenshotOnFailure: boolean;
+    _autoCleanup: void;
+    _autoScreenshot: void;
+}, import("@playwright/test").PlaywrightWorkerArgs & import("@playwright/test").PlaywrightWorkerOptions>;
 export { test, expect };
 //# sourceMappingURL=specs-base.d.ts.map

package/dist/orchestrator/templates/specs-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specs-base.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/templates/specs-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAQxD,QAAA,MAAM,IAAI,6OA8DR,CAAC;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC"}
+{"version":3,"file":"specs-base.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/templates/specs-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAGxD,KAAK,aAAa,GAAG;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAOF,QAAA,MAAM,IAAI;iBACK,aAAa;yBACL,OAAO;kBACd,IAAI;qBACD,IAAI;wGA6GrB,CAAC;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC"}

package/dist/orchestrator/templates/specs-base.js

@@ -8,6 +8,8 @@ Object.defineProperty(exports, "expect", { enumerable: true, get: function () {
 const contextCache = new Map();
 const GOTO_PATCHED = Symbol('goto-patched');
 const test = test_1.test.extend({
+    autoCleanup: [{}, { option: true }],
+    screenshotOnFailure: [false, { option: true }],
     page: async ({ browser, storageState }, use) => {
         if (storageState) {
             const cacheKey = typeof storageState === 'string' ? storageState : JSON.stringify(storageState);
@@ -26,11 +28,6 @@ const test = test_1.test.extend({
                     try {
                         const currentPath = new URL(page.url()).pathname;
                         if (currentPath === url || currentPath === url + '/') {
-                            // Dismiss any open overlays (dropdowns, dialogs) from previous test
-                            await page.keyboard.press('Escape').catch(() => { });
-                            await page.locator('body').click({ position: { x: 1, y: 1 }, force: true }).catch(() => { });
-                            // Safety check: if a fixed-position overlay (modal/dialog) is still present, full reload
-                            // eslint-disable-next-line no-eval -- runs in browser context via Playwright
                             const hasOverlay = await page.evaluate(`(() => {
                 const el = document.elementFromPoint(window.innerWidth / 2, window.innerHeight / 2);
                 if (!el) return false;
@@ -65,6 +62,51 @@ const test = test_1.test.extend({
             await context.close();
         }
     },
+    // Auto-cleanup fixture: runs teardown after each test based on @cleanup:* tags
+    _autoCleanup: [async ({ page, autoCleanup }, use) => {
+            await use();
+            if (autoCleanup.overlay) {
+                await page.keyboard.press('Escape').catch(() => { });
+                await page.locator('body').click({ position: { x: 1, y: 1 }, force: true }).catch(() => { });
+                // Dismiss persistent fixed overlays (modals, dialogs)
+                const hasOverlay = await page.evaluate(`(() => {
+        const el = document.elementFromPoint(window.innerWidth / 2, window.innerHeight / 2);
+        if (!el) return false;
+        let current = el;
+        while (current && current !== document.body) {
+          if (getComputedStyle(current).position === 'fixed') return true;
+          current = current.parentElement;
+        }
+        return false;
+      })()`).catch(() => false);
+                if (hasOverlay) {
+                    await page.keyboard.press('Escape').catch(() => { });
+                }
+            }
+            if (autoCleanup.forms) {
+                await page.evaluate(`(() => {
+        document.querySelectorAll('input:not([type=hidden]):not([type=submit])').forEach(el => { el.value = ''; });
+        document.querySelectorAll('textarea').forEach(el => { el.value = ''; });
+        document.querySelectorAll('select').forEach(el => { el.selectedIndex = 0; });
+      })()`).catch(() => { });
+            }
+            if (autoCleanup.scroll) {
+                await page.evaluate('window.scrollTo(0, 0)').catch(() => { });
+            }
+            if (autoCleanup.storage) {
+                await page.evaluate('sessionStorage.clear()').catch(() => { });
+            }
+        }, { auto: true }],
+    // Auto-screenshot fixture: captures screenshot on test failure
+    _autoScreenshot: [async ({ page, screenshotOnFailure }, use, testInfo) => {
+            await use();
+            if (screenshotOnFailure && testInfo.status !== testInfo.expectedStatus) {
+                await testInfo.attach('screenshot', {
+                    body: await page.screenshot(),
+                    contentType: 'image/png',
+                });
+            }
+        }, { auto: true }],
 });
 exports.test = test;
 //# sourceMappingURL=specs-base.js.map

package/dist/orchestrator/templates/specs-base.js.map

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

package/dist/orchestrator/templates/specs-base.ts

@@ -1,12 +1,27 @@
 import { test as base, expect } from '@playwright/test';
 import type { BrowserContext, Page } from '@playwright/test';
 
+type CleanupConfig = {
+  overlay?: boolean;
+  forms?: boolean;
+  scroll?: boolean;
+  storage?: boolean;
+};
+
 // Share one context per storageState — avoids creating multiple sessions
 // that trigger server rate limiting or session invalidation
 const contextCache = new Map<string, { context: BrowserContext; page: Page }>();
 const GOTO_PATCHED = Symbol('goto-patched');
 
-const test = base.extend({
+const test = base.extend<{
+  autoCleanup: CleanupConfig;
+  screenshotOnFailure: boolean;
+  _autoCleanup: void;
+  _autoScreenshot: void;
+}>({
+  autoCleanup: [{}, { option: true }],
+  screenshotOnFailure: [false, { option: true }],
+
   page: async ({ browser, storageState }, use) => {
     if (storageState) {
       const cacheKey = typeof storageState === 'string' ? storageState : JSON.stringify(storageState);
@@ -28,12 +43,6 @@ const test = base.extend({
           try {
             const currentPath = new URL(page.url()).pathname;
             if (currentPath === url || currentPath === url + '/') {
-              // Dismiss any open overlays (dropdowns, dialogs) from previous test
-              await page.keyboard.press('Escape').catch(() => {});
-              await page.locator('body').click({ position: { x: 1, y: 1 }, force: true }).catch(() => {});
-
-              // Safety check: if a fixed-position overlay (modal/dialog) is still present, full reload
-              // eslint-disable-next-line no-eval -- runs in browser context via Playwright
               const hasOverlay = await page.evaluate(`(() => {
                 const el = document.elementFromPoint(window.innerWidth / 2, window.innerHeight / 2);
                 if (!el) return false;
@@ -68,6 +77,55 @@ const test = base.extend({
       await context.close();
     }
   },
+
+  // Auto-cleanup fixture: runs teardown after each test based on @cleanup:* tags
+  _autoCleanup: [async ({ page, autoCleanup }, use) => {
+    await use();
+
+    if (autoCleanup.overlay) {
+      await page.keyboard.press('Escape').catch(() => {});
+      await page.locator('body').click({ position: { x: 1, y: 1 }, force: true }).catch(() => {});
+      // Dismiss persistent fixed overlays (modals, dialogs)
+      const hasOverlay = await page.evaluate(`(() => {
+        const el = document.elementFromPoint(window.innerWidth / 2, window.innerHeight / 2);
+        if (!el) return false;
+        let current = el;
+        while (current && current !== document.body) {
+          if (getComputedStyle(current).position === 'fixed') return true;
+          current = current.parentElement;
+        }
+        return false;
+      })()`).catch(() => false);
+      if (hasOverlay) {
+        await page.keyboard.press('Escape').catch(() => {});
+      }
+    }
+    if (autoCleanup.forms) {
+      await page.evaluate(`(() => {
+        document.querySelectorAll('input:not([type=hidden]):not([type=submit])').forEach(el => { el.value = ''; });
+        document.querySelectorAll('textarea').forEach(el => { el.value = ''; });
+        document.querySelectorAll('select').forEach(el => { el.selectedIndex = 0; });
+      })()`).catch(() => {});
+    }
+    if (autoCleanup.scroll) {
+      await page.evaluate('window.scrollTo(0, 0)').catch(() => {});
+    }
+    if (autoCleanup.storage) {
+      await page.evaluate('sessionStorage.clear()').catch(() => {});
+    }
+  }, { auto: true }],
+
+  // Auto-screenshot fixture: captures screenshot on test failure
+  _autoScreenshot: [async ({ page, screenshotOnFailure }, use, testInfo) => {
+    await use();
+
+    if (screenshotOnFailure && testInfo.status !== testInfo.expectedStatus) {
+      await testInfo.attach('screenshot', {
+        body: await page.screenshot(),
+        contentType: 'image/png',
+      });
+    }
+  }, { auto: true }],
 });
 
 export { test, expect };

package/dist/orchestrator/templates/specs-test-data.d.ts

@@ -0,0 +1,14 @@
+export declare class TestDataLoader {
+    private data;
+    private constructor();
+    /**
+     * Load test data for a screen/feature combination.
+     *
+     * Priority (later wins):
+     * 1. {feature}.yaml — base data
+     * 2. {feature}.{SUNGEN_ENV}.yaml — environment-specific (if SUNGEN_ENV set)
+     */
+    static load(screenName: string, featureName: string): TestDataLoader;
+    get(key: string): string;
+}
+//# sourceMappingURL=specs-test-data.d.ts.map

package/dist/orchestrator/templates/specs-test-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"specs-test-data.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/templates/specs-test-data.ts"],"names":[],"mappings":"AAIA,qBAAa,cAAc;IACzB,OAAO,CAAC,IAAI,CAAsB;IAElC,OAAO;IAIP;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,cAAc;IAcpE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAczB"}

package/dist/orchestrator/templates/specs-test-data.js

@@ -0,0 +1,100 @@
+"use strict";
+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;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestDataLoader = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const yaml_1 = __importDefault(require("yaml"));
+class TestDataLoader {
+    constructor(data) {
+        this.data = data;
+    }
+    /**
+     * Load test data for a screen/feature combination.
+     *
+     * Priority (later wins):
+     * 1. {feature}.yaml — base data
+     * 2. {feature}.{SUNGEN_ENV}.yaml — environment-specific (if SUNGEN_ENV set)
+     */
+    static load(screenName, featureName) {
+        const baseDir = path.join(process.cwd(), 'qa', 'screens', screenName, 'test-data');
+        const env = process.env.SUNGEN_ENV;
+        let data = loadYamlSync(path.join(baseDir, `${featureName}.yaml`)) || {};
+        if (env) {
+            const envData = loadYamlSync(path.join(baseDir, `${featureName}.${env}.yaml`));
+            if (envData)
+                data = deepMerge(data, envData);
+        }
+        return new TestDataLoader(data);
+    }
+    get(key) {
+        const parts = key.split('.');
+        let current = this.data;
+        for (const part of parts) {
+            if (current == null || typeof current !== 'object') {
+                throw new Error(`Test data key not found: ${key} (failed at '${part}')`);
+            }
+            current = current[part];
+        }
+        if (current === undefined || current === null) {
+            throw new Error(`Test data key not found: ${key}`);
+        }
+        return String(current);
+    }
+}
+exports.TestDataLoader = TestDataLoader;
+function loadYamlSync(filePath) {
+    if (!fs.existsSync(filePath))
+        return null;
+    const content = fs.readFileSync(filePath, 'utf-8');
+    return yaml_1.default.parse(content) || null;
+}
+function deepMerge(base, override) {
+    const result = { ...base };
+    for (const [key, value] of Object.entries(override)) {
+        if (value && typeof value === 'object' && !Array.isArray(value) &&
+            result[key] && typeof result[key] === 'object' && !Array.isArray(result[key])) {
+            result[key] = deepMerge(result[key], value);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=specs-test-data.js.map

package/dist/orchestrator/templates/specs-test-data.js.map

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

package/dist/orchestrator/templates/specs-test-data.ts

@@ -0,0 +1,66 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import yaml from 'yaml';
+
+export class TestDataLoader {
+  private data: Record<string, any>;
+
+  private constructor(data: Record<string, any>) {
+    this.data = data;
+  }
+
+  /**
+   * Load test data for a screen/feature combination.
+   *
+   * Priority (later wins):
+   * 1. {feature}.yaml — base data
+   * 2. {feature}.{SUNGEN_ENV}.yaml — environment-specific (if SUNGEN_ENV set)
+   */
+  static load(screenName: string, featureName: string): TestDataLoader {
+    const baseDir = path.join(process.cwd(), 'qa', 'screens', screenName, 'test-data');
+    const env = process.env.SUNGEN_ENV;
+
+    let data = loadYamlSync(path.join(baseDir, `${featureName}.yaml`)) || {};
+
+    if (env) {
+      const envData = loadYamlSync(path.join(baseDir, `${featureName}.${env}.yaml`));
+      if (envData) data = deepMerge(data, envData);
+    }
+
+    return new TestDataLoader(data);
+  }
+
+  get(key: string): string {
+    const parts = key.split('.');
+    let current: any = this.data;
+    for (const part of parts) {
+      if (current == null || typeof current !== 'object') {
+        throw new Error(`Test data key not found: ${key} (failed at '${part}')`);
+      }
+      current = current[part];
+    }
+    if (current === undefined || current === null) {
+      throw new Error(`Test data key not found: ${key}`);
+    }
+    return String(current);
+  }
+}
+
+function loadYamlSync(filePath: string): Record<string, any> | null {
+  if (!fs.existsSync(filePath)) return null;
+  const content = fs.readFileSync(filePath, 'utf-8');
+  return yaml.parse(content) || null;
+}
+
+function deepMerge(base: Record<string, any>, override: Record<string, any>): Record<string, any> {
+  const result = { ...base };
+  for (const [key, value] of Object.entries(override)) {
+    if (value && typeof value === 'object' && !Array.isArray(value) &&
+        result[key] && typeof result[key] === 'object' && !Array.isArray(result[key])) {
+      result[key] = deepMerge(result[key], value);
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}