Fix parse-defmethod-args not throwing error as expected (#136)

* Fix `parse-defmethod-args` not throwing error as expected * Test fix
camsaul · Oct 6, 2022 · 687a0ac · 687a0ac
1 parent 927af15
commit 687a0ac
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -534,11 +534,7 @@ match *all* of the specified `:defmethod-arities`, and all of its arities must b
 ;; => error: {:arities {:disallowed #{2}}}
 
 (m/defmethod mf :x [x y] x y)
-;; => error: {:arities {:required #{1}}}
-
-
-(m/defmethod mf :x [x y] x)
-;; => error: {:arities {:required #{1 [:>= 3]}, :disallowed #{2}}}
+;; => error: {:required #{1}, :disallowed #{2}}
 ```
 
 `:defmethod-arities` must be a set of either integers or `[:> n]` forms to represent arities with `&` rest

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-0.15.0
+0.15.0.1
diff --git a/src/methodical/macros.clj b/src/methodical/macros.clj
@@ -358,7 +358,7 @@
   (let [spec      (defmethod-args-spec multifn)
         conformed (s/conform spec args)]
     (if (s/invalid? conformed)
-      (s/explain-str spec args)
+      (throw (ex-info (s/explain-str spec args) (s/explain-data spec args)))
       (let [{[method-type type-args] :args-for-method-type} conformed]
         (-> (merge conformed {:method-type method-type} type-args)
             (dissoc :args-for-method-type))))))

diff --git a/test/methodical/macros_test.clj b/test/methodical/macros_test.clj
@@ -198,12 +198,6 @@
      :dispatch-value ({:a 1} [2 3])
      :fn-tail        [([x] {:x x, :y y})
                       ([x y] {:x x, :y y})]}
-
-    ;; despite looking a little ambiguous, this is actually invalid because neither `:before` nor `([x] x)` are allowed
-    ;; as dispatch values; see [[methodical.macros/default-dispatch-value-spec]] for reasons why.
-    [:before ([x] x) ([x y] x)]
-    "([x] x) - failed: dispatch-value-spec in: [1] at: [:args-for-method-type :aux :dispatch-value]\n"
-
     ;; here's another ambiguous one. Is this an `:after` aux method with dispatch value `"str"`, or a primary
     ;; method with dispatch value `:after` and a docstring?
     ;;
@@ -213,7 +207,15 @@
     {:method-type    :aux
      :qualifier      :after
      :dispatch-value "str"
-     :fn-tail        [[_x]]}))
+     :fn-tail        [[_x]]})
+
+  (t/testing "Errors"
+    ;; despite looking a little ambiguous, this is actually invalid because neither `:before` nor `([x] x)` are allowed
+    ;; as dispatch values; see [[methodical.macros/default-dispatch-value-spec]] for reasons why.
+    (t/is (thrown-with-msg?
+           clojure.lang.ExceptionInfo
+           (re-quote "([x] x) - failed: dispatch-value-spec in: [1] at: [:args-for-method-type :aux :dispatch-value]\n")
+           (#'macros/parse-defmethod-args mf1 '[:before ([x] x) ([x y] x)])))))
 
 (macros/defmethod mf1 :x
   [m]
@@ -580,7 +582,7 @@
         (t/is (= 1
                  (num-primary-methods))))
       (let [original-hash (::macros/defmulti-hash (meta (resolve 'methodical.macros-test/metadata-updates-mf)))
-            expected-doc  ["metadata-updates-mf is defined in [[methodical.macros-test]] (methodical/macros_test.clj:572)."
+            expected-doc  ["metadata-updates-mf is defined in [[methodical.macros-test]] (methodical/macros_test.clj:574)."
                            ""
                            "It caches methods using a [[methodical.impl.cache.watching.WatchingCache]]."
                            ""
@@ -597,7 +599,7 @@
                            ""
                            "These primary methods are known:"
                            ""
-                           "* `:default`, defined in [[methodical.macros-test]] (methodical/macros_test.clj:575) "]]
+                           "* `:default`, defined in [[methodical.macros-test]] (methodical/macros_test.clj:577) "]]
         (t/is (integer? original-hash))
         (letfn [(relevant-metadata [metadata]
                   (let [metadata (select-keys metadata [:name :private :amazing? :doc ::macros/defmulti-hash])]