Add Malli types to the API

src/macaw/core.clj

@@ -3,14 +3,17 @@
    [clojure.string :as str]
    [clojure.walk :as walk]
    [macaw.collect :as collect]
-   [macaw.rewrite :as rewrite])
+   [macaw.rewrite :as rewrite]
+   [macaw.types :as m.types]
+   [macaw.util.malli :as mu])
   (:import
-   (com.metabase.macaw AstWalker$Scope BasicTableExtractor AnalysisError CompoundTableExtractor)
+   (com.metabase.macaw AnalysisError AstWalker$Scope BasicTableExtractor CompoundTableExtractor)
    (java.util.function Consumer)
    (net.sf.jsqlparser JSQLParserException)
    (net.sf.jsqlparser.parser CCJSqlParser CCJSqlParserUtil)
    (net.sf.jsqlparser.parser.feature Feature)
-   (net.sf.jsqlparser.schema Table)))
+   (net.sf.jsqlparser.schema Table)
+   (net.sf.jsqlparser.statement Statement)))
 
 (set! *warn-on-reflection* true)
 
@@ -74,12 +77,13 @@
                                      str/lower-case
                                      (str/replace #"_" "-")))})
 
-(defn query->components
+(mu/defn query->components :- [:or m.types/error-result m.types/components-result]
   "Given a parsed query (i.e., a [subclass of] `Statement`) return a map with the elements found within it.
 
   (Specifically, it returns their fully-qualified names as strings, where 'fully-qualified' means 'as referred to in
   the query'; this function doesn't do additional inference work to find out a table's schema.)"
-  [parsed & {:as opts}]
+  [parsed       :- [:or m.types/error-result [:fn #(instance? Statement %)]]
+   & {:as opts} :- [:maybe m.types/options-map]]
   ;; By default, we will preserve identifiers verbatim, to be agnostic of casing and quoting.
   ;; This may result in duplicate components, which are left to the caller to deduplicate.
   ;; In Metabase's case, this is done during the stage where the database metadata is queried.
@@ -108,9 +112,9 @@
 (defn- tables->identifiers [expr]
   {:tables (set (map table->identifier expr))})
 
-(defn query->tables
+(mu/defn query->tables :- [:or m.types/error-result m.types/tables-result]
   "Given a parsed query (i.e., a [subclass of] `Statement`) return a set of all the table identifiers found within it."
-  [sql & {:keys [mode] :as opts}]
+  [sql :- :string & {:keys [mode] :as opts} :- [:maybe m.types/options-map]]
   (try
     (let [parsed (parsed-query sql opts)]
       (if (map? parsed)
@@ -122,7 +126,7 @@
     (catch AnalysisError e
       (->macaw-error e))))
 
-(defn replace-names
+(mu/defn replace-names :- :string
   "Given an SQL query, apply the given table, column, and schema renames.
 
   Supported options:
@@ -133,7 +137,9 @@
     - :agnostic - case is ignored when comparing identifiers in code to replacement \"from\" strings.
 
   - quotes-preserve-case: whether quoted identifiers should override the previous option."
-  [sql renames & {:as opts}]
+  [sql          :- :string
+   renames      :- :map
+   & {:as opts} :- [:maybe m.types/options-map]]
   ;; We need to pre-sanitize the SQL before its analyzed so that the AST token positions match up correctly.
   ;; Currently, we use a more complex and expensive sanitization method, so that it's reversible.
   ;; If we decide that it's OK to normalize whitespace etc. during replacement, then we can use the same helper.

src/macaw/types.clj

@@ -1 +1,61 @@
 (ns macaw.types)
+
+(def modes
+  "The different analyzer strategies that Macaw supports."
+  [:ast-walker-1
+   :basic-select
+   :compound-select])
+
+(def options-map
+  "The shape of the options accepted by our API"
+  [:map
+   [:mode                  {:optional true} (into [:enum] modes)]
+   [:non-reserved-words    {:optional true} [:seqable :keyword]]
+   [:allow-unused?         {:optional true} :boolean]
+   [:case-insensitive      {:optional true} [:enum :upper :lower :agnostic]]
+   [:quotes-preserve-case? {:optional true} :boolean]])
+
+(def error-types
+  "The different types of errors that Macaw can return."
+  [:macaw.error/analysis-error
+   :macaw.error/illegal-expression
+   :macaw.error/invalid-query
+   :macaw.error/unable-to-parse])
+
+(def error-result
+  "A map indicating that we were not able to parse the query."
+  [:map
+   [:error (into [:enum] error-types)]])
+
+(def ^:private table-ident
+  [:map
+   [:schema {:optional true} :string]
+   [:table                   :string]])
+
+(def ^:private column-ident
+  [:map
+   [:schema {:optional true} :string]
+   [:table  {:optional true} :string]
+   [:column                  :string]])
+
+(defn- wrapped [t]
+  [:map
+   [:component t]
+   [:context :any]])
+
+(def components-result
+  "A map holding all the components that we were able to parse from a query"
+  [:map {:closed true}
+   [:tables         [:set (wrapped table-ident)]]
+   [:columns        [:set (wrapped column-ident)]]
+   [:source-columns [:set column-ident]]
+   ;; TODO tighten types
+   [:tables-superset   [:set :any]]
+   [:has-wildcard?     [:set :any]]
+   [:mutation-commands [:set :any]]
+   [:table-wildcards   [:set :any]]])
+
+(def tables-result
+  "A map holding the tables that we were able to parse from a query"
+  [:map
+   [:tables [:set table-ident]]])

test/macaw/acceptance_test.clj

@@ -5,7 +5,8 @@
    [clojure.string :as str]
    [clojure.test :refer :all]
    [macaw.core :as m]
-   [macaw.core-test :as ct])
+   [macaw.core-test :as ct]
+   [macaw.types])
   (:import
    (java.io File)))
 
@@ -27,9 +28,7 @@
     (ct/raw-components (get cs k))))
 
 (def ^:private test-modes
-  #{:ast-walker-1
-    :basic-select
-    :compound-select})
+  (set (macaw.types/modes)))
 
 (def override-hierarchy
   (-> (make-hierarchy)