tynew type

49 files changed, 101 insertions, 152 deletions

diff --git a/src/luarocks/admin/cache.tl b/src/luarocks/admin/cache.tl
index 85e3df36..eb3b9568 100644
--- a/src/luarocks/admin/cache.tl
+++ b/src/luarocks/admin/cache.tl
@@ -9,10 +9,10 @@ local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
-function cache.get_upload_server(server: string): string, string
+function cache.get_upload_server(server: string): string, {string: string}, string
    if not server then server = cfg.upload_server end
    if not server then
-      return nil, "No server specified and no default configured with upload_server."
+      return nil, nil, "No server specified and no default configured with upload_server."
    end
    return server, cfg.upload_servers and cfg.upload_servers[server]
 end
diff --git a/src/luarocks/admin/cmd/add.tl b/src/luarocks/admin/cmd/add.tl
index f90eabc0..666e96b1 100644
--- a/src/luarocks/admin/cmd/add.tl
+++ b/src/luarocks/admin/cmd/add.tl
@@ -21,7 +21,7 @@ local type Args = a.Args
 function add.add_to_parser(parser: Parser)
    local cmd = parser:command("add", "Add a rock or rockspec to a rocks server.", util.see_also())
 
-   cmd:argument("rock", "A local rockspec or rock file.")
+   cmd:argument("rocks", "A local rockspec or rock file.")
       :args("+")
 
    cmd:option("--server", "The server to use. If not given, the default server "..
@@ -128,9 +128,9 @@ local function add_files_to_server(refresh: boolean, rockfiles: {string}, server
 end
 
 function add.command(args: Args): boolean, string, string --!
-   local server, server_table = cache.get_upload_server(args.add_server or args.server)
-   if not server then return nil, server_table end
-   return add_files_to_server(not args.no_refresh, args.rock, server, server_table, args.index)
+   local server, server_table, err = cache.get_upload_server(args.add_server or args.server)
+   if not server then return nil, err end
+   return add_files_to_server(not args.no_refresh, args.rocks, server, server_table, args.index)
 end
 
 
diff --git a/src/luarocks/admin/cmd/refresh_cache.tl b/src/luarocks/admin/cmd/refresh_cache.tl
index 1e2b84d2..09b26373 100644
--- a/src/luarocks/admin/cmd/refresh_cache.tl
+++ b/src/luarocks/admin/cmd/refresh_cache.tl
@@ -22,8 +22,8 @@ function refresh_cache.add_to_parser(parser: Parser)
 end
 
 function refresh_cache.command(args: Args): boolean, string
-   local server, upload_server = cache.get_upload_server(args.server)
-   if not server then return nil, upload_server end
+   local server, upload_server, err = cache.get_upload_server(args.server)
+   if not server then return nil, err end
    local download_url = cache.get_server_urls(server, upload_server)
 
    local ok, err = cache.refresh_local_cache(download_url, cfg.upload_user, cfg.upload_password)
diff --git a/src/luarocks/admin/cmd/remove.tl b/src/luarocks/admin/cmd/remove.tl
index 46b4feeb..78bf652e 100644
--- a/src/luarocks/admin/cmd/remove.tl
+++ b/src/luarocks/admin/cmd/remove.tl
@@ -21,7 +21,7 @@ local type Args = a.Args
 function admin_remove.add_to_parser(parser: Parser)
    local cmd = parser:command("remove", "Remove a rock or rockspec from a rocks server.", util.see_also())
 
-   cmd:argument("rock", "A local rockspec or rock file.")
+   cmd:argument("rocks", "A local rockspec or rock file.")
       :args("+")
 
    cmd:option("--server", "The server to use. If not given, the default server "..
@@ -89,9 +89,9 @@ local function remove_files_from_server(refresh: boolean, rockfiles: {string}, s
 end
 
 function admin_remove.command(args: Args): boolean, string
-   local server, server_table = cache.get_upload_server(args.server)
-   if not server then return nil, server_table end
-   return remove_files_from_server(not args.no_refresh, args.rock, server, server_table) --!
+   local server, server_table, err = cache.get_upload_server(args.server)
+   if not server then return nil, err end
+   return remove_files_from_server(not args.no_refresh, args.rocks, server, server_table) --!
 end
 
 
diff --git a/src/luarocks/admin/index.tl b/src/luarocks/admin/index.tl
index 06968828..e1b01f10 100644
--- a/src/luarocks/admin/index.tl
+++ b/src/luarocks/admin/index.tl
@@ -10,8 +10,7 @@ local persist = require("luarocks.persist")
 local dir = require("luarocks.dir")
 local manif = require("luarocks.manif")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 local type m = require("luarocks.core.types.manifest")
 local type Entry = m.Manifest.Entry
@@ -106,13 +105,13 @@ function index.format_external_dependencies(rockspec: Rockspec): string
    if rockspec.external_dependencies then
       local deplist = {}
       local listed_set: {string: boolean} = {}
-      local plats: {string : string} = nil
+      local plats: {string : {string: string}} = nil
       for name, desc in util.sortedpairs(rockspec.external_dependencies) do
          if name ~= "platforms" then
             table.insert(deplist, name:lower())
             listed_set[name] = true
          else
-            plats = desc
+            plats = desc as {string : {string: string}}
          end
       end
       if plats then
diff --git a/src/luarocks/build.tl b/src/luarocks/build.tl
index b3594225..b11ceb80 100644
--- a/src/luarocks/build.tl
+++ b/src/luarocks/build.tl
@@ -20,22 +20,17 @@ local repos = require("luarocks.repos")
 local repo_writer = require("luarocks.repo_writer")
 local deplocks = require("luarocks.deplocks")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
-local type i = require("luarocks.core.types.installs")
-local type InstallDirs = i.InstallDirs
-local type InstallDir = i.InstallDir
+local type InstallDirs = require("luarocks.core.types.installs").InstallDirs
+local type InstallDir = require("luarocks.core.types.installs").InstallDir
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
-local type b = require("luarocks.core.types.build")
-local type Build = b.Build
-local type Module = b.BuiltinBuild.Module
+local type Build = require("luarocks.core.types.build").Build
+local type Module = require("luarocks.core.types.build").BuiltinBuild.Module
 
-local type bo = require("luarocks.core.types.bopts")
-local type BOpts = bo.BOpts
+local type BOpts = require("luarocks.core.types.bopts").BOpts
 
 
 local type Builds = build.Builds
diff --git a/src/luarocks/build/builtin.tl b/src/luarocks/build/builtin.tl
index d4bd7fd7..5720a405 100644
--- a/src/luarocks/build/builtin.tl
+++ b/src/luarocks/build/builtin.tl
@@ -4,12 +4,10 @@ local record builtin
    skip_lua_inc_lib_check: boolean
 end
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
-local type b = require("luarocks.core.types.build")
-local type BuiltinBuild = b.BuiltinBuild
-local type Build = b.Build
+local type BuiltinBuild = require("luarocks.core.types.build").BuiltinBuild
+local type Build = require("luarocks.core.types.build").Build
 local type Module = BuiltinBuild.Module
 
 -- This build driver checks LUA_INCDIR and LUA_LIBDIR on demand,
diff --git a/src/luarocks/build/cmake.tl b/src/luarocks/build/cmake.tl
index 1c00797f..c149a3cd 100644
--- a/src/luarocks/build/cmake.tl
+++ b/src/luarocks/build/cmake.tl
@@ -7,11 +7,9 @@ local fs = require("luarocks.fs")
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
-local type b = require("luarocks.core.types.build")
-local type CMakeBuild = b.CMakeBuild
+local type CMakeBuild = require("luarocks.core.types.build").CMakeBuild
 
 --- Driver function for the "cmake" build back-end.
 -- @param rockspec table: the loaded rockspec.
diff --git a/src/luarocks/build/command.tl b/src/luarocks/build/command.tl
index c2739987..baadf01b 100644
--- a/src/luarocks/build/command.tl
+++ b/src/luarocks/build/command.tl
@@ -7,11 +7,9 @@ local fs = require("luarocks.fs")
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
-local type b = require("luarocks.core.types.build")
-local type CommandBuild = b.CommandBuild
+local type CommandBuild = require("luarocks.core.types.build").CommandBuild
 
 --- Driver function for the "command" build back-end.
 -- @param rockspec table: the loaded rockspec.
diff --git a/src/luarocks/build/make.tl b/src/luarocks/build/make.tl
index 4107bca1..1943bd04 100644
--- a/src/luarocks/build/make.tl
+++ b/src/luarocks/build/make.tl
@@ -7,11 +7,9 @@ local fs = require("luarocks.fs")
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
-local type b = require("luarocks.core.types.build")
-local type MakeBuild = b.MakeBuild
+local type MakeBuild = require("luarocks.core.types.build").MakeBuild
 
 --- Call "make" with given target and variables
 -- @param make_cmd string: the make command to be used (typically
diff --git a/src/luarocks/cmd.tl b/src/luarocks/cmd.tl
index 64abf6ce..4e314b87 100644
--- a/src/luarocks/cmd.tl
+++ b/src/luarocks/cmd.tl
@@ -22,8 +22,7 @@ local fun = require("luarocks.fun")
 local fs = require("luarocks.fs")
 local argparse = require("luarocks.vendor.argparse")
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
 local type Parser = argparse.Parser
 
diff --git a/src/luarocks/cmd/build.tl b/src/luarocks/cmd/build.tl
index 96e2ec42..58729719 100644
--- a/src/luarocks/cmd/build.tl
+++ b/src/luarocks/cmd/build.tl
@@ -24,11 +24,9 @@ local type Parser = argparse.Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
-local type bo = require("luarocks.core.types.bopts")
-local type BOpts = bo.BOpts
+local type BOpts = require("luarocks.core.types.bopts").BOpts
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 function cmd_build.add_to_parser(parser: Parser)
    local cmd = parser:command("build", "Build and install a rock, compiling its C parts if any.\n"..  -- luacheck: ignore 431
diff --git a/src/luarocks/cmd/install.tl b/src/luarocks/cmd/install.tl
index ca3d3916..506716ef 100644
--- a/src/luarocks/cmd/install.tl
+++ b/src/luarocks/cmd/install.tl
@@ -24,8 +24,7 @@ local type a = require("luarocks.core.types.args")
 local type Args = a.Args
 
 
-local type i = require("luarocks.core.types.installs")
-local type IOpts = i.IOpts
+local type IOpts = require("luarocks.core.types.installs").IOpts
 
 function install.add_to_parser(parser: Parser)
    local cmd = parser:command("install", "Install a rock.", util.see_also())  -- luacheck: ignore 431
diff --git a/src/luarocks/cmd/list.tl b/src/luarocks/cmd/list.tl
index 558ea09a..0e3f1fd1 100644
--- a/src/luarocks/cmd/list.tl
+++ b/src/luarocks/cmd/list.tl
@@ -25,8 +25,7 @@ local type Parser = argparse.Parser
 local type a = require("luarocks.core.types.args")
 local type Args = a.Args
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
 local type q = require("luarocks.core.types.query")
 local type Query = q.Query
diff --git a/src/luarocks/cmd/make.tl b/src/luarocks/cmd/make.tl
index 17af28ae..a92bc23e 100644
--- a/src/luarocks/cmd/make.tl
+++ b/src/luarocks/cmd/make.tl
@@ -23,8 +23,7 @@ local type Parser = argparse.Parser
 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 BOpts = require("luarocks.core.types.bopts").BOpts
 
 function make.cmd_options(parser: Parser)
    parser:flag("--no-install", "Do not install the rock.")
diff --git a/src/luarocks/cmd/new_version.tl b/src/luarocks/cmd/new_version.tl
index b2fdf81a..c3129055 100644
--- a/src/luarocks/cmd/new_version.tl
+++ b/src/luarocks/cmd/new_version.tl
@@ -21,8 +21,7 @@ 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
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 function new_version.add_to_parser(parser: Parser)
    local cmd = parser:command("new_version", [[
diff --git a/src/luarocks/cmd/show.tl b/src/luarocks/cmd/show.tl
index 1d6eddda..a5c95b18 100644
--- a/src/luarocks/cmd/show.tl
+++ b/src/luarocks/cmd/show.tl
@@ -4,7 +4,7 @@ local record show
    record Return
       name: string
       file: string
-      lable: string
+      label: string
    end
 end
 
@@ -20,6 +20,7 @@ local manif = require("luarocks.manif")
 local repos = require("luarocks.repos")
 
 local type Return = show.Return
+local type RenderData = {string: string | {string}}
 
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
@@ -27,15 +28,13 @@ local type Parser = argparse.Parser
 local type a = require("luarocks.core.types.args")
 local type Args = a.Args
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").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 Rockspec = require("luarocks.core.types.rockspec").Rockspec
+local type Dependencies = require("luarocks.core.types.rockspec").Dependencies
 
 local type m = require("luarocks.core.types.manifest")
 local type Entry = m.Manifest.Entry
@@ -152,17 +151,19 @@ local function format_text(text: string): string
 end
 
 local function installed_rock_label(dep: Query, tree: string | Tree): string
-   local installed, version: string, string
+   local installed, version: boolean, string
    local rocks_provided = util.get_rocks_provided()
    if rocks_provided[dep.name] then
       installed, version = true, rocks_provided[dep.name]
    else
-      installed, version = search.pick_installed_rock(dep, tree)
+      local name:  string
+      name, version = search.pick_installed_rock(dep, tree)
+      installed = name ~= nil
    end
    return installed and "using "..version or "missing"
 end
 
-local function render(template: string, data: {string: string | {string}}): string
+local function render(template: string, data: RenderData): string
    local out = {}
    for cmd, var, line in template:gmatch("(.)([a-z]*)%s*:([^\n]*)\n") do
       line = line:gsub("\\t", "\t")
@@ -173,13 +174,16 @@ local function render(template: string, data: {string: string | {string}}): stri
          if (cmd == "!" and d == nil)
              or (cmd ~= "!" and (d is string
                                  or (d is {string} and next(d) ~= nil))) then
-            local n = cmd == "*" and #d or 1
+            local n = d is {string} and #d or 1
+            if cmd ~= "*" then
+               n = 1
+            end
             for i = 1, n do
-               local tbl = cmd == "*" and d[i] or data
+               local tbl: string | {any: any} = cmd == "*" and d is {string} and d[i] or data
                if tbl is string   then
                   tbl = tbl:gsub("%%", "%%%%")
                end
-               table.insert(out, (line:gsub("${([a-z]+)}", tbl)))
+               table.insert(out, (line:gsub("${([a-z]+)}", tbl as string))) -- code works under the assumption that template is well behaved
             end
          end
       end
@@ -284,7 +288,7 @@ local function show_rock(template: string, namespace: string, name: string, vers
       deps = deps_to_list(rockspec.dependencies, tree),
       ideps = indirect_deps(minfo.dependencies, rockspec.dependencies, tree),
    }
-   util.printout(render(template, data))
+   util.printout(render(template, data as RenderData))
 end
 
 --- Driver function for "show" command.
diff --git a/src/luarocks/cmd/unpack.tl b/src/luarocks/cmd/unpack.tl
index 07900039..f6a1526a 100644
--- a/src/luarocks/cmd/unpack.tl
+++ b/src/luarocks/cmd/unpack.tl
@@ -17,8 +17,7 @@ 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
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 function unpack.add_to_parser(parser: Parser)
    local cmd = parser:command("unpack", [[
diff --git a/src/luarocks/cmd/upload.tl b/src/luarocks/cmd/upload.tl
index ae02fc64..19b8f6ef 100644
--- a/src/luarocks/cmd/upload.tl
+++ b/src/luarocks/cmd/upload.tl
@@ -1,5 +1,7 @@
 
 local record upload
+   record Response
+   end
 end
 
 local signing = require("luarocks.signing")
@@ -42,8 +44,8 @@ local function is_dev_version(version: string): string
    return version:match("^dev") or version:match("^scm")
 end
 
-function upload.command(args: Args): boolean, string, string --!
-   local api, err = Api.new(args as argparse.Args) --!
+function upload.command(args: Args): boolean, string, string
+   local api, err = Api.new(args)
    if not api then
       return nil, err
    end
diff --git a/src/luarocks/cmd/write_rockspec.tl b/src/luarocks/cmd/write_rockspec.tl
index ebd3b783..0d95d62a 100644
--- a/src/luarocks/cmd/write_rockspec.tl
+++ b/src/luarocks/cmd/write_rockspec.tl
@@ -22,12 +22,10 @@ local type Args = a.Args
 local type p = require("luarocks.core.types.persist")
 local type PersistableTable = p.PersistableTable
 
-local type b = require("luarocks.core.types.build")
-local type BuiltinBuild = b.BuiltinBuild
+local type BuiltinBuild = require("luarocks.core.types.build").BuiltinBuild
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
-local type Dependencies = r.Dependencies
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
+local type Dependencies = require("luarocks.core.types.rockspec").Dependencies
 
 local lua_versions = {
    "5.1",
diff --git a/src/luarocks/core/cfg.d.tl b/src/luarocks/core/cfg.d.tl
index fa3e9901..8437a043 100644
--- a/src/luarocks/core/cfg.d.tl
+++ b/src/luarocks/core/cfg.d.tl
@@ -1,8 +1,6 @@
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
 local record cfg
    detect_sysconfdir: function(): string
@@ -112,7 +110,7 @@ local record cfg
    export_path_separator: string
    -- admin cache
    upload_server: string
-   upload_servers: {string: string}
+   upload_servers: {string: {string: string}}
    -- admin add
    upload_user: string
    upload_password: string
diff --git a/src/luarocks/core/path.tl b/src/luarocks/core/path.tl
index 491fe484..eff15a51 100644
--- a/src/luarocks/core/path.tl
+++ b/src/luarocks/core/path.tl
@@ -5,8 +5,7 @@ end
 local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.core.dir")
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
 local dir_sep = package.config:sub(1, 1)
 --------------------------------------------------------------------------------
diff --git a/src/luarocks/core/types/args.d.tl b/src/luarocks/core/types/args.d.tl
index 00945789..d2aca6fc 100644
--- a/src/luarocks/core/types/args.d.tl
+++ b/src/luarocks/core/types/args.d.tl
@@ -102,6 +102,10 @@ local record args
       index: boolean
       repository: string
       local_tree: string
+      temp_key: string
+      api_key: string
+      debug: boolean
+      rocks: {string}
    end
 end
 
diff --git a/src/luarocks/core/types/manifest.d.tl b/src/luarocks/core/types/manifest.d.tl
index 1e986867..205a8dc9 100644
--- a/src/luarocks/core/types/manifest.d.tl
+++ b/src/luarocks/core/types/manifest.d.tl
@@ -1,8 +1,7 @@
 local type q = require("luarocks.core.types.query")
 local type Query = q.Query
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
 local record manifest      
    record Manifest
diff --git a/src/luarocks/core/types/rockspec.tl b/src/luarocks/core/types/rockspec.tl
index cfb35be2..22216f1d 100644
--- a/src/luarocks/core/types/rockspec.tl
+++ b/src/luarocks/core/types/rockspec.tl
@@ -1,8 +1,7 @@
 local type q = require("luarocks.core.types.query")
 local type Query = q.Query
 
-local type b = require("luarocks.core.types.build")
-local type Build = b.Build
+local type Build = require("luarocks.core.types.build").Build
 
 local record rockspec
     record Description
diff --git a/src/luarocks/core/types/testrunner.d.tl b/src/luarocks/core/types/testrunner.d.tl
index 508356fa..e310504d 100644
--- a/src/luarocks/core/types/testrunner.d.tl
+++ b/src/luarocks/core/types/testrunner.d.tl
@@ -1,5 +1,4 @@
-local type r = require("luarocks.core.types.rockspec")
-local type Test = r.Test
+local type Test = require("luarocks.core.types.rockspec").Test
 
 local record testrunner
     record TestRunner
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl
index 58c0bd1c..c1fefe2c 100644
--- a/src/luarocks/deps.tl
+++ b/src/luarocks/deps.tl
@@ -14,17 +14,15 @@ local vers = require("luarocks.core.vers")
 local queries = require("luarocks.queries")
 local deplocks = require("luarocks.deplocks")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
-local type Dependencies = r.Dependencies
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
+local type Dependencies = require("luarocks.core.types.rockspec").Dependencies
 
 local type bld = require("luarocks.core.types.build")
 local type BuiltinBuild = bld.BuiltinBuild
 local type Module = BuiltinBuild.Module
 local type Build = bld.Build
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
 local type q = require("luarocks.core.types.query")
 local type Query = q.Query
diff --git a/src/luarocks/fetch.tl b/src/luarocks/fetch.tl
index ccd8680e..6ee1c616 100644
--- a/src/luarocks/fetch.tl
+++ b/src/luarocks/fetch.tl
@@ -16,8 +16,7 @@ local cfg = require("luarocks.core.cfg")
 
 local type Fetch = fetch.Fetch
 local type Lock = fs.Lock --!
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 
 local function ensure_trailing_slash(url: string): string
diff --git a/src/luarocks/fetch/cvs.tl b/src/luarocks/fetch/cvs.tl
index 0532cecb..c8fc5e3d 100644
--- a/src/luarocks/fetch/cvs.tl
+++ b/src/luarocks/fetch/cvs.tl
@@ -7,8 +7,7 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 --- Download sources for building a rock, using CVS.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/git.tl b/src/luarocks/fetch/git.tl
index 466c4039..35e28272 100644
--- a/src/luarocks/fetch/git.tl
+++ b/src/luarocks/fetch/git.tl
@@ -9,8 +9,7 @@ local dir = require("luarocks.dir")
 local vers = require("luarocks.core.vers")
 local util = require("luarocks.util")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 local type v = require("luarocks.core.types.version")
 local type Version = v.Version
 
diff --git a/src/luarocks/fetch/git_file.tl b/src/luarocks/fetch/git_file.tl
index 06ada30b..90e14d12 100644
--- a/src/luarocks/fetch/git_file.tl
+++ b/src/luarocks/fetch/git_file.tl
@@ -5,8 +5,7 @@ end
 
 local git = require("luarocks.fetch.git")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 --- Fetch sources for building a rock from a local Git repository.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/git_http.tl b/src/luarocks/fetch/git_http.tl
index ecf23763..4ff602d9 100644
--- a/src/luarocks/fetch/git_http.tl
+++ b/src/luarocks/fetch/git_http.tl
@@ -12,8 +12,7 @@ end
 
 local git = require("luarocks.fetch.git")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 --- Fetch sources for building a rock from a local Git repository.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/git_ssh.tl b/src/luarocks/fetch/git_ssh.tl
index 0d6f9742..b5c30e3a 100644
--- a/src/luarocks/fetch/git_ssh.tl
+++ b/src/luarocks/fetch/git_ssh.tl
@@ -12,8 +12,7 @@ end
 
 local git = require("luarocks.fetch.git")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 --- Fetch sources for building a rock from a local Git repository.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/hg.tl b/src/luarocks/fetch/hg.tl
index cbdcdc86..3f94cee1 100644
--- a/src/luarocks/fetch/hg.tl
+++ b/src/luarocks/fetch/hg.tl
@@ -7,8 +7,7 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 --- Download sources for building a rock, using hg.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/hg_http.tl b/src/luarocks/fetch/hg_http.tl
index 218543cd..a4ce48fd 100644
--- a/src/luarocks/fetch/hg_http.tl
+++ b/src/luarocks/fetch/hg_http.tl
@@ -10,8 +10,7 @@ end
 
 local hg = require("luarocks.fetch.hg")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 --- Download sources for building a rock, using hg over http.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/sscm.tl b/src/luarocks/fetch/sscm.tl
index fd9b2ef5..7c850a4b 100644
--- a/src/luarocks/fetch/sscm.tl
+++ b/src/luarocks/fetch/sscm.tl
@@ -6,8 +6,7 @@ end
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 --- Download sources via Surround SCM Server for building a rock.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/fetch/svn.tl b/src/luarocks/fetch/svn.tl
index fc4ba2a5..4d738d74 100644
--- a/src/luarocks/fetch/svn.tl
+++ b/src/luarocks/fetch/svn.tl
@@ -7,8 +7,7 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 --- Download sources for building a rock, using Subversion.
 -- @param rockspec table: The rockspec table
diff --git a/src/luarocks/manif.tl b/src/luarocks/manif.tl
index 6fbf3fb2..ce3ca5c0 100644
--- a/src/luarocks/manif.tl
+++ b/src/luarocks/manif.tl
@@ -24,8 +24,7 @@ local util = require("luarocks.util")
 local queries = require("luarocks.queries")
 local type_manifest = require("luarocks.type.manifest")
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 local type m = require("luarocks.core.types.manifest")
 local type Manifest = m.Manifest
 local type Tree_manifest = m.Tree_manifest
diff --git a/src/luarocks/manif/writer.tl b/src/luarocks/manif/writer.tl
index 5af74e6a..24161af5 100644
--- a/src/luarocks/manif/writer.tl
+++ b/src/luarocks/manif/writer.tl
@@ -19,8 +19,7 @@ local queries = require("luarocks.queries")
 local type m = require("luarocks.core.types.manifest")
 local type Manifest = m.Manifest
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 local type res = require("luarocks.core.types.result")
 local type Result = res.Result
diff --git a/src/luarocks/pack.tl b/src/luarocks/pack.tl
index 037a1069..e4ffd117 100644
--- a/src/luarocks/pack.tl
+++ b/src/luarocks/pack.tl
@@ -15,8 +15,7 @@ local manif = require("luarocks.manif")
 local search = require("luarocks.search")
 local signing = require("luarocks.signing")
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
 local type q = require("luarocks.core.types.query")
 local type Query = q.Query
diff --git a/src/luarocks/path.tl b/src/luarocks/path.tl
index d6a06b5d..dae3e318 100644
--- a/src/luarocks/path.tl
+++ b/src/luarocks/path.tl
@@ -8,8 +8,7 @@ local core = require("luarocks.core.path")
 local dir = require("luarocks.dir")
 local util = require("luarocks.core.util")
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
 local record path
    rocks_dir: function(string | Tree): string
diff --git a/src/luarocks/repos.tl b/src/luarocks/repos.tl
index 7b974221..ee4fcf62 100644
--- a/src/luarocks/repos.tl
+++ b/src/luarocks/repos.tl
@@ -28,11 +28,9 @@ local type rm = require("luarocks.core.types.rockmanifest")
 local type RockManifest = rm.RockManifest
 local type Entry = RockManifest.Entry
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
 local type Op = repos.Op
 local type Paths = repos.Paths
diff --git a/src/luarocks/search.tl b/src/luarocks/search.tl
index 3737b26a..97287a0f 100644
--- a/src/luarocks/search.tl
+++ b/src/luarocks/search.tl
@@ -18,8 +18,7 @@ local type Query = q.Query
 local type ver = require("luarocks.core.types.version")
 local type Version = ver.Version
 
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
+local type Tree = require("luarocks.core.types.tree").Tree
 
 --- Store a search result (a rock or rockspec) in the result tree.
 -- @param result_tree table: The result tree, where keys are package names and
diff --git a/src/luarocks/test.tl b/src/luarocks/test.tl
index b60e3458..d2e36409 100644
--- a/src/luarocks/test.tl
+++ b/src/luarocks/test.tl
@@ -5,9 +5,8 @@ local fetch = require("luarocks.fetch")
 local deps = require("luarocks.deps")
 local util = require("luarocks.util")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
-local type Dependencies = r.Dependencies
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
+local type Dependencies = require("luarocks.core.types.rockspec").Dependencies
 
 local type t = require("luarocks.core.types.testrunner")
 local type TestRunner = t.TestRunner
diff --git a/src/luarocks/test/busted.tl b/src/luarocks/test/busted.tl
index 01473f1f..832a81b7 100644
--- a/src/luarocks/test/busted.tl
+++ b/src/luarocks/test/busted.tl
@@ -9,8 +9,7 @@ local dir = require("luarocks.dir")
 local queries = require("luarocks.queries")
 local install = require("luarocks.cmd.install")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Test = r.Test
+local type Test = require("luarocks.core.types.rockspec").Test
 
 function busted.detect_type(): boolean
    if fs.exists(".busted") then
diff --git a/src/luarocks/test/command.tl b/src/luarocks/test/command.tl
index 2a1e3ce9..217a34fc 100644
--- a/src/luarocks/test/command.tl
+++ b/src/luarocks/test/command.tl
@@ -5,8 +5,7 @@ end
 local fs = require("luarocks.fs")
 local cfg = require("luarocks.core.cfg")
 
-local type r = require("luarocks.core.types.rockspec")
-local type Test = r.Test
+local type Test = require("luarocks.core.types.rockspec").Test
 
 function command.detect_type(): boolean
    if fs.exists("test.lua") then
diff --git a/src/luarocks/type/rockspec.tl b/src/luarocks/type/rockspec.tl
index 8458c6f7..52c0c029 100644
--- a/src/luarocks/type/rockspec.tl
+++ b/src/luarocks/type/rockspec.tl
@@ -6,8 +6,7 @@ end
 local type o = require("luarocks.core.types.ordering")
 local type Ordering = o.Ordering
 
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 local type_check = require("luarocks.type_check")
 
diff --git a/src/luarocks/upload/api.tl b/src/luarocks/upload/api.tl
index 4ea9f922..86a9e5cb 100644
--- a/src/luarocks/upload/api.tl
+++ b/src/luarocks/upload/api.tl
@@ -11,13 +11,6 @@ local record api
       debug: boolean
       _server_tool_version: string
    end
-
-   record Args
-      server: string
-      temp_key: string
-      api_key: string
-      debug: boolean
-   end
 end
 
 local cfg = require("luarocks.core.cfg")
@@ -31,7 +24,7 @@ local dir_sep = package.config:sub(1, 1)
 
 local type Parameters = multipart.Parameters
 local type Api = api.Api
-local type Args = api.Args
+local type Args = require("luarocks.core.types.args").Args
 local type Configuration = api.Configuration
 local type File = multipart.File
 
diff --git a/src/luarocks/util.tl b/src/luarocks/util.tl
index c03751e6..79378416 100644
--- a/src/luarocks/util.tl
+++ b/src/luarocks/util.tl
@@ -51,8 +51,7 @@ util.keys = core.keys
 util.matchquote = core.matchquote
 
 local type Fn = util.Fn
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
+local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser