cmd

23 files changed, 311 insertions, 137 deletions

diff --git a/src/luarocks/cmd/build.tl b/src/luarocks/cmd/build.tl
index 13577c1a..9ec58c3e 100644
--- a/src/luarocks/cmd/build.tl
+++ b/src/luarocks/cmd/build.tl
@@ -54,7 +54,7 @@ function cmd_build.add_to_parser(parser: Parser)
       "versions of each dependency found for this rock (recursively), "..
       "and store it in the rock's directory. "..
       "Ignores any existing luarocks.lock file in the rock's sources.")
-   make.cmd_options(cmd) --!
+   make.cmd_options(cmd as Parser)
 end
 
 --- Build and install a rock.
diff --git a/src/luarocks/cmd/init.tl b/src/luarocks/cmd/init.tl
index 5223d01c..df365b75 100644
--- a/src/luarocks/cmd/init.tl
+++ b/src/luarocks/cmd/init.tl
@@ -38,7 +38,7 @@ function init.add_to_parser(parser: Parser)
    cmd:flag("--no-wrapper-scripts", "Do not generate wrapper ./lua and ./luarocks launcher scripts.")
    cmd:flag("--no-gitignore", "Do not generate a .gitignore file.")
 
-   cmd:group("Options for specifying rockspec data", write_rockspec.cmd_options(cmd)) --!
+   cmd:group("Options for specifying rockspec data", write_rockspec.cmd_options(cmd as Parser))
 end
 
 local function gitignore_path(pwd: string, wrapper_dir: string, filename: string): string
diff --git a/src/luarocks/cmd/install.tl b/src/luarocks/cmd/install.tl
index db72c77d..40f6c782 100644
--- a/src/luarocks/cmd/install.tl
+++ b/src/luarocks/cmd/install.tl
@@ -54,7 +54,7 @@ function install.add_to_parser(parser: Parser)
       "option to work properly.")
    cmd:flag("--check-lua-versions", "If the rock can't be found, check repository "..
       "and report if it is available for another Lua version.")
-   util.deps_mode_option(cmd)  --!
+   util.deps_mode_option(cmd as Parser)
    cmd:flag("--no-manifest", "Skip creating/updating the manifest")
    cmd:flag("--pin", "If the installed rock is a Lua module, create a "..
       "luarocks.lock file listing the exact versions of each dependency found for "..
diff --git a/src/luarocks/cmd/list.tl b/src/luarocks/cmd/list.tl
index 56f4de02..558ea09a 100644
--- a/src/luarocks/cmd/list.tl
+++ b/src/luarocks/cmd/list.tl
@@ -2,6 +2,12 @@
 --- Module implementing the LuaRocks "list" command.
 -- Lists currently installed rocks.
 local record list
+   record Outdated
+      name: string
+      installed: string
+      available: string
+      repo: string
+   end
 end
 
 local search = require("luarocks.search")
@@ -11,33 +17,21 @@ local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local path = require("luarocks.path")
 
+local type Outdated = list.Outdated
+
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
-local type Option = argparse.Option
 
 local type a = require("luarocks.core.types.args")
 local type Args = a.Args
 
-local type bo = require("luarocks.core.types.bopts")
-local type BOpts = bo.BOpts
-
-local type i = require("luarocks.core.types.installs")
-local type IOpts = i.IOpts
-
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
-
 local type t = require("luarocks.core.types.tree")
 local type Tree = t.Tree
 
-local type b = require("luarocks.core.types.build")
-local type BuiltinBuild = b.BuiltinBuild
-
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
-local type Dependencies = r.Dependencies
+local type q = require("luarocks.core.types.query")
+local type Query = q.Query
 
-function list.add_to_parser(parser)
+function list.add_to_parser(parser: Parser)
    local cmd = parser:command("list", "List currently installed rocks.", util.see_also())
 
    cmd:argument("filter", "A substring of a rock name to filter by.")
@@ -50,19 +44,19 @@ function list.add_to_parser(parser)
    cmd:flag("--porcelain", "Produce machine-friendly output.")
 end
 
-local function check_outdated(trees, query)
+local function check_outdated(trees: {string | Tree}, query: Query): {Outdated}
    local results_installed = {}
    for _, tree in ipairs(trees) do
       search.local_manifest_search(results_installed, path.rocks_dir(tree), query)
    end
-   local outdated = {}
+   local outdated: {Outdated} = {}
    for name, versions in util.sortedpairs(results_installed) do
-      versions = util.keys(versions)
-      table.sort(versions, vers.compare_versions)
-      local latest_installed = versions[1]
+      local versionsk = util.keys(versions)
+      table.sort(versionsk, vers.compare_versions)
+      local latest_installed = versionsk[1]
 
       local query_available = queries.new(name:lower())
-      local results_available, err = search.search_repos(query_available)
+      local results_available = search.search_repos(query_available)
 
       if results_available[name] then
          local available_versions = util.keys(results_available[name])
@@ -71,14 +65,14 @@ local function check_outdated(trees, query)
          local latest_available_repo = results_available[name][latest_available][1].repo
 
          if vers.compare_versions(latest_available, latest_installed) then
-            table.insert(outdated, { name = name, installed = latest_installed, available = latest_available, repo = latest_available_repo })
+            table.insert(outdated, { name = name, installed = latest_installed, available = latest_available, repo = latest_available_repo } as Outdated)
          end
       end
    end
    return outdated
 end
 
-local function list_outdated(trees, query, porcelain)
+local function list_outdated(trees: {string | Tree}, query: Query, porcelain: boolean): boolean
    util.title("Outdated rocks:", porcelain)
    local outdated = check_outdated(trees, query)
    for _, item in ipairs(outdated) do
@@ -95,7 +89,7 @@ end
 
 --- Driver function for "list" command.
 -- @return boolean: True if succeeded, nil on errors.
-function list.command(args)
+function list.command(args: Args): boolean, string
    local query = queries.new(args.filter and args.filter:lower() or "", args.namespace, args.version, true)
    local trees = cfg.rocks_trees
    local title = "Rocks installed for Lua "..cfg.lua_version
diff --git a/src/luarocks/cmd/make.tl b/src/luarocks/cmd/make.tl
index ab6c83da..f151c950 100644
--- a/src/luarocks/cmd/make.tl
+++ b/src/luarocks/cmd/make.tl
@@ -81,7 +81,7 @@ overrides and recreates this file scanning dependency based on ranges.
    cmd:argument("rockspec", "Rockspec for the rock to build.")
       :args("?")
 
-   make.cmd_options(cmd) --!
+   make.cmd_options(cmd as Parser) --!
 end
 
 --- Driver function for "make" command.
diff --git a/src/luarocks/cmd/new_version.tl b/src/luarocks/cmd/new_version.tl
index 2ec084e0..d61cb48b 100644
--- a/src/luarocks/cmd/new_version.tl
+++ 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,19 @@ 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 argparse = require("luarocks.vendor.argparse")
+local type Parser = argparse.Parser
+
+local type a = require("luarocks.core.types.args")
+local type Args = a.Args
+
+local type p = require("luarocks.core.types.persist")
+local type PersistableTable = p.PersistableTable
+
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.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 +64,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 +82,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 +118,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 +130,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,16 +158,16 @@ 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
@@ -173,13 +186,13 @@ 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: string, string
 
    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
@@ -197,7 +210,7 @@ function new_version.command(args)
    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
 
@@ -213,7 +226,7 @@ function new_version.command(args)
       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)
 
