Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

[malli] Don't include docstrings in mu/defn when compiling CLJS (#63793)

Oleksandr Yakushevc51d5b5f79cd
diff --git a/src/metabase/util/malli/defn.clj b/src/metabase/util/malli/defn.clj
index 25969666883..5f48b226a38 100644
--- a/src/metabase/util/malli/defn.clj
+++ b/src/metabase/util/malli/defn.clj
@@ -91,22 +91,24 @@
(let [parsed (mu.fn/parse-fn-tail fn-tail)
cosmetic-name (gensym (munge (str fn-name)))
{attr-map :meta} (:values parsed)
+ docstring (annotated-docstring parsed)
attr-map (merge
{:arglists (list 'quote (deparameterized-arglists parsed))
:schema (mu.fn/fn-schema parsed {:target :target/metadata})}
- attr-map)
- docstring (annotated-docstring parsed)
+ attr-map
+ ;; Don't include docstrings in CLJS to prevent them slipping into release build and
+ ;; inflating the bundle.
+ (macros/case
+ :clj {:doc docstring}
+ :cljs nil))
instrument? (mu.fn/instrument-ns? *ns*)]
- (if-not instrument?
- `(def ~(vary-meta fn-name merge attr-map)
- ~docstring
- ~(mu.fn/deparameterized-fn-form parsed))
- `(def ~(vary-meta fn-name merge attr-map)
- ~docstring
- ~(macros/case
+ `(def ~(vary-meta fn-name merge attr-map)
+ ~(if instrument?
+ (macros/case
:clj (let [error-context {:fn-name (list 'quote fn-name)}]
(mu.fn/instrumented-fn-form error-context parsed cosmetic-name))
- :cljs (mu.fn/deparameterized-fn-form parsed cosmetic-name))))))
+ :cljs (mu.fn/deparameterized-fn-form parsed cosmetic-name))
+ (mu.fn/deparameterized-fn-form parsed)))))
(defmacro defn-
"Same as defn, but creates a private def."
diff --git a/test/metabase/util/malli/defn_test.clj b/test/metabase/util/malli/defn_test.clj
index 57173cce966..c7ac1065287 100644
--- a/test/metabase/util/malli/defn_test.clj
+++ b/test/metabase/util/malli/defn_test.clj
@@ -174,14 +174,12 @@
(testing "returns a simple fn*"
(mt/with-dynamic-fn-redefs [mu.fn/instrument-ns? (constantly false)]
(let [expansion (macroexpand `(mu/defn ~'f :- :int [] "foo"))]
- (is (= '(def f
- "Inputs: []\n Return: :int" (clojure.core/fn [] "foo"))
+ (is (= '(def f (clojure.core/fn [] "foo"))
(deanon-fn-names expansion))))))
(testing "returns an instrumented fn"
(mt/with-dynamic-fn-redefs [mu.fn/instrument-ns? (constantly true)]
(let [expansion (macroexpand `(mu/defn ~'f :- :int [] "foo"))]
(is (= '(def f
- "Inputs: []\n Return: :int"
(clojure.core/let
[&f (clojure.core/fn f [] "foo")]
(clojure.core/fn