12 files changed, 149 insertions, 305 deletions

diff --git a/src/luarocks/core/manif-incomplete.lua b/src/luarocks/core/manif-original.lua
index 758b76db..3925f636 100644
--- a/src/luarocks/core/manif-incomplete.lua
+++ b/src/luarocks/core/manif-original.lua
@@ -1,112 +1,62 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local table = _tl_compat and _tl_compat.table or table
 
+--- Core functions for querying manifest files.
 local manif = {}
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 local persist = require("luarocks.core.persist")
 local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.core.dir")
 local util = require("luarocks.core.util")
 local vers = require("luarocks.core.vers")
 local path = require("luarocks.core.path")
+local require = nil
+--------------------------------------------------------------------------------
 
-
-
-
+-- Table with repository identifiers as keys and tables mapping
+-- Lua versions to cached loaded manifests as values.
 local manifest_cache = {}
 
-
-
-
-
+--- Cache a loaded manifest.
+-- @param repo_url string: The repository identifier.
+-- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
+-- @param manifest table: the manifest to be cached.
 function manif.cache_manifest(repo_url, lua_version, manifest)
    lua_version = lua_version or cfg.lua_version
    manifest_cache[repo_url] = manifest_cache[repo_url] or {}
    manifest_cache[repo_url][lua_version] = manifest
 end
 
-
-
-
-
+--- Attempt to get cached loaded manifest.
+-- @param repo_url string: The repository identifier.
+-- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
+-- @return table or nil: loaded manifest or nil if cache is empty.
 function manif.get_cached_manifest(repo_url, lua_version)
    lua_version = lua_version or cfg.lua_version
    return manifest_cache[repo_url] and manifest_cache[repo_url][lua_version]
 end
 
-
-
-
-
-
-
-
+--- Back-end function that actually loads the manifest
+-- and stores it in the manifest cache.
+-- @param file string: The local filename of the manifest file.
+-- @param repo_url string: The repository identifier.
+-- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
+-- @return table or (nil, string, string): the manifest or nil,
+-- error message and error code ("open", "load", "run").
 function manif.manifest_loader(file, repo_url, lua_version)
    local manifest, err, errcode = persist.load_into_table(file)
-   if not (type(manifest) == "table") then
-      return nil, "Failed loading manifest for " .. repo_url .. ": " .. err, errcode
+   if not manifest then
+      return nil, "Failed loading manifest for "..repo_url..": "..err, errcode
    end
    manif.cache_manifest(repo_url, lua_version, manifest)
    return manifest, err, errcode
 end
 
-
-
-
-
-
+--- Load a local manifest describing a repository.
+-- This is used by the luarocks.loader only.
+-- @param repo_url string: URL or pathname for the repository.
+-- @return table or (nil, string, string): A table representing the manifest,
+-- or nil followed by an error message and an error code, see manifest_loader.
 function manif.fast_load_local_manifest(repo_url)
+   assert(type(repo_url) == "string")
 
    local cached_manifest = manif.get_cached_manifest(repo_url)
    if cached_manifest then
@@ -114,15 +64,15 @@ function manif.fast_load_local_manifest(repo_url)
    end
 
    local pathname = dir.path(repo_url, "manifest")
-   return manif.manifest_loader(pathname, repo_url, nil)
+   return manif.manifest_loader(pathname, repo_url, nil, true)
 end
 
 function manif.load_rocks_tree_manifests(deps_mode)
    local trees = {}
    path.map_trees(deps_mode, function(tree)
-      local manifest = manif.fast_load_local_manifest(path.rocks_dir(tree))
+      local manifest, err = manif.fast_load_local_manifest(path.rocks_dir(tree))
       if manifest then
-         table.insert(trees, { tree = tree, manifest = manifest })
+         table.insert(trees, {tree=tree, manifest=manifest})
       end
    end)
    return trees
