zx-bulk-release 2.0.0 → 2.1.0

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [2.1.0](https://github.com/semrel-extra/zx-bulk-release/compare/v2.0.1...v2.1.0) (2023-03-22)
+
+### Features
+* feat: add memoize to avoid redundant builds ([151ea71](https://github.com/semrel-extra/zx-bulk-release/commit/151ea7118af3907aad73f395ac3fb2420e25b2c8))
+
+## [2.0.1](https://github.com/semrel-extra/zx-bulk-release/compare/v2.0.0...v2.0.1) (2023-03-22)
+
+### Fixes & improvements
+* perf: optimize pkg fetch ([749ea0b](https://github.com/semrel-extra/zx-bulk-release/commit/749ea0b29f854e57a447f4cdefe06ab32acba497))
+
 ## [2.0.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.26.2...v2.0.0) (2023-03-21)
 
 ### Features

package/package.json

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

package/src/main/js/build.js

@@ -2,10 +2,10 @@ import {traverseDeps} from './deps.js'
 import {fetchPkg} from './npm.js'
 import {runCmd} from './processor.js'
 
-export const build = async (pkg, packages, run = runCmd) => {
+export const build = async (pkg, packages, run = runCmd, self = build) => {
   if (pkg.built) return true
 
-  await traverseDeps(pkg, packages, async (_, {pkg}) => build(pkg, packages))
+  await traverseDeps(pkg, packages, async (_, {pkg}) => self(pkg, packages))
 
   const {config} = pkg
 

package/src/main/js/deps.js

@@ -1,4 +1,5 @@
 import {semver} from 'zx-extra'
+import {topo as _topo} from '@semrel-extra/topo'
 
 export const depScopes = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies']
 
@@ -63,3 +64,30 @@ export const subsWorkspace = (decl, actual) => {
 
   return decl
 }
+
+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})
+}
+
+export const traverseQueue = async ({queue, prev, cb}) => {
+  const acc = {}
+
+  return Promise.all(queue.map((name) =>
+    (acc[name] = (async () => {
+      await Promise.all((prev.get(name) || []).map((p) => acc[p]))
+      await cb(name)
+    })()))
+  )
+}

package/src/main/js/npm.js

@@ -1,22 +1,21 @@
 import {parseEnv} from './config.js'
 import {log} from './log.js'
-import {$, ctx, fs, path, tempy, copy, INI, fetch} from 'zx-extra'
+import {$, ctx, fs, path, INI, fetch} from 'zx-extra'
 
 export const fetchPkg = async (pkg, {env = $.env} = {}) => {
+  const id = `${pkg.name}@${pkg.version}`
+
   try {
+    log({pkg})(`fetching '${id}'`)
     const cwd = pkg.absPath
     const {npmRegistry, npmToken, npmConfig} = parseEnv(env)
-    const temp = tempy.temporaryDirectory()
     const bearerToken = getBearerToken(npmRegistry, npmToken, npmConfig)
     const tarball = getTarballUrl(npmRegistry, pkg.name, pkg.version)
-
-    await $.raw`wget --header='Authorization: ${bearerToken}' -qO- ${tarball} | tar xvz -C ${temp}`
-    await copy({from: ['**/*', '!package.json'], to: cwd, baseFrom: `${temp}/package`})
+    await $.raw`wget --header='Authorization: ${bearerToken}' -qO- ${tarball} | tar xvz -C ${cwd} --strip-components=1 --exclude='package.json'`
 
     pkg.fetched = true
-    log({pkg})(`fetched '${pkg.name}@${pkg.version}'`)
   } catch (e) {
-    log({pkg})(`fetching '${pkg.name}@${pkg.version}' failed`, e)
+    log({pkg})(`fetching '${id} failed`, e)
   }
 }
 

package/src/main/js/processor.js

@@ -1,22 +1,17 @@
 import os from 'node:os'
-import {$, fs, within} from 'zx-extra'
+import {$, within} from 'zx-extra'
 import {log} from './log.js'
-import {topo, traverse} from './topo.js'
-import {contextify} from './contextify.js'
+import {topo, traverseQueue} from './deps.js'
 import {analyze} from './analyze.js'
 import {build} from './build.js'
-import {publish} from './publish.js'
+import {getLatest, publish} from './publish.js'
 import {createState} from './state.js'
-import {tpl} from './util.js'
+import {memoizeBy, tpl} from './util.js'
 import {queuefy} from 'queuefy'
+import {getConfig} from "./config.js";
 
-export const run = async ({cwd = process.cwd(), env, flags = {}, concurrency = os.cpus().length} = {}) => within(async () => {
-  const state = createState({file: flags.report})
-  const _runCmd = queuefy(runCmd, concurrency)
-
-  $.state = state
-  $.env = {...process.env, ...env}
-  $.verbose = !!(flags.debug || $.env.DEBUG ) || $.verbose
+export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within(async () => {
+  const {state, build, publish} = createContext(flags, env)
 
   log()('zx-bulk-release')
 
@@ -26,7 +21,7 @@ export const run = async ({cwd = process.cwd(), env, flags = {}, concurrency = o
 
     state.setQueue(queue, packages)
 
-    await traverse({nodes, prev, async cb(name) {
+    await traverseQueue({queue, prev, async cb(name) {
       state.setStatus('analyzing', name)
       const pkg = packages[name]
       await contextify(pkg, packages, root)
@@ -40,7 +35,7 @@ export const run = async ({cwd = process.cwd(), env, flags = {}, concurrency = o
 
     state.setStatus('pending')
 
-    await traverse({nodes, prev, async cb(name) {
+    await traverseQueue({queue, prev, async cb(name) {
       const pkg = packages[name]
 
       if (!pkg.releaseType) {
@@ -49,7 +44,7 @@ export const run = async ({cwd = process.cwd(), env, flags = {}, concurrency = o
       }
 
       state.setStatus('building', name)
-      await build(pkg, packages, _runCmd)
+      await build(pkg, packages)
 
       if (flags.dryRun) {
         state.setStatus('success', name)
@@ -57,7 +52,7 @@ export const run = async ({cwd = process.cwd(), env, flags = {}, concurrency = o
       }
 
       state.setStatus('publishing', name)
-      await publish(pkg, _runCmd)
+      await publish(pkg)
 
       state.setStatus('success', name)
     }})
@@ -79,3 +74,35 @@ export const runCmd = async (pkg, name) => {
     await $.o({cwd: pkg.absPath, quote: v => v, preferLocal: true})`${cmd}`
   }
 }
+
+const createContext = (flags, env) => {
+  const state = createState({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
+  $.env = {...process.env, ...env}
+  $.verbose = !!(flags.debug || $.env.DEBUG ) || $.verbose
+
+  return {
+    state,
+    runCmd: _runCmd,
+    build: _build,
+    publish: _publish
+  }
+}
+
+// Inspired by https://docs.github.com/en/actions/learn-github-actions/contexts
+export const contextify = async (pkg, packages, root) => {
+  pkg.config = await getConfig(pkg.absPath, root.absPath)
+  pkg.latest = await getLatest(pkg)
+  pkg.context = {
+    git: {
+      sha: (await $`git rev-parse HEAD`).toString().trim(),
+      root: (await $`git rev-parse --show-toplevel`).toString().trim(),
+    },
+    env: $.env,
+    packages
+  }
+}

package/src/main/js/util.js

@@ -44,3 +44,14 @@ export const getPromise = () => {
 }
 
 export const keyByValue = (obj, value) => Object.keys(obj).find((key) => obj[key] === value)
+
+export const memoizeBy = (fn, memo = new Map(), getKey = v => v) => (...args) => {
+  const key = getKey(...args)
+  if (memo.has(key)) {
+    return memo.get(key)
+  }
+
+  const value = fn(...args)
+  memo.set(key, value)
+  return value
+}

package/src/main/js/contextify.js

@@ -1,18 +0,0 @@
-// Inspired by https://docs.github.com/en/actions/learn-github-actions/contexts
-
-import {getConfig} from './config.js'
-import {getLatest} from './publish.js'
-import {$} from 'zx-extra'
-
-export const contextify = async (pkg, packages, root) => {
-  pkg.config = await getConfig(pkg.absPath, root.absPath)
-  pkg.latest = await getLatest(pkg)
-  pkg.context = {
-    git: {
-      sha: (await $`git rev-parse HEAD`).toString().trim(),
-      root: (await $`git rev-parse --show-toplevel`).toString().trim(),
-    },
-    env: $.env,
-    packages
-  }
-}

package/src/main/js/topo.js

@@ -1,31 +0,0 @@
-import {topo as _topo} from '@semrel-extra/topo'
-import {getPromise} from './util.js'
-
-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})
-}
-
-export const traverse = async ({nodes, prev, cb}) => {
-  const waitings = nodes.reduce((acc, node) => {
-    acc[node] = getPromise()
-    return acc
-  }, {})
-
-  await Promise.all(nodes.map(async (name) => {
-    await Promise.all((prev.get(name) || []).map((p) => waitings[p].promise))
-    await cb(name)
-    waitings[name].resolve(true)
-  }))
-}