npm-update-package 0.10.0 → 0.12.0

package/README.md

@@ -9,31 +9,44 @@ CLI tool for creating pull request to update npm packages
 
 This package is currently under development, so the major version is 0 yet.
 
-## Installation
+## Requirements
 
-If you are using npm:
+- Git v2.23.0 or higher
 
-```sh
-npm i -g npm-update-package
-```
-
-If you are using Yarn:
+## Usage
 
 ```sh
-yarn global add npm-update-package
+npx npm-update-package --github-token $GITHUB_TOKEN
 ```
 
-Or, you can use [npx](https://docs.npmjs.com/cli/v8/commands/npx).
-
-```sh
-npx npm-update-package
+## Examples
+
+Example of running npm-update-package on GitHub Actions at 0:00 (UTC) every day:
+
+```yaml
+name: npm-update-package
+on:
+  schedule:
+    - cron: '0 0 * * *'
+jobs:
+  npm-update-package:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+      - run: |
+          git config user.name $GIT_USER_NAME
+          git config user.email $GIT_USER_EMAIL
+          npx npm-update-package --github-token $GITHUB_TOKEN
+        env:
+          GIT_USER_EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
+          GIT_USER_NAME: github-actions[bot]
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
 
-## Usage
+Actual working examples can be seen in these repositories.
 
-```sh
-npm-update-package --github-token $GITHUB_TOKEN
-```
+- [npm-update-package/example-npm](https://github.com/npm-update-package/example-npm)
 
 ## Options
 
@@ -45,7 +58,7 @@ Template strings such as `--branch-name` can embed variables like `{{packageName
 Branch name template
 
 - value: template string
-- embeddable variables:
+- variables:
   - `currentVersion`
   - `newVersion`
   - `packageName`
@@ -58,7 +71,7 @@ Branch name template
 Commit message template
 
 - value: template string
-- embeddable variables:
+- variables:
   - `currentVersion`
   - `newVersion`
   - `packageName`
@@ -78,6 +91,7 @@ GitHub token
 Log level to show
 
 - value: string
+  - `error`
   - `info`
   - `debug`
 - required: false
@@ -98,7 +112,7 @@ Package manager of your project
 Pull request body template
 
 - value: template string
-- embeddable variables:
+- variables:
   - `appName`
   - `appVersion`
   - `appWeb`
@@ -125,7 +139,7 @@ This PR has been generated by [{{{appName}}}]({{{appWeb}}}) v{{appVersion}}
 Pull request title template
 
 - value: template string
-- embeddable variables:
+- variables:
   - `currentVersion`
   - `newVersion`
   - `packageName`

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

package/dist/bin.js

@@ -12,8 +12,10 @@ logger.info(`Start ${app_1.app.name} v${app_1.app.version}`);
     options,
     logger
 })
-    .then(() => logger.info(`End ${app_1.app.name} v${app_1.app.version}`))
-    .catch((e) => {
-    // TODO: improve error handling
-    logger.fatal('Unexpected error has occurred.', e);
+    .then(() => {
+    logger.info(`End ${app_1.app.name} v${app_1.app.version}`);
+})
+    .catch((error) => {
+    logger.fatal(error);
+    throw error;
 });

package/dist/git/Git.js

@@ -10,14 +10,11 @@ class Git {
     async add(...files) {
         await this.terminal.run('git', 'add', ...files);
     }
-    async checkout(branchName) {
-        await this.terminal.run('git', 'checkout', branchName);
-    }
     async commit(message) {
         await this.terminal.run('git', 'commit', '--message', message);
     }
     async createBranch(branchName) {
-        await this.terminal.run('git', 'checkout', '-b', branchName);
+        await this.terminal.run('git', 'switch', '-c', branchName);
     }
     async getConfig(key) {
         const { stdout } = await this.terminal.run('git', 'config', key);
@@ -41,8 +38,14 @@ class Git {
     async removeBranch(branchName) {
         await this.terminal.run('git', 'branch', '-D', branchName);
     }
+    async restore(...files) {
+        await this.terminal.run('git', 'restore', '--worktree', '--staged', ...files);
+    }
     async setConfig(key, value) {
         await this.terminal.run('git', 'config', key, value);
     }
+    async switch(branchName) {
+        await this.terminal.run('git', 'switch', branchName);
+    }
 }
 exports.Git = Git;

package/dist/logger/LogLevel.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isLogLevel = exports.LogLevel = void 0;
 exports.LogLevel = {
-    Info: 'info',
-    Debug: 'debug'
+    Debug: 'debug',
+    Error: 'error',
+    Info: 'info'
 };
 const logLevels = Object.values(exports.LogLevel);
 const isLogLevel = (value) => logLevels.includes(value);

package/dist/main.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = void 0;
+const Either_1 = require("fp-ts/lib/Either");
 const git_1 = require("./git");
 const github_1 = require("./github");
 const ncu_1 = require("./ncu");
@@ -75,14 +76,24 @@ const main = async ({ options, logger }) => {
     });
     const results = await outdatedPackagesProcessor.process(outdatedPackages);
     logger.debug(`results=${JSON.stringify(results)}`);
-    const updatedPackages = results
+    const succeededResults = results.filter(Either_1.isRight).map(({ right }) => right);
+    logger.debug(`succeededResults=${JSON.stringify(succeededResults)}`);
+    const updatedPackages = succeededResults
         .filter(({ updated }) => updated)
         .map(({ outdatedPackage }) => outdatedPackage);
     logger.debug(`updatedPackages=${JSON.stringify(updatedPackages)}`);
-    const skippedPackages = results
+    const skippedPackages = succeededResults
         .filter(({ skipped }) => skipped)
         .map(({ outdatedPackage }) => outdatedPackage);
     logger.debug(`skippedPackages=${JSON.stringify(skippedPackages)}`);
-    logger.info(`${updatedPackages.length} packages has updated. ${skippedPackages.length} packages has skipped.`);
+    const failedResults = results.filter(Either_1.isLeft).map(({ left }) => left);
+    logger.debug(`failedResults=${JSON.stringify(failedResults)}`);
+    const failedPackages = failedResults.map(({ outdatedPackage }) => outdatedPackage);
+    logger.debug(`failedPackages=${JSON.stringify(failedPackages)}`);
+    // TODO: show as table
+    logger.info(`Processed ${succeededResults.length + failedPackages.length} packages:
+- ${updatedPackages.length} packages has updated: ${updatedPackages.map(({ name }) => name).join(',')}
+- ${skippedPackages.length} packages has skipped: ${skippedPackages.map(({ name }) => name).join(',')}
+- ${failedPackages.length} packages has failed: ${failedPackages.map(({ name }) => name).join(',')}`);
 };
 exports.main = main;

package/dist/ncu/Ncu.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Ncu = void 0;
 const npm_check_updates_1 = require("npm-check-updates");
-const isNcuOutdatedPackages_1 = require("./isNcuOutdatedPackages");
-const NcuOutdatedPackagesConverter_1 = require("./NcuOutdatedPackagesConverter");
+const NcuResult_1 = require("./NcuResult");
+const NcuResultConverter_1 = require("./NcuResultConverter");
 // TODO: add test
 class Ncu {
     constructor(packageJsonReader) {
@@ -30,11 +30,11 @@ class Ncu {
             ...pkg.optionalDependencies
         };
         const result = await (0, npm_check_updates_1.run)(options);
-        if (!(0, isNcuOutdatedPackages_1.isNcuOutdatedPackages)(result)) {
-            throw new Error('result is not NcuOutdatedPackages');
+        if (!(0, NcuResult_1.isNcuResult)(result)) {
+            throw new Error('result is not NcuResult');
         }
-        const ncuOutdatedPackagesConverter = new NcuOutdatedPackagesConverter_1.NcuOutdatedPackagesConverter(currentDependencies);
-        return ncuOutdatedPackagesConverter.toOutdatedPackages(result);
+        const ncuResultConverter = new NcuResultConverter_1.NcuResultConverter(currentDependencies);
+        return ncuResultConverter.toOutdatedPackages(result);
     }
 }
 exports.Ncu = Ncu;

package/dist/ncu/NcuResult.js

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

package/dist/ncu/{NcuOutdatedPackagesConverter.js → NcuResultConverter.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NcuOutdatedPackagesConverter = void 0;
+exports.NcuResultConverter = void 0;
 const PackageVersion_1 = require("./PackageVersion");
 const toUpdateType_1 = require("./toUpdateType");
 // TODO: add test
-class NcuOutdatedPackagesConverter {
+class NcuResultConverter {
     constructor(currentDependencies) {
         this.currentDependencies = currentDependencies;
     }
-    toOutdatedPackages(outdatedPackages) {
-        return Object.entries(outdatedPackages)
+    toOutdatedPackages(result) {
+        return Object.entries(result)
             .map(([name, newVersion]) => ({
             name,
             currentVersion: PackageVersion_1.PackageVersion.of(this.currentDependencies[name]),
@@ -23,4 +23,4 @@ class NcuOutdatedPackagesConverter {
         }));
     }
 }
-exports.NcuOutdatedPackagesConverter = NcuOutdatedPackagesConverter;
+exports.NcuResultConverter = NcuResultConverter;

package/dist/options/Options.js

@@ -8,7 +8,7 @@ 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.Info), (0, io_ts_1.literal)(logger_1.LogLevel.Debug)]),
+    logLevel: (0, io_ts_1.union)([(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

package/dist/options/initOptions.js

@@ -15,6 +15,7 @@ const initOptions = () => {
         .requiredOption('--github-token <value>', 'GitHub token')
         .addOption(new commander_1.Option('--log-level <value>', 'Log level to show')
         .choices([
+        logger_1.LogLevel.Error,
         logger_1.LogLevel.Info,
         logger_1.LogLevel.Debug
     ])

package/dist/package-manager/Npm.js

@@ -5,14 +5,12 @@ exports.Npm = void 0;
 class Npm {
     constructor(terminal) {
         this.terminal = terminal;
-        this.packageFiles = [
-            'package.json',
-            'package-lock.json'
-        ];
+        this.packageFile = 'package.json';
+        this.lockFile = 'package-lock.json';
     }
     /**
-    * @see https://docs.npmjs.com/cli/v8/commands/npm-install
-    */
+     * @see https://docs.npmjs.com/cli/v8/commands/npm-install
+     */
     async install() {
         await this.terminal.run('npm', 'install');
     }

package/dist/package-manager/Yarn.js

@@ -5,10 +5,8 @@ exports.Yarn = void 0;
 class Yarn {
     constructor(terminal) {
         this.terminal = terminal;
-        this.packageFiles = [
-            'package.json',
-            'yarn.lock'
-        ];
+        this.packageFile = 'package.json';
+        this.lockFile = 'yarn.lock';
     }
     /**
      * @see https://classic.yarnpkg.com/en/docs/cli/install

package/dist/processors/OutdatedPackageProcessor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OutdatedPackageProcessor = void 0;
+const Either_1 = require("fp-ts/lib/Either");
 // TODO: add test
 class OutdatedPackageProcessor {
     constructor({ git, ncu, packageManager, pullRequestCreator, remoteBranchExistenceChecker, logger, branchNameCreator, commitMessageCreator }) {
@@ -21,35 +22,49 @@ class OutdatedPackageProcessor {
         this.logger.debug(`branchName=${branchName}`);
         if (this.remoteBranchExistenceChecker.check(branchName)) {
             this.logger.info(`Skip ${outdatedPackage.name} because ${branchName} branch already exists on remote.`);
-            return {
+            return (0, Either_1.right)({
                 outdatedPackage,
                 skipped: true
-            };
+            });
         }
         await this.git.createBranch(branchName);
         this.logger.info(`${branchName} branch has created.`);
-        const updatedPackages = await this.ncu.update(outdatedPackage);
-        if (updatedPackages.length !== 1) {
-            throw new Error(`Failed to update ${outdatedPackage.name}.`);
+        try {
+            try {
+                const updatedPackages = await this.ncu.update(outdatedPackage);
+                if (updatedPackages.length !== 1) {
+                    throw new Error(`Failed to update ${outdatedPackage.name}.`);
+                }
+                await this.packageManager.install();
+            }
+            catch (error) {
+                this.logger.error(error);
+                return (0, Either_1.left)({
+                    outdatedPackage,
+                    error
+                });
+            }
+            this.logger.info(`${outdatedPackage.name} has updated from v${outdatedPackage.currentVersion.version} to v${outdatedPackage.newVersion.version}`);
+            await this.git.add(this.packageManager.packageFile, this.packageManager.lockFile);
+            const message = this.commitMessageCreator.create(outdatedPackage);
+            this.logger.debug(`message=${message}`);
+            await this.git.commit(message);
+            await this.git.push(branchName);
+            await this.pullRequestCreator.create({
+                outdatedPackage,
+                branchName
+            });
+            return (0, Either_1.right)({
+                outdatedPackage,
+                updated: true
+            });
+        }
+        finally {
+            await this.git.restore(this.packageManager.packageFile, this.packageManager.lockFile);
+            await this.git.switch('-');
+            await this.git.removeBranch(branchName);
+            this.logger.info(`${branchName} branch has removed.`);
         }
-        await this.packageManager.install();
-        this.logger.info(`${outdatedPackage.name} has updated from v${outdatedPackage.currentVersion.version} to v${outdatedPackage.newVersion.version}`);
-        await this.git.add(...this.packageManager.packageFiles);
-        const message = this.commitMessageCreator.create(outdatedPackage);
-        this.logger.debug(`message=${message}`);
-        await this.git.commit(message);
-        await this.git.push(branchName);
-        await this.pullRequestCreator.create({
-            outdatedPackage,
-            branchName
-        });
-        await this.git.checkout('-');
-        await this.git.removeBranch(branchName);
-        this.logger.info(`${branchName} branch has removed.`);
-        return {
-            outdatedPackage,
-            updated: true
-        };
     }
 }
 exports.OutdatedPackageProcessor = OutdatedPackageProcessor;

package/dist/terminal/Terminal.js

@@ -5,25 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Terminal = void 0;
 const execa_1 = __importDefault(require("execa"));
-const isExecaReturnValue_1 = require("./isExecaReturnValue");
 // TODO: add test
 class Terminal {
     async run(command, ...args) {
         return await (0, execa_1.default)(command, args);
     }
-    async runWithErrorHandling(command, ...args) {
-        try {
-            return await this.run(command, ...args);
-        }
-        catch (e) {
-            const value = e instanceof Error ? JSON.parse(JSON.stringify(e)) : e;
-            if ((0, isExecaReturnValue_1.isExecaReturnValue)(value)) {
-                return value;
-            }
-            else {
-                throw e;
-            }
-        }
-    }
 }
 exports.Terminal = Terminal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-update-package",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "CLI tool for creating pull request to update npm packages",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -24,7 +24,7 @@
     "io-ts": "2.2.16",
     "log4js": "6.3.0",
     "mustache": "4.1.0",
-    "npm-check-updates": "12.0.2",
+    "npm-check-updates": "12.0.3",
     "parse-github-url": "1.0.2",
     "semver": "7.3.5"
   },
@@ -36,8 +36,8 @@
     "@types/node": "12.20.15",
     "@types/parse-github-url": "1.0.0",
     "@types/semver": "7.3.9",
-    "@typescript-eslint/eslint-plugin": "5.5.0",
-    "eslint": "8.3.0",
+    "@typescript-eslint/eslint-plugin": "5.6.0",
+    "eslint": "8.4.1",
     "eslint-config-standard-with-typescript": "21.0.1",
     "eslint-plugin-import": "2.25.3",
     "eslint-plugin-jest": "25.3.0",
@@ -49,9 +49,9 @@
     "lint-staged": "12.1.2",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
-    "ts-jest": "27.0.7",
+    "ts-jest": "27.1.1",
     "ts-node": "10.4.0",
-    "typescript": "4.4.4",
+    "typescript": "4.5.3",
     "utility-types": "3.10.0"
   },
   "repository": {

package/dist/ncu/isNcuOutdatedPackages.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNcuOutdatedPackages = void 0;
-// TODO: add test
-const isNcuOutdatedPackages = (value) => {
-    return typeof value === 'object' && value !== null && Object.values(value).every(value => typeof value === 'string');
-};
-exports.isNcuOutdatedPackages = isNcuOutdatedPackages;

package/dist/terminal/isExecaReturnValue.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isExecaReturnValue = void 0;
-const io_ts_1 = require("io-ts");
-const ExecaReturnValueType = (0, io_ts_1.intersection)([
-    (0, io_ts_1.type)({
-        command: io_ts_1.string,
-        escapedCommand: io_ts_1.string,
-        exitCode: io_ts_1.number,
-        failed: io_ts_1.boolean,
-        timedOut: io_ts_1.boolean,
-        killed: io_ts_1.boolean,
-        isCanceled: io_ts_1.boolean
-    }),
-    (0, io_ts_1.partial)({
-        signal: io_ts_1.string,
-        signalDescription: io_ts_1.string
-    })
-]);
-// TODO: add test
-const isExecaReturnValue = (value) => {
-    return ExecaReturnValueType.is(value);
-};
-exports.isExecaReturnValue = isExecaReturnValue;