firefly-compiler 0.5.39 → 0.5.41

package/lux/LuxEvent.ff

@@ -1,79 +1,79 @@
-class LuxEvent(jsValue: JsValue)
-
-extend self: LuxEvent {
-    
-    preventDefault(): Unit {self.jsValue->preventDefault()}
-
-    stopPropagation(): Unit {self.jsValue->stopPropagation()}
-        
-    target(): JsValue {self.jsValue->target}
-
-    currentTarget(): JsValue {self.jsValue->currentTarget}
-
-    relatedTarget(): JsValue {self.jsValue->relatedTarget}
-
-    nativeEvent(): JsValue {self.jsValue}
-
-    type(): String {self.jsValue->type?}
-
-    altKey(): Bool {Js.binaryOperator("||", self.jsValue->altKey, False)?}
-
-    ctrlKey(): Bool {Js.binaryOperator("||", self.jsValue->ctrlKey, False)?}
-
-    shiftKey(): Bool {Js.binaryOperator("||", self.jsValue->shiftKey, False)?}
-
-    metaKey(): Bool {Js.binaryOperator("||", self.jsValue->metaKey, False)?}
-
-    button(): Int {Js.binaryOperator("||", self.jsValue->button, 0)?}
-
-    primaryButton(): Bool {Js.unaryOperator("!!", Js.binaryOperator("&", self.jsValue->buttons, 1))?}
-        
-    secondaryButton(): Bool {Js.unaryOperator("!!", Js.binaryOperator("&", self.jsValue->buttons, 2))?}
-        
-    middleButton(): Bool {Js.unaryOperator("!!", Js.binaryOperator("&", self.jsValue->buttons, 4))?}
-        
-    clientX(): Float {Js.binaryOperator("||", self.jsValue->clientX, 0)?}
-
-    clientY(): Float {Js.binaryOperator("||", self.jsValue->clientY, 0)?}
-
-    movementX(): Float {Js.binaryOperator("||", self.jsValue->movementX, 0)?}
-
-    movementY(): Float {Js.binaryOperator("||", self.jsValue->movementY, 0)?}
-
-    offsetX(): Float {Js.binaryOperator("||", self.jsValue->offsetX, 0)?}
-
-    offsetY(): Float {Js.binaryOperator("||", self.jsValue->offsetY, 0)?}
-
-    pageX(): Float {Js.binaryOperator("||", self.jsValue->pageX, 0)?}
-
-    pageY(): Float {Js.binaryOperator("||", self.jsValue->pageY, 0)?}
-
-    screenX(): Float {Js.binaryOperator("||", self.jsValue->screenX, 0)?}
-
-    screenY(): Float {Js.binaryOperator("||", self.jsValue->screenY, 0)?}
-
-    key(): String {Js.binaryOperator("||", self.jsValue->key, "")?}
-        
-    code(): String {Js.binaryOperator("||", self.jsValue->code, "")?}
-        
-    repeat(): Bool {Js.unaryOperator("!!", self.jsValue->repeat)?}
-        
-    leftKeyLocation(): Bool {self.jsValue->location === 1}
-        
-    rightKeyLocation(): Bool {self.jsValue->location === 2}
-        
-    numpadKeyLocation(): Bool {self.jsValue->location === 3}
-        
-    isComposing(): Bool {Js.unaryOperator("!!", self.jsValue->isComposing)?}
-        
-    data(): String {Js.binaryOperator("||", self.jsValue->data, "")?}
-        
-    text(): String {"" + Js.binaryOperator("||", self.jsValue->target->value, "")?}
-
-    inputType(): String {Js.binaryOperator("||", self.jsValue->inputType, "")?}
-
-    dataTransfer(): JsValue {Js.binaryOperator("||", self.jsValue->dataTransfer, "")?}
-
-    getTargetRanges(): JsValue {self.jsValue->getTargetRanges()}
-        
-}
+class LuxEvent(jsValue: JsValue)
+
+extend self: LuxEvent {
+    
+    preventDefault(): Unit {self.jsValue->preventDefault()}
+
+    stopPropagation(): Unit {self.jsValue->stopPropagation()}
+        
+    target(): JsValue {self.jsValue->target}
+
+    currentTarget(): JsValue {self.jsValue->currentTarget}
+
+    relatedTarget(): JsValue {self.jsValue->relatedTarget}
+
+    nativeEvent(): JsValue {self.jsValue}
+
+    type(): String {self.jsValue->type?}
+
+    altKey(): Bool {Js.binaryOperator("||", self.jsValue->altKey, False)?}
+
+    ctrlKey(): Bool {Js.binaryOperator("||", self.jsValue->ctrlKey, False)?}
+
+    shiftKey(): Bool {Js.binaryOperator("||", self.jsValue->shiftKey, False)?}
+
+    metaKey(): Bool {Js.binaryOperator("||", self.jsValue->metaKey, False)?}
+
+    button(): Int {Js.binaryOperator("||", self.jsValue->button, 0)?}
+
+    primaryButton(): Bool {Js.unaryOperator("!!", Js.binaryOperator("&", self.jsValue->buttons, 1))?}
+        
+    secondaryButton(): Bool {Js.unaryOperator("!!", Js.binaryOperator("&", self.jsValue->buttons, 2))?}
+        
+    middleButton(): Bool {Js.unaryOperator("!!", Js.binaryOperator("&", self.jsValue->buttons, 4))?}
+        
+    clientX(): Float {Js.binaryOperator("||", self.jsValue->clientX, 0)?}
+
+    clientY(): Float {Js.binaryOperator("||", self.jsValue->clientY, 0)?}
+
+    movementX(): Float {Js.binaryOperator("||", self.jsValue->movementX, 0)?}
+
+    movementY(): Float {Js.binaryOperator("||", self.jsValue->movementY, 0)?}
+
+    offsetX(): Float {Js.binaryOperator("||", self.jsValue->offsetX, 0)?}
+
+    offsetY(): Float {Js.binaryOperator("||", self.jsValue->offsetY, 0)?}
+
+    pageX(): Float {Js.binaryOperator("||", self.jsValue->pageX, 0)?}
+
+    pageY(): Float {Js.binaryOperator("||", self.jsValue->pageY, 0)?}
+
+    screenX(): Float {Js.binaryOperator("||", self.jsValue->screenX, 0)?}
+
+    screenY(): Float {Js.binaryOperator("||", self.jsValue->screenY, 0)?}
+
+    key(): String {Js.binaryOperator("||", self.jsValue->key, "")?}
+        
+    code(): String {Js.binaryOperator("||", self.jsValue->code, "")?}
+        
+    repeat(): Bool {Js.unaryOperator("!!", self.jsValue->repeat)?}
+        
+    leftKeyLocation(): Bool {self.jsValue->location === 1}
+        
+    rightKeyLocation(): Bool {self.jsValue->location === 2}
+        
+    numpadKeyLocation(): Bool {self.jsValue->location === 3}
+        
+    isComposing(): Bool {Js.unaryOperator("!!", self.jsValue->isComposing)?}
+        
+    data(): String {Js.binaryOperator("||", self.jsValue->data, "")?}
+        
+    text(): String {"" + Js.binaryOperator("||", self.jsValue->target->value, "")?}
+
+    inputType(): String {Js.binaryOperator("||", self.jsValue->inputType, "")?}
+
+    dataTransfer(): JsValue {Js.binaryOperator("||", self.jsValue->dataTransfer, "")?}
+
+    getTargetRanges(): JsValue {self.jsValue->getTargetRanges()}
+        
+}