diff --git a/src/luarocks/core/manif.lua b/src/luarocks/core/manif.lua
index 3925f636..7d7d68fa 100644
--- a/src/luarocks/core/manif.lua
+++ b/src/luarocks/core/manif.lua
@@ -1,62 +1,88 @@
-
---- Core functions for querying manifest files.
-local manif = {}
-
-local persist = require("luarocks.core.persist")
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local table = _tl_compat and _tl_compat.table or table; local persist = require("luarocks.core.persist")
 local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.core.dir")
 local util = require("luarocks.core.util")
 local vers = require("luarocks.core.vers")
 local path = require("luarocks.core.path")
-local require = nil
---------------------------------------------------------------------------------
 
--- Table with repository identifiers as keys and tables mapping
--- Lua versions to cached loaded manifests as values.
+
+
+
+local manif = {DependencyVersion = {}, Manifest = {}, Tree_manifest = {}, }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 local manifest_cache = {}
 
---- Cache a loaded manifest.
--- @param repo_url string: The repository identifier.
--- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
--- @param manifest table: the manifest to be cached.
+
+
+
+
 function manif.cache_manifest(repo_url, lua_version, manifest)
    lua_version = lua_version or cfg.lua_version
-   manifest_cache[repo_url] = manifest_cache[repo_url] or {}
-   manifest_cache[repo_url][lua_version] = manifest
+   manifest_cache.repository[repo_url] = manifest_cache.repository[repo_url] or {}
+   manifest_cache.repository[repo_url][lua_version] = manifest
 end
 
---- Attempt to get cached loaded manifest.
--- @param repo_url string: The repository identifier.
--- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
--- @return table or nil: loaded manifest or nil if cache is empty.
+
+
+
+
 function manif.get_cached_manifest(repo_url, lua_version)
    lua_version = lua_version or cfg.lua_version
-   return manifest_cache[repo_url] and manifest_cache[repo_url][lua_version]
+   return manifest_cache.repository[repo_url] and manifest_cache.repository[repo_url][lua_version]
 end
 
---- Back-end function that actually loads the manifest
--- and stores it in the manifest cache.
--- @param file string: The local filename of the manifest file.
--- @param repo_url string: The repository identifier.
--- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
--- @return table or (nil, string, string): the manifest or nil,
--- error message and error code ("open", "load", "run").
+
+
+
+
+
+
+
 function manif.manifest_loader(file, repo_url, lua_version)
    local manifest, err, errcode = persist.load_into_table(file)
-   if not manifest then
-      return nil, "Failed loading manifest for "..repo_url..": "..err, errcode
+   if type(err) == "string" then
+      return nil, "Failed loading manifest for " .. repo_url .. ": " .. err, errcode
    end
+
    manif.cache_manifest(repo_url, lua_version, manifest)
-   return manifest, err, errcode
+   return manifest
 end
 
---- Load a local manifest describing a repository.
--- This is used by the luarocks.loader only.
--- @param repo_url string: URL or pathname for the repository.
--- @return table or (nil, string, string): A table representing the manifest,
--- or nil followed by an error message and an error code, see manifest_loader.
+
+
+
+
+
 function manif.fast_load_local_manifest(repo_url)
-   assert(type(repo_url) == "string")
 
    local cached_manifest = manif.get_cached_manifest(repo_url)
    if cached_manifest then
@@ -64,15 +90,16 @@ function manif.fast_load_local_manifest(repo_url)
    end
 
    local pathname = dir.path(repo_url, "manifest")
-   return manif.manifest_loader(pathname, repo_url, nil, true)
+   return manif.manifest_loader(pathname, repo_url, nil)
 end
 
 function manif.load_rocks_tree_manifests(deps_mode)
    local trees = {}
    path.map_trees(deps_mode, function(tree)
-      local manifest, err = manif.fast_load_local_manifest(path.rocks_dir(tree))
+      local manifest = manif.fast_load_local_manifest(path.rocks_dir(tree))
       if manifest then
-         table.insert(trees, {tree=tree, manifest=manifest})
+         local tree_manifest = { tree = tree, manifest = manifest }
+         table.insert(trees, tree_manifest)
       end
    end)
    return trees
