firefly-compiler 0.5.49 → 0.5.51

package/webserver/WebRoute.ff

@@ -15,6 +15,19 @@ instance Int: WebParameter {
     fromRouteParameter(value: Int): String {"" + value}
 }
 
+instance Option[T: WebParameter]: WebParameter {
+    toRouteParameter(text: String): Option[Option[T]] {
+        if(text != "") {
+            toRouteParameter(text).map {Some(_)}
+        } else {
+            Some(None)
+        }
+    }
+    fromRouteParameter(value: Option[T]): String {
+        value.map {fromRouteParameter(_)}.else {""}
+    }
+}
+
 data WebRoute0(urlPattern: String, segments: List[String])
 data WebRoute1[P1](urlPattern: String, segments: List[String])
 data WebRoute2[P1, P2](urlPattern: String, segments: List[String])
@@ -42,12 +55,16 @@ extend self[P1: WebParameter]: WebRoute1[P1] {
         mutable result = ""
         mutable parameter = 1
         self.segments.each {r =>
-            result += "/"
             if(r.startsWith("{")) {
-                if(parameter == 1) {result += fromRouteParameter(p1)}
+                let p = if(parameter == 1) {
+                    fromRouteParameter(p1)
+                } else {
+                    ""
+                }
+                if(p != "" || !r.endsWith("?}")) {result += "/" + p}
                 parameter += 1
             } else {
-                result += r
+                result += "/" + r
             }
         }
         if(self.urlPattern.endsWith("/")) {result += "/"}
@@ -60,13 +77,18 @@ extend self[P1: WebParameter, P2: WebParameter]: WebRoute2[P1, P2] {
         mutable result = ""
         mutable parameter = 0
         self.segments.each {r =>
-            result += "/"
             if(r.startsWith("{")) {
-                if(parameter == 1) {result += fromRouteParameter(p1)}
-                if(parameter == 2) {result += fromRouteParameter(p2)}
+                let p = if(parameter == 1) {
+                    fromRouteParameter(p1)
+                } elseIf {parameter == 2} {
+                    fromRouteParameter(p2)
+                } else {
+                    ""
+                }
+                if(p != "" || !r.endsWith("?}")) {result += "/" + p}
                 parameter += 1
             } else {
-                result += r
+                result += "/" + r
             }
         }
         if(self.urlPattern.endsWith("/")) {result += "/"}
@@ -88,11 +110,12 @@ extend self[C]: WebRouteHandler[C] {
     
     add1[P1: WebParameter](route: WebRoute1[P1], handle: (WebRequest[WebResponse], C, P1) => Unit) {
         self.handlers.push {request, segments, context =>
-            if(segments.size() != route.segments.size()) {False} else:
-            let matching = True
+            let paddedSegments = internalCheckSegments(segments, route.segments)
+            if(paddedSegments.isEmpty()) {False} else:
+            mutable matching = True
             mutable p1 = None
-            segments.zip(route.segments).eachWhile {| Pair(s, r) =>
-                if(r.startsWith("{")) {
+            paddedSegments.zip(route.segments).eachWhile {| Pair(s, r) =>
+                matching = if(r.startsWith("{")) {
                     if(p1.isEmpty()) {
                         p1 = toRouteParameter(s)
                         !p1.isEmpty()
@@ -102,6 +125,7 @@ extend self[C]: WebRouteHandler[C] {
                 } else {
                     r == s
                 }
+                matching
             }
             if(!matching) {False} else:
             handle(request, context, p1.grab())
@@ -111,11 +135,12 @@ extend self[C]: WebRouteHandler[C] {
     
     add2[P1: WebParameter, P2: WebParameter](route: WebRoute2[P1, P2], handle: (WebRequest[WebResponse], C, P1, P2) => Unit) {
         self.handlers.push {request, segments, context =>
-            if(segments.size() != route.segments.size()) {False} else:
+            let paddedSegments = internalCheckSegments(segments, route.segments)
+            if(paddedSegments.isEmpty()) {False} else:
             mutable p1 = None
             mutable p2 = None
             mutable matching = True
-            segments.zip(route.segments).eachWhile {| Pair(s, r) =>
+            paddedSegments.zip(route.segments).eachWhile {| Pair(s, r) =>
                 matching = if(r.startsWith("{")) {
                     if(p1.isEmpty()) {
                         p1 = toRouteParameter(s)
@@ -139,12 +164,24 @@ extend self[C]: WebRouteHandler[C] {
     
     handle(request: WebRequest[WebResponse], context: C): Bool {
         let segments = request.readPath().split('/').filter {s => s != ""}
+        let trimmedSegments = if(segments.last().contains("")) {segments.dropLast()} else {segments}
         mutable handled = False
         self.handlers.eachWhile {| handler =>
-            handled = handler(request, segments, context)
+            handled = handler(request, trimmedSegments, context)
             !handled
         }
         handled
     }
 
 }
+
+internalCheckSegments(segments: List[String], patterns: List[String]): List[String] {
+    segments.{
+        | _ {segments.size() == patterns.size()} => 
+            segments
+        | _ {segments.size() == patterns.size() - 1} {patterns.indexWhere {_.endsWith("?}")} | Some(i)} =>
+            [...segments.takeFirst(i), "", ...segments.dropFirst(i)]
+        | _ => 
+            []
+    }
+}

package/fireflysite/ReferenceAll.ff

@@ -1,18 +0,0 @@
-import Guide
-import ReferenceIntroduction
-
-mock(): List[Document] {
-    [
-        ReferenceIntroduction.new()
-        UnfetchedDocument("Modules and packages")
-        UnfetchedDocument("Base types")
-        UnfetchedDocument("User defined types")
-        UnfetchedDocument("Statements and expressions")
-        UnfetchedDocument("Functions and methods")
-        UnfetchedDocument("Pattern matching")
-        UnfetchedDocument("Traits and instances")
-        UnfetchedDocument("Exceptions")
-        UnfetchedDocument("Structured concurrency")
-        UnfetchedDocument("JavaScript interop")
-    ]
-}