neex 0.1.8 → 0.2.6

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.6",
   "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\""
   },
@@ -31,15 +29,19 @@
   "license": "MIT",
   "dependencies": {
     "chalk": "^4.1.2",
+    "chokidar": "^3.5.3",
     "commander": "^9.4.0",
     "figlet": "^1.8.1",
     "figures": "^3.2.0",
     "gradient-string": "^3.0.0",
     "npm-run-path": "^4.0.1",
     "p-map": "^4.0.0",
-    "string-width": "^4.2.3"
+    "string-width": "^4.2.3",
+    "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.2.0"
   },
   "devDependencies": {
+    "@types/chokidar": "^2.1.7",
     "@types/figlet": "^1.7.0",
     "@types/jest": "^29.2.3",
     "@types/node": "^18.11.9",

package/dist/src/commands/dev-commands.js

@@ -1,190 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addDevCommands = void 0;
-const dev_runner_js_1 = require("../dev-runner.js");
-const chalk_1 = __importDefault(require("chalk"));
-const figures_1 = __importDefault(require("figures"));
-const path = __importStar(require("path"));
-const fs = __importStar(require("fs/promises"));
-// Helper function to find default command from package.json
-async function findDefaultCommand() {
-    var _a, _b;
-    try {
-        const packageJsonPath = path.join(process.cwd(), 'package.json');
-        await fs.access(packageJsonPath);
-        const packageJsonContent = await fs.readFile(packageJsonPath, 'utf-8');
-        const packageJson = JSON.parse(packageJsonContent);
-        if ((_a = packageJson.scripts) === null || _a === void 0 ? void 0 : _a.dev) {
-            console.log(chalk_1.default.blue(`${figures_1.default.info} No command provided. Using "dev" script from package.json: npm run dev`));
-            return 'npm run dev';
-        }
-        if ((_b = packageJson.scripts) === null || _b === void 0 ? void 0 : _b.start) {
-            console.log(chalk_1.default.blue(`${figures_1.default.info} No command provided. Using "start" script from package.json: npm run start`));
-            return 'npm run start';
-        }
-        if (packageJson.main) {
-            const mainFile = packageJson.main;
-            const mainFilePath = path.resolve(process.cwd(), mainFile);
-            try {
-                await fs.access(mainFilePath);
-                if (mainFile.endsWith('.ts') || mainFile.endsWith('.mts') || mainFile.endsWith('.cts')) {
-                    console.log(chalk_1.default.blue(`${figures_1.default.info} No command or script found. Using "main" field (TypeScript): npx ts-node ${mainFile}`));
-                    return `npx ts-node ${mainFile}`;
-                }
-                else {
-                    console.log(chalk_1.default.blue(`${figures_1.default.info} No command or script found. Using "main" field (JavaScript): node ${mainFile}`));
-                    return `node ${mainFile}`;
-                }
-            }
-            catch (e) {
-                // Main file doesn't exist, do nothing, will fall through to return null
-            }
-        }
-        return null;
-    }
-    catch (error) {
-        // package.json doesn't exist or other error, do nothing
-        return null;
-    }
-}
-function addDevCommands(program) {
-    let devRunner = null;
-    // Dev command (Nodemon functionality - formerly watch)
-    program
-        .command('dev [commands...]') // Made commands optional
-        .alias('d')
-        .description('Run commands with file watching and auto-restart (nodemon functionality)')
-        .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('-w, --watch <paths...>', 'Paths to watch (default: current directory)')
-        .option('-i, --ignore <patterns...>', 'Patterns to ignore')
-        .option('-e, --ext <extensions...>', 'File extensions to watch (default: js,mjs,json,ts,tsx,jsx)')
-        .option('-d, --delay <ms>', 'Delay before restart in milliseconds', parseInt)
-        .option('--clear', 'Clear console on restart')
-        .option('--verbose', 'Verbose output')
-        .option('--signal <signal>', 'Signal to send to processes on restart', 'SIGTERM')
-        .action(async (commands, options) => {
-        try {
-            let effectiveCommands = commands;
-            if (!effectiveCommands || effectiveCommands.length === 0) {
-                const foundCommand = await findDefaultCommand();
-                if (foundCommand) {
-                    effectiveCommands = [foundCommand];
-                    console.log(chalk_1.default.blue(`${figures_1.default.info} No command specified for 'neex dev', using default: "${foundCommand}"`));
-                }
-                else {
-                    console.error(chalk_1.default.red(`${figures_1.default.cross} No command specified for 'neex dev' and no default script (dev, start) or main file found in package.json.`));
-                    console.error(chalk_1.default.yellow(`${figures_1.default.pointer} Please specify a command to run (e.g., neex dev "npm run dev") or define a "dev" or "start" script in your package.json.`));
-                    process.exit(1);
-                }
-            }
-            else { // At least one command/argument is provided
-                const firstArg = effectiveCommands[0];
-                const remainingArgs = effectiveCommands.slice(1);
-                const isLikelyCommandOrScript = firstArg.includes(' ') || firstArg.startsWith('npm') || firstArg.startsWith('yarn') || firstArg.startsWith('pnpm');
-                if (!isLikelyCommandOrScript) {
-                    const filePath = path.resolve(process.cwd(), firstArg);
-                    try {
-                        await fs.access(filePath); // Check if file exists
-                        let commandToExecute = '';
-                        if (firstArg.endsWith('.js') || firstArg.endsWith('.mjs') || firstArg.endsWith('.cjs')) {
-                            commandToExecute = `node ${firstArg}`;
-                            console.log(chalk_1.default.blue(`${figures_1.default.info} Detected .js file, prepending with node.`));
-                        }
-                        else if (firstArg.endsWith('.ts') || firstArg.endsWith('.mts') || firstArg.endsWith('.cts')) {
-                            commandToExecute = `npx ts-node ${firstArg}`;
-                            console.log(chalk_1.default.blue(`${figures_1.default.info} Detected .ts file, prepending with npx ts-node.`));
-                        }
-                        if (commandToExecute) {
-                            effectiveCommands = [commandToExecute, ...remainingArgs];
-                            console.log(chalk_1.default.cyan(`${figures_1.default.pointer} Executing: ${effectiveCommands.join(' ')}`));
-                        }
-                        else {
-                            console.log(chalk_1.default.yellow(`${figures_1.default.warning} First argument "${firstArg}" is not a recognized .js/.ts file and doesn't look like a script. Attempting to run as is.`));
-                        }
-                    }
-                    catch (e) {
-                        console.log(chalk_1.default.yellow(`${figures_1.default.warning} File "${firstArg}" not found. Attempting to run as command.`));
-                    }
-                }
-            }
-            console.log(chalk_1.default.blue(`${figures_1.default.info} Starting development server with file watching (neex dev) for command(s): ${effectiveCommands.map(cmd => `"${cmd}"`).join(' && ')}...`));
-            const watchPaths = options.watch || ['./'];
-            const ignorePatterns = options.ignore || [
-                'node_modules/**', '.git/**', '*.log', 'dist/**', 'build/**',
-                'coverage/**', '.nyc_output/**', '*.tmp', '*.temp'
-            ];
-            const extensions = options.ext || ['js', 'mjs', 'json', 'ts', 'tsx', 'jsx'];
-            devRunner = new dev_runner_js_1.DevRunner({
-                runnerName: 'neex dev',
-                parallel: false,
-                color: options.color,
-                showTiming: options.timing,
-                prefix: options.prefix,
-                stopOnError: options.stopOnError,
-                printOutput: options.output,
-                minimalOutput: options.minimal,
-                watch: watchPaths,
-                ignore: ignorePatterns,
-                ext: extensions,
-                delay: options.delay || 1000,
-                clearConsole: options.clear,
-                verbose: options.verbose,
-                signal: options.signal,
-                restartOnChange: true,
-                groupOutput: false,
-                isServerMode: false
-            });
-            await devRunner.start(effectiveCommands);
-        }
-        catch (error) {
-            if (error instanceof Error) {
-                console.error(chalk_1.default.red(`${figures_1.default.cross} Dev Error: ${error.message}`));
-            }
-            else {
-                console.error(chalk_1.default.red(`${figures_1.default.cross} An unknown dev error occurred`));
-            }
-            process.exit(1);
-        }
-    });
-    // Return cleanup function for dev runner
-    return {
-        getDevRunner: () => devRunner,
-        cleanupDev: () => {
-            if (devRunner && devRunner.isActive()) {
-                devRunner.stop();
-            }
-        }
-    };
-}
-exports.addDevCommands = addDevCommands;

package/dist/src/commands/index.js

@@ -1,21 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// src/commands/index.ts - Export all commands
-__exportStar(require("./run-commands.js"), exports);
-__exportStar(require("./dev-commands.js"), exports);
-__exportStar(require("./process-commands"), exports);
-__exportStar(require("./server-commands.js"), exports);