repo_writer

6 files changed, 76 insertions, 85 deletions

diff --git a/src/luarocks/fs.d.tl b/src/luarocks/fs.d.tl
index 73848524..680369de 100644
--- a/src/luarocks/fs.d.tl
+++ b/src/luarocks/fs.d.tl
@@ -58,7 +58,7 @@ local record fs
    move: function(string, string, string): boolean, string
    -- writer
    replace_file: function(string, string): boolean, string
-   get_md5: function(string): string
+   get_md5: function(string): string, string
 end
 
 return fs
diff --git a/src/luarocks/manif/writer.tl b/src/luarocks/manif/writer.tl
index 2b303fd5..b803bff6 100644
--- a/src/luarocks/manif/writer.tl
+++ b/src/luarocks/manif/writer.tl
@@ -28,6 +28,10 @@ local type Result = res.Result
 local type p = require("luarocks.core.types.persist")
 local type PersistableTable = p.PersistableTable
 
+local type rm = require("luarocks.core.types.rockmanifest")
+local type RockManifest = rm.RockManifest
+local type Entry = rm.RockManifest.Entry
+
 --- Update storage table to account for items provided by a package.
 -- @param storage table: a table storing items in the following format:
 -- keys are item names and values are arrays of packages providing each item,
@@ -56,7 +60,7 @@ end
 -- @param items table: a table mapping item names to paths.
 -- @param name string: package name.
 -- @param version string: package version.
-local function remove_package_items(storage: {string: {string}}, name: string, version: string, items: {string: string})
+local function remove_package_items(storage: {string: {string}}, name: string, version: string, items: {string: {string}})
    assert(not name:match("/"))
 
    local package_identifier = name.."/"..version
@@ -95,8 +99,6 @@ end
 -- "all" for all trees, "order" for all trees with priority >= the current default,
 -- "none" for no trees.
 local function update_dependencies(manifest: Manifest, deps_mode: string)
-   assert(type(manifest) == "table")
-   assert(type(deps_mode) == "string")
 
    if not manifest.dependencies then manifest.dependencies = {} end
    local mdeps = manifest.dependencies
