firefly-compiler 0.6.18 → 0.6.20

package/compiler/Bridge.ff

@@ -0,0 +1,80 @@
+import Builder
+import ModuleCache
+
+setGlobalBridge(nodeSystem: NodeSystem) {
+    // To avoid having the generated code for buildMain depend on the Firefly compiler,
+    // we provide the bridge through a global symbol that is read by BuildSystem.internalBridge.
+    nodeSystem.js().globalThis()->"$firefly_bridge" = BuildSystemBridge(
+        internalCompile = {internalCompile(nodeSystem, _, _)}
+        internalBrowserCallEsBuild = {callEsBuildForBrowser(nodeSystem, _, _, _, _)}
+    )!
+}
+
+internalCompile(nodeSystem: NodeSystem, mainFiles: List[Path], target: String): Unit {
+    Builder.buildViaBuildSystem(
+        nodeSystem
+        nodeSystem.path(nodeSystem!->"fireflyPath_"?)
+        mainFiles
+        target
+    )
+}
+
+callEsBuildForBrowser(
+    nodeSystem: NodeSystem
+    mainJsFiles: List[String]
+    outputPath: String
+    minify: Bool
+    sourceMap: Bool
+): Unit {
+    let esbuild = Js.import("esbuild")
+    Js.await(esbuild->build(Js->(
+        entryPoints = mainJsFiles
+        bundle = True
+        minify = minify
+        sourcemap = sourceMap
+        platform = "browser"
+        target = "es2017"
+        outdir = outputPath
+        outExtension = Js.object().with(".js", ".bundle.js")
+    )))
+}
+
+callEsBuildForNode(
+    self: NodeSystem
+    mainJsFile: String
+    outputPath: String
+    minify: Bool
+): Unit {
+    let esbuild = Js.import("esbuild")
+    Js.await(esbuild->build(Js->(
+        entryPoints = [mainJsFile]
+        bundle = True
+        minify = minify
+        sourcemap = True
+        platform = "node"
+        target = "es2017"
+        external = ["esbuild", "uws.js"]
+        loader = Js.object().with(".node", "copy")
+        outdir = outputPath
+    )))
+}
+
+callEsBuildContextForNode(
+    self: NodeSystem
+    mainJsFile: String
+    outputPath: String
+    minify: Bool
+): JsValue {
+    let esbuild = Js.import("esbuild")
+    Js.await(esbuild->context(Js->(
+        entryPoints = [mainJsFile]
+        bundle = True
+        minify = minify
+        sourcemap = True
+        platform = "node"
+        target = "es2017"
+        external = ["esbuild", "uws.js"]
+        loader = Js.object().with(".node", "copy")
+        outfile = outputPath
+    )))    
+}

package/compiler/Builder.ff

