conventional-recommended-bump 7.0.0 → 8.0.0

package/{cli.js → cli.mjs}

@@ -1,10 +1,12 @@
 #!/usr/bin/env node
+import { resolve } from 'path'
+import { pathToFileURL } from 'url'
+import meow from 'meow'
+import conventionalRecommendedBump from './index.js'
 
-'use strict'
-
-const meow = require('meow')
-const conventionalRecommendedBump = require('./')
-const path = require('path')
+function relativeResolve (filePath) {
+  return pathToFileURL(resolve(process.cwd(), filePath))
+}
 
 const cli = meow(`
     Usage
@@ -28,39 +30,43 @@ const cli = meow(`
       --commit-path                  Recommend a bump scoped to a specific directory
       --skip-unstable                If given, unstable tags will be skipped, e.g., x.x.x-alpha.1, x.x.x-rc.2
 `, {
+  importMeta: import.meta,
   flags: {
     preset: {
-      alias: 'p'
+      shortFlag: 'p'
     },
     config: {
-      alias: 'g'
+      shortFlag: 'g'
     },
-    'header-pattern': {
-      alias: 'h'
+    headerPattern: {
+      shortFlag: 'h'
     },
-    'header-correspondence': {
-      alias: 'c'
+    headerCorrespondence: {
+      shortFlag: 'c'
     },
-    'reference-actions': {
-      alias: 'r'
+    referenceActions: {
+      shortFlag: 'r'
     },
-    'issue-prefixes': {
-      alias: 'i'
+    issuePrefixes: {
+      shortFlag: 'i'
     },
-    'note-keywords': {
-      alias: 'n'
+    noteKeywords: {
+      shortFlag: 'n'
     },
-    'field-pattern': {
-      alias: 'f'
+    fieldPattern: {
+      shortFlag: 'f'
     },
     verbose: {
-      alias: 'v'
+      shortFlag: 'v'
+    },
+    lernaPackage: {
+      shortFlag: 'l'
     },
-    'lerna-package': {
-      alias: 'l'
+    tagPrefix: {
+      shortFlag: 't'
     },
-    'tag-prefix': {
-      alias: 't'
+    skipUnstable: {
+      type: 'boolean'
     }
   }
 })
@@ -79,7 +85,7 @@ if (preset) {
   options.preset = preset
   delete flags.preset
 } else if (config) {
-  options.config = require(path.resolve(process.cwd(), config))
+  options.config = (await import(relativeResolve(config))).default
   delete flags.config
 }
 
@@ -87,7 +93,7 @@ if (flags.verbose) {
   options.warn = console.warn.bind(console)
 }
 
-conventionalRecommendedBump(options, flags, function (err, data) {
+conventionalRecommendedBump(options, flags, (err, data) => {
   if (err) {
     console.error(err.toString())
     process.exit(1)

package/index.js

@@ -2,16 +2,15 @@
 const concat = require('concat-stream')
 const conventionalCommitsFilter = require('conventional-commits-filter')
 const conventionalCommitsParser = require('conventional-commits-parser')
-const conventionalChangelogPresetLoader = require('conventional-changelog-preset-loader')
+const { loadPreset } = require('conventional-changelog-preset-loader')
 const gitSemverTags = require('git-semver-tags')
 const gitRawCommits = require('git-raw-commits')
-const presetResolver = require('./preset-resolver')
 
 const VERSIONS = ['major', 'minor', 'patch']
 
-module.exports = conventionalRecommendedBump
+module.exports = conventionalRecommendedBumpLegacy
 
-function conventionalRecommendedBump (optionsArgument, parserOptsArgument, cbArgument) {
+async function conventionalRecommendedBump (optionsArgument, parserOptsArgument) {
   if (typeof optionsArgument !== 'object') {
     throw new Error('The \'options\' argument must be an object.')
   }
@@ -21,56 +20,42 @@ function conventionalRecommendedBump (optionsArgument, parserOptsArgument, cbArg
     gitRawCommitsOpts: {}
   }, optionsArgument)
 
-  const cb = typeof parserOptsArgument === 'function' ? parserOptsArgument : cbArgument
-
-  if (typeof cb !== 'function') {
-    throw new Error('You must provide a callback function.')
-  }
-
-  let presetPackage = options.config || {}
+  let config = options.config || {}
   if (options.preset) {
-    try {
-      presetPackage = conventionalChangelogPresetLoader(options.preset)
-    } catch (err) {
-      if (err.message === 'does not exist') {
-        const preset = typeof options.preset === 'object' ? options.preset.name : options.preset
-        return cb(new Error(`Unable to load the "${preset}" preset package. Please make sure it's installed.`))
-      } else {
-        return cb(err)
-      }
-    }
+    config = await loadPreset(options.preset)
   }
 
