Fix system check plugins and profile plugin edge case

Author: wilkerlucio

deps.edn

@@ -8,5 +8,5 @@
   fulcrologic/fulcro         {:mvn/version "2.4.4"}
   fulcrologic/fulcro-inspect {:mvn/version "2.0.0"}
   binaryage/devtools         {:mvn/version "0.9.9"}
-  org.clojure/test.check     {:mvn/version "0.9.0"}
+  org.clojure/test.check     {:mvn/version "0.10.0-alpha3"}
   camel-snake-kebab          {:mvn/version "0.4.0"}}}

project.clj

@@ -13,7 +13,7 @@
                  [org.clojure/math.combinatorics "0.1.4"]
                  [com.wsscode/spec-inspec "1.0.0-alpha2"]
                  [fulcrologic/fulcro "2.5.5" :scope "provided"]
-                 [org.clojure/test.check "0.9.0"]
+                 [org.clojure/test.check "0.10.0-alpha3" :scope "provided"]
                  [camel-snake-kebab "0.4.0"]]
 
   :plugins [[lein-cljsbuild "1.1.7"]]
@@ -26,4 +26,5 @@
 
   :jar-exclusions [#"src-docs/.*" #"docs/.+" #"node-modules/.+"]
 
-  :profiles {:dev {:source-paths ["src" "src-docs"]}})
+  :profiles {:dev {:source-paths ["src" "src-docs"]
+                   :dependencies [[criterium "0.4.4"]]}})

src/com/wsscode/pathom/core.cljc

@@ -712,7 +712,7 @@
     plugins))
 
 (defn wrap-normalize-env
-  ([parser] (wrap-normalize-env parser {}))
+  ([parser] (wrap-normalize-env parser []))
   ([parser plugins]
    (fn wrap-normalize-env-internal
      ([env tx] (wrap-normalize-env-internal env tx nil))

src/com/wsscode/pathom/profile.cljc

@@ -31,8 +31,10 @@
          @profile*
          (let [start-time (current-time-ms)]
            (let-chan [res (reader env)]
-             (swap! profile* update-in path append-at
-               (- (current-time-ms) start-time))
+             (try
+               (swap! profile* update-in path append-at
+                 (- (current-time-ms) start-time))
+               (catch Exception _))
              res)))))
 
    ::p/wrap-mutate

test/com/wsscode/pathom/system_test.clj

@@ -92,7 +92,8 @@
 (defn parser-test-props [env]
   (props/for-all [{:keys [query errors? plugins]} (->> (base-gen)
                                                        (gen/fmap #(update % :query p/remove-query-wildcard)))]
-    (let [parser        (p/parser {::p/plugins plugins
+    (let [plugins       (mapv (comp deref resolve) plugins)
+          parser        (p/parser {::p/plugins plugins
                                    :mutate     pt/mutate-fn})
 
           async-parser  (p/async-parser {::p/plugins plugins
@@ -112,6 +113,69 @@
   [{{::pc/keys [output]} ::pc/resolver-data} _]
   (pct/parser (assoc pct/parser-env ::pt/include-nils? false) output))
 
+(defn profile-speed-props [env]
+  (let [props (gen/generate (gen/vector-distinct gen/keyword-ns {:min-elements 8
+                                                                 :max-elements 100})
+                4)]
+    (props/for-all [query (s.query/make-gen {::s.query/gen-property
+                                             (fn [_] (gen/elements props))
+
+                                             ::s.query/gen-params
+                                             (fn [_] (gen/map gen/keyword gen/simple-type-printable {:max-elements 3}))}
+                            ::s.query/gen-query)]
+      (let [plugins       [pp/profile-plugin]
+            parser        (p/parser {::p/plugins plugins
+                                     :mutate     pt/mutate-fn})
+
+            async-parser  (p/async-parser {::p/plugins plugins
+                                           :mutate     pt/mutate-fn})
+            {:keys [async-reader] :as env} env]
+        (= (catch-run-parser parser env query)
+           (catch-run-parser (comp <!! async-parser) (assoc env ::p/reader async-reader) query))))))
+
+(test/defspec profile-speed
+  {:max-size 16 :num-tests 30
+   :seed     1530060220973} (profile-speed-props pct/parser-env))
+
+(comment
+  (let [props (gen/generate (gen/vector-distinct gen/keyword-ns {:min-elements 8
+                                                                 :max-elements 100})
+                4)
+        query-gen (s.query/make-gen {::s.query/gen-property
+                                     (fn [_] (gen/elements props))
+
+                                     ::s.query/gen-params
+                                     (fn [_] (gen/map gen/keyword gen/simple-type-printable {:max-elements 3}))}
+                    ::s.query/gen-query)
+        queries (take 20 (gen/sample-seq query-gen 16))]
+    (def queries queries))
+
+  (let [env pct/parser-env
+        plugins      [pp/profile-plugin]
+        parser       (p/parser {::p/plugins plugins
+                                :mutate     pt/mutate-fn})
+
+        async-parser (p/async-parser {::p/plugins plugins
+                                      :mutate     pt/mutate-fn})
+        {:keys [async-reader] :as env} env]
+
+    (doseq [query queries]
+      (parser env query))
+
+    #_
+    (criterium/with-progress-reporting
+      (criterium/bench
+        (doseq [query queries]
+          #_ (parser env query)
+          ((comp <!! async-parser) (assoc env ::p/reader async-reader) query)))))
+
+  (time
+    (clojure.test/test-vars [#'profile-speed]))
+
+  (criterium/with-progress-reporting
+    (criterium/bench
+      (clojure.test/test-vars [#'profile-speed]))))
+
 (defn async-resolve-fn
   [{{::pc/keys [output]} ::pc/resolver-data :as env} _]
   (if (-> env :ast :key (pt/hash-mod? 3))
@@ -194,7 +258,9 @@
       :query        [(A {})]
       :type         :call})
 
-  (let [{:keys [query plugins errors?]} {:query [#:N3Sq!.+!w?0.j+?_.lG+{:x?d? [:hP0*/dN04E]}], :errors? false, :plugins []}
+  (let [{:keys [query plugins errors?]} {:query '[:A.?d!.!W_l.Zj/j?+y
+                                                  {:A.?d!.!W_l.Zj/j?+y
+                                                   [{:a [:foo]}]}], :errors? false, :plugins [pp/profile-plugin]}
         env pct/parser-env]
     (let [parser        (p/parser {::p/plugins plugins
                                    :mutate     pt/mutate-fn})