@codeyam/codeyam-cli 0.1.0-staging.2ea44f6 → 0.1.0-staging.3ef993e

package/codeyam-cli/src/utils/__tests__/entityChangeStatus.test.js

@@ -1,4 +1,4 @@
-import { buildReverseDependencyGraph, classifyDirectChanges, computeEntityChangeStatus, buildChangedFilesMap, pageNameFromUrl, buildEntityInfosFromScenarios, buildEntityInfosFromGlossary, filterGroupsByChangeStatus, filterGlossaryByChangeStatus, filterScenarioScreenshotsByChangeStatus, } from "../entityChangeStatus.js";
+import { buildReverseDependencyGraph, classifyDirectChanges, computeEntityChangeStatus, buildChangedFilesMap, pageNameFromUrl, scenarioEntityName, buildEntityInfosFromScenarios, buildEntityInfosFromGlossary, filterGroupsByChangeStatus, filterGlossaryByChangeStatus, filterScenarioScreenshotsByChangeStatus, } from "../entityChangeStatus.js";
 import { scanPageFilePaths, detectFirstFeature, readFeatureStartedAt, } from "../entityChangeStatus.server.js";
 import * as fsModule from 'fs';
 import * as pathModule from 'path';
@@ -128,6 +128,11 @@ describe('entityChangeStatus', () => {
             // This is an edge case — empty string is falsy so returns Home
             expect(pageNameFromUrl('')).toBe('Home');
         });
+        it('should return Home for root path with query string', () => {
+            expect(pageNameFromUrl('/?demo=empty')).toBe('Home');
+            expect(pageNameFromUrl('/?state=seeded')).toBe('Home');
+            expect(pageNameFromUrl('/?tab=overview&sort=date')).toBe('Home');
+        });
         it('should handle dynamic route segments', () => {
             expect(pageNameFromUrl('/drinks/[id]')).toBe('Drinks');
             expect(pageNameFromUrl('/users/[userId]/posts')).toBe('Users');
@@ -1298,81 +1303,274 @@ describe('entityChangeStatus', () => {
             expect(result).toEqual([]);
         });
     });
