git-semver-tags 6.0.0 → 7.0.1

package/README.md

@@ -16,12 +16,12 @@ $ npm install --save git-semver-tags
 ```js
 var gitSemverTags = require('git-semver-tags');
 
-// gitSemverTags([options,] callback)
+// gitSemverTags([options])
 
-gitSemverTags(function(err, tags) {
-  console.log(tags);
-  //=> [ 'v2.0.0', 'v1.0.0' ]
-});
+const tags = await gitSemverTags();
+
+console.log(tags);
+//=> [ 'v2.0.0', 'v1.0.0' ]
 ```
 
 ```sh

package/cli.mjs

@@ -33,16 +33,11 @@ const args = meow(`
   }
 })
 
-gitSemverTags({
+const tags = await gitSemverTags({
   lernaTags: args.flags.lerna,
   package: args.flags.package,
   tagPrefix: args.flags.tagPrefix,
   skipUnstable: args.flags.skipUnstable
-}, (err, tags) => {
-  if (err) {
-    console.error(err.toString())
-    process.exit(1)
-  }
-
-  console.log(tags.join('\n'))
 })
+
+console.log(tags.join('\n'))

package/index.js

@@ -1,66 +1,71 @@
-'use strict'
+const { exec } = require('child_process')
+const { valid: semverValid } = require('semver')
 
-const proc = require('process')
-const exec = require('child_process').exec
-const semverValid = require('semver').valid
 const regex = /tag:\s*(.+?)[,)]/gi
-const cmd = 'git log --decorate --no-color'
+const cmd = 'git log --decorate --no-color --date-order'
 const unstableTagTest = /.+-\w+\.\d+$/
 
 function lernaTag (tag, pkg) {
-  if (pkg && !(new RegExp('^' + pkg + '@')).test(tag)) {
+  if (pkg && !tag.startsWith(`${pkg}@`)) {
     return false
-  } else {
-    return /^.+@[0-9]+\.[0-9]+\.[0-9]+(-.+)?$/.test(tag)
   }
-}
 
-module.exports = function gitSemverTags (opts, callback) {
-  if (typeof opts === 'function') {
-    callback = opts
-    opts = {}
-  }
-  const options = Object.assign({ maxBuffer: Infinity, cwd: proc.cwd() }, opts)
+  return /^.+@[0-9]+\.[0-9]+\.[0-9]+(-.+)?$/.test(tag)
+}
 
-  if (options.package && !options.lernaTags) {
-    callback(new Error('opts.package should only be used when running in lerna mode'))
-    return
-  }
+function gitSemverTags (opts = {}) {
+  return new Promise((resolve, reject) => {
+    const options = {
+      maxBuffer: Infinity,
+      cwd: process.cwd(),
+      ...opts
+    }
 
-  exec(cmd, options, function (err, data) {
-    if (err) {
-      callback(err)
-      return
+    if (options.package && !options.lernaTags) {
+      throw new Error('opts.package should only be used when running in lerna mode')
     }
 
-    const tags = []
-    data.split('\n').forEach(function (decorations) {
+    exec(cmd, options, (err, data) => {
+      if (err) {
+        reject(err)
+        return
+      }
+
+      const tags = []
       let match
-      while ((match = regex.exec(decorations))) {
-        const tag = match[1]
+      let tag
+      let unprefixedTag
 
-        if (options.skipUnstable && unstableTagTest.test(tag)) {
-          // skip unstable tag
-          continue
-        }
+      data.split('\n').forEach((decorations) => {
+        while ((match = regex.exec(decorations))) {
+          tag = match[1]
 
-        if (options.lernaTags) {
-          if (lernaTag(tag, options.package)) {
-            tags.push(tag)
+          if (options.skipUnstable && unstableTagTest.test(tag)) {
+            // skip unstable tag
+            continue
           }
-        } else if (options.tagPrefix) {
-          if (tag.startsWith(options.tagPrefix)) {
-            const unprefixedTag = tag.replace(options.tagPrefix, '')
-            if (semverValid(unprefixedTag)) {
+
+          if (options.lernaTags) {
+            if (lernaTag(tag, options.package)) {
               tags.push(tag)
             }
+          } else if (options.tagPrefix) {
+            if (tag.startsWith(options.tagPrefix)) {
+              unprefixedTag = tag.replace(options.tagPrefix, '')
+
+              if (semverValid(unprefixedTag)) {
+                tags.push(tag)
+              }
+            }
+          } else if (semverValid(tag)) {
+            tags.push(tag)
           }
-        } else if (semverValid(tag)) {
-          tags.push(tag)
         }
-      }
-    })
+      })
 
-    callback(null, tags)
+      resolve(tags)
+    })
   })
 }
+
+module.exports = gitSemverTags

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-semver-tags",
-  "version": "6.0.0",
+  "version": "7.0.1",
   "description": "Get all git semver tags of your repository in reverse chronological order",
   "bugs": {
     "url": "https://github.com/conventional-changelog/conventional-changelog/issues"