new types propagated more

7 files changed, 74 insertions, 36 deletions

diff --git a/src/luarocks/core/util.tl b/src/luarocks/core/util.tl
index ad6d8f9e..56c0072e 100644
--- a/src/luarocks/core/util.tl
+++ b/src/luarocks/core/util.tl
@@ -5,8 +5,8 @@ end
 --------------------------------------------------------------------------------
 
 local type ordering = require("luarocks.core.types.ordering")
-local type Ordering<K> = ordering.Ordering<K>
-local type SortBy<K> = ordering.SortBy<K>
+local type Ordering = ordering.Ordering
+local type SortBy = ordering.SortBy
 
 local dir_sep = package.config:sub(1, 1)
 
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl
index 8fe9feff..622f9b42 100644
--- a/src/luarocks/deps.tl
+++ b/src/luarocks/deps.tl
@@ -245,7 +245,9 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
    end
 
    found, where = match_dep(dep, get_versions)
-   assert(found)
+   if not found then
+       return nil, "Repository inconsistency detected (previously unfinished/corrupted installation?)"
+   end
    return true, found, where
 end
 
diff --git a/src/luarocks/fs.d.tl b/src/luarocks/fs.d.tl
index ee471b72..e5047af7 100644
--- a/src/luarocks/fs.d.tl
+++ b/src/luarocks/fs.d.tl
@@ -25,7 +25,7 @@ local record fs
    tmpname: function(): string
    execute_string: function(string): boolean
    Q: function(string): string
-   download: function(string, string, ?boolean): boolean, string, string
+   download: function(string, string, ?boolean): boolean, string, boolean
    set_permissions: function(string, string, string)
    -- patch
    absolute_name: function(string, ?string): string
diff --git a/src/luarocks/manif.tl b/src/luarocks/manif.tl
index f0f838b8..d55be0e5 100644
--- a/src/luarocks/manif.tl
+++ b/src/luarocks/manif.tl
@@ -6,8 +6,18 @@ 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}
+   
+   record RockManifest
+      type Entry = string | {string: Entry}
+      rock_manifest: {string: Entry}
+   end
+   
 end
 
+local type RockManifest = manif.RockManifest
+local type Entry = manif.RockManifest.Entry
+
 local core = require("luarocks.core.manif")
 local persist = require("luarocks.persist")
 local fetch = require("luarocks.fetch")
@@ -21,9 +31,11 @@ local type_manifest = require("luarocks.type.manifest")
 
 local type tree = require("luarocks.core.types.tree")
 local type Tree = tree.Tree
-local type Manifest = core.Manifest
-local type Tree_manifest = core.Tree_manifest
-local type DependencyVersion = core.DependencyVersion --!
+local type manifest = require("luarocks.core.types.manifest")
+local type Manifest = manifest.Manifest
+local type Tree_manifest = manifest.Tree_manifest
+local type query = require("luarocks.core.types.query")
+local type Query = query.Query
 
 manif.cache_manifest = core.cache_manifest
 manif.load_rocks_tree_manifests = core.load_rocks_tree_manifests
@@ -31,7 +43,7 @@ manif.scan_dependencies = core.scan_dependencies
 
 manif.rock_manifest_cache = {}
 
-local function check_manifest(repo_url: string, manifest: {any: any}, globals: {string: any}): Manifest, string, string
+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)
@@ -60,7 +72,7 @@ do
    end
 end
 
-function manif.load_rock_manifest(name: string, version: string, root?: string | Tree)
+function manif.load_rock_manifest(name: string, version: string, root?: string | Tree): {string: Entry}, string
    assert(not name:match("/"))
 
    local name_version = name.."/"..version
@@ -68,7 +80,7 @@ function manif.load_rock_manifest(name: string, version: string, root?: string |
       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
@@ -192,7 +204,7 @@ 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: DependencyVersion, deps_mode: string): {string}, {string: string | Tree}
+function manif.get_versions(dep: Query, deps_mode: string): {string}, {string: string | Tree}
 
    local name: string = dep.name
    local namespace: string = dep.namespace
diff --git a/src/luarocks/rockspecs.tl b/src/luarocks/rockspecs.tl
index cdd0dcff..175428c4 100644
--- a/src/luarocks/rockspecs.tl
+++ b/src/luarocks/rockspecs.tl
@@ -11,6 +11,12 @@ local vers = require("luarocks.core.vers")
 
 local type rockspec = require("luarocks.core.types.rockspec")
 local type Rockspec = rockspec.Rockspec
