Get dynamic route importing working

joy-framework · Apr 30, 2020 · 7a83be7 · 7a83be7
1 parent 83f3740
commit 7a83be7
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/joy/router.janet b/src/joy/router.janet
@@ -87,9 +87,17 @@
     ~(set *route-table* (merge *route-table* (route-table ,;args)))))
 
 
+(defn present? [val]
+  (and (truthy? val)
+       (not (empty? val))))
+
+
 (defn namespace [val]
   (when (keyword? val)
-    (first (string/split "/" val))))
+    (let [arr (string/split "/" val)
+          len (dec (length arr))
+          ns-array (array/slice arr 0 len)]
+      (string/join ns-array "/"))))
 
 
 (defmacro defroutes [& args]
@@ -101,13 +109,13 @@
         files (as-> rest ?
                     (map |(get $ 2) ?)
                     (map namespace ?)
-                    (filter truthy? ?)
+                    (filter present? ?)
                     (distinct ?))
 
         # import all distinct file names from routes
         _ (loop [file :in files]
             (try
-              (import* (string "./routes/" file))
+              (import* (string "./routes/" file) :as file)
               ([err]
                (print (string "Route file src/routes/" file ".janet does not exist.")))))