[new] Simplify signal expansion

src/taoensso/telemere/impl.cljc

@@ -550,7 +550,12 @@
               :sf-arity   4
               :ct-sig-filter     ct-sig-filter
               :*rt-sig-filter* `*rt-sig-filter*}
-             opts)]
+
+             (assoc opts :bound-forms
+               {:kind  '__kind
+                :ns    '__ns
+                :id    '__id
+                :level '__level}))]
 
        (if elide?
          run-form
@@ -716,14 +721,15 @@
            ;;        (run-fn-form)
            ;;        (let [...]))))
 
-           `(enc/if-not ~allow? ; Allow to throw at call
+           ;; Unless otherwise specified, allow errors to throw on call
-              ~run-form
+           `(let [~'__kind  ~kind-form
-              (let [;;; Allow to throw at call
-                    ~'__inst   ~inst-form
-                    ~'__level  ~level-form
-                    ~'__kind   ~kind-form
-                    ~'__id     ~id-form
                   ~'__ns    ~ns-form
+                  ~'__id    ~id-form
+                  ~'__level ~level-form]
+
+              (enc/if-not ~allow?
+                ~run-form
+                (let [~'__inst   ~inst-form
                       ~'__thread ~thread-form
                       ~'__root0  ~root-form0 ; ?{:keys [id uid]}
 
@@ -738,11 +744,12 @@
 
                   (if ~'__run-result
                     ( ~'__run-result signal#)
-                  true))))))))
+                    true)))))))))
 
 (comment
   (with-signal  (signal! {:level :warn :let [x :x] :msg ["Test" "message" x] :data {:a :A :x x} :run (+ 1 2)}))
   (macroexpand '(signal! {:level :warn :let [x :x] :msg ["Test" "message" x] :data {:a :A :x x} :run (+ 1 2)}))
+  (macroexpand '(signal! {:level :info}))
 
   (do
     (println "---")