+    // ── scenarioEntityName ──────────────────────────────────────────────
+    describe('scenarioEntityName', () => {
+        it('should return componentName when set', () => {
+            expect(scenarioEntityName({
+                componentName: 'ReviewCard',
+                url: '/isolated-components/ReviewCard?s=Default',
+            })).toBe('ReviewCard');
+        });
+        it('should return page name from URL when componentName is null', () => {
+            expect(scenarioEntityName({ componentName: null, url: '/drinks/1' })).toBe('Drinks');
+        });
+        it('should return Home for root URL when componentName is null', () => {
+            expect(scenarioEntityName({ componentName: null, url: '/' })).toBe('Home');
+        });
+        it('should return Home when both componentName and url are null', () => {
+            expect(scenarioEntityName({ componentName: null, url: null })).toBe('Home');
+        });
+        it('should return page name when componentName is undefined', () => {
+            expect(scenarioEntityName({ url: '/settings' })).toBe('Settings');
+        });
+        it('should return Home when no fields provided', () => {
+            expect(scenarioEntityName({})).toBe('Home');
+        });
+    });
     // ── filterScenarioScreenshotsByChangeStatus ───────────────────────────
     describe('filterScenarioScreenshotsByChangeStatus', () => {
-        const screenshots = [
-            { name: 'Busy Month', path: 'busy.png' },
-            { name: 'Empty Calendar', path: 'empty.png' },
-            { name: 'EventPill - Default', path: 'pill.png' },
-            { name: 'ErrorState - Server Error', path: 'error.png' },
-            { name: 'CalendarGrid - Default', path: 'grid.png' },
-        ];
-        const pageNames = new Set(['Home']);
         it('should return all screenshots when entityChangeStatus is undefined', () => {
-            expect(filterScenarioScreenshotsByChangeStatus(screenshots, undefined, pageNames)).toEqual(screenshots);
+            const screenshots = [
+                { name: 'Busy Month', path: 'busy.png', componentName: null, url: '/' },
+                {
+                    name: 'EventPill - Default',
+                    path: 'pill.png',
+                    componentName: 'EventPill',
+                    url: '/isolated-components/EventPill',
+                },
+            ];
+            expect(filterScenarioScreenshotsByChangeStatus(screenshots, undefined)).toEqual(screenshots);
         });
         it('should return all screenshots when entityChangeStatus is empty', () => {
-            expect(filterScenarioScreenshotsByChangeStatus(screenshots, {}, pageNames)).toEqual(screenshots);
+            const screenshots = [
+                { name: 'Busy Month', path: 'busy.png', componentName: null, url: '/' },
+            ];
+            expect(filterScenarioScreenshotsByChangeStatus(screenshots, {})).toEqual(screenshots);
         });
-        it('should filter screenshots to only those matching entities with a change status', () => {
+        it('should include component scenarios whose entity has a change status', () => {
+            const screenshots = [
+                {
+                    name: 'EventPill - Default',
+                    path: 'pill.png',
+                    componentName: 'EventPill',
+                    url: '/isolated-components/EventPill',
+                },
+                {
+                    name: 'ErrorState - Server Error',
+                    path: 'error.png',
+                    componentName: 'ErrorState',
+                    url: '/isolated-components/ErrorState',
+                },
+                {
+                    name: 'CalendarGrid - Default',
+                    path: 'grid.png',
+                    componentName: 'CalendarGrid',
+                    url: '/isolated-components/CalendarGrid',
+                },
+            ];
             const status = {
                 ErrorState: { status: 'new' },
-                Home: { status: 'edited' },
+                EventPill: { status: 'edited' },
             };
-            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status, pageNames);
-            // App-level screenshots (no prefix) match because Home page has status
-            // "ErrorState - *" matches the ErrorState entity
+            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status);
             expect(result.map((s) => s.name)).toEqual([
-                'Busy Month',
-                'Empty Calendar',
+                'EventPill - Default',
                 'ErrorState - Server Error',
             ]);
         });
-        it('should handle screenshots without component prefix (app-level)', () => {
-            const appScreenshots = [
-                { name: 'Busy Month', path: 'busy.png' },
-                { name: 'Empty Calendar', path: 'empty.png' },
+        it('should include page scenarios whose page entity has a change status', () => {
+            const screenshots = [
+                { name: 'Busy Month', path: 'busy.png', componentName: null, url: '/' },
+                {
+                    name: 'Empty Calendar',
+                    path: 'empty.png',
+                    componentName: null,
+                    url: '/',
+                },
             ];
             const status = {
                 Home: { status: 'edited' },
             };
-            const result = filterScenarioScreenshotsByChangeStatus(appScreenshots, status, pageNames);
-            expect(result).toEqual(appScreenshots);
+            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status);
+            expect(result).toEqual(screenshots);
         });
-        it('should exclude app-level screenshots when no page entity has a status', () => {
+        it('should exclude page scenarios when their page entity has no status', () => {
+            const screenshots = [
+                { name: 'Busy Month', path: 'busy.png', componentName: null, url: '/' },
+                {
+                    name: 'EventPill - Default',
+                    path: 'pill.png',
+                    componentName: 'EventPill',
+                    url: '/isolated-components/EventPill',
+                },
+            ];
             const status = {
                 SomeComponent: { status: 'new' },
             };
-            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status, pageNames);
-            // No page entity has status, so app-level screenshots are excluded
-            // SomeComponent doesn't match any screenshot prefix either
+            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status);
+            // Home page has no status, so "Busy Month" is excluded
+            // SomeComponent doesn't match EventPill either
             expect(result).toEqual([]);
         });
-        it('should include app-level and matching component screenshots together', () => {
+        it('should include both page and component scenarios when both entities have status', () => {
+            const screenshots = [
+                { name: 'Busy Month', path: 'busy.png', componentName: null, url: '/' },
+                {
+                    name: 'Empty Calendar',
+                    path: 'empty.png',
+                    componentName: null,
+                    url: '/',
+                },
+                {
+                    name: 'EventPill - Default',
+                    path: 'pill.png',
+                    componentName: 'EventPill',
+                    url: '/isolated-components/EventPill',
+                },
+            ];
             const status = {
                 Home: { status: 'edited' },
                 EventPill: { status: 'new' },
             };
-            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status, pageNames);
+            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status);
             expect(result.map((s) => s.name)).toEqual([
                 'Busy Month',
                 'Empty Calendar',
                 'EventPill - Default',
             ]);
         });
-        it('should handle legacy "App - " prefixed scenario names (backward compat)', () => {
-            const legacyScreenshots = [
-                { name: 'App - Busy Month', path: 'busy.png' },
-                { name: 'App - Empty Calendar', path: 'empty.png' },
+        it('should handle page scenarios with dashes in names using URL, not name parsing', () => {
+            // The original bug: "Drink Detail - Earl Grey" was parsed as component "Drink Detail"
+            const screenshots = [
+                {
+                    name: 'Drink Detail - Earl Grey',
+                    path: 'earl.png',
+                    componentName: null,
+                    url: '/drinks/1',
+                },
+                {
+                    name: 'Drink Detail - No Reviews',
+                    path: 'no-reviews.png',
+                    componentName: null,
+                    url: '/drinks/1',
+                },
+                {
+                    name: 'ReviewCard - Default',
+                    path: 'review.png',
+                    componentName: 'ReviewCard',
+                    url: '/isolated-components/ReviewCard',
+                },
+                {
+                    name: 'Full Catalog',
+                    path: 'catalog.png',
+                    componentName: null,
+                    url: '/',
+                },
+            ];
+            const status = {
+                Drinks: { status: 'new' },
+                ReviewCard: { status: 'new' },
+                Home: { status: 'edited' },
+            };
+            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status);
+            expect(result.map((s) => s.name)).toEqual([
+                'Drink Detail - Earl Grey',
+                'Drink Detail - No Reviews',
+                'ReviewCard - Default',
+                'Full Catalog',
+            ]);
+        });
+        it('should exclude page scenarios for unchanged pages even with dashes in names', () => {
+            const screenshots = [
+                {
+                    name: 'Drink Detail - Earl Grey',
+                    path: 'earl.png',
+                    componentName: null,
+                    url: '/drinks/1',
+                },
+                {
+                    name: 'ReviewCard - Default',
+                    path: 'review.png',
+                    componentName: 'ReviewCard',
+                    url: '/isolated-components/ReviewCard',
+                },
+            ];
+            const status = {
+                ReviewCard: { status: 'edited' },
+            };
+            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status);
+            // Drinks page has no status, so "Drink Detail" page scenarios are excluded
+            expect(result.map((s) => s.name)).toEqual(['ReviewCard - Default']);
+        });
+        it('should use componentName for matching, not the name prefix', () => {
+            const screenshots = [
+                {
+                    name: 'Card Loading State - Spinner',
+                    path: 'spinner.png',
+                    componentName: 'LoadingCard',
+                    url: '/isolated-components/LoadingCard',
+                },
+            ];
+            const status = {
+                LoadingCard: { status: 'new' },
+            };
+            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status);
+            expect(result.map((s) => s.name)).toEqual([
+                'Card Loading State - Spinner',
+            ]);
+        });
+        it('should exclude component scenario when its entity has no status', () => {
+            const screenshots = [
+                {
+                    name: 'Card Loading State - Spinner',
+                    path: 'spinner.png',
+                    componentName: 'LoadingCard',
+                    url: '/isolated-components/LoadingCard',
+                },
+            ];
+            const status = {
+                SomeOtherComponent: { status: 'new' },
+            };
+            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status);
+            expect(result).toEqual([]);
+        });
+        it('should filter per-page independently (not all-or-nothing for pages)', () => {
+            // Only Drinks page changed, not Home — scenarios for each page should be filtered independently
+            const screenshots = [
+                {
+                    name: 'Full Catalog',
+                    path: 'catalog.png',
+                    componentName: null,
+                    url: '/',
+                },
+                {
+                    name: 'Drink Detail - Earl Grey',
+                    path: 'earl.png',
+                    componentName: null,
+                    url: '/drinks/1',
+                },
+            ];
+            const status = {
+                Drinks: { status: 'new' },
+            };
+            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status);
+            // Home page has no status, so "Full Catalog" is excluded
+            // Drinks page has status, so "Drink Detail" is included
+            expect(result.map((s) => s.name)).toEqual(['Drink Detail - Earl Grey']);
+        });
+        it('should fall back to name-based parsing when componentName is not present (backward compat)', () => {
+            const screenshots = [
                 { name: 'EventPill - Default', path: 'pill.png' },
+                { name: 'Full Calendar', path: 'cal.png' },
             ];
             const status = {
+                EventPill: { status: 'new' },
                 Home: { status: 'edited' },
             };
-            const result = filterScenarioScreenshotsByChangeStatus(legacyScreenshots, status, pageNames);
+            const result = filterScenarioScreenshotsByChangeStatus(screenshots, status);
             expect(result.map((s) => s.name)).toEqual([
-                'App - Busy Month',
-                'App - Empty Calendar',
+                'EventPill - Default',
+                'Full Calendar',
             ]);
         });
     });