+
+-- local type Query = require("luarocks.core.types.query").Query --TEAL BUG #778
+
+local type query = require("luarocks.core.types.query")
+local type Query = query.Query
+
 local type Variables = rockspec.Variables
 
 local vendored_build_type_set: {string: boolean} = {
@@ -60,19 +66,19 @@ local function platform_overrides(tbl?: {any: any})
    tbl.platforms = nil
 end
 
-local function convert_dependencies(rockspec: {string: {string}}, key: string): boolean, string
-   if rockspec[key] then
-      for i = 1, #rockspec[key] do
-         local parsed, err = queries.from_dep_string(rockspec[key][i])
-         if not parsed then
-            return nil, "Parse error processing dependency '"..rockspec[key][i].."': "..tostring(err)
-         end
-         rockspec[key][i] = parsed
+local function convert_dependencies(dependencies: {string}): {Query}, string
+   if not dependencies then
+      return {}
+   end
+   local qs: {Query} = {}
+   for i = 1, #dependencies do
+      local parsed, err = queries.from_dep_string(dependencies[i])
+      if not parsed then
+         return nil, "Parse error processing dependency '"..dependencies[i].."': "..tostring(err)
       end
-   else
-      rockspec[key] = {}
+      qs[i] = parsed
    end
-   return true
+   return qs
 end
 
 --- Set up path-related variables for a given rock.
@@ -147,11 +153,20 @@ function rockspecs.from_persisted_table(filename: string, rockspec: Rockspec, gl
 
    rockspec.rocks_provided = util.get_rocks_provided(rockspec)
 
-   for _, key in ipairs({"dependencies", "build_dependencies", "test_dependencies"}) do
-      local ok, err = convert_dependencies(rockspec, key)
-      if not ok then
-         return nil, err
-      end
+   local err: string
+   rockspec.dependencies.queries, err = convert_dependencies(rockspec.dependencies)
+   if err then
+      return nil, err
+   end
+
+   rockspec.build_dependencies.queries, err = convert_dependencies(rockspec.build_dependencies)
+   if err then
+      return nil, err
+   end
+
+   rockspec.test_dependencies.queries, err = convert_dependencies(rockspec.test_dependencies)
+   if err then
+      return nil, err
    end
 
    if rockspec.build
@@ -163,7 +178,7 @@ function rockspecs.from_persisted_table(filename: string, rockspec: Rockspec, gl
       end
 
       local found = false
-      for _, dep in ipairs(rockspec.build_dependencies) do
+      for _, dep in ipairs(rockspec.build_dependencies.queries) do
          if dep.name == build_pkg_name then
             found = true
             break
@@ -171,7 +186,11 @@ function rockspecs.from_persisted_table(filename: string, rockspec: Rockspec, gl
       end
 
       if not found then
-         table.insert(rockspec.build_dependencies, queries.from_dep_string(build_pkg_name))
+         local query, err = queries.from_dep_string(build_pkg_name)
+         if err then
+            return nil, "Invalid dependency in rockspec: " .. err
+         end
+         table.insert(rockspec.build_dependencies.queries, query)
       end
    end
 
diff --git a/src/luarocks/type/manifest.tl b/src/luarocks/type/manifest.tl
index f379f1e0..3114b82a 100644
--- a/src/luarocks/type/manifest.tl
+++ b/src/luarocks/type/manifest.tl
@@ -1,6 +1,9 @@
 local record type_manifest
 end
 
+local type manifest = require("luarocks.core.types.manifest")
+local type Manifest = manifest.Manifest
+
 local type_check = require("luarocks.type_check")
 
 local manifest_formats = type_check.declare_schemas({
@@ -80,11 +83,11 @@ local manifest_formats = type_check.declare_schemas({
 -- mismatches.
 -- @return boolean or (nil, string): true if type checking
 -- succeeded, or nil and an error message if it failed.
-function type_manifest.check(manifest: {any: any}, globals: {string: any}): boolean, string --!
+function type_manifest.check(manifest: Manifest, globals: {string: any}): boolean, string --!
    local format = manifest_formats["3.0"]
    local ok, err = type_check.check_undeclared_globals(globals, format)
    if not ok then return nil, err end
-   return type_check.type_check_table("3.0", manifest, format, "")
+   return type_check.type_check_table("3.0", manifest as {any: any}, format, "")
 end
 
 return type_manifest
diff --git a/src/luarocks/type/rockspec.tl b/src/luarocks/type/rockspec.tl
index 1b03736d..014dc4d3 100644
--- a/src/luarocks/type/rockspec.tl
+++ b/src/luarocks/type/rockspec.tl
@@ -6,8 +6,10 @@ end
 local type ordering = require("luarocks.core.types.ordering")
 local type Ordering = ordering.Ordering
 
+local type rockspec = require("luarocks.core.types.rockspec")
+local type Rockspec = rockspec.Rockspec
+
 local type_check = require("luarocks.type_check")
-local util = require("luarocks.core.util") --!
 
 -- local type TableSchema = type_check.TableSchema
 
@@ -206,14 +208,14 @@ type_rockspec.order = {
    }
 }
 
-local function check_rockspec_using_version(rockspec: {any: any}, globals: {string: any}, version: string): boolean, string
+local function check_rockspec_using_version(rockspec: Rockspec, globals: {string: any}, version: string): boolean, string
    local schema = rockspec_formats[version]
    if not schema then
       return nil, "unknown rockspec format " .. version
    end
    local ok, err = type_check.check_undeclared_globals(globals, schema)
    if ok then
-      ok, err = type_check.type_check_table(version, rockspec, schema, "")
+      ok, err = type_check.type_check_table(version, rockspec as {any: any}, schema, "")
    end
    if ok then
       return true
@@ -228,9 +230,9 @@ end
 -- mismatches.
 -- @return boolean or (nil, string): true if type checking
 -- succeeded, or nil and an error message if it failed.
-function type_rockspec.check(rockspec: {any: any}, globals: {string: any}): boolean, string
+function type_rockspec.check(rockspec: Rockspec, globals: {string: any}): boolean, string
 
-   local version: string = rockspec.rockspec_format as string or "1.0" --! tostring
+   local version: string = rockspec.rockspec_format as string or "1.0"
    local ok, err = check_rockspec_using_version(rockspec, globals, version)
    if ok then
       return true