fix export ^ with class declarations inside of do

Author: leafo

moonscript/transform.lua

@@ -5,6 +5,7 @@ local data = require("moonscript.data")
 local reversed = util.reversed
 local ntype, build, smart_node, is_slice, value_is_singular = types.ntype, types.build, types.smart_node, types.is_slice, types.value_is_singular
 local insert = table.insert
+local mtype = util.moon.type
 local implicitly_return
 do
   local _parent_0 = nil
@@ -233,7 +234,7 @@ find_assigns = function(body, out)
   return out
 end
 local hoist_declarations
-hoist_declarations = function(body, rules)
+hoist_declarations = function(body)
   local assigns = { }
   local _list_0 = find_assigns(body)
   for _index_0 = 1, #_list_0 do
@@ -246,7 +247,11 @@ hoist_declarations = function(body, rules)
       end
     end
   end
-  return table.insert(body, 1, {
+  local idx = 1
+  while mtype(body[idx]) == Run do
+    idx = idx + 1
+  end
+  return table.insert(body, idx, {
     "declare",
     assigns
   })
@@ -1092,6 +1097,7 @@ Statement = Transformer({
       local _with_0 = build
       local out_body = {
         Run(function(self)
+          self:put_name(name)
           return self:set("super", function(block, chain)
             if chain then
               local slice = (function()

moonscript/transform.moon

@@ -9,6 +9,8 @@ import reversed from util
 import ntype, build, smart_node, is_slice, value_is_singular from types
 import insert from table
 
+mtype = util.moon.type
+
 export Statement, Value, NameProxy, LocalName, Run
 
 local implicitly_return
@@ -92,15 +94,19 @@ find_assigns = (body, out={}) ->
         table.insert out, thing[2] -- extract names
   out
 
-hoist_declarations = (body, rules) ->
+hoist_declarations = (body) ->
   assigns = {}
 
   -- hoist the plain old assigns
   for names in *find_assigns body
     for name in *names
       table.insert assigns, name if type(name) == "string"
 
-  table.insert body, 1, {"declare", assigns}
+  -- insert after runs
+  idx = 1
+  while mtype(body[idx]) == Run do idx += 1
+
+  table.insert body, idx, {"declare", assigns}
 
 expand_elseif_assign = (ifstm) ->
   for i = 4, #ifstm
@@ -551,6 +557,9 @@ Statement = Transformer {
     with build
       out_body = {
         Run =>
+          -- make sure we don't assign the class to a local inside the do
+          @put_name name
+
           @set "super", (block, chain) ->
             if chain
               slice = [item for item in *chain[3,]]

tests/inputs/class.moon

@@ -147,3 +147,11 @@ class (-> require "moon")!.Something extends Hello.World
   nil
 
 
+
+--
+
+export ^
+class Something
+  nil
+
+

tests/outputs/class.lua

@@ -752,5 +752,44 @@ do
   (function()
     return require("moon")
   end)().Something = _class_0
+end
+do
+  local _parent_0 = nil
+  local _base_0 = { }
+  _base_0.__index = _base_0
+  if _parent_0 then
+    setmetatable(_base_0, _parent_0.__base)
+  end
+  local _class_0 = setmetatable({
+    __init = function(self, ...)
+      if _parent_0 then
+        return _parent_0.__init(self, ...)
+      end
+    end,
+    __base = _base_0,
+    __name = "Something",
+    __parent = _parent_0
+  }, {
+    __index = function(cls, name)
+      local val = rawget(_base_0, name)
+      if val == nil and _parent_0 then
+        return _parent_0[name]
+      else
+        return val
+      end
+    end,
+    __call = function(cls, ...)
+      local _self_0 = setmetatable({}, _base_0)
+      cls.__init(_self_0, ...)
+      return _self_0
+    end
+  })
+  _base_0.__class = _class_0
+  local self = _class_0
+  _ = nil
+  if _parent_0 and _parent_0.__inherited then
+    _parent_0.__inherited(_parent_0, _class_0)
+  end
+  Something = _class_0
   return _class_0
 end