Clojure 1.12 IFn coercion

CHANGELOG.md

@@ -9,6 +9,7 @@ A preview of the next release can be installed from
 
 ## Unreleased
 
+- Clojure 1.12 interop: method thunks, FI coercion, array notation
 - Upgrade SCI reflector based on clojure 1.12 and remove specific workaround for
   `Thread/sleep` interop
 - Add `tools.reader.edn/read`

deps.edn

@@ -20,7 +20,7 @@
          "impl-java/src"],
  :deps {org.clojure/clojure {:mvn/version "1.12.0"},
         org.babashka/sci {:local/root "sci"}
-        org.babashka/babashka.impl.java {:mvn/version "0.1.8"}
+        org.babashka/babashka.impl.java {:mvn/version "0.1.9"}
         org.babashka/sci.impl.types {:mvn/version "0.0.2"}
         babashka/babashka.curl {:local/root "babashka.curl"}
         babashka/fs {:local/root "fs"}

impl-java/build.clj

@@ -3,7 +3,7 @@
             [clojure.tools.build.api :as b]))
 
 (def lib 'org.babashka/babashka.impl.java)
-(def version "0.1.8")
+(def version "0.1.9")
 (def class-dir "target/classes")
 (def basis (b/create-basis {:project "deps.edn"}))
 (def jar-file (format "target/%s-%s.jar" (name lib) version))
@@ -26,7 +26,12 @@
                 :lib lib
                 :version version
                 :basis basis
-                :src-dirs ["src"]})
+                :src-dirs ["src"]
+                :pom-data
+                [[:licenses
+                  [:license
+                   [:name "MIT License"]
+                   [:url "https://opensource.org/license/mit/"]]]]})
   (b/copy-dir {:src-dirs ["src"]
                :target-dir class-dir})
   (b/jar {:class-dir class-dir

impl-java/deps.edn

@@ -2,7 +2,7 @@
  :aliases
  {:build ;; added by neil
   {:paths ["." "build" "src"]
-   :deps {io.github.clojure/tools.build {:git/tag "v0.8.1" :git/sha "7d40500"}
+   :deps {io.github.clojure/tools.build {:git/tag "v0.9.6" :git/sha "8e78bcc"}
           slipset/deps-deploy {:mvn/version "0.2.0"}
           org.babashka/sci.impl.types {:mvn/version "0.0.2"}
           ;; insn/insn {:mvn/version "0.5.3"}

impl-java/src/babashka/impl/reify2/interfaces.clj

@@ -1,6 +1,7 @@
 (ns babashka.impl.reify2.interfaces)
 
 (def interfaces [java.nio.file.FileVisitor
+                 java.nio.file.DirectoryStream$Filter
                  java.io.FileFilter
                  java.io.FilenameFilter
                  clojure.lang.Associative

project.clj

@@ -29,7 +29,7 @@
                  [nrepl/bencode "1.2.0"]
                  [borkdude/sci.impl.reflector "0.0.3"]
                  [org.babashka/sci.impl.types "0.0.2"]
-                 [org.babashka/babashka.impl.java "0.1.8"]
+                 [org.babashka/babashka.impl.java "0.1.9"]
                  [org.clojure/core.async "1.6.673"]
                  [org.clojure/test.check "1.1.1"]
                  [com.github.clj-easy/graal-build-time "0.1.0"]

resources/META-INF/native-image/babashka/babashka/proxy-config.json

@@ -0,0 +1,31 @@
+[{
+  "interfaces": [
+    "java.util.function.Predicate"
+  ]
+},
+ {
+   "interfaces": [
+     "java.util.function.Function"
+   ]
+ },
+ {
+   "interfaces": [
+     "java.io.FileFilter"
+   ]
+ },
+ {
+   "interfaces": [
+     "java.nio.file.DirectoryStream$Filter"
+   ]
+ },
+ {
+   "interfaces": [
+     "java.util.function.Supplier"
+   ]
+ },
+ {
+   "interfaces": [
+     "java.util.function.UnaryOperator"
+   ]
+ }
+]

sci

@@ -1 +1 @@
-Subproject commit 5d33aaa3f529d8a8da4837d5192cc244cdb9c9f3
+Subproject commit 6c49b7ed9346e05e0868193c355e7c38ca7bcec9

src/babashka/impl/classes.clj

@@ -394,6 +394,7 @@
                 java.nio.file.FileVisitOption
                 java.nio.file.FileVisitResult
                 java.nio.file.Files
+                java.nio.file.DirectoryStream$Filter
                 java.nio.file.LinkOption
                 java.nio.file.NoSuchFileException
                 java.nio.file.Path
@@ -668,9 +669,10 @@
                    c))
         m (assoc m :public-class
                  (fn [v]
+                   ;; (prn :v v)
                    ;; NOTE: a series of instance check, so far, is still cheaper
                    ;; than piggybacking on defmulti or defprotocol
-                   (cond (instance? java.lang.Process v)
+                   (let [res (cond (instance? java.lang.Process v)
                                    java.lang.Process
                                    (instance? java.lang.ProcessHandle v)
                                    java.lang.ProcessHandle
@@ -697,6 +699,8 @@
                                    java.nio.file.FileSystem
                                    (instance? java.nio.file.PathMatcher v)
                                    java.nio.file.PathMatcher
+                                   (instance? java.util.stream.Stream v)
+                                   java.util.stream.Stream
                                    (instance? java.util.stream.IntStream v)
                                    java.util.stream.IntStream
                                    (instance? java.util.stream.BaseStream v)
@@ -754,8 +758,12 @@
                                    java.util.Set
                                    (instance? java.io.Closeable v)
                                    java.io.Closeable
+                                   (instance? java.util.Collection v)
+                                   java.util.Collection
                                    ;; keep commas for merge friendliness
-                         )))
+                                   )]
+                     ;; (prn :res res)
+                     res)))
         m (assoc m (list 'quote 'clojure.lang.Var) 'sci.lang.Var)
         m (assoc m (list 'quote 'clojure.lang.Namespace) 'sci.lang.Namespace)]
     m))

src/babashka/impl/reify.clj

@@ -187,5 +187,4 @@
 
     sun.misc.SignalHandler
     {handle [[this signal]]}
-
     }))

test/babashka/interop_test.clj

@@ -64,3 +64,14 @@
 (deftest jio-line-number-reader-test
   (is (= 2 (bb nil "(def rdr (java.io.LineNumberReader. (java.io.StringReader. \"foo\nbar\")))
                     (binding [*in* rdr] (read-line) (read-line)) (.getLineNumber rdr)"))))
+
+(deftest FI-coercion
+  (is (true? (bb nil "(= [1 3] (into [] (doto (java.util.ArrayList. [1 2 3]) (.removeIf even?))))")))
+  (is (true? (bb nil "(= \"abcabc\" (.computeIfAbsent (java.util.HashMap.) \"abc\" #(str % %)))")))
+  (is (true? (bb nil "(= '(\\9) (-> \"a9-\" seq .stream (.filter Character/isDigit) stream-seq!))")))
+  (is (true? (bb nil "(require (quote [clojure.java.io :as jio])) (import [java.io File] [java.nio.file Path Files DirectoryStream$Filter]) (pos? (count (seq (Files/newDirectoryStream (.toPath (jio/file \".\"))
+                      #(-> ^Path % .toFile .isDirectory)))))")))
+  (is (true? (bb nil "(import [java.util Collection] [java.util.stream Stream] [java.util.function Predicate])
+                      (= '(100 100 100 100 100) (->> (Stream/generate (constantly 100)) stream-seq! (take 5)))")))
+  (is (true? (bb nil "(import [java.util Collection] [java.util.stream Stream] [java.util.function Predicate])
+                      (= '(1 2 3 4 5 6 7 8 9 10) (->> (Stream/iterate 1 inc) stream-seq! (take 10)))"))))

test/babashka/reify_test.clj

@@ -153,3 +153,10 @@
 (force-gc)
 @deleted?
 ")))
+
+(deftest reify-dir-stream-filter
+  (is (true? (bb nil "
+(defn get-dir-stream [^java.nio.file.Path dir-path glob-pattern]
+  (let [path (.toPath (java.io.File. dir-path))]
+    (java.nio.file.Files/newDirectoryStream path glob-pattern)))
+(pos? (count (seq (get-dir-stream \".\" (reify java.nio.file.DirectoryStream$Filter (accept [_ path] (.isDirectory (.toFile path))))))))"))))