zx-bulk-release 2.2.6 → 2.2.8

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [2.2.8](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.7...v2.2.8) (2023-03-24)
+
+### Fixes & improvements
+* fix: fix git-push-rebase-retry hook ([30df2f1](https://github.com/semrel-extra/zx-bulk-release/commit/30df2f1d25d43145343e47f2f96d4a00955d6b76))
+
+## [2.2.7](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.6...v2.2.7) (2023-03-24)
+
+### Fixes & improvements
+* docs: describe more CLI flags ([6f7a053](https://github.com/semrel-extra/zx-bulk-release/commit/6f7a053ae2fe2da8fd71858b132ef4ac4d1456ad))
+* refactor: move `topo` to ctx builder ([6fec83c](https://github.com/semrel-extra/zx-bulk-release/commit/6fec83c10dd76feb93a3148eb2c032c6eaa902f1))
+
 ## [2.2.6](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.5...v2.2.6) (2023-03-24)
 
 ### Fixes & improvements

package/README.md

@@ -18,10 +18,10 @@
 * No extra builds. The required deps are fetched from the pkg registry (`npmFetch` config opt).
 
 ## Roadmap
+* [x] Store release metrics to `meta`.
+* [ ] ~~Self-repair. Restore broken/missing metadata from external registries (npm, pypi, m2)~~. Tags should be the only source of truth
 * [ ] Multistack. Add support for java/kt/py.
-* [ ] Self-repair. Restore broken/missing metadata from external registries (npm, pypi, m2).
 * [ ] Semaphore. Let several release agents to serve the monorepo at the same time.
-* [ ] Stats. Store release metrics to `meta`.
 
 ## Requirements
 * macOS / linux
@@ -37,11 +37,16 @@ yarn add zx-bulk-release
 ```shell
 GH_TOKEN=ghtoken GH_USER=username NPM_TOKEN=npmtoken npx zx-bulk-release [opts]
 ```
-| Flag                | Description                | Default  |
-|---------------------|----------------------------|----------|
-| `--dry-run`         | Dry run mode               | `false`  |
-| `--ignore`          | Packages to ignore: `a, b` |          |
-| `--include-private` | Include private pkgs       | `false`  |
+| Flag                         | Description                                                    | Default          |
+|------------------------------|----------------------------------------------------------------|------------------|
+| `--ignore`                   | Packages to ignore: `a, b`                                     |                  |
+| `--include-private`          | Include `private` packages                                       | `false`          |
+| `--concurrency`              | `build/publish` threads limit                                  | `os.cpus.length` |
+| `--no-build`                 | Skip `buildCmd` invoke                                         |                  |
+| `--no-npm-fetch`             | Disable npm artifacts fetching                                 |                  |                      
+| `--dry-run` / `--no-publish` | Disable any publish logic                                      |                  |
+| `--report`                   | Persist release state to file                                  |                  |
+| `--debug`                    | Enable [zx](https://github.com/google/zx#verbose) verbose mode |                  |
 
 ### JS API
 ```js

package/package.json

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

package/src/main/js/analyze.js

@@ -6,7 +6,7 @@ import {getCommits} from './git.js'
 
 export const analyze = async (pkg, packages) => {
   const semanticChanges = await getSemanticChanges(pkg.absPath, pkg.latest.tag?.ref)
-  const depsChanges = await updateDeps(pkg, packages)
+  const depsChanges = await updateDeps(pkg, pkg.context.packages)
   const changes = [...semanticChanges, ...depsChanges]
   const releaseType = getNextReleaseType(changes)
 

package/src/main/js/config.js

@@ -15,10 +15,10 @@ const CONFIG_FILES = [
 ]
 
 export const defaultConfig = {
-  cmd: 'yarn && yarn build && yarn test',
-  changelog: 'changelog',
-  npmFetch: true,
-  ghRelease: true,
+  cmd:        'yarn && yarn build && yarn test',
+  changelog:  'changelog',
+  npmFetch:   true,
+  ghRelease:  true,
   // npmPublish: true,
   // ghPages: 'gh-pages'
 }
@@ -38,10 +38,8 @@ export const normalizePkgConfig = (config, env) => ({
   }
 })
 
-export const parseEnv = (env = process.env) => {
-  const {GH_USER, GH_USERNAME, GITHUB_USER, GITHUB_USERNAME, GH_TOKEN, GITHUB_TOKEN, NPM_TOKEN, NPM_REGISTRY, NPMRC, NPM_USERCONFIG, NPM_CONFIG_USERCONFIG, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL} = env
-
-  return {
+export const parseEnv = ({GH_USER, GH_USERNAME, GITHUB_USER, GITHUB_USERNAME, GH_TOKEN, GITHUB_TOKEN, NPM_TOKEN, NPM_REGISTRY, NPMRC, NPM_USERCONFIG, NPM_CONFIG_USERCONFIG, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL} = process.env) =>
+  ({
     ghUser:             GH_USER || GH_USERNAME || GITHUB_USER || GITHUB_USERNAME,
     ghToken:            GH_TOKEN || GITHUB_TOKEN,
     npmConfig:          NPMRC || NPM_USERCONFIG || NPM_CONFIG_USERCONFIG,
@@ -49,7 +47,6 @@ export const parseEnv = (env = process.env) => {
     npmRegistry:        NPM_REGISTRY || 'https://registry.npmjs.org',
     gitCommitterName:   GIT_COMMITTER_NAME || 'Semrel Extra Bot',
     gitCommitterEmail:  GIT_COMMITTER_EMAIL || 'semrel-extra-bot@hotmail.com',
-  }
-}
+  })
 
 export const normalizeFlags = (flags = {}) => Object.entries(flags).reduce((acc, [k, v]) => ({...acc, [camelize(k)]: v}), {})

package/src/main/js/git.js

@@ -1,6 +1,7 @@
 import {$, ctx, fs, path, tempy, copy} from 'zx-extra'
 import {log} from './log.js'
-import {keyByValue, memoizeBy} from './util.js'
+import {memoizeBy} from './util.js'
+import {queuefy} from 'queuefy'
 
 export const fetchRepo = memoizeBy(async ({cwd: _cwd, branch, origin: _origin, basicAuth}) => ctx(async ($) => {
   const origin = _origin || (await getRepo(_cwd, {basicAuth})).repoAuthedUrl
@@ -17,32 +18,30 @@ export const fetchRepo = memoizeBy(async ({cwd: _cwd, branch, origin: _origin, b
   return cwd
 }), async ({cwd, branch}) => `${await getRoot(cwd)}:${branch}`)
 
-export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFiles, files = [], basicAuth, gitCommitterEmail, gitCommitterName}) => ctx(async ($) => {
+export const pushCommit = queuefy(async ({cwd, from, to, branch, origin, msg, ignoreFiles, files = [], basicAuth, gitCommitterEmail, gitCommitterName}) => ctx(async ($) => {
   let retries = 3
-  let _cwd
 
-  while (retries > 0) {
-    try {
-      _cwd = await fetchRepo({cwd, branch, origin, basicAuth})
+  const _cwd = await fetchRepo({cwd, branch, origin, basicAuth})
+  $.cwd = _cwd
 
-      for (let {relpath, contents} of files) {
-        const _contents = typeof contents === 'string' ? contents : JSON.stringify(contents, null, 2)
-        await fs.outputFile(path.resolve(_cwd, to, relpath), _contents)
-      }
-      if (from) await copy({baseFrom: cwd, from, baseTo: _cwd, to, ignoreFiles, cwd})
-
-      $.cwd = _cwd
-
-      await $`git config user.name ${gitCommitterName}`
-      await $`git config user.email ${gitCommitterEmail}`
-      await $`git add .`
-      try {
-        await $`git commit -m ${msg}`
-      } catch {
-        log({level: 'warn'})(`no changes to commit to ${branch}`)
-        return
-      }
+  for (let {relpath, contents} of files) {
+    const _contents = typeof contents === 'string' ? contents : JSON.stringify(contents, null, 2)
+    await fs.outputFile(path.resolve(_cwd, to, relpath), _contents)
+  }
+  if (from) await copy({baseFrom: cwd, from, baseTo: _cwd, to, ignoreFiles, cwd})
+
+  try {
+    await $`git config user.name ${gitCommitterName} &&
+            git config user.email ${gitCommitterEmail} &&
+            git add . &&
+            git commit -m ${msg}`
+  } catch {
+    log({level: 'warn'})(`no changes to commit to ${branch}`)
+    return
+  }
 
+  while (retries > 0) {
+    try {
       return await $.raw`git push origin HEAD:refs/heads/${branch}`
     } catch (e) {
       retries -= 1
@@ -51,9 +50,11 @@ export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFile
       if (retries === 0) {
         throw e
       }
+
+      await $`git pull --rebase origin ${branch}`
     }
   }
-})
+}))
 
 export const getRoot = async (cwd) => (await $.o({cwd})`git rev-parse --show-toplevel`).toString().trim()
 

package/src/main/js/log.js

@@ -1,34 +1,28 @@
 import {$, fs} from 'zx-extra'
 import {get, set, tpl} from './util.js'
 
-export const log = (ctx) => {
-  if ($.report) {
-    return $.report.log(ctx)
-  }
-
-  return console.log
-}
+export const log = (ctx) =>
+  $.report
+    ? $.report.log(ctx)
+    : console.log
 
-export const createReport = ({logger = console, file = null} = {}) => ({
+export const createReport = ({logger = console, packages = {}, queue = [], flags} = {}) => ({
   logger,
-  file,
+  flags,
+  file: flags.report || flags.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
-  },
+  queue,
+  packages: Object.entries(packages).reduce((acc, [name, {manifest: {version}, absPath, relPath}]) => {
+    acc[name] = {
+      status: 'initial',
+      name,
+      version,
+      path: absPath,
+      relPath
+    }
+    return acc
+  }, {}),
   get(key, pkgName) {
     return get(
       pkgName ? this.packages[pkgName] : this,

package/src/main/js/processor.js

@@ -13,23 +13,21 @@ import {fetchPkg, npmPublish} from './npm.js'
 import {memoizeBy, tpl} from './util.js'
 
 export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within(async () => {
-  const {report, build, publish} = createContext(flags, env)
+  const context = await createContext({flags, env, cwd})
+  const {report, packages, queue, prev, graphs} = context
+  const _runCmd = queuefy(runCmd, flags.concurrency || os.cpus().length)
 
-  report.log()('zx-bulk-release')
+  report
+    .log()('zx-bulk-release')
+    .log()('queue:', queue)
+    .log()('graphs', graphs)
 
   try {
-    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) {
       report.setStatus('analyzing', name)
       const pkg = packages[name]
-      await contextify(pkg, packages, root)
-      await analyze(pkg, packages)
+      await contextify(pkg, context)
+      await analyze(pkg)
       report
         .set('config', pkg.config, name)
         .set('version', pkg.version, name)
@@ -47,17 +45,14 @@ export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within
         report.setStatus('skipped', name)
         return
       }
-
-      report.setStatus('building', name)
-      await build(pkg, packages)
-
-      if (flags.dryRun) {
-        report.setStatus('success', name)
-        return
+      if (!flags.noBuild) {
+        report.setStatus('building', name)
+        await build(pkg, _runCmd)
+      }
+      if (!flags.dryRun && !flags.noPublish) {
+        report.setStatus('publishing', name)
+        await publish(pkg, _runCmd)
       }
-
-      report.setStatus('publishing', name)
-      await publish(pkg)
 
       report.setStatus('success', name)
     }})
@@ -78,30 +73,31 @@ export const runCmd = async (pkg, name) => {
 
   if (cmd) {
     log({pkg})(`run ${name} '${cmd}'`)
-    await $.o({cwd: pkg.absPath, quote: v => v, preferLocal: true})`${cmd}`
+    return $.o({cwd: pkg.absPath, quote: v => v, preferLocal: true})`${cmd}`
   }
 }
 
-const createContext = (flags, env) => {
-  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))
+const createContext = async ({flags, env, cwd}) => {
+  const { packages, queue, root, prev, graphs } = await topo({cwd, flags})
+  const report =    createReport({packages, queue, flags})
 
-  $.report = report
-  $.env = {...process.env, ...env}
-  $.verbose = !!(flags.debug || $.env.DEBUG ) || $.verbose
+  $.report =        report
+  $.env =           {...process.env, ...env}
+  $.verbose =       !!(flags.debug || $.env.DEBUG ) || $.verbose
 
   return {
     report,
-    runCmd: _runCmd,
-    build: _build,
-    publish: _publish
+    packages,
+    root,
+    queue,
+    prev,
+    graphs,
+    flags
   }
 }
 
 // Inspired by https://docs.github.com/en/actions/learn-github-actions/contexts
-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 = {
@@ -114,13 +110,12 @@ const contextify = async (pkg, packages, root) => {
   }
 }
 
-const build = async (pkg, packages, run = runCmd, self = build) => within(async () => {
+const build = memoizeBy(async (pkg, run = runCmd, flags = {}, 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
+    traverseDeps(pkg, pkg.context.packages, async (_, {pkg}) => self(pkg, run, flags, self)),
+    pkg.changes.length === 0 && pkg.config.npmFetch && !flags.noNpmFetch
       ? fetchPkg(pkg)
       : Promise.resolve()
   ])
@@ -131,10 +126,11 @@ const build = async (pkg, packages, run = runCmd, self = build) => within(async
   }
 
   pkg.built = true
-})
+}))
 
-const publish = async (pkg, run = runCmd) => within(async () => {
+const publish = memoizeBy(async (pkg, run = runCmd) => within(async () => {
   $.scope = pkg.name
+
   await fs.writeJson(pkg.manifestPath, pkg.manifest, {spaces: 2})
   await pushTag(pkg)
 
@@ -146,4 +142,6 @@ const publish = async (pkg, run = runCmd) => within(async () => {
     ghPages(pkg),
     run(pkg, 'publishCmd')
   ])
-})
+
+  pkg.published = true
+}))

package/src/main/js/util.js

@@ -30,19 +30,6 @@ export const set = (obj, path, value) => {
 
 export const msgJoin = (rest, context, def) => tpl(rest.filter(Boolean).join(' ') || def, context)
 
-export const getPromise = () => {
-    let resolve, reject
-    const promise = new Promise((...args) => {
-        [resolve, reject] = args
-    })
-
-    return {
-        resolve,
-        reject,
-        promise,
-    }
-}
-
 export const keyByValue = (obj, value) => Object.keys(obj).find((key) => obj[key] === value)
 
 export const memoizeBy = (fn, getKey = v => v, memo = new Map()) => async (...args) => {