Move all path-related functions out from moonscript.cmd.moonc

- By 'path-related', I mean ones that purely manipulate or work on
  paths, with no actual filesystem accesses involved
- A few new functions are also added

Author: Shados

moonscript/cmd/moonc.lua

@@ -1,13 +1,12 @@
 local lfs = require("lfs")
 local split
 split = require("moonscript.util").split
-local dirsep, dirsep_chars, mkdir, normalize_dir, parse_dir, parse_file, convert_path, iterate_path, format_time, gettime, compile_file_text, write_file, compile_and_write, is_abs_path, path_to_target
-dirsep = package.config:sub(1, 1)
-if dirsep == "\\" then
-  dirsep_chars = "\\/"
-else
-  dirsep_chars = dirsep
+local dirsep, normalize_dir, normalize_path, parse_dir, parse_file, parse_subtree, convert_path
+do
+  local _obj_0 = require("moonscript.cmd.path_handling")
+  dirsep, normalize_dir, normalize_path, parse_dir, parse_file, parse_subtree, convert_path = _obj_0.dirsep, _obj_0.normalize_dir, _obj_0.normalize_path, _obj_0.parse_dir, _obj_0.parse_file, _obj_0.parse_subtree, _obj_0.convert_path
 end
+local mkdir, format_time, gettime, compile_file_text, write_file, compile_and_write, path_to_target
 mkdir = function(path)
   local chunks = split(path, dirsep)
   local accum
@@ -18,35 +17,6 @@ mkdir = function(path)
   end
   return lfs.attributes(path, "mode")
 end
-normalize_dir = function(path)
-  local normalized_dir
-  if is_abs_path(path) then
-    normalized_dir = dirsep
-  else
-    normalized_dir = ""
-  end
-  for path_element in iterate_path(path) do
-    normalized_dir = normalized_dir .. (path_element .. dirsep)
-  end
-  return normalized_dir
-end
-end
-parse_dir = function(path)
-  return (path:match("^(.-)[^" .. tostring(dirsep_chars) .. "]*$"))
-end
-parse_file = function(path)
-  return (path:match("^.-([^" .. tostring(dirsep_chars) .. "]*)$"))
-end
-convert_path = function(path)
-  local new_path = path:gsub("%.moon$", ".lua")
-  if new_path == path then
-    new_path = path .. ".lua"
-  end
-  return new_path
-end
-iterate_path = function(path)
-  return path:gmatch("([^" .. tostring(dirsep_chars) .. "]+)")
-end
 format_time = function(time)
   return ("%.3fms"):format(time * 1000)
 end
@@ -161,14 +131,6 @@ compile_and_write = function(src, dest, opts)
   end
   return write_file(dest, code)
 end
-is_abs_path = function(path)
-  local first = path:sub(1, 1)
-  if dirsep == "\\" then
-    return first == "/" or first == "\\" or path:sub(2, 1) == ":"
-  else
-    return first == dirsep
-  end
-end
 path_to_target = function(path, target_dir, base_dir)
   if target_dir == nil then
     target_dir = nil
