zx-bulk-release 1.1.2 → 1.2.0

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.2.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.1.2...v1.2.0) (2022-06-21)
+
+### Features
+* feat: parse legacy lerna tags ([c130191](https://github.com/semrel-extra/zx-bulk-release/commit/c130191f192b185937286730b8c3505d5674c7c1))
+* feat: introduce meta.json to store release details ([a20c348](https://github.com/semrel-extra/zx-bulk-release/commit/a20c34809e29d772a44f71990fdb11921a49ca9f))
+
 ## [1.1.2](https://github.com/semrel-extra/zx-bulk-release/compare/v1.1.1...v1.1.2) (2022-06-18)
 
 ### Fixes & improvements

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zx-bulk-release",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": "./src/main/js/index.js",

package/src/main/js/deps.js

@@ -11,7 +11,14 @@ export const updateDeps = async (pkg, packages) => {
     if (!deps) continue
 
     for (let [name, version] of Object.entries(deps)) {
-      const next = resolveVersion(version, packages[name]?.version, pkg.latest.manifest?.[scope]?.[name])
+      if (!packages[name]) continue
+
+      const prev = pkg.latest.meta?.[scope]?.[name]
+      const actual = packages[name]?.version
+      const next = resolveVersion(version, actual, prev)
+
+      pkg[scope] = {...pkg[scope], [name]: next || version}
+
       if (!next) continue
 
       deps[name] = next

package/src/main/js/publish.js

@@ -3,6 +3,7 @@ import {tempy, ctx, fs, path, $} from 'zx-extra'
 import {copydir} from 'git-glob-cp'
 
 const branches = {}
+const META_VERSION = '1'
 
 export const getOrigin = (cwd) => ctx(async ($) => {
   $.cwd = cwd
@@ -35,9 +36,14 @@ export const fetch = async ({cwd: _cwd, branch, origin: _origin}) => ctx(async (
   return cwd
 })
 
-export const push = async ({cwd, from, to, branch, origin, msg, ignoreFiles}) => ctx(async ($) => {
+export const push = async ({cwd, from, to, branch, origin, msg, ignoreFiles, files = []}) => ctx(async ($) => {
   const _cwd = await fetch({cwd, branch, origin})
-  await copydir({baseFrom: cwd, from, baseTo: _cwd, to})
+
+  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 copydir({baseFrom: cwd, from, baseTo: _cwd, to, ignoreFiles})
 
   $.cwd = _cwd
 
@@ -49,15 +55,13 @@ export const push = async ({cwd, from, to, branch, origin, msg, ignoreFiles}) =>
 })
 
 export const publish = async (pkg, env) => ctx(async ($) => {
-  const {name, version, files} = pkg.manifest
+  const {name, version} = pkg.manifest
+  const tag = formatTag({name, version})
   const cwd = pkg.absPath
+
   $.cwd = cwd
   $.env = env
 
-  const tag = formatTag({name, version})
-  const from = files ? [...files, 'package.json'] : ['!node_modules', '*']
-  const to = getArtifactPath(tag)
-
   console.log(`push release tag ${tag}`)
   await $`git config user.name ${$.env.GIT_COMMITTER_NAME || 'Semrel Extra Bot'}`
   await $`git config user.email ${$.env.GIT_COMMITTER_EMAIL || 'semrel-extra-bot@hotmail.com'}`
@@ -65,7 +69,7 @@ export const publish = async (pkg, env) => ctx(async ($) => {
   await $`git push origin ${tag}`
 
   console.log('push artifact to branch `meta`')
-  await push({cwd, from, to, branch: 'meta', msg: `chore: publish artifact ${name} ${version}`, ignoreFiles: '.npmignore'})
+  await pushMeta(pkg)
 
   const registry = env.NPM_REGISTRY || 'https://registry.npmjs.org'
   const npmrc = path.resolve(cwd, '.npmrc')
@@ -77,23 +81,44 @@ export const publish = async (pkg, env) => ctx(async ($) => {
 
 export const getArtifactPath = (tag) => tag.toLowerCase().replace(/[^a-z0-9-]/g, '-')
 
-export const getLatestManifest = async (cwd, tag) => {
+export const getLatestMeta = async (cwd, tag) => {
   if (!tag) return null
 
   try {
-    const meta = await fetch({cwd, branch: 'meta'})
-    return await fs.readJson(path.resolve(meta, getArtifactPath(tag), 'package.json'))
+    const _cwd = await fetch({cwd, branch: 'meta'})
+    return await fs.readJson(path.resolve(_cwd, getArtifactPath(tag), 'meta.json'))
   } catch {}
 
   return null
 }
 
+export const pushMeta = async (pkg) => ctx(async ($) => {
+  const cwd = pkg.absPath
+  const {name, version} = pkg
+  const tag = formatTag({name, version})
+  const to = getArtifactPath(tag)
+  const branch =  'meta'
+  const msg =  `chore: release meta ${name} ${version}`
+  const meta = {
+    META_VERSION,
+    name: pkg.name,
+    version: pkg.version,
+    dependencies: pkg.dependencies,
+    devDependencies: pkg.devDependencies,
+    peerDependencies: pkg.peerDependencies,
+    optionalDependencies: pkg.optionalDependencies,
+  }
+  const files = [{relpath: 'meta.json', contents: meta}]
+
+  await push({cwd, to, branch, msg, files})
+})
+
 export const getLatest = async (cwd, name) => {
   const tag = await getLatestTag(cwd, name)
-  const manifest = await getLatestManifest(cwd, tag?.ref)
+  const meta = await getLatestMeta(cwd, tag?.ref)
 
   return {
     tag,
-    manifest
+    meta
   }
 }

package/src/main/js/tag.js

@@ -8,8 +8,8 @@ const f0 = {
     if (!tag.endsWith('-f0')) return null
 
     const pattern = /^(\d{4}\.(?:[1-9]|1[012])\.(?:0[1-9]|[12]\d|30|31))-((?:[a-z0-9-]+\.)?[a-z0-9-]+)\.(v?\d+\.\d+\.\d+.*)-f0$/
-    const matched = pattern.exec(tag)
-    const [, _date, _name, version] = matched || []
+    const matched = pattern.exec(tag) || []
+    const [, _date, _name, version] = matched
 
     if (!semver.valid(version)) return null
 
@@ -33,8 +33,8 @@ const f1 = {
     if (!tag.endsWith('-f1')) return null
 
     const pattern = /^(\d{4}\.(?:[1-9]|1[012])\.(?:0[1-9]|[12]\d|30|31))-[a-z0-9-]+\.(v?\d+\.\d+\.\d+.*)\.([^.]+)-f1$/
-    const matched = pattern.exec(tag)
-    const [, _date, version, b64] = matched || []
+    const matched = pattern.exec(tag) || []
+    const [, _date, version, b64] = matched
 
     if (!semver.valid(version)) return null
 
@@ -54,6 +54,17 @@ const f1 = {
   }
 }
 
+const lerna = {
+  parse(tag) {
+    const pattern = /^(@?[a-z0-9-]+(?:\/[a-z0-9-]+)?)@(v?\d+\.\d+\.\d+.*)/
+    const [, name, version] = pattern.exec(tag) || []
+
+    if (!semver.valid(version)) return null
+
+    return {name, version, format: 'lerna', ref: tag}
+  }
+}
+
 // TODO
 // const variants = [f0, f1]
 // export const parseTag = (tag) => {
@@ -65,7 +76,7 @@ const f1 = {
 //   return null
 // }
 
-export const parseTag = (tag) => f0.parse(tag) || f1.parse(tag) || null
+export const parseTag = (tag) => f0.parse(tag) || f1.parse(tag) || lerna.parse(tag) || null
 
 export const formatTag = (tag) => f0.format(tag) || f1.format(tag) || null
 

package/src/test/js/integration.test.js

@@ -121,7 +121,7 @@ test('run()', async () => {
     const meta = tempy.temporaryDirectory()
 
     await $`git clone --single-branch --branch meta --depth 1 ${origin} ${meta}`
-    assert.is((await fs.readJson(`${meta}/${tag.toLowerCase().replace(/[^a-z0-9-]/g, '-')}/package.json`)).version, '1.0.1')
+    assert.is((await fs.readJson(`${meta}/${tag.toLowerCase().replace(/[^a-z0-9-]/g, '-')}/meta.json`)).version, '1.0.1')
   })
 
   await registry.stop()

package/src/test/js/tag.test.js

@@ -143,6 +143,16 @@ test('formatTag() / parseTag()', () => {
         format: 'f1',
         ref: '2022.6.13-examplecom.v1.0.0.ZXhhbXBsZS5jb20-f1'
       }
+    ],
+    [
+      '@qiwi/pijma-ssr@1.1.12',
+      {
+        name: '@qiwi/pijma-ssr',
+        version: '1.1.12',
+        format: 'lerna',
+        ref: '@qiwi/pijma-ssr@1.1.12'
+      },
+      true
     ]
   ]