-  presetResolver(presetPackage).then(config => {
-    const whatBump = options.whatBump ||
-      ((config.recommendedBumpOpts && config.recommendedBumpOpts.whatBump)
-        ? config.recommendedBumpOpts.whatBump
-        : noop)
+  const whatBump = options.whatBump ||
+    ((config.recommendedBumpOpts && config.recommendedBumpOpts.whatBump)
+      ? config.recommendedBumpOpts.whatBump
+      : noop)
 
-    if (typeof whatBump !== 'function') {
-      throw Error('whatBump must be a function')
-    }
+  if (typeof whatBump !== 'function') {
+    throw Error('whatBump must be a function')
+  }
 
-    // TODO: For now we defer to `config.recommendedBumpOpts.parserOpts` if it exists, as our initial refactor
-    // efforts created a `parserOpts` object under the `recommendedBumpOpts` object in each preset package.
-    // In the future we want to merge differences found in `recommendedBumpOpts.parserOpts` into the top-level
-    // `parserOpts` object and remove `recommendedBumpOpts.parserOpts` from each preset package if it exists.
-    const parserOpts = Object.assign({},
-      config.recommendedBumpOpts && config.recommendedBumpOpts.parserOpts
-        ? config.recommendedBumpOpts.parserOpts
-        : config.parserOpts,
-      parserOptsArgument)
+  // TODO: For now we defer to `config.recommendedBumpOpts.parserOpts` if it exists, as our initial refactor
+  // efforts created a `parserOpts` object under the `recommendedBumpOpts` object in each preset package.
+  // In the future we want to merge differences found in `recommendedBumpOpts.parserOpts` into the top-level
+  // `parserOpts` object and remove `recommendedBumpOpts.parserOpts` from each preset package if it exists.
+  const parserOpts = Object.assign({},
+    config.recommendedBumpOpts && config.recommendedBumpOpts.parserOpts
+      ? config.recommendedBumpOpts.parserOpts
+      : config.parserOpts,
+    parserOptsArgument)
 
-    const warn = typeof parserOpts.warn === 'function' ? parserOpts.warn : noop
+  const warn = typeof parserOpts.warn === 'function' ? parserOpts.warn : noop
 
+  return await new Promise((resolve, reject) => {
     gitSemverTags({
       lernaTags: !!options.lernaPackage,
       package: options.lernaPackage,
       tagPrefix: options.tagPrefix,
-      skipUnstable: options.skipUnstable
+      skipUnstable: options.skipUnstable,
+      cwd: options.cwd
     }, (err, tags) => {
       if (err) {
-        return cb(err)
+        return reject(err)
       }
 
       gitRawCommits({
@@ -78,6 +63,8 @@ function conventionalRecommendedBump (optionsArgument, parserOptsArgument, cbArg
         from: tags[0] || '',
         path: options.path,
         ...options.gitRawCommitsOpts
+      }, {
+        cwd: options.cwd
       })
         .pipe(conventionalCommitsParser(parserOpts))
         .pipe(concat(data => {
@@ -95,10 +82,22 @@ function conventionalRecommendedBump (optionsArgument, parserOptsArgument, cbArg
             result = {}
           }
 
-          cb(null, result)
+          resolve(result)
         }))
     })
-  }).catch(err => cb(err))
+  })
+}
+
+function conventionalRecommendedBumpLegacy (optionsArgument, parserOptsArgument, cbArgument) {
+  const cb = typeof parserOptsArgument === 'function' ? parserOptsArgument : cbArgument
+
+  if (typeof cb !== 'function') {
+    throw new Error('You must provide a callback function.')
+  }
+
+  conventionalRecommendedBump(optionsArgument, parserOptsArgument)
+    .then((result) => cb(null, result))
+    .catch((err) => cb(err))
 }
 
 function noop () {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "conventional-recommended-bump",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "description": "Get a recommended version bump based on conventional commits",
   "bugs": {
     "url": "https://github.com/conventional-changelog/conventional-changelog/issues"
@@ -17,12 +17,11 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "files": [
     "index.js",
-    "cli.js",
-    "preset-resolver.js"
+    "cli.mjs"
   ],
   "keywords": [
     "conventional-recommended-bump",
@@ -32,18 +31,15 @@
   ],
   "dependencies": {
     "concat-stream": "^2.0.0",
-    "conventional-changelog-preset-loader": "^3.0.0",
-    "conventional-commits-filter": "^3.0.0",
-    "conventional-commits-parser": "^4.0.0",
-    "git-raw-commits": "^3.0.0",
-    "git-semver-tags": "^5.0.0",
-    "meow": "^8.1.2"
+    "meow": "^12.0.1",
+    "conventional-changelog-preset-loader": "^4.0.0",
+    "conventional-commits-filter": "^4.0.0",
+    "conventional-commits-parser": "^5.0.0",
+    "git-raw-commits": "^4.0.0",
+    "git-semver-tags": "^6.0.0"
   },
-  "bin": "cli.js",
+  "bin": "cli.mjs",
   "devDependencies": {
-    "conventional-changelog-conventionalcommits": "^5.0.0"
-  },
-  "scripts": {
-    "test-windows": "mocha --timeout 30000 ./test/preset-resolver.spec.js"
+    "conventional-changelog-conventionalcommits": "^7.0.0"
   }
 }

package/preset-resolver.js

@@ -1,19 +0,0 @@
-'use strict'
-
-const { promisify } = require('util')
-
-module.exports = presetResolver
-
-async function presetResolver (presetPackage) {
-  // handle traditional node-style callbacks
-  if (typeof presetPackage === 'function') {
-    return await promisify(presetPackage)()
-  }
-
-  // handle object literal or Promise instance
-  if (typeof presetPackage === 'object') {
-    return await presetPackage
-  }
-
-  throw new Error('preset package must be a promise, function, or object')
-}