version parsing fix for tags, 0.9.3 release

systemjs · Oct 21, 2014 · e6ec736 · e6ec736
1 parent b5e0a71
commit e6ec736
Show file tree

Hide file tree

Showing 10 changed files with 123 additions and 105 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "system.js",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "main": "dist/system.js",
   "dependencies": {
     "es6-module-loader": "~0.9.4"

diff --git a/dist/system-csp.js b/dist/system-csp.js
diff --git a/dist/system-csp.js.map b/dist/system-csp.js.map
diff --git a/dist/system-csp.src.js b/dist/system-csp.src.js
@@ -1,5 +1,5 @@
 /*
- * SystemJS v0.9.2
+ * SystemJS v0.9.3
  */
 
 (function($__global) {
@@ -1882,17 +1882,30 @@ function versions(loader) {
   function parseSemver(v) {
     var semver = v.match(semverRegEx);
     if (!semver)
-      return;
-    return {
-      major: toInt(semver[1]),
-      minor: toInt(semver[2]),
-      patch: toInt(semver[3]),
-      pre: semver[4] && semver[4].split('.')
-    };
+      return {
+        tag: v
+      };
+    else
+      return {
+        major: toInt(semver[1]),
+        minor: toInt(semver[2]),
+        patch: toInt(semver[3]),
+        pre: semver[4] && semver[4].split('.')
+      };
   }
 
   var parts = ['major', 'minor', 'patch'];
   function semverCompareParsed(v1, v2) {
+    // not semvers - tags have equal precedence
+    if (v1.tag && v2.tag)
+      return 0;
+
+    // semver beats non-semver
+    if (v1.tag)
+      return -1;
+    if (v2.tag)
+      return 1;
+
     // compare version numbers
     for (var i = 0; i < parts.length; i++) {
       var part = parts[i];
@@ -1947,14 +1960,12 @@ function versions(loader) {
   // saves operation repetition
   // doesn't support tags
   // if not semver or fuzzy, assume exact
-  /*
-   * semver       - is this a semver range
-   * fuzzy        - is this a fuzzy range
-   * version      - the parsed version object
-   */
   function matchParsed(range, version) {
     var rangeVersion = range.version;
 
+    if (rangeVersion.tag)
+      return rangeVersion.tag == version.tag;
+
     // if the version is less than the range, it's not a match
     if (semverCompareParsed(rangeVersion, version) == 1)
       return false;
@@ -1993,6 +2004,11 @@ function versions(loader) {
     return !!(!rangeVersion.pre && rangeVersion.major == version.major && rangeVersion.minor == version.minor && rangeVersion.patch == version.patch);
   }
 
+  /*
+   * semver       - is this a semver range
+   * fuzzy        - is this a fuzzy range
+   * version      - the parsed version object
+   */
   function parseRange(range) {
     var rangeObj = {};
 
@@ -2002,6 +2018,9 @@ function versions(loader) {
 
     var rangeVersion = rangeObj.version = parseSemver(range);
 
+    if (rangeVersion.tag)
+      return rangeObj;
+
     // 0, 0.1 behave like ~0, ~0.1
     if (!rangeObj.fuzzy && !rangeObj.semver && (isNaN(rangeVersion.minor) || isNaN(rangeVersion.patch)))
       rangeObj.fuzzy = true;
@@ -2022,20 +2041,7 @@ function versions(loader) {
   }
 
   function semverCompare(v1, v2) {
-    var semver1 = parseSemver(v1);
-    var semver2 = parseSemver(v2);
-
-    // not semvers - just sort string tags
-    if (!semver1 && !semver2)
-      return v1 > v2 ? 1 : -1;
-
-    // semver beats non-semver
-    if (!semver1)
-      return -1;
-    if (!semver2)
-      return 1;
-
-    return semverCompareParsed(semver1, semver2);
+    return semverCompareParsed(parseSemver(v1), parseSemver(v2));
   }
 
   loader.versions = loader.versions || {};
@@ -2095,24 +2101,24 @@ function versions(loader) {
       var packageName = normalized.substr(0, index);
       var range = normalized.substr(index + 1).split('/')[0];
       var rangeLength = range.length;
-      var versionRange = parseRange(normalized.substr(index + 1).split('/')[0]);
+      var parsedRange = parseRange(normalized.substr(index + 1).split('/')[0]);
       versions = packageVersions[normalized.substr(0, index)] || [];
       if (typeof versions == 'string')
         versions = [versions];
 
       // find a match in our version list
       for (var i = versions.length - 1; i >= 0; i--) {
-        if (matchParsed(versionRange, parseSemver(versions[i])))
+        if (matchParsed(parsedRange, parseSemver(versions[i])))
           return packageName + '@' + versions[i] + normalized.substr(index + rangeLength + 1);
       }
 
       // no match found -> send a request to the server
       var versionRequest;
-      if (versionRange.semver) {
-        versionRequest = versionRange.version.major == 0 ? '0.' + versionRange.version.minor : versionRange.version.major;
+      if (parsedRange.semver) {
+        versionRequest = parsedRange.version.major == 0 ? '0.' + parsedRange.version.minor : parsedRange.version.major;
       }
-      else if (versionRange.fuzzy) {
-        versionRequest = versionRange.version.major + '.' + versionRange.version.minor;
+      else if (parsedRange.fuzzy) {
+        versionRequest = parsedRange.version.major + '.' + parsedRange.version.minor;
       }
       else {
         versionRequest = range;

diff --git a/dist/system.js b/dist/system.js
diff --git a/dist/system.js.map b/dist/system.js.map
diff --git a/dist/system.src.js b/dist/system.src.js
@@ -1,5 +1,5 @@
 /*
- * SystemJS v0.9.2
+ * SystemJS v0.9.3
  */
 
 (function($__global) {
@@ -1816,17 +1816,30 @@ function versions(loader) {
   function parseSemver(v) {
     var semver = v.match(semverRegEx);
     if (!semver)
-      return;
-    return {
-      major: toInt(semver[1]),
-      minor: toInt(semver[2]),
-      patch: toInt(semver[3]),
-      pre: semver[4] && semver[4].split('.')
-    };
+      return {
+        tag: v
+      };
+    else
+      return {
+        major: toInt(semver[1]),
+        minor: toInt(semver[2]),
+        patch: toInt(semver[3]),
+        pre: semver[4] && semver[4].split('.')
+      };
   }
 
   var parts = ['major', 'minor', 'patch'];
   function semverCompareParsed(v1, v2) {
+    // not semvers - tags have equal precedence
+    if (v1.tag && v2.tag)
+      return 0;
+
+    // semver beats non-semver
+    if (v1.tag)
+      return -1;
+    if (v2.tag)
+      return 1;
+
     // compare version numbers
     for (var i = 0; i < parts.length; i++) {
       var part = parts[i];
@@ -1881,14 +1894,12 @@ function versions(loader) {
   // saves operation repetition
   // doesn't support tags
   // if not semver or fuzzy, assume exact
-  /*
-   * semver       - is this a semver range
-   * fuzzy        - is this a fuzzy range
-   * version      - the parsed version object
-   */
   function matchParsed(range, version) {
     var rangeVersion = range.version;
 
+    if (rangeVersion.tag)
+      return rangeVersion.tag == version.tag;
+
     // if the version is less than the range, it's not a match
     if (semverCompareParsed(rangeVersion, version) == 1)
       return false;
@@ -1927,6 +1938,11 @@ function versions(loader) {
     return !!(!rangeVersion.pre && rangeVersion.major == version.major && rangeVersion.minor == version.minor && rangeVersion.patch == version.patch);
   }
 
+  /*
+   * semver       - is this a semver range
+   * fuzzy        - is this a fuzzy range
+   * version      - the parsed version object
+   */
   function parseRange(range) {
     var rangeObj = {};
 
@@ -1936,6 +1952,9 @@ function versions(loader) {
 
     var rangeVersion = rangeObj.version = parseSemver(range);
 
+    if (rangeVersion.tag)
+      return rangeObj;
+
     // 0, 0.1 behave like ~0, ~0.1
     if (!rangeObj.fuzzy && !rangeObj.semver && (isNaN(rangeVersion.minor) || isNaN(rangeVersion.patch)))
       rangeObj.fuzzy = true;
@@ -1956,20 +1975,7 @@ function versions(loader) {
   }
 
   function semverCompare(v1, v2) {
-    var semver1 = parseSemver(v1);
-    var semver2 = parseSemver(v2);
-
-    // not semvers - just sort string tags
-    if (!semver1 && !semver2)
-      return v1 > v2 ? 1 : -1;
-
-    // semver beats non-semver
-    if (!semver1)
-      return -1;
-    if (!semver2)
-      return 1;
-
-    return semverCompareParsed(semver1, semver2);
+    return semverCompareParsed(parseSemver(v1), parseSemver(v2));
   }
 
   loader.versions = loader.versions || {};
@@ -2029,24 +2035,24 @@ function versions(loader) {
       var packageName = normalized.substr(0, index);
       var range = normalized.substr(index + 1).split('/')[0];
       var rangeLength = range.length;
-      var versionRange = parseRange(normalized.substr(index + 1).split('/')[0]);
+      var parsedRange = parseRange(normalized.substr(index + 1).split('/')[0]);
       versions = packageVersions[normalized.substr(0, index)] || [];
       if (typeof versions == 'string')
         versions = [versions];
 
       // find a match in our version list
       for (var i = versions.length - 1; i >= 0; i--) {
-        if (matchParsed(versionRange, parseSemver(versions[i])))
+        if (matchParsed(parsedRange, parseSemver(versions[i])))
           return packageName + '@' + versions[i] + normalized.substr(index + rangeLength + 1);
       }
 
       // no match found -> send a request to the server
       var versionRequest;
-      if (versionRange.semver) {
-        versionRequest = versionRange.version.major == 0 ? '0.' + versionRange.version.minor : versionRange.version.major;
+      if (parsedRange.semver) {
+        versionRequest = parsedRange.version.major == 0 ? '0.' + parsedRange.version.minor : parsedRange.version.major;
       }
-      else if (versionRange.fuzzy) {
-        versionRequest = versionRange.version.major + '.' + versionRange.version.minor;
+      else if (parsedRange.fuzzy) {
+        versionRequest = parsedRange.version.major + '.' + parsedRange.version.minor;
       }
       else {
         versionRequest = range;

diff --git a/lib/banner.js b/lib/banner.js
@@ -1,4 +1,4 @@
 /*
- * SystemJS v0.9.2
+ * SystemJS v0.9.3
  */