Keep all interceptors top level

pom.xml

@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>dehli</groupId>
   <artifactId>serverless</artifactId>
-  <version>0.2.1</version>
+  <version>0.2.2</version>
   <name>serverless</name>
   <dependencies>
     <dependency>

src/serverless/interceptors/env.cljs

@@ -10,9 +10,5 @@
 
 (def assoc-env
   {:name :serverless/assoc-env
-   :enter (fn [context]
-            (assoc-in context
-                      [:request :serverless/env]
-                      (-> context
-                          (get-in [:request :serverless/raw-env])
-                          env->hash-map)))})
+   :enter (fn [{:keys [serverless/raw-env] :as context}]
+            (assoc context :serverless/env (env->hash-map raw-env)))})

src/serverless/interceptors/event.cljs

@@ -5,9 +5,10 @@
 
 (def assoc-event
   {:name :serverless/assoc-event
-   :enter (fn [{:keys [request] :as context}]
-            (let [{:keys [serverless/raw-event]} request]
-              (assoc-in context [:request :serverless/event]
-                        (cske/transform-keys csk/->kebab-case (->clj raw-event)))))
+   :enter (fn [{:keys [serverless/raw-event] :as context}]
+            (assoc context
+                   :serverless/event
+                   (cske/transform-keys csk/->kebab-case (->clj raw-event))))
+
    :leave (fn [context]
             (update context :response ->js))})

src/serverless/interceptors/now.cljs

@@ -4,4 +4,4 @@
 (def assoc-now
   {:name :serverless/assoc-now
    :enter (fn [context]
-            (assoc-in context [:request :serverless/now] (t/now)))})
+            (assoc context :serverless/now (t/now)))})

src/serverless/interceptors/raw_env.cljs

@@ -3,4 +3,4 @@
 
 (def assoc-raw-env
   {:name :serverless/assoc-raw-env
-   :enter #(assoc-in % [:request :serverless/raw-env] (j/get js/process :env))})
+   :enter #(assoc % :serverless/raw-env (j/get js/process :env))})

src/serverless/interceptors/raw_event.cljs

@@ -2,5 +2,4 @@
 
 (def assoc-raw-event
   {:name :serverless/assoc-raw-event
-   :enter (fn [{:keys [request] :as context}]
-            (assoc context :request {:serverless/raw-event request}))})
+   :enter #(assoc % :serverless/raw-event (:request %))})