zx-bulk-release 2.2.0 → 2.2.2

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [2.2.2](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.1...v2.2.2) (2023-03-24)
+
+### Fixes & improvements
+* fix: fix gitPush retry ([268da72](https://github.com/semrel-extra/zx-bulk-release/commit/268da727036b0d3bf20b1ef10053440c5f56dad0))
+
+## [2.2.1](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.0...v2.2.1) (2023-03-23)
+
+### Fixes & improvements
+* perf: make parallel internal `publish` tasks ([87f388e](https://github.com/semrel-extra/zx-bulk-release/commit/87f388ea2ff5cce96cca600903d80260f13f0908))
+* refactor: improve internal reporter ([cc62df7](https://github.com/semrel-extra/zx-bulk-release/commit/cc62df762c0581db159ddd2fae8d90b085911884))
+
 ## [2.2.0](https://github.com/semrel-extra/zx-bulk-release/compare/v2.1.6...v2.2.0) (2023-03-23)
 
 ### Fixes & improvements

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zx-bulk-release",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": {

package/src/main/js/analyze.js

@@ -2,7 +2,7 @@ import {semver} from 'zx-extra'
 import {updateDeps} from './deps.js'
 import {formatTag} from './meta.js';
 import {log} from './log.js'
-import {getCommits} from './repo.js'
+import {getCommits} from './git.js'
 
 export const analyze = async (pkg, packages) => {
   const semanticChanges = await getSemanticChanges(pkg.absPath, pkg.latest.tag?.ref)

package/src/main/js/changelog.js

@@ -1,6 +1,6 @@
 import {$} from 'zx-extra'
 import {log} from './log.js'
-import {fetchRepo, getRepo, pushCommit} from './repo.js'
+import {fetchRepo, getRepo, pushCommit} from './git.js'
 import {msgJoin} from './util.js'
 import {formatTag} from './meta.js'
 

package/src/main/js/{publish.js → gh.js}

@@ -1,23 +1,9 @@
-import {fs, path, $} from 'zx-extra'
-import {formatTag, pushTag} from './meta.js'
-import {pushCommit, getRepo} from './repo.js'
-import {npmPublish} from './npm.js'
-import {pushChangelog, formatReleaseNotes} from './changelog.js'
-import {msgJoin} from './util.js'
-import {runCmd} from './processor.js'
 import {log} from './log.js'
-import {pushMeta} from './meta.js'
-
-export const publish = async (pkg, run = runCmd) => {
-  await fs.writeJson(pkg.manifestPath, pkg.manifest, {spaces: 2})
-  await pushTag(pkg)
-  await pushMeta(pkg)
-  await pushChangelog(pkg)
-  await npmPublish(pkg)
-  await ghRelease(pkg)
-  await ghPages(pkg)
-  await run(pkg, 'publishCmd')
-}
+import {getRepo, pushCommit} from './git.js'
+import {formatTag} from './meta.js'
+import {formatReleaseNotes} from './changelog.js'
+import {$, path} from 'zx-extra'
+import {msgJoin} from './util.js'
 
 export const ghRelease = async (pkg) => {
   log({pkg})(`create gh release`)
@@ -35,10 +21,10 @@ export const ghRelease = async (pkg) => {
     body: releaseNotes
   })
 
-  await $.o({cwd})`curl -H "Authorization: token ${ghToken}" -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${repoName}/releases -d ${releaseData}`
+  await $.o({cwd})`curl -H 'Authorization: token ${ghToken}' -H 'Accept: application/vnd.github.v3+json' https://api.github.com/repos/${repoName}/releases -d ${releaseData}`
 }
 
-const ghPages = async (pkg) => {
+export const ghPages = async (pkg) => {
   const {config: {ghPages: opts, gitCommitterEmail, gitCommitterName, ghBasicAuth: basicAuth}} = pkg
   if (!opts) return
 

package/src/main/js/{repo.js → git.js}

@@ -30,7 +30,6 @@ export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFile
 
   while (retries > 0) {
     try {
-
       _cwd = await fetchRepo({cwd, branch, origin, basicAuth})
 
       for (let {relpath, contents} of files) {
@@ -54,8 +53,12 @@ export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFile
       return await $.raw`git push origin HEAD:refs/heads/${branch}`
     } catch (e) {
       retries -= 1
+      log({level: 'error'})('git push failed', 'branch', branch, 'retries left', retries, e)
       branches[keyByValue(branches, _cwd)] = null
-      console.warn('git push failed', 'retries left', retries, e)
+
+      if (retries === 0) {
+        throw e
+      }
     }
   }
 })
@@ -65,6 +68,7 @@ export const getRepo = async (_cwd, {basicAuth} = {}) => {
   const cwd = await getRoot(_cwd)
   if (repos[cwd]) return repos[cwd]
 
+  console.log('!!! has basic auth', !!basicAuth)
   const originUrl = await getOrigin(cwd)
   const [, , repoHost, repoName] = originUrl.replace(':', '/').replace(/\.git/, '').match(/.+(@|\/\/)([^/]+)\/(.+)$/) || []
   const repoPublicUrl = `https://${repoHost}/${repoName}`
@@ -109,3 +113,8 @@ export const getCommits = async (cwd, from, to = 'HEAD') => ctx(async ($) => {
       return {subj, body, short, hash}
     })
 })
+
+export const getTags = async (cwd, ref = '') =>
+  (await $.o({cwd})`git tag -l ${ref}`)
+    .toString()
+    .split('\n')

package/src/main/js/log.js

@@ -1,9 +1,69 @@
-import {$} from 'zx-extra'
+import {$, fs} from 'zx-extra'
+import {get, set, tpl} from './util.js'
 
 export const log = (ctx) => {
-  if ($.state) {
-    return $.state.log(ctx)
+  if ($.report) {
+    return $.report.log(ctx)
   }
 
   return console.log
 }
+
+export const createReport = ({logger = console, file = null} = {}) => ({
+  logger,
+  file,
+  status: 'initial',
+  queue: [],
+  packages: {},
+  events: [],
+  setPackages(packages) {
+    this.packages = Object.entries(packages).reduce((acc, [name, {manifest: {version}, absPath, relPath}]) => {
+      acc[name] = {
+        status: 'initial',
+        name,
+        version,
+        path: absPath,
+        relPath
+      }
+      return acc
+    }, {})
+    return this
+  },
+  get(key, pkgName) {
+    return get(
+      pkgName ? this.packages[pkgName] : this,
+      key
+    )
+  },
+  set(key, value, pkgName) {
+    set(
+      pkgName ? this.packages[pkgName] : this,
+      key,
+      value
+    )
+    return this
+  },
+  setStatus(status, name) {
+    this.set('status', status, name)
+    this.save()
+    return this
+  },
+  getStatus(status, name) {
+    return this.get('status', name)
+  },
+  log(ctx = {}) {
+    return function (...chunks) {
+      const {pkg, scope = pkg?.name || $.scope || '~', level = 'info'} = ctx
+      const msg = chunks.map(c => typeof c === 'string' ? tpl(c, ctx) : c)
+      const event = {msg, scope, date: Date.now(), level}
+      this.events.push(event)
+      logger[level](`[${scope}]`, ...msg)
+
+      return this
+    }.bind(this)
+  },
+  save() {
+    this.file && fs.outputJsonSync(this.file, this)
+    return this
+  }
+})

package/src/main/js/meta.js

@@ -3,7 +3,7 @@
 import {ctx, semver, $, fs, path} from 'zx-extra'
 import {Buffer} from 'buffer'
 import {log} from './log.js'
-import {fetchRepo, pushCommit} from './repo.js'
+import {fetchRepo, pushCommit, getTags as getGitTags} from './git.js'
 import {fetchManifest} from './npm.js'
 
 export const pushTag = (pkg) => ctx(async ($) => {
@@ -138,8 +138,7 @@ export const parseTag = (tag) => f0.parse(tag) || f1.parse(tag) || lerna.parse(t
 export const formatTag = (tag) => f0.format(tag) || f1.format(tag) || null
 
 export const getTags = async (cwd, ref = '') =>
-  (await $.o({cwd})`git tag -l ${ref}`).toString()
-    .split('\n')
+  (await getGitTags(cwd, ref))
     .map(tag => parseTag(tag.trim()))
     .filter(Boolean)
     .sort((a, b) => semver.rcompare(a.version, b.version))

package/src/main/js/processor.js

@@ -2,35 +2,35 @@ import os from 'node:os'
 import {$, fs, within} from 'zx-extra'
 import {queuefy} from 'queuefy'
 import {analyze} from './analyze.js'
-import {build} from './build.js'
+import {pushChangelog} from './changelog.js'
 import {getPkgConfig} from './config.js'
-import {topo, traverseQueue} from './deps.js'
-import {log} from './log.js'
-import {getLatest} from './meta.js'
-import {publish} from './publish.js'
-import {getRoot, getSha} from './repo.js'
-import {get, memoizeBy, set, tpl} from './util.js'
+import {topo, traverseDeps, traverseQueue} from './deps.js'
+import {ghPages, ghRelease} from './gh.js'
+import {getRoot, getSha} from './git.js'
+import {log, createReport} from './log.js'
+import {getLatest, pushMeta, pushTag} from './meta.js'
+import {fetchPkg, npmPublish} from './npm.js'
+import {memoizeBy, tpl} from './util.js'
 
 export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within(async () => {
-  const {state, build, publish} = createContext(flags, env)
+  const {report, build, publish} = createContext(flags, env)
 
-  log()('zx-bulk-release')
+  report.log()('zx-bulk-release')
 
   try {
-    const {packages, queue, root, sources, next, prev, nodes, graphs, edges} = await topo({cwd, flags})
-    log()('queue:', queue)
-    log()('graphs', graphs)
-
-    state
-      .setQueue(queue)
+    const {packages, queue, root, prev, graphs} = await topo({cwd, flags})
+    report
+      .log()('queue:', queue)
+      .log()('graphs', graphs)
+      .set('queue', queue)
       .setPackages(packages)
 
     await traverseQueue({queue, prev, async cb(name) {
-      state.setStatus('analyzing', name)
+      report.setStatus('analyzing', name)
       const pkg = packages[name]
       await contextify(pkg, packages, root)
       await analyze(pkg, packages)
-      state
+      report
         .set('config', pkg.config, name)
         .set('version', pkg.version, name)
         .set('prevVersion', pkg.latest.tag?.version || pkg.manifest.version, name)
@@ -38,38 +38,39 @@ export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within
         .set('tag', pkg.tag, name)
     }})
 
-    state.setStatus('pending')
+    report.setStatus('pending')
 
     await traverseQueue({queue, prev, async cb(name) {
       const pkg = packages[name]
 
       if (!pkg.releaseType) {
-        state.setStatus('skipped', name)
+        report.setStatus('skipped', name)
         return
       }
 
-      state.setStatus('building', name)
+      report.setStatus('building', name)
       await build(pkg, packages)
 
       if (flags.dryRun) {
-        state.setStatus('success', name)
+        report.setStatus('success', name)
         return
       }
 
-      state.setStatus('publishing', name)
+      report.setStatus('publishing', name)
       await publish(pkg)
 
-      state.setStatus('success', name)
+      report.setStatus('success', name)
     }})
   } catch (e) {
-    log({level: 'error'})(e)
-    state
+    report
+      .log({level: 'error'})(e)
       .set('error', e)
       .setStatus('failure')
     throw e
   }
-  state.setStatus('success')
-  log()('Great success!')
+  report
+    .setStatus('success')
+    .log()('Great success!')
 })
 
 export const runCmd = async (pkg, name) => {
@@ -82,17 +83,17 @@ export const runCmd = async (pkg, name) => {
 }
 
 const createContext = (flags, env) => {
-  const state = createState({file: flags.report})
+  const report = createReport({file: flags.report})
   const _runCmd = queuefy(runCmd, flags.concurrency || os.cpus().length)
   const _build = memoizeBy((pkg, packages) => build(pkg, packages, _runCmd, _build))
   const _publish = memoizeBy((pkg) => publish(pkg, _runCmd))
 
-  $.state = state
+  $.report = report
   $.env = {...process.env, ...env}
   $.verbose = !!(flags.debug || $.env.DEBUG ) || $.verbose
 
   return {
-    state,
+    report,
     runCmd: _runCmd,
     build: _build,
     publish: _publish
@@ -100,7 +101,7 @@ const createContext = (flags, env) => {
 }
 
 // Inspired by https://docs.github.com/en/actions/learn-github-actions/contexts
-export const contextify = async (pkg, packages, root) => {
+const contextify = async (pkg, packages, root) => {
   pkg.config = await getPkgConfig(pkg.absPath, root.absPath)
   pkg.latest = await getLatest(pkg)
   pkg.context = {
@@ -113,63 +114,36 @@ export const contextify = async (pkg, packages, root) => {
   }
 }
 
-export const createState = ({logger = console, file = null} = {}) => ({
-  logger,
-  file,
-  status: 'initial',
-  queue: [],
-  packages: {},
-  events: [],
-  setQueue(queue) {
-    this.queue = queue
-    return this
-  },
-  setPackages(packages) {
-    this.packages = Object.entries(packages).reduce((acc, [name, {manifest: {version}, absPath, relPath}]) => {
-      acc[name] = {
-        status: 'initial',
-        name,
-        version,
-        path: absPath,
-        relPath
-      }
-      return acc
-    }, {})
-    return this
-  },
-  get(key, pkgName) {
-    return get(
-      pkgName ? this.packages[pkgName] : this,
-      key
-    )
-  },
-  set(key, value, pkgName) {
-    set(
-      pkgName ? this.packages[pkgName] : this,
-      key,
-      value
-    )
-    return this
-  },
-  setStatus(status, name) {
-    this.set('status', status, name)
-    this.save()
-    return this
-  },
-  getStatus(status, name) {
-    return this.get('status', name)
-  },
-  log(ctx = {}) {
-    return function (...chunks) {
-      const {pkg, scope = pkg?.name || '~', level = 'info'} = ctx
-      const msg = chunks.map(c => typeof c === 'string' ? tpl(c, ctx) : c)
-      const event = {msg, scope, date: Date.now(), level}
-      this.events.push(event)
-      logger[level](`[${scope}]`, ...msg)
-    }.bind(this)
-  },
-  save() {
-    this.file && fs.outputJsonSync(this.file, this)
-    return this
+const build = async (pkg, packages, run = runCmd, self = build) => within(async () => {
+  $.scope = pkg.name
+  if (pkg.built) return
+
+  await Promise.all([
+    traverseDeps(pkg, packages, async (_, {pkg}) => self(pkg, packages, run, self)),
+    pkg.changes.length === 0 && pkg.config.npmFetch
+      ? fetchPkg(pkg)
+      : Promise.resolve()
+  ])
+
+  if (!pkg.fetched) {
+    await run(pkg, 'buildCmd')
+    await run(pkg, 'testCmd')
   }
+
+  pkg.built = true
+})
+
+const publish = async (pkg, run = runCmd) => within(async () => {
+  $.scope = pkg.name
+  await fs.writeJson(pkg.manifestPath, pkg.manifest, {spaces: 2})
+  await pushTag(pkg)
+
+  await Promise.all([
+    pushMeta(pkg),
+    pushChangelog(pkg),
+    npmPublish(pkg),
+    ghRelease(pkg),
+    ghPages(pkg),
+    run(pkg, 'publishCmd')
+  ])
 })

package/src/main/js/build.js

@@ -1,21 +0,0 @@
-import {traverseDeps} from './deps.js'
-import {fetchPkg} from './npm.js'
-import {runCmd} from './processor.js'
-
-export const build = async (pkg, packages, run = runCmd, self = build) => {
-  if (pkg.built) return true
-
-  await traverseDeps(pkg, packages, async (_, {pkg}) => self(pkg, packages, run, self))
-
-  if (pkg.changes.length === 0 && pkg.config.npmFetch) {
-    await fetchPkg(pkg)
-  }
-
-  if (!pkg.fetched) {
-    await run(pkg, 'buildCmd')
-    await run(pkg, 'testCmd')
-  }
-
-  pkg.built = true
-  return true
-}