@sun-asterisk/sungen 3.2.4 → 3.2.6

package/src/dashboard/snapshot-builder.ts

@@ -44,6 +44,9 @@ const DEFAULT_BASE_LOCALE = 'vi';
 
 export interface DashboardTarget {
   name: string;
+  kind: 'screen' | 'flow' | 'api';
+  /** Derived convenience (`kind === 'flow'`) — kept for the flow-specific
+   *  branches that predate the api tier. */
   isFlow: boolean;
 }
 
@@ -134,7 +137,9 @@ function buildOneScreen(
   // For mobile, per-OS features flatten here so the Compare view can key each
   // scenario by (tcId, platform) via its OS-precise testEnvironment.
   const scenarios = features.flatMap((f) => f.scenarios);
-  const label = target.isFlow ? `flow/${target.name}` : target.name;
+  const label = target.kind === 'flow' ? `flow/${target.name}`
+    : target.kind === 'api' ? `api/${target.name}`
+    : target.name;
 
   // Screen-level platform axis: 'mobile' when any feature is OS-tagged; the
   // union of OSes that actually produced a result file this run.
@@ -154,6 +159,7 @@ function buildOneScreen(
   return {
     name: label,
     isFlow: target.isFlow,
+    kind: target.kind,
     platform: anyPlatform ? 'mobile' : undefined,
     featureName: primary.featureName,
     featurePath: primary.featurePath,
@@ -434,14 +440,24 @@ function bumpKey(record: Record<string, number>, key: string): void {
 // Path helpers (mirror delivery.ts to stay consistent)
 // ----------------------------------------------------------------------------
 
+/** qa/ subfolder for a unit kind (mirrors delivery.ts's qaParent). */
+function qaParent(kind: DashboardTarget['kind']): string {
+  return kind === 'flow' ? 'flows' : kind === 'api' ? 'api' : 'screens';
+}
+
 function qaDir(cwd: string, target: DashboardTarget): string {
-  return path.join(cwd, 'qa', target.isFlow ? 'flows' : 'screens', target.name);
+  return path.join(cwd, 'qa', qaParent(target.kind), target.name);
 }
 
 function generatedDir(cwd: string, target: DashboardTarget): string {
-  return target.isFlow
-    ? path.join(cwd, 'specs', 'generated', 'flows', target.name)
-    : path.join(cwd, 'specs', 'generated', target.name);
+  // Mirrors delivery.ts: screen → specs/generated/<name>, flow → …/flows/<name>,
+  // api → …/api/<name> (api flows carry name 'flows/<flow>', composing correctly).
+  const sub = target.kind === 'flow'
+    ? path.join('flows', target.name)
+    : target.kind === 'api'
+      ? path.join('api', target.name)
+      : target.name;
+  return path.join(cwd, 'specs', 'generated', sub);
 }
 
 // ----------------------------------------------------------------------------
@@ -451,17 +467,23 @@ function generatedDir(cwd: string, target: DashboardTarget): string {
 export function listDashboardTargets(cwd: string): DashboardTarget[] {
   const targets: DashboardTarget[] = [];
 
-  const screensDir = path.join(cwd, 'qa', 'screens');
-  if (fs.existsSync(screensDir)) {
-    for (const d of fs.readdirSync(screensDir, { withFileTypes: true })) {
-      if (d.isDirectory()) targets.push({ name: d.name, isFlow: false });
+  const scan = (kind: DashboardTarget['kind'], skip: (n: string) => boolean = () => false): void => {
+    const dir = path.join(cwd, 'qa', qaParent(kind));
+    if (!fs.existsSync(dir)) return;
+    for (const d of fs.readdirSync(dir, { withFileTypes: true })) {
+      if (d.isDirectory() && !skip(d.name)) targets.push({ name: d.name, kind, isFlow: kind === 'flow' });
     }
-  }
-
-  const flowsDir = path.join(cwd, 'qa', 'flows');
-  if (fs.existsSync(flowsDir)) {
-    for (const d of fs.readdirSync(flowsDir, { withFileTypes: true })) {
-      if (d.isDirectory()) targets.push({ name: d.name, isFlow: true });
+  };
+  scan('screen');
+  scan('flow');
+  scan('api', (n) => n === 'flows');  // api areas: qa/api/<area> (the flows/ container is a nested tier)
+
+  // api flows: qa/api/flows/<flow> → name 'flows/<flow>', kind 'api'
+  // (paths compose to qa/api/flows/… + specs/generated/api/flows/…), mirroring delivery.ts.
+  const apiFlowsRoot = path.join(cwd, 'qa', 'api', 'flows');
+  if (fs.existsSync(apiFlowsRoot)) {
+    for (const d of fs.readdirSync(apiFlowsRoot, { withFileTypes: true })) {
+      if (d.isDirectory()) targets.push({ name: path.posix.join('flows', d.name), kind: 'api', isFlow: false });
     }
   }
 
@@ -469,10 +491,15 @@ export function listDashboardTargets(cwd: string): DashboardTarget[] {
 }
 
 export function resolveTargetType(cwd: string, name: string): DashboardTarget {
-  if (fs.existsSync(path.join(cwd, 'qa', 'flows', name))) {
-    return { name, isFlow: true };
-  }
-  return { name, isFlow: false };
+  if (fs.existsSync(path.join(cwd, 'qa', 'flows', name))) return { name, kind: 'flow', isFlow: true };
+  // Screen before api so `dashboard <name>` resolves the same unit as `delivery <name>`
+  // when a repo has both qa/screens/<name> and qa/api/<name> (delivery.ts precedence).
+  if (fs.existsSync(path.join(cwd, 'qa', 'screens', name))) return { name, kind: 'screen', isFlow: false };
+  if (fs.existsSync(path.join(cwd, 'qa', 'api', name))) return { name, kind: 'api', isFlow: false };
+  // `flows/<flow>` or a bare api-flow name → qa/api/flows/<flow>
+  const apiFlow = name.startsWith('flows/') ? name : path.posix.join('flows', name);
+  if (fs.existsSync(path.join(cwd, 'qa', 'api', apiFlow))) return { name: apiFlow, kind: 'api', isFlow: false };
+  return { name, kind: 'screen', isFlow: false };
 }
 
 // ----------------------------------------------------------------------------