Fix #135: Correctly resolve children for custom Paths (#137)

babashka · Jan 9, 2025 · 603b290 · 603b290
1 parent ab826ff
commit 603b290
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/babashka/fs.cljc b/src/babashka/fs.cljc
@@ -56,7 +56,9 @@
    (as-path f))
   (^Path [parent child]
    (if parent
-     (.resolve (as-path parent) (as-path child))
+     (if (string? child)
+       (.resolve ^Path (as-path parent) ^String child)
+       (.resolve ^Path (as-path parent) (as-path child)))
      (as-path child)))
   (^Path [parent child & more]
    (reduce path (path parent child) more)))

diff --git a/test/babashka/fs_test.clj b/test/babashka/fs_test.clj
@@ -835,3 +835,8 @@
           file-in-dir (fs/create-temp-file {:dir dir})]
       (is (= (str (fs/owner dir)) (str (fs/owner file-in-dir)))))))
 
+(deftest issue-135-test
+  (let [uri (java.net.URI/create (str "jar:file:" (fs/unixify (fs/cwd)) "/test-resources/bencode-1.1.0.jar"))
+        fs (java.nio.file.FileSystems/newFileSystem uri {})
+        path-in-zip (.getPath ^java.nio.file.FileSystem fs "/bencode" (into-array String []))]
+    (is (fs/path path-in-zip "core.clj"))))