npm-update-package 0.46.6 → 0.48.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "npm-update-package",
-    "version": "0.46.6",
+    "version": "0.48.0",
     "description": "CLI tool for creating pull requests to update npm packages",
     "scripts": {
         "badges": "jest-coverage-badges output docs",
@@ -12,7 +12,7 @@
         "prepare": "husky install",
         "prepublish": "npm-run-all lint test build",
         "start": "ts-node src/bin.ts",
-        "test": "jest --passWithNoTests"
+        "test": "jest"
     },
     "bin": "dist/src/bin.js",
     "dependencies": {
@@ -46,7 +46,7 @@
         "eslint": "8.11.0",
         "eslint-config-standard-with-typescript": "21.0.1",
         "eslint-plugin-import": "2.25.4",
-        "eslint-plugin-jest": "26.1.1",
+        "eslint-plugin-jest": "26.1.2",
         "eslint-plugin-node": "11.1.0",
         "eslint-plugin-promise": "6.0.0",
         "eslint-plugin-tsdoc": "0.2.14",

package/dist/src/core/OutdatedPackageProcessor.js

@@ -5,7 +5,7 @@ const Either_1 = require("fp-ts/lib/Either");
 const git_1 = require("../git");
 // TODO: add test
 class OutdatedPackageProcessor {
-    constructor({ git, packageManager, pullRequestCreator, branchFinder, logger, commitMessageCreator, pullRequestFinder, pullRequestCloser, packageUpdater }) {
+    constructor({ git, packageManager, pullRequestCreator, branchFinder, logger, commitMessageCreator, pullRequestFinder, pullRequestsCloser, packageUpdater }) {
         this.git = git;
         this.packageManager = packageManager;
         this.pullRequestCreator = pullRequestCreator;
@@ -13,7 +13,7 @@ class OutdatedPackageProcessor {
         this.logger = logger;
         this.commitMessageCreator = commitMessageCreator;
         this.pullRequestFinder = pullRequestFinder;
-        this.pullRequestCloser = pullRequestCloser;
+        this.pullRequestsCloser = pullRequestsCloser;
         this.packageUpdater = packageUpdater;
     }
     /**
@@ -69,10 +69,7 @@ class OutdatedPackageProcessor {
     async closeOldPullRequests(outdatedPackage) {
         const pullRequests = this.pullRequestFinder.findByPackageName(outdatedPackage.name);
         this.logger.debug(`pullRequests=${JSON.stringify(pullRequests)}`);
-        await Promise.all(pullRequests.map(async (pullRequest) => {
-            await this.pullRequestCloser.close(pullRequest);
-            this.logger.info(`Pull request for ${outdatedPackage.name} has closed. ${pullRequest.html_url}`);
-        }));
+        await this.pullRequestsCloser.close(pullRequests);
     }
 }
 exports.OutdatedPackageProcessor = OutdatedPackageProcessor;

package/dist/src/core/OutdatedPackagesProcessor.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OutdatedPackagesProcessor = void 0;
-// TODO: add test
 class OutdatedPackagesProcessor {
     constructor({ outdatedPackageProcessor, logger }) {
         this.outdatedPackageProcessor = outdatedPackageProcessor;

package/dist/src/github/pull-request/closer/PullRequestsCloser.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PullRequestsCloser = void 0;
+class PullRequestsCloser {
+    constructor({ pullRequestCloser, logger }) {
+        this.pullRequestCloser = pullRequestCloser;
+        this.logger = logger;
+    }
+    async close(pullRequests) {
+        await Promise.all(pullRequests.map(async (pullRequest) => {
+            await this.pullRequestCloser.close(pullRequest);
+            this.logger.info(`Pull request #${pullRequest.number} has closed. ${pullRequest.html_url}`);
+        }));
+    }
+}
+exports.PullRequestsCloser = PullRequestsCloser;

package/dist/src/github/pull-request/closer/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./PullRequestCloser"), exports);
+__exportStar(require("./PullRequestsCloser"), exports);

package/dist/src/github/pull-request/creator/PullRequestBodyCreator.js

@@ -19,6 +19,8 @@ class PullRequestBodyCreator {
         const sections = [];
         const outdatedPackagesTable = this.createOutdatedPackagesTable(outdatedPackage);
         sections.push(`This PR updates these packages:\n\n${outdatedPackagesTable}`);
+        const diffSection = this.createDiffSection(outdatedPackage);
+        sections.push(diffSection);
         const gitRepo = await this.extractRepository(outdatedPackage);
         if ((gitRepo === null || gitRepo === void 0 ? void 0 : gitRepo.isGitHub) === true) {
             const releaseNotesSection = await this.createReleaseNotesSection({
@@ -39,6 +41,15 @@ class PullRequestBodyCreator {
         sections.push(`---\n${footer}`);
         return sections.join('\n\n');
     }
+    createDiffSection(outdatedPackage) {
+        const packageName = outdatedPackage.name;
+        const currentVersion = outdatedPackage.currentVersion.version;
+        const newVersion = outdatedPackage.newVersion.version;
+        return `## Package diffs
+
+- [npmfs](https://npmfs.com/compare/${packageName}/${currentVersion}/${newVersion})
+- [Renovate Bot Package Diff](https://renovatebot.com/diffs/npm/${packageName}/${currentVersion}/${newVersion})`;
+    }
     createFooter() {
         return `This PR has been generated by [${package_json_1.default.name}](${package_json_1.default.homepage}) v${package_json_1.default.version}`;
     }
@@ -51,11 +62,9 @@ class PullRequestBodyCreator {
         const currentVersionLink = `[\`${currentVersion}\`](https://www.npmjs.com/package/${packageName}/v/${currentVersion})`;
         const newVersion = outdatedPackage.newVersion.version;
         const newVersionLink = `[\`${newVersion}\`](https://www.npmjs.com/package/${packageName}/v/${newVersion})`;
-        const diffLink = `[diff](https://renovatebot.com/diffs/npm/${packageName}/${currentVersion}/${newVersion})`;
-        const version = `${currentVersionLink} -> ${newVersionLink} (${diffLink})`;
-        return `|Package|Dependency type|Level|Version|
-|---|---|---|---|
-|${packageLink}|${dependencyType}|${level}|${version}|`;
+        return `|Package|Dependency type|Level|Current version|New version|
+|---|---|---|---|---|
+|${packageLink}|${dependencyType}|${level}|${currentVersionLink}|${newVersionLink}|`;
     }
     createNotesSection() {
         if (this.options.prBodyNotes === undefined) {

package/dist/src/main.js

@@ -86,6 +86,10 @@ const main = async ({ options, logger }) => {
     const commitMessageCreator = new git_1.CommitMessageCreator(options.commitMessage);
     const pullRequestFinder = new github_1.PullRequestFinder(pullRequests);
     const pullRequestCloser = new github_1.PullRequestCloser(github);
+    const pullRequestsCloser = new github_1.PullRequestsCloser({
+        pullRequestCloser,
+        logger
+    });
     const packageUpdater = new core_1.PackageUpdater({
         packageManager,
         ncu
@@ -98,7 +102,7 @@ const main = async ({ options, logger }) => {
         logger,
         commitMessageCreator,
         pullRequestFinder,
-        pullRequestCloser,
+        pullRequestsCloser,
         packageUpdater
     });
     const outdatedPackagesProcessor = new core_1.OutdatedPackagesProcessor({

package/dist/src/options/createOptions.js

@@ -0,0 +1,24 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createOptions = void 0;
+const commander_1 = require("commander");
+const package_json_1 = __importDefault(require("../../package.json"));
+const Options_1 = require("./Options");
+const toCommanderOption_1 = require("./toCommanderOption");
+// TODO: add test
+const createOptions = (cliOptions) => {
+    commander_1.program.version(package_json_1.default.version);
+    cliOptions
+        .map(toCommanderOption_1.toCommanderOption)
+        .forEach(option => commander_1.program.addOption(option));
+    commander_1.program.parse(process.argv);
+    const options = commander_1.program.opts();
+    if (!(0, Options_1.isOptions)(options)) {
+        throw new Error(`Failed to parse command-line options. options=${JSON.stringify(options)}`);
+    }
+    return options;
+};
+exports.createOptions = createOptions;

package/dist/src/options/initOptions.js

@@ -1,25 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initOptions = void 0;
-const commander_1 = require("commander");
-const package_json_1 = __importDefault(require("../../package.json"));
 const cliOptions_1 = require("./cliOptions");
-const Options_1 = require("./Options");
-const toCommanderOption_1 = require("./toCommanderOption");
-// TODO: add test
+const createOptions_1 = require("./createOptions");
 const initOptions = () => {
-    commander_1.program.version(package_json_1.default.version);
-    cliOptions_1.cliOptions
-        .map(toCommanderOption_1.toCommanderOption)
-        .forEach(option => commander_1.program.addOption(option));
-    commander_1.program.parse(process.argv);
-    const options = commander_1.program.opts();
-    if (!(0, Options_1.isOptions)(options)) {
-        throw new Error(`Failed to parse command-line options. options=${JSON.stringify(options)}`);
-    }
-    return options;
+    return (0, createOptions_1.createOptions)(cliOptions_1.cliOptions);
 };
 exports.initOptions = initOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-update-package",
-  "version": "0.46.6",
+  "version": "0.48.0",
   "description": "CLI tool for creating pull requests to update npm packages",
   "scripts": {
     "badges": "jest-coverage-badges output docs",
@@ -12,7 +12,7 @@
     "prepare": "husky install",
     "prepublish": "npm-run-all lint test build",
     "start": "ts-node src/bin.ts",
-    "test": "jest --passWithNoTests"
+    "test": "jest"
   },
   "bin": "dist/src/bin.js",
   "dependencies": {
@@ -46,7 +46,7 @@
     "eslint": "8.11.0",
     "eslint-config-standard-with-typescript": "21.0.1",
     "eslint-plugin-import": "2.25.4",
-    "eslint-plugin-jest": "26.1.1",
+    "eslint-plugin-jest": "26.1.2",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "6.0.0",
     "eslint-plugin-tsdoc": "0.2.14",