@@ -1411,12 +1609,12 @@ describe('entityChangeStatus', () => {
             const result = scanPageFilePaths(tempDir);
             expect(result).toEqual({ Home: 'app/page.js' });
         });
-        it('should skip codeyam-isolate directories', () => {
+        it('should skip isolated-components directories', () => {
             const appDir = pathModule.join(tempDir, 'app');
-            fsModule.mkdirSync(pathModule.join(appDir, 'codeyam-isolate', 'test'), {
+            fsModule.mkdirSync(pathModule.join(appDir, 'isolated-components', 'test'), {
                 recursive: true,
             });
-            fsModule.writeFileSync(pathModule.join(appDir, 'codeyam-isolate', 'test', 'page.tsx'), '');
+            fsModule.writeFileSync(pathModule.join(appDir, 'isolated-components', 'test', 'page.tsx'), '');
             const result = scanPageFilePaths(tempDir);
             expect(result).toEqual({});
         });
@@ -1424,6 +1622,57 @@ describe('entityChangeStatus', () => {
             const result = scanPageFilePaths(tempDir);
             expect(result).toEqual({});
         });
+        // ── Expo Router support ──────────────────────────────────────────────
+        it('should find index.tsx as Home page (Expo Router)', () => {
+            const appDir = pathModule.join(tempDir, 'app');
+            fsModule.mkdirSync(appDir, { recursive: true });
+            fsModule.writeFileSync(pathModule.join(appDir, 'index.tsx'), '');
+            const result = scanPageFilePaths(tempDir);
+            expect(result).toEqual({ Home: 'app/index.tsx' });
+        });
+        it('should find named route files as pages (Expo Router)', () => {
+            const appDir = pathModule.join(tempDir, 'app');
+            fsModule.mkdirSync(appDir, { recursive: true });
+            fsModule.writeFileSync(pathModule.join(appDir, 'index.tsx'), '');
+            fsModule.writeFileSync(pathModule.join(appDir, 'add-tea.tsx'), '');
+            fsModule.mkdirSync(pathModule.join(appDir, 'tea'), { recursive: true });
+            fsModule.writeFileSync(pathModule.join(appDir, 'tea', '[id].tsx'), '');
+            const result = scanPageFilePaths(tempDir);
+            expect(result).toEqual({
+                Home: 'app/index.tsx',
+                'Add-tea': 'app/add-tea.tsx',
+                Tea: 'app/tea/[id].tsx',
+            });
+        });
+        it('should skip _layout.tsx files (Expo Router)', () => {
+            const appDir = pathModule.join(tempDir, 'app');
+            fsModule.mkdirSync(appDir, { recursive: true });
+            fsModule.writeFileSync(pathModule.join(appDir, '_layout.tsx'), '');
+            fsModule.writeFileSync(pathModule.join(appDir, 'index.tsx'), '');
+            const result = scanPageFilePaths(tempDir);
+            expect(result).toEqual({ Home: 'app/index.tsx' });
+        });
+        it('should handle route groups like (tabs) transparently (Expo Router)', () => {
+            const appDir = pathModule.join(tempDir, 'app');
+            const tabsDir = pathModule.join(appDir, '(tabs)');
+            fsModule.mkdirSync(tabsDir, { recursive: true });
+            fsModule.writeFileSync(pathModule.join(tabsDir, '_layout.tsx'), '');
+            fsModule.writeFileSync(pathModule.join(tabsDir, 'index.tsx'), '');
+            fsModule.writeFileSync(pathModule.join(tabsDir, 'settings.tsx'), '');
+            const result = scanPageFilePaths(tempDir);
+            expect(result).toEqual({
+                Home: 'app/(tabs)/index.tsx',
+                Settings: 'app/(tabs)/settings.tsx',
+            });
+        });
+        it('should prefer page.tsx over index.tsx when both exist (Next.js priority)', () => {
+            const appDir = pathModule.join(tempDir, 'app');
+            fsModule.mkdirSync(appDir, { recursive: true });
+            fsModule.writeFileSync(pathModule.join(appDir, 'page.tsx'), '');
+            fsModule.writeFileSync(pathModule.join(appDir, 'index.tsx'), '');
+            const result = scanPageFilePaths(tempDir);
+            expect(result).toEqual({ Home: 'app/page.tsx' });
+        });
     });
     // ── detectFirstFeature ─────────────────────────────────────────────────
     describe('detectFirstFeature', () => {