rman 0.9.0 → 0.11.0

package/bin/rman.js

@@ -2,4 +2,4 @@
 import {runCli} from '../esm/cli.mjs';
 
 // eslint-disable-next-line
-runCli().catch();
+runCli().catch(() => 0);

package/cjs/commands/ci-command.js

@@ -51,7 +51,7 @@ class CleanInstallCommand extends run_command_1.RunCommand {
     }
     async _fsDelete(fileOrDir) {
         if (await (0, file_utils_1.fsExists)(fileOrDir)) {
-            npmlog_1.default.info(this.commandName, chalk_1.default.yellow('clean'), 'Deleting ' + fileOrDir);
+            npmlog_1.default.info(this.commandName, chalk_1.default.yellow('clean'), 'Deleting ' + path_1.default.relative(this.repository.dirname, fileOrDir));
             await (0, file_utils_1.fsDelete)(fileOrDir);
         }
     }

package/cjs/commands/multi-task-command.js

@@ -7,6 +7,7 @@ exports.MultiTaskCommand = void 0;
 const os_1 = __importDefault(require("os"));
 const npmlog_1 = __importDefault(require("npmlog"));
 const power_tasks_1 = require("power-tasks");
+const putil_varhelpers_1 = require("putil-varhelpers");
 const command_1 = require("../core/command");
 const constants_1 = require("../utils/constants");
 class MultiTaskCommand extends command_1.Command {
@@ -16,8 +17,7 @@ class MultiTaskCommand extends command_1.Command {
         if (this.options.ci || !constants_1.isTTY)
             this.options.progress = false;
         // noinspection SuspiciousTypeOfGuard
-        this.options.concurrency = typeof options?.concurrency === 'string' ?
-            parseInt(options.concurrency, 10) : undefined;
+        this.options.concurrency = (0, putil_varhelpers_1.toNumber)(options?.concurrency);
         if (this.options.bail == null)
             this.options.bail = true;
     }
@@ -30,6 +30,7 @@ class MultiTaskCommand extends command_1.Command {
         }
         // this.enableProgress();
         this._task = new power_tasks_1.Task(childTasks, {
+            name: '$project-root',
             concurrency: this.options.concurrency || os_1.default.cpus().length,
             bail: this.options.bail,
         });

package/cjs/commands/publish-command.js

@@ -20,7 +20,7 @@ class PublishCommand extends run_command_1.RunCommand {
         const selectedPackages = [];
         for (const p of packages) {
             const logPkgName = chalk_1.default.yellow(p.name);
-            npmlog_1.default.verbose(this.commandName, logPkgName, npmlog_1.default.separator, `Fetching package information from repository`);
+            npmlog_1.default.info(this.commandName, logPkgName, npmlog_1.default.separator, `Fetching package information from repository`);
             const r = await (0, package_json_1.default)(p.json.name);
             if (r.version === p.version) {
                 npmlog_1.default.info(this.commandName, logPkgName, npmlog_1.default.separator, `Ignored. Same version (${p.version}) in repository`);

package/cjs/commands/run-command.js

@@ -32,16 +32,16 @@ class RunCommand extends multi_task_command_1.MultiTaskCommand {
                 }
             }
         }
-        const mainTask = this._prepareScriptTask({
+        const rootTask = this._prepareScriptTask({
             name: 'root',
             cwd: this.repository.dirname,
             json: this.repository.json
         });
-        if (!mainTask?.children)
+        if (!rootTask?.children)
             return packageTasks;
         const tasks = [];
-        const pre = mainTask.children.filter((t => t.name.endsWith(':pre' + this.script)));
-        const post = mainTask.children.filter((t => t.name.endsWith(':post' + this.script)));
+        const pre = rootTask.children.filter((t => t.name?.endsWith(':pre' + this.script)));
+        const post = rootTask.children.filter((t => t.name?.endsWith(':post' + this.script)));
         pre.forEach(t => t.options.exclusive = true);
         post.forEach(t => t.options.exclusive = true);
         tasks.push(...pre);
@@ -74,7 +74,7 @@ class RunCommand extends multi_task_command_1.MultiTaskCommand {
                     }, ctx);
                 }, {
                     name: args.name + ':' + s.name,
-                    dependencies: s.name.startsWith('pre') || s.name.startsWith('post') ?
+                    dependencies: (this.options.parallel || s.name.startsWith('pre') || s.name.startsWith('post')) ?
                         undefined : args.dependencies
                 });
                 children.push(task);
@@ -96,8 +96,7 @@ class RunCommand extends multi_task_command_1.MultiTaskCommand {
         const r = await (0, exec_1.exec)(args.command, { cwd: args.cwd, stdio: args.stdio });
         if (logLevel)
             if (r.error) {
-                npmlog_1.default.error(this.commandName, chalk_1.default.cyan(args.name), chalk_1.default.red.bold('failed'), npmlog_1.default.separator, args.command, npmlog_1.default.separator, r.error.message.trim());
-                npmlog_1.default.verbose(this.commandName, '', r.stderr || r.stdout);
+                npmlog_1.default.error(this.commandName, chalk_1.default.cyan(args.name), chalk_1.default.red.bold('failed'), npmlog_1.default.separator, args.command, npmlog_1.default.separator, r.error.message.trim() + ('\n' + r.stdout).trim());
             }
             else
                 npmlog_1.default.log(logLevel, this.commandName, chalk_1.default.cyan(args.name), chalk_1.default.green.bold('executed'), npmlog_1.default.separator, args.command, chalk_1.default.yellow(' (' + (Date.now() - t) + ' ms)'));
@@ -126,6 +125,14 @@ RunCommand.commandName = 'run';
                     .option(RunCommand.cliCommandOptions);
             },
             handler: async (args) => {
+                const runCfg = repository.config?.command?.run;
+                if (args.script && runCfg && typeof runCfg === 'object') {
+                    ['parallel', 'bail', 'progress'].forEach(n => {
+                        if (typeof runCfg[n] === 'string') {
+                            runCfg[n] = runCfg[n].split(/\s*,\s*/).includes(args.script);
+                        }
+                    });
+                }
                 const options = command_1.Command.composeOptions(RunCommand.commandName, args, repository.config);
                 const script = '' + args.script;
                 await new RunCommand(repository, script, options).execute();

package/cjs/utils/exec.js

@@ -28,21 +28,17 @@ async function exec(command, options) {
     };
     const result = {
         code: undefined,
-        stderr: '',
         stdout: ''
     };
-    const buffer = {
-        stdout: '',
-        stderr: ''
-    };
+    let buffer = '';
     const processData = (data, stdio) => {
-        buffer[stdio] += '' + data;
-        result[stdio] += '' + data;
+        buffer += '' + data;
+        result.stdout += '' + data;
         if (opts.onData)
             opts.onData(data, stdio);
     };
     const processLines = (stdio, flush) => {
-        let chunk = buffer[stdio];
+        let chunk = buffer;
         let i;
         if (flush && !chunk.endsWith('\n'))
             chunk += '\n';
@@ -52,7 +48,7 @@ async function exec(command, options) {
             if (opts.onLine)
                 opts.onLine(line, stdio);
         }
-        buffer[stdio] = chunk;
+        buffer = chunk;
     };
     const child = (0, child_process_1.spawn)(command, opts.argv || [], spawnOptions);
     if (child.pid) {

package/esm/commands/ci-command.mjs

@@ -45,7 +45,7 @@ export class CleanInstallCommand extends RunCommand {
     }
     async _fsDelete(fileOrDir) {
         if (await fsExists(fileOrDir)) {
-            logger.info(this.commandName, chalk.yellow('clean'), 'Deleting ' + fileOrDir);
+            logger.info(this.commandName, chalk.yellow('clean'), 'Deleting ' + path.relative(this.repository.dirname, fileOrDir));
             await fsDelete(fileOrDir);
         }
     }

package/esm/commands/multi-task-command.mjs

@@ -1,6 +1,7 @@
 import os from 'os';
 import logger from 'npmlog';
 import { Task } from 'power-tasks';
+import { toNumber } from 'putil-varhelpers';
 import { Command } from './../core/command.mjs';
 import { isTTY } from './../utils/constants.mjs';
 export class MultiTaskCommand extends Command {
@@ -10,8 +11,7 @@ export class MultiTaskCommand extends Command {
         if (this.options.ci || !isTTY)
             this.options.progress = false;
         // noinspection SuspiciousTypeOfGuard
-        this.options.concurrency = typeof options?.concurrency === 'string' ?
-            parseInt(options.concurrency, 10) : undefined;
+        this.options.concurrency = toNumber(options?.concurrency);
         if (this.options.bail == null)
             this.options.bail = true;
     }
@@ -24,6 +24,7 @@ export class MultiTaskCommand extends Command {
         }
         // this.enableProgress();
         this._task = new Task(childTasks, {
+            name: '$project-root',
             concurrency: this.options.concurrency || os.cpus().length,
             bail: this.options.bail,
         });

package/esm/commands/publish-command.mjs

@@ -14,7 +14,7 @@ export class PublishCommand extends RunCommand {
         const selectedPackages = [];
         for (const p of packages) {
             const logPkgName = chalk.yellow(p.name);
-            logger.verbose(this.commandName, logPkgName, logger.separator, `Fetching package information from repository`);
+            logger.info(this.commandName, logPkgName, logger.separator, `Fetching package information from repository`);
             const r = await fetchPackageInfo(p.json.name);
             if (r.version === p.version) {
                 logger.info(this.commandName, logPkgName, logger.separator, `Ignored. Same version (${p.version}) in repository`);

package/esm/commands/run-command.mjs

@@ -26,16 +26,16 @@ export class RunCommand extends MultiTaskCommand {
                 }
             }
         }
-        const mainTask = this._prepareScriptTask({
+        const rootTask = this._prepareScriptTask({
             name: 'root',
             cwd: this.repository.dirname,
             json: this.repository.json
         });
-        if (!mainTask?.children)
+        if (!rootTask?.children)
             return packageTasks;
         const tasks = [];
-        const pre = mainTask.children.filter((t => t.name.endsWith(':pre' + this.script)));
-        const post = mainTask.children.filter((t => t.name.endsWith(':post' + this.script)));
+        const pre = rootTask.children.filter((t => t.name?.endsWith(':pre' + this.script)));
+        const post = rootTask.children.filter((t => t.name?.endsWith(':post' + this.script)));
         pre.forEach(t => t.options.exclusive = true);
         post.forEach(t => t.options.exclusive = true);
         tasks.push(...pre);
@@ -68,7 +68,7 @@ export class RunCommand extends MultiTaskCommand {
                     }, ctx);
                 }, {
                     name: args.name + ':' + s.name,
-                    dependencies: s.name.startsWith('pre') || s.name.startsWith('post') ?
+                    dependencies: (this.options.parallel || s.name.startsWith('pre') || s.name.startsWith('post')) ?
                         undefined : args.dependencies
                 });
                 children.push(task);
@@ -90,8 +90,7 @@ export class RunCommand extends MultiTaskCommand {
         const r = await exec(args.command, { cwd: args.cwd, stdio: args.stdio });
         if (logLevel)
             if (r.error) {
-                logger.error(this.commandName, chalk.cyan(args.name), chalk.red.bold('failed'), logger.separator, args.command, logger.separator, r.error.message.trim());
-                logger.verbose(this.commandName, '', r.stderr || r.stdout);
+                logger.error(this.commandName, chalk.cyan(args.name), chalk.red.bold('failed'), logger.separator, args.command, logger.separator, r.error.message.trim() + ('\n' + r.stdout).trim());
             }
             else
                 logger.log(logLevel, this.commandName, chalk.cyan(args.name), chalk.green.bold('executed'), logger.separator, args.command, chalk.yellow(' (' + (Date.now() - t) + ' ms)'));
@@ -119,6 +118,14 @@ RunCommand.commandName = 'run';
                     .option(RunCommand.cliCommandOptions);
             },
             handler: async (args) => {
+                const runCfg = repository.config?.command?.run;
+                if (args.script && runCfg && typeof runCfg === 'object') {
+                    ['parallel', 'bail', 'progress'].forEach(n => {
+                        if (typeof runCfg[n] === 'string') {
+                            runCfg[n] = runCfg[n].split(/\s*,\s*/).includes(args.script);
+                        }
+                    });
+                }
                 const options = Command.composeOptions(RunCommand.commandName, args, repository.config);
                 const script = '' + args.script;
                 await new RunCommand(repository, script, options).execute();

package/esm/utils/exec.d.ts

@@ -14,7 +14,6 @@ export interface IExecutorOptions {
 export interface ExecuteCommandResult {
     code?: number;
     error?: Error;
-    stderr?: string;
     stdout?: string;
 }
 export declare function exec(command: string, options?: IExecutorOptions): Promise<ExecuteCommandResult>;

package/esm/utils/exec.mjs

@@ -22,21 +22,17 @@ export async function exec(command, options) {
     };
     const result = {
         code: undefined,
-        stderr: '',
         stdout: ''
     };
-    const buffer = {
-        stdout: '',
-        stderr: ''
-    };
+    let buffer = '';
     const processData = (data, stdio) => {
-        buffer[stdio] += '' + data;
-        result[stdio] += '' + data;
+        buffer += '' + data;
+        result.stdout += '' + data;
         if (opts.onData)
             opts.onData(data, stdio);
     };
     const processLines = (stdio, flush) => {
-        let chunk = buffer[stdio];
+        let chunk = buffer;
         let i;
         if (flush && !chunk.endsWith('\n'))
             chunk += '\n';
@@ -46,7 +42,7 @@ export async function exec(command, options) {
             if (opts.onLine)
                 opts.onLine(line, stdio);
         }
-        buffer[stdio] = chunk;
+        buffer = chunk;
     };
     const child = spawn(command, opts.argv || [], spawnOptions);
     if (child.pid) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rman",
   "description": "Monorepo repository manager",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "author": "Panates",
   "license": "MIT",
   "contributors": [
@@ -33,49 +33,49 @@
   },
   "dependencies": {
     "@netlify/parse-npm-script": "^0.1.2",
-    "chalk": "^5.0.0",
+    "chalk": "^5.0.1",
     "easy-table": "^1.2.0",
     "envinfo": "^7.8.1",
-    "fast-glob": "^3.2.7",
+    "fast-glob": "^3.2.11",
     "figures": "^4.0.0",
     "is-ci": "^3.0.1",
     "js-yaml": "^4.1.0",
-    "npmlog": "^6.0.0",
+    "npmlog": "^6.0.1",
     "package-json": "^7.0.0",
     "path-key": "^4.0.0",
-    "power-tasks": "^0.4.0",
-    "putil-merge": "^3.7.0",
+    "power-tasks": "^0.6.0",
+    "putil-merge": "^3.8.0",
     "putil-varhelpers": "^1.6.3",
     "semver": "^7.3.5",
-    "signal-exit": "^3.0.6",
-    "strict-typed-events": "^2.0.0",
+    "signal-exit": "^3.0.7",
+    "strict-typed-events": "^2.1.0",
     "strip-color": "^0.1.0",
-    "yargs": "^17.3.1"
+    "yargs": "^17.4.0"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.16.3",
+    "@babel/eslint-parser": "^7.17.0",
     "@types/envinfo": "^7.8.1",
     "@types/is-ci": "^3.0.0",
-    "@types/jest": "^27.4.0",
+    "@types/jest": "^27.4.1",
     "@types/js-yaml": "^4.0.5",
-    "@types/node": "^17.0.5",
+    "@types/node": "^17.0.22",
     "@types/npmlog": "^4.1.4",
     "@types/semver": "^7.3.9",
     "@types/signal-exit": "^3.0.1",
     "@types/strip-color": "^0.1.0",
-    "@types/yargs": "^17.0.8",
-    "@typescript-eslint/eslint-plugin": "^5.8.1",
-    "@typescript-eslint/parser": "^5.8.1",
-    "eslint": "^8.5.0",
+    "@types/yargs": "^17.0.10",
+    "@typescript-eslint/eslint-plugin": "^5.16.0",
+    "@typescript-eslint/parser": "^5.16.0",
+    "eslint": "^8.11.0",
     "eslint-config-google": "^0.14.0",
     "jest": "^27.5.1",
-    "ts-cleanup": "^0.2.2",
-    "ts-gems": "^1.1.0",
+    "ts-cleanup": "^0.2.4",
+    "ts-gems": "^1.5.2",
     "ts-jest": "^27.1.3",
-    "ts-loader": "^9.0.0",
-    "ts-node": "^10.4.0",
-    "tsconfig-paths": "^3.9.0",
-    "typescript": "^4.5.2",
+    "ts-loader": "^9.2.8",
+    "ts-node": "^10.7.0",
+    "tsconfig-paths": "^3.14.0",
+    "typescript": "^4.6.2",
     "typescript-esm": "^2.0.0"
   },
   "engines": {