diff --git a/src/luarocks/cmd/pack.tl b/src/luarocks/cmd/pack.tl
index 29a43e7b..0baaab10 100644
--- a/src/luarocks/cmd/pack.tl
+++ b/src/luarocks/cmd/pack.tl
@@ -1,13 +1,20 @@
 
 --- Module implementing the LuaRocks "pack" command.
 -- Creates a rock, packing sources or binaries.
-local cmd_pack = {}
+local record cmd_pack
+end
 
 local util = require("luarocks.util")
 local pack = require("luarocks.pack")
 local queries = require("luarocks.queries")
 
-function cmd_pack.add_to_parser(parser)
+local argparse = require("luarocks.vendor.argparse")
+local type Parser = argparse.Parser
+
+local type a = require("luarocks.core.types.args")
+local type Args = a.Args
+
+function cmd_pack.add_to_parser(parser: Parser)
    local cmd = parser:command("pack", "Create a rock, packing sources or binaries.", util.see_also())
 
    cmd:argument("rock", "A rockspec file, for creating a source rock, or the "..
@@ -22,8 +29,8 @@ end
 --- Driver function for the "pack" command.
 -- @return boolean or (nil, string): true if successful or nil followed
 -- by an error message.
-function cmd_pack.command(args)
-   local file, err
+function cmd_pack.command(args: Args): boolean, string
+   local file, err: string, string
    if args.rock:match(".*%.rockspec") then
       file, err = pack.pack_source_rock(args.rock)
    else
diff --git a/src/luarocks/cmd/path.tl b/src/luarocks/cmd/path.tl
index ba346550..082c96bf 100644
--- a/src/luarocks/cmd/path.tl
+++ b/src/luarocks/cmd/path.tl
@@ -1,13 +1,20 @@
 
 --- @module luarocks.path_cmd
 -- Driver for the `luarocks path` command.
-local path_cmd = {}
+local record path_cmd
+end
 
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 local fs = require("luarocks.fs")
 
-function path_cmd.add_to_parser(parser)
+local argparse = require("luarocks.vendor.argparse")
+local type Parser = argparse.Parser
+
+local type a = require("luarocks.core.types.args")
+local type Args = a.Args
+
+function path_cmd.add_to_parser(parser: Parser)
    local cmd = parser:command("path", [[
 Returns the package path currently configured for this installation
 of LuaRocks, formatted as shell commands to update LUA_PATH and LUA_CPATH.
@@ -38,7 +45,7 @@ end
 
 --- Driver function for "path" command.
 -- @return boolean This function always succeeds.
-function path_cmd.command(args)
+function path_cmd.command(args: Args): boolean, string
    local lr_path, lr_cpath, lr_bin = cfg.package_paths(args.tree)
    local path_sep = cfg.export_path_separator
 
diff --git a/src/luarocks/cmd/purge.tl b/src/luarocks/cmd/purge.tl
index fda8ab88..b83f8e52 100644
--- a/src/luarocks/cmd/purge.tl
+++ b/src/luarocks/cmd/purge.tl
@@ -1,7 +1,9 @@
 
 --- Module implementing the LuaRocks "purge" command.
 -- Remove all rocks from a given tree.
-local purge = {}
+local record purge
+   needs_lock: function(Args): boolean
+end
 
 local util = require("luarocks.util")
 local path = require("luarocks.path")
@@ -12,7 +14,14 @@ local cfg = require("luarocks.core.cfg")
 local remove = require("luarocks.remove")
 local queries = require("luarocks.queries")
 
-function purge.add_to_parser(parser)
+local argparse = require("luarocks.vendor.argparse")
+local type Parser = argparse.Parser
+
+local type args = require("luarocks.core.types.args")
+local type Args = args.Args
+
+
+function purge.add_to_parser(parser: Parser)
    -- luacheck: push ignore 431
    local cmd = parser:command("purge", [[
 This command removes rocks en masse from a given tree.
@@ -33,13 +42,13 @@ The --tree option is mandatory: luarocks purge does not assume a default tree.]]
       "without reporting dependency issues.")
 end
 
-function purge.command(args)
+function purge.command(args: Args): boolean, string
    local tree = args.tree
 
    local results = {}
    search.local_manifest_search(results, path.rocks_dir(tree), queries.all())
 
-   local sort = function(a,b) return vers.compare_versions(b,a) end
+   local sort = function(a: string,b: string): boolean return vers.compare_versions(b,a) end
    if args.old_versions then
       sort = vers.compare_versions
    end
@@ -67,6 +76,6 @@ function purge.command(args)
    return repo_writer.refresh_manifest(cfg.rocks_dir)
 end
 
-purge.needs_lock = function() return true end
+purge.needs_lock = function(): boolean return true end
 
 return purge
diff --git a/src/luarocks/cmd/remove.tl b/src/luarocks/cmd/remove.tl
index 630303ca..4dbef645 100644
--- a/src/luarocks/cmd/remove.tl
+++ b/src/luarocks/cmd/remove.tl
@@ -1,7 +1,9 @@
 
 --- Module implementing the LuaRocks "remove" command.
 -- Uninstalls rocks.
-local cmd_remove = {}
+local record cmd_remove
+   needs_lock: function(Args): boolean
+end
 
 local remove = require("luarocks.remove")
 local util = require("luarocks.util")
@@ -11,7 +13,13 @@ local path = require("luarocks.path")
 local deps = require("luarocks.deps")
 local queries = require("luarocks.queries")
 
-function cmd_remove.add_to_parser(parser)
+local argparse = require("luarocks.vendor.argparse")
+local type Parser = argparse.Parser
+
+local type a = require("luarocks.core.types.args")
+local type Args = a.Args
+
+function cmd_remove.add_to_parser(parser: Parser)
    -- luacheck: push ignore 431
    local cmd = parser:command("remove", [[
 Uninstall a rock.
@@ -30,13 +38,13 @@ To override this check and force the removal, use --force or --force-fast.]],
 
    cmd:flag("--force", "Force removal if it would break dependencies.")
    cmd:flag("--force-fast", "Perform a forced removal without reporting dependency issues.")
-   util.deps_mode_option(cmd)
+   util.deps_mode_option(cmd as Parser)
 end
 
 --- Driver function for the "remove" command.
 -- @return boolean or (nil, string, exitcode): True if removal was
 -- successful, nil and an error message otherwise. exitcode is optionally returned.
-function cmd_remove.command(args)
+function cmd_remove.command(args: Args): boolean, string
    local name = args.rock
    local deps_mode = deps.get_deps_mode(args)
 
@@ -66,6 +74,6 @@ function cmd_remove.command(args)
    return true
 end
 
-cmd_remove.needs_lock = function() return true end
+cmd_remove.needs_lock = function(): boolean return true end
 
 return cmd_remove
diff --git a/src/luarocks/cmd/search.tl b/src/luarocks/cmd/search.tl
index 6cab6d80..8474cf60 100644
--- a/src/luarocks/cmd/search.tl
+++ b/src/luarocks/cmd/search.tl
@@ -1,7 +1,8 @@
 
 --- Module implementing the LuaRocks "search" command.
 -- Queries LuaRocks servers.
-local cmd_search = {}
+local record cmd_search
+end
 
 local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
@@ -9,7 +10,16 @@ local search = require("luarocks.search")
 local queries = require("luarocks.queries")
 local results = require("luarocks.results")
 
-function cmd_search.add_to_parser(parser)
+local argparse = require("luarocks.vendor.argparse")
+local type Parser = argparse.Parser
+
+local type a = require("luarocks.core.types.args")
+local type Args = a.Args
+
+local type res = require("luarocks.core.types.result")
+local type Result = res.Result
+
+function cmd_search.add_to_parser(parser: Parser)
    local cmd = parser:command("search", "Query the LuaRocks servers.", util.see_also())
 
    cmd:argument("name", "Name of the rock to search for.")
@@ -33,7 +43,7 @@ end
 -- @param result_tree table: A search results table.
 -- @return (table, table): Two tables, one for source and one for binary
 -- results.
-local function split_source_and_binary_results(result_tree)
+local function split_source_and_binary_results(result_tree: {string: {string: {Result}}}): {string : {string : {Result}}}, {string : {string : {Result}}}
    local sources, binaries = {}, {}
    for name, versions in pairs(result_tree) do
       for version, repositories in pairs(versions) do
@@ -53,7 +63,7 @@ end
 --- Driver function for "search" command.
 -- @return boolean or (nil, string): True if build was successful; nil and an
 -- error message otherwise.
-function cmd_search.command(args)
+function cmd_search.command(args: Args): boolean, string
    local name = args.name
 
    if args.all then
@@ -65,7 +75,7 @@ function cmd_search.command(args)
    end
 
    local query = queries.new(name, args.namespace, args.version, true)
-   local result_tree, err = search.search_repos(query)
+   local result_tree = search.search_repos(query)
    local porcelain = args.porcelain
    local full_name = util.format_rock_name(name, args.namespace, args.version)
    util.title(full_name .. " - Search results for Lua "..cfg.lua_version..":", porcelain, "=")
diff --git a/src/luarocks/cmd/show.tl b/src/luarocks/cmd/show.tl
index 88cbbada..4850b3af 100644
--- a/src/luarocks/cmd/show.tl
+++ b/src/luarocks/cmd/show.tl
@@ -1,6 +1,12 @@
 --- Module implementing the LuaRocks "show" command.
 -- Shows information about an installed rock.
-local show = {}
+local record show
+   record Return
+      name: string
+      file: string
+      lable: string
+   end
+end
 
 local queries = require("luarocks.queries")
 local search = require("luarocks.search")
@@ -13,7 +19,41 @@ local fetch = require("luarocks.fetch")
 local manif = require("luarocks.manif")
 local repos = require("luarocks.repos")
 
-function show.add_to_parser(parser)
+local type Return = show.Return
+
+local argparse = require("luarocks.vendor.argparse")
+local type Parser = argparse.Parser
+local type Option = argparse.Option
+
+local type a = require("luarocks.core.types.args")
+local type Args = a.Args
+
+local type bo = require("luarocks.core.types.bopts")
+local type BOpts = bo.BOpts
+
+local type i = require("luarocks.core.types.installs")
+local type IOpts = i.IOpts
+
+local type p = require("luarocks.core.types.persist")
+local type PersistableTable = p.PersistableTable
+
+local type res = require("luarocks.core.types.result")
+local type Result = res.Result
+
+local type t = require("luarocks.core.types.tree")
+local type Tree = t.Tree
+
+local type q = require("luarocks.core.types.query")
+local type Query = q.Query
+
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
+local type Dependencies = r.Dependencies
+
+local type m = require("luarocks.core.types.manifest")
+local type Entry = m.Manifest.Entry
+
+function show.add_to_parser(parser: Parser)
    local cmd = parser:command("show", [[
 Show information about an installed rock.
 
@@ -94,14 +134,14 @@ local porcelain_template = [[
 *ideps    :indirect_dependency\t${name}\t${label}
 ]]
 
-local function keys_as_string(t, sep)
+local function keys_as_string(t: {string: any}, sep: string): string
    local keys = util.keys(t)
    table.sort(keys)
    return table.concat(keys, sep or " ")
 end
 
-local function word_wrap(line)
-   local width = tonumber(os.getenv("COLUMNS")) or 80
+local function word_wrap(line: string): string
+   local width = math.tointeger(os.getenv("COLUMNS")) or 80 --! tonumber to tointeger
    if width > 80 then width = 80 end
    if #line > width then
       local brk = width
@@ -115,7 +155,7 @@ local function word_wrap(line)
    return line
 end
 
-local function format_text(text)
+local function format_text(text: string): string
    text = text:gsub("^%s*",""):gsub("%s$", ""):gsub("\n[ \t]+","\n"):gsub("([^\n])\n([^\n])","%1 %2")
    local paragraphs = util.split_string(text, "\n\n")
    for n, line in ipairs(paragraphs) do
@@ -124,8 +164,8 @@ local function format_text(text)
    return (table.concat(paragraphs, "\n\n"):gsub("%s$", ""))
 end
 
-local function installed_rock_label(dep, tree)
-   local installed, version
+local function installed_rock_label(dep: Query, tree: string | Tree): string
+   local installed, version: string, string
    local rocks_provided = util.get_rocks_provided()
    if rocks_provided[dep.name] then
       installed, version = true, rocks_provided[dep.name]
@@ -135,7 +175,7 @@ local function installed_rock_label(dep, tree)
    return installed and "using "..version or "missing"
 end
 
-local function render(template, data)
+local function render(template: string, data: {string: string | {string}}): string
    local out = {}
    for cmd, var, line in template:gmatch("(.)([a-z]*)%s*:([^\n]*)\n") do
       line = line:gsub("\\t", "\t")
@@ -144,12 +184,12 @@ local function render(template, data)
          table.insert(out, line)
       elseif cmd == "?" or cmd == "*" or cmd == "!" then
          if (cmd == "!" and d == nil)
-             or (cmd ~= "!" and (type(d) == "string"
-                                 or (type(d) == "table" and next(d)))) then
+             or (cmd ~= "!" and (d is string
+                                 or (d is {string} and next(d) ~= nil))) then
             local n = cmd == "*" and #d or 1
             for i = 1, n do
                local tbl = cmd == "*" and d[i] or data
-               if type(tbl) == "string" then
+               if tbl is string   then
                   tbl = tbl:gsub("%%", "%%%%")
                end
                table.insert(out, (line:gsub("${([a-z]+)}", tbl)))
@@ -160,7 +200,7 @@ local function render(template, data)
    return table.concat(out, "\n")
 end
 
-local function adjust_path(name, version, basedir, pathname, suffix)
+local function adjust_path(name: string, version: string, basedir: string, pathname: string, suffix?: string): string
    pathname = dir.path(basedir, pathname)
    local vpathname = path.versioned_name(pathname, basedir, name, version)
    return (fs.exists(vpathname)
@@ -168,25 +208,25 @@ local function adjust_path(name, version, basedir, pathname, suffix)
           or pathname) .. (suffix or "")
 end
 
-local function modules_to_list(name, version, repo)
-   local ret = {}
+local function modules_to_list(name: string, version: string, repo: string | Tree): {Return}
+   local ret: {Return} = {}
    local rock_manifest = manif.load_rock_manifest(name, version, repo)
 
    local lua_dir = path.deploy_lua_dir(repo)
    local lib_dir = path.deploy_lib_dir(repo)
-   repos.recurse_rock_manifest_entry(rock_manifest.lua, function(pathname)
+   repos.recurse_rock_manifest_entry(rock_manifest.lua, function(pathname: string): boolean, string
       table.insert(ret, {
          name = path.path_to_module(pathname),
          file = adjust_path(name, version, lua_dir, pathname),
       })
    end)
-   repos.recurse_rock_manifest_entry(rock_manifest.lib, function(pathname)
+   repos.recurse_rock_manifest_entry(rock_manifest.lib, function(pathname: string): boolean, string
       table.insert(ret, {
          name = path.path_to_module(pathname),
          file = adjust_path(name, version, lib_dir, pathname),
       })
    end)
-   table.sort(ret, function(a, b)
+   table.sort(ret, function(a: Return, b: Return): boolean
       if a.name == b.name then
          return a.file < b.file
       end
@@ -195,18 +235,18 @@ local function modules_to_list(name, version, repo)
    return ret
 end
 
-local function commands_to_list(name, version, repo)
-   local ret = {}
+local function commands_to_list(name: string, version: string, repo: string | Tree): {Return}
+   local ret: {Return} = {}
    local rock_manifest = manif.load_rock_manifest(name, version, repo)
 
    local bin_dir = path.deploy_bin_dir(repo)
-   repos.recurse_rock_manifest_entry(rock_manifest.bin, function(pathname)
+   repos.recurse_rock_manifest_entry(rock_manifest.bin, function(pathname: string): boolean, string
       table.insert(ret, {
          name = name,
          file = adjust_path(name, version, bin_dir, pathname, cfg.wrapper_suffix),
       })
    end)
-   table.sort(ret, function(a, b)
+   table.sort(ret, function(a: Return, b: Return): boolean
       if a.name == b.name then
          return a.file < b.file
       end
@@ -215,16 +255,16 @@ local function commands_to_list(name, version, repo)
    return ret
 end
 
-local function deps_to_list(dependencies, tree)
-   local ret = {}
-   for _, dep in ipairs(dependencies or {}) do
+local function deps_to_list(dependencies: Dependencies, tree: string | Tree): {Return}
+   local ret: {Return} = {}
+   for _, dep in ipairs(dependencies.queries or {}) do
       table.insert(ret, { name = tostring(dep), label = installed_rock_label(dep, tree) })
    end
    return ret
 end
 
-local function indirect_deps(mdeps, rdeps, tree)
-   local ret = {}
+local function indirect_deps(mdeps: {string: string}, rdeps: Dependencies, tree: string | Tree): {Return}
+   local ret: {Return} = {}
    local direct_deps = {}
    for _, dep in ipairs(rdeps) do
       direct_deps[dep] = true
@@ -237,7 +277,7 @@ local function indirect_deps(mdeps, rdeps, tree)
    return ret
 end
 
-local function show_rock(template, namespace, name, version, rockspec, repo, minfo, tree)
+local function show_rock(template: string, namespace: string, name: string, version: string, rockspec: Rockspec, repo: string | Tree, minfo: Entry, tree: string | Tree)
    local desc = rockspec.description or {}
    local data = {
       namespace = namespace,
@@ -262,7 +302,7 @@ end
 
 --- Driver function for "show" command.
 -- @return boolean: True if succeeded, nil on errors.
-function show.command(args)
+function show.command(args: Args): boolean, string
    local query = queries.new(args.rock, args.namespace, args.version, true)
 
    local name, version, repo, repo_url = search.pick_installed_rock(query, args.tree)
diff --git a/src/luarocks/cmd/test.tl b/src/luarocks/cmd/test.tl
index b353bd80..144cfdac 100644
--- a/src/luarocks/cmd/test.tl
+++ b/src/luarocks/cmd/test.tl
@@ -1,12 +1,19 @@
 
 --- Module implementing the LuaRocks "test" command.
 -- Tests a rock, compiling its C parts if any.
-local cmd_test = {}
+local record cmd_test
+end
 
 local util = require("luarocks.util")
 local test = require("luarocks.test")
 
-function cmd_test.add_to_parser(parser)
+local argparse = require("luarocks.vendor.argparse")
+local type Parser = argparse.Parser
+
+local type a = require("luarocks.core.types.args")
+local type Args = a.Args
+
+function cmd_test.add_to_parser(parser: Parser)
    local cmd = parser:command("test", [[
 Run the test suite for the Lua project in the current directory.
 
@@ -30,7 +37,7 @@ to separate LuaRocks arguments from test suite arguments.]],
       :argname("<type>")
 end
 
-function cmd_test.command(args)
+function cmd_test.command(args: Args): boolean, string, string --!
    if args.rockspec and args.rockspec:match("rockspec$") then
       return test.run_test_suite(args.rockspec, args.test_type, args.args, args.prepare)
    end
diff --git a/src/luarocks/cmd/unpack.tl b/src/luarocks/cmd/unpack.tl
index a0ade4f3..07900039 100644
--- a/src/luarocks/cmd/unpack.tl
+++ b/src/luarocks/cmd/unpack.tl
@@ -1,7 +1,8 @@
 
 --- Module implementing the LuaRocks "unpack" command.
 -- Unpack the contents of a rock.
-local unpack = {}
+local record unpack
+end
 
 local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
@@ -10,7 +11,16 @@ local build = require("luarocks.build")
 local dir = require("luarocks.dir")
 local search = require("luarocks.search")
 
-function unpack.add_to_parser(parser)
+local argparse = require("luarocks.vendor.argparse")
+local type Parser = argparse.Parser
+
+local type a = require("luarocks.core.types.args")
+local type Args = a.Args
+
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
+
+function unpack.add_to_parser(parser: Parser)
    local cmd = parser:command("unpack", [[
 Unpacks the contents of a rock in a newly created directory.
 Argument may be a rock file, or the name of a rock in a rocks server.
@@ -34,9 +44,7 @@ end
 -- @param dir_name string: The directory where to store and unpack files.
 -- @return table or (nil, string): the loaded rockspec table or
 -- nil and an error message.
-local function unpack_rockspec(rockspec_file, dir_name)
-   assert(type(rockspec_file) == "string")
-   assert(type(dir_name) == "string")
+local function unpack_rockspec(rockspec_file: string, dir_name: string): Rockspec, string
 
    local rockspec, err = fetch.load_rockspec(rockspec_file)
    if not rockspec then
@@ -44,8 +52,8 @@ local function unpack_rockspec(rockspec_file, dir_name)
    end
    local ok, err = fs.change_dir(dir_name)
    if not ok then return nil, err end
-   local ok, sources_dir = fetch.fetch_sources(rockspec, true, ".")
-   if not ok then
+   local oks, sources_dir = fetch.fetch_sources(rockspec, true, ".")
+   if not oks then
       return nil, sources_dir
    end
    ok, err = fs.change_dir(sources_dir)
@@ -63,16 +71,14 @@ end
 -- extension in the rock filename (eg. "src", "all", "linux-x86")
 -- @return table or (nil, string): the loaded rockspec table or
 -- nil and an error message.
-local function unpack_rock(rock_file, dir_name, kind)
-   assert(type(rock_file) == "string")
-   assert(type(dir_name) == "string")
+local function unpack_rock(rock_file: string, dir_name: string, kind: string): Rockspec, string, string
 
    local ok, err, errcode = fetch.fetch_and_unpack_rock(rock_file, dir_name)
    if not ok then
       return nil, err, errcode
    end
-   ok, err = fs.change_dir(dir_name)
-   if not ok then return nil, err end
+   local oks, errs = fs.change_dir(dir_name)
+   if not oks then return nil, errs end
    local rockspec_file = dir_name..".rockspec"
    local rockspec, err = fetch.load_rockspec(rockspec_file)
    if not rockspec then
@@ -80,13 +86,13 @@ local function unpack_rock(rock_file, dir_name, kind)
    end
    if kind == "src" then
       if rockspec.source.file then
-         local ok, err = fs.unpack_archive(rockspec.source.file)
+         oks, err = fs.unpack_archive(rockspec.source.file)
          if not ok then return nil, err end
-         ok, err = fetch.find_rockspec_source_dir(rockspec, ".")
+         oks, err = fetch.find_rockspec_source_dir(rockspec, ".")
          if not ok then return nil, err end
-         ok, err = fs.change_dir(rockspec.source.dir)
+         oks, err = fs.change_dir(rockspec.source.dir)
          if not ok then return nil, err end
-         ok, err = build.apply_patches(rockspec)
+         oks, err = build.apply_patches(rockspec)
          fs.pop_dir()
          if not ok then return nil, err end
       end
@@ -100,8 +106,7 @@ end
 -- @param file string: A rockspec or .rock URL.
 -- @return boolean or (nil, string): true if successful or nil followed
 -- by an error message.
-local function run_unpacker(file, force)
-   assert(type(file) == "string")
+local function run_unpacker(file: string, force: boolean): boolean, string
 
    local base_name = dir.base_name(file)
    local dir_name, kind, extension = base_name:match("(.*)%.([^.]+)%.(rock)$")
@@ -123,7 +128,7 @@ local function run_unpacker(file, force)
    end
    local rollback = util.schedule_function(fs.delete, fs.absolute_name(dir_name))
 
-   local rockspec, err
+   local rockspec, err: Rockspec, string
    if extension == "rock" then
       rockspec, err = unpack_rock(file, dir_name, kind)
    elseif extension == "rockspec" then
@@ -152,8 +157,8 @@ end
 --- Driver function for the "unpack" command.
 -- @return boolean or (nil, string): true if successful or nil followed
 -- by an error message.
-function unpack.command(args)
-   local url, err
+function unpack.command(args: Args): boolean, string
+   local url, err: string, string
    if args.rock:match(".*%.rock") or args.rock:match(".*%.rockspec") then
       url = args.rock
    else
diff --git a/src/luarocks/cmd/upload.tl b/src/luarocks/cmd/upload.tl
index 6b84e452..018d9f6e 100644
--- a/src/luarocks/cmd/upload.tl
+++ b/src/luarocks/cmd/upload.tl
@@ -1,5 +1,6 @@
 
-local upload = {}
+local record upload
+end
 
 local signing = require("luarocks.signing")
 local util = require("luarocks.util")
@@ -8,7 +9,39 @@ local pack = require("luarocks.pack")
 local cfg = require("luarocks.core.cfg")
 local Api = require("luarocks.upload.api")
 
-function upload.add_to_parser(parser)
+local argparse = require("luarocks.vendor.argparse")
+local type Parser = argparse.Parser
+local type Option = argparse.Option
+
+local type a = require("luarocks.core.types.args")
+local type Args = a.Args
+
+local type bo = require("luarocks.core.types.bopts")
+local type BOpts = bo.BOpts
+
+local type i = require("luarocks.core.types.installs")
+local type IOpts = i.IOpts
+
+local type p = require("luarocks.core.types.persist")
+local type PersistableTable = p.PersistableTable
+
+local type res = require("luarocks.core.types.result")
+local type Result = res.Result
+
+local type t = require("luarocks.core.types.tree")
+local type Tree = t.Tree
+
+local type q = require("luarocks.core.types.query")
+local type Query = q.Query
+
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
+local type Dependencies = r.Dependencies
+
+local type m = require("luarocks.core.types.manifest")
+local type Entry = m.Manifest.Entry
+
+function upload.add_to_parser(parser: Parser)
    local cmd = parser:command("upload", "Pack a source rock file (.src.rock extension) "..
       "and upload it and the rockspec to the public rocks repository.", util.see_also())
       :summary("Upload a rockspec to the public rocks repository.")
@@ -31,12 +64,12 @@ function upload.add_to_parser(parser)
    cmd:flag("--debug"):hidden(true)
 end
 
-local function is_dev_version(version)
+local function is_dev_version(version: string): string
    return version:match("^dev") or version:match("^scm")
 end
 
-function upload.command(args)
-   local api, err = Api.new(args)
+function upload.command(args: Args): boolean, string, string --!
+   local api, err = Api.new(args as argparse.Args) --!
    if not api then
       return nil, err
    end
@@ -63,8 +96,8 @@ function upload.command(args)
       return nil, "Revision "..rockspec.version.." already exists on the server. "..util.see_help("upload")
    end
 
-   local sigfname
-   local rock_sigfname
+   local sigfname: string
+   local rock_sigfname: string
 
    if args.sign then
       sigfname, err = signing.sign_file(args.rockspec)
@@ -74,7 +107,7 @@ function upload.command(args)
       util.printout("Signed rockspec: "..sigfname)
    end
 
-   local rock_fname
+   local rock_fname: string
    if args.src_rock then
       rock_fname = args.src_rock
    elseif not args.skip_pack and not is_dev_version(rockspec.version) then
diff --git a/src/luarocks/cmd/which.tl b/src/luarocks/cmd/which.tl
index f50a43c3..7566e704 100644
--- a/src/luarocks/cmd/which.tl
+++ b/src/luarocks/cmd/which.tl
@@ -1,13 +1,20 @@
 
 --- @module luarocks.which_cmd
 -- Driver for the `luarocks which` command.
-local which_cmd = {}
+local record which_cmd
+end
 
-local loader = require("luarocks.loader")
+local loader = require("luarocks.loader") --!
 local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 
-function which_cmd.add_to_parser(parser)
+local argparse = require("luarocks.vendor.argparse")
+local type Parser = argparse.Parser
+
+local type a = require("luarocks.core.types.args")
+local type Args = a.Args
+
+function which_cmd.add_to_parser(parser: Parser)
    local cmd = parser:command("which", 'Given a module name like "foo.bar", '..
       "output which file would be loaded to resolve that module by "..
       'luarocks.loader, like "/usr/local/lua/'..cfg.lua_version..'/foo/bar.lua".',
@@ -19,7 +26,7 @@ end
 
 --- Driver function for "which" command.
 -- @return boolean This function terminates the interpreter.
-function which_cmd.command(args)
+function which_cmd.command(args: Args): boolean, string
    local pathname, rock_name, rock_version, where = loader.which(args.modname, "lp")
 
    if pathname then
diff --git a/src/luarocks/cmd/write_rockspec.tl b/src/luarocks/cmd/write_rockspec.tl
index e8d65cba..ebd3b783 100644
--- a/src/luarocks/cmd/write_rockspec.tl
+++ b/src/luarocks/cmd/write_rockspec.tl
@@ -88,7 +88,7 @@ rockspec, and is not guaranteed to be complete or correct. ]], util.see_also())
    cmd:argument("location", "URL or path to the rock sources.")
       :args("?")
 
-   write_rockspec.cmd_options(cmd) --!
+   write_rockspec.cmd_options(cmd as Parser)
 end
 
 local function open_file(name: string): FILE, string, integer
diff --git a/src/luarocks/core/cfg.d.tl b/src/luarocks/core/cfg.d.tl
index 7dea5b32..03eedd6d 100644
--- a/src/luarocks/core/cfg.d.tl
+++ b/src/luarocks/core/cfg.d.tl
@@ -107,6 +107,9 @@ local record cfg
    project_tree: string
    -- cmd make
    keep_other_versions: boolean
+   -- cmd path
+   package_paths: function(string | Tree): string, string, string
+   export_path_separator: string
 end
 
 return cfg
\ No newline at end of file
diff --git a/src/luarocks/core/types/args.d.tl b/src/luarocks/core/types/args.d.tl
index a4f240cc..d2c49ea6 100644
--- a/src/luarocks/core/types/args.d.tl
+++ b/src/luarocks/core/types/args.d.tl
@@ -67,6 +67,36 @@ local record args
         no_wrapper_scripts: boolean
         wrapper_dir: string
         reset: boolean
+        filter: string
+        outdated: boolean
+        new_version: string
+        dir: string
+        new_url: string
+        lr_path: string
+        lr_cpath: string
+        lr_bin: string
+        full: boolean
+        append: boolean
+        no_bin: boolean
+        old_versions: boolean
+        binary: boolean
+        rock_tree: boolean
+        rock_namespace: boolean
+        rock_dir: boolean
+        rock_license: boolean
+        issues: boolean
+        labels: boolean
+        modules: boolean
+        deps: boolean
+        build_deps: boolean
+        test_deps: boolean
+        mversion: boolean
+        test_type: string
+        args: {string}
+        prepare: boolean
+        src_rock: string
+        skip_pack: boolean
+        modname: string
      end
 end
 
diff --git a/src/luarocks/core/types/rockspec.tl b/src/luarocks/core/types/rockspec.tl
index f1e4895d..cfb35be2 100644
--- a/src/luarocks/core/types/rockspec.tl
+++ b/src/luarocks/core/types/rockspec.tl
@@ -12,7 +12,7 @@ local record rockspec
         issues_url: string
         maintainer: string
         license: string
-        labels: any --!
+        labels: {string}
     end
   
     record Source
diff --git a/src/luarocks/fs.d.tl b/src/luarocks/fs.d.tl
index a0fca017..5d4fa79e 100644
--- a/src/luarocks/fs.d.tl
+++ b/src/luarocks/fs.d.tl
@@ -82,6 +82,7 @@ local record fs
    quiet_stderr: function(string): string
    -- cmd innit
    wrap_script: function(string, string, string, ...:string): boolean, string
+   export_cmd: function(string, string): string
 end
 
 return fs
diff --git a/src/luarocks/upload/multipart.tl b/src/luarocks/upload/multipart.tl
index 28787da2..c42a286c 100644
--- a/src/luarocks/upload/multipart.tl
+++ b/src/luarocks/upload/multipart.tl
@@ -104,7 +104,7 @@ function multipart.encode(params: Parameters): string, string --! Table map type
                         "\r\n", "--", boundary, "--", "\r\n" }), boundary
 end
 
-function multipart.new_file(fname: string, mime: string): File
+function multipart.new_file(fname: string, mime?: string): File
    local self: File = {}
 
    setmetatable(self, { __index = File })
diff --git a/src/luarocks/util.tl b/src/luarocks/util.tl
index 53e363a5..c03751e6 100644
--- a/src/luarocks/util.tl
+++ b/src/luarocks/util.tl
@@ -13,7 +13,7 @@ local type SortBy = o.SortBy
 
 local record util
    cleanup_path: function(string, string, string, boolean): string
-   split_string: function(string, string, number): {string}
+   split_string: function(string, string, ?number): {string}
    sortedpairs: function<K, V>(tbl: {K: V}, sort_by?: SortBy): function(): K, V, Ordering<K>
    deep_merge: function({any : any}, {any : any})
    deep_merge_under: function({any : any}, {any : any})