feat(vim.version): more coercion with strict=false

Problem:
"tmux 3.2a" (output from "tmux -V") is not parsed easily.

Solution:
With `strict=false`, discard everything before the first digit.

- rename Semver => Version
- rename vim.version.version() => vim.version._version()
- rename matches() => has()
- remove `opts` from cmp()

1 files changed, 54 insertions, 79 deletions

diff --git a/test/functional/lua/version_spec.lua b/test/functional/lua/version_spec.lua
index 2fb02795b2..014fea5272 100644
--- a/test/functional/lua/version_spec.lua
+++ b/test/functional/lua/version_spec.lua
@@ -6,11 +6,8 @@ local exec_lua = helpers.exec_lua
 local matches = helpers.matches
 local pcall_err = helpers.pcall_err
 
-local version = require('vim.version')
-local Semver = version.LazyM
-
 local function v(ver)
-  return Semver.version(ver)
+  return vim.version._version(ver)
 end
 
 describe('version', function()
@@ -20,13 +17,13 @@ describe('version', function()
     eq({ major = 42, minor = 3, patch = 99 }, exec_lua("return vim.version.parse('v42.3.99')"))
   end)
 
-  describe('lazy semver version', function()
+  describe('_version()', function()
     local tests = {
       ['v1.2.3'] = { major = 1, minor = 2, patch = 3 },
       ['v1.2'] = { major = 1, minor = 2, patch = 0 },
       ['v1.2.3-prerelease'] = { major = 1, minor = 2, patch = 3, prerelease = 'prerelease' },
       ['v1.2-prerelease'] = { major = 1, minor = 2, patch = 0, prerelease = 'prerelease' },
-      ['v1.2.3-prerelease+build'] = { major = 1, minor = 2, patch = 3, prerelease = 'prerelease', build = "build" },
+      ['v1.2.3-prerelease+build'] = { major = 1, minor = 2, patch = 3, prerelease = 'prerelease', build = 'build' },
       ['1.2.3+build'] = { major = 1, minor = 2, patch = 3, build = 'build' },
     }
     for input, output in pairs(tests) do
@@ -36,7 +33,7 @@ describe('version', function()
     end
   end)
 
-  describe('lazy semver range', function()
+  describe('range', function()
     local tests = {
       ['1.2.3'] = { from = { 1, 2, 3 }, to = { 1, 2, 4 } },
       ['1.2'] = { from = { 1, 2, 0 }, to = { 1, 3, 0 } },
@@ -64,51 +61,34 @@ describe('version', function()
     for input, output in pairs(tests) do
       output.from = v(output.from)
       output.to = output.to and v(output.to)
+      local range = vim.version.range(input)
 
-      local range = Semver.range(input)
       it('parses ' .. input, function()
         eq(output, range)
       end)
 
       it('[from] in range ' .. input, function()
-        assert(range:matches(output.from))
+        assert(range:has(output.from))
       end)
 
       it('[from-1] not in range ' .. input, function()
         local lower = vim.deepcopy(range.from)
         lower.major = lower.major - 1
-        assert(not range:matches(lower))
+        assert(not range:has(lower))
       end)
 
-      it('[to] not in range ' .. input .. ' to:' .. tostring(range and range.to), function()
+      it('[to] not in range ' .. input .. ' to:' .. tostring(range.to), function()
         if range.to then
           assert(not (range.to < range.to))
-          assert(not range:matches(range.to))
+          assert(not range:has(range.to))
         end
       end)
     end
 
-    it("handles prerelease", function()
-      assert(not Semver.range('1.2.3'):matches('1.2.3-alpha'))
-      assert(Semver.range('1.2.3-alpha'):matches('1.2.3-alpha'))
-      assert(not Semver.range('1.2.3-alpha'):matches('1.2.3-beta'))
-    end)
-  end)
-
-  describe('lazy semver order', function()
-    it('is correct', function()
-      assert(v('v1.2.3') == v('1.2.3'))
-      assert(not (v('v1.2.3') < v('1.2.3')))
-      assert(v('v1.2.3') > v('1.2.3-prerelease'))
-      assert(v('v1.2.3-alpha') < v('1.2.3-beta'))
-      assert(v('v1.2.3-prerelease') < v('1.2.3'))
-      assert(v('v1.2.3') >= v('1.2.3'))
-      assert(v('v1.2.3') >= v('1.0.3'))
-      assert(v('v1.2.3') >= v('1.2.2'))
-      assert(v('v1.2.3') > v('1.2.2'))
-      assert(v('v1.2.3') > v('1.0.3'))
-      eq(version.last({ v('1.2.3'), v('2.0.0') }), v('2.0.0'))
-      eq(version.last({ v('2.0.0'), v('1.2.3') }), v('2.0.0'))
+    it('handles prerelease', function()
+      assert(not vim.version.range('1.2.3'):has('1.2.3-alpha'))
+      assert(vim.version.range('1.2.3-alpha'):has('1.2.3-alpha'))
+      assert(not vim.version.range('1.2.3-alpha'):has('1.2.3-beta'))
     end)
   end)
 
@@ -143,12 +123,11 @@ describe('version', function()
       { v1 = '1.0.0-beta.11',    v2 = '1.0.0-rc.1',       want = -1, },
     }
     for _, tc in ipairs(testcases) do
-      local want = ('v1 %s v2'):format(tc.want == 0 and '==' or (tc.want == 1 and '>' or '<'))
+      local msg = function(s) return ('v1 %s v2'):format(s == 0 and '==' or (s == 1 and '>' or '<')) end
       it(string.format('(v1 = %s, v2 = %s)', tc.v1, tc.v2),
         function()
-          local rv = version.cmp(tc.v1, tc.v2, { strict = true })
-          local got = ('v1 %s v2'):format(rv == 0 and '==' or (rv == 1 and '>' or '<'))
-          ok(tc.want == rv, want, got)
+          local rv = vim.version.cmp(tc.v1, tc.v2, { strict = true })
+          ok(tc.want == rv, msg(tc.want), msg(rv))
         end
       )
     end
@@ -157,47 +136,19 @@ describe('version', function()
   describe('parse()', function()
     describe('strict=true', function()
       local testcases = {
-        {
-          desc = 'Nvim version',
-          version = 'v0.9.0-dev-1233+g210120dde81e',
-          want = { major = 0, minor = 9, patch = 0, prerelease = 'dev-1233', build = 'g210120dde81e', },
-        },
-        {
-          desc = 'no leading v',
-          version = '10.20.123',
-          want = { major = 10, minor = 20, patch = 123, prerelease = nil, build = nil, },
-        },
-        {
-          desc = 'leading v',
-          version = 'v1.2.3',
-          want = { major = 1, minor = 2, patch = 3 },
-        },
-        {
-          desc = 'prerelease',
-          version = '1.2.3-alpha',
-          want = { major = 1, minor = 2, patch = 3, prerelease = 'alpha' },
-        },
-        {
-          desc = 'prerelease and other identifiers',
-          version = '1.2.3-alpha.1',
-          want = { major = 1, minor = 2, patch = 3, prerelease = 'alpha.1' },
-        },
-        {
-          desc = 'build',
-          version = '1.2.3+build.15',
-          want = { major = 1, minor = 2, patch = 3, build = 'build.15' },
-        },
-        {
-          desc = 'prerelease and build',
-          version = '1.2.3-rc1+build.15',
-          want = { major = 1, minor = 2, patch = 3, prerelease = 'rc1', build = 'build.15', },
-        },
+        { desc = 'Nvim version',         version = 'v0.9.0-dev-1233+g210120dde81e', want = { major = 0, minor = 9, patch = 0, prerelease = 'dev-1233', build = 'g210120dde81e', }, },
+        { desc = 'no v',                 version = '10.20.123', want = { major = 10, minor = 20, patch = 123, prerelease = nil, build = nil, }, },
+        { desc = 'with v',               version = 'v1.2.3', want = { major = 1, minor = 2, patch = 3 }, },
+        { desc = 'prerelease',           version = '1.2.3-alpha', want = { major = 1, minor = 2, patch = 3, prerelease = 'alpha' }, },
+        { desc = 'prerelease.x',         version = '1.2.3-alpha.1', want = { major = 1, minor = 2, patch = 3, prerelease = 'alpha.1' }, },
+        { desc = 'build.x',              version = '1.2.3+build.15', want = { major = 1, minor = 2, patch = 3, build = 'build.15' }, },
+        { desc = 'prerelease and build', version = '1.2.3-rc1+build.15', want = { major = 1, minor = 2, patch = 3, prerelease = 'rc1', build = 'build.15', }, },
       }
       for _, tc in ipairs(testcases) do
         it(
           string.format('%q: version = %q', tc.desc, tc.version),
           function()
-            eq(tc.want, version.parse(tc.version))
+            eq(tc.want, vim.version.parse(tc.version))
           end
         )
       end
@@ -211,12 +162,13 @@ describe('version', function()
         { version = '1-1.0',    want = { major = 1, minor = 0, patch = 0, prerelease = '1.0' }, },
         { version = 'v1.2.3  ', want = { major = 1, minor = 2, patch = 3 }, },
         { version = '  v1.2.3', want = { major = 1, minor = 2, patch = 3 }, },
+        { version = 'tmux 3.2a', want = { major = 3, minor = 2, patch = 0, }, },
       }
       for _, tc in ipairs(testcases) do
         it(
           string.format('version = %q', tc.version),
           function()
-            eq(tc.want, version.parse(tc.version, { strict = false }))
+            eq(tc.want, vim.version.parse(tc.version, { strict = false }))
           end
         )
       end
@@ -236,6 +188,8 @@ describe('version', function()
         { version = '1.2.3-%?' },
         { version = '1.2.3+%?' },
         { version = '1.2.3+build.0-rc1' },
+        { version = '3.2a', },
+        { version = 'tmux 3.2a', },
       }
 
       local function quote_empty(s)
@@ -244,7 +198,7 @@ describe('version', function()
 
       for _, tc in ipairs(testcases) do
         it(quote_empty(tc.version), function()
-          eq(nil, version.parse(tc.version, { strict = true }))
+          eq(nil, vim.version.parse(tc.version, { strict = true }))
         end)
       end
     end)
@@ -261,21 +215,42 @@ describe('version', function()
         it(string.format('(%s): %s', tc.desc, tostring(tc.version)), function()
           local expected = string.format(type(tc.version) == 'string'
             and 'invalid version: "%s"' or 'invalid version: %s', tostring(tc.version))
-          matches(expected, pcall_err(version.parse, tc.version, { strict = true }))
+          matches(expected, pcall_err(vim.version.parse, tc.version, { strict = true }))
         end)
       end
     end)
   end)
 
+  it('relational metamethods (== < >)', function()
+    assert(v('v1.2.3') == v('1.2.3'))
+    assert(not (v('v1.2.3') < v('1.2.3')))
+    assert(v('v1.2.3') > v('1.2.3-prerelease'))
+    assert(v('v1.2.3-alpha') < v('1.2.3-beta'))
+    assert(v('v1.2.3-prerelease') < v('1.2.3'))
+    assert(v('v1.2.3') >= v('1.2.3'))
+    assert(v('v1.2.3') >= v('1.0.3'))
+    assert(v('v1.2.3') >= v('1.2.2'))
+    assert(v('v1.2.3') > v('1.2.2'))
+    assert(v('v1.2.3') > v('1.0.3'))
+    eq(vim.version.last({ v('1.2.3'), v('2.0.0') }), v('2.0.0'))
+    eq(vim.version.last({ v('2.0.0'), v('1.2.3') }), v('2.0.0'))
+  end)
+
   it('lt()', function()
-    eq(true, version.lt('1', '2'))
+    eq(true, vim.version.lt('1', '2'))
+    eq(false, vim.version.lt({3}, {0, 7, 4}))
+    eq(false, vim.version.lt({major=3, minor=3, patch=0}, {3, 2, 0}))
   end)
 
   it('gt()', function()
-    eq(true, version.gt('2', '1'))
+    eq(true, vim.version.gt('2', '1'))
+    eq(true, vim.version.gt({3}, {0, 7, 4}))
+    eq(true, vim.version.gt({major=3, minor=3, patch=0}, {3, 2, 0}))
   end)
 
   it('eq()', function()
-    eq(true, version.eq('2', '2'))
+    eq(true, vim.version.eq('2', '2'))
+    eq(true, vim.version.eq({3, 1, 0}, '3.1.0'))
+    eq(true, vim.version.eq({major=3, minor=3, patch=0}, {3, 3, 0}))
   end)
 end)