The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Extract dispatch type hierarchy (#82226)
Ben Grabowcb4541b965eb
diff --git a/src/metabase/util.cljc b/src/metabase/util.cljcindex 48e399d7b65..b8f40ad248f 100644--- a/src/metabase/util.cljc+++ b/src/metabase/util.cljc@@ -915,18 +915,23 @@#?(:clj (defn- regexp? [x](instance? java.util.regex.Pattern x)))-(derive :dispatch-type/nil :dispatch-type/*)-(derive :dispatch-type/boolean :dispatch-type/*)-(derive :dispatch-type/string :dispatch-type/*)-(derive :dispatch-type/keyword :dispatch-type/*)-(derive :dispatch-type/number :dispatch-type/*)-(derive :dispatch-type/integer :dispatch-type/number)-(derive :dispatch-type/map :dispatch-type/*)-(derive :dispatch-type/sequential :dispatch-type/*)-(derive :dispatch-type/set :dispatch-type/*)-(derive :dispatch-type/symbol :dispatch-type/*)-(derive :dispatch-type/fn :dispatch-type/*)-(derive :dispatch-type/regex :dispatch-type/*)+(def dispatch-type-hierarchy+ "Hierarchy relating the keywords returned by [[dispatch-type-keyword]]. A multimethod dispatching+ on [[dispatch-type-keyword]] must pass `:hierarchy #'dispatch-type-hierarchy` for `:dispatch-type/*` to work as a+ fallback method; Clojure's global hierarchy does not relate these keywords."+ (-> (make-hierarchy)+ (derive :dispatch-type/nil :dispatch-type/*)+ (derive :dispatch-type/boolean :dispatch-type/*)+ (derive :dispatch-type/string :dispatch-type/*)+ (derive :dispatch-type/keyword :dispatch-type/*)+ (derive :dispatch-type/number :dispatch-type/*)+ (derive :dispatch-type/integer :dispatch-type/number)+ (derive :dispatch-type/map :dispatch-type/*)+ (derive :dispatch-type/sequential :dispatch-type/*)+ (derive :dispatch-type/set :dispatch-type/*)+ (derive :dispatch-type/symbol :dispatch-type/*)+ (derive :dispatch-type/fn :dispatch-type/*)+ (derive :dispatch-type/regex :dispatch-type/*)))(defn dispatch-type-keyword"In Cljs `(type 1) is `js/Number`, but `(isa? 1 js/Number)` isn't truthy, so dispatching off of [[clojure.core/type]]@@ -936,8 +941,9 @@have dispatched on `type` if they were written in pure Clojure.Returns `:dispatch-type/*` if there is no mapping for the current type, but you can add more as needed if- appropriate. All type keywords returned by this method also derive from `:dispatch-type/*`, meaning you can write an- implementation for `:dispatch-type/*` and use it as a fallback method.+ appropriate. All type keywords returned by this method derive from `:dispatch-type/*`+ in [[dispatch-type-hierarchy]], meaning you can write an implementation for `:dispatch-type/*` and use it as a+ fallback method.Think of `:dispatch-type/*` as similar to how you would use `Object` if you were dispatchingoff of `type` in pure Clojure."diff --git a/test/metabase/test_runner/assert_exprs/approximately_equal.cljs b/test/metabase/test_runner/assert_exprs/approximately_equal.cljsindex 95a0f6032d6..7fdb92c7b92 100644--- a/test/metabase/test_runner/assert_exprs/approximately_equal.cljs+++ b/test/metabase/test_runner/assert_exprs/approximately_equal.cljs@@ -7,7 +7,8 @@"Multimethod to use to diff two things with `=?`."{:arglists '([expected actual])}(fn [expected actual]- [(u/dispatch-type-keyword expected) (u/dispatch-type-keyword actual)]))+ [(u/dispatch-type-keyword expected) (u/dispatch-type-keyword actual)])+ :hierarchy #'u/dispatch-type-hierarchy);;;; Default method implsdiff --git a/test/metabase/util_test.cljc b/test/metabase/util_test.cljcindex 2c7fc14b8d9..66bed2898dc 100644--- a/test/metabase/util_test.cljc+++ b/test/metabase/util_test.cljc@@ -446,7 +446,7 @@str :dispatch-type/fn#?(:clj (Object.) :cljs (js/Object.)) :dispatch-type/*)(testing "All type keywords should derive from :dispatch-type/*"- (are [x] (isa? (u/dispatch-type-keyword x) :dispatch-type/*)+ (are [x] (isa? u/dispatch-type-hierarchy (u/dispatch-type-keyword x) :dispatch-type/*):dispatch-type/nil:dispatch-type/string:dispatch-type/keyword