@@ -198,14 +160,7 @@ path_to_target = function(path, target_dir, base_dir)
   return target
 end
 return {
-  dirsep = dirsep,
   mkdir = mkdir,
-  normalize_dir = normalize_dir,
-  parse_dir = parse_dir,
-  parse_file = parse_file,
-  iterate_path = iterate_path,
-  convert_path = convert_path,
-  is_abs_path = is_abs_path,
   gettime = gettime,
   format_time = format_time,
   path_to_target = path_to_target,

moonscript/cmd/moonc.moon

@@ -3,14 +3,10 @@
 lfs = require "lfs"
 
 import split from require "moonscript.util"
+import dirsep, normalize_dir, normalize_path, parse_dir, parse_file, parse_subtree, convert_path from require "moonscript.cmd.path_handling"
 
 local *
 
-dirsep = package.config\sub 1,1
-dirsep_chars = if dirsep == "\\"
-  "\\/" -- windows
-else
-  dirsep
 
 -- similar to mkdir -p
 mkdir = (path) ->
@@ -23,35 +19,6 @@ mkdir = (path) ->
 
   lfs.attributes path, "mode"
 
--- Strips excess / and ensures path ends with /
-normalize_dir = (path) ->
-  normalized_dir = if is_abs_path(path)
-    dirsep
-  else
-    ""
-  for path_element in iterate_path(path)
-    normalized_dir ..= path_element .. dirsep
-  return normalized_dir
-
--- parse the directory out of a path
-parse_dir = (path) ->
-  (path\match "^(.-)[^#{dirsep_chars}]*$")
-
--- parse the filename out of a path
-parse_file = (path) ->
-  (path\match "^.-([^#{dirsep_chars}]*)$")
-
--- converts .moon to a .lua path for calcuating compile target
-convert_path = (path) ->
-  new_path = path\gsub "%.moon$", ".lua"
-  if new_path == path
-    new_path = path .. ".lua"
-  new_path
-
--- Iterates over the directories (and file) in a path
-iterate_path = (path) ->
-  path\gmatch "([^#{dirsep_chars}]+)"
-
 format_time = (time) ->
   "%.3fms"\format time*1000
 
@@ -157,14 +124,6 @@ compile_and_write = (src, dest, opts={}) ->
 
   write_file dest, code
 
-is_abs_path = (path) ->
-  first = path\sub 1, 1
-  if dirsep == "\\"
-    first == "/" or first == "\\" or path\sub(2,1) == ":"
-  else
-    first == dirsep
-
-
 -- calcuate where a path should be compiled to
 -- target_dir: the directory to place the file (optional, from -t flag)
 -- base_dir: the directory where the file came from when globbing recursively
@@ -192,14 +151,7 @@ path_to_target = (path, target_dir=nil, base_dir=nil) ->
   target
 
 {
-  :dirsep
   :mkdir
-  :normalize_dir
-  :parse_dir
-  :parse_file
-  :iterate_path
-  :convert_path
-  :is_abs_path
   :gettime
   :format_time
   :path_to_target

moonscript/cmd/path_handling.lua

@@ -0,0 +1,78 @@
+local dirsep, dirsep_chars, is_abs_path, normalize_dir, normalize_path, parse_dir, parse_file, parse_subtree, parse_root, convert_path, iterate_path
+dirsep = package.config:sub(1, 1)
+if dirsep == "\\" then
+  dirsep_chars = "\\/"
+else
+  dirsep_chars = dirsep
+end
+is_abs_path = function(path)
+  local first = path:sub(1, 1)
+  if dirsep == "\\" then
+    return first == "/" or first == "\\" or path:sub(2, 1) == ":"
+  else
+    return first == dirsep
+  end
+end
+normalize_dir = function(path)
+  local normalized_dir
+  if is_abs_path(path) then
+    normalized_dir = dirsep
+  else
+    normalized_dir = ""
+  end
+  for path_element in iterate_path(path) do
+    normalized_dir = normalized_dir .. (path_element .. dirsep)
+  end
+  return normalized_dir
+end
+normalize_path = function(path)
+  local path_elements = { }
+  for path_element in iterate_path(path) do
+    table.insert(path_elements, path_element)
+  end
+  local normalized_path
+  if is_abs_path(path) then
+    normalized_path = dirsep
+  else
+    normalized_path = ""
+  end
+  for i = 1, #path_elements - 1 do
+    local path_element = path_elements[i]
+    normalized_path = normalized_path .. (path_element .. dirsep)
+  end
+  return normalized_path .. path_elements[#path_elements]
+end
+parse_dir = function(path)
+  return (path:match("^(.-)[^" .. tostring(dirsep_chars) .. "]*$"))
+end
+parse_file = function(path)
+  return (path:match("^.-([^" .. tostring(dirsep_chars) .. "]*)$"))
+end
+parse_subtree = function(path)
+  return (path:match("^.-[" .. tostring(dirsep_chars) .. "]+(.*)$"))
+end
+parse_root = function(path)
+  return (path:match("^(.-[" .. tostring(dirsep_chars) .. "]+).*$"))
+end
+convert_path = function(path)
+  local new_path = path:gsub("%.moon$", ".lua")
+  if new_path == path then
+    new_path = path .. ".lua"
+  end
+  return new_path
+end
+iterate_path = function(path)
+  return path:gmatch("([^" .. tostring(dirsep_chars) .. "]+)")
+end
+return {
+  dirsep = dirsep,
+  is_abs_path = is_abs_path,
+  normalize_dir = normalize_dir,
+  normalize_path = normalize_path,
+  parse_dir = parse_dir,
+  parse_file = parse_file,
+  parse_subtree = parse_subtree,
+  parse_root = parse_root,
+  convert_path = convert_path,
+  iterate_path = iterate_path
+}

moonscript/cmd/path_handling.moon

@@ -0,0 +1,85 @@
+-- Path-handling functions; these are on their own to allow test filesystem
+-- stub functions to make use of them independently of the modules they are
+-- testing
+local *
+
+dirsep = package.config\sub 1,1
+dirsep_chars = if dirsep == "\\"
+  "\\/" -- windows
+else
+  dirsep
+
+is_abs_path = (path) ->
+  first = path\sub 1, 1
+  if dirsep == "\\"
+    first == "/" or first == "\\" or path\sub(2,1) == ":"
+  else
+    first == dirsep
+
+-- Strips excess / and ensures path ends with /
+normalize_dir = (path) ->
+  normalized_dir = if is_abs_path(path)
+    dirsep
+  else
+    ""
+  for path_element in iterate_path(path)
+    normalized_dir ..= path_element .. dirsep
+  return normalized_dir
+
+-- Strips excess and trailing /
+normalize_path = (path) ->
+  path_elements = {}
+  for path_element in iterate_path(path)
+    table.insert path_elements, path_element
+
+  normalized_path = if is_abs_path(path)
+    dirsep
+  else
+    ""
+
+  for i = 1, #path_elements - 1
+    path_element = path_elements[i]
+    normalized_path ..= path_element .. dirsep
+  return normalized_path .. path_elements[#path_elements]
+
+-- parse the directory out of a path
+parse_dir = (path) ->
+  (path\match "^(.-)[^#{dirsep_chars}]*$")
+
+-- parse the filename out of a path
+parse_file = (path) ->
+  (path\match "^.-([^#{dirsep_chars}]*)$")
+
+-- parse the subtree (all but the top directory) out of a path
+-- Invariants:
+-- If input is already normalized, the output will also be in normalized form
+parse_subtree = (path) ->
+  (path\match "^.-[#{dirsep_chars}]+(.*)$")
+
+-- parse the very first directory out of a path
+parse_root = (path) ->
+  (path\match "^(.-[#{dirsep_chars}]+).*$")
+
+-- converts .moon to a .lua path for calcuating compile target
+convert_path = (path) ->
+  new_path = path\gsub "%.moon$", ".lua"
+  if new_path == path
+    new_path = path .. ".lua"
+  new_path
+
+-- Iterates over the directories (and file) in a path
+iterate_path = (path) ->
+  path\gmatch "([^#{dirsep_chars}]+)"
+
+{
+  :dirsep
+  :is_abs_path
+  :normalize_dir
+  :normalize_path
+  :parse_dir
+  :parse_file
+  :parse_subtree
+  :parse_root
+  :convert_path
+  :iterate_path
+}

moonscript/cmd/watchers.lua

@@ -69,7 +69,7 @@ do
   local _base_0 = {
     get_dirs = function(self)
       local parse_dir
-      parse_dir = require("moonscript.cmd.moonc").parse_dir
+      parse_dir = require("moonscript.cmd.path_handling").parse_dir
       local dirs
       do
         local _accum_0 = { }

moonscript/cmd/watchers.moon

@@ -22,7 +22,7 @@ class InotifyWacher extends Watcher
     pcall -> require "inotify"
 
   get_dirs: =>
-    import parse_dir from require "moonscript.cmd.moonc"
+    import parse_dir from require "moonscript.cmd.path_handling"
     dirs = for {file_path} in *@file_list
       dir = parse_dir file_path
       dir = "./" if dir == ""