Fixing an issue in the run command and updating the unit, integration, and e2e tests.

adrianwebb · adrianwebb · commit 3f42bac395b5 · 2025-12-15T23:29:40.000-05:00
diff --git a/src/commands/run.ts b/src/commands/run.ts
@@ -38,7 +38,7 @@ export default class RunCommand extends BaseCommand {
 
         // Initialize command to default npm run
         const finalCmd = 'npm';
-        const finalArgs = ['run', script, '--', ...scriptArgs];
+        let finalArgs = null;
         let execPath = null;
 
         // Check for module:script syntax
@@ -64,6 +64,7 @@ export default class RunCommand extends BaseCommand {
                 this.error(`Failed to find package.json for module ${moduleName}`);
                 return;
             }
+            finalArgs = ['run', scriptName, '--', ...scriptArgs];
             execPath = modulePath;
 
         } else {
@@ -73,6 +74,7 @@ export default class RunCommand extends BaseCommand {
                 this.error(`Script ${script} does not exist in Astrical core`);
                 return;
             }
+            finalArgs = ['run', script, '--', ...scriptArgs];
             execPath = siteDir;
         }
 
diff --git a/test/e2e/lifecycle.e2e.test.ts b/test/e2e/lifecycle.e2e.test.ts
@@ -49,13 +49,24 @@ if (args[0] === 'build') {
                 dependencies: {
                     // Use file: protocol to point to local mock
                     'astro': `file:${mockAstroDir}`
+                },
+                scripts: {
+                    'build': 'astro build',
+                    'dev': 'astro dev',
+                    'preview': 'astro preview'
                 }
             }),
             'README.md': '# E2E Starter',
             'astrical.yml': 'name: e2e-test\nversion: 0.0.1', // ESSENTIAL for CLI to recognize project
             'src/pages/index.astro': '--- ---',
             'src/core/index.ts': '// core',
-            'src/core/package.json': '{}'
+            'src/core/package.json': JSON.stringify({
+                scripts: {
+                    'build': 'astro build',
+                    'dev': 'astro dev',
+                    'preview': 'astro preview'
+                }
+            })
         });
 
         // 3. Setup Mock Module Repo
