1 files changed, 41 insertions, 14 deletions
diff --git a/bundle.moon b/bundle.moon
index 5d855ea..1c6b5f6 100644
--- a/bundle.moon
+++ b/bundle.moon
@@ -2,23 +2,50 @@ output_name = assert arg[1], "please specify the output directory"
 
 escape = (str) -> string.format '%q', str
 
+readfile = (name) ->
+  file = io.open name, 'r'
+  with file\read '*all'
+    file\close
+
 with io.open output_name, 'w'
-  \write "local p = package.preload\n"
+  -- final wrap mode
+  if arg[2] == '--wrap'
+    assert #arg == 3, "too many arguments for 'wrap' mode"
+    bundle = arg[3]
+
+    bundle = dofile bundle
+    \write "local p = package.preload\n"
+    for { :module, :file, :source } in *bundle
+      module = escape module
+      \write "if not p[#{module}] then p[#{module}] = load(#{escape source}, #{escape file}) end\n"
 
-  for i=2, #arg
-    file_name = arg[i]
+  -- iterative bundling mode
+  else
+    \write "return {\n"
 
-    file = io.open file_name, 'r'
-    code = file\read '*all'
-    file\close!
+    this = assert arg[2]
+    addmod = (module, file, source) ->
+      modname = "#{this}.#{module}"
+      modname = this if module == 'init'
+      \write "
+{
+  module = #{escape modname},
+  file = #{escape "#{this}/#{file}"},
+  source = #{escape source},
+},"
 
-    module = file_name\gsub '/', '.'
-    module = module\gsub '%.lua$', ''
-    module = module\gsub '%.init$', ''
-    module = module\match '^dist%.(.*)'
+    for file in *arg[3,]
+      if dirname = file\match '^([%w-_]+)/%.bundle%.lua$'
+        bundle = dofile file
+        for { :module, :file, :source } in *bundle
+          addmod module, file, source
+      else
+        module = file\gsub '%.lua$', ''
+        continue if module\match '%.server'
+        module = module\gsub '%.client$', ''
+        module = module\gsub '%.init$', ''
+        addmod module, file, readfile file
 
-    file_name = escape file_name
-    code = escape code
-    module = escape module
+    \write "}"
 
-    \write "if not p[#{module}] then p[#{module}] = load(#{code}, #{file_name}) end\n"
+  \close!