Teal: convert luarocks.manif

author: V1K1NGbg <victor@ilchev.com> 2024-08-22 17:49:00 -0300
committer: Hisham Muhammad <hisham@gobolinux.org> 2024-10-21 13:30:51 -0300
commit: 8286ac6ca0a0d17b72132c5cfab4eadea7c5d384 (patch)
tree: a1f0014658ab3a15fae405c9ebe9f960ccd60df8
parent: ef6ae68c57b74430654987f159af1f1e902f67c2 (diff)
download: luarocks-8286ac6ca0a0d17b72132c5cfab4eadea7c5d384.tar.gz
luarocks-8286ac6ca0a0d17b72132c5cfab4eadea7c5d384.tar.bz2
luarocks-8286ac6ca0a0d17b72132c5cfab4eadea7c5d384.zip
1 files changed, 37 insertions, 33 deletions
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.tl
index a4ddda11..23ed081b 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.tl
@@ -2,7 +2,15 @@
 -- Manifest files describe the contents of a LuaRocks tree or server.
 -- They are loaded into manifest tables, which are then used for
 -- performing searches, matching dependencies, etc.
-local manif = {}
+local record manif
+   cache_manifest: function(string, string, Manifest)
+   load_rocks_tree_manifests: function(? string): {Tree_manifest}
+   scan_dependencies: function(string, string, {Tree_manifest}, {any : any})
+   rock_manifest_cache: {string: RockManifest}
+end
+local type RockManifest = require("luarocks.core.types.rockmanifest").RockManifest
+local type Entry = require("luarocks.core.types.rockmanifest").RockManifest.Entry
 local core = require("luarocks.core.manif")
 local persist = require("luarocks.persist")
@@ -15,13 +23,18 @@ local util = require("luarocks.util")
 local queries = require("luarocks.queries")
 local type_manifest = require("luarocks.type.manifest")
+local type Tree = require("luarocks.core.types.tree").Tree
+local type Manifest = require("luarocks.core.types.manifest").Manifest
+local type Tree_manifest = require("luarocks.core.types.manifest").Tree_manifest
+local type Query = require("luarocks.core.types.query").Query
 manif.cache_manifest = core.cache_manifest
 manif.load_rocks_tree_manifests = core.load_rocks_tree_manifests
 manif.scan_dependencies = core.scan_dependencies
 manif.rock_manifest_cache = {}
-local function check_manifest(repo_url, manifest, globals)
+local function check_manifest(repo_url: string, manifest: Manifest, globals: {string: any}): Manifest, string, string
   local ok, err = type_manifest.check(manifest, globals)
   if not ok then
      core.cache_manifest(repo_url, cfg.lua_version, nil)
@@ -30,17 +43,17 @@ local function check_manifest(repo_url, manifest, globals)
   return manifest
 end
-local postprocess_dependencies
+local postprocess_dependencies: function(Manifest)
 do
   local postprocess_check = setmetatable({}, { __mode = "k" })
-   postprocess_dependencies = function(manifest)
+   postprocess_dependencies = function(manifest: Manifest)
      if postprocess_check[manifest] then
         return
      end
      if manifest.dependencies then
-         for name, versions in pairs(manifest.dependencies) do
+         for _, versions in pairs(manifest.dependencies) do
-            for version, entries in pairs(versions) do
+            for _, entries in pairs(versions) do
-               for k, v in pairs(entries) do
+               for k, v in ipairs(entries) do
                  entries[k] = queries.from_persisted_table(v)
               end
            end
@@ -50,16 +63,15 @@ do
   end
 end
-function manif.load_rock_manifest(name, version, root)
+function manif.load_rock_manifest(name: string, version: string, root?: string | Tree): {string: Entry}, string
-   assert(type(name) == "string" and not name:match("/"))
+   assert(not name:match("/"))
-   assert(type(version) == "string")
   local name_version = name.."/"..version
   if manif.rock_manifest_cache[name_version] then
      return manif.rock_manifest_cache[name_version].rock_manifest
   end
   local pathname = path.rock_manifest_file(name, version, root)
-   local rock_manifest = persist.load_into_table(pathname)
+   local rock_manifest = persist.load_into_table(pathname) as RockManifest
   if not rock_manifest then
      return nil, "rock_manifest file not found for "..name.." "..version.." - not a LuaRocks tree?"
   end
@@ -76,9 +88,7 @@ end
 -- if a versioned manifest was not found.
 -- @return table or (nil, string, [string]): A table representing the manifest,
 -- or nil followed by an error message and an optional error code.
-function manif.load_manifest(repo_url, lua_version, versioned_only)
+function manif.load_manifest(repo_url: string, lua_version?: string, versioned_only?: boolean): Manifest, string, string
-   assert(type(repo_url) == "string")
-   assert(type(lua_version) == "string" or not lua_version)
   lua_version = lua_version or cfg.lua_version
   local cached_manifest = core.get_cached_manifest(repo_url, lua_version)
