fix a regression with TMX map loading relatrd to a semver version comparaison issue

Author: obiot

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [16.1.3] (melonJS 2) - _2024-02-13_
+
+### Fixed
+- Loader: fix a regression with TMX map loading related to a semver version comparaison (`compare()` requires a "x.y.z" version format)
+
 ## [16.1.2] (melonJS 2) - _2024-02-12_
 
 ### Fixed
@@ -747,7 +752,8 @@
 
 -------------------------------------------------------------------------------
 
-[16.1.0]: https://github.com/melonjs/melonJS/compare/16.1.1...16.1.2
+[16.1.3]: https://github.com/melonjs/melonJS/compare/16.1.2...16.1.3
+[16.1.2]: https://github.com/melonjs/melonJS/compare/16.1.1...16.1.2
 [16.1.1]: https://github.com/melonjs/melonJS/compare/16.2.0...16.1.1
 [16.1.0]: https://github.com/melonjs/melonJS/compare/16.0.0...16.1.0
 [16.0.0]: https://github.com/melonjs/melonJS/compare/15.15.0...16.0.0

src/utils/utils.js

@@ -33,6 +33,17 @@ let GUID_index = 0;
  * }
  */
 export function checkVersion(v1, v2) {
+    // Convert to proper "x.y.z" format if necessary
+    if (/^\d+$/.test(v1)) {
+        v1 += ".0.0";
+    } else if (/^\d+\.\d+$/.test(v1)) {
+        v1 += ".0";
+    }
+    if (/^\d+$/.test(v2)) {
+        v2 += ".0.0";
+    } else if (/^\d+\.\d+$/.test(v2)) {
+        v2 += ".0";
+    }
     return compare(v1, v2);
 }
 

tests/browser/spec/utils-spec.js

@@ -165,9 +165,18 @@ describe("utils", function () {
             // < 0 if the second string is greater 
             // === 0 if the strings are equal
             expect(me.utils.checkVersion("15.13.0", "15.12.0") > 0).toEqual(true);
+            expect(me.utils.checkVersion("15.13", "15.12.0") > 0).toEqual(true);
+            expect(me.utils.checkVersion("16", "15.12.0") > 0).toEqual(true);
+            expect(me.utils.checkVersion("16", "15") > 0).toEqual(true);
             expect(me.utils.checkVersion("7.0.0", "15.5.0") < 0).toEqual(true);
             expect(me.utils.checkVersion("15.12.0", "15.12.0") === 0).toEqual(true);
+            expect(me.utils.checkVersion("15.12.0", "15.12") === 0).toEqual(true);
+            expect(me.utils.checkVersion("15.0.0", "15.0") === 0).toEqual(true);
+            expect(me.utils.checkVersion("15.0.0", "15") === 0).toEqual(true);
             expect(me.utils.checkVersion("15.12.1", "16.1.1") < 0).toEqual(true);
+            expect(me.utils.checkVersion("15.12.1", "16.1") < 0).toEqual(true);
+            expect(me.utils.checkVersion("15.12.1", "16") < 0).toEqual(true);
+            expect(me.utils.checkVersion("15", "16") < 0).toEqual(true);
         });
     });
 });