chore: convert bump script to js (#15820)

script/lib/util.py

@@ -217,85 +217,6 @@ def s3put(bucket, access_key, secret_key, prefix, key_prefix, files):
 def add_exec_bit(filename):
   os.chmod(filename, os.stat(filename).st_mode | stat.S_IEXEC)
 
-def parse_version(version):
-  if version[0] == 'v':
-    version = version[1:]
-
-  vs = version.split('.')
-  if len(vs) > 4:
-    return vs[0:4]
-  else:
-    return vs + ['0'] * (4 - len(vs))
-
-def clean_parse_version(v):
-  return parse_version(v.split("-")[0])        
-
-def is_stable(v):
-  return len(v.split(".")) == 3    
-
-def is_beta(v):
-  return 'beta' in v
-
-def is_nightly(v):
-  return 'nightly' in v
-
-def get_nightly_date():
-  return datetime.datetime.today().strftime('%Y%m%d')
-
-def get_last_major():
-  return execute(['node', 'script/get-last-major-for-master.js'])
-
-def get_next_nightly(v):
-  pv = clean_parse_version(v)
-  (major, minor, patch) = pv[0:3]
-
-  if (is_stable(v)):
-    patch = str(int(pv[2]) + 1)
-
-  if execute(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) == "master":
-    major = str(get_last_major() + 1)
-    minor = '0'
-    patch = '0'
-
-  pre = 'nightly.' + get_nightly_date()
-  return make_version(major, minor, patch, pre)
-
-def non_empty(thing):
-  return thing.strip() != ''
-
-def beta_tag_compare(tag1, tag2):
-  p1 = parse_version(tag1)
-  p2 = parse_version(tag2)
-  return int(p1[3]) - int(p2[3])
-
-def get_next_beta(v):
-  pv = clean_parse_version(v)
-  tag_pattern = 'v' + pv[0] + '.' + pv[1] + '.' + pv[2] + '-beta.*'
-  tag_list = sorted(filter(
-    non_empty,
-    execute(['git', 'tag', '--list', '-l', tag_pattern]).strip().split('\n')
-  ), cmp=beta_tag_compare)
-  if len(tag_list) == 0:
-    return make_version(pv[0] , pv[1],  pv[2], 'beta.1')
-
-  lv = parse_version(tag_list[-1])
-  return make_version(pv[0] , pv[1],  pv[2], 'beta.' + str(int(lv[3]) + 1))
-
-def get_next_stable_from_pre(v):
-  pv = clean_parse_version(v)
-  (major, minor, patch) = pv[0:3]
-  return make_version(major, minor, patch)
-
-def get_next_stable_from_stable(v):
-  pv = clean_parse_version(v)
-  (major, minor, patch) = pv[0:3]
-  return make_version(major, minor, str(int(patch) + 1))
-
-def make_version(major, minor, patch, pre = None):
-  if pre is None:
-    return major + '.' + minor + '.' + patch
-  return major + "." + minor + "." + patch + '-' + pre
-
 def get_out_dir():
   out_dir = 'Debug'
   override = os.environ.get('ELECTRON_OUT_DIR')

script/lib/version-utils.js

@@ -0,0 +1,73 @@
+const path = require('path')
+const fs = require('fs')
+const semver = require('semver')
+const { getLastMajorForMaster } = require('../get-last-major-for-master')
+const { GitProcess } = require('dugite')
+const { promisify } = require('util')
+
+const readFile = promisify(fs.readFile)
+const gitDir = path.resolve(__dirname, '..', '..')
+
+const getCurrentDate = () => {
+  const d = new Date()
+  const dd = `${d.getDate()}`.padStart(2, '0')
+  const mm = `${d.getMonth() + 1}`.padStart(2, '0')
+  const yyyy = d.getFullYear()
+  return `${yyyy}${mm}${dd}`
+}
+
+const isNightly = v => v.includes('nightly')
+const isBeta = v => v.includes('beta')
+const isStable = v => {
+  const parsed = semver.parse(v)
+  return !!(parsed && parsed.prerelease.length === 0)
+}
+
+const makeVersion = (components, delim, withPre = false) => {
+  let version = [components.major, components.minor, components.patch].join(delim)
+  if (withPre) {
+    version += `-${components.pre[0]}${delim}${components.pre[1]}`
+  }
+  return version
+}
+
+async function nextBeta (v) {
+  const next = semver.coerce(semver.clean(v))
+
+  const tagBlob = await GitProcess.exec(['tag', '--list', '-l', `v${next}-beta.*`], gitDir)
+  const tags = tagBlob.stdout.split('\n').filter(e => e !== '')
+  tags.sort((t1, t2) => semver.gt(t1, t2))
+
+  // increment the latest existing beta tag or start at beta.1 if it's a new beta line
+  return tags.length === 0 ? semver.inc(next, 'beta', 'prerelease') : semver.inc(tags.pop(), 'prerelease')
+}
+
+async function getElectronVersion () {
+  const versionPath = path.join(__dirname, '..', '..', 'VERSION')
+  const version = await readFile(versionPath, 'utf8')
+  return version.trim()
+}
+
+async function nextNightly (v) {
+  let next = semver.valid(semver.coerce(v))
+  const pre = `nightly.${getCurrentDate()}`
+
+  const branch = await GitProcess.exec(['rev-parse', '--abbrev-ref', 'HEAD'], gitDir)
+  if (branch === 'master') {
+    next = semver.inc(await getLastMajorForMaster(), 'major')
+  } else if (isStable(v)) {
+    next = semver.inc(next, 'patch')
+  }
+
+  return `${next}-${pre}`
+}
+
+module.exports = {
+  isStable,
+  isBeta,
+  isNightly,
+  nextBeta,
+  makeVersion,
+  getElectronVersion,
+  nextNightly
+}