package/lux/Main.ff

@@ -1,123 +1,123 @@
-import HttpServer from ff:httpserver
-
-import Lux
-import LuxEvent
-import Css
-
-data ChatEntry(
-    question: String
-    answer: Option[String]
-)
-
-mainComponent(lux: Lux, http: HttpClient) {
-    lux.useState([]): chat, setChat => 
-    lux.useState(""): message, setMessage =>
-    lux.div {
-        lux.div {
-            chat.each {questionComponent(lux, http, _)}
-        }
-        lux.form {
-            lux.input {
-                //.with("autofocus", "true")
-                lux.setValue(message)
-                lux.onInput {event => setMessage(event.text())}
-            }
-            lux.on("submit") {event => 
-                event.preventDefault()
-                setMessage("")
-                setChat([...chat, message])
-            }
-        }
-    }
-}
-
-questionCss = CssClass([Css.marginBottom("10px")], [], [])
-
-questionComponent(lux: Lux, http: HttpClient, question: String) {
-    lux.div {
-        lux.cssClass(questionCss)
-        lux.div {lux.text("User: " + question)}
-        lux.useLazy1(question): _ =>
-        lux.useSuspense {lux.div {lux.text("Assistant typing...")}}: lux =>
-        let answer = http.post("/chat", [], question.toBuffer()) {_.readText()}
-        lux.div {lux.text("Assistant: " + answer)}
-    }
-}
-
-browserMain(system: BrowserSystem) {
-    Lux.renderById(system, "main") {lux => mainComponent(lux, system.httpClient())}
-}
-
-nodeMain(system: NodeSystem) {
-    let openAiKey = system.arguments().first()
-    HttpServer.listen(system, "localhost", 8080) {request, response =>
-        if(request.path() == "/") {
-            response.setHeader("Content-Type", ["text/html; charset=UTF-8"])
-            response.writeText("<!doctype html>")
-            response.writeText("<div id='main'></div>")
-            response.writeText("<script type='module' src='/js/script/script/Main.mjs'></script>")
-        } elseIf {request.path().startsWith("/js/") && !request.path().contains("..")} {
-            response.setHeader("Content-Type", ["text/javascript; charset=UTF-8"])
-            response.writeText(system.assets().readText(request.path()))
-        } elseIf {request.path() == "/chat"} {
-            let question = request.readText()
-            response.setHeader("Content-Type", ["text/plain; charset=UTF-8"])
-            openAiKey.{
-                | None => 
-                    system.mainTask().sleep(Duration(question.size().toFloat()))
-                    response.writeText("Hi! You need to give an OpenAI secret key at the command line.")
-                | Some(key) => 
-                    let chatJson = encodeChat(question)
-                    let answer = fetchAnswer(system.httpClient(), key, chatJson)
-                    response.writeText(answer)
-            }
-        } else {
-            response.writeStatus(404, Some("Not found"))
-        }
-    }
-}
-
-fetchAnswer(httpClient: HttpClient, key: String, question: Json): String {
-    let json = httpClient.post(
-        url = "https://api.openai.com/v1/chat/completions"
-        headers = [
-            Pair("Authorization", "Bearer " + key)
-            Pair("Content-Type", "application/json")
-        ]
-        body = question.write().toBuffer()
-    ) {_.readJson()}
-    json.field("choices").index(0).field("message").field("content").grabString()
-}
-
-encodeChat(question: String): Json {
-    let systemJson = Json.object()
-        .with("role", "system")
-        .with("content", "You are a helpful assistant.")
-    let questionJson = Json.object()
-        .with("role", "user")
-        .with("content", question)
-    Json.object()
-        .with("model", "gpt-3.5-turbo")
-        .with("messages", [systemJson, questionJson])
-}
-
-
-/*
-let
-encodeMessage role content = 
-    E.object  [ ("role", E.string role), ("content", E.string content) ]
-encodeEntry question maybeAnswer = case maybeAnswer of
-    Nothing -> [ encodeMessage "user" question ]
-    Just answer -> [ encodeMessage "user" question, encodeMessage "assistant" answer ]
-encodedMessages = encodeMessage "system" "You are a helpful assistant."
-    :: List.concatMap (\entry -> encodeEntry entry.question entry.answer) chat
-in E.object 
-[ ("model", E.string "gpt-3.5-turbo")
-, ("messages", E.list (\x -> x) encodedMessages)
-]
-*/
-buildMain(system: BuildSystem) {
-    let browser = system.compileForBrowser("Main.ff")
-    let assets = AssetSystem.create().addAssets("/js", browser.assets())
-    system.setAssets(assets)
-}
+import HttpServer from ff:httpserver
+
+import Lux
+import LuxEvent
+import Css
+
+data ChatEntry(
+    question: String
+    answer: Option[String]
+)
+
+mainComponent(lux: Lux, http: HttpClient) {
+    lux.useState([]): chat, setChat => 
+    lux.useState(""): message, setMessage =>
+    lux.div {
+        lux.div {
+            chat.each {questionComponent(lux, http, _)}
+        }
+        lux.form {
+            lux.input {
+                //.with("autofocus", "true")
+                lux.setValue(message)
+                lux.onInput {event => setMessage(event.text())}
+            }
+            lux.on("submit") {event => 
+                event.preventDefault()
+                setMessage("")
+                setChat([...chat, message])
+            }
+        }
+    }
+}
+
+questionCss = CssClass([Css.marginBottom("10px")], [], [])
+
+questionComponent(lux: Lux, http: HttpClient, question: String) {
+    lux.div {
+        lux.cssClass(questionCss)
+        lux.div {lux.text("User: " + question)}
+        lux.useLazy1(question): _ =>
+        lux.useSuspense {lux.div {lux.text("Assistant typing...")}}: lux =>
+        let answer = http.post("/chat", [], question.toBuffer()) {_.readText()}
+        lux.div {lux.text("Assistant: " + answer)}
+    }
+}
+
+browserMain(system: BrowserSystem) {
+    Lux.renderById(system, "main") {lux => mainComponent(lux, system.httpClient())}
+}
+
+nodeMain(system: NodeSystem) {
+    let openAiKey = system.arguments().first()
+    HttpServer.listen(system, "localhost", 8080) {request, response =>
+        if(request.path() == "/") {
+            response.setHeader("Content-Type", ["text/html; charset=UTF-8"])
+            response.writeText("<!doctype html>")
+            response.writeText("<div id='main'></div>")
+            response.writeText("<script type='module' src='/js/script/script/Main.mjs'></script>")
+        } elseIf {request.path().startsWith("/js/") && !request.path().contains("..")} {
+            response.setHeader("Content-Type", ["text/javascript; charset=UTF-8"])
+            response.writeText(system.assets().readText(request.path()))
+        } elseIf {request.path() == "/chat"} {
+            let question = request.readText()
+            response.setHeader("Content-Type", ["text/plain; charset=UTF-8"])
+            openAiKey.{
+                | None => 
+                    system.mainTask().sleep(Duration(question.size().toFloat()))
+                    response.writeText("Hi! You need to give an OpenAI secret key at the command line.")
+                | Some(key) => 
+                    let chatJson = encodeChat(question)
+                    let answer = fetchAnswer(system.httpClient(), key, chatJson)
+                    response.writeText(answer)
+            }
+        } else {
+            response.writeStatus(404, Some("Not found"))
+        }
+    }
+}
+
+fetchAnswer(httpClient: HttpClient, key: String, question: Json): String {
+    let json = httpClient.post(
+        url = "https://api.openai.com/v1/chat/completions"
+        headers = [
+            Pair("Authorization", "Bearer " + key)
+            Pair("Content-Type", "application/json")
+        ]
+        body = question.write().toBuffer()
+    ) {_.readJson()}
+    json.field("choices").index(0).field("message").field("content").grabString()
+}
+
+encodeChat(question: String): Json {
+    let systemJson = Json.object()
+        .with("role", "system")
+        .with("content", "You are a helpful assistant.")
+    let questionJson = Json.object()
+        .with("role", "user")
+        .with("content", question)
+    Json.object()
+        .with("model", "gpt-3.5-turbo")
+        .with("messages", [systemJson, questionJson])
+}
+
+
+/*
+let
+encodeMessage role content = 
+    E.object  [ ("role", E.string role), ("content", E.string content) ]
+encodeEntry question maybeAnswer = case maybeAnswer of
+    Nothing -> [ encodeMessage "user" question ]
+    Just answer -> [ encodeMessage "user" question, encodeMessage "assistant" answer ]
+encodedMessages = encodeMessage "system" "You are a helpful assistant."
+    :: List.concatMap (\entry -> encodeEntry entry.question entry.answer) chat
+in E.object 
+[ ("model", E.string "gpt-3.5-turbo")
+, ("messages", E.list (\x -> x) encodedMessages)
+]
+*/
+buildMain(system: BuildSystem) {
+    let browser = system.compileForBrowser("Main.ff")
+    let assets = AssetSystem.create().addAssets("/js", browser.assets())
+    system.setAssets(assets)
+}