[alpha] Make reg-sub-raw alpha-compatible

Author: kimo-k

src/re_frame/alpha.cljc

@@ -15,6 +15,7 @@
    [re-frame.loggers          :as loggers]
    [re-frame.db               :as db]
    [re-frame.interop          :as interop]
+   [re-frame.query.alpha      :as q]
    [clojure.set               :as set]
    [re-frame.std-interceptors :as std-interceptors :refer [db-handler->interceptor
                                                            fx-handler->interceptor
@@ -751,7 +752,11 @@ A `flow` is a map, specifying one dataflow node. It has keys:
 
 (defn ^:api-docs/hide reg-sub-raw
   [query-id handler-fn]
-  (registrar/register-handler subs/kind query-id handler-fn))
+  (registrar/register-handler
+   subs/kind
+   query-id
+   (fn raw-subs-handler-fn [db q]
+     (handler-fn db (subs.alpha/compat q)))))
 
 (defn ^:api-docs/hide clear-subscription-cache!
   []

src/re_frame/subs/alpha.cljc

@@ -54,18 +54,21 @@
          (reset! rid (reagent-id r))
          r)))))
 
+(defn compat [q]
+  (if (map? q)
+    (-> (or (:re-frame/query-v q) [(q/id q)])
+        (vary-meta assoc
+                   :re-frame/lifecycle (q/lifecycle q)
+                   :re-frame/query-m q))
+    q))
+
 (defmethod reg :legacy-sub [_ id & args]
   (let [[inputs-fn computation-fn] (apply sugar id sub q/query? args)]
     (register-handler
      :sub
      id
      (fn subs-handler-fn [_ q]
-       (let [q (if (map? q)
-                 (-> (or (::rf/query-v q) [(q/id q)])
-                     (vary-meta assoc
-                                ::rf/lifecycle (q/lifecycle q)
-                                ::rf/query-m q))
-                 q)
+       (let [q (compat q)
              subscriptions (inputs-fn q nil)
              rid (atom nil)
              r (make-reaction