firefly-compiler 0.5.84 → 0.5.85

package/compiler/JsEmitter.ff

@@ -164,11 +164,11 @@ extend self: JsEmitter {
             liner.writeLines()
             self.emitInstanceDefinition(_)
         }
-        let ignoreJsImports = if(self.emitTarget == EmitExecutable && self.moduleKey.packagePair.isCore()) {
+        let ignoreJsImports = [] /* if(self.emitTarget == EmitExecutable && self.moduleKey.packagePair.isCore()) {
             ["esbuild"]
         } else {
             []
-        }
+        }*/
         let jsImports = self.jsImporter.generateImports(ignoreJsImports.toSet())
         if(!jsImports.isEmpty()) {
             self.writeAnchorLines(anchor, jsImports)
@@ -195,7 +195,7 @@ extend self: JsEmitter {
 
     makeRun(moduleName: String, functions: List[DFunction], mainPackagePair: PackagePair, bootstrapping: Bool): List[String] {
         let buildMainFunction = functions.find {_.signature.name == "buildMain"}.filter {_ =>
-            self.emitTarget != EmitBrowser && self.emitTarget != EmitExecutable
+            self.emitTarget != EmitBrowser
         }
         let willRunOnNode = self.emitTarget != EmitBrowser
         let targetMain = if(willRunOnNode) {"nodeMain"} else {"browserMain"}
@@ -207,6 +207,7 @@ extend self: JsEmitter {
             }.toList()
             "import {" + escapeKeyword(mainName) + "$} from './" + moduleName + ".mjs'"
             self.emitImport(ModuleKey(PackagePair("ff", "core"), [], "Error"))
+            self.emitImport(ModuleKey(PackagePair("ff", "core"), [], "BuildSystem"))
             "export async function $run$(fireflyPath_, arguments_) {"
             "Error.stackTraceLimit = 50"
             "const $task = {controller_: new AbortController(), subtasks_: new Set(), promise_: new Promise(() => {}), started_: performance.now() * 0.001}"
@@ -225,11 +226,11 @@ extend self: JsEmitter {
             ...if(!buildMainFunction.isEmpty()) {[
                 "await buildMain_$(system, $task)"]
             } else {[]}
-            ...if(self.emitTarget != EmitBuild) {[
+            ...if(self.emitTarget != EmitBuild && self.emitTarget != EmitExecutable) {[
                 "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)"
+            ...if(self.emitTarget == EmitExecutable) {[
+                "if(system.assets_) await ff_core_BuildSystem.internalWriteAssets_$(system, system.assets_, $task)"
             ]} else {[]}
             ...if(!willRunOnNode) {[]} else {[
                 "} catch(error) {"
@@ -256,11 +257,11 @@ extend self: JsEmitter {
                     "await $run$(fireflyPath_, process.argv.slice(2))"
                     "})"
                 ]
-                | EmitExecutable => [
+                /*| EmitExecutable => [
                     "queueMicrotask(async () => {"
                     "await $run$(null, process.argv.slice(2))"
                     "})"
-                ]
+                ]*/
                 | _ => []
             }
         ].join("\n")]}.else {[]}

package/compiler/Main.ff

@@ -67,9 +67,10 @@ main(system: NodeSystem): Unit {
             )
             prepareFireflyDirectory(system.path("."))
             let mainPath = system.path(mainFile)
-            let moduleKey = buildScript(system, mainPath, resolvedDependencies.mainPackagePair, EmitExecutable, resolvedDependencies)
+            let moduleKey = 
+                buildScript(system, mainPath, resolvedDependencies.mainPackagePair, EmitExecutable, resolvedDependencies)
             bundleForExecutable(system, resolvedDependencies.mainPackagePair, moduleKey)
-            importAndRun(system, fireflyPath, "build", moduleKey, [])
+            importAndRun(system, fireflyPath, "executable", moduleKey, [])
 
         | CheckCommand(filePath) => 
             let errors = Builder.check(
@@ -175,7 +176,7 @@ buildScript(
     } else {
         resolvedDependencies.packagePaths.add(PackagePair("ff", "core"), fireflyPath.slash("core"))
     }
-    let compilerModulePath = if(emitTarget != EmitBrowser && emitTarget != EmitExecutable) {
+    let compilerModulePath = if(emitTarget != EmitBrowser) {
         fireflyPath.slash("output").slash("js").slash("ff").slash("compiler/Builder.mjs")
     }
     let targetName = emitTarget.{

package/core/BuildSystem.ff

@@ -209,3 +209,18 @@ internalCompile(buildSystem: BuildSystem, mainFiles: List[Path], target: String)
 internalMainPackagePair(buildSystem: BuildSystem): Pair[String, String] {
     Pair(buildSystem!->"mainPackagePair_"->"group_"?, buildSystem!->"mainPackagePair_"->"name_"?)
 }
+
+internalWriteAssets(system: NodeSystem, assetSystem: AssetSystem): Unit {
+    let path = system.path(".").slash(".firefly").path("output").slash("assets")
+    if(path.exists()) {path.delete()}
+    path.createDirectory()
+    Log.debug("Writing assets to " + path.absolute())
+    assetSystem.files.each {p, s =>
+        Log.debug(p)
+        if(!p.contains("..")) {
+            let assetPath = path.slash(p)
+            assetPath.parent().grab().createDirectory(createParentDirectories = True)
+            assetPath.writeStream(s())
+        }
+    }
+}

package/fireflysite/Dockerfile

@@ -1,18 +1,16 @@
-FROM node:22
-# See https://cheatsheetseries.owasp.org/cheatsheets/NodeJS_Docker_Cheat_Sheet.html
-RUN apt update
-RUN apt install dumb-init
+FROM node:22-slim
+RUN apt update && apt install dumb-init
 USER node
-RUN mkdir /home/node/app
-RUN mkdir /home/node/firefly
+RUN mkdir /home/node/firefly && mkdir /home/node/app
 WORKDIR /home/node/firefly
 RUN npm install firefly-compiler
 WORKDIR /home/node/app
 COPY --chown=node:node . .
 RUN [ "/home/node/firefly/node_modules/.bin/firefly", "build", "Main.ff" ]
 EXPOSE 8080
-ENTRYPOINT [ "dumb-init", "node", "--harmony-temporal", ".firefly/output/executable/Main.bundle.js", "0.0.0.0", "8080" ]
+ENTRYPOINT [ "dumb-init", "node", "--harmony-temporal", ".firefly/output/executable/ff/fireflysite/Main.run.js", "0.0.0.0", "8080" ]
 
 # Test it with
 # podman build -t fireflysite .
 # podman run -p 8080:8080 --rm -it fireflysite
+# podman run --entrypoint /bin/bash --rm -it fireflysite

package/fireflysite/Main.ff

@@ -54,7 +54,6 @@ nodeMain(system: NodeSystem): Unit {
 buildMain(system: BuildSystem) {
     mutable assets = AssetSystem.create()
     let browserAssets = system.bundleForBrowser(Router.modulesWithBrowserMain().map {_ + ".ff"}, sourceMaps = True)
-    //let browserAssets = system.compileForBrowser(Router.modulesWithBrowserMain().map {_ + ".ff"})
     assets = assets.addAssets("/js/", browserAssets)
     assets = assets.addAssets("/assets/", system.packageAssets().assets("/assets/"))
     system.setAssets(assets)

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

@@ -763,9 +763,7 @@ const _w1 = for_a[for_i];
 ff_compiler_JsEmitter.Liner_writeLines(liner_);
 ff_compiler_JsEmitter.JsEmitter_emitInstanceDefinition(self_, _w1)
 };
-const ignoreJsImports_ = ((ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable()) && ff_compiler_Syntax.PackagePair_isCore(self_.moduleKey_.packagePair_))
-? ["esbuild"]
-: []);
+const ignoreJsImports_ = [];
 const jsImports_ = ff_compiler_JsImporter.JsImporter_generateImports(self_.jsImporter_, ff_core_List.List_toSet(ignoreJsImports_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String));
 if((!ff_core_List.List_isEmpty(jsImports_))) {
 ff_compiler_JsEmitter.JsEmitter_writeAnchorLines(self_, anchor_, jsImports_)
@@ -796,7 +794,7 @@ export function JsEmitter_makeRun(self_, moduleName_, functions_, mainPackagePai
 const buildMainFunction_ = ff_core_Option.Option_filter(ff_core_List.List_find(functions_, ((_w1) => {
 return (_w1.signature_.name_ === "buildMain")
 })), ((_) => {
-return (ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget) && ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget))
+return ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
 }));
 const willRunOnNode_ = ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget);
 const targetMain_ = (willRunOnNode_
@@ -814,7 +812,7 @@ return _w1.signature_.name_
 })), ((mainName_) => {
 return [ff_core_List.List_join([...ff_core_Option.Option_toList(ff_core_Option.Option_map(buildMainFunction_, ((buildMain_) => {
 return (((("import {" + ff_compiler_JsEmitter.escapeKeyword_(buildMain_.signature_.name_)) + "$} from './") + moduleName_) + ".mjs'")
-}))), (((("import {" + ff_compiler_JsEmitter.escapeKeyword_(mainName_)) + "$} from './") + moduleName_) + ".mjs'"), ff_compiler_JsEmitter.JsEmitter_emitImport(self_, ff_compiler_Syntax.ModuleKey(ff_compiler_Syntax.PackagePair("ff", "core"), [], "Error")), "export async function $run$(fireflyPath_, arguments_) {", "Error.stackTraceLimit = 50", "const $task = {controller_: new AbortController(), subtasks_: new Set(), promise_: new Promise(() => {}), started_: performance.now() * 0.001}", ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
+}))), (((("import {" + ff_compiler_JsEmitter.escapeKeyword_(mainName_)) + "$} from './") + moduleName_) + ".mjs'"), ff_compiler_JsEmitter.JsEmitter_emitImport(self_, ff_compiler_Syntax.ModuleKey(ff_compiler_Syntax.PackagePair("ff", "core"), [], "Error")), ff_compiler_JsEmitter.JsEmitter_emitImport(self_, ff_compiler_Syntax.ModuleKey(ff_compiler_Syntax.PackagePair("ff", "core"), [], "BuildSystem")), "export async function $run$(fireflyPath_, arguments_) {", "Error.stackTraceLimit = 50", "const $task = {controller_: new AbortController(), subtasks_: new Set(), promise_: new Promise(() => {}), started_: performance.now() * 0.001}", ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
 ? ["let interval = setInterval(() => {}, 24 * 60 * 60 * 1000)"]
 : []), "let system = {", "task_: $task,", "array_: arguments_,", "fireflyPath_: fireflyPath_,", (((("mainPackagePair_: {group_: \"" + mainPackagePair_.group_) + "\", name_: \"") + mainPackagePair_.name_) + "\"},"), (("executableMode_: " + (ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable())
 ? "true"
@@ -822,10 +820,10 @@ return (((("import {" + ff_compiler_JsEmitter.escapeKeyword_(buildMain_.signatur
 ? "true"
 : "false")), "}", "try {", ...((!ff_core_Option.Option_isEmpty(buildMainFunction_))
 ? ["await buildMain_$(system, $task)"]
-: []), ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBuild(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
+: []), ...((ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBuild(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget) && ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable(), 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())
-? []
+: []), ...(ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable())
+? ["if(system.assets_) await ff_core_BuildSystem.internalWriteAssets_$(system, 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)
@@ -837,9 +835,6 @@ return ["queueMicrotask(async () => {", "await $run$(null, [])", "})"]
 if(_1.EmitNode && bootstrapping_) {
 return ["import * as path from 'node:path'", "queueMicrotask(async () => {", "let fireflyPath_ = path.dirname(path.dirname(path.dirname(path.dirname(path.dirname(process.argv[1])))))", "await $run$(fireflyPath_, process.argv.slice(2))", "})"]
 }
-if(_1.EmitExecutable) {
-return ["queueMicrotask(async () => {", "await $run$(null, process.argv.slice(2))", "})"]
-}
 {
 return []
 }
@@ -4377,9 +4372,7 @@ const _w1 = for_a[for_i];
 ff_compiler_JsEmitter.Liner_writeLines(liner_);
 ff_compiler_JsEmitter.JsEmitter_emitInstanceDefinition(self_, _w1)
 };
-const ignoreJsImports_ = ((ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable()) && ff_compiler_Syntax.PackagePair_isCore(self_.moduleKey_.packagePair_))
-? ["esbuild"]
-: []);
+const ignoreJsImports_ = [];
 const jsImports_ = ff_compiler_JsImporter.JsImporter_generateImports(self_.jsImporter_, ff_core_List.List_toSet(ignoreJsImports_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String));
 if((!ff_core_List.List_isEmpty(jsImports_))) {
 ff_compiler_JsEmitter.JsEmitter_writeAnchorLines(self_, anchor_, jsImports_)
@@ -4410,7 +4403,7 @@ export async function JsEmitter_makeRun$(self_, moduleName_, functions_, mainPac
 const buildMainFunction_ = ff_core_Option.Option_filter(ff_core_List.List_find(functions_, ((_w1) => {
 return (_w1.signature_.name_ === "buildMain")
 })), ((_) => {
-return (ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget) && ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget))
+return ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
 }));
 const willRunOnNode_ = ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget);
 const targetMain_ = (willRunOnNode_
@@ -4428,7 +4421,7 @@ return _w1.signature_.name_
 })), ((mainName_) => {
 return [ff_core_List.List_join([...ff_core_Option.Option_toList(ff_core_Option.Option_map(buildMainFunction_, ((buildMain_) => {
 return (((("import {" + ff_compiler_JsEmitter.escapeKeyword_(buildMain_.signature_.name_)) + "$} from './") + moduleName_) + ".mjs'")
-}))), (((("import {" + ff_compiler_JsEmitter.escapeKeyword_(mainName_)) + "$} from './") + moduleName_) + ".mjs'"), ff_compiler_JsEmitter.JsEmitter_emitImport(self_, ff_compiler_Syntax.ModuleKey(ff_compiler_Syntax.PackagePair("ff", "core"), [], "Error")), "export async function $run$(fireflyPath_, arguments_) {", "Error.stackTraceLimit = 50", "const $task = {controller_: new AbortController(), subtasks_: new Set(), promise_: new Promise(() => {}), started_: performance.now() * 0.001}", ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
+}))), (((("import {" + ff_compiler_JsEmitter.escapeKeyword_(mainName_)) + "$} from './") + moduleName_) + ".mjs'"), ff_compiler_JsEmitter.JsEmitter_emitImport(self_, ff_compiler_Syntax.ModuleKey(ff_compiler_Syntax.PackagePair("ff", "core"), [], "Error")), ff_compiler_JsEmitter.JsEmitter_emitImport(self_, ff_compiler_Syntax.ModuleKey(ff_compiler_Syntax.PackagePair("ff", "core"), [], "BuildSystem")), "export async function $run$(fireflyPath_, arguments_) {", "Error.stackTraceLimit = 50", "const $task = {controller_: new AbortController(), subtasks_: new Set(), promise_: new Promise(() => {}), started_: performance.now() * 0.001}", ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
 ? ["let interval = setInterval(() => {}, 24 * 60 * 60 * 1000)"]
 : []), "let system = {", "task_: $task,", "array_: arguments_,", "fireflyPath_: fireflyPath_,", (((("mainPackagePair_: {group_: \"" + mainPackagePair_.group_) + "\", name_: \"") + mainPackagePair_.name_) + "\"},"), (("executableMode_: " + (ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable())
 ? "true"
@@ -4436,10 +4429,10 @@ return (((("import {" + ff_compiler_JsEmitter.escapeKeyword_(buildMain_.signatur
 ? "true"
 : "false")), "}", "try {", ...((!ff_core_Option.Option_isEmpty(buildMainFunction_))
 ? ["await buildMain_$(system, $task)"]
-: []), ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBuild(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
+: []), ...((ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBuild(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget) && ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable(), 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())
-? []
+: []), ...(ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable())
+? ["if(system.assets_) await ff_core_BuildSystem.internalWriteAssets_$(system, 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)
@@ -4451,9 +4444,6 @@ return ["queueMicrotask(async () => {", "await $run$(null, [])", "})"]
 if(_1.EmitNode && bootstrapping_) {
 return ["import * as path from 'node:path'", "queueMicrotask(async () => {", "let fireflyPath_ = path.dirname(path.dirname(path.dirname(path.dirname(path.dirname(process.argv[1])))))", "await $run$(fireflyPath_, process.argv.slice(2))", "})"]
 }
-if(_1.EmitExecutable) {
-return ["queueMicrotask(async () => {", "await $run$(null, process.argv.slice(2))", "})"]
-}
 {
 return []
 }