npm-update-package 1.5.2 → 1.5.4

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "npm-update-package",
-    "version": "1.5.2",
+    "version": "1.5.4",
     "description": "CLI tool for creating pull requests to update npm packages",
     "scripts": {
         "build": "tsc --project tsconfig.build.json",
@@ -31,7 +31,7 @@
         "type-guards": "0.15.0"
     },
     "devDependencies": {
-        "@eslint-recommended/eslint-config-typescript": "1.3.0",
+        "@eslint-recommended/eslint-config-typescript": "1.3.1",
         "@npm-update-package/eslint-config-typescript": "0.1.1",
         "@tsconfig/node14": "1.0.3",
         "@types/mustache": "4.2.1",
@@ -45,8 +45,8 @@
         "eslint-plugin-eslint-comments": "3.2.0",
         "eslint-plugin-import": "2.26.0",
         "eslint-plugin-import-newlines": "1.2.3",
-        "eslint-plugin-jest": "27.1.3",
-        "eslint-plugin-jsdoc": "39.5.0",
+        "eslint-plugin-jest": "27.1.4",
+        "eslint-plugin-jsdoc": "39.6.2",
         "eslint-plugin-n": "15.4.0",
         "eslint-plugin-promise": "6.1.1",
         "eslint-plugin-tsdoc": "0.2.17",

package/dist/src/main.js

@@ -6,7 +6,7 @@ const core_1 = require("./core");
 const git_1 = require("./git");
 const github_1 = require("./github");
 const logger_1 = require("./logger");
-const ncu_1 = require("./ncu");
+const npm_check_updates_1 = require("./npm-check-updates");
 const outdated_package_processor_1 = require("./outdated-package-processor");
 const package_manager_1 = require("./package-manager");
 const terminal_1 = require("./terminal");
@@ -16,7 +16,7 @@ const main = async (options) => {
         ...options,
         githubToken: options.githubToken !== '' ? '***' : ''
     })}`);
-    const ncu = new ncu_1.Ncu(options);
+    const ncu = new npm_check_updates_1.NpmCheckUpdates(options);
     const outdatedPackages = await ncu.check();
     logger_1.logger.debug(`outdatedPackages=${JSON.stringify(outdatedPackages)}`);
     if (outdatedPackages.length === 0) {

package/dist/src/npm-check-updates/Dependency.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDependency = exports.Dependency = void 0;
+exports.Dependency = {
+    Bundle: 'bundle',
+    Dev: 'dev',
+    Optional: 'optional',
+    Peer: 'peer',
+    Prod: 'prod'
+};
+const values = Object.values(exports.Dependency);
+const isDependency = (value) => values.includes(value);
+exports.isDependency = isDependency;

package/dist/src/{ncu/Ncu.js → npm-check-updates/NpmCheckUpdates.js}

@@ -1,46 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Ncu = void 0;
+exports.NpmCheckUpdates = void 0;
 const npm_check_updates_1 = require("npm-check-updates");
 const type_guards_1 = require("type-guards");
-const file_1 = require("../file");
 const logger_1 = require("../logger");
 const package_json_1 = require("../package-json");
 const semver_1 = require("../semver");
-const NcuResult_1 = require("./NcuResult");
+const createDepOptionValue_1 = require("./createDepOptionValue");
+const NpmCheckUpdatesResult_1 = require("./NpmCheckUpdatesResult");
 // TODO: Add test
-class Ncu {
+class NpmCheckUpdates {
     constructor(options) {
         this.options = options;
     }
     async check() {
+        const dep = (0, createDepOptionValue_1.createDepOptionValue)(this.options.dependencyTypes);
+        logger_1.logger.trace(`dep=${dep}`);
         return await this.run({
             packageManager: this.options.packageManager,
             jsonUpgraded: true,
-            dep: this.createDepOptionValue(),
+            dep,
             reject: this.options.ignorePackages
         });
     }
-    createDepOptionValue() {
-        return this.options.dependencyTypes
-            .map((dependencyType) => {
-            switch (dependencyType) {
-                case package_json_1.DependencyType.Dependencies:
-                    return 'prod';
-                case package_json_1.DependencyType.DevDependencies:
-                    return 'dev';
-                case package_json_1.DependencyType.PeerDependencies:
-                    return 'peer';
-                case package_json_1.DependencyType.BundledDependencies:
-                    return 'bundle';
-                case package_json_1.DependencyType.OptionalDependencies:
-                    return 'optional';
-                default:
-                    throw new Error();
-            }
-        })
-            .join(',');
-    }
     async update(outdatedPackage) {
         return await this.run({
             packageManager: this.options.packageManager,
@@ -50,15 +32,17 @@ class Ncu {
         });
     }
     async run(options) {
-        // Read package.json before running ncu
-        const json = await (0, file_1.readFile)('./package.json');
-        const pkg = (0, package_json_1.parsePackageJson)(json);
-        logger_1.logger.debug(`pkg=${JSON.stringify(pkg)}`);
+        // Read package.json before running npm-check-updates
+        const pkg = await (0, package_json_1.readPackageJson)('./package.json');
+        logger_1.logger.trace(`pkg=${JSON.stringify(pkg)}`);
+        // Run npm-check-updates
         const result = await (0, npm_check_updates_1.run)(options);
-        logger_1.logger.debug(`result=${JSON.stringify(result)}`);
-        if (!(0, NcuResult_1.isNcuResult)(result)) {
-            throw new Error('Failed to running ncu.');
+        logger_1.logger.trace(`result=${JSON.stringify(result)}`);
+        if (!(0, NpmCheckUpdatesResult_1.isNpmCheckUpdatesResult)(result)) {
+            throw new Error(`npm-check-updates has outputted unexpected result. result=${JSON.stringify(result)}`);
         }
+        const resultEntries = Object.entries(result);
+        logger_1.logger.trace(`resultEntries=${JSON.stringify(resultEntries)}`);
         const { dependencies, devDependencies, peerDependencies, bundledDependencies, optionalDependencies } = pkg;
         const toCurrentVersionString = (packageName) => {
             if (dependencies?.[packageName] !== undefined) {
@@ -94,20 +78,22 @@ class Ncu {
                 return package_json_1.DependencyType.OptionalDependencies;
             }
         };
-        const resultEntries = Object.entries(result);
         const outdatedPackages = resultEntries
             .map(([name, newVersionString]) => {
             const currentVersionString = toCurrentVersionString(name);
+            logger_1.logger.trace(`currentVersionString=${String(currentVersionString)}`);
             if (currentVersionString === undefined) {
                 return undefined;
             }
             const dependencyType = toDependencyType(name);
+            logger_1.logger.trace(`dependencyType=${String(dependencyType)}`);
             if (dependencyType === undefined) {
                 return undefined;
             }
             const currentVersion = semver_1.SemVer.of(currentVersionString);
             const newVersion = semver_1.SemVer.of(newVersionString);
             const level = (0, semver_1.compareSemVers)(currentVersion, newVersion);
+            logger_1.logger.trace(`level=${String(level)}`);
             if (level === undefined) {
                 return undefined;
             }
@@ -118,14 +104,16 @@ class Ncu {
                 level,
                 dependencyType
             };
+            logger_1.logger.trace(`outdatedPackage=${JSON.stringify(outdatedPackage)}`);
             return outdatedPackage;
         })
             // eslint-disable-next-line unicorn/no-array-callback-reference
             .filter(type_guards_1.isNotUndefined);
+        logger_1.logger.trace(`outdatedPackages=${JSON.stringify(outdatedPackages)}`);
         if (resultEntries.length !== outdatedPackages.length) {
-            throw new Error('Failed to running ncu.');
+            throw new Error(`Failed to running npm-check-updates. result=${JSON.stringify(result)}`);
         }
         return outdatedPackages;
     }
 }
-exports.Ncu = Ncu;
+exports.NpmCheckUpdates = NpmCheckUpdates;

package/dist/src/npm-check-updates/NpmCheckUpdatesResult.js

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

package/dist/src/npm-check-updates/createDepOptionValue.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDepOptionValue = void 0;
+const toDependency_1 = require("./toDependency");
+// TODO: Add test
+const createDepOptionValue = (dependencyTypes) => {
+    return dependencyTypes
+        .map((dependencyType) => (0, toDependency_1.toDependency)(dependencyType))
+        .join(',');
+};
+exports.createDepOptionValue = createDepOptionValue;

package/dist/src/{ncu → npm-check-updates}/index.js

@@ -14,4 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Ncu"), exports);
+__exportStar(require("./NpmCheckUpdates"), exports);

package/dist/src/npm-check-updates/toDependency.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toDependency = void 0;
+const package_json_1 = require("../package-json");
+const Dependency_1 = require("./Dependency");
+// TODO: Add test
+const toDependency = (dependencyType) => {
+    switch (dependencyType) {
+        case package_json_1.DependencyType.Dependencies:
+            return Dependency_1.Dependency.Prod;
+        case package_json_1.DependencyType.DevDependencies:
+            return Dependency_1.Dependency.Dev;
+        case package_json_1.DependencyType.PeerDependencies:
+            return Dependency_1.Dependency.Peer;
+        case package_json_1.DependencyType.BundledDependencies:
+            return Dependency_1.Dependency.Bundle;
+        case package_json_1.DependencyType.OptionalDependencies:
+            return Dependency_1.Dependency.Optional;
+    }
+};
+exports.toDependency = toDependency;

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

@@ -18,3 +18,4 @@ __exportStar(require("./DependencyType"), exports);
 __exportStar(require("./extractRepository"), exports);
 __exportStar(require("./PackageMetadata"), exports);
 __exportStar(require("./parsePackageJson"), exports);
+__exportStar(require("./readPackageJson"), exports);

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readPackageJson = void 0;
+const file_1 = require("../file");
+const parsePackageJson_1 = require("./parsePackageJson");
+// TODO: Add test
+const readPackageJson = async (path) => {
+    const json = await (0, file_1.readFile)(path);
+    return (0, parsePackageJson_1.parsePackageJson)(json);
+};
+exports.readPackageJson = readPackageJson;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-update-package",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "CLI tool for creating pull requests to update npm packages",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -31,7 +31,7 @@
     "type-guards": "0.15.0"
   },
   "devDependencies": {
-    "@eslint-recommended/eslint-config-typescript": "1.3.0",
+    "@eslint-recommended/eslint-config-typescript": "1.3.1",
     "@npm-update-package/eslint-config-typescript": "0.1.1",
     "@tsconfig/node14": "1.0.3",
     "@types/mustache": "4.2.1",
@@ -45,8 +45,8 @@
     "eslint-plugin-eslint-comments": "3.2.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-import-newlines": "1.2.3",
-    "eslint-plugin-jest": "27.1.3",
-    "eslint-plugin-jsdoc": "39.5.0",
+    "eslint-plugin-jest": "27.1.4",
+    "eslint-plugin-jsdoc": "39.6.2",
     "eslint-plugin-n": "15.4.0",
     "eslint-plugin-promise": "6.1.1",
     "eslint-plugin-tsdoc": "0.2.17",

package/dist/src/ncu/NcuResult.js

@@ -1,6 +0,0 @@
-"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;