zx-bulk-release 1.16.0 → 1.17.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [1.17.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.16.2...v1.17.0) (2022-06-28)
+
+### Fixes & improvements
+* docs: describe CLI options ([e744e97](https://github.com/semrel-extra/zx-bulk-release/commit/e744e97e8e5451ffff217283ad4e552f05073e7c))
+* docs: describe internal release flow ([e29bfc9](https://github.com/semrel-extra/zx-bulk-release/commit/e29bfc968a519d7c48b0475ad30c826bef17fb96))
+
+### Features
+* feat: introduce `--include-private` and `ignore` flags ([d029b62](https://github.com/semrel-extra/zx-bulk-release/commit/d029b6242da2e3c7fabaa5e24d61709b47e42b94))
+
+## [1.16.2](https://github.com/semrel-extra/zx-bulk-release/compare/v1.16.1...v1.16.2) (2022-06-28)
+
+### Fixes & improvements
+* refactor: separate `analyze` helper ([1f76993](https://github.com/semrel-extra/zx-bulk-release/commit/1f76993d3d9539a02d516c0cd757713964f6f523))
+
+## [1.16.1](https://github.com/semrel-extra/zx-bulk-release/compare/v1.16.0...v1.16.1) (2022-06-28)
+
+### Fixes & improvements
+* refactor: extract tag utils from publish.js ([82b3ef0](https://github.com/semrel-extra/zx-bulk-release/commit/82b3ef02affb65bb79eda5f54f32b0378e7083f2))
+
 ## [1.16.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.15.0...v1.16.0) (2022-06-28)
 
 ### Features

package/README.md

@@ -26,6 +26,11 @@
 ```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`  |
 
 ### JS API
 ```js
@@ -59,7 +64,7 @@ Any [cosmiconfig](https://github.com/davidtheclark/cosmiconfig) compliant format
 
 ### Output
 
-[Readable and clear logs](https://github.com/semrel-extra/demo-zx-bulk-release/runs/7069468916?check_suite_focus=true)
+[Compact and clear logs](https://github.com/semrel-extra/demo-zx-bulk-release/runs/7090161341?check_suite_focus=true#step:6:1)
 
 ```shell
 Run npm_config_yes=true npx zx-bulk-release
@@ -99,6 +104,55 @@ zx-bulk-release
 ```
 
 ## Implementation notes
+### Flow
+```js
+try {
+  const {packages, queue, root} = await topo({cwd, flags})
+  console.log('queue:', queue)
+
+  for (let name of queue) {
+    const pkg = packages[name]
+
+    await analyze(pkg, packages, root)
+
+    if (pkg.changes.length === 0) continue
+
+    await build(pkg, packages)
+
+    if (flags.dryRun) continue
+
+    await publish(pkg)
+  }
+} catch (e) {
+  console.error(e)
+  throw e
+}
+```
+
+### `topo`
+[Toposort](https://github.com/semrel-extra/topo) is used to order the pkgs to be released.
+By default, it omits the packages marked as `private`. You can override this by setting the `--include-private` flag.
+
+### `analyze`
+Determines pkg changes, release type, next version etc.
+
+### `build`
+Building pkg assets: bundles, docs, etc.
+```js
+export const publish = async (pkg) => {
+  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)
+}
+```
+
+### `publish`
+Publish the pkg to git, npm, gh-pages, gh-release, etc.
+
 ### Tags
 [Lerna](https://github.com/lerna/lerna) tags (like `@pkg/name@v1.0.0-beta.0`) are suitable for monorepos, but they don’t follow [semver spec](https://semver.org/). Therefore, we propose another contract:
 ```js
@@ -117,14 +171,14 @@ 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 {
-    ghUser: GH_USER || GH_USERNAME || GITHUB_USER || GITHUB_USERNAME,
-    ghToken: GH_TOKEN || GITHUB_TOKEN,
-    npmToken: NPM_TOKEN,
+    ghUser:             GH_USER || GH_USERNAME || GITHUB_USER || GITHUB_USERNAME,
+    ghToken:            GH_TOKEN || GITHUB_TOKEN,
+    npmToken:           NPM_TOKEN,
     // npmConfig suppresses npmToken
-    npmConfig: NPMRC || NPM_USERCONFIG || NPM_CONFIG_USERCONFIG,
-    npmRegistry: NPM_REGISTRY || 'https://registry.npmjs.org',
-    gitCommitterName: GIT_COMMITTER_NAME || 'Semrel Extra Bot',
-    gitCommitterEmail: GIT_COMMITTER_EMAIL || 'semrel-extra-bot@hotmail.com',
+    npmConfig:          NPMRC || NPM_USERCONFIG || NPM_CONFIG_USERCONFIG,
+    npmRegistry:        NPM_REGISTRY || 'https://registry.npmjs.org',
+    gitCommitterName:   GIT_COMMITTER_NAME || 'Semrel Extra Bot',
+    gitCommitterEmail:  GIT_COMMITTER_EMAIL || 'semrel-extra-bot@hotmail.com',
   }
 }
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zx-bulk-release",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": "./src/main/js/index.js",
@@ -13,7 +13,7 @@
   "dependencies": {
     "@semrel-extra/topo": "^1.4.1",
     "cosmiconfig": "^7.0.1",
-    "git-glob-cp": "^1.7.1",
+    "git-glob-cp": "^1.7.2",
     "ini": "^3.0.0",
     "zx-extra": "^1.7.1"
   },

package/src/main/js/analyze.js

@@ -1,4 +1,22 @@
 import {ctx, semver} from 'zx-extra'
+import {getConfig} from './config.js'
+import {getLatest} from './publish.js'
+import {updateDeps} from './deps.js'
+
+export const analyze = async (pkg, packages, root) => {
+  pkg.config = await getConfig(pkg.absPath, root.absPath)
+  pkg.latest = await getLatest(pkg)
+
+  const semanticChanges = await getSemanticChanges(pkg.absPath, pkg.latest.tag?.ref)
+  const depsChanges = await updateDeps(pkg, packages)
+  const changes = [...semanticChanges, ...depsChanges]
+
+  pkg.changes = changes
+  pkg.version = resolvePkgVersion(changes, pkg.latest.tag?.version || pkg.manifest.version)
+  pkg.manifest.version = pkg.version
+
+  console.log(`[${pkg.name}] semantic changes`, changes)
+}
 
 export const releaseSeverityOrder = ['major', 'minor', 'patch']
 export const semanticRules = [

package/src/main/js/cli.js

@@ -2,5 +2,6 @@
 
 import {argv} from 'zx-extra'
 import {run} from './index.js'
+import {normalizeFlags} from './config.js';
 
-run({flags: argv})
+run({flags: normalizeFlags(argv)})

package/src/main/js/config.js

@@ -46,3 +46,6 @@ export const parseEnv = (env = process.env) => {
     gitCommitterEmail:  GIT_COMMITTER_EMAIL || 'semrel-extra-bot@hotmail.com',
   }
 }
+
+const camelize = s => s.replace(/-./g, x=>x[1].toUpperCase())
+export const normalizeFlags = (flags = {}) => Object.entries(flags).reduce((acc, [k, v]) => ({...acc, [camelize(k)]: v}), {})

package/src/main/js/index.js

@@ -1,42 +1,27 @@
-import {fs, $} from 'zx-extra'
-import {topo} from '@semrel-extra/topo'
-import {updateDeps} from './deps.js'
-import {getSemanticChanges, resolvePkgVersion} from './analyze.js'
-import {publish, getLatest} from './publish.js'
+import {analyze} from './analyze.js'
+import {publish} from './publish.js'
 import {build} from './build.js'
-import {getConfig} from './config.js'
+import {topo} from './topo.js'
 
 export const run = async ({cwd = process.cwd(), env = process.env, flags = {}} = {}) => {
   console.log('zx-bulk-release')
 
   try {
-  const {packages, queue, root} = await topo({cwd})
-  const dryRun = flags['dry-run'] || flags.dryRun
-
+  const {packages, queue, root} = await topo({cwd, flags})
   console.log('queue:', queue)
 
   for (let name of queue) {
     const pkg = packages[name]
-    pkg.config = await getConfig(pkg.absPath, root.absPath)
-    pkg.latest = await getLatest(pkg)
-
-    const semanticChanges = await getSemanticChanges(pkg.absPath, pkg.latest.tag?.ref)
-    const depsChanges = await updateDeps(pkg, packages)
-    const changes = [...semanticChanges, ...depsChanges]
 
-    pkg.changes = changes
-    pkg.version = resolvePkgVersion(changes, pkg.latest.tag?.version || pkg.manifest.version)
-    pkg.manifest.version = pkg.version
+    await analyze(pkg, packages, root)
 
-    if (changes.length === 0) continue
-    console.log(`[${name}] semantic changes`, changes)
+    if (pkg.changes.length === 0) continue
 
-    await build(pkg, packages, cwd)
+    await build(pkg, packages)
 
-    if (dryRun) continue
+    if (flags.dryRun) continue
 
-    await fs.writeJson(pkg.manifestPath, pkg.manifest, {spaces: 2})
-    await publish(pkg, env)
+    await publish(pkg)
   }
   } catch (e) {
     console.error(e)

package/src/main/js/npm.js

@@ -50,10 +50,6 @@ export const npmPublish = (pkg) => ctx(async ($) => {
   await $`npm publish --no-git-tag-version --registry=${npmRegistry} --userconfig ${npmrc} --no-workspaces`
 })
 
-// NOTE registry-auth-token does not work with localhost:4873
-export const getAuthToken = (registry, npmrc) =>
-  (Object.entries(npmrc).find(([reg]) => reg.startsWith(registry.replace(/^https?/, ''))) || [])[1]
-
 // $`npm view ${name}@${version} dist.tarball`
 export const getTarballUrl = (registry, name, version) => `${registry}/${name}/-/${name.replace(/^.+(%2f|\/)/,'')}-${version}.tgz`
 
@@ -65,3 +61,7 @@ export const getBearerToken = async (npmRegistry, npmToken, npmConfig) => {
     : npmToken
   return `Bearer ${token}`
 }
+
+// NOTE registry-auth-token does not work with localhost:4873
+export const getAuthToken = (registry, npmrc) =>
+  (Object.entries(npmrc).find(([reg]) => reg.startsWith(registry.replace(/^https?/, ''))) || [])[1]

package/src/main/js/publish.js

@@ -1,10 +1,11 @@
-import {formatTag, getLatestTag} from './tag.js'
+import {formatTag, getLatestTag, pushTag} from './tag.js'
 import {ctx, fs, path, $} from 'zx-extra'
 import {push, fetch, parseRepo} from './repo.js'
 import {parseEnv} from './config.js'
 import {fetchManifest, npmPublish} from './npm.js'
 
 export const publish = async (pkg) => {
+  await fs.writeJson(pkg.manifestPath, pkg.manifest, {spaces: 2})
   await pushTag(pkg)
   await pushMeta(pkg)
   await pushChangelog(pkg)
@@ -13,25 +14,10 @@ export const publish = async (pkg) => {
   await ghPages(pkg)
 }
 
-export const pushTag = (pkg) => ctx(async ($) => {
-  const {absPath: cwd, name, version} = pkg
-  const tag = formatTag({name, version})
-  const {gitCommitterEmail, gitCommitterName} = parseEnv($.env)
-
-  console.log(`[${name}] push release tag ${tag}`)
-
-  $.cwd = cwd
-  await $`git config user.name ${gitCommitterName}`
-  await $`git config user.email ${gitCommitterEmail}`
-  await $`git tag -m ${tag} ${tag}`
-  await $`git push origin ${tag}`
-})
-
 export const pushMeta = async (pkg) => {
   console.log(`[${pkg.name}] push artifact to branch 'meta'`)
 
-  const cwd = pkg.absPath
-  const {name, version} = pkg
+  const {name, version, absPath: cwd} = pkg
   const tag = formatTag({name, version})
   const to = '.'
   const branch = 'meta'

package/src/main/js/tag.js

@@ -1,7 +1,22 @@
-// Semantic tags
+// Semantic tags processing
 
-import {ctx, semver} from 'zx-extra'
+import {ctx, semver, $} from 'zx-extra'
 import {Buffer} from 'buffer'
+import {parseEnv} from './config.js'
+
+export const pushTag = (pkg) => ctx(async ($) => {
+  const {absPath: cwd, name, version} = pkg
+  const tag = formatTag({name, version})
+  const {gitCommitterEmail, gitCommitterName} = parseEnv($.env)
+
+  console.log(`[${name}] push release tag ${tag}`)
+
+  $.cwd = cwd
+  await $`git config user.name ${gitCommitterName}`
+  await $`git config user.email ${gitCommitterEmail}`
+  await $`git tag -m ${tag} ${tag}`
+  await $`git push origin ${tag}`
+})
 
 const f0 = {
   parse(tag) {
@@ -85,15 +100,12 @@ 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 = (cwd) => ctx(async ($) => {
-  $.cwd = cwd
-
-  return (await $`git tag -l`).toString()
+export const getTags = async (cwd) =>
+  (await $.o({cwd})`git tag -l`).toString()
     .split('\n')
     .map(tag => parseTag(tag.trim()))
     .filter(Boolean)
     .sort((a, b) => semver.rcompare(a.version, b.version))
-})
 
 export const getLatestTag = async (cwd, name) =>
   (await getTags(cwd)).find(tag => tag.name === name) || null

package/src/main/js/topo.js

@@ -0,0 +1,17 @@
+import {topo as _topo} from '@semrel-extra/topo'
+
+export const topo = async ({flags = {}, cwd} = {}) => {
+  const ignore = typeof flags.ignore === 'string'
+    ? flags.ignore.split(/\s*,\s*/)
+    : Array.isArray(flags.ignore)
+      ? flags.ignore
+      : []
+
+  const filter = flags.includePrivate
+    ? () => true
+    : ({manifest: {private: _private, name}}) =>
+      flags.includePrivate ? true : !_private &&
+      !ignore.includes(name)
+
+  return _topo({cwd, filter})
+}

package/src/test/js/topo.test.js

@@ -2,7 +2,7 @@ import {suite} from 'uvu'
 import * as assert from 'uvu/assert'
 import {fileURLToPath} from "node:url"
 import path from 'node:path'
-import {topo} from '@semrel-extra/topo'
+import {topo} from '../../main/js/topo.js'
 
 const test = suite('topo')
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
@@ -14,4 +14,9 @@ test('topo returns pkg info and release queue', async () => {
   assert.equal(queue, ['a', 'b', 'd', 'c'])
 })
 
+test('topo applies pkg filter', async () => {
+  const {nodes, queue} = await topo({cwd: path.resolve(fixtures, 'regular-monorepo'), flags: {ignore: 'b,c'}})
+  assert.equal(queue, ['a', 'd'])
+})
+
 test.run()