npm-update-package 0.19.1 → 0.21.0

package/README.md

@@ -73,33 +73,6 @@ Package manager of your project
 - required: false
 - default: `npm`
 
-### `--pull-request-body`
-
-Pull request body template
-
-- type: string
-- variables:
-  - `appName`
-  - `appVersion`
-  - `appWeb`
-  - `currentVersion`
-  - `newVersion`
-  - `packageName`
-  - `updateType`
-- required: false
-- default:
-
-```
-This PR updates these packages:
-
-|package|type|current version|new version|
-|---|---|---|---|
-|[{{{packageName}}}](https://www.npmjs.com/package/{{{packageName}}})|{{updateType}}|\`{{currentVersion}}\`|\`{{newVersion}}\`|
-
----
-This PR has been generated by [{{{appName}}}]({{{appWeb}}}) v{{appVersion}}
-```
-
 ### `--pull-request-labels`
 
 Pull request labels
@@ -153,8 +126,6 @@ Actual working examples can be seen in these repositories.
 
 The following shows the process flow of npm-update-package:
 
-[![](http://www.plantuml.com/plantuml/svg/RKyxKiCm5EpVARPqYbmWRi9Gq4666GuWx4tiGPQ4z0JXzaIn70D38wsUzkrddzH4pPELAv1Jz3bWCgEJtGCLFcjlb3s2wTxCYQaL6OzexgozZM0YaSDM_RPmDz213iqNqqO0kbve4z4ulv7BQpnAjNcgueSgT8Y-Oqe-IcIWKG7-9Quye8HvvkILU8t6TGDu7fEcFodM102mkuyqjursdhs4uh6qQdyHGxOMaU-PIUjFCVtuAN6jDjzpxDe2dyDeYUQHPrtKbv2oabTOaEmlHvxiDm00)](http://www.plantuml.com/plantuml/uml/RKyxKiCm5EpVARPqYbmWRi9Gq4666GuWx4tiGPQ4z0JXzaIn70D38wsUzkrddzH4pPELAv1Jz3bWCgEJtGCLFcjlb3s2wTxCYQaL6OzexgozZM0YaSDM_RPmDz213iqNqqO0kbve4z4ulv7BQpnAjNcgueSgT8Y-Oqe-IcIWKG7-9Quye8HvvkILU8t6TGDu7fEcFodM102mkuyqjursdhs4uh6qQdyHGxOMaU-PIUjFCVtuAN6jDjzpxDe2dyDeYUQHPrtKbv2oabTOaEmlHvxiDm00)
-
 <!--
 ```plantuml
 @startuml
@@ -187,6 +158,8 @@ end
 ```
 -->
 
+[![](http://www.plantuml.com/plantuml/svg/RKyxKiCm5EpVARPqYbmWRi9Gq4666GuWx4tiGPQ4z0JXzaIn70D38wsUzkrddzH4pPELAv1Jz3bWCgEJtGCLFcjlb3s2wTxCYQaL6OzexgozZM0YaSDM_RPmDz213iqNqqO0kbve4z4ulv7BQpnAjNcgueSgT8Y-Oqe-IcIWKG7-9Quye8HvvkILU8t6TGDu7fEcFodM102mkuyqjursdhs4uh6qQdyHGxOMaU-PIUjFCVtuAN6jDjzpxDe2dyDeYUQHPrtKbv2oabTOaEmlHvxiDm00)](http://www.plantuml.com/plantuml/uml/RKyxKiCm5EpVARPqYbmWRi9Gq4666GuWx4tiGPQ4z0JXzaIn70D38wsUzkrddzH4pPELAv1Jz3bWCgEJtGCLFcjlb3s2wTxCYQaL6OzexgozZM0YaSDM_RPmDz213iqNqqO0kbve4z4ulv7BQpnAjNcgueSgT8Y-Oqe-IcIWKG7-9Quye8HvvkILU8t6TGDu7fEcFodM102mkuyqjursdhs4uh6qQdyHGxOMaU-PIUjFCVtuAN6jDjzpxDe2dyDeYUQHPrtKbv2oabTOaEmlHvxiDm00)
+
 ## FAQ
 
 ### What is the purpose of npm-update-package?

package/dist/app.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.app = void 0;
 exports.app = {
     name: 'npm-update-package',
-    version: '0.19.0',
+    version: '0.21.0',
     web: 'https://github.com/npm-update-package/npm-update-package'
 };

package/dist/github/PullRequestBodyCreator.js

@@ -4,8 +4,15 @@ exports.PullRequestBodyCreator = void 0;
 const mustache_1 = require("mustache");
 const app_1 = require("../app");
 class PullRequestBodyCreator {
-    constructor(template) {
-        this.template = template;
+    constructor() {
+        this.template = `This PR updates these packages:
+
+|package|type|current version|new version|
+|---|---|---|---|
+|[{{{packageName}}}](https://www.npmjs.com/package/{{{packageName}}})|{{updateType}}|\`{{currentVersion}}\`|\`{{newVersion}}\`|
+
+---
+This PR has been generated by [{{{appName}}}]({{{appWeb}}}) v{{appVersion}}`;
     }
     create(outdatedPackage) {
         const appName = app_1.app.name;

package/dist/main.js

@@ -6,6 +6,7 @@ const git_1 = require("./git");
 const github_1 = require("./github");
 const ncu_1 = require("./ncu");
 const package_json_1 = require("./package-json");
+const PackageJsonReader_1 = require("./package-json/PackageJsonReader");
 const package_manager_1 = require("./package-manager");
 const processors_1 = require("./processors");
 const terminal_1 = require("./terminal");
@@ -16,7 +17,14 @@ const main = async ({ options, logger }) => {
         githubToken: options.githubToken !== '' ? '***' : ''
     })}`);
     const packageJsonParser = new package_json_1.PackageJsonParser(logger);
-    const ncu = new ncu_1.Ncu(packageJsonParser);
+    const packageJsonReader = new PackageJsonReader_1.PackageJsonReader({
+        packageJsonParser,
+        logger
+    });
+    const ncu = new ncu_1.Ncu({
+        packageJsonReader,
+        logger
+    });
     const outdatedPackages = await ncu.check();
     logger.debug(`outdatedPackages=${JSON.stringify(outdatedPackages)}`);
     if (outdatedPackages.length === 0) {
@@ -48,7 +56,7 @@ const main = async ({ options, logger }) => {
         packageManager: options.packageManager
     });
     const pullRequestTitleCreator = new github_1.PullRequestTitleCreator(options.pullRequestTitle);
-    const pullRequestBodyCreator = new github_1.PullRequestBodyCreator(options.pullRequestBody);
+    const pullRequestBodyCreator = new github_1.PullRequestBodyCreator();
     const pullRequestCreator = new github_1.PullRequestCreator({
         github,
         gitRepo,

package/dist/ncu/Ncu.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Ncu = void 0;
 const npm_check_updates_1 = require("npm-check-updates");
-const file_1 = require("../file");
 const NcuResult_1 = require("./NcuResult");
 const NcuResultConverter_1 = require("./NcuResultConverter");
 // TODO: add test
 class Ncu {
-    constructor(packageJsonParser) {
-        this.packageJsonParser = packageJsonParser;
+    constructor({ packageJsonReader, logger }) {
+        this.packageJsonReader = packageJsonReader;
+        this.logger = logger;
     }
     async check() {
         return await this.run({
@@ -23,19 +23,19 @@ class Ncu {
         });
     }
     async run(options) {
-        const packageJson = await (0, file_1.readFile)('./package.json');
-        const pkg = this.packageJsonParser.parse(packageJson);
-        const currentDependencies = {
-            ...pkg.dependencies,
-            ...pkg.devDependencies,
-            ...pkg.peerDependencies,
-            ...pkg.optionalDependencies
-        };
+        const pkg = await this.packageJsonReader.read();
+        this.logger.debug(`pkg=${JSON.stringify(pkg)}`);
         const result = await (0, npm_check_updates_1.run)(options);
+        this.logger.debug(`result=${JSON.stringify(result)}`);
         if (!(0, NcuResult_1.isNcuResult)(result)) {
             throw new Error('result is not NcuResult');
         }
-        const ncuResultConverter = new NcuResultConverter_1.NcuResultConverter(currentDependencies);
+        const ncuResultConverter = new NcuResultConverter_1.NcuResultConverter({
+            ...pkg.dependencies,
+            ...pkg.devDependencies,
+            ...pkg.peerDependencies,
+            ...pkg.optionalDependencies
+        });
         return ncuResultConverter.toOutdatedPackages(result);
     }
 }

package/dist/options/Options.js

@@ -11,7 +11,6 @@ const Options = (0, io_ts_1.intersection)([
         githubToken: io_ts_1.string,
         logLevel: (0, io_ts_1.union)([(0, io_ts_1.literal)(logger_1.LogLevel.Off), (0, io_ts_1.literal)(logger_1.LogLevel.Error), (0, io_ts_1.literal)(logger_1.LogLevel.Info), (0, io_ts_1.literal)(logger_1.LogLevel.Debug)]),
         packageManager: (0, io_ts_1.union)([(0, io_ts_1.literal)(package_manager_1.PackageManagerName.Npm), (0, io_ts_1.literal)(package_manager_1.PackageManagerName.Yarn)]),
-        pullRequestBody: io_ts_1.string,
         pullRequestTitle: io_ts_1.string
     }),
     (0, io_ts_1.partial)({

package/dist/options/cliOptions.js

@@ -49,20 +49,6 @@ exports.cliOptions = [
         ],
         default: package_manager_1.PackageManagerName.Npm
     },
-    {
-        name: 'pull-request-body',
-        description: 'Pull request body template',
-        type: OptionType_1.OptionType.String,
-        required: false,
-        default: `This PR updates these packages:
-
-|package|type|current version|new version|
-|---|---|---|---|
-|[{{{packageName}}}](https://www.npmjs.com/package/{{{packageName}}})|{{updateType}}|\`{{currentVersion}}\`|\`{{newVersion}}\`|
-
----
-This PR has been generated by [{{{appName}}}]({{{appWeb}}}) v{{appVersion}}`
-    },
     {
         name: 'pull-request-labels',
         description: 'Pull request labels',

package/dist/package-json/PackageJsonReader.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PackageJsonReader = void 0;
+const fs_1 = __importDefault(require("fs"));
+// TODO: add test
+class PackageJsonReader {
+    constructor({ packageJsonParser, logger }) {
+        this.packageJsonParser = packageJsonParser;
+        this.logger = logger;
+    }
+    async read() {
+        const json = await fs_1.default.promises.readFile('./package.json', 'utf8');
+        this.logger.debug(`json=${json}`);
+        return this.packageJsonParser.parse(json);
+    }
+}
+exports.PackageJsonReader = PackageJsonReader;

package/dist/package-json/index.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PackageJsonParser = void 0;
+exports.PackageJsonReader = exports.PackageJsonParser = void 0;
 var PackageJsonParser_1 = require("./PackageJsonParser");
 Object.defineProperty(exports, "PackageJsonParser", { enumerable: true, get: function () { return PackageJsonParser_1.PackageJsonParser; } });
+var PackageJsonReader_1 = require("./PackageJsonReader");
+Object.defineProperty(exports, "PackageJsonReader", { enumerable: true, get: function () { return PackageJsonReader_1.PackageJsonReader; } });

package/dist/package-manager/createPackageManager.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPackageManager = void 0;
 const Npm_1 = require("./Npm");
+const PackageManagerName_1 = require("./PackageManagerName");
 const Yarn_1 = require("./Yarn");
-// TODO: add test
 const createPackageManager = ({ terminal, packageManager }) => {
     switch (packageManager) {
-        case 'npm':
+        case PackageManagerName_1.PackageManagerName.Npm:
             return new Npm_1.Npm(terminal);
-        case 'yarn':
+        case PackageManagerName_1.PackageManagerName.Yarn:
             return new Yarn_1.Yarn(terminal);
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-update-package",
-  "version": "0.19.1",
+  "version": "0.21.0",
   "description": "CLI tool for creating pull request to update npm packages",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -20,34 +20,34 @@
     "@octokit/rest": "18.12.0",
     "commander": "8.3.0",
     "execa": "5.1.1",
-    "fp-ts": "2.11.5",
+    "fp-ts": "2.11.6",
     "io-ts": "2.2.16",
     "log4js": "6.3.0",
     "mustache": "4.1.0",
-    "npm-check-updates": "12.0.5",
+    "npm-check-updates": "12.1.0",
     "parse-github-url": "1.0.2",
     "semver": "7.3.5",
     "type-guards": "0.15.0"
   },
   "devDependencies": {
-    "@jest/types": "27.0.6",
-    "@tsconfig/node16": "1.0.2",
-    "@types/jest": "27.0.3",
+    "@jest/types": "27.4.2",
+    "@tsconfig/node12": "1.0.9",
+    "@types/jest": "27.4.0",
     "@types/mustache": "4.1.2",
-    "@types/node": "16.11.17",
+    "@types/node": "12.20.40",
     "@types/parse-github-url": "1.0.0",
     "@types/semver": "7.3.9",
-    "@typescript-eslint/eslint-plugin": "5.8.1",
-    "eslint": "8.5.0",
+    "@typescript-eslint/eslint-plugin": "5.9.0",
+    "eslint": "8.6.0",
     "eslint-config-standard-with-typescript": "21.0.1",
-    "eslint-plugin-import": "2.25.3",
-    "eslint-plugin-jest": "25.3.2",
+    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-jest": "25.3.4",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "6.0.0",
     "eslint-plugin-tsdoc": "0.2.14",
     "husky": "7.0.4",
-    "jest": "27.0.6",
-    "lint-staged": "12.1.4",
+    "jest": "27.4.6",
+    "lint-staged": "12.1.5",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
     "ts-jest": "27.1.2",

package/dist/file/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readFile = void 0;
-var readFile_1 = require("./readFile");
-Object.defineProperty(exports, "readFile", { enumerable: true, get: function () { return readFile_1.readFile; } });

package/dist/file/readFile.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readFile = void 0;
-const promises_1 = require("fs/promises");
-// TODO: add test
-const readFile = async (path) => {
-    const data = await (0, promises_1.readFile)(path, 'utf8');
-    return data;
-};
-exports.readFile = readFile;