zx-bulk-release 2.2.4 → 2.2.6

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [2.2.6](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.5...v2.2.6) (2023-03-24)
+
+### Fixes & improvements
+* refactor: apply memoize to git utils ([ff8ff78](https://github.com/semrel-extra/zx-bulk-release/commit/ff8ff7840eb65171b7d69d45cafed944627bfd20))
+
+## [2.2.5](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.4...v2.2.5) (2023-03-24)
+
+### Fixes & improvements
+* perf: print err.stack on process failure ([5f3271f](https://github.com/semrel-extra/zx-bulk-release/commit/5f3271fa4e85d6d8f0b23ad240c9d566fddf69be))
+
 ## [2.2.4](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.3...v2.2.4) (2023-03-24)
 
 ### Fixes & improvements

package/package.json

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

package/src/main/js/config.js

@@ -34,8 +34,6 @@ export const normalizePkgConfig = (config, env) => ({
   npmFetch: config.npmFetch || config.fetch || config.fetchPkg,
   buildCmd: config.buildCmd || config.cmd,
   get ghBasicAuth() {
-    console.log('this.ghToken', !!this.ghToken)
-    console.log('this.ghUser', !!this.ghUser)
     return this.ghUser && this.ghToken ? `${this.ghUser}:${this.ghToken}` : false
   }
 })

package/src/main/js/git.js

@@ -1,14 +1,8 @@
 import {$, ctx, fs, path, tempy, copy} from 'zx-extra'
 import {log} from './log.js'
-import {keyByValue} from './util.js'
-
-const branches = {}
-export const fetchRepo = async ({cwd: _cwd, branch, origin: _origin, basicAuth}) => ctx(async ($) => {
-  const root = await getRoot(_cwd)
-  const id = `${root}:${branch}`
-
-  if (branches[id]) return branches[id]
+import {keyByValue, memoizeBy} from './util.js'
 
+export const fetchRepo = memoizeBy(async ({cwd: _cwd, branch, origin: _origin, basicAuth}) => ctx(async ($) => {
   const origin = _origin || (await getRepo(_cwd, {basicAuth})).repoAuthedUrl
   const cwd = tempy.temporaryDirectory()
   $.cwd = cwd
@@ -19,10 +13,9 @@ export const fetchRepo = async ({cwd: _cwd, branch, origin: _origin, basicAuth})
     await $`git init .`
     await $`git remote add origin ${origin}`
   }
-  branches[id] = cwd
 
-  return branches[id]
-})
+  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 ($) => {
   let retries = 3
@@ -54,7 +47,6 @@ export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFile
     } catch (e) {
       retries -= 1
       log({level: 'error'})('git push failed', 'branch', branch, 'retries left', retries, e)
-      branches[keyByValue(branches, _cwd)] = null
 
       if (retries === 0) {
         throw e
@@ -63,14 +55,11 @@ export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFile
   }
 })
 
-const repos = {}
-export const getRepo = async (_cwd, {basicAuth} = {}) => {
-  const cwd = await getRoot(_cwd)
-  if (repos[cwd]) return repos[cwd]
+export const getRoot = async (cwd) => (await $.o({cwd})`git rev-parse --show-toplevel`).toString().trim()
 
-  const e = new Error()
-  console.log('!!! has basic auth', !!basicAuth, e.stack)
+export const getSha = async (cwd) => (await $.o({cwd})`git rev-parse HEAD`).toString().trim()
 
+export const getRepo = memoizeBy(async (cwd, {basicAuth} = {}) => {
   const originUrl = await getOrigin(cwd)
   const [, , repoHost, repoName] = originUrl.replace(':', '/').replace(/\.git/, '').match(/.+(@|\/\/)([^/]+)\/(.+)$/) || []
   const repoPublicUrl = `https://${repoHost}/${repoName}`
@@ -78,29 +67,18 @@ export const getRepo = async (_cwd, {basicAuth} = {}) => {
     ? `https://${basicAuth}@${repoHost}/${repoName}.git`
     : originUrl
 
-  repos[cwd] = {
+  return {
     repoName,
     repoHost,
     repoPublicUrl,
     repoAuthedUrl,
     originUrl,
   }
+}, getRoot)
 
-  return repos[cwd]
-}
-
-const origins = {}
-export const getOrigin = async (cwd) => {
-  if (!origins[cwd]) {
-    origins[cwd] = (await $.o({cwd})`git config --get remote.origin.url`).toString().trim()
-  }
-
-  return origins[cwd]
-}
-
-export const getRoot = async (cwd) => (await $.o({cwd})`git rev-parse --show-toplevel`).toString().trim()
-
-export const getSha = async (cwd) => (await $.o({cwd})`git rev-parse HEAD`).toString().trim()
+export const getOrigin = memoizeBy(async (cwd) =>
+  $.o({cwd})`git config --get remote.origin.url`.then(r => r.toString().trim())
+)
 
 export const getCommits = async (cwd, from, to = 'HEAD') => ctx(async ($) => {
   const ref = from ? `${from}..${to}` : to

package/src/main/js/meta.js

@@ -45,9 +45,9 @@ export const pushMeta = async (pkg) => {
 }
 
 export const getLatest = async (pkg) => {
-  const {absPath: cwd, name} = pkg
+  const {absPath: cwd, name, config: {ghBasicAuth: basicAuth}} = pkg
   const tag = await getLatestTag(cwd, name)
-  const meta = await getLatestMeta(cwd, tag?.ref) || await fetchManifest(pkg, {nothrow: true})
+  const meta = await getLatestMeta(cwd, tag?.ref, basicAuth) || await fetchManifest(pkg, {nothrow: true})
 
   return {
     tag,
@@ -155,11 +155,11 @@ 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) => {
+export const getLatestMeta = async (cwd, tag, basicAuth) => {
   if (!tag) return null
 
   try {
-    const _cwd = await fetchRepo({cwd, branch: 'meta'})
+    const _cwd = await fetchRepo({cwd, branch: 'meta', basicAuth})
     return await Promise.any([
       fs.readJson(path.resolve(_cwd, `${getArtifactPath(tag)}.json`)),
       fs.readJson(path.resolve(_cwd, getArtifactPath(tag), 'meta.json'))

package/src/main/js/processor.js

@@ -63,7 +63,7 @@ export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within
     }})
   } catch (e) {
     report
-      .log({level: 'error'})(e)
+      .log({level: 'error'})(e, e.stack)
       .set('error', e)
       .setStatus('failure')
     throw e

package/src/main/js/util.js

@@ -45,8 +45,8 @@ 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)
+export const memoizeBy = (fn, getKey = v => v, memo = new Map()) => async (...args) => {
+  const key = await getKey(...args)
   if (memo.has(key)) {
     return memo.get(key)
   }