rman 0.5.0 → 0.6.1

package/cjs/commands/ci-command.js

@@ -29,7 +29,7 @@ class CleanInstallCommand extends run_command_1.RunCommand {
             npmlog_1.default.info(this.commandName, chalk_1.default.yellow('installing'), 'Running ' + client + ' install');
             return super._exec({
                 name: 'root',
-                dirname: this.repository.dirname,
+                cwd: this.repository.dirname,
                 json: { ...this.repository.json },
                 command: client + ' install',
                 stdio: 'inherit'
@@ -41,10 +41,10 @@ class CleanInstallCommand extends run_command_1.RunCommand {
         if (args.command === '#') {
             if (args.name === 'root')
                 return { code: 0 };
-            const { dirname } = args;
-            await this._fsDelete(path_1.default.join(dirname, 'node_modules'));
-            await this._fsDelete(path_1.default.join(dirname, 'package-lock.json'));
-            await this._fsDelete(path_1.default.join(dirname, 'yarn-lock.json'));
+            const { cwd } = args;
+            await this._fsDelete(path_1.default.join(cwd, 'node_modules'));
+            await this._fsDelete(path_1.default.join(cwd, 'package-lock.json'));
+            await this._fsDelete(path_1.default.join(cwd, 'yarn-lock.json'));
             return { code: 0 };
         }
         return super._exec(args, ctx);

package/cjs/commands/run-command.js

@@ -23,7 +23,7 @@ class RunCommand extends multi_task_command_1.MultiTaskCommand {
             if (p.json.scripts) {
                 const childTask = this._prepareScriptTask({
                     name: p.name,
-                    dirname: p.dirname,
+                    cwd: p.dirname,
                     json: p.json,
                     dependencies: p.dependencies
                 }, options);
@@ -34,7 +34,7 @@ class RunCommand extends multi_task_command_1.MultiTaskCommand {
         }
         const mainTask = this._prepareScriptTask({
             name: 'root',
-            dirname: this.repository.dirname,
+            cwd: this.repository.dirname,
             json: this.repository.json
         });
         if (!mainTask?.children)
@@ -89,16 +89,19 @@ class RunCommand extends multi_task_command_1.MultiTaskCommand {
         }
     }
     async _exec(args, options) {
-        npmlog_1.default.verbose(this.commandName, chalk_1.default.cyan(args.name), chalk_1.default.cyanBright.bold('executing'), npmlog_1.default.separator, args.command);
+        const logLevel = args.logLevel == null ? 'info' : args.logLevel;
+        if (logLevel)
+            npmlog_1.default.verbose(this.commandName, chalk_1.default.cyan(args.name), chalk_1.default.cyanBright.bold('executing'), npmlog_1.default.separator, args.command);
         const t = Date.now();
-        const r = await (0, exec_1.exec)(args.command, { cwd: args.dirname, stdio: args.stdio });
-        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);
-        }
-        else
-            npmlog_1.default.info(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)'));
-        if (r.error)
+        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);
+            }
+            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)'));
+        if (r.error && !args.noThrow)
             throw r.error;
         return r;
     }

package/cjs/commands/version-command.js

@@ -5,14 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersionCommand = void 0;
 const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
 const chalk_1 = __importDefault(require("chalk"));
 const semver_1 = __importDefault(require("semver"));
 const npmlog_1 = __importDefault(require("npmlog"));
 const strip_color_1 = __importDefault(require("strip-color"));
+const power_tasks_1 = require("power-tasks");
 const run_command_1 = require("./run-command");
 const git_utils_1 = require("../utils/git-utils");
 const command_1 = require("../core/command");
