@codeyam/codeyam-cli 0.1.0-staging.09652b8 → 0.1.0-staging.0a69043

package/codeyam-cli/src/utils/__tests__/git.editor.test.js

@@ -0,0 +1,134 @@
+import { validateCommitSha, verifyCommitExists, gitStash, gitCheckout, } from "../git.js";
+import { execSync } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+describe('git editor utilities', () => {
+    describe('validateCommitSha', () => {
+        it('should accept a valid 7-char short SHA', () => {
+            expect(validateCommitSha('abc1234')).toBe(true);
+        });
+        it('should accept a valid 40-char full SHA', () => {
+            expect(validateCommitSha('abc1234567890def1234567890abc123456789de')).toBe(true);
+        });
+        it('should accept uppercase hex chars', () => {
+            expect(validateCommitSha('ABC1234DEF')).toBe(true);
+        });
+        it('should reject too-short SHAs (< 7 chars)', () => {
+            expect(validateCommitSha('abc12')).toBe(false);
+        });
+        it('should reject too-long SHAs (> 40 chars)', () => {
+            expect(validateCommitSha('a'.repeat(41))).toBe(false);
+        });
+        it('should reject non-hex characters', () => {
+            expect(validateCommitSha('abcdefg')).toBe(false);
+        });
+        it('should reject empty string', () => {
+            expect(validateCommitSha('')).toBe(false);
+        });
+        it('should reject command injection attempts', () => {
+            expect(validateCommitSha('abc1234; rm -rf /')).toBe(false);
+        });
+    });
+    describe('verifyCommitExists', () => {
+        let tempDir;
+        beforeEach(() => {
+            tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'git-test-'));
+            execSync('git init', { cwd: tempDir, stdio: 'pipe' });
+            execSync('git config user.email "test@test.com"', {
+                cwd: tempDir,
+                stdio: 'pipe',
+            });
+            execSync('git config user.name "Test"', { cwd: tempDir, stdio: 'pipe' });
+            fs.writeFileSync(path.join(tempDir, 'file.txt'), 'hello');
+            execSync('git add -A && git commit -m "initial"', {
+                cwd: tempDir,
+                stdio: 'pipe',
+            });
+        });
+        afterEach(() => {
+            fs.rmSync(tempDir, { recursive: true, force: true });
+        });
+        it('should return true for an existing commit', () => {
+            const sha = execSync('git rev-parse HEAD', {
+                cwd: tempDir,
+                encoding: 'utf8',
+            }).trim();
+            expect(verifyCommitExists(tempDir, sha)).toBe(true);
+        });
+        it('should return false for a non-existent commit', () => {
+            expect(verifyCommitExists(tempDir, 'deadbeefdeadbeef')).toBe(false);
+        });
+    });
+    describe('gitStash', () => {
+        let tempDir;
+        beforeEach(() => {
+            tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'git-stash-test-'));
+            execSync('git init', { cwd: tempDir, stdio: 'pipe' });
+            execSync('git config user.email "test@test.com"', {
+                cwd: tempDir,
+                stdio: 'pipe',
+            });
+            execSync('git config user.name "Test"', { cwd: tempDir, stdio: 'pipe' });
+            fs.writeFileSync(path.join(tempDir, 'file.txt'), 'hello');
+            execSync('git add -A && git commit -m "initial"', {
+                cwd: tempDir,
+                stdio: 'pipe',
+            });
+        });
+        afterEach(() => {
+            fs.rmSync(tempDir, { recursive: true, force: true });
+        });
+        it('should stash uncommitted changes', () => {
+            fs.writeFileSync(path.join(tempDir, 'file.txt'), 'modified');
+            const result = gitStash(tempDir, 'test stash');
+            expect(result.stashed).toBe(true);
+            // File should be restored to committed state
+            const content = fs.readFileSync(path.join(tempDir, 'file.txt'), 'utf8');
+            expect(content).toBe('hello');
+        });
+        it('should return stashed=false when nothing to stash', () => {
+            const result = gitStash(tempDir, 'test stash');
+            expect(result.stashed).toBe(false);
+        });
+    });
+    describe('gitCheckout', () => {
+        let tempDir;
+        let firstSha;
+        beforeEach(() => {
+            tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'git-checkout-test-'));
+            execSync('git init', { cwd: tempDir, stdio: 'pipe' });
+            execSync('git config user.email "test@test.com"', {
+                cwd: tempDir,
+                stdio: 'pipe',
+            });
+            execSync('git config user.name "Test"', { cwd: tempDir, stdio: 'pipe' });
+            fs.writeFileSync(path.join(tempDir, 'file.txt'), 'v1');
+            execSync('git add -A && git commit -m "first"', {
+                cwd: tempDir,
+                stdio: 'pipe',
+            });
+            firstSha = execSync('git rev-parse HEAD', {
+                cwd: tempDir,
+                encoding: 'utf8',
+            }).trim();
+            fs.writeFileSync(path.join(tempDir, 'file.txt'), 'v2');
+            execSync('git add -A && git commit -m "second"', {
+                cwd: tempDir,
+                stdio: 'pipe',
+            });
+        });
+        afterEach(() => {
+            fs.rmSync(tempDir, { recursive: true, force: true });
+        });
+        it('should checkout a specific commit', () => {
+            gitCheckout(tempDir, firstSha);
+            const content = fs.readFileSync(path.join(tempDir, 'file.txt'), 'utf8');
+            expect(content).toBe('v1');
+        });
+        it('should throw on invalid ref', () => {
+            expect(() => gitCheckout(tempDir, 'nonexistent_ref')).toThrow();
+        });
+    });
+});
+//# sourceMappingURL=git.editor.test.js.map

