firefly-compiler 0.5.81 → 0.5.83

package/compiler/JsEmitter.ff

@@ -229,7 +229,7 @@ extend self: JsEmitter {
                 "await " + mainName + "_$(system, $task)"
             ]} else {[]}
             ...if(self.emitTarget == EmitBuild) {[
-                "await $firefly_compiler.internalCreateExecutable_$(system, '.firefly/output/executable/Main.bundle.js', '.firefly/output', ['host'], system.assets_, $task)"
+                // "await $firefly_compiler.internalCreateExecutable_$(system, '.firefly/output/executable/Main.bundle.js', '.firefly/output', ['host'], system.assets_, $task)"
             ]} else {[]}
             ...if(!willRunOnNode) {[]} else {[
                 "} catch(error) {"

package/compiler/Main.ff

@@ -63,13 +63,13 @@ main(system: NodeSystem): Unit {
             let resolvedDependencies = Dependencies.process(
                 system.httpClient()
                 DependencyLock.new(system.mainTask())
-                system.path(mainFile + ".ff")
+                system.path(mainFile)
             )
             prepareFireflyDirectory(system.path("."))
             let mainPath = system.path(mainFile)
             let moduleKey = buildScript(system, mainPath, resolvedDependencies.mainPackagePair, EmitBuild, resolvedDependencies)
             buildScript(system, mainPath, resolvedDependencies.mainPackagePair, EmitExecutable, resolvedDependencies)
-            bundleForPkg(system, resolvedDependencies.mainPackagePair, mainPath.base())
+            bundleForExecutable(system, resolvedDependencies.mainPackagePair, moduleKey)
             importAndRun(system, fireflyPath, "build", moduleKey, [])
 
         | CheckCommand(filePath) => 
@@ -276,11 +276,16 @@ parseCommandLine(arguments: List[String]): MainCommand {
     | [s, ...] => throw(CommandLineError("Unknown command '" + s + "'" + usageString))
 }
 
-bundleForPkg(system: NodeSystem, packagePair: PackagePair, mainFile: String) {
-    let prefix = ".firefly/output/executable/"
-    let mainJsFile = prefix + packagePair.groupName("/") + "/" + mainFile + ".mjs"
-    let file = prefix + "Main.bundle.js"
-    BuildSystem.internalNodeCallEsBuild(system, mainJsFile, outputPath = file, minify = False)
+bundleForExecutable(system: NodeSystem, packagePair: PackagePair, moduleKey: ModuleKey) {
+    let packagePath = moduleKey.packagePair.groupName("/")
+    let outputPath = system.path(".firefly/output/executable/" + packagePath + "/")
+    let runFile = outputPath.slash(moduleKey.importName() + ".run.mjs")
+    BuildSystem.internalNodeCallEsBuild(
+        system, 
+        runFile.absolute(), 
+        outputPath.absolute(), 
+        minify = True
+    )
 }
 
 bundleForBrowser(system: NodeSystem, packagePair: PackagePair, moduleKey: ModuleKey) {

package/core/BuildSystem.ff

@@ -125,8 +125,8 @@ internalNodeCallEsBuild(
         target = "es2017"
         external = ["esbuild", "uws.js"]
         loader = Js.object().with(".node", "copy")
-        outfile = outputPath
-    )))    
+        outdir = outputPath
+    )))
 }
 
 internalNodeCallEsBuildContext(

package/experimental/docker/Dockerfile

@@ -0,0 +1,17 @@
+FROM node:24
+RUN mkdir /home/node/app && chown -R node:node /home/node/app
+RUN mkdir /home/node/firefly && chown -R node:node /home/node/firefly
+# COPY package*.json ./
+USER node
+WORKDIR /home/node/firefly
+RUN npm install firefly-compiler
+WORKDIR /home/node/app
+COPY --chown=node:node . .
+# This fetches Firefly packages but we should also do their npm install --no-bin-links
+RUN [ "/home/node/firefly/node_modules/.bin/firefly", "check", "Main.ff" ]
+EXPOSE 8080
+ENTRYPOINT [ "/home/node/firefly/node_modules/.bin/firefly", "Main.ff" ]
+
+# Test it with
+# podman build -t my-image .
+# podman run -it --name my-container my-image

package/experimental/docker/Main.ff

@@ -0,0 +1,3 @@
+nodeMain(system: NodeSystem) {
+    system.writeLine("Hello!")
+}

package/fireflysite/.dockerignore

@@ -0,0 +1,10 @@
+**/.firefly/output/
+**/.firefly/temporary/
+**/.firefly/dependencies/
+**/.firefly/include/package-lock.json
+**/node_modules/
+**/*_?_?_?.tar.gz
+**/.DS_Store
+
+Dockerfile
+.dockerignore

package/fireflysite/Dockerfile

@@ -0,0 +1,20 @@
+FROM node:22
+# See https://cheatsheetseries.owasp.org/cheatsheets/NodeJS_Docker_Cheat_Sheet.html
+RUN apt update
+RUN apt install dumb-init
+USER node
+RUN mkdir /home/node/app
+RUN mkdir /home/node/firefly
+WORKDIR /home/node/firefly
+RUN npm install firefly-compiler
+WORKDIR /home/node/app
+RUN mkdir -p .firefly/output/executable
+COPY --chown=node:node .firefly/output/executable .firefly/output/executable
+# This fetches Firefly packages but we should also do their npm install --no-bin-links
+RUN [ "/home/node/firefly/node_modules/.bin/firefly", "build", "Main.ff" ]
+EXPOSE 8080
+ENTRYPOINT [ "dumb-init", "node", ".firefly/output/executable/Main.bundle.js", "0.0.0.0", "8080" ]
+
+# Test it with
+# podman build -t fireflysite .
+# podman run -p 8080:8080 --rm -it fireflysite

package/fireflysite/Main.ff

@@ -18,6 +18,7 @@ nodeMain(system: NodeSystem): Unit {
     let handlers = WebRouteHandler(Array.new())
     Router.handlers(handlers)
     let cacheSalt = system.crypto().randomBuffer(16)
+    Log.debug("Starting server on " + host + ":" + port)
     WebServer.new(system, host, port).listen {request =>
         let path = request.readPath()
         let segments = path.split('/').filter {s => s != "" && s != "." && s != ".."}

package/lsp/CompletionHandler.ff

@@ -870,7 +870,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
                 "        if(request.readPath() == \"/\") {"
                 "            request.writeHeader(\"Content-Type\", \"text/html; charset=UTF-8\")"
                 "            request.writeText(\"<!doctype html>\")"
-                "            request.writeText(\"<script type='module' src='/js/script/script/$TM_FILENAME_BASE.mjs'></script>\")"
+                "            request.writeText(\"<script type='module' src='/js/script/script/$TM_FILENAME_BASE.run.mjs'></script>\")"
                 "        } elseIf {request.readPath() == \"/hello\"} {"
                 "            request.writeHeader(\"Content-Type\", \"text/plain; charset=UTF-8\")"
                 "            request.writeText(\"Hello from server!\")"

package/output/js/ff/compiler/JsEmitter.mjs

@@ -825,7 +825,7 @@ return (((("import {" + ff_compiler_JsEmitter.escapeKeyword_(buildMain_.signatur
 : []), ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBuild(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
 ? [(("await " + mainName_) + "_$(system, $task)")]
 : []), ...(ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBuild())
-? ["await $firefly_compiler.internalCreateExecutable_$(system, '.firefly/output/executable/Main.bundle.js', '.firefly/output', ['host'], system.assets_, $task)"]
+? []
 : []), ...((!willRunOnNode_)
 ? []
 : ["} catch(error) {", "console.error(ff_core_Error.Error_stack(error))", "process.exit(1)"]), "} finally {", ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
@@ -4439,7 +4439,7 @@ return (((("import {" + ff_compiler_JsEmitter.escapeKeyword_(buildMain_.signatur
 : []), ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBuild(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
 ? [(("await " + mainName_) + "_$(system, $task)")]
 : []), ...(ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBuild())
-? ["await $firefly_compiler.internalCreateExecutable_$(system, '.firefly/output/executable/Main.bundle.js', '.firefly/output', ['host'], system.assets_, $task)"]
+? []
 : []), ...((!willRunOnNode_)
 ? []
 : ["} catch(error) {", "console.error(ff_core_Error.Error_stack(error))", "process.exit(1)"]), "} finally {", ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)