@@ -94,7 +104,7 @@ function manif.load_manifest(repo_url, lua_version, versioned_only)
   }
   local protocol, repodir = dir.split_url(repo_url)
-   local pathname, from_cache
+   local pathname, from_cache: string, boolean
   if protocol == "file" then
      for _, filename in ipairs(filenames) do
         pathname = dir.path(repodir, filename)
@@ -103,7 +113,7 @@ function manif.load_manifest(repo_url, lua_version, versioned_only)
         end
      end
   else
-      local err, errcode
+      local err, errcode: string, string
      for _, filename in ipairs(filenames) do
         pathname, err, errcode, from_cache = fetch.fetch_caching(dir.path(repo_url, filename), "no_mirror")
         if pathname then
@@ -132,32 +142,28 @@ function manif.load_manifest(repo_url, lua_version, versioned_only)
      pathname = nozip
   end
   local manifest, err, errcode = core.manifest_loader(pathname, repo_url, lua_version)
-   if not manifest then
+   if not manifest and err is string then --!
      return nil, err, errcode
   end
   postprocess_dependencies(manifest)
-   return check_manifest(repo_url, manifest, err)
+   return check_manifest(repo_url, manifest, err as {string: any})
 end
 --- Get type and name of an item (a module or a command) provided by a file.
 -- @param deploy_type string: rock manifest subtree the file comes from ("bin", "lua", or "lib").
 -- @param file_path string: path to the file relatively to deploy_type subdirectory.
 -- @return (string, string): item type ("module" or "command") and name.
-function manif.get_provided_item(deploy_type, file_path)
+function manif.get_provided_item(deploy_type: string, file_path: string): string, string
-   assert(type(deploy_type) == "string")
-   assert(type(file_path) == "string")
   local item_type = deploy_type == "bin" and "command" or "module"
   local item_name = item_type == "command" and file_path or path.path_to_module(file_path)
   return item_type, item_name
 end
-local function get_providers(item_type, item_name, repo)
+local function get_providers(item_type: string, item_name: string, repo: string | Tree): {string}
-   assert(type(item_type) == "string")
-   assert(type(item_name) == "string")
   local rocks_dir = path.rocks_dir(repo or cfg.root_dir)
   local manifest = manif.load_manifest(rocks_dir)
-   return manifest and manifest[item_type .. "s"][item_name]
+   return manifest and (manifest as {string: {string: {string}}})[item_type .. "s"][item_name]
 end
 --- Given a name of a module or a command, figure out which rock name and version
@@ -167,14 +173,14 @@ end
 -- @param root string or nil: A local root dir for a rocks tree. If not given, the default is used.
 -- @return (string, string) or nil: name and version of the provider rock or nil if there
 -- is no provider.
-function manif.get_current_provider(item_type, item_name, repo)
+function manif.get_current_provider(item_type: string, item_name: string, repo?: string | Tree): string, string
   local providers = get_providers(item_type, item_name, repo)
   if providers then
      return providers[1]:match("([^/]*)/([^/]*)")
   end
 end
-function manif.get_next_provider(item_type, item_name, repo)
+function manif.get_next_provider(item_type: string, item_name: string, repo?: string | Tree): string, string
   local providers = get_providers(item_type, item_name, repo)
   if providers and providers[2] then
      return providers[2]:match("([^/]*)/([^/]*)")
@@ -189,15 +195,13 @@ end
 -- or "all", to use all trees.
 -- @return table: An array of strings listing installed
 -- versions of a package, and a table indicating where they are found.
-function manif.get_versions(dep, deps_mode)
+function manif.get_versions(dep: Query, deps_mode: string): {string}, {string: string | Tree}
-   assert(type(dep) == "table")
-   assert(type(deps_mode) == "string")
-   local name = dep.name
+   local name: string = dep.name
-   local namespace = dep.namespace
+   local namespace: string = dep.namespace
   local version_set = {}
-   path.map_trees(deps_mode, function(tree)
+   path.map_trees(deps_mode, function(tree: string | Tree)
      local manifest = manif.load_manifest(path.rocks_dir(tree))
      if manifest and manifest.repository[name] then
author	V1K1NGbg <victor@ilchev.com>	2024-08-22 17:49:00 -0300
committer	Hisham Muhammad <hisham@gobolinux.org>	2024-10-21 13:30:51 -0300
commit	8286ac6ca0a0d17b72132c5cfab4eadea7c5d384 (patch)
tree	a1f0014658ab3a15fae405c9ebe9f960ccd60df8
parent	ef6ae68c57b74430654987f159af1f1e902f67c2 (diff)
download	luarocks-8286ac6ca0a0d17b72132c5cfab4eadea7c5d384.tar.gz luarocks-8286ac6ca0a0d17b72132c5cfab4eadea7c5d384.tar.bz2 luarocks-8286ac6ca0a0d17b72132c5cfab4eadea7c5d384.zip