firefly-compiler 0.5.35 → 0.5.37

package/fireflysite/Main.ff

@@ -1,152 +1,163 @@
-import WebServer from ff:webserver
-import Lux from ff:lux
-import Css from ff:lux
-import Guide
-import GettingStarted
-import ReferenceAll
-import ExamplesOverview
-import PackagesOverview
-import CommunityOverview
-import FrontPage
-import Styles
-
-nodeMain(system: NodeSystem): Unit {
-    let host = system.arguments().grab(0)
-    let port = system.arguments().grab(1).grabInt()
-    let cacheSalt = system.crypto().randomBuffer(16)
-    system.writeLine("Listening on " + host + ":" + port)
-    WebServer.new(system, host, port).listen {request =>
-        let path = request.readPath()
-        let segments = path.split('/').filter {s => s != "" && s != "." && s != ".."}
-        segments.{
-            | ["js", ...] => 
-                let asset = if(path == "/js/ff/fireflysite/Main.mjs" && system.assets().exists("/js/Main.bundle.js")) {
-                    "/js/Main.bundle.js"
-                } else {
-                    path
-                }
-                serveAsset(system, cacheSalt, request, "text/javascript; charset=UTF-8", asset)
-            | ["favicon.ico"] =>
-                serveAsset(system, cacheSalt, request, "image/png", "/assets/image/firefly-logo-notext.png")
-            | ["assets", "font", "firefly-mono.woff2"] => 
-                serveAsset(system, cacheSalt, request, "font/woff2", "/assets/font/gf-noto-sans-mono-latin.woff2")
-            | ["assets", "font", "firefly-sans.woff2"] => 
-                serveAsset(system, cacheSalt, request, "font/woff2", "/assets/font/gf-nunito-sans-latin.woff2")
-            | ["assets", ...rest] => serveAssets(system, cacheSalt, request, rest)
-            | _ {serveGuide(system, request)} => 
-            | _ =>
-                let parameters = if(request.readRawQueryString().size() == 0) {""} else {
-                    "?" + request.readRawQueryString()
-                }
-                request.writeHeader("Location", "https://www.firefly-lang.org" + path + parameters)
-                request.writeStatus("302 Found")
-        }
-    }    
-}
-
-guides = [
-    Guide("/front/", [FrontPage.new()])
-    Guide("/getting-started/", [GettingStarted.new()])
-    Guide("/examples/", ExamplesOverview.mock())
-    Guide("/reference/", ReferenceAll.mock())
-    Guide("/packages/", [PackagesOverview.new()])
-    Guide("/community/", [CommunityOverview.new()])
-]
-
-serveGuide(system: NodeSystem, request: WebRequest[WebResponse]): Bool {
-    let demos = ExamplesOverview.demos()
-    mutable served = False
-    guides.each {guide => 
-        if(request.readPath().startsWith(guide.prefix)):
-        let kebab = request.readPath().dropFirst(guide.prefix.size())
-        let htmlAndCss = Lux.renderToString(system) {lux =>
-            Guide.render(lux, system.httpClient(), guide.prefix, kebab, guides, demos)
-        }
-        let title = guide.documents.find {d => 
-            Guide.kebabCase(d.heading()) == kebab
-        }.map {_.title(guide)}.else {guide.title()}
-        serveGuideHtml(title, htmlAndCss.first, htmlAndCss.second, request)
-        served = True
-    }
-    served
-}
-
-browserMain(system: BrowserSystem): Unit {
-    let demos = ExamplesOverview.demos()
-    guides.collect {guide => 
-        if(system.urlPath().startsWith(guide.prefix)):
-        Lux.renderById(system, "main") {lux => 
-            let kebab = system.urlPath().dropFirst(guide.prefix.size())
-            Guide.render(lux, system.httpClient(), guide.prefix, kebab, guides, demos)
-        }
-    }
-}
-
-buildMain(system: BuildSystem) {
-    let browser = system.compileForBrowser("Main.ff").bundle()
-    let assets = AssetSystem.create()
-        .addAssets("/js/", browser.assets())
-        .addAssets("/assets/", system.packageAssets().assets("/assets/"))
-    system.setAssets(assets)
-}
-
-serveAssets(system: NodeSystem, salt: Buffer, request: WebRequest[WebResponse], segments: List[String]): Unit {
-    let asset = "/assets/" + segments.join("/")
-    if(!system.assets().exists(asset)) {
-        request.writeStatus("404 Not Found")
-    } else:
-    
-    guessContentType(asset).or {
-        request.writeStatus("404 Not Found")
-    }: contentType =>
-
-    serveAsset(system, salt, request, contentType, asset)
-}
-
-guessContentType(path: String): Option[String] {
-    path.split('.').last().flatMap {
-        | "md" => Some("text/markdown")
-        | "png" => Some("image/png")
-        | "webp" => Some("image/webp")
-        | "ttf" => Some("font/ttf")
-        | _ => None
-    }
-}
-
-serveAsset(system: NodeSystem, salt: Buffer, request: WebRequest[WebResponse], contentType: String, asset: String): Unit {
-    let etag = "\"" + system.crypto().hmacSha256(salt, asset.toBuffer()).toHex() + "\""
-    request.writeHeader("Content-Type", contentType)
-    if(request.readHeader("host") == Some("localhost:8080")) {
-        request.writeHeader("Cache-Control", "no-cache")
-    } else {
-        request.writeHeader("Cache-Control", "public, max-age=60, must-revalidate")
-        request.writeHeader("ETag", etag)
-    }
-    if(request.readHeader("if-none-match").any {_.trim() == etag}) {
-        request.writeStatus("304 Not Modified")
-    } else {
-        request.writeStream(system.assets().readStream(asset))
-    }
-}
-
-serveGuideHtml(title: String, contentHtml: String, styleTags: String, request: WebRequest[WebResponse]): Unit {
-    request.writeHeader("Content-Type", "text/html; charset=UTF-8")
-    request.writeText("<!doctype html>")
-    request.writeText("<html lang='en' style='background-color: #ffffff; color: #333333; width: 100%; height: 100%; color-scheme: light;'>")
-    request.writeText("<head>")
-    request.writeText("<title>" + title + "</title>")
-    request.writeText("<meta name='viewport' content='width=device-width, initial-scale=1.0'>")
-    request.writeText("<meta name='theme-color' content='#ecc45e'>")
-    request.writeText("<script type='module' src='/js/ff/fireflysite/Main.mjs'></script>")
-    request.writeText("<link rel='preload' href='/assets/font/firefly-mono.woff2' as='font' crossorigin='anonymous'>")
-    request.writeText("<link rel='preload' href='/assets/font/firefly-sans.woff2' as='font' crossorigin='anonymous'>")
-    request.writeText("<link rel='preload' href='/assets/image/firefly-logo-yellow.webp' as='image'>")
-    request.writeText("<style>@font-face { font-family: 'Firefly Mono'; font-display: fallback; src: url('/assets/font/firefly-mono.woff2'); }</style>")
-    request.writeText("<style>@font-face { font-family: 'Firefly Sans'; font-display: fallback; src: url('/assets/font/firefly-sans.woff2'); }</style>")
-    request.writeText(styleTags)
-    request.writeText("</head>")
-    request.writeText("<body style='margin: 0; padding: 0; width: 100%; height: 100%; touch-action: manipulation;'>")
-    request.writeText("<div id='main'>" + contentHtml + "</div>")
-    request.writeText("</body>")
-    request.writeText("</html>")
-}
+import WebServer from ff:webserver
+import Lux from ff:lux
+import Css from ff:lux
+import Guide
+import GettingStarted
+import ReferenceAll
+import ExamplesOverview
+import PackagesOverview
+import CommunityOverview
+import FrontPage
+import Styles
+
+nodeMain(system: NodeSystem): Unit {
+    let host = system.arguments().grab(0)
+    let port = system.arguments().grab(1).grabInt()
+    let cacheSalt = system.crypto().randomBuffer(16)
+    system.writeLine("Listening on " + host + ":" + port)
+    WebServer.new(system, host, port).listen {request =>
+        let path = request.readPath()
+        let segments = path.split('/').filter {s => s != "" && s != "." && s != ".."}
+        segments.{
+            | _ {
+                !request.readHeader("host").contains("www.firefly-lang.org") &&
+                !request.readHeader("host").any {_.startsWith("localhost")}
+            } =>
+                let parameters = if(request.readRawQueryString().size() == 0) {""} else {
+                    "?" + request.readRawQueryString()
+                }
+                request.writeHeader("Location", "https://www.firefly-lang.org" + path + parameters)
+                request.writeStatus("302 Found")
+            | ["js", ...] => 
+                let asset = if(path == "/js/ff/fireflysite/Main.mjs" && system.assets().exists("/js/Main.bundle.js")) {
+                    "/js/Main.bundle.js"
+                } else {
+                    path
+                }
+                serveAsset(system, cacheSalt, request, "text/javascript; charset=UTF-8", asset)
+            | ["favicon.ico"] =>
+                serveAsset(system, cacheSalt, request, "image/png", "/assets/image/firefly-logo-notext.png")
+            | ["assets", "font", "firefly-mono.woff2"] => 
+                serveAsset(system, cacheSalt, request, "font/woff2", "/assets/font/gf-noto-sans-mono-latin.woff2")
+            | ["assets", "font", "firefly-sans.woff2"] => 
+                serveAsset(system, cacheSalt, request, "font/woff2", "/assets/font/gf-nunito-sans-latin.woff2")
+            | ["assets", ...rest] => serveAssets(system, cacheSalt, request, rest)
+            | _ {serveGuide(system, request)} => 
+            | _ =>
+                request.writeText("404 Not Found")
+                request.writeStatus("404 Not Found")
+        }
+    }    
+}
+
+guides = [
+    Guide("/front/", [FrontPage.new()])
+    Guide("/getting-started/", [GettingStarted.new()])
+    Guide("/examples/", ExamplesOverview.mock())
+    Guide("/reference/", ReferenceAll.mock())
+    Guide("/packages/", [PackagesOverview.new()])
+    Guide("/community/", [CommunityOverview.new()])
+]
+
+serveGuide(system: NodeSystem, request: WebRequest[WebResponse]): Bool {
+    let demos = ExamplesOverview.demos()
+    mutable served = False
+    guides.each {guide =>
+        if(isGuidePath(request.readPath(), guide.prefix)):
+        let kebab = request.readPath().dropFirst(guide.prefix.size())
+        let htmlAndCss = Lux.renderToString(system) {lux =>
+            Guide.render(lux, system.httpClient(), guide.prefix, kebab, guides, demos)
+        }
+        let title = guide.documents.find {d => 
+            Guide.kebabCase(d.heading()) == kebab
+        }.map {_.title(guide)}.else {guide.title()}
+        serveGuideHtml(title, htmlAndCss.first, htmlAndCss.second, request)
+        served = True
+    }
+    served
+}
+
+browserMain(system: BrowserSystem): Unit {
+    let demos = ExamplesOverview.demos()
+    guides.collect {guide => 
+        if(isGuidePath(system.urlPath(), guide.prefix)):
+        Lux.renderById(system, "main") {lux => 
+            let kebab = system.urlPath().dropFirst(guide.prefix.size())
+            Guide.render(lux, system.httpClient(), guide.prefix, kebab, guides, demos)
+        }
+    }
+}
+
+isGuidePath(path: String, prefix: String): Bool {
+    //Log.debug(path + " vs. " + prefix)
+    path.startsWith(prefix) || (prefix == "/front/" && (path == "/" || path == "/index.html")) // Why is index.html requested
+}
+
+buildMain(system: BuildSystem) {
+    let browser = system.compileForBrowser("Main.ff") // .bundle()
+    let assets = AssetSystem.create()
+        .addAssets("/js/", browser.assets())
+        .addAssets("/assets/", system.packageAssets().assets("/assets/"))
+    system.setAssets(assets)
+}
+
+serveAssets(system: NodeSystem, salt: Buffer, request: WebRequest[WebResponse], segments: List[String]): Unit {
+    let asset = "/assets/" + segments.join("/")
+    if(!system.assets().exists(asset)) {
+        request.writeStatus("404 Not Found")
+    } else:
+    
+    guessContentType(asset).or {
+        request.writeStatus("404 Not Found")
+    }: contentType =>
+
+    serveAsset(system, salt, request, contentType, asset)
+}
+
+guessContentType(path: String): Option[String] {
+    path.split('.').last().flatMap {
+        | "md" => Some("text/markdown")
+        | "png" => Some("image/png")
+        | "webp" => Some("image/webp")
+        | "ttf" => Some("font/ttf")
+        | _ => None
+    }
+}
+
+serveAsset(system: NodeSystem, salt: Buffer, request: WebRequest[WebResponse], contentType: String, asset: String): Unit {
+    let etag = "\"" + system.crypto().hmacSha256(salt, asset.toBuffer()).toHex() + "\""
+    request.writeHeader("Content-Type", contentType)
+    if(request.readHeader("host") == Some("localhost:8080")) {
+        request.writeHeader("Cache-Control", "no-cache")
+    } else {
+        request.writeHeader("Cache-Control", "public, max-age=60, must-revalidate")
+        request.writeHeader("ETag", etag)
+    }
+    if(request.readHeader("if-none-match").any {_.trim() == etag}) {
+        request.writeStatus("304 Not Modified")
+    } else {
+        request.writeStream(system.assets().readStream(asset))
+    }
+}
+
+serveGuideHtml(title: String, contentHtml: String, styleTags: String, request: WebRequest[WebResponse]): Unit {
+    request.writeHeader("Content-Type", "text/html; charset=UTF-8")
+    request.writeText("<!doctype html>")
+    request.writeText("<html lang='en' style='background-color: #ffffff; color: #333333; width: 100%; height: 100%; color-scheme: light;'>")
+    request.writeText("<head>")
+    request.writeText("<title>" + title + "</title>")
+    request.writeText("<meta name='viewport' content='width=device-width, initial-scale=1.0'>")
+    request.writeText("<meta name='theme-color' content='#ecc45e'>")
+    request.writeText("<script type='module' src='/js/ff/fireflysite/Main.mjs'></script>")
+    request.writeText("<link rel='preload' href='/assets/font/firefly-mono.woff2' as='font' crossorigin='anonymous'>")
+    request.writeText("<link rel='preload' href='/assets/font/firefly-sans.woff2' as='font' crossorigin='anonymous'>")
+    request.writeText("<link rel='preload' href='/assets/image/firefly-logo-yellow.webp' as='image'>")
+    request.writeText("<style>@font-face { font-family: 'Firefly Mono'; font-display: fallback; src: url('/assets/font/firefly-mono.woff2'); }</style>")
+    request.writeText("<style>@font-face { font-family: 'Firefly Sans'; font-display: fallback; src: url('/assets/font/firefly-sans.woff2'); }</style>")
+    request.writeText(styleTags)
+    request.writeText("</head>")
+    request.writeText("<body style='margin: 0; padding: 0; width: 100%; height: 100%; touch-action: manipulation;'>")
+    request.writeText("<div id='main'>" + contentHtml + "</div>")
+    request.writeText("</body>")
+    request.writeText("</html>")
+}

