npm-update-package 0.46.3 → 0.46.6

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "npm-update-package",
-    "version": "0.46.3",
+    "version": "0.46.6",
     "description": "CLI tool for creating pull requests to update npm packages",
     "scripts": {
         "badges": "jest-coverage-badges output docs",
@@ -26,7 +26,7 @@
         "log4js": "6.4.3",
         "mustache": "4.1.0",
         "node-fetch": "2.6.7",
-        "npm-check-updates": "12.5.3",
+        "npm-check-updates": "12.5.4",
         "parse-github-url": "1.0.2",
         "semver": "7.3.5",
         "sleep-promise": "9.1.0",
@@ -53,7 +53,7 @@
         "husky": "7.0.4",
         "jest": "27.4.7",
         "jest-coverage-badges": "1.1.2",
-        "lint-staged": "12.3.6",
+        "lint-staged": "12.3.7",
         "npm-run-all": "4.1.5",
         "rimraf": "3.0.2",
         "ts-jest": "27.1.3",

package/dist/src/core/OutdatedPackageProcessor.js

@@ -5,9 +5,8 @@ const Either_1 = require("fp-ts/lib/Either");
 const git_1 = require("../git");
 // TODO: add test
 class OutdatedPackageProcessor {
-    constructor({ git, ncu, packageManager, pullRequestCreator, branchFinder, logger, commitMessageCreator, pullRequestFinder, pullRequestCloser }) {
+    constructor({ git, packageManager, pullRequestCreator, branchFinder, logger, commitMessageCreator, pullRequestFinder, pullRequestCloser, packageUpdater }) {
         this.git = git;
-        this.ncu = ncu;
         this.packageManager = packageManager;
         this.pullRequestCreator = pullRequestCreator;
         this.branchFinder = branchFinder;
@@ -15,6 +14,7 @@ class OutdatedPackageProcessor {
         this.commitMessageCreator = commitMessageCreator;
         this.pullRequestFinder = pullRequestFinder;
         this.pullRequestCloser = pullRequestCloser;
+        this.packageUpdater = packageUpdater;
     }
     /**
      * Don't run in parallel because it includes file operations.
@@ -33,7 +33,7 @@ class OutdatedPackageProcessor {
         this.logger.info(`${branchName} branch has created.`);
         try {
             try {
-                await this.updatePackage(outdatedPackage);
+                await this.packageUpdater.update(outdatedPackage);
             }
             catch (error) {
                 this.logger.error(error);
@@ -66,13 +66,6 @@ class OutdatedPackageProcessor {
             this.logger.info(`${branchName} branch has removed.`);
         }
     }
-    async updatePackage(outdatedPackage) {
-        const updatedPackages = await this.ncu.update(outdatedPackage);
-        if (updatedPackages.length !== 1) {
-            throw new Error(`Failed to update ${outdatedPackage.name}.`);
-        }
-        await this.packageManager.install();
-    }
     async closeOldPullRequests(outdatedPackage) {
         const pullRequests = this.pullRequestFinder.findByPackageName(outdatedPackage.name);
         this.logger.debug(`pullRequests=${JSON.stringify(pullRequests)}`);

package/dist/src/core/PackageUpdater.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PackageUpdater = void 0;
+class PackageUpdater {
+    constructor({ packageManager, ncu }) {
+        this.packageManager = packageManager;
+        this.ncu = ncu;
+    }
+    async update(outdatedPackage) {
+        const updatedPackages = await this.ncu.update(outdatedPackage);
+        if (updatedPackages.length !== 1) {
+            throw new Error(`Failed to update ${outdatedPackage.name}.`);
+        }
+        await this.packageManager.install();
+    }
+}
+exports.PackageUpdater = PackageUpdater;

package/dist/src/core/index.js

@@ -18,4 +18,5 @@ __exportStar(require("./FailedResult"), exports);
 __exportStar(require("./OutdatedPackage"), exports);
 __exportStar(require("./OutdatedPackageProcessor"), exports);
 __exportStar(require("./OutdatedPackagesProcessor"), exports);
+__exportStar(require("./PackageUpdater"), exports);
 __exportStar(require("./SucceededResult"), exports);

package/dist/src/git/GitRepository.js

@@ -6,27 +6,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitRepository = void 0;
 const url_1 = require("url");
 const parse_github_url_1 = __importDefault(require("parse-github-url"));
+const HOST_GITHUB = 'github.com';
 class GitRepository {
-    constructor({ url, owner, name }) {
+    constructor({ url, owner, name, isGitHub }) {
         this.url = url;
         this.owner = owner;
         this.name = name;
+        this.isGitHub = isGitHub;
     }
+    /**
+     * Parses a repository string.
+     * @example Valid strings
+     * - `<owner>/<repo>`
+     * - `github:<owner>/<repo>`
+     * - `https://<host>/<owner>/<repo>`
+     * - `https://<host>/<owner>/<repo>.git`
+     * - `git://<host>/<owner>/<repo>`
+     * - `git://<host>/<owner>/<repo>.git`
+     * - `git+https://<host>/<owner>/<repo>`
+     * - `git+https://<host>/<owner>/<repo>.git`
+     * - `git+ssh://<host>/<owner>/<repo>`
+     * - `git+ssh://<host>/<owner>/<repo>.git`
+     * - `git@<host>:<owner>/<repo>`
+     * - `git@<host>:<owner>/<repo>.git`
+     */
     static of(repository) {
-        var _a;
-        const parsed = (0, parse_github_url_1.default)(repository);
-        if (parsed === null) {
-            throw new Error(`Failed to parse repository. repository=${repository}`);
+        const result = (0, parse_github_url_1.default)(repository);
+        if (result === null) {
+            return undefined;
         }
-        const { host, owner, name } = parsed;
-        if (host === null || owner === null || name === null) {
-            throw new Error(`Failed to parse repository. repository=${repository}`);
+        const { owner, name } = result;
+        if (owner === null || name === null) {
+            return undefined;
+        }
+        const host = result.protocol === 'github:' ? HOST_GITHUB : result.host;
+        if (host === null || !host.includes('.')) {
+            return undefined;
         }
-        const protocol = (_a = parsed.protocol) !== null && _a !== void 0 ? _a : 'https:';
         return new GitRepository({
-            url: new url_1.URL(`${protocol}//${host}/${owner}/${name}`),
+            url: new url_1.URL(`https://${host}/${owner}/${name}`),
             owner,
-            name
+            name,
+            isGitHub: host === HOST_GITHUB
         });
     }
 }

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

@@ -20,7 +20,7 @@ class PullRequestBodyCreator {
         const outdatedPackagesTable = this.createOutdatedPackagesTable(outdatedPackage);
         sections.push(`This PR updates these packages:\n\n${outdatedPackagesTable}`);
         const gitRepo = await this.extractRepository(outdatedPackage);
-        if (gitRepo !== undefined) {
+        if ((gitRepo === null || gitRepo === void 0 ? void 0 : gitRepo.isGitHub) === true) {
             const releaseNotesSection = await this.createReleaseNotesSection({
                 outdatedPackage,
                 gitRepo

package/dist/src/logger/createLogger.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLogger = void 0;
 const log4js_1 = require("log4js");
-// TODO: add test
 const createLogger = (logLevel) => {
     const logger = (0, log4js_1.getLogger)();
     logger.level = logLevel;

package/dist/src/main.js

@@ -30,6 +30,9 @@ const main = async ({ options, logger }) => {
     const remoteUrl = await git.getRemoteUrl();
     const gitRepo = git_1.GitRepository.of(remoteUrl);
     logger.debug(`gitRepo=${JSON.stringify(gitRepo)}`);
+    if (gitRepo === undefined) {
+        throw new Error(`Failed to parse remote url. URL=${remoteUrl}`);
+    }
     const github = (0, github_1.createGitHub)({
         host: gitRepo.url.host,
         token: options.githubToken
@@ -83,16 +86,20 @@ 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 packageUpdater = new core_1.PackageUpdater({
+        packageManager,
+        ncu
+    });
     const outdatedPackageProcessor = new core_1.OutdatedPackageProcessor({
         git,
-        ncu,
         packageManager,
         pullRequestCreator,
         branchFinder,
         logger,
         commitMessageCreator,
         pullRequestFinder,
-        pullRequestCloser
+        pullRequestCloser,
+        packageUpdater
     });
     const outdatedPackagesProcessor = new core_1.OutdatedPackagesProcessor({
         outdatedPackageProcessor,

package/dist/src/package-json/extractRepository.js

@@ -2,19 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractRepository = void 0;
 const git_1 = require("../git");
-const parseRepositoryString_1 = require("./parseRepositoryString");
-const extractRepository = ({ repository }) => {
+const extractRepository = (pkg) => {
+    const { repository } = pkg;
     if (repository === undefined) {
         return undefined;
     }
-    if (typeof repository === 'string') {
-        const { owner, repo, isGitHub } = (0, parseRepositoryString_1.parseRepositoryString)(repository);
-        if (!isGitHub) {
-            return undefined;
-        }
-        return git_1.GitRepository.of(`${owner}/${repo}`);
-    }
-    const { url } = repository;
-    return git_1.GitRepository.of(url.replace(/^git\+/, ''));
+    const repositoryString = typeof repository === 'string' ? repository : repository.url;
+    return git_1.GitRepository.of(repositoryString);
 };
 exports.extractRepository = extractRepository;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-update-package",
-  "version": "0.46.3",
+  "version": "0.46.6",
   "description": "CLI tool for creating pull requests to update npm packages",
   "scripts": {
     "badges": "jest-coverage-badges output docs",
@@ -26,7 +26,7 @@
     "log4js": "6.4.3",
     "mustache": "4.1.0",
     "node-fetch": "2.6.7",
-    "npm-check-updates": "12.5.3",
+    "npm-check-updates": "12.5.4",
     "parse-github-url": "1.0.2",
     "semver": "7.3.5",
     "sleep-promise": "9.1.0",
@@ -53,7 +53,7 @@
     "husky": "7.0.4",
     "jest": "27.4.7",
     "jest-coverage-badges": "1.1.2",
-    "lint-staged": "12.3.6",
+    "lint-staged": "12.3.7",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
     "ts-jest": "27.1.3",

package/dist/src/package-json/parseRepositoryString.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseRepositoryString = void 0;
-const parseRepositoryString = (repository) => {
-    const matched = repository.match(/^((.+):)?(.+)\/(.+)/);
-    if (matched === null) {
-        throw new Error(`Failed to parse repository. repository=${repository}`);
-    }
-    const [, , type, owner, repo] = matched;
-    /* istanbul ignore if: I can't write a test to reach here. */
-    if (owner === undefined || repo === undefined) {
-        throw new Error(`Failed to parse repository. repository=${repository}`);
-    }
-    return {
-        owner,
-        repo,
-        isGitHub: type === undefined || type === 'github'
-    };
-};
-exports.parseRepositoryString = parseRepositoryString;