firefly-compiler 0.5.46 → 0.5.48

package/output/js/ff/core/Buffer.mjs

@@ -140,7 +140,7 @@ return (new DataView(arrayBuffer_))
 export function fromBase64_(base64_) {
 const binaryString_ = atob(base64_);
 const bytes_ = Uint8Array.from(binaryString_, ((char_) => {
-return char_.CharCodeAt(0)
+return char_.charCodeAt(0)
 }));
 return (new DataView(bytes_.buffer))
 }
@@ -186,7 +186,7 @@ return (new DataView(arrayBuffer_))
 export async function fromBase64_$(base64_, $task) {
 const binaryString_ = atob(base64_);
 const bytes_ = Uint8Array.from(binaryString_, ((char_) => {
-return char_.CharCodeAt(0)
+return char_.charCodeAt(0)
 }));
 return (new DataView(bytes_.buffer))
 }

package/output/js/ff/core/Map.mjs

@@ -137,6 +137,14 @@ export function Map_get(self_, key_, ff_core_Ordering_Order$K) {
 return ff_core_RbMap.RB_get(self_, key_, ff_core_Ordering_Order$K)
 }
 
+export function Map_lastBefore(self_, key_, ff_core_Ordering_Order$K) {
+return ff_core_RbMap.RB_lastBefore(self_, key_, ff_core_Ordering_Order$K)
+}
+
+export function Map_firstAfter(self_, key_, ff_core_Ordering_Order$K) {
+return ff_core_RbMap.RB_firstAfter(self_, key_, ff_core_Ordering_Order$K)
+}
+
 export function Map_remove(self_, key_, ff_core_Ordering_Order$K) {
 return ff_core_RbMap.delete_(key_, self_, ff_core_Ordering_Order$K)
 }
@@ -256,6 +264,14 @@ export async function Map_get$(self_, key_, ff_core_Ordering_Order$K, $task) {
 return ff_core_RbMap.RB_get(self_, key_, ff_core_Ordering_Order$K)
 }
 
+export async function Map_lastBefore$(self_, key_, ff_core_Ordering_Order$K, $task) {
+return ff_core_RbMap.RB_lastBefore(self_, key_, ff_core_Ordering_Order$K)
+}
+
+export async function Map_firstAfter$(self_, key_, ff_core_Ordering_Order$K, $task) {
+return ff_core_RbMap.RB_firstAfter(self_, key_, ff_core_Ordering_Order$K)
+}
+
 export async function Map_remove$(self_, key_, ff_core_Ordering_Order$K, $task) {
 return ff_core_RbMap.delete_(key_, self_, ff_core_Ordering_Order$K)
 }

package/output/js/ff/core/Path.mjs

