1 files changed, 32 insertions, 19 deletions

diff --git a/src/luarocks/cmd/make.lua b/src/luarocks/cmd/make.tl
index ffec8c5d..13b1d66b 100644
--- a/src/luarocks/cmd/make.lua
+++ b/src/luarocks/cmd/make.tl
@@ -3,7 +3,9 @@
 -- Builds sources in the current directory, but unlike "build",
 -- it does not fetch sources, etc., assuming everything is
 -- available in the current directory.
-local make = {}
+local record make
+   needs_lock: function(Args): boolean
+end
 
 local build = require("luarocks.build")
 local util = require("luarocks.util")
@@ -12,11 +14,16 @@ local fetch = require("luarocks.fetch")
 local pack = require("luarocks.pack")
 local remove = require("luarocks.remove")
 local deps = require("luarocks.deps")
-local writer = require("luarocks.manif.writer")
 local dir = require("luarocks.dir")
 local fs = require("luarocks.fs")
 
-function make.cmd_options(parser)
+local type Parser = require("luarocks.vendor.argparse").Parser
+
+local type Args = require("luarocks.core.types.args").Args
+
+local type BOpts = require("luarocks.core.types.bopts").BOpts
+
+function make.cmd_options(parser: Parser)
    parser:flag("--no-install", "Do not install the rock.")
    parser:flag("--no-doc", "Install the rock without its documentation.")
    parser:flag("--pack-binary-rock", "Do not install rock. Instead, produce a "..
@@ -33,7 +40,7 @@ function make.cmd_options(parser)
       "built. If the rockspec or src.rock is being downloaded, LuaRocks will "..
       "attempt to download the signature as well. Otherwise, the signature "..
       "file should be already available locally in the same directory.\n"..
-      "You need the signer’s public key in your local keyring for this "..
+      "You need the signer's public key in your local keyring for this "..
       "option to work properly.")
    parser:flag("--sign", "To be used with --pack-binary-rock. Also produce a "..
       "signature file for the generated .rock file.")
@@ -46,7 +53,7 @@ function make.cmd_options(parser)
    util.deps_mode_option(parser)
 end
 
-function make.add_to_parser(parser)
+function make.add_to_parser(parser: Parser)
    -- luacheck: push ignore 431
    local cmd = parser:command("make", [[
 Builds sources in the current directory, but unlike "build", it does not fetch
@@ -71,16 +78,17 @@ overrides and recreates this file scanning dependency based on ranges.
    cmd:argument("rockspec", "Rockspec for the rock to build.")
       :args("?")
 
-   make.cmd_options(cmd)
+   make.cmd_options(cmd as Parser)
 end
 
 --- Driver function for "make" command.
 -- @return boolean or (nil, string, exitcode): True if build was successful; nil and an
 -- error message otherwise. exitcode is optionally returned.
-function make.command(args)
+function make.command(args: Args): boolean, string
+   local name, namespace, version: string, string, string
    local rockspec_filename = args.rockspec
    if not rockspec_filename then
-      local err
+      local err: string
       rockspec_filename, err = util.get_default_rockspec()
       if not rockspec_filename then
          return nil, err
@@ -96,10 +104,10 @@ function make.command(args)
       return nil, err
    end
 
-   local name, namespace = util.split_namespace(rockspec.name)
+   name, namespace = util.split_namespace(rockspec.name)
    namespace = namespace or args.namespace
 
-   local opts = build.opts({
+   local opts: BOpts = {
       need_to_fetch = false,
       minimal_mode = true,
       deps_mode = deps.get_deps_mode(args),
@@ -111,17 +119,22 @@ function make.command(args)
       pin = not not args.pin,
       rebuild = true,
       no_install = not not args.no_install
-   })
+   }
 
    if args.sign and not args.pack_binary_rock then
       return nil, "In the make command, --sign is meant to be used only with --pack-binary-rock"
    end
 
    if args.no_install then
-      return build.build_rockspec(rockspec, opts, cwd)
+      name, version = build.build_rockspec(rockspec, opts, cwd)
+      if name then
+         return true
+      else
+         return nil, version
+      end
    elseif args.pack_binary_rock then
-      return pack.pack_binary_rock(name, namespace, rockspec.version, args.sign, function()
-         local name, version = build.build_rockspec(rockspec, opts, cwd)  -- luacheck: ignore 431
+      return pack.pack_binary_rock(name, namespace, rockspec.version, args.sign, function(): string, string
+         name, version = build.build_rockspec(rockspec, opts, cwd)  -- luacheck: ignore 431
          if name and args.no_doc then
             util.remove_doc_dir(name, version)
          end
@@ -130,12 +143,12 @@ function make.command(args)
    else
       local ok, err = build.build_rockspec(rockspec, opts, cwd)
       if not ok then return nil, err end
-      local name, version = ok, err  -- luacheck: ignore 421
+      name, version = ok, err  -- luacheck: ignore 421
 
       if opts.build_only_deps then
          util.printout("Stopping after installing dependencies for " ..name.." "..version)
          util.printout()
-         return name, version
+         return name ~= nil, version
       end
 
       if args.no_doc then
@@ -151,12 +164,12 @@ function make.command(args)
          end
       end
 
-      writer.check_dependencies(nil, deps.get_deps_mode(args))
-      return name, version
+      deps.check_dependencies(nil, deps.get_deps_mode(args))
+      return name ~= nil, version
    end
 end
 
-make.needs_lock = function(args)
+make.needs_lock = function(args: Args): boolean
    if args.pack_binary_rock or args.no_install then
       return false
    end