deplocks

5 files changed, 227 insertions, 8 deletions

diff --git a/src/luarocks/core/cfg.d.tl b/src/luarocks/core/cfg.d.tl
index 7b74f258..26aec8d9 100644
--- a/src/luarocks/core/cfg.d.tl
+++ b/src/luarocks/core/cfg.d.tl
@@ -89,6 +89,9 @@ local record cfg
       tool_version: string
       api_version: string
    end
+   -- loader
+   init: function(): boolean, string, string
+   init_package_paths: function
 end
 
 return cfg
\ No newline at end of file
diff --git a/src/luarocks/core/manif.tl b/src/luarocks/core/manif.tl
index 0713d293..cfa53dd0 100644
--- a/src/luarocks/core/manif.tl
+++ b/src/luarocks/core/manif.tl
@@ -7,13 +7,13 @@ 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 Constraint = vers.Constraint
 
 --- Core functions for querying manifest files.
 local record manif
    
    record DependencyVersion
-      constraints: {Constraints}
+      constraints: {Constraint}
       name: string
    end
    
@@ -96,7 +96,7 @@ function manif.fast_load_local_manifest(repo_url: string): Manifest, string | {a
    return manif.manifest_loader(pathname, repo_url, nil)
 end
 
-function manif.load_rocks_tree_manifests(deps_mode: string): {Tree_manifest}
+function manif.load_rocks_tree_manifests(deps_mode?: string): {Tree_manifest}
    local trees = {}
    path.map_trees(deps_mode, function(tree: cfg.Tree)
       local manifest= manif.fast_load_local_manifest(path.rocks_dir(tree))
diff --git a/src/luarocks/deplocks-origianal.lua b/src/luarocks/deplocks-origianal.lua
new file mode 100644
index 00000000..d62908f4
--- /dev/null
+++ b/src/luarocks/deplocks-origianal.lua
@@ -0,0 +1,106 @@
+local deplocks = {}
+
+local fs = require("luarocks.fs")
+local dir = require("luarocks.dir")
+local util = require("luarocks.util")
+local persist = require("luarocks.persist")
+
+local deptable = {}
+local deptable_mode = "start"
+local deplock_abs_filename
+local deplock_root_rock_name
+
+function deplocks.init(root_rock_name, dirname)
+   if deptable_mode ~= "start" then
+      return
+   end
+   deptable_mode = "create"
+
+   local filename = dir.path(dirname, "luarocks.lock")
+   deplock_abs_filename = fs.absolute_name(filename)
+   deplock_root_rock_name = root_rock_name
+
+   deptable = {}
+end
+
+function deplocks.get_abs_filename(root_rock_name)
+   if root_rock_name == deplock_root_rock_name then
+      return deplock_abs_filename
+   end
+end
+
+function deplocks.load(root_rock_name, dirname)
+   if deptable_mode ~= "start" then
+      return true, nil
+   end
+   deptable_mode = "locked"
+
+   local filename = dir.path(dirname, "luarocks.lock")
+   local ok, result, errcode = persist.run_file(filename, {})
+   if errcode == "load" or errcode == "run" then
+      -- bad config file or depends on env, so error out
+      return nil, nil, "Could not read existing lockfile " .. filename
+   end
+
+   if errcode == "open" then
+      -- could not open, maybe file does not exist
+      return true, nil
+   end
+
+   deplock_abs_filename = fs.absolute_name(filename)
+   deplock_root_rock_name = root_rock_name
+
+   deptable = result
+   return true, filename
+end
+
+function deplocks.add(depskey, name, version)
+   if deptable_mode == "locked" then
+      return
+   end
+
+   local dk = deptable[depskey]
+   if not dk then
+      dk = {}
+      deptable[depskey] = dk
+   end
+
+   if not dk[name] then
+      dk[name] = version
+   end
+end
+
+function deplocks.get(depskey, name)
+   local dk = deptable[depskey]
+   if not dk then
+      return nil
+   end
+
+   return deptable[name]
+end
+
+function deplocks.write_file()
+   if deptable_mode ~= "create" then
+      return true
+   end
+
+   return persist.save_as_module(deplock_abs_filename, deptable)
+end
+
+-- a table-like interface to deplocks
+function deplocks.proxy(depskey)
+   return setmetatable({}, {
+      __index = function(_, k)
+         return deplocks.get(depskey, k)
+      end,
+      __newindex = function(_, k, v)
+         return deplocks.add(depskey, k, v)
+      end,
+   })
+end
+
+function deplocks.each(depskey)
+   return util.sortedpairs(deptable[depskey] or {})
+end
+
+return deplocks
diff --git a/src/luarocks/deplocks.lua b/src/luarocks/deplocks.lua
index d62908f4..1f6b4c82 100644
--- a/src/luarocks/deplocks.lua
+++ b/src/luarocks/deplocks.lua
@@ -5,6 +5,8 @@ local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 local persist = require("luarocks.persist")
 
+
+
 local deptable = {}
 local deptable_mode = "start"
 local deplock_abs_filename
@@ -36,14 +38,14 @@ function deplocks.load(root_rock_name, dirname)
    deptable_mode = "locked"
 
    local filename = dir.path(dirname, "luarocks.lock")
-   local ok, result, errcode = persist.run_file(filename, {})
+   local _, result, errcode = persist.run_file(filename, {})
    if errcode == "load" or errcode == "run" then
-      -- bad config file or depends on env, so error out
+
       return nil, nil, "Could not read existing lockfile " .. filename
    end
 
    if errcode == "open" then
-      -- could not open, maybe file does not exist
+
       return true, nil
    end
 
@@ -65,7 +67,7 @@ function deplocks.add(depskey, name, version)
       deptable[depskey] = dk
    end
 
-   if not dk[name] then
+   if type(dk) == "table" and not dk[name] then
       dk[name] = version
    end
 end
@@ -87,7 +89,7 @@ function deplocks.write_file()
    return persist.save_as_module(deplock_abs_filename, deptable)
 end
 
--- a table-like interface to deplocks
+
 function deplocks.proxy(depskey)
    return setmetatable({}, {
       __index = function(_, k)
diff --git a/src/luarocks/deplocks.tl b/src/luarocks/deplocks.tl
new file mode 100644
index 00000000..693dd04b
--- /dev/null
+++ b/src/luarocks/deplocks.tl
@@ -0,0 +1,108 @@
+local deplocks = {}
+
+local fs = require("luarocks.fs")
+local dir = require("luarocks.dir")
+local util = require("luarocks.util")
+local persist = require("luarocks.persist")
+
+local type PersistableTable = persist.PersistableTable
+
+local deptable: PersistableTable = {}
+local deptable_mode = "start"
+local deplock_abs_filename: string
+local deplock_root_rock_name: string
+
+function deplocks.init(root_rock_name: string, dirname: string)
+   if deptable_mode ~= "start" then
+      return
+   end
+   deptable_mode = "create"
+
+   local filename = dir.path(dirname, "luarocks.lock")
+   deplock_abs_filename = fs.absolute_name(filename)
+   deplock_root_rock_name = root_rock_name
+
+   deptable = {}
+end
+
+function deplocks.get_abs_filename(root_rock_name: string): string
+   if root_rock_name == deplock_root_rock_name then
+      return deplock_abs_filename
+   end
+end
+
+function deplocks.load(root_rock_name: string, dirname: string): boolean, string, string
+   if deptable_mode ~= "start" then
+      return true, nil
+   end
+   deptable_mode = "locked"
+
+   local filename = dir.path(dirname, "luarocks.lock")
+   local _, result, errcode = persist.run_file(filename, {})
+   if errcode == "load" or errcode == "run" then
+      -- bad config file or depends on env, so error out
+      return nil, nil, "Could not read existing lockfile " .. filename
+   end
+
+   if errcode == "open" then
+      -- could not open, maybe file does not exist
+      return true, nil
+   end
+
+   deplock_abs_filename = fs.absolute_name(filename)
+   deplock_root_rock_name = root_rock_name
+
+   deptable = result as PersistableTable --! cast
+   return true, filename
+end
+
+function deplocks.add(depskey: string, name: string, version: string)
+   if deptable_mode == "locked" then
+      return
+   end
+
+   local dk = deptable[depskey]
+   if not dk then
+      dk = {}
+      deptable[depskey] = dk
+   end
+
+   if dk is PersistableTable and not dk[name] then
+      dk[name] = version
+   end
+end
+
+function deplocks.get(depskey: string, name: string): string | number | boolean | PersistableTable
+   local dk = deptable[depskey]
+   if not dk then
+      return nil
+   end
+
+   return deptable[name]
+end
+
+function deplocks.write_file(): boolean, string
+   if deptable_mode ~= "create" then
+      return true
+   end
+
+   return persist.save_as_module(deplock_abs_filename, deptable)
+end
+
+-- a table-like interface to deplocks
+function deplocks.proxy(depskey: string): PersistableTable
+   return setmetatable({}, {
+      __index = function(_, k: string): string | number | boolean | PersistableTable
+         return deplocks.get(depskey, k)
+      end,
+      __newindex = function(_, k: string, v: string)
+         return deplocks.add(depskey, k, v)
+      end,
+   })
+end
+
+function deplocks.each(depskey: string): function(): string | number, string | number | boolean | PersistableTable
+   return util.sortedpairs(deptable[depskey] as PersistableTable or {})
+end
+
+return deplocks
\ No newline at end of file