bulk-release 2.2.16 → 2.2.17

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [2.2.17](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.16...v2.2.17) (2023-03-28)
+
+### Fixes & improvements
+* fix: tweak up pkg ver resolver ([af20c16](https://github.com/semrel-extra/zx-bulk-release/commit/af20c16c936f7cadb2f3c461d16edc6e7f34f942))
+
 ## [2.2.16](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.15...v2.2.16) (2023-03-28)
 
 ### Fixes & improvements

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bulk-release",
   "alias": "bulk-release",
-  "version": "2.2.16",
+  "version": "2.2.17",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": {

package/src/main/js/analyze.js

@@ -12,7 +12,11 @@ export const analyze = async (pkg) => {
 
   pkg.changes = changes
   pkg.releaseType = releaseType
-  pkg.version = resolvePkgVersion(releaseType, pkg.latest.tag?.version || pkg.latest.meta?.version)
+  pkg.version = resolvePkgVersion(
+    releaseType,
+    pkg.latest.tag?.version || pkg.latest.meta?.version,
+    pkg.manifest.version
+  )
   pkg.manifest.version = pkg.version
   pkg.tag = releaseType ? formatTag({name: pkg.name, version: pkg.version}) : null
 
@@ -58,13 +62,13 @@ export const getNextReleaseType = (changes) => changes.length
   ? releaseSeverityOrder.find(type => changes.find(({releaseType}) => type === releaseType))
   : null
 
-export const getNextVersion = (releaseType, prevVersion) => {
-  if (!prevVersion) return '1.0.0'
+export const getNextVersion = (releaseType, prevVersion, defaultVersion = '1.0.0') => {
+  if (!prevVersion) return defaultVersion
 
   return semver.inc(prevVersion, releaseType)
 }
 
-export const resolvePkgVersion = (releaseType, prevVersion) =>
+export const resolvePkgVersion = (releaseType, prevVersion, defaultVersion) =>
   releaseType
-    ? getNextVersion(releaseType, prevVersion)
+    ? getNextVersion(releaseType, prevVersion, defaultVersion)
     : prevVersion || null

package/src/main/js/meta.js

@@ -142,10 +142,10 @@ export const getTags = async (cwd, ref = '') =>
     .sort((a, b) => semver.rcompare(a.version, b.version))
 
 export const getLatestTag = async (cwd, name) =>
-  (await getTags(cwd)).find(tag => tag.name === name) || null
+  (await getTags(cwd)).find(tag => tag.name === name)
 
 export const getLatestTaggedVersion = async (cwd, name) =>
-  (await getLatestTag(cwd, name))?.version || null
+  (await getLatestTag(cwd, name))?.version || undefined
 
 export const formatDateTag = (date = new Date()) => `${date.getUTCFullYear()}.${date.getUTCMonth() + 1}.${date.getUTCDate()}`
 
@@ -154,7 +154,7 @@ export const parseDateTag = (date) => new Date(date.replaceAll('.', '-')+'Z')
 export const getArtifactPath = (tag) => tag.toLowerCase().replace(/[^a-z0-9-]/g, '-')
 
 export const getLatestMeta = async (cwd, tag, basicAuth) => {
-  if (!tag) return null
+  if (!tag) return
 
   try {
     const _cwd = await fetchRepo({cwd, branch: 'meta', basicAuth})
@@ -163,6 +163,4 @@ export const getLatestMeta = async (cwd, tag, basicAuth) => {
       fs.readJson(path.resolve(_cwd, getArtifactPath(tag), 'meta.json'))
     ])
   } catch {}
-
-  return null
 }