@@ -239,38 +241,6 @@ local function store_results(results: {string: {string: {Result}}}, manifest: Ma
    return true
 end
 
--- and here what would `entrytable` be, since it can either be a `Manifest` or ...
--- ```
--- local function store_results(results: {string: {string: {Result}}}, manifest: Manifest): boolean
-
---    for name, versions in pairs(results) do
---       local pkgtable = manifest.repository[name] or {}
---       for version, entries in pairs(versions) do
---          local versiontable = {}
---          for _, entry in ipairs(entries) do
---             local entrytable: Manifest = {}
---             entrytable.arch = entry.arch
---             if entry.arch == "installed" then
---                local rock_manifest, err = manif.load_rock_manifest(name, version)
---                if not rock_manifest then return nil, err end
-
---                entrytable.modules = repos.package_modules(name, version)
---                store_package_items(manifest.modules, name, version, entrytable.modules)
---                entrytable.commands = repos.package_commands(name, version)
---                store_package_items(manifest.commands, name, version, entrytable.commands)
---             end
---             table.insert(versiontable, entrytable)
---          end
---          pkgtable[version] = versiontable
---       end
---       manifest.repository[name] = pkgtable
---    end
---    sort_package_matching_table(manifest.modules)
---    sort_package_matching_table(manifest.commands)
---    return true
--- end
--- ```
-
 --- Commit a table to disk in given local path.
 -- @param where string: The directory where the table should be saved.
 -- @param name string: The filename.
@@ -290,13 +260,13 @@ end
 
 function writer.make_rock_manifest(name: string, version: string): boolean, string
    local install_dir = path.install_dir(name, version)
-   local tree: {string: {string}} = {}
+   local tree: {string: Entry} = {}
    for _, file in ipairs(fs.find(install_dir)) do
       local full_path = dir.path(install_dir, file)
       local walk = tree
-      local last: {string : {string}}
+      local last: {string : Entry}
       local last_name: string
-      local next: {string}
+      local next: Entry
       for filename in file:gmatch("[^\\/]+") do
          next = walk[filename]
          if not next then
@@ -305,9 +275,14 @@ function writer.make_rock_manifest(name: string, version: string): boolean, stri
          end
          last = walk
          last_name = filename
-         walk = next
+         if not next is string then
+            walk = next
+         else
+            return nil, "Next was string, expected a table"
+         end
       end
       if fs.is_file(full_path) then
+
          local sum, err = fs.get_md5(full_path)
          if not sum then
             return nil, "Failed producing checksum: "..tostring(err)
@@ -315,48 +290,12 @@ function writer.make_rock_manifest(name: string, version: string): boolean, stri
          last[last_name] = sum
       end
    end
-   local rock_manifest = { rock_manifest=tree }
+   local rock_manifest: RockManifest = { rock_manifest=tree }
    manif.rock_manifest_cache[name.."/"..version] = rock_manifest
-   save_table(install_dir, "rock_manifest", rock_manifest )
+   save_table(install_dir, "rock_manifest", rock_manifest as PersistableTable)
    return true
 end
 
--- in this code, what would next and walk be, since we have `walk[filename] = next`,  but also `walk = next`
--- ```
--- function writer.make_rock_manifest(name: string, version: string): boolean, string
---    local install_dir = path.install_dir(name, version)
---    local tree: {string: {string}} = {}
---    for _, file in ipairs(fs.find(install_dir)) do
---       local full_path = dir.path(install_dir, file)
---       local walk = tree
---       local last: {string : {string}}
---       local last_name: string
---       local next: {string}
---       for filename in file:gmatch("[^\\/]+") do
---          next = walk[filename]
---          if not next then
---             next = {}
---             walk[filename] = next
---          end
---          last = walk
---          last_name = filename
---          walk = next
---       end
---       if fs.is_file(full_path) then
---          local sum, err = fs.get_md5(full_path)
---          if not sum then
---             return nil, "Failed producing checksum: "..tostring(err)
---          end
---          last[last_name] = sum
---       end
---    end
---    local rock_manifest = { rock_manifest=tree }
---    manif.rock_manifest_cache[name.."/"..version] = rock_manifest
---    save_table(install_dir, "rock_manifest", rock_manifest )
---    return true
--- end
--- ```
-
 -- Writes a 'rock_namespace' file in a locally installed rock directory.
 -- @param name string: the rock name, without a namespace
 -- @param version string: the rock version
@@ -454,7 +393,7 @@ function writer.add_to_manifest(name: string, version: string, repo: string, dep
       return writer.make_manifest(rocks_dir, deps_mode)
    end
 
-   local results = {[name] = {[version] = {{arch = "installed", repo = rocks_dir}}}}
+   local results: {string : {string : {Result}}} = {[name] = {[version] = {{arch = "installed", repo = rocks_dir}}}}
 
    local ok: boolean
    ok, err = store_results(results, manifest) --!
diff --git a/src/luarocks/path.tl b/src/luarocks/path.tl
index ae5e5204..65c425d3 100644
--- a/src/luarocks/path.tl
+++ b/src/luarocks/path.tl
@@ -95,7 +95,7 @@ end
 -- @param tree string or nil: If given, specifies the local tree to use.
 -- @return string: The resulting path -- does not guarantee that
 -- the package (and by extension, the file) exists.
-function path.rock_manifest_file(name: string, version: string, tree: string | Tree): string
+function path.rock_manifest_file(name: string, version: string, tree?: string | Tree): string
    assert(not name:match("/"))
    return dir.path(path.rocks_dir(tree), name, version, "rock_manifest")
 end
diff --git a/src/luarocks/repo_writer-original.lua b/src/luarocks/repo_writer-original.lua
new file mode 100644
index 00000000..698af976
--- /dev/null
+++ b/src/luarocks/repo_writer-original.lua
@@ -0,0 +1,52 @@
+local repo_writer = {}
+
+local fs = require("luarocks.fs")
+local path = require("luarocks.path")
+local repos = require("luarocks.repos")
+local writer = require("luarocks.manif.writer")
+
+function repo_writer.deploy_files(name, version, wrap_bin_scripts, deps_mode, namespace)
+   local ok, err
+
+   if not fs.exists(path.rock_manifest_file(name, version)) then
+      ok, err = writer.make_rock_manifest(name, version)
+      if err then
+         return nil, err
+      end
+   end
+
+   if namespace then
+      ok, err = writer.make_namespace_file(name, version, namespace)
+      if not ok then
+         return nil, err
+      end
+   end
+
+   ok, err = repos.deploy_local_files(name, version, wrap_bin_scripts, deps_mode)
+   if not ok then
+      return nil, err
+   end
+
+   ok, err = writer.add_to_manifest(name, version, nil, deps_mode)
+   return ok, err
+end
+
+function repo_writer.delete_version(name, version, deps_mode, quick)
+   local ok, err, op = repos.delete_local_version(name, version, deps_mode, quick)
+
+   if op == "remove" then
+      local rok, rerr = writer.remove_from_manifest(name, version, nil, deps_mode)
+      if ok and not rok then
+         ok, err = rok, rerr
+      end
+   end
+
+   return ok, err
+end
+
+function repo_writer.refresh_manifest(rocks_dir)
+   return writer.make_manifest(rocks_dir, "one")
+end
+
+return repo_writer
+
diff --git a/src/luarocks/repo_writer.lua b/src/luarocks/repo_writer.lua
index 698af976..0ccb3e91 100644
--- a/src/luarocks/repo_writer.lua
+++ b/src/luarocks/repo_writer.lua
@@ -1,5 +1,6 @@
 local repo_writer = {}
 
+
 local fs = require("luarocks.fs")
 local path = require("luarocks.path")
 local repos = require("luarocks.repos")
@@ -49,4 +50,3 @@ function repo_writer.refresh_manifest(rocks_dir)
 end
 
 return repo_writer
-
diff --git a/src/luarocks/repo_writer.tl b/src/luarocks/repo_writer.tl
index 70a49f95..ec99ba48 100644
--- a/src/luarocks/repo_writer.tl
+++ b/src/luarocks/repo_writer.tl
@@ -6,8 +6,8 @@ local path = require("luarocks.path")
 local repos = require("luarocks.repos")
 local writer = require("luarocks.manif.writer")
 
-function repo_writer.deploy_files(name, version, wrap_bin_scripts, deps_mode, namespace)
-   local ok, err
+function repo_writer.deploy_files(name: string, version: string, wrap_bin_scripts: boolean, deps_mode: string, namespace: string): boolean, string
+   local ok, err: boolean, string
 
    if not fs.exists(path.rock_manifest_file(name, version)) then
       ok, err = writer.make_rock_manifest(name, version)
@@ -32,7 +32,7 @@ function repo_writer.deploy_files(name, version, wrap_bin_scripts, deps_mode, na
    return ok, err
 end
 
-function repo_writer.delete_version(name, version, deps_mode, quick)
+function repo_writer.delete_version(name: string, version: string, deps_mode: string, quick: boolean): boolean,  string
    local ok, err, op = repos.delete_local_version(name, version, deps_mode, quick)
 
    if op == "remove" then
@@ -45,7 +45,7 @@ function repo_writer.delete_version(name, version, deps_mode, quick)
    return ok, err
 end
 
-function repo_writer.refresh_manifest(rocks_dir)
+function repo_writer.refresh_manifest(rocks_dir: string): boolean, string
    return writer.make_manifest(rocks_dir, "one")
 end