package/fireflysite/MatchingPasswordsDemo.ff

@@ -1,82 +1,82 @@
-import Guide
-import Lux from ff:lux
-import LuxEvent from ff:lux
-
-name = "Matching passwords"
-
-new(): Demo {
-    Demo(
-        name
-        {render(_)}
-    )
-}
-
-render(lux: Lux): Unit {
-    function passwordInput(password: String, setPassword: String => Unit) {
-        lux.div {
-            lux.input {
-                lux.set("type", "password")
-                lux.set("autocomplete", "new-password")
-                lux.setValue(password)
-                lux.onInput {event =>
-                    setPassword(event.text())
-                }
-            }
-        }
-    }
-    lux.form {
-        lux.useState(""): password1, setPassword1 => 
-        lux.useState(""): password2, setPassword2 => 
-        passwordInput(password1, setPassword1)
-        passwordInput(password2, setPassword2)
-        lux.div {
-            if(password1 != password2) {
-                lux.text("Passwords don't match!")
-            } elseIf {password2.size() != 0} {
-                lux.text("Passwords match!")
-            }
-        }
-    }
-}
-
-newDocument(): Document {
-    ReadyDocument([
-        Section(name, [
-            Paragraph([Text("Two passwords fields and a check that they match.")])
-        ])
-        Section("Demo", [
-            LuxDemo(name)
-        ])
-        Section("Code", [
-            CodeBlock("""
-                render(lux: Lux): Unit {
-                    function passwordInput(password: String, setPassword: String => Unit) {
-                        lux.div {
-                            lux.input {
-                                lux.set("type", "password")
-                                lux.set("autocomplete", "new-password")
-                                lux.setValue(password)
-                                lux.onInput {event =>
-                                    setPassword(event.text())
-                                }
-                            }
-                        }
-                    }
-                    lux.form {
-                        lux.useState(""): password1, setPassword1 => 
-                        lux.useState(""): password2, setPassword2 => 
-                        passwordInput(password1, setPassword1)
-                        passwordInput(password2, setPassword2)
-                        lux.div {
-                            if(password1 != password2) {
-                                lux.text("Passwords don't match!")
-                            } elseIf {password2.size() != 0} {
-                                lux.text("Passwords match!")
-                            }
-                        }
-                    }
-                }
-            """, firefly = True)
-        ])
-    ])
-}
+import Guide
+import Lux from ff:lux
+import LuxEvent from ff:lux
+
+name = "Matching passwords"
+
+new(): Demo {
+    Demo(
+        name
+        {render(_)}
+    )
+}
+
+render(lux: Lux): Unit {
+    function passwordInput(password: String, setPassword: String => Unit) {
+        lux.div {
+            lux.input {
+                lux.set("type", "password")
+                lux.set("autocomplete", "new-password")
+                lux.setValue(password)
+                lux.onInput {event =>
+                    setPassword(event.text())
+                }
+            }
+        }
+    }
+    lux.form {
+        lux.useState(""): password1, setPassword1 => 
+        lux.useState(""): password2, setPassword2 => 
+        passwordInput(password1, setPassword1)
+        passwordInput(password2, setPassword2)
+        lux.div {
+            if(password1 != password2) {
+                lux.text("Passwords don't match!")
+            } elseIf {password2.size() != 0} {
+                lux.text("Passwords match!")
+            }
+        }
+    }
+}
+
+newDocument(): Document {
+    ReadyDocument([
+        Section(name, [
+            Paragraph([Text("Two passwords fields and a check that they match.")])
+        ])
+        Section("Demo", [
+            LuxDemo(name)
+        ])
+        Section("Code", [
+            CodeBlock("""
+                render(lux: Lux): Unit {
+                    function passwordInput(password: String, setPassword: String => Unit) {
+                        lux.div {
+                            lux.input {
+                                lux.set("type", "password")
+                                lux.set("autocomplete", "new-password")
+                                lux.setValue(password)
+                                lux.onInput {event =>
+                                    setPassword(event.text())
+                                }
+                            }
+                        }
+                    }
+                    lux.form {
+                        lux.useState(""): password1, setPassword1 => 
+                        lux.useState(""): password2, setPassword2 => 
+                        passwordInput(password1, setPassword1)
+                        passwordInput(password2, setPassword2)
+                        lux.div {
+                            if(password1 != password2) {
+                                lux.text("Passwords don't match!")
+                            } elseIf {password2.size() != 0} {
+                                lux.text("Passwords match!")
+                            }
+                        }
+                    }
+                }
+            """, firefly = True)
+        ])
+    ])
+}

