fix: Fix .x version range to work correctly

liquidz · Sep 9, 2023 · 511b6aa · 511b6aa
1 parent 4cd7c88
commit 511b6aa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/antq/util/ver.clj b/src/antq/util/ver.clj
@@ -64,7 +64,7 @@
                (str/replace "+" "\\+")
                (str/replace "?" "\\?")
                ;; .x
-               (str/replace "\\.x" "\\.+")
+               (str/replace "\\.x" "\\.\\d+")
                ;; *
                (str/replace "*" ".*")
                (->> (str "^"))

diff --git a/test/antq/util/ver_test.clj b/test/antq/util/ver_test.clj
@@ -80,4 +80,10 @@
     (t/is (true? (sut/in-range? "*" "2.0.0")))
 
     (t/is (false? (sut/in-range? "1.0.*" "1.1.0")))
-    (t/is (false? (sut/in-range? "1.0*" "1.1.0")))))
+    (t/is (false? (sut/in-range? "1.0*" "1.1.0"))))
+
+  (t/testing "combination"
+    (t/is (true? (sut/in-range? "1.0.x-alpha*" "1.0.0-alpha1")))
+
+    (t/is (false? (sut/in-range? "1.0.x-alpha*" "1.0.0-bata1")))
+    (t/is (false? (sut/in-range? "1.0.x-alpha*" "1.1.0-alpha1")))))