Add support for matching -ea version formats

giltene · web-flow · commit f8061412c643 · 2019-12-21T19:51:32.000-08:00
This will support specifying EA versions in the following format examples. E.g.:
14-ea
14.0.0-ea
14.0.0-ea.28
Notes:
 - For the last form above, which is needed for requesting a specific ea build, we must only add '.x' if there are less than 3 dots in the version, hence the change from != 3 to &lt; 3
- The prior parsing logic for e.g. 14.0.0-ea "spelling" will ignore precedence between build numbers in the form of e.g. 14.0.0-ea+b27 vs. 14.0.0-ea+b27 (so it will end up with the earliest rather than the latest ea build in the cdn), and does not allow specifying an ea build number (it will match 14.0.0-ea+b29 to a cdn 14.0.0-ea+b2). The new logic [copupled with the CDN populating EA builds in the form 14.0.0-ea.28) will resolve that.
diff --git a/src/installer.ts b/src/installer.ts
@@ -266,12 +266,21 @@ function normalizeVersion(version: string): string {
     }
   }
 
-  // Add trailing .x if it is missing
-  if (version.split('.').length != 3) {
+  if (version.endsWith('-ea')) {
+    // convert e.g. 14-ea to 14.0.0-ea
+    if (version.indexOf('.') == -1) {
+      version = version.slice(0, version.length - 3) + '.0.0-ea';
+    }
+    // match anything in -ea.X (semver won't do .x matching on pre-release versions) 
+    if (version[0] >= '0' && version[0] <= '9') {
+      version = '>=' + version;
+    }
+  } else if (version.split('.').length < 3) {
+    // For non-ea versions, add trailing .x if it is missing
     if (version[version.length - 1] != 'x') {
       version = version + '.x';
     }
   }
-
+  
   return version;
 }

Original file line number	Diff line number	Diff line change
`@@ -266,12 +266,21 @@ function normalizeVersion(version: string): string {`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`
`269`		`- // Add trailing .x if it is missing`
`270`		`- if (version.split('.').length != 3) {`
	`269`	`+ if (version.endsWith('-ea')) {`
	`270`	`+ // convert e.g. 14-ea to 14.0.0-ea`
	`271`	`+ if (version.indexOf('.') == -1) {`
	`272`	`+ version = version.slice(0, version.length - 3) + '.0.0-ea';`
	`273`	`+ }`
	`274`	`+ // match anything in -ea.X (semver won't do .x matching on pre-release versions)`
	`275`	`+ if (version[0] >= '0' && version[0] <= '9') {`
	`276`	`+ version = '>=' + version;`
	`277`	`+ }`
	`278`	`+ } else if (version.split('.').length < 3) {`
	`279`	`+ // For non-ea versions, add trailing .x if it is missing`
`271`	`280`	`if (version[version.length - 1] != 'x') {`
`272`	`281`	`version = version + '.x';`
`273`	`282`	`}`
`274`	`283`	`}`
`275`		`-`
	`284`	`+`
`276`	`285`	`return version;`
`277`	`286`	`}`