package/fireflysite/PackagesOverview.ff

@@ -1,49 +1,49 @@
-import Guide
-import CountingButtonDemo
-import MatchingPasswordsDemo
-
-new(): Document {
-    ReadyDocument([
-        Section("Packages", [
-            Paragraph([
-                Text("Here you'll eventually find the package index.")
-                Text("For now, here's a short list of essential packages.") 
-            ])
-        ])
-        Section("ff:core", [
-            Paragraph([
-                Text("The standard library of Firefly.")
-            ])
-        ])
-        Section("ff:webserver", [
-            Paragraph([
-                Text("A webserver package. Has HTTPS and WebSocket support.")
-            ])
-        ])
-        Section("ff:websocket", [
-            Paragraph([
-                Text("A package for making websocket connections.")
-            ])
-        ])
-        Section("ff:postgresql", [
-            Paragraph([
-                Text("A package for connecting to PostgreSQL. Has connection pool support.")
-            ])
-        ])
-        Section("ff:lux", [
-            Paragraph([
-                Text("A package for building interactive web interfaces.")
-            ])
-        ])
-        Section("ff:rpc", [
-            Paragraph([
-                Text("A package for type safe remote procedure calls.")
-            ])
-        ])
-        Section("ff:unsafejs", [
-            Paragraph([
-                Text("A FFI package for JavaScript.")
-            ])
-        ])
-    ])
-}
+import Guide
+import CountingButtonDemo
+import MatchingPasswordsDemo
+
+new(): Document {
+    ReadyDocument([
+        Section("Packages", [
+            Paragraph([
+                Text("Here you'll eventually find the package index.")
+                Text("For now, here's a short list of essential packages.") 
+            ])
+        ])
+        Section("ff:core", [
+            Paragraph([
+                Text("The standard library of Firefly.")
+            ])
+        ])
+        Section("ff:webserver", [
+            Paragraph([
+                Text("A webserver package. Has HTTPS and WebSocket support.")
+            ])
+        ])
+        Section("ff:websocket", [
+            Paragraph([
+                Text("A package for making websocket connections.")
+            ])
+        ])
+        Section("ff:postgresql", [
+            Paragraph([
+                Text("A package for connecting to PostgreSQL. Has connection pool support.")
+            ])
+        ])
+        Section("ff:lux", [
+            Paragraph([
+                Text("A package for building interactive web interfaces.")
+            ])
+        ])
+        Section("ff:rpc", [
+            Paragraph([
+                Text("A package for type safe remote procedure calls.")
+            ])
+        ])
+        Section("ff:unsafejs", [
+            Paragraph([
+                Text("A FFI package for JavaScript.")
+            ])
+        ])
+    ])
+}