npm-update-package 0.16.0 → 0.17.1

package/README.md

@@ -129,6 +129,13 @@ This PR updates these packages:
 This PR has been generated by [{{{appName}}}]({{{appWeb}}}) v{{appVersion}}
 ```
 
+### `--pull-request-labels`
+
+Pull request labels
+
+- type: string array
+- required: false
+
 ### `--pull-request-title`
 
 Pull request title template

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.16.0',
+    version: '0.17.1',
     web: 'https://github.com/npm-update-package/npm-update-package'
 };

package/dist/git/index.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Git = exports.CommitMessageCreator = exports.BranchNameCreator = void 0;
+exports.GitRepository = exports.Git = exports.CommitMessageCreator = exports.BranchNameCreator = void 0;
 var BranchNameCreator_1 = require("./BranchNameCreator");
 Object.defineProperty(exports, "BranchNameCreator", { enumerable: true, get: function () { return BranchNameCreator_1.BranchNameCreator; } });
 var CommitMessageCreator_1 = require("./CommitMessageCreator");
 Object.defineProperty(exports, "CommitMessageCreator", { enumerable: true, get: function () { return CommitMessageCreator_1.CommitMessageCreator; } });
 var Git_1 = require("./Git");
 Object.defineProperty(exports, "Git", { enumerable: true, get: function () { return Git_1.Git; } });
+var GitRepository_1 = require("./GitRepository");
+Object.defineProperty(exports, "GitRepository", { enumerable: true, get: function () { return GitRepository_1.GitRepository; } });

package/dist/github/GitHub.js

@@ -6,6 +6,10 @@ class GitHub {
     constructor(octokit) {
         this.octokit = octokit;
     }
+    async addLabels(params) {
+        const { data } = await this.octokit.issues.addLabels(params);
+        return data;
+    }
     async createPullRequest(params) {
         const { data } = await this.octokit.pulls.create(params);
         return data;

package/dist/github/Label.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/github/PullRequestCreator.js

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PullRequestCreator = void 0;
-// TODO: add test
 class PullRequestCreator {
-    constructor({ github, gitRepo, githubRepo, pullRequestTitleCreator, pullRequestBodyCreator, logger }) {
+    constructor({ github, gitRepo, githubRepo, pullRequestTitleCreator, pullRequestBodyCreator, logger, labels }) {
         this.github = github;
         this.gitRepo = gitRepo;
         this.githubRepo = githubRepo;
         this.pullRequestTitleCreator = pullRequestTitleCreator;
         this.pullRequestBodyCreator = pullRequestBodyCreator;
         this.logger = logger;
+        this.labels = labels;
     }
     async create({ outdatedPackage, branchName }) {
         const title = this.pullRequestTitleCreator.create(outdatedPackage);
         this.logger.debug(`title=${title}`);
         const body = this.pullRequestBodyCreator.create(outdatedPackage);
         this.logger.debug(`body=${body}`);
-        const createdPullRequest = await this.github.createPullRequest({
+        const pullRequest = await this.github.createPullRequest({
             owner: this.gitRepo.owner,
             repo: this.gitRepo.name,
             base: this.githubRepo.default_branch,
@@ -24,8 +24,17 @@ class PullRequestCreator {
             title,
             body
         });
-        this.logger.debug(`createdPullRequest=${JSON.stringify(createdPullRequest)}`);
-        this.logger.info(`Pull request for ${outdatedPackage.name} has created. ${createdPullRequest.html_url}`);
+        this.logger.debug(`pullRequest=${JSON.stringify(pullRequest)}`);
+        if (this.labels !== undefined) {
+            const labels = await this.github.addLabels({
+                owner: this.gitRepo.owner,
+                repo: this.gitRepo.name,
+                issue_number: pullRequest.number,
+                labels: this.labels
+            });
+            this.logger.debug(`labels=${JSON.stringify(labels)}`);
+        }
+        this.logger.info(`Pull request for ${outdatedPackage.name} has created. ${pullRequest.html_url}`);
     }
 }
 exports.PullRequestCreator = PullRequestCreator;

package/dist/main.js

@@ -59,7 +59,8 @@ const main = async ({ options, logger }) => {
         githubRepo,
         pullRequestTitleCreator,
         pullRequestBodyCreator,
-        logger
+        logger,
+        labels: options.pullRequestLabels
     });
     const branchNameCreator = new git_1.BranchNameCreator(options.branchName);
     const commitMessageCreator = new git_1.CommitMessageCreator(options.commitMessage);

package/dist/ncu/NcuResultConverter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NcuResultConverter = void 0;
+const type_guards_1 = require("type-guards");
 const PackageVersion_1 = require("./PackageVersion");
 const toUpdateType_1 = require("./toUpdateType");
 // TODO: add test
@@ -9,18 +10,28 @@ class NcuResultConverter {
         this.currentDependencies = currentDependencies;
     }
     toOutdatedPackages(result) {
-        return Object.entries(result)
-            .map(([name, newVersion]) => ({
-            name,
-            currentVersion: PackageVersion_1.PackageVersion.of(this.currentDependencies[name]),
-            newVersion: PackageVersion_1.PackageVersion.of(newVersion)
-        }))
-            .map(({ name, currentVersion, newVersion }) => ({
-            name,
-            currentVersion,
-            newVersion,
-            type: (0, toUpdateType_1.toUpdateType)(currentVersion, newVersion)
-        }));
+        const resultEntries = Object.entries(result);
+        const outdatedPackages = resultEntries
+            .map(([name, newVersionString]) => {
+            const currentVersionString = this.currentDependencies[name];
+            if (currentVersionString === undefined) {
+                return undefined;
+            }
+            const currentVersion = PackageVersion_1.PackageVersion.of(currentVersionString);
+            const newVersion = PackageVersion_1.PackageVersion.of(newVersionString);
+            const type = (0, toUpdateType_1.toUpdateType)(currentVersion, newVersion);
+            return {
+                name,
+                currentVersion,
+                newVersion,
+                type
+            };
+        })
+            .filter(type_guards_1.isNotUndefined);
+        if (resultEntries.length !== outdatedPackages.length) {
+            throw new Error('Failed to convert to outdatedPackages from NcuResult.');
+        }
+        return outdatedPackages;
     }
 }
 exports.NcuResultConverter = NcuResultConverter;

package/dist/options/CLIOption.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/options/OptionType.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isOptionType = exports.OptionType = void 0;
+exports.OptionType = {
+    String: 'string',
+    StringArray: 'string[]'
+};
+const optionTypes = Object.values(exports.OptionType);
+const isOptionType = (value) => optionTypes.includes(value);
+exports.isOptionType = isOptionType;

package/dist/options/Options.js

@@ -4,13 +4,18 @@ exports.isOptions = void 0;
 const io_ts_1 = require("io-ts");
 const logger_1 = require("../logger");
 const package_manager_1 = require("../package-manager");
-const Options = (0, io_ts_1.type)({
-    branchName: io_ts_1.string,
-    commitMessage: io_ts_1.string,
-    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
-});
+const Options = (0, io_ts_1.intersection)([
+    (0, io_ts_1.type)({
+        branchName: io_ts_1.string,
+        commitMessage: io_ts_1.string,
+        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)({
+        pullRequestLabels: (0, io_ts_1.array)(io_ts_1.string)
+    })
+]);
 exports.isOptions = Options.is;

package/dist/options/cliOptions.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cliOptions = void 0;
+const logger_1 = require("../logger");
+const package_manager_1 = require("../package-manager");
+const OptionType_1 = require("./OptionType");
+exports.cliOptions = [
+    {
+        name: 'branch-name',
+        description: 'Branch name template',
+        type: OptionType_1.OptionType.String,
+        required: false,
+        default: 'npm-update-package/{{{packageName}}}/v{{newVersion}}'
+    },
+    {
+        name: 'commit-message',
+        description: 'Commit message template',
+        type: OptionType_1.OptionType.String,
+        required: false,
+        default: 'chore(deps): {{updateType}} update {{{packageName}}} to v{{newVersion}}'
+    },
+    {
+        name: 'github-token',
+        description: 'GitHub token',
+        type: OptionType_1.OptionType.String,
+        required: true
+    },
+    {
+        name: 'log-level',
+        description: 'Log level to show',
+        type: OptionType_1.OptionType.String,
+        required: false,
+        choices: [
+            logger_1.LogLevel.Off,
+            logger_1.LogLevel.Error,
+            logger_1.LogLevel.Info,
+            logger_1.LogLevel.Debug
+        ],
+        default: logger_1.LogLevel.Info
+    },
+    {
+        name: 'package-manager',
+        description: 'Package manager of your project',
+        type: OptionType_1.OptionType.String,
+        required: false,
+        choices: [
+            package_manager_1.PackageManagerName.Npm,
+            package_manager_1.PackageManagerName.Yarn
+        ],
+        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',
+        type: OptionType_1.OptionType.StringArray,
+        required: false
+    },
+    {
+        name: 'pull-request-title',
+        description: 'Pull request title template',
+        type: OptionType_1.OptionType.String,
+        required: false,
+        default: 'chore(deps): {{updateType}} update {{{packageName}}} to v{{newVersion}}'
+    }
+];

package/dist/options/initOptions.js

@@ -3,39 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initOptions = void 0;
 const commander_1 = require("commander");
 const app_1 = require("../app");
-const logger_1 = require("../logger");
-const package_manager_1 = require("../package-manager");
+const cliOptions_1 = require("./cliOptions");
 const Options_1 = require("./Options");
+const toCommanderOption_1 = require("./toCommanderOption");
 // TODO: add test
 const initOptions = () => {
-    commander_1.program
-        .version(app_1.app.version)
-        .option('--branch-name <value>', 'Branch name template', 'npm-update-package/{{{packageName}}}/v{{newVersion}}')
-        .option('--commit-message <value>', 'Commit message template', 'chore(deps): {{updateType}} update {{{packageName}}} to v{{newVersion}}')
-        .requiredOption('--github-token <value>', 'GitHub token')
-        .addOption(new commander_1.Option('--log-level <value>', 'Log level to show')
-        .choices([
-        logger_1.LogLevel.Off,
-        logger_1.LogLevel.Error,
-        logger_1.LogLevel.Info,
-        logger_1.LogLevel.Debug
-    ])
-        .default(logger_1.LogLevel.Info))
-        .addOption(new commander_1.Option('--package-manager <value>', 'Package manager of your project')
-        .choices([
-        package_manager_1.PackageManagerName.Npm,
-        package_manager_1.PackageManagerName.Yarn
-    ])
-        .default(package_manager_1.PackageManagerName.Npm))
-        .option('--pull-request-body <value>', 'Pull request body 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}}`)
-        .option('--pull-request-title <value>', 'Pull request title template', 'chore(deps): {{updateType}} update {{{packageName}}} to v{{newVersion}}');
+    commander_1.program.version(app_1.app.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)) {

package/dist/options/toCommanderOption.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toCommanderOption = void 0;
+const commander_1 = require("commander");
+const OptionType_1 = require("./OptionType");
+// TODO: add test
+const toCommanderOption = (cliOption) => {
+    const argument = createArgumentString(cliOption);
+    const option = new commander_1.Option(`--${cliOption.name} ${argument}`, cliOption.description);
+    if (cliOption.choices !== undefined) {
+        option.choices(cliOption.choices);
+    }
+    if (!cliOption.required && cliOption.default !== undefined) {
+        option.default(cliOption.default);
+    }
+    return option;
+};
+exports.toCommanderOption = toCommanderOption;
+const createArgumentString = (cliOption) => {
+    const prefix = cliOption.required ? '<' : '[';
+    const suffix = cliOption.required ? '>' : ']';
+    const name = createArgumentNameString(cliOption.type);
+    return `${prefix}${name}${suffix}`;
+};
+const createArgumentNameString = (optionType) => {
+    switch (optionType) {
+        case OptionType_1.OptionType.String:
+            return 'value';
+        case OptionType_1.OptionType.StringArray:
+            return 'values...';
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-update-package",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "description": "CLI tool for creating pull request to update npm packages",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -26,7 +26,8 @@
     "mustache": "4.1.0",
     "npm-check-updates": "12.0.5",
     "parse-github-url": "1.0.2",
-    "semver": "7.3.5"
+    "semver": "7.3.5",
+    "type-guards": "0.15.0"
   },
   "devDependencies": {
     "@jest/types": "27.0.6",