1 files changed, 31 insertions, 22 deletions

diff --git a/src/luarocks/cmd/new_version.lua b/src/luarocks/cmd/new_version.tl
index ccba9335..d5da0e86 100644
--- a/src/luarocks/cmd/new_version.lua
+++ b/src/luarocks/cmd/new_version.tl
@@ -1,7 +1,8 @@
 
 --- Module implementing the LuaRocks "new_version" command.
 -- Utility function that writes a new rockspec, updating data from a previous one.
-local new_version = {}
+local record new_version
+end
 
 local util = require("luarocks.util")
 local download = require("luarocks.download")
@@ -11,7 +12,15 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local type_rockspec = require("luarocks.type.rockspec")
 
-function new_version.add_to_parser(parser)
+local type Parser = require("luarocks.vendor.argparse").Parser
+
+local type Args = require("luarocks.core.types.args").Args
+
+local type PersistableTable = require("luarocks.core.types.persist").PersistableTable
+
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
+
+function new_version.add_to_parser(parser: Parser)
    local cmd = parser:command("new_version", [[
 This is a utility function that writes a new rockspec, updating data from a
 previous one.
@@ -51,7 +60,7 @@ if it already exists.]], util.see_also())
 end
 
 
-local function try_replace(tbl, field, old, new)
+local function try_replace(tbl: {string: string}, field: string, old: string, new: string): boolean
    if not tbl[field] then
       return false
    end
@@ -69,7 +78,7 @@ end
 -- If it specified MD5, update it.
 -- @return (true, false) if MD5 was not specified or it stayed same,
 -- (true, true) if MD5 changed, (nil, string) on error.
-local function check_url_and_update_md5(out_rs, invalid_is_error)
+local function check_url_and_update_md5(out_rs: Rockspec, invalid_is_error?: boolean): boolean, string | boolean --!
    local file, temp_dir = fetch.fetch_url_at_temp_dir(out_rs.source.url, "luarocks-new-version-"..out_rs.package)
    if not file then
       if invalid_is_error then
@@ -105,7 +114,7 @@ local function check_url_and_update_md5(out_rs, invalid_is_error)
    end
 end
 
-local function update_source_section(out_rs, url, tag, old_ver, new_ver)
+local function update_source_section(out_rs: Rockspec, url: string, tag: string, old_ver: string, new_ver: string): boolean, string | boolean
    if tag then
       out_rs.source.tag = tag
    end
@@ -117,21 +126,21 @@ local function update_source_section(out_rs, url, tag, old_ver, new_ver)
       return true
    end
    if out_rs.source.dir then
-      try_replace(out_rs.source, "dir", old_ver, new_ver)
+      try_replace(out_rs.source as {string: string}, "dir", old_ver, new_ver)
    end
    if out_rs.source.file then
-      try_replace(out_rs.source, "file", old_ver, new_ver)
+      try_replace(out_rs.source as {string: string}, "file", old_ver, new_ver)
    end
 
    local old_url = out_rs.source.url
-   if try_replace(out_rs.source, "url", old_ver, new_ver) then
+   if try_replace(out_rs.source as {string: string}, "url", old_ver, new_ver) then
       local ok, md5_changed = check_url_and_update_md5(out_rs, true)
       if ok then
          return ok, md5_changed
       end
       out_rs.source.url = old_url
    end
-   if tag or try_replace(out_rs.source, "tag", old_ver, new_ver) then
+   if tag or try_replace(out_rs.source as {string: string}, "tag", old_ver, new_ver) then
       return true
    end
    -- Couldn't replace anything significant, use the old URL.
@@ -145,23 +154,23 @@ local function update_source_section(out_rs, url, tag, old_ver, new_ver)
    return true
 end
 
-function new_version.command(args)
+function new_version.command(args: Args): boolean, string | boolean
    if not args.rock then
-      local err
+      local err: string
       args.rock, err = util.get_default_rockspec()
       if not args.rock then
          return nil, err
       end
    end
 
-   local filename, err
+   local filename, err: string, string
    if args.rock:match("rockspec$") then
       filename, err = fetch.fetch_url(args.rock)
       if not filename then
          return nil, err
       end
    else
-      filename, err = download.download("rockspec", args.rock:lower())
+      filename, err = download.download_file("rockspec", args.rock:lower())
       if not filename then
          return nil, err
       end
@@ -173,33 +182,33 @@ function new_version.command(args)
    end
 
    local old_ver, old_rev = valid_rs.version:match("(.*)%-(%d+)$")
-   local new_ver, new_rev
+   local new_ver, new_rev_str, new_rev: string, string, integer
 
    if args.tag and not args.new_version then
       args.new_version = args.tag:gsub("^v", "")
    end
 
-   local out_dir
+   local out_dir: string
    if args.dir then
       out_dir = dir.normalize(args.dir)
    end
 
    if args.new_version then
-      new_ver, new_rev = args.new_version:match("(.*)%-(%d+)$")
-      new_rev = tonumber(new_rev)
+      new_ver, new_rev_str = args.new_version:match("(.*)%-(%d+)$")
+      new_rev = math.tointeger(new_rev_str)
       if not new_rev then
          new_ver = args.new_version
          new_rev = 1
       end
    else
       new_ver = old_ver
-      new_rev = tonumber(old_rev) + 1
+      new_rev = math.tointeger(old_rev) + 1
    end
    local new_rockver = new_ver:gsub("-", "")
 
-   local out_rs, err = persist.load_into_table(filename)
+   local out_rs, err = persist.load_into_table(filename) as Rockspec, string
    local out_name = out_rs.package:lower()
-   out_rs.version = new_rockver.."-"..new_rev
+   out_rs.version = new_rockver.."-"..tostring(new_rev)
 
    local ok, err = update_source_section(out_rs, args.new_url, args.tag, old_ver, new_ver)
    if not ok then return nil, err end
@@ -208,12 +217,12 @@ function new_version.command(args)
       out_rs.build.type = "builtin"
    end
 
-   local out_filename = out_name.."-"..new_rockver.."-"..new_rev..".rockspec"
+   local out_filename = out_name.."-"..new_rockver.."-"..tostring(new_rev)..".rockspec"
    if out_dir then
       out_filename = dir.path(out_dir, out_filename)
       fs.make_dir(out_dir)
    end
-   persist.save_from_table(out_filename, out_rs, type_rockspec.order)
+   persist.save_from_table(out_filename, out_rs as PersistableTable, type_rockspec.order)
 
    util.printout("Wrote "..out_filename)