add working version of with-try macro with some initial tests

Author: joaopluigi

src/nodely/api/v0.clj

@@ -20,6 +20,7 @@
              nodely.data/leaf
              nodely.data/sequence
              nodely.data/branch
+             nodely.data/with-try
              engine-core/checked-env)
 
 (import-fn nodely.engine.lazy/eval-node-with-values eval-node-with-values)

src/nodely/data.clj

@@ -198,24 +198,36 @@
                     (do (assert (= catch 'catch))
                         [t s expr]))]))
 
+(defn tuple-to-handler
+  [m]
+  (fn [error]
+    (if-let [f (some (fn [[ex-class handler]] (when (instance? ex-class error) handler)) m)]
+      (f error)
+      (throw error))))
+
 (defn with-try-expr
   [clauses]
-  (let [clauses (into {} (for [[c t s expr] clauses]
+  (let [clauses (into [] (for [[c t s expr] clauses]
                            (do (assert (= c 'catch))
-                               [(resolve t) (eval `(fn [~s] ~expr))]
-                               #_[t s expr])))]
+                               (if-let [t (resolve t)]
+                                 [t (eval `(fn [~s] ~expr))]
+                                 (throw (ex-info (str "Could not resolve exception class: " t) {:type t}))))))]
     clauses))
 
 (defmacro with-try
   [env & body]
   `(with-error-handler
      ~env
-     ~(with-try-expr body)))
+     (tuple-to-handler ~(with-try-expr body))))
 
 (comment
-  (macroexpand-1 '(with-try {:a "hi"}
+  (macroexpand-1 '(with-try {:a (leaf [:x] (comp inc :x))}
                     (catch Exception e (println e))
                     (catch Throwable t (println t))))
+
+  (tuple-to-handler {java.lang.Exception identity,
+                     java.lang.Throwable identity})
+
   ;
   )
 

test/nodely/api_test.clj

@@ -303,10 +303,27 @@
                                  remove-keys)]
       (update-node-engine-test-suite engine))))
 
-(t/deftest try-env
-  (t/testing "try-env works"
-    (t/matching 3
-                (api/eval-key 
-                 (api/try-env exceptions-all-the-way-down
-                                       (catch Throwable _ 0)) 
-                 :d {::api/engine :sync.lazy}))))
+(t/deftest with-try
+  (t/testing "with-try works Throwable catches first"
+    (t/matching "Could not resolve exception class: NonSenseException"
+                (try
+                  (eval '(api/with-try exceptions-all-the-way-down
+                           (catch NonSenseException _ 0)))
+                  (catch clojure.lang.Compiler$CompilerException e
+                    (ex-message (.getCause e))))))
+
+  (t/testing "with-try works Throwable catches first"
+    (t/matching 0
+                (api/eval-key
+                 (api/with-try exceptions-all-the-way-down
+                   (catch Throwable _ -3)
+                   (catch clojure.lang.ExceptionInfo _ 0))
+                 :d {::api/engine :sync.lazy})))
+
+  (t/testing "with-try works ExceptionInfo catches first"
+    (t/matching 0
+                (api/eval-key
+                 (api/with-try exceptions-all-the-way-down
+                   (catch clojure.lang.ExceptionInfo _ -3)
+                   (catch Throwable _ 0))
+                 :d {::api/engine :sync.lazy}))))