@@ -15,7 +15,6 @@ build(
     emitTarget: EmitTarget
     mainModules: List[ModuleKey]
     resolvedDependencies: ResolvedDependencies
-    compilerModulePath: Option[Path]
     jsOutputPath: Path
     printMeasurements: Bool
     moduleCache: ModuleCache
@@ -24,7 +23,6 @@ build(
     let compiler = Compiler.new(
         emitTarget
         system.mainTask()
-        compilerModulePath
         jsOutputPath
         resolvedDependencies
         Map.new()
@@ -107,7 +105,6 @@ buildViaBuildSystem(
         emitTarget = EmitBrowser
         mainModules = mainModuleKeys
         resolvedDependencies = resolvedDependencies.ResolvedDependencies(packagePaths = fixedPackagePaths)
-        compilerModulePath = None
         jsOutputPath = system.path(".firefly/output").slash(target)
         printMeasurements = printMeasurements
         moduleCache = moduleCache
@@ -156,7 +153,6 @@ check(
         let compiler = Compiler.new(
             EmitNode
             system.mainTask() 
-            None
             package.root.slash(".firefly").slash("temporary")
             fixedResolvedDependencies
             virtualFiles

package/compiler/Compiler.ff

@@ -13,7 +13,6 @@ import LspHook
 capability Compiler(
     emitTarget: EmitTarget
     task: Task
-    compilerModulePath: Option[Path]
     jsOutputPath: Path
     packagePaths: Map[PackagePair, Path]
     singleFilePackages: Set[PackagePair]
@@ -27,7 +26,6 @@ capability Compiler(
 new(
     emitTarget: EmitTarget
     task: Task
-    compilerModulePath: Option[Path]
     jsOutputPath: Path
     resolvedDependencies: ResolvedDependencies
     virtualFiles: Map[String, String]
@@ -37,7 +35,6 @@ new(
     Compiler(
         emitTarget = emitTarget
         task = task
-        compilerModulePath = compilerModulePath
         jsOutputPath = jsOutputPath
         packagePaths = resolvedDependencies.packagePaths
         singleFilePackages = resolvedDependencies.singleFilePackages
@@ -231,7 +228,6 @@ extend self: Compiler {
             otherModules = allModules
             emitTarget = self.emitTarget
             isMainModule = isMainModule
-            compilerModuleFileUrl = self.compilerModulePath.map {_.relativeUrlTo(jsPath)}
             moduleKey = moduleKey
         )
         emitter.emitModule(module)

package/compiler/DevelopMode.ff

@@ -4,7 +4,8 @@ import Dependencies
 import DependencyLock
 import Syntax
 import JsEmitter
-import Builder from ff:compiler
+import Bridge
+import Builder
 
 capability Runner(
     lock: Lock
@@ -139,7 +140,7 @@ startApp(
             )
             let esBuildPath = runFilePath.parent().grab().slash(runFilePath.base() + ".minified.js")
             let context = esbuildContext.jsValue.else {
-                let jsValue = BuildSystem.internalNodeCallEsBuildContext(system, startPath.absolute(), esBuildPath.absolute(), minify = True)
+                let jsValue = Bridge.callEsBuildContextForNode(system, startPath.absolute(), esBuildPath.absolute(), minify = True)
                 esbuildContext.jsValue = Some(jsValue)
                 jsValue
             }
@@ -166,6 +167,17 @@ startApp(
                             runner.state = CompileErrorState(None, error.message())
                         }
                     }
+                } elseIf {message->ffDevelopMode === "internalBrowserCallEsBuild"} {
+                    runner.lock.do {
+                        if(taskIteration == runner.iteration):
+                        try {
+                            Bridge.callEsBuildForBrowser(system, message->mainJsFiles?, message->outputPath?, message->minify?, message->sourceMap?)
+                            forkedProcess->send(Js->(ffDevelopMode = "internalBrowserCallEsBuild"))
+                            Unit
+                        } catchAny {error =>
+                            runner.state = CompileErrorState(None, error.message())
+                        }
+                    }
                 }
             }))
             let standardOut = result.standardOut.toString()

package/compiler/JsEmitter.ff

@@ -8,7 +8,6 @@ class JsEmitter(
     jsImporter: JsImporter
     emitTarget: EmitTarget
     isMainModule: Bool
-    compilerModuleFileUrl: Option[String]
     moduleKey: ModuleKey
     mutable emittingAsync: Bool
     mutable tailCallUsed: Bool
@@ -29,7 +28,6 @@ new(
     otherModules: List[Module]
     emitTarget: EmitTarget
     isMainModule: Bool
-    compilerModuleFileUrl: Option[String]
     moduleKey: ModuleKey
 ): JsEmitter {
     JsEmitter(
@@ -39,7 +37,6 @@ new(
         jsImporter = JsImporter.new()
         emitTarget = emitTarget
         isMainModule = isMainModule
-        compilerModuleFileUrl = compilerModuleFileUrl
         moduleKey = moduleKey
         emittingAsync = False
         tailCallUsed = False
@@ -121,7 +118,6 @@ extend self: JsEmitter {
     emitModule(module: Module) {
         let selfImport = self.emitImport(self.moduleKey)
         let imports = [
-            self.compilerModuleFileUrl.map {"import * as $firefly_compiler from '" + _ + "'"}.toList()
             module.imports.sortBy {_.moduleKey}.map {self.emitImport(_.moduleKey)}
         ].flatten()
         let liner = Liner(self, True)

package/compiler/Main.ff

@@ -12,6 +12,7 @@ import ModuleCache
 import LspHook
 import DependencyLock
 import DevelopMode
+import Bridge
 
 data MainCommand {
     BootstrapCommand
@@ -108,7 +109,6 @@ main(system: NodeSystem): Unit {
                     ].toMap()
                     singleFilePackages = [].toSet()
                 )
-                compilerModulePath = None
                 jsOutputPath = workingDirectory.slash("output").slash("js")
                 printMeasurements = True
                 moduleCache = ModuleCache.new(0)
@@ -176,9 +176,6 @@ buildScript(
     } else {
         resolvedDependencies.packagePaths.add(PackagePair("ff", "core"), fireflyPath.slash("core"))
     }
-    let compilerModulePath = if(emitTarget != EmitBrowser) {
-        fireflyPath.slash("output").slash("js").slash("ff").slash("compiler/Builder.mjs")
-    }
     let targetName = emitTarget.{
         | EmitNode => "node"
         | EmitBrowser => "browser"
@@ -192,7 +189,6 @@ buildScript(
         emitTarget = emitTarget
         mainModules = [moduleKey]
         resolvedDependencies = resolvedDependencies.ResolvedDependencies(packagePaths = fixedPackagePaths)
-        compilerModulePath = compilerModulePath
         jsOutputPath = system.path(".firefly").path("output").path(targetName)
         printMeasurements = printMeasurements
         moduleCache = moduleCache
@@ -286,7 +282,7 @@ bundleForExecutable(system: NodeSystem, packagePair: PackagePair, moduleKey: Mod
         // The following should be awaited, but esbuild doesn't support top level await - still seems to work though
         "run.$run$(null, process.argv.slice(2))"
     )
-    BuildSystem.internalNodeCallEsBuild(
+    Bridge.callEsBuildForNode(
         system, 
         startPath.absolute(), 
         outputPath.absolute(), 
@@ -298,8 +294,8 @@ bundleForBrowser(system: NodeSystem, packagePair: PackagePair, moduleKey: Module
     let packagePath = moduleKey.packagePair.groupName("/")
     let outputPath = system.path(".firefly/output/browser/" + packagePath + "/")
     let runFile = outputPath.slash(moduleKey.importName() + ".run.mjs")
-    BuildSystem.internalBrowserCallEsBuild(
-        system!? 
+    Bridge.callEsBuildForBrowser(
+        system
         [runFile.absolute()]
         outputPath.absolute()
         minify = True
@@ -315,6 +311,7 @@ importAndRun(
     arguments: List[String]
     buildMode: Bool = False
 ): Bool {
+    Bridge.setGlobalBridge(system)
     let runFile = locateRunFile(system, target, moduleKey)
     let runFilePath = if(runFile.contains("://")) {system.pathFromUrl(runFile)} else {system.path(runFile)}
     if(runFilePath.exists()) {

package/core/BuildSystem.ff

@@ -1,23 +1,29 @@
 capability BuildSystem {}
 
+capability BuildSystemBridge(
+    internalCompile: (List[Path], String) => Unit
+    internalBrowserCallEsBuild: (List[String], String, Bool, Bool) => Unit
+)
+
 extend self: BuildSystem {
 
     compileForBrowser(mainFiles: List[String]): AssetSystem {
+        let bridge = internalBridge(self)
         // TODO: Check that the mainFile is in the current package directory
-        internalCompile(self, mainFiles.map {internalPath(self, _)}, "browser")
+        bridge.internalCompile(mainFiles.map {internalPath(self, _)}, "browser")
         let streams = internalListDirectory(internalPath(self, ".firefly/output/browser"))
         let mainPackagePair = internalMainPackagePair(self)
         AssetSystem(streams.toMap())
     }
 
     bundleForBrowser(mainFiles: List[String], minify: Bool = True, sourceMaps: Bool = False): AssetSystem {
-        internalCompile(self, mainFiles.map {internalPath(self, _)}, "browser")
+        let bridge = internalBridge(self)
+        bridge.internalCompile(mainFiles.map {internalPath(self, _)}, "browser")
         let browserOutputPath = internalPath(self, ".firefly/output/browser")
         let runPaths = internalListPath(browserOutputPath).filter {_.base().endsWith(".run.mjs")}.toList()
         if(Js.globalThis()->ffDevelopMode.typeof() == "undefined") {
             let outputPath = runPaths.grabFirst().parent().grab()
-            let start = self.mainTask().elapsed()
-            internalBrowserCallEsBuild(self, runPaths.map {_.absolute()}, outputPath.absolute(), minify, sourceMaps)
+            bridge.internalBrowserCallEsBuild(runPaths.map {_.absolute()}, outputPath.absolute(), minify, sourceMaps)
             let bundlePaths = runPaths.flatMap {p =>
                 let outputPath = p.parent().grab()
                 let bundlePath = outputPath.slash(p.base().removeLast(".mjs").grab() + ".bundle.js")
@@ -39,7 +45,7 @@ extend self: BuildSystem {
                 function bundle() {
                     lock.do {
                         if(!built.contains(p.absolute())) {
-                            internalBrowserCallEsBuild(self, [p.absolute()], outputPath.absolute(), minify, sourceMaps)
+                            bridge.internalBrowserCallEsBuild([p.absolute()], outputPath.absolute(), minify, sourceMaps)
                             built = built.add(p.absolute())
                         }
                         bundlePath.readStream()
@@ -85,66 +91,6 @@ extend self: BuildSystem {
         
 }
 
-internalBrowserCallEsBuild(
-    self: BuildSystem
-    mainJsFiles: List[String]
-    outputPath: String
-    minify: Bool
-    sourceMap: Bool
-): Unit {
-    let esbuild = Js.import("esbuild")
-    Js.await(esbuild->build(Js->(
-        entryPoints = mainJsFiles
-        bundle = True
-        minify = minify
-        sourcemap = sourceMap
-        platform = "browser"
-        target = "es2017"
-        outdir = outputPath
-        outExtension = Js.object().with(".js", ".bundle.js")
-    )))
-}
-
-internalNodeCallEsBuild(
-    self: NodeSystem
-    mainJsFile: String
-    outputPath: String
-    minify: Bool
-): Unit {
-    let esbuild = Js.import("esbuild")
-    Js.await(esbuild->build(Js->(
-        entryPoints = [mainJsFile]
-        bundle = True
-        minify = minify
-        sourcemap = True
-        platform = "node"
-        target = "es2017"
-        external = ["esbuild", "uws.js"]
-        loader = Js.object().with(".node", "copy")
-        outdir = outputPath
-    )))
-}
-
-internalNodeCallEsBuildContext(
-    self: NodeSystem
-    mainJsFile: String
-    outputPath: String
-    minify: Bool
-): JsValue {
-    let esbuild = Js.import("esbuild")
-    Js.await(esbuild->context(Js->(
-        entryPoints = [mainJsFile]
-        bundle = True
-        minify = minify
-        sourcemap = True
-        platform = "node"
-        target = "es2017"
-        external = ["esbuild", "uws.js"]
-        loader = Js.object().with(".node", "copy")
-        outfile = outputPath
-    )))    
-}
-
 internalListDirectory(path: Path): List[Pair[String, () => Stream[Buffer]]] {
     function go(currentPath: Path): Stream[Path] {
         currentPath.entries().flatMap {file =>
@@ -175,33 +121,6 @@ internalPath(buildSystem: BuildSystem, absoluteOrRelative: String): Path {
     Path(nodePath->resolve(absoluteOrRelative)?)
 }
 
-internalCompile(buildSystem: BuildSystem, mainFiles: List[Path], target: String): Unit {
-    if(Js.globalThis()->ffDevelopMode.typeof() != "undefined") {
-        Js->process->send(Js->(
-            ffDevelopMode = "internalCompile"
-            mainFiles = mainFiles.map {_.absolute()}
-            target = target
-        ))
-        Js.awaitCancellablePromise {resolve, reject, cleanup =>
-            Js->process->on("message", Js->{message => 
-                if(message->ffDevelopMode === "internalCompile") {
-                    resolve(Unit) // Handle errors?
-                }
-            })
-        }
-    } else:
-    // Ported from the old FFI. It's quite fragile w.r.t. changes in code generation.
-    Js.await(Js.rawIdentifier("$firefly_compiler")->"buildViaBuildSystem_$"(
-        buildSystem! 
-        internalPath(buildSystem, buildSystem!->"fireflyPath_"?)!
-        mainFiles!
-        target
-        Js.undefined()
-        Js.undefined()
-        Js.currentTask()!
-    ))
-}
-
 internalMainPackagePair(buildSystem: BuildSystem): Pair[String, String] {
     Pair(buildSystem!->"mainPackagePair_"->"group_"?, buildSystem!->"mainPackagePair_"->"name_"?)
 }
@@ -227,3 +146,40 @@ internalReadAssets(system: NodeSystem): AssetSystem {
     let streams = internalListDirectory(path)
     AssetSystem(streams.toMap())
 }
+
+internalBridge(self: BuildSystem): BuildSystemBridge {
+    let bridge = Js->"$firefly_bridge"
+    if(!bridge.nullish()) {bridge?} else {
+        function delegate(job: String, message: JsValue): Unit {
+            Js->process->send(message.with("ffDevelopMode", job))
+            Js.awaitCancellablePromise {resolve, reject, cleanup =>
+                let callback = Js->{message => 
+                    if(message->ffDevelopMode === job) {
+                        resolve(Unit) // Handle errors?
+                    }
+                }
+                cleanup {_ => Js->process->off("message", callback)}
+                Js->process->on("message", callback)
+            }
+        }
+        BuildSystemBridge(
+            internalCompile = {mainFiles, target => 
+                let message = Js->(
+                    mainFiles = mainFiles.map {_.absolute()}
+                    target = target
+                )
+                delegate("internalCompile", message)
+            }
+            internalBrowserCallEsBuild = {mainJsFiles, outputPath, minify, sourceMap => 
+                let message = Js->(
+                    mainJsFiles = mainJsFiles
+                    outputPath = outputPath
+                    minify = minify
+                    sourceMap = sourceMap
+                )
+                delegate("internalBrowserCallEsBuild", message)
+            }
+        )
+    }
+}
+

package/fireflysite/Html.ff

@@ -4,35 +4,77 @@ import Lux from ff:lux
 import Menu
 
 serveHtml(
+    system: NodeSystem
     moduleName: String
     title: String
     pageData: Buffer
-    contentHtml: String
-    styleTags: String
     request: WebRequest[WebResponse]
+    body: Lux => Unit
 ): Unit {
+    let html = Lux.renderToString {lux, insertStyleTags =>
+        lux.add("html") {
+            lux.set("lang", "en")
+            lux.set("style", "background-color: #ffffff; color: #333333; width: 100%; height: 100%; color-scheme: light;")
+            lux.add("head") {
+                lux.add("title") {lux.text(title)}
+                lux.add("meta") {
+                    lux.set("name", "viewport")
+                    lux.set("content", "width=device-width, initial-scale=1.0")
+                }
+                lux.add("meta") {
+                    lux.set("name", "theme-color")
+                    lux.set("content", "#ecc45e")
+                }
+                lux.add("link") {
+                    lux.set("rel", "modulepreload")
+                    lux.set("href", "/js/ff/fireflysite/" + moduleName + ".run.mjs")
+                }
+                lux.add("link") {
+                    lux.set("rel", "preload")
+                    lux.set("href", "/assets/font/firefly-mono.woff2")
+                    lux.set("as", "font")
+                    lux.set("crossorigin", "anonymous")
+                }
+                lux.add("link") {
+                    lux.set("rel", "preload")
+                    lux.set("href", "/assets/font/firefly-sans.woff2")
+                    lux.set("as", "font")
+                    lux.set("crossorigin", "anonymous")
+                }
+                lux.add("link") {
+                    lux.set("rel", "preload")
+                    lux.set("href", "/assets/image/firefly-logo-yellow.webp")
+                    lux.set("as", "image")
+                }
+                lux.add("style") {lux.text("@font-face { font-family: 'Firefly Mono'; font-display: fallback; src: url('/assets/font/firefly-mono.woff2'); }")}
+                lux.add("style") {lux.text("@font-face { font-family: 'Firefly Sans'; font-display: fallback; src: url('/assets/font/firefly-sans.woff2'); }")}
+                insertStyleTags()
+                lux.add("script") {
+                    lux.set("type", "module")
+                    lux.set("src", "/js/ff/fireflysite/" + moduleName + ".run.mjs")
+                }
+                lux.add("script") {
+                    lux.set("type", "text/plain")
+                    lux.set("id", "data")
+                    lux.text(pageData.toLetter16())
+                }
+                lux.add("script") {
+                    lux.set("type", "speculationrules")
+                    lux.text(speculationRules)
+                }
+            }
+            lux.add("body") {
+                lux.set("style", "margin: 0; padding: 0; width: 100%; height: 100%; touch-action: manipulation;")
+                lux.add("div") {
+                    lux.set("id", "main")
+                    body(lux)
+                }
+            }
+        }
+    }
     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("<link rel='modulepreload' href='/js/ff/fireflysite/" + moduleName + ".run.mjs'>")
-    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("<script type='module' src='/js/ff/fireflysite/" + moduleName + ".run.mjs'></script>")
-    request.writeText("<script type='text/plain' id='data'>" + pageData.toLetter16() + "</script>")
-    request.writeText(speculationRules)
-    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>")
+    request.writeText(html.first)
 }
 
 serve404(
@@ -55,8 +97,7 @@ renderAndServe[T: Serializable](
     render: Lux => Unit
 ) {
     let serialized = Serializable.serialize(pageData)
-    let htmlAndCss = Lux.renderToString(system, render)
-    serveHtml(moduleName, title, serialized, htmlAndCss.first, htmlAndCss.second, request)
+    serveHtml(system, moduleName, title, serialized, request, render)
 }
 
 renderToMain[T: Serializable](system: BrowserSystem, render: (Lux, T) => Unit) {
@@ -67,13 +108,11 @@ renderToMain[T: Serializable](system: BrowserSystem, render: (Lux, T) => Unit) {
     }
 }
 
-speculationRules: String = """<script type="speculationrules">
-{
+speculationRules: String = """{
   "prerender": [{
     "where": {
       "href_matches": "/*"
     },
     "eagerness": "moderate"
   }]
-}
-</script>"""
+}"""