diff --git a/README.md b/README.md index 6c5280f..c6f08f2 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ extname :: FilePath -> FilePath - join :: FilePath -> FilePath -> FilePath + join :: [FilePath] -> FilePath normalize :: FilePath -> FilePath diff --git a/src/Node/Path.purs b/src/Node/Path.purs index 6d8193e..e8100a8 100644 --- a/src/Node/Path.purs +++ b/src/Node/Path.purs @@ -17,11 +17,9 @@ foreign import normalize -- Joins two path segments together and normalizes the resulting path. -- foreign import join - "var join = function (start) { \ - \ return function (end) { \ - \ return require('path').join(start, end); \ - \ }; \ - \}" :: FilePath -> FilePath -> FilePath + "var join = function (segments) { \ + \ return require('path').join.apply(this, segments); \ + \}" :: [FilePath] -> FilePath -- | -- Resolves `to` to an absolute path ([from...], to). diff --git a/tests/Simple.purs b/tests/Simple.purs index 2de62c5..53054bf 100644 --- a/tests/Simple.purs +++ b/tests/Simple.purs @@ -13,7 +13,7 @@ assertEq x y = main = do assertEq (normalize "/foo/bar//baz/asdf/quux/..") (normalize "/foo/bar/baz/asdf") - assertEq (join "/foo" "bar") (normalize "/foo/bar") + assertEq (join ["/foo", "bar"]) (normalize "/foo/bar") --assertEq (resolve ["foo/bar", "tmp/file/", ".."] "a/../subfile") (normalize "/foo/bar") assertEq (relative "/data/orandea/test/aaa" "/data/orandea/impl/bbb") (normalize "../../impl/bbb") assertEq (dirname "/foo/bar/baz/asdf/quux") (normalize "/foo/bar/baz/asdf")