rman 0.35.0 → 0.36.1

package/cjs/commands/publish-command.js

@@ -7,6 +7,7 @@ const npmlog_1 = tslib_1.__importDefault(require("npmlog"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const command_js_1 = require("../core/command.js");
 const npm_utils_js_1 = require("../utils/npm-utils.js");
+const package_not_found_error_js_1 = require("../utils/package-not-found-error.js");
 const run_command_js_1 = require("./run-command.js");
 class PublishCommand extends run_command_js_1.RunCommand {
     constructor(repository, options) {
@@ -28,35 +29,37 @@ class PublishCommand extends run_command_js_1.RunCommand {
                 continue;
             }
             npmlog_1.default.info(this.commandName, logPkgName, npmlog_1.default.separator, `Fetching package information from repository`);
-            const npmHelper = new npm_utils_js_1.NpmHelper({ cwd: p.dirname });
+            const npmHelper = new npm_utils_js_1.NpmHelper({ cwd: p.dirname, userconfig: this.options.userconfig });
             promises.push(npmHelper
-                .getPackageInfo(p.json.name, { userconfig: this.options.userconfig })
+                .getPackageInfo(p.json.name)
                 .then(r => {
-                const sameVersion = !!(r && r.version === p.version);
-                if (this.options.checkOnly) {
-                    npmlog_1.default.info(this.commandName, logPkgName, npmlog_1.default.separator, !r.version
-                        ? ansi_colors_1.default.yellow('No package information found in repository')
-                        : sameVersion
-                            ? `No publish needed. Version (${ansi_colors_1.default.magenta(p.version)}) same in repository`
-                            : `Publishing is possible.` +
-                                ` Version "${ansi_colors_1.default.magenta(p.version)}" differs from version in repository (${ansi_colors_1.default.magenta(r.version)})`);
+                const fetchedVersion = r.version;
+                const sameVersion = fetchedVersion === p.version;
+                npmlog_1.default.info(this.commandName, logPkgName, npmlog_1.default.separator, sameVersion
+                    ? `No publish needed. Version (${ansi_colors_1.default.magenta(p.version)}) same in repository`
+                    : `Publishing is possible.` +
+                        ` Version "${ansi_colors_1.default.magenta(p.version)}" differs from version in repository (${ansi_colors_1.default.magenta(fetchedVersion)})`);
+                if (this.options.checkOnly)
                     return;
-                }
-                if (r && r.version === p.version) {
-                    npmlog_1.default.info(this.commandName, logPkgName, npmlog_1.default.separator, `No publish needed. Version (${ansi_colors_1.default.magenta(p.version)}) same in repository`);
-                }
-                else {
-                    npmlog_1.default.verbose(this.commandName, logPkgName, npmlog_1.default.separator, `Publishing is possible.` +
-                        ` Version "${ansi_colors_1.default.magenta(p.version)}" differs from version in repository (${ansi_colors_1.default.magenta(r.version)})`);
+                if (fetchedVersion === p.version) {
                     selectedPackages.push(p);
                 }
             })
                 .catch(e => {
-                if (e.name !== 'PackageNotFoundError')
+                if (e instanceof package_not_found_error_js_1.PackageNotFoundError) {
+                    npmlog_1.default.info(this.commandName, logPkgName, npmlog_1.default.separator, 'Publishing is possible. No package information found in repository');
+                    selectedPackages.push(p);
+                }
+                else
                     throw e;
             }));
         }
         await Promise.all(promises);
+        npmlog_1.default.verbose(this.commandName, '', npmlog_1.default.separator, `${selectedPackages.length} packages will be published`);
+        selectedPackages.forEach(p => {
+            p.json.scripts = p.json.scripts || {};
+            p.json.scripts.publish = '#';
+        });
         return super._prepareTasks(selectedPackages, { newVersions });
     }
     async _exec(pkg, command, args, options) {
@@ -71,9 +74,10 @@ class PublishCommand extends run_command_js_1.RunCommand {
                 else
                     cwd = path_1.default.join(pkg.dirname, contents);
             }
-            return super._exec(pkg, 'npm publish' +
+            const npmHelper = new npm_utils_js_1.NpmHelper({ cwd: pkg.dirname, userconfig: this.options.userconfig });
+            return super._exec(pkg, 'echo npm publish' +
                 (this.options.access ? ' --access=' + this.options.access : '') +
-                (this.options.userconfig ? ` --userconfig="${this.options.userconfig}"` : ''), {
+                (npmHelper.userconfig ? ` --userconfig="${npmHelper.userconfig}"` : ''), {
                 ...args,
                 cwd,
                 stdio: npmlog_1.default.levelIndex < 1000 ? 'inherit' : 'pipe',

package/cjs/commands/run-command.js

@@ -26,11 +26,12 @@ class RunCommand extends multi_task_command_js_1.MultiTaskCommand {
             }
         }
         const rootTask = this._prepareScriptTask(this.repository.rootPackage);
-        if (!rootTask?.children)
+        const children = rootTask?.options.children;
+        if (!children)
             return packageTasks;
         const tasks = [];
-        const pre = rootTask.children.filter(t => t.name?.endsWith(':pre' + this.script));
-        const post = rootTask.children.filter(t => t.name?.endsWith(':post' + this.script));
+        const pre = children.filter(t => t.name?.endsWith(':pre' + this.script));
+        const post = 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);

package/cjs/tsconfig-build-cjs.tsbuildinfo

@@ -1 +1 @@
-{"root":["../../src/cli.ts","../../src/index.ts","../../src/commands/build-command.ts","../../src/commands/changed-command.ts","../../src/commands/ci-command.ts","../../src/commands/execute-command.ts","../../src/commands/info-command.ts","../../src/commands/list-command.ts","../../src/commands/multi-task-command.ts","../../src/commands/publish-command.ts","../../src/commands/run-command.ts","../../src/commands/version-command.ts","../../src/core/command.ts","../../src/core/constants.ts","../../src/core/logger.ts","../../src/core/package.ts","../../src/core/repository.ts","../../src/utils/exec.ts","../../src/utils/file-utils.ts","../../src/utils/get-dirname.ts","../../src/utils/git-utils.ts","../../src/utils/npm-run-path.ts","../../src/utils/npm-utils.ts"],"version":"5.7.3"}
+{"root":["../../src/cli.ts","../../src/index.ts","../../src/commands/build-command.ts","../../src/commands/changed-command.ts","../../src/commands/ci-command.ts","../../src/commands/execute-command.ts","../../src/commands/info-command.ts","../../src/commands/list-command.ts","../../src/commands/multi-task-command.ts","../../src/commands/publish-command.ts","../../src/commands/run-command.ts","../../src/commands/version-command.ts","../../src/core/command.ts","../../src/core/constants.ts","../../src/core/logger.ts","../../src/core/package.ts","../../src/core/repository.ts","../../src/utils/exec.ts","../../src/utils/file-utils.ts","../../src/utils/get-dirname.ts","../../src/utils/git-utils.ts","../../src/utils/npm-run-path.ts","../../src/utils/npm-utils.ts","../../src/utils/package-not-found-error.ts"],"version":"5.7.3"}

package/cjs/utils/npm-utils.js

@@ -1,22 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NpmHelper = exports.PackageNotFoundError = void 0;
+exports.NpmHelper = void 0;
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
 const exec_js_1 = require("./exec.js");
-class PackageNotFoundError extends Error {
-}
-exports.PackageNotFoundError = PackageNotFoundError;
+const package_not_found_error_js_1 = require("./package-not-found-error.js");
 class NpmHelper {
     constructor(options) {
         this.cwd = options?.cwd || process.cwd();
+        this.userconfig = options?.userconfig ? path_1.default.resolve(this.cwd, options.userconfig) : undefined;
     }
-    async getPackageInfo(packageName, options) {
+    async getPackageInfo(packageName) {
         const argv = ['view', packageName, '--json'];
-        if (options?.userconfig)
-            argv.push('--userconfig', options.userconfig);
+        if (this.userconfig)
+            argv.push('--userconfig', this.userconfig);
         const x = await (0, exec_js_1.exec)('npm', { cwd: this.cwd, argv });
         if (x && x.stdout) {
             if (x.code && x.stdout.includes('404')) {
-                return new PackageNotFoundError('Package ' + packageName + ' not found in repository');
+                throw new package_not_found_error_js_1.PackageNotFoundError('Package ' + packageName + ' not found in repository');
             }
             const b = x.stdout.indexOf('{');
             const e = x.stdout.lastIndexOf('}');

package/cjs/utils/package-not-found-error.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PackageNotFoundError = void 0;
+class PackageNotFoundError extends Error {
+}
+exports.PackageNotFoundError = PackageNotFoundError;

package/esm/commands/publish-command.js

@@ -3,6 +3,7 @@ import logger from 'npmlog';
 import path from 'path';
 import { Command } from '../core/command.js';
 import { NpmHelper } from '../utils/npm-utils.js';
+import { PackageNotFoundError } from '../utils/package-not-found-error.js';
 import { RunCommand } from './run-command.js';
 export class PublishCommand extends RunCommand {
     constructor(repository, options) {
@@ -24,35 +25,37 @@ export class PublishCommand extends RunCommand {
                 continue;
             }
             logger.info(this.commandName, logPkgName, logger.separator, `Fetching package information from repository`);
-            const npmHelper = new NpmHelper({ cwd: p.dirname });
+            const npmHelper = new NpmHelper({ cwd: p.dirname, userconfig: this.options.userconfig });
             promises.push(npmHelper
-                .getPackageInfo(p.json.name, { userconfig: this.options.userconfig })
+                .getPackageInfo(p.json.name)
                 .then(r => {
-                const sameVersion = !!(r && r.version === p.version);
-                if (this.options.checkOnly) {
-                    logger.info(this.commandName, logPkgName, logger.separator, !r.version
-                        ? colors.yellow('No package information found in repository')
-                        : sameVersion
-                            ? `No publish needed. Version (${colors.magenta(p.version)}) same in repository`
-                            : `Publishing is possible.` +
-                                ` Version "${colors.magenta(p.version)}" differs from version in repository (${colors.magenta(r.version)})`);
+                const fetchedVersion = r.version;
+                const sameVersion = fetchedVersion === p.version;
+                logger.info(this.commandName, logPkgName, logger.separator, sameVersion
+                    ? `No publish needed. Version (${colors.magenta(p.version)}) same in repository`
+                    : `Publishing is possible.` +
+                        ` Version "${colors.magenta(p.version)}" differs from version in repository (${colors.magenta(fetchedVersion)})`);
+                if (this.options.checkOnly)
                     return;
-                }
-                if (r && r.version === p.version) {
-                    logger.info(this.commandName, logPkgName, logger.separator, `No publish needed. Version (${colors.magenta(p.version)}) same in repository`);
-                }
-                else {
-                    logger.verbose(this.commandName, logPkgName, logger.separator, `Publishing is possible.` +
-                        ` Version "${colors.magenta(p.version)}" differs from version in repository (${colors.magenta(r.version)})`);
+                if (fetchedVersion === p.version) {
                     selectedPackages.push(p);
                 }
             })
                 .catch(e => {
-                if (e.name !== 'PackageNotFoundError')
+                if (e instanceof PackageNotFoundError) {
+                    logger.info(this.commandName, logPkgName, logger.separator, 'Publishing is possible. No package information found in repository');
+                    selectedPackages.push(p);
+                }
+                else
                     throw e;
             }));
         }
         await Promise.all(promises);
+        logger.verbose(this.commandName, '', logger.separator, `${selectedPackages.length} packages will be published`);
+        selectedPackages.forEach(p => {
+            p.json.scripts = p.json.scripts || {};
+            p.json.scripts.publish = '#';
+        });
         return super._prepareTasks(selectedPackages, { newVersions });
     }
     async _exec(pkg, command, args, options) {
@@ -67,9 +70,10 @@ export class PublishCommand extends RunCommand {
                 else
                     cwd = path.join(pkg.dirname, contents);
             }
-            return super._exec(pkg, 'npm publish' +
+            const npmHelper = new NpmHelper({ cwd: pkg.dirname, userconfig: this.options.userconfig });
+            return super._exec(pkg, 'echo npm publish' +
                 (this.options.access ? ' --access=' + this.options.access : '') +
-                (this.options.userconfig ? ` --userconfig="${this.options.userconfig}"` : ''), {
+                (npmHelper.userconfig ? ` --userconfig="${npmHelper.userconfig}"` : ''), {
                 ...args,
                 cwd,
                 stdio: logger.levelIndex < 1000 ? 'inherit' : 'pipe',

package/esm/commands/run-command.js

@@ -22,11 +22,12 @@ export class RunCommand extends MultiTaskCommand {
             }
         }
         const rootTask = this._prepareScriptTask(this.repository.rootPackage);
-        if (!rootTask?.children)
+        const children = rootTask?.options.children;
+        if (!children)
             return packageTasks;
         const tasks = [];
-        const pre = rootTask.children.filter(t => t.name?.endsWith(':pre' + this.script));
-        const post = rootTask.children.filter(t => t.name?.endsWith(':post' + this.script));
+        const pre = children.filter(t => t.name?.endsWith(':pre' + this.script));
+        const post = 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);

package/esm/tsconfig-build-esm.tsbuildinfo

@@ -1 +1 @@
-{"root":["../../src/cli.ts","../../src/index.ts","../../src/commands/build-command.ts","../../src/commands/changed-command.ts","../../src/commands/ci-command.ts","../../src/commands/execute-command.ts","../../src/commands/info-command.ts","../../src/commands/list-command.ts","../../src/commands/multi-task-command.ts","../../src/commands/publish-command.ts","../../src/commands/run-command.ts","../../src/commands/version-command.ts","../../src/core/command.ts","../../src/core/constants.ts","../../src/core/logger.ts","../../src/core/package.ts","../../src/core/repository.ts","../../src/utils/exec.ts","../../src/utils/file-utils.ts","../../src/utils/get-dirname.ts","../../src/utils/git-utils.ts","../../src/utils/npm-run-path.ts","../../src/utils/npm-utils.ts"],"version":"5.7.3"}
+{"root":["../../src/cli.ts","../../src/index.ts","../../src/commands/build-command.ts","../../src/commands/changed-command.ts","../../src/commands/ci-command.ts","../../src/commands/execute-command.ts","../../src/commands/info-command.ts","../../src/commands/list-command.ts","../../src/commands/multi-task-command.ts","../../src/commands/publish-command.ts","../../src/commands/run-command.ts","../../src/commands/version-command.ts","../../src/core/command.ts","../../src/core/constants.ts","../../src/core/logger.ts","../../src/core/package.ts","../../src/core/repository.ts","../../src/utils/exec.ts","../../src/utils/file-utils.ts","../../src/utils/get-dirname.ts","../../src/utils/git-utils.ts","../../src/utils/npm-run-path.ts","../../src/utils/npm-utils.ts","../../src/utils/package-not-found-error.ts"],"version":"5.7.3"}

package/esm/utils/npm-utils.js

@@ -1,18 +1,19 @@
+import path from 'path';
 import { exec } from './exec.js';
-export class PackageNotFoundError extends Error {
-}
+import { PackageNotFoundError } from './package-not-found-error.js';
 export class NpmHelper {
     constructor(options) {
         this.cwd = options?.cwd || process.cwd();
+        this.userconfig = options?.userconfig ? path.resolve(this.cwd, options.userconfig) : undefined;
     }
-    async getPackageInfo(packageName, options) {
+    async getPackageInfo(packageName) {
         const argv = ['view', packageName, '--json'];
-        if (options?.userconfig)
-            argv.push('--userconfig', options.userconfig);
+        if (this.userconfig)
+            argv.push('--userconfig', this.userconfig);
         const x = await exec('npm', { cwd: this.cwd, argv });
         if (x && x.stdout) {
             if (x.code && x.stdout.includes('404')) {
-                return new PackageNotFoundError('Package ' + packageName + ' not found in repository');
+                throw new PackageNotFoundError('Package ' + packageName + ' not found in repository');
             }
             const b = x.stdout.indexOf('{');
             const e = x.stdout.lastIndexOf('}');

package/esm/utils/package-not-found-error.js

@@ -0,0 +1,2 @@
+export class PackageNotFoundError extends Error {
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rman",
   "description": "Monorepo repository manager",
-  "version": "0.35.0",
+  "version": "0.36.1",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {

package/types/utils/npm-utils.d.ts

@@ -1,13 +1,11 @@
-export declare class PackageNotFoundError extends Error {
-}
 export declare namespace NpmHelper { }
 export interface NpmOptions {
     cwd?: string;
+    userconfig?: string;
 }
 export declare class NpmHelper {
     cwd: string;
+    userconfig?: string;
     constructor(options?: NpmOptions);
-    getPackageInfo(packageName: string, options?: {
-        userconfig?: string;
-    }): Promise<any>;
+    getPackageInfo(packageName: string): Promise<any>;
 }

package/types/utils/package-not-found-error.d.ts

@@ -0,0 +1,2 @@
+export declare class PackageNotFoundError extends Error {
+}