package/codeyam-cli/src/utils/__tests__/git.editor.test.js.map

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

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

@@ -0,0 +1,177 @@
+import { validateGlossaryEntry, mergeGlossaryEntries } from "../glossaryAdd.js";
+describe('glossaryAdd', () => {
+    describe('validateGlossaryEntry', () => {
+        it('should accept a valid entry with all required fields', () => {
+            const result = validateGlossaryEntry({
+                name: 'DrinkCard',
+                filePath: 'app/components/DrinkCard.tsx',
+                description: 'Displays a single drink item',
+            });
+            expect(result.valid).toBe(true);
+            expect(result.error).toBeUndefined();
+        });
+        it('should reject missing name', () => {
+            const result = validateGlossaryEntry({
+                filePath: 'app/components/DrinkCard.tsx',
+                description: 'Displays a single drink item',
+            });
+            expect(result.valid).toBe(false);
+            expect(result.error).toContain('name');
+        });
+        it('should reject missing filePath', () => {
+            const result = validateGlossaryEntry({
+                name: 'DrinkCard',
+                description: 'Displays a single drink item',
+            });
+            expect(result.valid).toBe(false);
+            expect(result.error).toContain('filePath');
+        });
+        it('should reject missing description', () => {
+            const result = validateGlossaryEntry({
+                name: 'DrinkCard',
+                filePath: 'app/components/DrinkCard.tsx',
+            });
+            expect(result.valid).toBe(false);
+            expect(result.error).toContain('description');
+        });
+        it('should reject non-object input', () => {
+            expect(validateGlossaryEntry('string').valid).toBe(false);
+            expect(validateGlossaryEntry(null).valid).toBe(false);
+            expect(validateGlossaryEntry(42).valid).toBe(false);
+        });
+    });
+    describe('mergeGlossaryEntries', () => {
+        it('should append new entry to empty array', () => {
+            const result = mergeGlossaryEntries([], [
+                {
+                    name: 'DrinkCard',
+                    filePath: 'app/components/DrinkCard.tsx',
+                    description: 'A drink card',
+                },
+            ]);
+            expect(result.entries).toHaveLength(1);
+            expect(result.entries[0].name).toBe('DrinkCard');
+            expect(result.added).toBe(1);
+            expect(result.updated).toBe(0);
+            expect(result.errors).toHaveLength(0);
+        });
+        it('should append new entry to existing array', () => {
+            const existing = [
+                {
+                    name: 'Header',
+                    filePath: 'app/components/Header.tsx',
+                    description: 'Page header',
+                },
+            ];
+            const result = mergeGlossaryEntries(existing, [
+                {
+                    name: 'DrinkCard',
+                    filePath: 'app/components/DrinkCard.tsx',
+                    description: 'A drink card',
+                },
+            ]);
+            expect(result.entries).toHaveLength(2);
+            expect(result.added).toBe(1);
+            expect(result.updated).toBe(0);
+        });
+        it('should update existing entry when name + filePath match', () => {
+            const existing = [
+                {
+                    name: 'DrinkCard',
+                    filePath: 'app/components/DrinkCard.tsx',
+                    description: 'Old description',
+                },
+            ];
+            const result = mergeGlossaryEntries(existing, [
+                {
+                    name: 'DrinkCard',
+                    filePath: 'app/components/DrinkCard.tsx',
+                    description: 'New description',
+                },
+            ]);
+            expect(result.entries).toHaveLength(1);
+            expect(result.entries[0].description).toBe('New description');
+            expect(result.added).toBe(0);
+            expect(result.updated).toBe(1);
+        });
+        it('should handle mix of new and updated entries', () => {
+            const existing = [
+                {
+                    name: 'Header',
+                    filePath: 'app/components/Header.tsx',
+                    description: 'Page header',
+                },
+                {
+                    name: 'DrinkCard',
+                    filePath: 'app/components/DrinkCard.tsx',
+                    description: 'Old',
+                },
+            ];
+            const result = mergeGlossaryEntries(existing, [
+                {
+                    name: 'DrinkCard',
+                    filePath: 'app/components/DrinkCard.tsx',
+                    description: 'Updated',
+                },
+                {
+                    name: 'Footer',
+                    filePath: 'app/components/Footer.tsx',
+                    description: 'Page footer',
+                },
+            ]);
+            expect(result.entries).toHaveLength(3);
+            expect(result.added).toBe(1);
+            expect(result.updated).toBe(1);
+            // Updated entry should preserve its position
+            expect(result.entries[1].name).toBe('DrinkCard');
+            expect(result.entries[1].description).toBe('Updated');
+        });
+        it('should return correct added/updated counts', () => {
+            const existing = [
+                { name: 'A', filePath: 'a.ts', description: 'a' },
+                { name: 'B', filePath: 'b.ts', description: 'b' },
+            ];
+            const result = mergeGlossaryEntries(existing, [
+                { name: 'A', filePath: 'a.ts', description: 'updated a' },
+                { name: 'C', filePath: 'c.ts', description: 'new c' },
+                { name: 'D', filePath: 'd.ts', description: 'new d' },
+            ]);
+            expect(result.added).toBe(2);
+            expect(result.updated).toBe(1);
+            expect(result.entries).toHaveLength(4);
+        });
+        it('should preserve extra fields on existing entries not in incoming', () => {
+            const existing = [
+                {
+                    name: 'DrinkCard',
+                    filePath: 'app/components/DrinkCard.tsx',
+                    description: 'Old',
+                    returnType: 'JSX.Element',
+                    testFile: 'tests/DrinkCard.test.ts',
+                },
+            ];
+            const result = mergeGlossaryEntries(existing, [
+                {
+                    name: 'DrinkCard',
+                    filePath: 'app/components/DrinkCard.tsx',
+                    description: 'New',
+                },
+            ]);
+            expect(result.entries[0].returnType).toBe('JSX.Element');
+            expect(result.entries[0].testFile).toBe('tests/DrinkCard.test.ts');
+            expect(result.entries[0].description).toBe('New');
+        });
+        it('should report errors for invalid entries', () => {
+            const result = mergeGlossaryEntries([], [
+                { name: 'Good', filePath: 'a.ts', description: 'valid' },
+                { filePath: 'b.ts', description: 'missing name' },
+                { name: 'Also Good', filePath: 'c.ts', description: 'valid' },
+            ]);
+            expect(result.entries).toHaveLength(2);
+            expect(result.added).toBe(2);
+            expect(result.errors).toHaveLength(1);
+            expect(result.errors[0].index).toBe(1);
+        });
+    });
+});
+//# sourceMappingURL=glossaryAdd.test.js.map