+const promises_1 = __importDefault(require("fs/promises"));
 class VersionCommand extends run_command_1.RunCommand {
     constructor(repository, bump, options) {
         super(repository, 'version', options);
@@ -33,7 +34,7 @@ class VersionCommand extends run_command_1.RunCommand {
             let message = '';
             let newVer = '';
             const logPkgName = chalk_1.default.yellow(p.name);
-            if (!this.options.forceDirty) {
+            if (!this.options.noTag) {
                 const isDirty = dirtyFiles.find(f => !path_1.default.relative(relDir, f).startsWith('..'));
                 if (isDirty) {
                     if (!this.options.ignoreDirty)
@@ -71,13 +72,30 @@ class VersionCommand extends run_command_1.RunCommand {
         }
         if (errorCount)
             throw new Error('Unable to bump version due to error(s)');
+        const maxVer = Object.values(newVersions).reduce((m, v) => {
+            return semver_1.default.gt(m, v) ? m : v;
+        }, '0.0.0');
         if (this.options.unified) {
-            const maxVer = Object.values(newVersions).reduce((m, v) => {
-                return semver_1.default.gt(m, v) ? m : v;
-            }, '0.0.0');
             Object.keys(newVersions).forEach(k => newVersions[k] = maxVer);
         }
-        return super._prepareTasks(selectedPackages, { newVersions });
+        const tasks = await super._prepareTasks(selectedPackages, { newVersions });
+        tasks.forEach(t => t.options.exclusive = true);
+        if (this.options.unified)
+            tasks.push(new power_tasks_1.Task(async () => {
+                try {
+                    await super._exec({
+                        name: 'rman',
+                        command: 'git tag -a "v' + maxVer + '" -m "version ' + maxVer + '"',
+                        cwd: this.repository.dirname,
+                        stdio: npmlog_1.default.levelIndex <= 1000 ? 'inherit' : 'pipe',
+                        logLevel: 'silly'
+                    });
+                }
+                catch {
+                    //
+                }
+            }, { exclusive: true }));
+        return tasks;
     }
     async _exec(args, options) {
         if (args.name === 'root')
@@ -88,9 +106,18 @@ class VersionCommand extends run_command_1.RunCommand {
             const newVer = newVersions[args.name];
             args.json.version = newVer;
             delete args.json.scripts.version;
-            const f = path_1.default.join(args.dirname, 'package.json');
+            const f = path_1.default.join(args.cwd, 'package.json');
             const data = JSON.stringify(args.json, undefined, 2);
-            fs_1.default.writeFileSync(f, data, 'utf-8');
+            await promises_1.default.writeFile(f, data, 'utf-8');
+            if (!this.options.noTag) {
+                await super._exec({
+                    name: args.name,
+                    command: 'git commit -m "' + newVer + '" package.json',
+                    cwd: args.cwd,
+                    stdio: npmlog_1.default.levelIndex <= 1000 ? 'inherit' : 'pipe',
+                    logLevel: 'silly'
+                });
+            }
             npmlog_1.default.info(this.commandName, args.name, npmlog_1.default.separator, 'Version changed from ' + chalk_1.default.cyan(oldVer) + ' to ' + chalk_1.default.cyan(newVer));
             return { code: 0 };
         }
@@ -113,12 +140,12 @@ VersionCommand.commandName = 'version';
         },
         'ignore-dirty': {
             alias: 'i',
-            describe: '# Ignore dirty packages',
+            describe: '# Do not bump version for dirty packages',
             type: 'boolean'
         },
-        'force-dirty': {
-            alias: 'f',
-            describe: '# Force bump version for dirty packages',
+        'no-tag': {
+            alias: 'n',
+            describe: '# Do not crate git version tag. (Ignores dirty check)',
             type: 'boolean'
         }
     };

package/cjs/core/command.js

@@ -88,7 +88,7 @@ class Command extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_t
         //
     }
     async _preExecute() {
-        npmlog_2.default.info('run', `Executing "${this.commandName}" command`);
+        npmlog_2.default.info('rman', `Executing "${this.commandName}" command`);
     }
 }
 exports.Command = Command;
@@ -113,8 +113,8 @@ exports.Command = Command;
     function composeOptions(commandName, yargArgs, config) {
         const result = (0, putil_merge_1.default)({}, yargArgs);
         (0, putil_merge_1.default)(result, config, { filter: (_, key) => key !== 'command' });
-        const cfgCmd = config.commans && typeof config.command === 'object' ?
-            config.command : undefined;
+        const cfgCmd = config.command && typeof config.command === 'object' ?
+            config.command[commandName] : undefined;
         if (cfgCmd && typeof cfgCmd === 'object')
             (0, putil_merge_1.default)(result, cfgCmd);
         return result;

package/esm/commands/ci-command.d.ts

@@ -12,7 +12,7 @@ export declare class CleanInstallCommand extends RunCommand<CleanInstallCommand.
     protected _exec(args: {
         name: string;
         json: any;
-        dirname: string;
+        cwd: string;
         dependencies?: string[];
         command: string;
     }, ctx?: any): Promise<ExecuteCommandResult>;

package/esm/commands/ci-command.mjs

@@ -23,7 +23,7 @@ export class CleanInstallCommand extends RunCommand {
             logger.info(this.commandName, chalk.yellow('installing'), 'Running ' + client + ' install');
             return super._exec({
                 name: 'root',
-                dirname: this.repository.dirname,
+                cwd: this.repository.dirname,
                 json: { ...this.repository.json },
                 command: client + ' install',
                 stdio: 'inherit'
@@ -35,10 +35,10 @@ export class CleanInstallCommand extends RunCommand {
         if (args.command === '#') {
             if (args.name === 'root')
                 return { code: 0 };
-            const { dirname } = args;
-            await this._fsDelete(path.join(dirname, 'node_modules'));
-            await this._fsDelete(path.join(dirname, 'package-lock.json'));
-            await this._fsDelete(path.join(dirname, 'yarn-lock.json'));
+            const { cwd } = args;
+            await this._fsDelete(path.join(cwd, 'node_modules'));
+            await this._fsDelete(path.join(cwd, 'package-lock.json'));
+            await this._fsDelete(path.join(cwd, 'yarn-lock.json'));
             return { code: 0 };
         }
         return super._exec(args, ctx);

package/esm/commands/publish-command.d.ts

@@ -12,7 +12,7 @@ export declare class PublishCommand extends RunCommand<PublishCommand.Options> {
     protected _exec(args: {
         name: string;
         json: any;
-        dirname: string;
+        cwd: string;
         dependencies?: string[];
         command: string;
     }, options?: any): Promise<ExecuteCommandResult>;

package/esm/commands/run-command.d.ts

@@ -13,16 +13,18 @@ export declare class RunCommand<TOptions extends RunCommand.Options> extends Mul
     protected _prepareScriptTask(args: {
         name: string;
         json: any;
-        dirname: string;
+        cwd: string;
         dependencies?: string[];
     }, ctx?: any): Task | undefined;
     protected _exec(args: {
         name: string;
-        json: any;
-        dirname: string;
+        cwd: string;
         dependencies?: string[];
         command: string;
         stdio?: 'inherit' | 'pipe';
+        json?: any;
+        logLevel?: string;
+        noThrow?: boolean;
     }, options?: any): Promise<ExecuteCommandResult>;
 }
 export declare namespace RunCommand {

package/esm/commands/run-command.mjs

@@ -17,7 +17,7 @@ export class RunCommand extends MultiTaskCommand {
             if (p.json.scripts) {
                 const childTask = this._prepareScriptTask({
                     name: p.name,
-                    dirname: p.dirname,
+                    cwd: p.dirname,
                     json: p.json,
                     dependencies: p.dependencies
                 }, options);
@@ -28,7 +28,7 @@ export class RunCommand extends MultiTaskCommand {
         }
         const mainTask = this._prepareScriptTask({
             name: 'root',
-            dirname: this.repository.dirname,
+            cwd: this.repository.dirname,
             json: this.repository.json
         });
         if (!mainTask?.children)
@@ -83,16 +83,19 @@ export class RunCommand extends MultiTaskCommand {
         }
     }
     async _exec(args, options) {
-        logger.verbose(this.commandName, chalk.cyan(args.name), chalk.cyanBright.bold('executing'), logger.separator, args.command);
+        const logLevel = args.logLevel == null ? 'info' : args.logLevel;
+        if (logLevel)
+            logger.verbose(this.commandName, chalk.cyan(args.name), chalk.cyanBright.bold('executing'), logger.separator, args.command);
         const t = Date.now();
-        const r = await exec(args.command, { cwd: args.dirname, stdio: args.stdio });
-        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);
-        }
-        else
-            logger.info(this.commandName, chalk.cyan(args.name), chalk.green.bold('executed'), logger.separator, args.command, chalk.yellow(' (' + (Date.now() - t) + ' ms)'));
-        if (r.error)
+        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);
+            }
+            else
+                logger.log(logLevel, this.commandName, chalk.cyan(args.name), chalk.green.bold('executed'), logger.separator, args.command, chalk.yellow(' (' + (Date.now() - t) + ' ms)'));
+        if (r.error && !args.noThrow)
             throw r.error;
         return r;
     }

package/esm/commands/version-command.d.ts

@@ -13,7 +13,7 @@ export declare class VersionCommand extends RunCommand<VersionCommand.Options> {
     protected _exec(args: {
         name: string;
         json: any;
-        dirname: string;
+        cwd: string;
         dependencies?: string[];
         command: string;
     }, options?: any): Promise<ExecuteCommandResult>;
@@ -23,7 +23,7 @@ export declare namespace VersionCommand {
         unified?: boolean;
         all?: boolean;
         ignoreDirty?: boolean;
-        forceDirty?: boolean;
+        noTag?: boolean;
     }
     const cliCommandOptions: Record<string, yargs.Options>;
     function initCli(repository: Repository, program: yargs.Argv): void;

package/esm/commands/version-command.mjs

@@ -1,12 +1,13 @@
 import path from 'path';
-import fs from 'fs';
 import chalk from 'chalk';
 import semver from 'semver';
 import logger from 'npmlog';
 import stripColor from 'strip-color';
+import { Task } from 'power-tasks';
 import { RunCommand } from './run-command.mjs';
 import { GitHelper } from './../utils/git-utils.mjs';
 import { Command } from './../core/command.mjs';
+import fs from 'fs/promises';
 export class VersionCommand extends RunCommand {
     constructor(repository, bump, options) {
         super(repository, 'version', options);
@@ -27,7 +28,7 @@ export class VersionCommand extends RunCommand {
             let message = '';
             let newVer = '';
             const logPkgName = chalk.yellow(p.name);
-            if (!this.options.forceDirty) {
+            if (!this.options.noTag) {
                 const isDirty = dirtyFiles.find(f => !path.relative(relDir, f).startsWith('..'));
                 if (isDirty) {
                     if (!this.options.ignoreDirty)
@@ -65,13 +66,30 @@ export class VersionCommand extends RunCommand {
         }
         if (errorCount)
             throw new Error('Unable to bump version due to error(s)');
+        const maxVer = Object.values(newVersions).reduce((m, v) => {
+            return semver.gt(m, v) ? m : v;
+        }, '0.0.0');
         if (this.options.unified) {
-            const maxVer = Object.values(newVersions).reduce((m, v) => {
-                return semver.gt(m, v) ? m : v;
-            }, '0.0.0');
             Object.keys(newVersions).forEach(k => newVersions[k] = maxVer);
         }
-        return super._prepareTasks(selectedPackages, { newVersions });
+        const tasks = await super._prepareTasks(selectedPackages, { newVersions });
+        tasks.forEach(t => t.options.exclusive = true);
+        if (this.options.unified)
+            tasks.push(new Task(async () => {
+                try {
+                    await super._exec({
+                        name: 'rman',
+                        command: 'git tag -a "v' + maxVer + '" -m "version ' + maxVer + '"',
+                        cwd: this.repository.dirname,
+                        stdio: logger.levelIndex <= 1000 ? 'inherit' : 'pipe',
+                        logLevel: 'silly'
+                    });
+                }
+                catch {
+                    //
+                }
+            }, { exclusive: true }));
+        return tasks;
     }
     async _exec(args, options) {
         if (args.name === 'root')
@@ -82,9 +100,18 @@ export class VersionCommand extends RunCommand {
             const newVer = newVersions[args.name];
             args.json.version = newVer;
             delete args.json.scripts.version;
-            const f = path.join(args.dirname, 'package.json');
+            const f = path.join(args.cwd, 'package.json');
             const data = JSON.stringify(args.json, undefined, 2);
-            fs.writeFileSync(f, data, 'utf-8');
+            await fs.writeFile(f, data, 'utf-8');
+            if (!this.options.noTag) {
+                await super._exec({
+                    name: args.name,
+                    command: 'git commit -m "' + newVer + '" package.json',
+                    cwd: args.cwd,
+                    stdio: logger.levelIndex <= 1000 ? 'inherit' : 'pipe',
+                    logLevel: 'silly'
+                });
+            }
             logger.info(this.commandName, args.name, logger.separator, 'Version changed from ' + chalk.cyan(oldVer) + ' to ' + chalk.cyan(newVer));
             return { code: 0 };
         }
@@ -106,12 +133,12 @@ VersionCommand.commandName = 'version';
         },
         'ignore-dirty': {
             alias: 'i',
-            describe: '# Ignore dirty packages',
+            describe: '# Do not bump version for dirty packages',
             type: 'boolean'
         },
-        'force-dirty': {
-            alias: 'f',
-            describe: '# Force bump version for dirty packages',
+        'no-tag': {
+            alias: 'n',
+            describe: '# Do not crate git version tag. (Ignores dirty check)',
             type: 'boolean'
         }
     };

package/esm/core/command.mjs

@@ -82,7 +82,7 @@ export class Command extends TypedEventEmitterClass(AsyncEventEmitter) {
         //
     }
     async _preExecute() {
-        logger.info('run', `Executing "${this.commandName}" command`);
+        logger.info('rman', `Executing "${this.commandName}" command`);
     }
 }
 (function (Command) {
@@ -106,8 +106,8 @@ export class Command extends TypedEventEmitterClass(AsyncEventEmitter) {
     function composeOptions(commandName, yargArgs, config) {
         const result = merge({}, yargArgs);
         merge(result, config, { filter: (_, key) => key !== 'command' });
-        const cfgCmd = config.commans && typeof config.command === 'object' ?
-            config.command : undefined;
+        const cfgCmd = config.command && typeof config.command === 'object' ?
+            config.command[commandName] : undefined;
         if (cfgCmd && typeof cfgCmd === 'object')
             merge(result, cfgCmd);
         return result;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rman",
   "description": "Monorepo repository manager",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "author": "Panates",
   "license": "MIT",
   "contributors": [