replace static-context macro without compojure impl details

Author: frenchy64

CHANGELOG.md

@@ -8,6 +8,7 @@ See also: [compojure-api 1.1.x changelog](./CHANGELOG-1.1.x.md)
   * saves 1 evaluation per schema, per request, for dynamic contexts
 * Fix: Merge `:{form,multipart}-params` `:info :public :parameters :formData` field at runtime
 * Add `:outer-lets` field to `restructure-param` result which wraps entire resulting form
+* Remove `static-context` macro and replace with equivalent expansion without relying on compojure internals.
 
 ## 2.0.0-alpha32 (2024-03-20)
 

src/compojure/api/meta.clj

@@ -648,13 +648,6 @@
     `(do ~@body)
     (reverse (partition 2 bindings))))
 
-(defmacro static-context
-  [path route]
-  `(compojure.api.compojure-compat/make-context
-     ~(#'compojure.core/context-route path)
-     (let [r# ~route]
-       (fn [_#] r#))))
-
 (defn routing [handlers]
   (if-let [handlers (seq (keep identity (flatten handlers)))]
     (apply compojure.core/routes handlers)
@@ -1080,7 +1073,8 @@
                    form)
             form (if (seq middleware) `((mw/compose-middleware ~middleware) ~form) form)
             form (if static-context?
-                   `(static-context ~path ~form)
+                   `(let [form# ~form]
+                      (compojure.core/context ~path ~arg-with-request form#))
                    `(compojure.core/context ~path ~arg-with-request ~form))
 
             ;; create and apply a separate lookup-function to find the inner routes

test/compojure/api/meta_test.clj

@@ -1,6 +1,6 @@
 (ns compojure.api.meta-test
   (:require [compojure.api.sweet :as sweet :refer :all]
-            [compojure.api.meta :as meta :refer [merge-parameters static-context routing]]
+            [compojure.api.meta :as meta :refer [merge-parameters routing]]
             [compojure.api.common :refer [merge-vector]]
             [compojure.api.compojure-compat :refer [make-context]]
             [clojure.data :as data]
@@ -258,8 +258,11 @@
                     :method nil,
                     :info (merge-parameters {:static-context? true}),
                     :handler
-                    (static-context "/a"
-                      (routing [(~'POST "/ping" [])]))})))
+                    (let [?form (routing [(~'POST "/ping" [])])]
+                      (cc/context
+                        "/a"
+                        [:as +compojure-api-request+]
+                        ?form))})))
   (testing "dynamic context"
     (is-expands (context "/a" [] :dynamic true (POST "/ping" []))
                 `(map->Route
@@ -277,18 +280,7 @@
                     :handler
                     (cc/context "/a"
                       [:as +compojure-api-request+]
-                      (routing [(~'POST "/ping" [])]))})))
-  (testing "static-context"
-    (is-expands (static-context "/a"
-                                (routing [(POST "/ping" [])]))
-                `(make-context
-                   {:__record__ "clout.core.CompiledRoute",
-                    :source "/a:__path-info",
-                    :re #"/a(|/.*)",
-                    :keys [:__path-info],
-                    :absolute? false}
-                   (let [?r ~'(routing [(POST "/ping" [])])]
-                     (fn [?_] ?r))))))
+                      (routing [(~'POST "/ping" [])]))}))))
 
 (deftest is-thrown-with-msg?-test
   (is-thrown-with-msg? Exception #"message" (throw (Exception. "message")))
@@ -2145,3 +2137,10 @@
       (is (= {:field 1 :default 1 :extra-keys 1 :extra-vals 1 :default-never 1} @times))
       (dorun (repeatedly 10 exercise))
       (is (= {:field 1 :default 1 :extra-keys 1 :extra-vals 1 :default-never 11} @times)))))
+
+#_
+(deftest push-context-parameters-into-endpoints-test
+  (macroexpand-2
+    `(context "/foo" []
+              :dynamic true
+              )))