Teal: convert luarocks.upload.multipart

1 files changed, 37 insertions, 28 deletions

diff --git a/src/luarocks/upload/multipart.lua b/src/luarocks/upload/multipart.tl
index 790e368f..7fcf73b5 100644
--- a/src/luarocks/upload/multipart.lua
+++ b/src/luarocks/upload/multipart.tl
@@ -1,20 +1,31 @@
 
-local multipart = {}
+local record multipart
+   -- record Parameters
+   --    {{string, (string | File)}}
+   --    map: {string: (string | File)}
+   -- end
+   type Parameters = {string: (string | File)}
 
-local File = {}
+   record File
+      mimetype: string
+      fname: string
+      mime: function(File): string
+   end
+end
 
-local unpack = unpack or table.unpack
+local type Parameters = multipart.Parameters
+local type File = multipart.File
 
--- socket.url.escape(s) from LuaSocket 3.0rc1
-function multipart.url_escape(s)
-   return (string.gsub(s, "([^A-Za-z0-9_])", function(c)
+-- socket.url.escape(s) from LuaSocket 3.0rc1 --?
+function multipart.url_escape(s: string): string
+   return (string.gsub(s, "([^A-Za-z0-9_])", function(c: string): string
       return string.format("%%%02x", string.byte(c))
    end))
 end
 
-function File:mime()
+function multipart.File:mime(): string
    if not self.mimetype then
-      local mimetypes_ok, mimetypes = pcall(require, "mimetypes")
+      local mimetypes_ok, mimetypes = pcall(require, "mimetypes") 
       if mimetypes_ok then
          self.mimetype = mimetypes.guess(self.fname)
       end
@@ -23,7 +34,7 @@ function File:mime()
    return self.mimetype
 end
 
-function File:content()
+function multipart.File:content(): string, string
    local fd = io.open(self.fname, "rb")
    if not fd then
       return nil, "Failed to open file: "..self.fname
@@ -33,8 +44,8 @@ function File:content()
    return data
 end
 
-local function rand_string(len)
-   local shuffled = {}
+local function rand_string(len: integer): string
+   local shuffled: {integer} = {}
    for i = 1, len do
       local r = math.random(97, 122)
       if math.random() >= 0.5 then
@@ -42,7 +53,7 @@ local function rand_string(len)
       end
       shuffled[i] = r
    end
-   return string.char(unpack(shuffled))
+   return string.char(table.unpack(shuffled))
 end
 
 -- multipart encodes params
@@ -53,23 +64,20 @@ end
 --   {key2, value2},
 --   key3: value3
 -- }
-function multipart.encode(params)
-   local tuples = { }
-   for i = 1, #params do
-      tuples[i] = params[i]
-   end
+function multipart.encode(params: Parameters): string, string
+   local tuples: {{string, string | File}} = {}
    for k,v in pairs(params) do
-      if type(k) == "string" then
+      if k is string then
          table.insert(tuples, {k, v})
       end
    end
-   local chunks = {}
+   local chunks: {string} = {}
    for _, tuple in ipairs(tuples) do
-      local k,v = unpack(tuple)
+      local k,v = table.unpack(tuple)
       k = multipart.url_escape(k)
-      local buffer = { 'Content-Disposition: form-data; name="' .. k .. '"' }
-      local content
-      if type(v) == "table" and v.__class == File then
+      local buffer: {string} = { 'Content-Disposition: form-data; name="' .. k .. '"' }
+      local content: string
+      if v is File then
          buffer[1] = buffer[1] .. ('; filename="' .. v.fname:gsub(".*[/\\]", "") .. '"')
          table.insert(buffer, "Content-type: " .. v:mime())
          content = v:content()
@@ -80,7 +88,7 @@ function multipart.encode(params)
       table.insert(buffer, content)
       table.insert(chunks, table.concat(buffer, "\r\n"))
    end
-   local boundary
+   local boundary: string
    while not boundary do
       boundary = "Boundary" .. rand_string(16)
       for _, chunk in ipairs(chunks) do
@@ -96,12 +104,13 @@ function multipart.encode(params)
                         "\r\n", "--", boundary, "--", "\r\n" }), boundary
 end
 
-function multipart.new_file(fname, mime)
-   local self = {}
+function multipart.new_file(fname: string, mime?: string): File
+   local self: File = {}
+
    setmetatable(self, { __index = File })
-   self.__class = File
+
    self.fname = fname
-   self.mimetype = mime
+   self.mimetype = mime 
    return self
 end