Make relative path works for libraries

edubart · Sep 30, 2020 · 2e07d1c · 2e07d1c
1 parent baf72d5
commit 2e07d1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/nelua/utils/fs.lua b/nelua/utils/fs.lua
@@ -300,6 +300,7 @@ function fs.findmodulefile(name, pathstr, relpath)
       fullpath = fs.abspath(fs.join(relpath, name))
     elseif name:match('^[.]+') then -- relative with '.'
       local dots, rest = name:match('^(%.+)(.*)')
+      rest = rest:gsub('%.', fs.sep)
       if #dots == 1 then
         fullpath = fs.abspath(fs.join(relpath, rest))
       else

diff --git a/spec/004-utils_spec.lua b/spec/004-utils_spec.lua
@@ -15,7 +15,9 @@ it("fs.findmodulepath", function()
   end
 
   assert_relative_findmodule('test', '/somedir/test.nelua')
+  assert_relative_findmodule('lib.test', '/somedir/lib/test.nelua')
   assert_relative_findmodule('test', '/somedir/test/init.nelua')
+  assert_relative_findmodule('lib.test', '/somedir/lib/test/init.nelua')
   assert_relative_findmodule('/tmp/test.nelua', '/tmp/test.nelua')
   assert_relative_findmodule('./test.nelua', './test.nelua')
   assert_relative_findmodule('../test.nelua', '../test.nelua')
@@ -24,7 +26,9 @@ it("fs.findmodulepath", function()
   assert_relative_findmodule('../test', '../test.nelua')
   assert_relative_findmodule('../test', '../test/init.nelua')
   assert_relative_findmodule('.test', './test.nelua')
+  assert_relative_findmodule('.lib.test', './lib/test.nelua')
   assert_relative_findmodule('..test', '../test.nelua')
+  assert_relative_findmodule('..lib.test', '../lib/test.nelua')
   assert_relative_findmodule('...test', '../../test.nelua')
   assert_relative_findmodule('....test', '../../../test.nelua')
 end)