diff --git a/src/luarocks/core/manif.tl b/src/luarocks/core/manif.tl
index 24178f14..cf698d82 100644
--- a/src/luarocks/core/manif.tl
+++ b/src/luarocks/core/manif.tl
@@ -1,9 +1,17 @@
+local persist = require("luarocks.core.persist")
+local cfg = require("luarocks.core.cfg")
+local dir = require("luarocks.core.dir")
+local util = require("luarocks.core.util")
+local vers = require("luarocks.core.vers")
+local path = require("luarocks.core.path")
+
+local type Constraints = vers.Constraints
 
 --- Core functions for querying manifest files.
 local record manif
    
    record DependencyVersion
-      constraints: {Constraints} --? vers.Constraints
+      constraints: {Constraints}
       name: string
    end
    
@@ -21,15 +29,8 @@ local record manif
    end
 end
 
-local persist = require("luarocks.core.persist") --!
-local cfg = require("luarocks.core.cfg")
-local dir = require("luarocks.core.dir")
-local util = require("luarocks.core.util")
-local vers = require("luarocks.core.vers")
-local path = require("luarocks.core.path")
 --------------------------------------------------------------------------------
  
-local type Constraints = vers.Constraints
 local type DependencyVersion = manif.DependencyVersion
 local type Manifest = manif.Manifest
 local type Tree_manifest = manif.Tree_manifest
@@ -38,7 +39,7 @@ local type Tree_manifest = manif.Tree_manifest
 
 -- Table with repository identifiers as keys and tables mapping
 -- Lua versions to cached loaded manifests as values.
-local manifest_cache: Manifest= {} --?
+local manifest_cache: Manifest = {}
 
 --- Cache a loaded manifest.
 -- @param repo_url string: The repository identifier.
@@ -56,7 +57,7 @@ end
 -- @return table or nil: loaded manifest or nil if cache is empty.
 function manif.get_cached_manifest(repo_url: string, lua_version: string): Manifest
    lua_version = lua_version or cfg.lua_version
-   return manifest_cache.repository[repo_url] and manifest_cache.repository[repo_url][lua_version] --!
+   return manifest_cache.repository[repo_url] and manifest_cache.repository[repo_url][lua_version]
 end
 
 --- Back-end function that actually loads the manifest
@@ -66,13 +67,14 @@ end
 -- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
 -- @return table or (nil, string, string): the manifest or nil,
 -- error message and error code ("open", "load", "run").
-function manif.manifest_loader(file: string, repo_url: string, lua_version: string): Manifest | nil, string, string
+function manif.manifest_loader(file: string, repo_url: string, lua_version: string): Manifest, string, string
    local manifest, err, errcode: {any: any}, {any: any} | string, string = persist.load_into_table(file)
-   if not manifest is Manifest then --! Manifest != {any:any}
-      return nil, "Failed loading manifest for "..repo_url..": "..err, errcode
+   if err is string then
+      return nil, "Failed loading manifest for "..repo_url..": " ..err, errcode
    end
-   manif.cache_manifest(repo_url, lua_version, manifest)
-   return manifest, err, errcode
+   
+   manif.cache_manifest(repo_url, lua_version, manifest as Manifest) -- No runtime check if manifest is actually a Manifest!
+   return manifest as Manifest
 end
 
 --- Load a local manifest describing a repository.
@@ -93,7 +95,7 @@ end
 
 function manif.load_rocks_tree_manifests(deps_mode: string): {Tree_manifest}
    local trees = {}
