neex 0.1.8 → 0.2.5

package/dist/src/cli.js

@@ -3,48 +3,143 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// src/cli.ts - Main CLI file (refactored)
+// src/cli.ts - Updated version
 const commander_1 = require("commander");
-const index_js_1 = require("./commands/index.js");
+const index_js_1 = require("./index.js");
 const chalk_1 = __importDefault(require("chalk"));
 const figures_1 = __importDefault(require("figures"));
 const { version } = require('../../package.json');
 function cli() {
     const program = new commander_1.Command();
-    // Initialize cleanup handlers
-    const cleanupHandlers = [];
+    let cleanupRunner = null;
     program
         .name('neex')
-        .description('Professional script runner with nodemon and PM2 functionality')
+        .description('Professional script runner with beautiful colored output')
         .version(version);
-    // Add all command groups
-    (0, index_js_1.addRunCommands)(program);
-    (0, index_js_1.addServerCommands)(program);
-    const devCommands = (0, index_js_1.addDevCommands)(program);
-    cleanupHandlers.push(devCommands.cleanupDev);
-    const processCommands = (0, index_js_1.addProcessCommands)(program);
-    cleanupHandlers.push(processCommands.cleanupProcess);
+    // Main command for sequential execution (similar to run-s)
+    program
+        .command('run <commands...>')
+        .alias('s')
+        .description('Run commands sequentially')
+        .option('-c, --no-color', 'Disable colored output')
+        .option('-t, --no-timing', 'Hide timing information')
+        .option('-p, --no-prefix', 'Hide command prefix')
+        .option('-s, --stop-on-error', 'Stop on first error')
+        .option('-o, --no-output', 'Hide command output')
+        .option('-m, --minimal', 'Use minimal output format')
+        .action(async (commands, options) => {
+        try {
+            await (0, index_js_1.run)(commands, {
+                parallel: false,
+                color: options.color,
+                showTiming: options.timing,
+                prefix: options.prefix,
+                stopOnError: options.stopOnError,
+                printOutput: options.output,
+                minimalOutput: options.minimal,
+                registerCleanup: (cleanup) => { cleanupRunner = cleanup; }
+            });
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                console.error(chalk_1.default.red(`${figures_1.default.cross} Error: ${error.message}`));
+            }
+            else {
+                console.error(chalk_1.default.red(`${figures_1.default.cross} An unknown error occurred`));
+            }
+            process.exit(1);
+        }
+    });
+    // runx command: parallel execution by default (with alias 'p'), can run sequentially with -q
+    program
+        .command('runx <commands...>', { isDefault: true })
+        .alias('p')
+        .description('Run commands in parallel (default) or sequentially with -q. Alias: p')
+        .option('-c, --no-color', 'Disable colored output')
+        .option('-t, --no-timing', 'Hide timing information')
+        .option('-p, --no-prefix', 'Hide command prefix')
+        .option('-s, --stop-on-error', 'Stop on first error')
+        .option('-o, --no-output', 'Hide command output')
+        .option('-m, --minimal', 'Use minimal output format')
+        .option('-x, --max-parallel <number>', 'Maximum number of parallel processes', parseInt)
+        .option('-q, --sequential', 'Run commands sequentially instead of in parallel')
+        .action(async (commands, options) => {
+        try {
+            await (0, index_js_1.run)(commands, {
+                parallel: !options.sequential,
+                maxParallel: options.maxParallel,
+                color: options.color,
+                showTiming: options.timing,
+                prefix: options.prefix,
+                stopOnError: options.stopOnError,
+                printOutput: options.output,
+                minimalOutput: options.minimal,
+                registerCleanup: (cleanup) => { cleanupRunner = cleanup; }
+            });
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                console.error(chalk_1.default.red(`${figures_1.default.cross} Error: ${error.message}`));
+            }
+            else {
+                console.error(chalk_1.default.red(`${figures_1.default.cross} An unknown error occurred`));
+            }
+            process.exit(1);
+        }
+    });
+    // Add a new servers command specifically optimized for running web servers
+    program
+        .command('servers <commands...>')
+        .alias('srv')
+        .description('Run multiple servers with optimized output for API, frontend, etc.')
+        .option('-c, --no-color', 'Disable colored output')
+        .option('-t, --no-timing', 'Hide timing information')
+        .option('-p, --no-prefix', 'Hide command prefix')
+        .option('-s, --stop-on-error', 'Stop when any server crashes')
+        .option('-x, --max-parallel <number>', 'Maximum number of parallel servers', parseInt)
+        .option('-g, --group-output', 'Group outputs by server')
+        .action(async (commands, options) => {
+        try {
+            console.log(chalk_1.default.blue(`${figures_1.default.info} Starting servers in parallel mode...`));
+            await (0, index_js_1.run)(commands, {
+                parallel: true,
+                maxParallel: options.maxParallel,
+                color: options.color,
+                showTiming: options.timing,
+                prefix: options.prefix,
+                stopOnError: options.stopOnError,
+                printOutput: true,
+                registerCleanup: (cleanup) => { cleanupRunner = cleanup; },
+                groupOutput: options.groupOutput,
+                isServerMode: true // Special flag for server mode formatting
+            });
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                console.error(chalk_1.default.red(`${figures_1.default.cross} Server Error: ${error.message}`));
+            }
+            else {
+                console.error(chalk_1.default.red(`${figures_1.default.cross} An unknown server error occurred`));
+            }
+            process.exit(1);
+        }
+    });
     program.parse(process.argv);
     // Show help if no commands specified
     if (program.args.length === 0) {
         program.help();
     }
     // Graceful shutdown handling