diff --git a/test/integration/commands/build.integration.test.ts b/test/integration/commands/build.integration.test.ts
@@ -74,7 +74,7 @@ describe('BuildCommand Integration', () => {
         // 2. Verify exec called with local binary
         // BuildCommand uses runCommand -> exec
         expect(execMock).toHaveBeenCalledWith(
-            expect.stringContaining('node_modules/.bin/astro build'),
+            expect.stringContaining('npm run build'),
             expect.objectContaining({
                 cwd: expect.stringContaining('_site')
             }),
diff --git a/test/integration/commands/clean.integration.test.ts b/test/integration/commands/clean.integration.test.ts
@@ -11,8 +11,8 @@ describe('CleanCommand Integration', () => {
     beforeEach(async () => {
         tempDir = await createTempDir('clean-integration-');
         // Setup initial state
-        await fs.ensureDir(path.join(tempDir, 'dist'));
-        await fs.outputFile(path.join(tempDir, 'dist', 'index.js'), 'console.log("hi")');
+        await fs.ensureDir(path.join(tempDir, '_site'));
+        await fs.outputFile(path.join(tempDir, '_site', 'index.html'), '<html></html>');
         await fs.ensureDir(path.join(tempDir, 'node_modules'));
         await fs.outputFile(path.join(tempDir, 'node_modules', 'pkg.json'), '{}');
     });
@@ -21,27 +21,18 @@ describe('CleanCommand Integration', () => {
         if (tempDir) await fs.remove(tempDir);
     });
 
-    it('should remove dist and node_modules directories', async () => {
+    it('should remove _site and node_modules directories', async () => {
         const cli = new CLI({ commandName: 'astrical' });
         const command = new CleanCommand(cli);
-        // CleanCommand usually runs in process.cwd(), so we need to mock that or pass directory if supported.
-        // Checking clean.ts implementation... it uses process.cwd().
-        // We can spy spy process.cwd() or similar.
-
-        // Wait, does CleanCommand accept a directory argument? 
-        // Let's check implementation. If not, we have to change process.cwd.
 
         const originalCwd = process.cwd();
         try {
             process.chdir(tempDir);
 
-            await command.run();
-
-            expect(fs.existsSync(path.join(tempDir, 'dist'))).toBe(false);
-            // clean command removes node_modules/.vite, not the whole node_modules
-            expect(fs.existsSync(path.join(tempDir, 'node_modules', '.vite'))).toBe(false);
-            expect(fs.existsSync(path.join(tempDir, 'node_modules'))).toBe(true);
+            await command.run({});
 
+            expect(fs.existsSync(path.join(tempDir, '_site'))).toBe(false);
+            expect(fs.existsSync(path.join(tempDir, 'node_modules'))).toBe(false);
         } finally {
             process.chdir(originalCwd);
         }
diff --git a/test/integration/commands/dev_preview.integration.test.ts b/test/integration/commands/dev_preview.integration.test.ts
@@ -5,7 +5,7 @@ import PreviewCommand from '../../../src/commands/preview.js';
 import { createTempDir } from '../../utils/integration-helpers.js';
 import path from 'node:path';
 import fs from 'fs-extra';
-import { spawn } from 'child_process';
+import { spawn, exec } from 'child_process';
 import EventEmitter from 'events';
 
 vi.mock('child_process', () => ({
@@ -32,6 +32,12 @@ describe('Dev/Preview Integration', () => {
             setTimeout(() => child.emit('close', 0), 10);
             return child;
         });
+
+        vi.mocked(exec).mockImplementation(((cmd: string, options: any, cb: any) => {
+            const callback = cb || options;
+            callback(null, { stdout: '', stderr: '' });
+            return {} as any;
+        }) as any);
     });
 
     afterEach(() => {
diff --git a/test/integration/commands/run.integration.test.ts b/test/integration/commands/run.integration.test.ts
@@ -22,15 +22,26 @@ describe('RunCommand Integration', () => {
 
         // Setup minimal env
         await fs.ensureDir(path.join(projectDir, 'src', 'core'));
-
-        // Setup a module with a script
+        await fs.outputFile(path.join(projectDir, 'src', 'core', 'package.json'), JSON.stringify({
+            name: 'astrical-core',
+            scripts: {
+                'test-script': 'echo test'
+            }
+        }));
         await fs.ensureDir(path.join(projectDir, 'src', 'modules', 'my-auth'));
         await fs.outputFile(path.join(projectDir, 'src', 'modules', 'my-auth', 'package.json'), JSON.stringify({
             scripts: {
                 'seed': 'node seed.js'
             }
         }));
 
+        await fs.ensureDir(path.join(projectDir, '_site'));
+        await fs.outputFile(path.join(projectDir, '_site', 'package.json'), JSON.stringify({
+            scripts: {
+                'test-script': 'echo test'
+            }
+        }));
+
         spawnMock = vi.mocked(spawn).mockImplementation(() => {
             const child: any = new EventEmitter();
             child.stdout = new EventEmitter();
@@ -55,7 +66,7 @@ describe('RunCommand Integration', () => {
         const command = new RunCommand(cli);
         Object.assign(command, { projectRoot: projectDir });
 
-        await command.run('test-script', '--flag', {}); // Add options object
+        await command.run({ script: 'test-script', args: ['--flag'] });
 
         expect(spawnMock).toHaveBeenCalledWith(
             'npm',
@@ -71,18 +82,15 @@ describe('RunCommand Integration', () => {
         const command = new RunCommand(cli);
         Object.assign(command, { projectRoot: projectDir });
 
-        await command.run('my-auth:seed', '--force', {}); // Add options object
-
-        // Module scripts run using sh -c or cmd /c
-        const expectedCmd = process.platform === 'win32' ? 'cmd' : 'sh';
-        const expectedArgs = process.platform === 'win32'
-            ? ['/c', 'node seed.js --force']
-            : ['-c', 'node seed.js --force'];
+        await command.run({ script: 'my-auth:seed', args: ['--force'] });
 
+        // Module scripts run via npm run scriptName inside module dir
         expect(spawnMock).toHaveBeenCalledWith(
-            expectedCmd,
-            expectedArgs,
-            expect.anything()
+            'npm',
+            ['run', 'seed', '--', '--force'],
+            expect.objectContaining({
+                cwd: expect.stringContaining(path.join('modules', 'my-auth'))
+            })
         );
     });
 });
diff --git a/test/unit/commands/build.test.ts b/test/unit/commands/build.test.ts
@@ -76,7 +76,7 @@ describe('BuildCommand', () => {
         expect(copyEnvironment).toHaveBeenCalledWith('/mock/root');
 
         expect(runCommand).toHaveBeenCalledWith(
-            expect.stringContaining('/mock/root/node_modules/.bin/astro build'),
+            'npm run build',
             expect.stringContaining('_site')
         );
 
diff --git a/test/unit/commands/run.test.ts b/test/unit/commands/run.test.ts

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export default class RunCommand extends BaseCommand {`
`38`	`38`
`39`	`39`	`// Initialize command to default npm run`
`40`	`40`	`const finalCmd = 'npm';`
`41`		`- const finalArgs = ['run', script, '--', ...scriptArgs];`
	`41`	`+ let finalArgs = null;`
`42`	`42`	`let execPath = null;`
`43`	`43`
`44`	`44`	`// Check for module:script syntax`
`@@ -64,6 +64,7 @@ export default class RunCommand extends BaseCommand {`
`64`	`64`	this.error(`Failed to find package.json for module ${moduleName}`);
`65`	`65`	`return;`
`66`	`66`	`}`
	`67`	`+ finalArgs = ['run', scriptName, '--', ...scriptArgs];`
`67`	`68`	`execPath = modulePath;`
`68`	`69`
`69`	`70`	`} else {`
`@@ -73,6 +74,7 @@ export default class RunCommand extends BaseCommand {`
`73`	`74`	this.error(`Script ${script} does not exist in Astrical core`);
`74`	`75`	`return;`
`75`	`76`	`}`
	`77`	`+ finalArgs = ['run', script, '--', ...scriptArgs];`
`76`	`78`	`execPath = siteDir;`
`77`	`79`	`}`
`78`	`80`