-   path.map_trees(deps_mode, function(tree: cfg.Tree) --! tree: cfg.Tree
+   path.map_trees(deps_mode, function(tree: cfg.Tree)
       local manifest= manif.fast_load_local_manifest(path.rocks_dir(tree))
       if manifest then
          local tree_manifest: Tree_manifest = {tree=tree, manifest=manifest}
@@ -124,7 +126,7 @@ function manif.scan_dependencies(name: string, version: string, tree_manifests:
                local entries = t.manifest.repository[pkg]
                if entries then
                   for ver, _ in util.sortedpairs(entries, vers.compare_versions) do
-                     if (not constraints) or vers.match_constraints(vers.parse_version(ver), constraints) then --!
+                     if (not constraints) or vers.match_constraints(vers.parse_version(ver), constraints) then
                         manif.scan_dependencies(pkg, ver, tree_manifests, dest)
                      end
                   end
diff --git a/src/luarocks/core/util.lua b/src/luarocks/core/util.lua
index 9ddf27a2..8c995fa6 100644
--- a/src/luarocks/core/util.lua
+++ b/src/luarocks/core/util.lua
@@ -295,11 +295,12 @@ function util.sortedpairs(tbl, sort_function)
 
       for _, order_entry in ipairs(order) do
          local key, sub_order
-         if type(order_entry) == "table" then
+
+         if not (type(order_entry) == "table") then
+            key = order_entry
+         else
             key = order_entry[1]
             sub_order = order_entry[2]
-         else
-            key = order_entry
          end
 
          if tbl[key] then
diff --git a/src/luarocks/core/util.tl b/src/luarocks/core/util.tl
index 759a7147..d20fa2e0 100644
--- a/src/luarocks/core/util.tl
+++ b/src/luarocks/core/util.tl
@@ -233,7 +233,7 @@ end
 --- Return an array of keys of a table.
 -- @param tbl table: The input table.
 -- @return table: The array of keys.
-function util.keys(tbl: {any:any}): {any}
+function util.keys<K, V>(tbl: {K: V}): {K}
    local ks = {}
    for k,_ in pairs(tbl) do
       table.insert(ks, k)
@@ -278,12 +278,12 @@ end
 -- for that key, which is returned by the iterator as the third value after the key
 -- and the value.
 -- @return function: the iterator function.
-function util.sortedpairs(tbl: {any: any}, sort_function: CompFn | {any} | nil): function(): any, any, any
+function util.sortedpairs<K, V, S>(tbl: {K: V}, sort_function: CompFn | {K | {K, S}}): function(): K, V, S
    if not sort_function then
       sort_function = default_sort
    end
    local keys = util.keys(tbl)
-   local sub_orders = {}
+   local sub_orders: {K: S} = {}
 
    if sort_function is CompFn then
       table.sort(keys, sort_function)
@@ -294,12 +294,13 @@ function util.sortedpairs(tbl: {any: any}, sort_function: CompFn | {any} | nil):
       keys = {}
 
       for _, order_entry in ipairs(order) do
-         local key, sub_order: any, any
-         if order_entry is {any: any} then
+         local key, sub_order: K, S
+
+         if not order_entry is {K, S} then --TEAL BUG
+            key = order_entry as K
+         else
             key = order_entry[1]
             sub_order = order_entry[2]
-         else
-            key = order_entry
          end
 
          if tbl[key] then
@@ -318,7 +319,7 @@ function util.sortedpairs(tbl: {any: any}, sort_function: CompFn | {any} | nil):
    end
 
    local i = 1
-   return function(): any, any, any
+   return function(): K, V, S
       local key = keys[i]
       i = i + 1
       return key, tbl[key], sub_orders[key]
diff --git a/src/luarocks/dir-original.lua b/src/luarocks/dir.lua
index be89e37b..be89e37b 100644
--- a/src/luarocks/dir-original.lua
+++ b/src/luarocks/dir.lua
diff --git a/src/luarocks/dir.tl b/src/luarocks/dir.tl
index 86098413..d349ac71 100644
--- a/src/luarocks/dir.tl
+++ b/src/luarocks/dir.tl
@@ -1,11 +1,14 @@
 
 --- Generic utilities for handling pathnames.
 local record dir
+   path: function(...: string): string
+   split_url: function(string): string, string
+   normalize: function(string): string
 end
 
 local core = require("luarocks.core.dir")
 
-dir.path = core.path --!
+dir.path = core.path
 dir.split_url = core.split_url
 dir.normalize = core.normalize
 
@@ -47,7 +50,7 @@ end
 
 --- Returns true if protocol does not require additional tools.
 -- @param protocol The protocol name
-function dir.is_basic_protocol(protocol: string): boolean --? extra type (enum)
+function dir.is_basic_protocol(protocol: string): boolean
    return protocol == "http" or protocol == "https" or protocol == "ftp" or protocol == "file"
 end
 
diff --git a/src/luarocks/fs.d.tl b/src/luarocks/fs.d.tl
new file mode 100644
index 00000000..b0ca56c7
--- /dev/null
+++ b/src/luarocks/fs.d.tl
@@ -0,0 +1,13 @@
+local record fs
+   verbose: function(): FILE | boolean, string, integer
+   load_fns: function(fs_table: FsTable, inits: {any:any}): function
+   load_platform_fns: function(patt: any, inits: {any:any}): string
+   init: function
+   change_dir_to_root: function
+   record FsTable
+   end
+
+   --...
+end
+
+return fs
diff --git a/src/luarocks/fs-original.lua b/src/luarocks/fs.lua
index a8156a21..a8156a21 100644
--- a/src/luarocks/fs-original.lua
+++ b/src/luarocks/fs.lua
diff --git a/src/luarocks/fs.tl b/src/luarocks/fs.tl
deleted file mode 100644
index c31d3b5a..00000000
--- a/src/luarocks/fs.tl
+++ /dev/null
@@ -1,151 +0,0 @@
-
---- Proxy module for filesystem and platform abstractions.
--- All code using "fs" code should require "luarocks.fs",
--- and not the various platform-specific implementations.
--- However, see the documentation of the implementation
--- for the API reference.
-
-local pairs = pairs --?
-
-local record fs
-
-end
-
--- To avoid a loop when loading the other fs modules.
-package.loaded["luarocks.fs"] = fs
-
-local cfg = require("luarocks.core.cfg")
-
-local pack = table.pack or function(...) return { n = select("#", ...), ... } end --!
-
-math.randomseed(os.time())
-
-local fs_is_verbose = false
-
-do
-   local old_popen, old_execute: function(string, string): (FILE, string), function(string): (boolean, string, integer) --! () around output to seperate
-
-   -- patch io.popen and os.execute to display commands in verbose mode
-   function fs.verbose()
-      fs_is_verbose = true
-
-      if old_popen or old_execute then return end --? == nil!
-      old_popen = io.popen
-      -- luacheck: push globals io os
-      io.popen = function(one: string, two: string): FILE, string
-         if two == nil then
-            print("\nio.popen: ", one)
-         else
-            print("\nio.popen: ", one, "Mode:", two)
-         end
-         return old_popen(one, two)
-      end
-
-      old_execute = os.execute
-      os.execute = function(cmd: string): boolean, string, integer
-         -- redact api keys if present
-         print("\nos.execute: ", (cmd:gsub("(/api/[^/]+/)([^/]+)/", function(cap: string, key): string return cap.."<redacted>/" end)) ) --! key is unused
-         local a, b, c = old_execute(cmd)
-         if type(a) == "boolean" then
-            print((a and ".........." or "##########") .. ": " .. tostring(c) .. (b == "exit" and "" or " (" .. tostring(b) .. ")"))
-         elseif type(a) == "number" then --! "a" needs to be a boolean
-            print(((a == 0) and ".........." or "##########") .. ": " .. tostring(a))
-         end
-         return a, b, c
-      end
-      -- luacheck: pop
-   end
-end
-
-do
-   local skip_verbose_wrap = {
-      ["current_dir"] = true,
-   }
-
-   local function load_fns(fs_table, inits)
-      for name, fn in pairs(fs_table) do
-         if name ~= "init" and not fs[name] then
-            if skip_verbose_wrap[name] then
-               fs[name] = fn
-            else
-               fs[name] = function(...)
-                  if fs_is_verbose then
-                     local args = pack(...)
-                     for i=1, args.n do
-                        local arg = args[i]
-                        local pok, v = pcall(string.format, "%q", arg)
-                        args[i] = pok and v or tostring(arg)
-                     end
-                     print("fs." .. name .. "(" .. table.concat(args, ", ") .. ")")
-                  end
-                  return fn(...)
-               end
-            end
-         end
-      end
-      if fs_table.init then
-         table.insert(inits, fs_table.init)
-      end
-   end
-
-   local function load_platform_fns(patt, inits)
-      local each_platform = cfg.each_platform
-
-      -- FIXME A quick hack for the experimental Windows build
-      if os.getenv("LUAROCKS_CROSS_COMPILING") then
-         each_platform = function()
-            local i = 0
-            local plats = { "linux", "unix" }
-            return function()
-               i = i + 1
-               return plats[i]
-            end
-         end
-      end
-
-      for platform in each_platform("most-specific-first") do
-         local ok, fs_plat = pcall(require, patt:format(platform))
-         if ok and fs_plat then
-            load_fns(fs_plat, inits)
-         end
-      end
-   end
-
-   function fs.init()
-      local inits = {}
-
-      if fs.current_dir then
-         -- unload luarocks fs so it can be reloaded using all modules
-         -- providing extra functionality in the current package paths
-         for k, _ in pairs(fs) do
-            if k ~= "init" and k ~= "verbose" then
-               fs[k] = nil
-            end
-         end
-         for m, _ in pairs(package.loaded) do
-            if m:match("luarocks%.fs%.") then
-               package.loaded[m] = nil
-            end
-         end
-      end
-
-      -- Load platform-specific functions
-      load_platform_fns("luarocks.fs.%s", inits)
-
-      -- Load platform-independent pure-Lua functionality
-      load_fns(require("luarocks.fs.lua"), inits)
-
-      -- Load platform-specific fallbacks for missing Lua modules
-      load_platform_fns("luarocks.fs.%s.tools", inits)
-
-      -- Load platform-independent external tool functionality
-      load_fns(require("luarocks.fs.tools"), inits)
-
-      -- Run platform-specific initializations after everything is loaded
-      for _, init in ipairs(inits) do
-         init()
-      end
-   end
-end
-
-return fs
diff --git a/src/luarocks/util-original.lua b/src/luarocks/util.lua
index de9157fc..de9157fc 100644
--- a/src/luarocks/util-original.lua
+++ b/src/luarocks/util.lua
diff --git a/src/luarocks/util.tl b/src/luarocks/util.tl
index 41855aae..f556cb03 100644
--- a/src/luarocks/util.tl
+++ b/src/luarocks/util.tl
@@ -20,8 +20,6 @@ util.printerr = core.printerr
 util.warning = core.warning
 util.keys = core.keys
 
-local unpack = unpack or table.unpack --!
-local pack = table.pack or function(...) return { n = select("#", ...), ... } end --!
 
 local scheduled_functions: {integer: {string: any}} = {} --? infered from line 48-51
 
@@ -35,7 +33,7 @@ local scheduled_functions: {integer: {string: any}} = {} --? infered from line 4
 function util.schedule_function(f: function(), ...:any): {string:any}
    assert(type(f) == "function")
 
-   local item = { fn = f, args = pack(...) }
+   local item = { fn = f, args = table.pack(...) }
    table.insert(scheduled_functions, item)
    return item
 end
@@ -65,7 +63,7 @@ function util.run_scheduled_functions()
    end
    for i = #scheduled_functions, 1, -1 do
       local item = scheduled_functions[i]
-      item.fn(unpack(item.args, 1, item.args.n))
+      item.fn(table.unpack(item.args, 1, item.args.n))
    end
 end