-    const handleSignal = async (signal) => {
+    const handleSignal = (signal) => {
         console.log(`\n${chalk_1.default.yellow(`${figures_1.default.warning} Received ${signal}. Cleaning up...`)}`);
-        // Run all cleanup handlers
-        for (const cleanup of cleanupHandlers) {
-            try {
-                await cleanup();
-            }
-            catch (error) {
-                console.error(`Cleanup error:`, error);
-            }
+        if (cleanupRunner) {
+            cleanupRunner();
         }
+        // Give cleanup a moment, then exit
         setTimeout(() => process.exit(0), 500);
     };
-    process.on('SIGINT', () => handleSignal('SIGINT').catch(err => console.error('SIGINT handler error:', err)));
-    process.on('SIGTERM', () => handleSignal('SIGTERM').catch(err => console.error('SIGTERM handler error:', err)));
-    process.on('SIGQUIT', () => handleSignal('SIGQUIT').catch(err => console.error('SIGQUIT handler error:', err)));
+    process.on('SIGINT', () => handleSignal('SIGINT')); // Ctrl+C
+    process.on('SIGTERM', () => handleSignal('SIGTERM'));
+    process.on('SIGQUIT', () => handleSignal('SIGQUIT'));
 }
 exports.default = cli;

package/dist/src/index.js

@@ -23,9 +23,7 @@ async function run(commands, options) {
         stopOnError: (_f = options === null || options === void 0 ? void 0 : options.stopOnError) !== null && _f !== void 0 ? _f : false,
         minimalOutput: (_g = options === null || options === void 0 ? void 0 : options.minimalOutput) !== null && _g !== void 0 ? _g : false,
         groupOutput: (_h = options === null || options === void 0 ? void 0 : options.groupOutput) !== null && _h !== void 0 ? _h : false,
-        isServerMode: (_j = options === null || options === void 0 ? void 0 : options.isServerMode) !== null && _j !== void 0 ? _j : false,
-        retry: options === null || options === void 0 ? void 0 : options.retry,
-        retryDelay: options === null || options === void 0 ? void 0 : options.retryDelay
+        isServerMode: (_j = options === null || options === void 0 ? void 0 : options.isServerMode) !== null && _j !== void 0 ? _j : false
     };
     const runner = new runner_1.Runner(runOptions);
     if (options === null || options === void 0 ? void 0 : options.registerCleanup) {

package/dist/src/logger.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
 const figures_1 = __importDefault(require("figures"));
 const string_width_1 = __importDefault(require("string-width"));
-const utils_1 = require("./utils");
 class Logger {
     constructor() {
         this.prefixLength = 0;
@@ -121,9 +120,6 @@ class Logger {
         // Clear buffer after printing
         this.outputBuffer.set(command, []);
     }
-    clearBuffer(command) {
-        this.outputBuffer.set(command, []);
-    }
     printLine(message, level = 'info') {
         if (level === 'error') {
             console.error(chalk_1.default.red(`${figures_1.default.cross} ${message}`));
@@ -140,12 +136,6 @@ class Logger {
         this.startTimes.set(command, new Date());
         const prefix = this.formatPrefix(command);
         const color = this.commandColors.get(command) || chalk_1.default.white;
-        // Stop any previous spinner for this command (e.g. if retrying)
-        this.stopSpinner(command);
-        // Clear the line before printing "Starting..."
-        if (this.isSpinnerActive) { // Check if any spinner was active to avoid clearing unnecessarily
-            process.stdout.write('\r' + ' '.repeat(process.stdout.columns || 80) + '\r');
-        }
         console.log(`${prefix} ${color('Starting...')}`);
         // Start spinner for this command
         this.startSpinner(command);
@@ -207,32 +197,6 @@ class Logger {
             console.error(`${prefix} ${chalk_1.default.red(error.message)}`);
         }
     }
-    printEnd(result, minimalOutput) {
-        this.stopSpinner(result.command);
-        const prefix = this.formatPrefix(result.command); // Corrected to formatPrefix
-        let durationDisplay = '';
-        if (result.duration !== null) {
-            // Ensure result.duration is treated as a number here
-            durationDisplay = `(${(0, utils_1.formatDuration)(result.duration)})`;
-        }
-        const duration = durationDisplay;
-        if (minimalOutput) {
-            if (!result.success) {
-                const status = result.code !== null ? `failed (code ${result.code})` : 'failed';
-                this.printLine(`${prefix} ${chalk_1.default.red(figures_1.default.cross)} ${result.command} ${status} ${duration}`, 'error');
-            }
-        }
-        else {
-            if (result.success) {
-                this.printLine(`${prefix} ${chalk_1.default.green(figures_1.default.tick)} Command "${result.command}" finished successfully ${duration}`, 'info');
-            }
-            else {
-                const errorCode = result.code !== null ? ` (code ${result.code})` : '';
-                const errorMessage = result.error ? `: ${result.error.message}` : '';
-                this.printLine(`${prefix} ${chalk_1.default.red(figures_1.default.cross)} Command "${result.command}" failed${errorCode}${errorMessage} ${duration}`, 'error');
-            }
-        }
-    }
     printSummary(results) {
         // Stop any remaining spinners
         this.stopAllSpinners();

package/dist/src/runner.js

@@ -35,7 +35,6 @@ const chalk_1 = __importDefault(require("chalk"));
 const logger_1 = __importDefault(require("./logger"));
 const p_map_1 = __importDefault(require("p-map"));
 const npm_run_path_1 = __importDefault(require("npm-run-path"));
-const fs = __importStar(require("fs"));
 class Runner {
     constructor(options) {
         this.activeProcesses = new Map();
@@ -45,41 +44,6 @@ class Runner {
         this.options = options;
         this.activeProcesses = new Map();
     }
-    async expandWildcardCommands(commands) {
-        const expandedCommands = [];
-        let packageJson;
-        try {
-            const packageJsonPath = path.join(process.cwd(), 'package.json');
-            if (fs.existsSync(packageJsonPath)) {
-                const packageJsonContent = await fsPromises.readFile(packageJsonPath, 'utf-8');
-                packageJson = JSON.parse(packageJsonContent);
-            }
-        }
-        catch (error) {
-            logger_1.default.printLine(`Could not read or parse package.json: ${error.message}`, 'warn');
-            packageJson = { scripts: {} };
-        }
-        for (const command of commands) {
-            if (command.includes('*') && packageJson && packageJson.scripts) {
-                const pattern = new RegExp(`^${command.replace(/\*/g, '.*')}$`);
-                let foundMatch = false;
-                for (const scriptName in packageJson.scripts) {
-                    if (pattern.test(scriptName)) {
-                        expandedCommands.push(scriptName); // Or packageJson.scripts[scriptName] if you want the script value
-                        foundMatch = true;
-                    }
-                }
-                if (!foundMatch) {
-                    logger_1.default.printLine(`No scripts found in package.json matching wildcard: ${command}`, 'warn');
-                    expandedCommands.push(command); // Add original command if no match
-                }
-            }
-            else {
-                expandedCommands.push(command);
-            }
-        }
-        return expandedCommands;
-    }
     async resolveScriptAndCwd(scriptNameOrCommand, baseDir) {
         try {
             const packageJsonPath = path.join(baseDir, 'package.json');
@@ -139,7 +103,7 @@ class Runner {
         // Update server info
         this.serverInfo.set(command, serverInfo);
     }
-    async runCommand(originalCommand, currentRetry = 0) {
+    async runCommand(originalCommand) {
         const { executableCommand: command, executionCwd: cwd } = await this.resolveScriptAndCwd(originalCommand, process.cwd());
         const startTime = new Date();
         const result = {
@@ -153,8 +117,7 @@ class Runner {
         if (this.options.printOutput) {
             logger_1.default.printStart(originalCommand);
         }
-        return new Promise(async (resolve) => {
-            var _a, _b;
+        return new Promise((resolve) => {
             const [cmd, ...args] = command.split(' ');
             const env = {
                 ...process.env,
@@ -177,93 +140,96 @@ class Runner {
                     startTime: new Date()
                 });
             }
-            (_a = proc.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                const output = {
-                    command: originalCommand,
-                    type: 'stdout',
-                    data: data.toString(),
-                    timestamp: new Date()
-                };
-                if (this.options.isServerMode)
-                    this.detectServerInfo(originalCommand, data.toString());
-                if (result.output)
-                    result.output.push(output);
-                logger_1.default.bufferOutput(output);
-                if (!this.options.groupOutput && this.options.printOutput)
-                    logger_1.default.printBuffer(originalCommand);
-            });
-            (_b = proc.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
-                const output = {
-                    command: originalCommand,
-                    type: 'stderr',
-                    data: data.toString(),
-                    timestamp: new Date()
-                };
-                if (result.output)
-                    result.output.push(output);
-                logger_1.default.bufferOutput(output);
-                if (!this.options.groupOutput && this.options.printOutput)
-                    logger_1.default.printBuffer(originalCommand);
-            });
-            proc.on('error', async (err) => {
-                result.endTime = new Date();
-                result.error = err;
-                result.success = false;
-                result.duration = result.endTime.getTime() - startTime.getTime();
+            // Capture and display output
+            if (this.options.printOutput) {
+                proc.stdout.on('data', (data) => {
+                    const output = {
+                        command: originalCommand,
+                        type: 'stdout',
+                        data: data.toString(),
+                        timestamp: new Date()
+                    };
+                    if (this.options.isServerMode) {
+                        this.detectServerInfo(originalCommand, data.toString());
+                    }
+                    // Store output for logging
+                    if (result.output)
+                        result.output.push(output);
+                    logger_1.default.bufferOutput(output);
+                    // Print immediately unless we're in group mode
+                    if (!this.options.groupOutput) {
+                        logger_1.default.printBuffer(originalCommand);
+                    }
+                });
+                proc.stderr.on('data', (data) => {
+                    const output = {
+                        command: originalCommand,
+                        type: 'stderr',
+                        data: data.toString(),
+                        timestamp: new Date()
+                    };
+                    // Store output for logging
+                    if (result.output)
+                        result.output.push(output);
+                    logger_1.default.bufferOutput(output);
+                    // Print immediately unless we're in group mode
+                    if (!this.options.groupOutput) {
+                        logger_1.default.printBuffer(originalCommand);
+                    }
+                });
+            }
+            proc.on('close', (code) => {
+                const endTime = new Date();
+                const duration = endTime.getTime() - startTime.getTime();
+                result.endTime = endTime;
+                result.duration = duration;
+                result.code = code;
+                result.success = code === 0;
                 this.activeProcesses.delete(originalCommand);
                 if (this.options.isServerMode) {
                     const serverInfo = this.serverInfo.get(originalCommand);
                     if (serverInfo) {
-                        serverInfo.status = 'error';
+                        serverInfo.status = code === 0 ? 'stopped' : 'error';
                         this.serverInfo.set(originalCommand, serverInfo);
                     }
-                    logger_1.default.printLine(`Command "${originalCommand}" failed to start: ${err.message}`, 'error');
-                }
-                logger_1.default.printBuffer(originalCommand);
-                if (this.options.printOutput)
-                    logger_1.default.printEnd(result, this.options.minimalOutput);
-                if (this.options.retry && this.options.retry > 0 && currentRetry < this.options.retry) {
-                    logger_1.default.printLine(`Command "${originalCommand}" failed with error. Retrying (${currentRetry + 1}/${this.options.retry})...`, 'warn');
-                    if (this.options.retryDelay && this.options.retryDelay > 0) {
-                        await new Promise(res => setTimeout(res, this.options.retryDelay));
+                    // If this is server mode and a server failed, print prominent error
+                    if (code !== 0) {
+                        logger_1.default.printLine(`Server ${originalCommand} crashed with code ${code}`, 'error');
                     }
-                    logger_1.default.clearBuffer(originalCommand);
-                    resolve(this.runCommand(originalCommand, currentRetry + 1));
                 }
-                else {
-                    resolve(result);
+                // Print grouped output at the end if enabled
+                if (this.options.groupOutput && result.output && result.output.length > 0) {
+                    logger_1.default.printBuffer(originalCommand);
+                }
+                if (this.options.printOutput) {
+                    if (result.success) {
+                        logger_1.default.printSuccess(result);
+                    }
+                    else {
+                        logger_1.default.printError(result);
+                    }
                 }
+                resolve(result);
             });
-            proc.on('close', async (code) => {
-                result.code = code;
-                result.success = code === 0;
-                result.endTime = new Date();
-                result.duration = result.endTime.getTime() - startTime.getTime();
+            proc.on('error', (error) => {
+                const endTime = new Date();
+                const duration = endTime.getTime() - startTime.getTime();
+                result.endTime = endTime;
+                result.duration = duration;
+                result.error = error;
+                result.success = false;
                 this.activeProcesses.delete(originalCommand);
                 if (this.options.isServerMode) {
                     const serverInfo = this.serverInfo.get(originalCommand);
                     if (serverInfo) {
-                        serverInfo.status = code === 0 ? 'stopped' : 'error';
+                        serverInfo.status = 'error';
                         this.serverInfo.set(originalCommand, serverInfo);
                     }
-                    if (code !== 0) {
-                        logger_1.default.printLine(`Server "${originalCommand}" exited with code ${code}`, 'error');
-                    }
                 }
-                logger_1.default.printBuffer(originalCommand);
-                if (this.options.printOutput)
-                    logger_1.default.printEnd(result, this.options.minimalOutput);
-                if (!result.success && this.options.retry && this.options.retry > 0 && currentRetry < this.options.retry) {
-                    logger_1.default.printLine(`Command "${originalCommand}" failed with code ${code}. Retrying (${currentRetry + 1}/${this.options.retry})...`, 'warn');
-                    if (this.options.retryDelay && this.options.retryDelay > 0) {
-                        await new Promise(res => setTimeout(res, this.options.retryDelay));
-                    }
-                    logger_1.default.clearBuffer(originalCommand);
-                    resolve(this.runCommand(originalCommand, currentRetry + 1));
-                }
-                else {
-                    resolve(result);
+                if (this.options.printOutput) {
+                    logger_1.default.printError(result);
                 }
+                resolve(result);
             });
         });
     }
@@ -272,6 +238,7 @@ class Runner {
         for (const cmd of commands) {
             const result = await this.runCommand(cmd);
             results.push(result);
+            // Stop on error if enabled
             if (!result.success && this.options.stopOnError) {
                 break;
             }
@@ -290,19 +257,18 @@ class Runner {
             });
         }
         catch (error) {
+            // If pMap stops due to stopOnError
             if (this.options.isServerMode) {
                 logger_1.default.printLine('One or more servers failed to start. Stopping all servers.', 'error');
             }
             return [];
         }
     }
-    async run(initialCommands) {
-        const commands = await this.expandWildcardCommands(initialCommands);
+    async run(commands) {
         if (commands.length === 0) {
-            logger_1.default.printLine('No commands to run after wildcard expansion.', 'warn');
             return [];
         }
-        // Initialize logger with the final list of commands
+        // Set up logger with commands
         logger_1.default.setCommands(commands);
         // Run in parallel or sequential mode
         if (this.options.parallel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neex",
-  "version": "0.1.8",
+  "version": "0.2.5",
   "description": "The Modern Build System for Polyrepo-in-Monorepo Architecture",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -12,9 +12,7 @@
     "start": "node dist/bin/neex.js",
     "prepublishOnly": "npm run build",
     "test": "jest",
-    "dev": "neex w \"ts-node src/server.ts\"",
-    "w": "neex w \"ts-node src/server.ts\"",
-    "test:dev": "node ./dist/bin/neex.js px \"echo Starting frontend\" \"echo Starting backend\"",
+    "test:dev": "node ./dist/bin/neex.js runx \"echo Starting frontend\" \"echo Starting backend\"",
     "test:parallel": "node ./dist/src/cli.js parallel \"echo Building frontend\" \"echo Building backend\"",
     "test:sequence": "node ./dist/src/cli.js run \"echo Step 1\" \"echo Step 2\" \"echo Step 3\""
   },