@@ -428,10 +428,7 @@ dir_ = fsPromises_.opendir(self_.absolutePath_, {bufferSize: 128})
 };
 const entry_ = dir_.read();
 if((!ff_core_JsValue.JsValue_isNull(entry_))) {
-return ff_core_Option.Some((function() {
-entry_.ffPath = self_.absolutePath_;
-return entry_
-})())
+return ff_core_Option.Some((entry_.ffPath = self_.absolutePath_, entry_))
 } else return ff_core_Option.None()
 }), (() => {
 if((!ff_core_JsValue.JsValue_isNull(dir_))) {
@@ -729,10 +726,7 @@ dir_ = (await fsPromises_.opendir(self_.absolutePath_, {bufferSize: 128}))
 };
 const entry_ = (await dir_.read());
 if((!ff_core_JsValue.JsValue_isNull(entry_))) {
-return ff_core_Option.Some((await (async function() {
-entry_.ffPath = self_.absolutePath_;
-return entry_
-})()))
+return ff_core_Option.Some((entry_.ffPath = self_.absolutePath_, entry_))
 } else return ff_core_Option.None()
 }), (async ($task) => {
 if((!ff_core_JsValue.JsValue_isNull(dir_))) {

package/output/js/ff/core/RbMap.mjs

@@ -995,6 +995,62 @@ return
 }
 }
 
+export function RB_lastBefore(self_, key_, ff_core_Ordering_Order$K) {
+{
+const _1 = self_;
+if(_1.E) {
+return ff_core_Option.None()
+}
+if(_1.T) {
+const l_ = _1.left_;
+const k_ = _1.key_;
+const v_ = _1.value_;
+const r_ = _1.right_;
+if(ff_core_Ordering.notBefore_(k_, key_, ff_core_Ordering_Order$K)) {
+return ff_core_RbMap.RB_lastBefore(l_, key_, ff_core_Ordering_Order$K)
+}
+}
+{
+const l_ = _1.left_;
+const k_ = _1.key_;
+const v_ = _1.value_;
+const r_ = _1.right_;
+return ff_core_Option.Option_orElse(ff_core_RbMap.RB_lastBefore(r_, key_, ff_core_Ordering_Order$K), (() => {
+return ff_core_Option.Some(ff_core_Pair.Pair(k_, v_))
+}))
+return
+}
+}
+}
+
+export function RB_firstAfter(self_, key_, ff_core_Ordering_Order$K) {
+{
+const _1 = self_;
+if(_1.E) {
+return ff_core_Option.None()
+}
+if(_1.T) {
+const l_ = _1.left_;
+const k_ = _1.key_;
+const v_ = _1.value_;
+const r_ = _1.right_;
+if(ff_core_Ordering.notAfter_(k_, key_, ff_core_Ordering_Order$K)) {
+return ff_core_RbMap.RB_firstAfter(r_, key_, ff_core_Ordering_Order$K)
+}
+}
+{
+const l_ = _1.left_;
+const k_ = _1.key_;
+const v_ = _1.value_;
+const r_ = _1.right_;
+return ff_core_Option.Option_orElse(ff_core_RbMap.RB_firstAfter(l_, key_, ff_core_Ordering_Order$K), (() => {
+return ff_core_Option.Some(ff_core_Pair.Pair(k_, v_))
+}))
+return
+}
+}
+}
+
 export function RB_size(self_, ff_core_Ordering_Order$K) {
 {
 const _1 = self_;
@@ -1188,6 +1244,62 @@ return
 }
 }
 
+export async function RB_lastBefore$(self_, key_, ff_core_Ordering_Order$K, $task) {
+{
+const _1 = self_;
+if(_1.E) {
+return ff_core_Option.None()
+}
+if(_1.T) {
+const l_ = _1.left_;
+const k_ = _1.key_;
+const v_ = _1.value_;
+const r_ = _1.right_;
+if(ff_core_Ordering.notBefore_(k_, key_, ff_core_Ordering_Order$K)) {
+return ff_core_RbMap.RB_lastBefore(l_, key_, ff_core_Ordering_Order$K)
+}
+}
+{
+const l_ = _1.left_;
+const k_ = _1.key_;
+const v_ = _1.value_;
+const r_ = _1.right_;
+return ff_core_Option.Option_orElse(ff_core_RbMap.RB_lastBefore(r_, key_, ff_core_Ordering_Order$K), (() => {
+return ff_core_Option.Some(ff_core_Pair.Pair(k_, v_))
+}))
+return
+}
+}
+}
+
+export async function RB_firstAfter$(self_, key_, ff_core_Ordering_Order$K, $task) {
+{
+const _1 = self_;
+if(_1.E) {
+return ff_core_Option.None()
+}
+if(_1.T) {
+const l_ = _1.left_;
+const k_ = _1.key_;
+const v_ = _1.value_;
+const r_ = _1.right_;
+if(ff_core_Ordering.notAfter_(k_, key_, ff_core_Ordering_Order$K)) {
+return ff_core_RbMap.RB_firstAfter(r_, key_, ff_core_Ordering_Order$K)
+}
+}
+{
+const l_ = _1.left_;
+const k_ = _1.key_;
+const v_ = _1.value_;
+const r_ = _1.right_;
+return ff_core_Option.Option_orElse(ff_core_RbMap.RB_firstAfter(l_, key_, ff_core_Ordering_Order$K), (() => {
+return ff_core_Option.Some(ff_core_Pair.Pair(k_, v_))
+}))
+return
+}
+}
+}
+
 export async function RB_size$(self_, ff_core_Ordering_Order$K, $task) {
 {
 const _1 = self_;

package/output/js/ff/core/Set.mjs

@@ -135,6 +135,18 @@ export function Set_contains(self_, value_, ff_core_Ordering_Order$T) {
 return ff_core_Map.Map_contains(self_, value_, ff_core_Ordering_Order$T)
 }
 
+export function Set_lastBefore(self_, key_, ff_core_Ordering_Order$T) {
+return ff_core_Option.Option_map(ff_core_Map.Map_lastBefore(self_, key_, ff_core_Ordering_Order$T), ((_w1) => {
+return _w1.first_
+}))
+}
+
+export function Set_firstAfter(self_, key_, ff_core_Ordering_Order$T) {
+return ff_core_Option.Option_map(ff_core_Map.Map_firstAfter(self_, key_, ff_core_Ordering_Order$T), ((_w1) => {
+return _w1.first_
+}))
+}
+
 export function Set_size(self_, ff_core_Ordering_Order$T) {
 return ff_core_Map.Map_size(self_, ff_core_Ordering_Order$T)
 }
@@ -200,6 +212,18 @@ export async function Set_contains$(self_, value_, ff_core_Ordering_Order$T, $ta
 return ff_core_Map.Map_contains(self_, value_, ff_core_Ordering_Order$T)
 }
 
+export async function Set_lastBefore$(self_, key_, ff_core_Ordering_Order$T, $task) {
+return ff_core_Option.Option_map(ff_core_Map.Map_lastBefore(self_, key_, ff_core_Ordering_Order$T), ((_w1) => {
+return _w1.first_
+}))
+}
+
+export async function Set_firstAfter$(self_, key_, ff_core_Ordering_Order$T, $task) {
+return ff_core_Option.Option_map(ff_core_Map.Map_firstAfter(self_, key_, ff_core_Ordering_Order$T), ((_w1) => {
+return _w1.first_
+}))
+}
+
 export async function Set_size$(self_, ff_core_Ordering_Order$T, $task) {
 return ff_core_Map.Map_size(self_, ff_core_Ordering_Order$T)
 }

package/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly compiler",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.46",
+    "version": "0.5.48",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"

package/vscode/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly language support",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.46",
+    "version": "0.5.48",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"

package/webserver/WebRoute.ff

@@ -0,0 +1,150 @@
+import WebServer
+
+trait P: WebParameter {
+    toRouteParameter(text: String): Option[P]
+    fromRouteParameter(value: P): String
+}
+
+instance String: WebParameter {
+    toRouteParameter(text: String): Option[String] {Some(text)} // TODO: Unescape
+    fromRouteParameter(value: String): String {value} // TODO: Escape
+}
+
+instance Int: WebParameter {
+    toRouteParameter(text: String): Option[Int] {text.getInt()}
+    fromRouteParameter(value: Int): String {"" + value}
+}
+
+data WebRoute0(urlPattern: String, segments: List[String])
+data WebRoute1[P1](urlPattern: String, segments: List[String])
+data WebRoute2[P1, P2](urlPattern: String, segments: List[String])
+
+new0(urlPattern: String): WebRoute0 {
+    WebRoute0(urlPattern, urlPattern.split('/').filter {s => s != ""})
+}
+
+new1[P1](urlPattern: String): WebRoute1[P1] {
+    WebRoute1(urlPattern, urlPattern.split('/').filter {s => s != ""})
+}
+
+new2[P1, P2](urlPattern: String): WebRoute2[P1, P2] {
+    WebRoute2(urlPattern, urlPattern.split('/').filter {s => s != ""})
+}
+
+extend self: WebRoute0 {
+    toUrl(): String {
+        self.urlPattern
+    }
+}
+
+extend self[P1: WebParameter]: WebRoute1[P1] {
+    toUrl(p1: P1): String {
+        mutable result = ""
+        mutable parameter = 1
+        self.segments.each {r =>
+            result += "/"
+            if(r.startsWith("{")) {
+                if(parameter == 1) {result += fromRouteParameter(p1)}
+                parameter += 1
+            } else {
+                result += r
+            }
+        }
+        if(self.urlPattern.endsWith("/")) {result += "/"}
+        result
+    }
+}
+
+extend self[P1: WebParameter, P2: WebParameter]: WebRoute2[P1, P2] {
+    toUrl(p1: P1, p2: P2): String {
+        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)}
+                parameter += 1
+            } else {
+                result += r
+            }
+        }
+        if(self.urlPattern.endsWith("/")) {result += "/"}
+        result
+    }
+}
+
+capability WebRouteHandler[C](handlers: Array[(WebRequest[WebResponse], List[String], C) => Bool])
+
+extend self[C]: WebRouteHandler[C] {
+    
+    add0(route: WebRoute0, handle: (WebRequest[WebResponse], C) => Unit) {
+        self.handlers.push {request, segments, context =>
+            if(segments != route.segments) {False} else:
+            handle(request, context)
+            True
+        }
+    }
+    
+    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
+            mutable p1 = None
+            segments.zip(route.segments).eachWhile {| Pair(s, r) =>
+                if(r.startsWith("{")) {
+                    if(p1.isEmpty()) {
+                        p1 = toRouteParameter(s)
+                        !p1.isEmpty()
+                    } else {
+                        False
+                    }
+                } else {
+                    r == s
+                }
+            }
+            if(!matching) {False} else:
+            handle(request, context, p1.grab())
+            True
+        }
+    }
+    
+    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:
+            mutable p1 = None
+            mutable p2 = None
+            mutable matching = True
+            segments.zip(route.segments).eachWhile {| Pair(s, r) =>
+                matching = if(r.startsWith("{")) {
+                    if(p1.isEmpty()) {
+                        p1 = toRouteParameter(s)
+                        !p1.isEmpty()
+                    } elseIf {p2.isEmpty()} {
+                        p2 = toRouteParameter(s)
+                        !p2.isEmpty()
+                    } else {
+                        False
+                    }
+                } else {
+                    r == s
+                }
+                matching
+            }
+            if(!matching) {False} else:
+            handle(request, context, p1.grab(), p2.grab())
+            True
+        }
+    }
+    
+    handle(request: WebRequest[WebResponse], context: C): Bool {
+        let segments = request.readPath().split('/').filter {s => s != ""}
+        mutable handled = False
+        self.handlers.eachWhile {| handler =>
+            handled = handler(request, segments, context)
+            !handled
+        }
+        handled
+    }
+
+}