npm-update-package 0.45.3 → 0.45.6

package/README.md

@@ -294,6 +294,6 @@ end
 
 npm-update-package can be used in environments where Renovate cannot be used for some reason.
 
-### Conflicts have occurred in the pull request. What should I do?
+### What should I do if conflicts occurred in the pull request?
 
-If conflicts have occurred in the pull request, close it and run npm-update-package again.
+If you have difficulty resolving it manually, close the pull request and run npm-update-package again.

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "npm-update-package",
-    "version": "0.45.3",
+    "version": "0.45.6",
     "description": "CLI tool for creating pull requests to update npm packages",
     "scripts": {
         "build": "tsc --project tsconfig.build.json",
@@ -20,23 +20,28 @@
         "fp-ts": "2.11.8",
         "http-status-codes": "2.2.0",
         "io-ts": "2.2.16",
+        "lodash": "4.14.2",
         "log4js": "6.4.2",
         "mustache": "4.1.0",
+        "node-fetch": "2.6.7",
         "npm-check-updates": "12.5.2",
         "parse-github-url": "1.0.2",
         "semver": "7.3.5",
+        "sleep-promise": "9.1.0",
         "type-guards": "0.15.0"
     },
     "devDependencies": {
         "@jest/types": "27.4.2",
         "@tsconfig/node12": "1.0.9",
         "@types/jest": "27.4.0",
+        "@types/lodash": "4.14.179",
         "@types/mustache": "4.1.2",
         "@types/node": "12.20.40",
+        "@types/node-fetch": "2.6.1",
         "@types/parse-github-url": "1.0.0",
         "@types/semver": "7.3.9",
-        "@typescript-eslint/eslint-plugin": "5.13.0",
-        "eslint": "8.10.0",
+        "@typescript-eslint/eslint-plugin": "5.14.0",
+        "eslint": "8.11.0",
         "eslint-config-standard-with-typescript": "21.0.1",
         "eslint-plugin-import": "2.25.4",
         "eslint-plugin-jest": "26.1.1",

package/dist/src/github/GitHub.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitHub = void 0;
-// TODO: add test
+const lodash_1 = require("lodash");
 class GitHub {
     constructor(octokit) {
         this.octokit = octokit;
@@ -51,7 +51,7 @@ class GitHub {
     }
     async fetchBranches({ owner, repo }) {
         const branches = [];
-        for (let page = 1;; page++) {
+        for (const page of (0, lodash_1.range)(1, 11)) {
             const { data } = await this.octokit.repos.listBranches({
                 owner,
                 repo,
@@ -75,7 +75,7 @@ class GitHub {
     }
     async fetchPullRequests({ owner, repo }) {
         const pullRequests = [];
-        for (let page = 1;; page++) {
+        for (const page of (0, lodash_1.range)(1, 11)) {
             const { data } = await this.octokit.pulls.list({
                 owner,
                 repo,
@@ -89,22 +89,6 @@ class GitHub {
         }
         return pullRequests;
     }
-    async fetchReleases({ owner, repo }) {
-        const releases = [];
-        for (let page = 1;; page++) {
-            const { data } = await this.octokit.repos.listReleases({
-                owner,
-                repo,
-                per_page: 100,
-                page
-            });
-            if (data.length === 0) {
-                break;
-            }
-            releases.push(...data);
-        }
-        return releases;
-    }
     async fetchRepository({ owner, repo }) {
         const { data } = await this.octokit.repos.get({
             owner,

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

@@ -67,13 +67,14 @@ ${this.options.prBodyNotes}`;
     async createReleaseNotesSection({ outdatedPackage, gitRepo }) {
         const releases = await this.releasesFetcher.fetch({
             gitRepo,
+            packageName: outdatedPackage.name,
             from: outdatedPackage.currentVersion,
             to: outdatedPackage.newVersion
         });
         if (releases.length === 0) {
             return undefined;
         }
-        const items = releases.map(release => `- [${release.tag_name}](${release.html_url})`);
+        const items = releases.map(({ tag, url }) => `- [${tag}](${url})`);
         return `## Release notes
 
 ${items.join('\n')}`;

package/dist/src/github/pull-request/finder/PullRequestFinder.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PullRequestFinder = void 0;
 const metadata_1 = require("../metadata");
 const isPullRequestByNpmUpdatePackage_1 = require("./isPullRequestByNpmUpdatePackage");
-// TODO: Add test
 class PullRequestFinder {
     constructor(pullRequests) {
         this.pullRequests = pullRequests;

package/dist/src/github/pull-request/metadata/extractPullRequestMetadata.js

@@ -4,7 +4,11 @@ exports.extractPullRequestMetadata = void 0;
 const PullRequestMetadata_1 = require("./PullRequestMetadata");
 const extractPullRequestMetadata = (pullRequestBody) => {
     const matched = pullRequestBody.match(/<div id="npm-update-package-metadata">\s*```json\s*([\s\S]+?)\s*```\s*<\/div>/);
-    const json = matched === null || matched === void 0 ? void 0 : matched[1];
+    if (matched === null) {
+        return undefined;
+    }
+    const json = matched[1];
+    /* istanbul ignore if: I can't write a test to reach here. */
     if (json === undefined) {
         return undefined;
     }

package/dist/src/github/releases/Release.js

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

package/dist/src/github/releases/fetcher/ReleasesFetcher.js

@@ -1,20 +1,58 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReleasesFetcher = void 0;
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const semver_1 = require("semver");
+const sleep_promise_1 = __importDefault(require("sleep-promise"));
+const type_guards_1 = require("type-guards");
 class ReleasesFetcher {
-    constructor(github) {
-        this.github = github;
+    constructor({ packageManager }) {
+        this.packageManager = packageManager;
     }
-    async fetch({ gitRepo, from, to }) {
-        const releases = await this.github.fetchReleases({
-            owner: gitRepo.owner,
-            repo: gitRepo.name
+    async fetch({ gitRepo, packageName, from, to }) {
+        const versions = await this.getVersions({
+            packageName,
+            from,
+            to
         });
-        return releases.filter(({ tag_name: version }) => {
-            // TODO: Move these to SemVer
-            return (0, semver_1.valid)(version) !== null && (0, semver_1.gte)(version, from.version) && (0, semver_1.lte)(version, to.version);
+        const tags = versions.map(version => `v${version}`);
+        return await this.fetchReleasesByTags({
+            gitRepo,
+            tags
         });
     }
+    async fetchReleaseByTag({ gitRepo, tag }) {
+        const url = `${gitRepo.url.toString()}/releases/tag/${tag}`;
+        const resp = await (0, node_fetch_1.default)(url);
+        if (resp.ok) {
+            return {
+                tag,
+                url
+            };
+        }
+    }
+    async fetchReleasesByTags({ gitRepo, tags }) {
+        const releases = await Promise.all(tags.map(async (tag, i) => {
+            if (i > 0) {
+                // NOTE: Sleeps for 1 second between fetches.
+                await (0, sleep_promise_1.default)(1000);
+            }
+            return await this.fetchReleaseByTag({
+                gitRepo,
+                tag
+            });
+        }));
+        return releases.filter(type_guards_1.isNotUndefined);
+    }
+    async getVersions({ packageName, from, to }) {
+        const versions = await this.packageManager.getVersions(packageName);
+        // TODO: Move these to SemVer
+        return versions.filter(version => (0, semver_1.valid)(version))
+            .filter(version => (0, semver_1.gte)(version, from.version))
+            .filter(version => (0, semver_1.lte)(version, to.version));
+    }
 }
 exports.ReleasesFetcher = ReleasesFetcher;

package/dist/src/github/releases/index.js

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

package/dist/src/main.js

@@ -65,10 +65,7 @@ const main = async ({ options, logger }) => {
         packageManager: options.packageManager
     });
     const pullRequestTitleCreator = new github_1.PullRequestTitleCreator(options.prTitle);
-    const githubWithoutToken = (0, github_1.createGitHub)({
-        host: 'github.com'
-    });
-    const releasesFetcher = new github_1.ReleasesFetcher(githubWithoutToken);
+    const releasesFetcher = new github_1.ReleasesFetcher({ packageManager });
     const pullRequestBodyCreator = new github_1.PullRequestBodyCreator({
         options,
         releasesFetcher

package/dist/src/options/toCommanderOption.js

@@ -3,7 +3,6 @@ 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);
@@ -17,10 +16,8 @@ const toCommanderOption = (cliOption) => {
 };
 exports.toCommanderOption = toCommanderOption;
 const createArgumentString = (cliOption) => {
-    const prefix = cliOption.required ? '<' : '[';
-    const suffix = cliOption.required ? '>' : ']';
     const name = createArgumentNameString(cliOption.type);
-    return `${prefix}${name}${suffix}`;
+    return cliOption.required ? `<${name}>` : `[${name}]`;
 };
 const createArgumentNameString = (optionType) => {
     switch (optionType) {

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parsePackageJson = void 0;
 const PackageMetadata_1 = require("./PackageMetadata");
-// TODO: add test
 const parsePackageJson = (json) => {
     const parsed = JSON.parse(json);
     if ((0, PackageMetadata_1.isPackageMetadata)(parsed)) {

package/dist/src/package-manager/Npm.js

@@ -1,12 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Npm = void 0;
+const Versions_1 = require("./Versions");
 class Npm {
     constructor(terminal) {
         this.terminal = terminal;
         this.packageFile = 'package.json';
         this.lockFile = 'package-lock.json';
     }
+    async getVersions(packageName) {
+        const { stdout } = await this.terminal.run('npm', 'info', packageName, 'versions', '--json');
+        const versions = JSON.parse(stdout);
+        if (!(0, Versions_1.isVersions)(versions)) {
+            throw new Error(`Failed to parse versions. versions=${JSON.stringify(versions)}`);
+        }
+        return versions;
+    }
     /**
      * @see https://docs.npmjs.com/cli/v8/commands/npm-install
      */

package/dist/src/package-manager/Versions.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVersions = exports.Versions = void 0;
+const io_ts_1 = require("io-ts");
+exports.Versions = (0, io_ts_1.array)(io_ts_1.string);
+exports.isVersions = exports.Versions.is;

package/dist/src/package-manager/Yarn.js

@@ -1,12 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Yarn = void 0;
+const Versions_1 = require("./Versions");
 class Yarn {
     constructor(terminal) {
         this.terminal = terminal;
         this.packageFile = 'package.json';
         this.lockFile = 'yarn.lock';
     }
+    async getVersions(packageName) {
+        const { stdout } = await this.terminal.run('yarn', 'info', packageName, 'versions', '--json');
+        const versions = JSON.parse(stdout);
+        if (!(0, Versions_1.isVersions)(versions)) {
+            throw new Error(`Failed to parse versions. versions=${JSON.stringify(versions)}`);
+        }
+        return versions;
+    }
     /**
      * @see https://classic.yarnpkg.com/en/docs/cli/install
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-update-package",
-  "version": "0.45.3",
+  "version": "0.45.6",
   "description": "CLI tool for creating pull requests to update npm packages",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -20,23 +20,28 @@
     "fp-ts": "2.11.8",
     "http-status-codes": "2.2.0",
     "io-ts": "2.2.16",
+    "lodash": "4.14.2",
     "log4js": "6.4.2",
     "mustache": "4.1.0",
+    "node-fetch": "2.6.7",
     "npm-check-updates": "12.5.2",
     "parse-github-url": "1.0.2",
     "semver": "7.3.5",
+    "sleep-promise": "9.1.0",
     "type-guards": "0.15.0"
   },
   "devDependencies": {
     "@jest/types": "27.4.2",
     "@tsconfig/node12": "1.0.9",
     "@types/jest": "27.4.0",
+    "@types/lodash": "4.14.179",
     "@types/mustache": "4.1.2",
     "@types/node": "12.20.40",
+    "@types/node-fetch": "2.6.1",
     "@types/parse-github-url": "1.0.0",
     "@types/semver": "7.3.9",
-    "@typescript-eslint/eslint-plugin": "5.13.0",
-    "eslint": "8.10.0",
+    "@typescript-eslint/eslint-plugin": "5.14.0",
+    "eslint": "8.11.0",
     "eslint-config-standard-with-typescript": "21.0.1",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-jest": "26.1.1",