package/codeyam-cli/src/utils/__tests__/glossaryAdd.test.js.map

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

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

@@ -0,0 +1,122 @@
+import * as http from 'http';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+import { execSync } from 'child_process';
+import { runCaptureScript, resolveCaptureScript } from "../editorCapture.js";
+// Skip when Playwright browsers aren't installed (CI unit test jobs
+// may not have them — they're only installed for integration tests).
+let hasPlaywright = false;
+try {
+    // Playwright stores browsers in a platform-specific cache directory.
+    // Rather than guessing the path, try to resolve the chromium executable.
+    const result = execSync('node -e "const { chromium } = require(\'playwright\'); console.log(chromium.executablePath())"', { stdio: 'pipe', timeout: 10000 });
+    const execPath = result.toString().trim();
+    hasPlaywright = !!execPath && fs.existsSync(execPath);
+}
+catch {
+    hasPlaywright = false;
+}
+const describeIfPlaywright = hasPlaywright ? describe : describe.skip;
+/**
+ * Integration test for journalCapture.ts page stabilization.
+ *
+ * Verifies that the capture script waits for client-side JavaScript to finish
+ * rendering before taking a screenshot. This prevents blank/skeleton screenshots
+ * when pages use useEffect + fetch to load data (the standard React pattern).
+ *
+ * The test uses a simple HTTP server with a page that:
+ * 1. Shows "Loading..." initially
+ * 2. Fetches data from an API endpoint after a delay (simulating useEffect)
+ * 3. Renders the data and updates document.title to "LOADED"
+ *
+ * journalCapture.ts logs the page title right before taking the screenshot.
+ * If the stabilization logic works correctly, the title will be "LOADED".
+ */
+describeIfPlaywright('journalCapture page stabilization', () => {
+    let tempDir;
+    let server;
+    let port;
+    let captureScriptPath;
+    const API_RESPONSE_DELAY_MS = 200;
+    // Serve a page that simulates React useEffect + fetch pattern.
+    // The fetch fires after a brief delay (simulating React mount/hydration),
+    // and the API responds after API_RESPONSE_DELAY_MS.
+    const pageHtml = `<!DOCTYPE html>
+<html>
+<head><title>LOADING</title></head>
+<body style="margin:0; font-family:sans-serif;">
+  <div id="root" style="padding:20px;">
+    <div id="content" style="font-size:24px; color:#999;">Loading...</div>
+  </div>
+  <script>
+    // Simulate React lifecycle: component mounts, useEffect fires, fetch starts
+    // requestAnimationFrame simulates the async mount cycle
+    requestAnimationFrame(function() {
+      setTimeout(function() {
+        fetch('/api/data')
+          .then(function(r) { return r.json(); })
+          .then(function(data) {
+            document.getElementById('content').textContent = data.message;
+            document.getElementById('content').style.color = '#000';
+            document.getElementById('content').style.background = '#4ade80';
+            document.title = 'LOADED';
+          });
+      }, 50);
+    });
+  </script>
+</body>
+</html>`;
+    beforeAll(async () => {
+        tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'journal-capture-stab-test-'));
+        // Resolve the actual journalCapture.ts script path
+        const webserverDir = path.resolve(__dirname, '../../webserver');
+        const codeyamRoot = path.resolve(__dirname, '../../..');
+        captureScriptPath = await resolveCaptureScript(webserverDir, codeyamRoot);
+        // Start HTTP server
+        server = http.createServer((req, res) => {
+            if (req.url === '/') {
+                res.writeHead(200, { 'Content-Type': 'text/html' });
+                res.end(pageHtml);
+            }
+            else if (req.url === '/api/data') {
+                // Simulate API response delay
+                setTimeout(() => {
+                    res.writeHead(200, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ message: 'Content loaded successfully' }));
+                }, API_RESPONSE_DELAY_MS);
+            }
+            else {
+                res.writeHead(404);
+                res.end();
+            }
+        });
+        await new Promise((resolve) => {
+            server.listen(0, () => resolve());
+        });
+        port = server.address().port;
+    });
+    afterAll(() => {
+        server?.close();
+        if (tempDir) {
+            fs.rmSync(tempDir, { recursive: true, force: true });
+        }
+    });
+    it('should capture content rendered by client-side JavaScript fetch', async () => {
+        const outputPath = path.join(tempDir, 'screenshot.png');
+        const captureArgs = JSON.stringify({
+            url: `http://localhost:${port}/`,
+            outputPath,
+            viewportWidth: 800,
+            viewportHeight: 600,
+        });
+        const result = await runCaptureScript(captureScriptPath, captureArgs, tempDir);
+        expect(result.success).toBe(true);
+        expect(fs.existsSync(outputPath)).toBe(true);
+        // The capture script logs the page title right before taking the screenshot.
+        // If it waited for client-side JS to finish, the title should be "LOADED".
+        // If it captured too early (during loading state), the title would be "LOADING".
+        expect(result.output).toContain('Page title: LOADED');
+    }, 30000);
+});
+//# sourceMappingURL=journalCaptureStabilization.test.js.map

package/codeyam-cli/src/utils/__tests__/journalCaptureStabilization.test.js.map

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