firefly-compiler 0.5.50 → 0.5.52

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

@@ -881,5 +881,3 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 }
 };
-
-

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

@@ -4006,5 +4006,3 @@ return instantiated_
 }
 
 
-
-

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

@@ -665,9 +665,7 @@ return ("export " + ff_compiler_JsEmitter.JsEmitter_emitFunctionDefinition(self_
 return ff_compiler_JsEmitter.JsEmitter_emitExtendsDefinition(self_, _w1)
 })), ff_core_List.List_map(module_.instances_, ((_w1) => {
 return ff_compiler_JsEmitter.JsEmitter_emitInstanceDefinition(self_, _w1)
-})), (self_.isMainModule_
-? ff_compiler_JsEmitter.JsEmitter_emitRun(self_, module_.functions_, packagePair_, ((packagePair_.group_ === "ff") && (packagePair_.name_ === "compiler")))
-: [])];
+}))];
 const ignoreJsImports_ = (((ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable()) && (packagePair_.group_ === "ff")) && (packagePair_.name_ === "core"))
 ? ["esbuild"]
 : []);
@@ -686,7 +684,7 @@ self_.emittingAsync_ = false
 }
 }
 
-export function JsEmitter_emitRun(self_, functions_, mainPackagePair_, bootstrapping_) {
+export function JsEmitter_emitRun(self_, moduleName_, functions_, mainPackagePair_, bootstrapping_) {
 const buildMainFunction_ = ff_core_Option.Option_filter(ff_core_List.List_find(functions_, ((_w1) => {
 return (_w1.signature_.name_ === "buildMain")
 })), ((_) => {
@@ -706,7 +704,9 @@ return (_w1.signature_.name_ === "main")
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_core_Option.Option_map(mainFunction_, ((_w1) => {
 return _w1.signature_.name_
 })), ((mainName_) => {
-return [ff_core_List.List_join(["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)
+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'"), "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"
@@ -719,7 +719,7 @@ return [ff_core_List.List_join(["export async function $run$(fireflyPath_, argum
 : []), ...(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)"]
 : []), "} finally {", ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
-? ["ff_core_Task.Task_abort$($task)", "clearInterval(interval)"]
+? ["$task.controller_.abort()", "clearInterval(interval)"]
 : []), "}", "}", ...(((_1) => {
 if(_1.EmitBrowser) {
 return ["queueMicrotask(async () => {", "await $run$(null, [])", "})"]
@@ -1181,14 +1181,6 @@ const effect_ = _1.effect_;
 const typeArguments_ = _1.typeArguments_;
 const arguments_ = _1.arguments_;
 const dictionaries_ = _1.dictionaries_;
-if(ff_core_String.String_contains(name_, "bundleForBrowser")) {
-if((!ff_core_Option.Option_contains((arguments_[0] ?? ff_core_List.List_grab(arguments_, 0)).name_, "system", ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String))) {
-ff_core_Log.debug_(("Wrong arguments for bundleForBrowser: " + ff_core_Show.ff_core_Show_Show$ff_core_List_List(ff_core_Option.ff_core_Show_Show$ff_core_Option_Option(ff_core_Show.ff_core_Show_Show$ff_core_String_String)).show_(ff_core_List.List_map(arguments_, ((_w1) => {
-return _w1.name_
-})))));
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Core.GrabException(), ff_core_Core.ff_core_Any_HasAnyTag$ff_core_Core_GrabException)})
-}
-};
 {
 const _1 = ff_compiler_JsEmitter.detectIfElse_(term_);
 if(_1.length === 0) {
@@ -3191,9 +3183,7 @@ return ("export " + ff_compiler_JsEmitter.JsEmitter_emitFunctionDefinition(self_
 return ff_compiler_JsEmitter.JsEmitter_emitExtendsDefinition(self_, _w1)
 })), ff_core_List.List_map(module_.instances_, ((_w1) => {
 return ff_compiler_JsEmitter.JsEmitter_emitInstanceDefinition(self_, _w1)
-})), (self_.isMainModule_
-? ff_compiler_JsEmitter.JsEmitter_emitRun(self_, module_.functions_, packagePair_, ((packagePair_.group_ === "ff") && (packagePair_.name_ === "compiler")))
-: [])];
+}))];
 const ignoreJsImports_ = (((ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitExecutable()) && (packagePair_.group_ === "ff")) && (packagePair_.name_ === "core"))
 ? ["esbuild"]
 : []);
@@ -3212,7 +3202,7 @@ self_.emittingAsync_ = false
 }
 }
 
-export async function JsEmitter_emitRun$(self_, functions_, mainPackagePair_, bootstrapping_, $task) {
+export async function JsEmitter_emitRun$(self_, moduleName_, functions_, mainPackagePair_, bootstrapping_, $task) {
 const buildMainFunction_ = ff_core_Option.Option_filter(ff_core_List.List_find(functions_, ((_w1) => {
 return (_w1.signature_.name_ === "buildMain")
 })), ((_) => {
@@ -3232,7 +3222,9 @@ return (_w1.signature_.name_ === "main")
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_core_Option.Option_map(mainFunction_, ((_w1) => {
 return _w1.signature_.name_
 })), ((mainName_) => {
-return [ff_core_List.List_join(["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)
+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'"), "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"
@@ -3245,7 +3237,7 @@ return [ff_core_List.List_join(["export async function $run$(fireflyPath_, argum
 : []), ...(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)"]
 : []), "} finally {", ...(ff_core_Equal.notEquals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser(), ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget)
-? ["ff_core_Task.Task_abort$($task)", "clearInterval(interval)"]
+? ["$task.controller_.abort()", "clearInterval(interval)"]
 : []), "}", "}", ...(((_1) => {
 if(_1.EmitBrowser) {
 return ["queueMicrotask(async () => {", "await $run$(null, [])", "})"]
@@ -3707,14 +3699,6 @@ const effect_ = _1.effect_;
 const typeArguments_ = _1.typeArguments_;
 const arguments_ = _1.arguments_;
 const dictionaries_ = _1.dictionaries_;
-if(ff_core_String.String_contains(name_, "bundleForBrowser")) {
-if((!ff_core_Option.Option_contains((arguments_[0] ?? ff_core_List.List_grab(arguments_, 0)).name_, "system", ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String))) {
-ff_core_Log.debug_(("Wrong arguments for bundleForBrowser: " + ff_core_Show.ff_core_Show_Show$ff_core_List_List(ff_core_Option.ff_core_Show_Show$ff_core_Option_Option(ff_core_Show.ff_core_Show_Show$ff_core_String_String)).show_(ff_core_List.List_map(arguments_, ((_w1) => {
-return _w1.name_
-})))));
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Core.GrabException(), ff_core_Core.ff_core_Any_HasAnyTag$ff_core_Core_GrabException)})
-}
-};
 {
 const _1 = ff_compiler_JsEmitter.detectIfElse_(term_);
 if(_1.length === 0) {
@@ -6119,5 +6103,3 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 }
 };
-
-

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

@@ -256,5 +256,3 @@ return
 }
 
 
-
-

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

@@ -1196,5 +1196,3 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 }
 };
-
-

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

@@ -183,7 +183,7 @@ return "browser"
 return "executable"
 }
 }))(emitTarget_);
-ff_compiler_Builder.build_(system_, emitTarget_, mainPackagePair_, mainFile_, (((_c) => {
+ff_compiler_Builder.build_(system_, emitTarget_, mainPackagePair_, [mainFile_], (((_c) => {
 return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.packages_, fixedPackagePaths_, _c.singleFilePackages_)
 }))(resolvedDependencies_), compilerModulePath_, ff_core_Path.Path_slash(ff_core_NodeSystem.NodeSystem_path(system_, ".firefly"), "temporary"), ff_core_Path.Path_path(ff_core_Path.Path_path(ff_core_NodeSystem.NodeSystem_path(system_, ".firefly"), "output"), targetName_), false, ff_compiler_ModuleCache.new_(0))
 }
@@ -196,7 +196,7 @@ const resolvedDependencies_ = ff_compiler_Dependencies.process_(ff_core_NodeSyst
 ff_compiler_Main.prepareFireflyDirectory_(ff_core_NodeSystem.NodeSystem_path(system_, "."));
 const localMainFile_ = ff_core_Path.Path_base(ff_core_NodeSystem.NodeSystem_path(system_, mainFile_));
 buildScript_(localMainFile_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitNode(), resolvedDependencies_);
-if((!ff_compiler_Main.importAndRun_(fireflyPath_, "node", resolvedDependencies_.mainPackagePair_, localMainFile_, arguments_))) {
+if((!ff_compiler_Main.importAndRun_(system_, fireflyPath_, "node", resolvedDependencies_.mainPackagePair_, localMainFile_, arguments_))) {
 const at_ = ff_compiler_Syntax.Location(ff_core_Path.Path_absolute(ff_core_NodeSystem.NodeSystem_path(system_, (mainFile_ + ".ff"))), 1, 1);
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "This module does not contain a 'nodeMain' function"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
@@ -219,7 +219,7 @@ const localMainFile_ = ff_core_Path.Path_base(ff_core_NodeSystem.NodeSystem_path
 buildScript_(localMainFile_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitBuild(), resolvedDependencies_);
 buildScript_(localMainFile_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitExecutable(), resolvedDependencies_);
 ff_compiler_Main.bundleForPkg_(system_, resolvedDependencies_.mainPackagePair_, localMainFile_);
-ff_compiler_Main.importAndRun_(fireflyPath_, "build", resolvedDependencies_.mainPackagePair_, localMainFile_, [])
+ff_compiler_Main.importAndRun_(system_, fireflyPath_, "build", resolvedDependencies_.mainPackagePair_, localMainFile_, [])
 return
 }
 if(command_a.CheckCommand) {
@@ -233,7 +233,7 @@ return
 if(command_a.BootstrapCommand) {
 const workingDirectory_ = ff_core_NodeSystem.NodeSystem_path(system_, ".");
 const fakeLocation_ = ff_compiler_Syntax.Location("<core>", 0, 0);
-ff_compiler_Builder.build_(system_, ff_compiler_JsEmitter.EmitNode(), ff_compiler_Syntax.PackagePair("ff", "compiler"), "Main", ff_compiler_Dependencies.ResolvedDependencies(ff_compiler_Syntax.PackagePair("ff", "compiler"), ff_core_List.List_toMap([ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "core"), ff_compiler_Syntax.PackageInfo(ff_compiler_Syntax.DPackage(fakeLocation_, ff_compiler_Syntax.PackagePair("ff", "core"), ff_compiler_Syntax.Version(fakeLocation_, 0, 0, 0), ff_compiler_Syntax.TargetNames(true, false)), [], [ff_compiler_Syntax.DInclude(fakeLocation_, "node_modules")]))], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toMap([ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "compiler"), ff_core_Path.Path_slash(workingDirectory_, "compiler")), ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "core"), ff_core_Path.Path_slash(workingDirectory_, "core"))], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toSet([], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair)), ff_core_Option.None(), ff_core_Path.Path_slash(ff_core_Path.Path_slash(workingDirectory_, "output"), "temporary"), ff_core_Path.Path_slash(ff_core_Path.Path_slash(workingDirectory_, "output"), "js"), true, ff_compiler_ModuleCache.new_(0))
+ff_compiler_Builder.build_(system_, ff_compiler_JsEmitter.EmitNode(), ff_compiler_Syntax.PackagePair("ff", "compiler"), ["Main"], ff_compiler_Dependencies.ResolvedDependencies(ff_compiler_Syntax.PackagePair("ff", "compiler"), ff_core_List.List_toMap([ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "core"), ff_compiler_Syntax.PackageInfo(ff_compiler_Syntax.DPackage(fakeLocation_, ff_compiler_Syntax.PackagePair("ff", "core"), ff_compiler_Syntax.Version(fakeLocation_, 0, 0, 0), ff_compiler_Syntax.TargetNames(true, false)), [], [ff_compiler_Syntax.DInclude(fakeLocation_, "node_modules")]))], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toMap([ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "compiler"), ff_core_Path.Path_slash(workingDirectory_, "compiler")), ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "core"), ff_core_Path.Path_slash(workingDirectory_, "core"))], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toSet([], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair)), ff_core_Option.None(), ff_core_Path.Path_slash(ff_core_Path.Path_slash(workingDirectory_, "output"), "temporary"), ff_core_Path.Path_slash(ff_core_Path.Path_slash(workingDirectory_, "output"), "js"), true, ff_compiler_ModuleCache.new_(0))
 return
 }
 {
@@ -434,21 +434,22 @@ export function bundleForBrowser_(system_, packagePair_, mainFile_) {
 const prefix_ = ".firefly/output/browser/";
 const mainJsFile_ = ((((prefix_ + ff_compiler_Syntax.PackagePair_groupName(packagePair_, "/")) + "/") + mainFile_) + ".mjs");
 const file_ = (prefix_ + "Main.bundle.js");
-const browserCode_ = ff_core_BuildSystem.BrowserCode(packagePair_.group_, packagePair_.name_, ff_core_NodeSystem.NodeSystem_path(system_, mainFile_), ff_core_AssetSystem.AssetSystem(ff_core_List.List_toMap([ff_core_Pair.Pair("/", (() => {
-return ff_core_Path.Path_readStream(ff_core_NodeSystem.NodeSystem_path(system_, "."))
-}))], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)));
-ff_core_BuildSystem.internalCallEsBuild_(browserCode_, mainJsFile_, file_, true, true)
+ff_core_BuildSystem.internalCallEsBuild_(system_, mainJsFile_, file_, true, true)
 }
 
-export function importAndRun_(fireflyPath_, target_, packagePair_, mainFile_, arguments_) {
+export function importAndRun_(system_, fireflyPath_, target_, packagePair_, mainFile_, arguments_) {
 const process_ = import("process");
 const cwd_ = process_.cwd();
 const workingDirectory_ = ((cwd_.indexOf(":") === 1)
 ? ("file:///" + cwd_)
 : cwd_);
 const packagePath_ = ((packagePair_.group_ + "/") + packagePair_.name_);
-const main_ = import((((((((workingDirectory_ + "/.firefly/output/") + target_) + "/") + packagePath_) + "/") + mainFile_) + ".mjs"));
-if(((typeof main_["$run$"]) !== "undefined")) {
+const runFile_ = (((((((workingDirectory_ + "/.firefly/output/") + target_) + "/") + packagePath_) + "/") + mainFile_) + ".run.mjs");
+const runFilePath_ = (ff_core_String.String_contains(runFile_, "://")
+? ff_core_NodeSystem.NodeSystem_pathFromUrl(system_, runFile_)
+: ff_core_NodeSystem.NodeSystem_path(system_, runFile_));
+if(ff_core_Path.Path_exists(runFilePath_, false, false, false)) {
+const main_ = import(runFile_);
 main_["$run$"](fireflyPath_.absolutePath_, arguments_);
 return true
 } else {
@@ -581,7 +582,7 @@ return "browser"
 return "executable"
 }
 }))(emitTarget_);
-(await ff_compiler_Builder.build_$(system_, emitTarget_, mainPackagePair_, mainFile_, (((_c) => {
+(await ff_compiler_Builder.build_$(system_, emitTarget_, mainPackagePair_, [mainFile_], (((_c) => {
 return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.packages_, fixedPackagePaths_, _c.singleFilePackages_)
 }))(resolvedDependencies_), compilerModulePath_, (await ff_core_Path.Path_slash$((await ff_core_NodeSystem.NodeSystem_path$(system_, ".firefly", $task)), "temporary", $task)), (await ff_core_Path.Path_path$((await ff_core_Path.Path_path$((await ff_core_NodeSystem.NodeSystem_path$(system_, ".firefly", $task)), "output", $task)), targetName_, $task)), false, ff_compiler_ModuleCache.new_(0), $task))
 }
@@ -594,7 +595,7 @@ const resolvedDependencies_ = (await ff_compiler_Dependencies.process_$((await f
 (await ff_compiler_Main.prepareFireflyDirectory_$((await ff_core_NodeSystem.NodeSystem_path$(system_, ".", $task)), $task));
 const localMainFile_ = (await ff_core_Path.Path_base$((await ff_core_NodeSystem.NodeSystem_path$(system_, mainFile_, $task)), $task));
 (await buildScript_$(localMainFile_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitNode(), resolvedDependencies_, $task));
-if((!(await ff_compiler_Main.importAndRun_$(fireflyPath_, "node", resolvedDependencies_.mainPackagePair_, localMainFile_, arguments_, $task)))) {
+if((!(await ff_compiler_Main.importAndRun_$(system_, fireflyPath_, "node", resolvedDependencies_.mainPackagePair_, localMainFile_, arguments_, $task)))) {
 const at_ = ff_compiler_Syntax.Location((await ff_core_Path.Path_absolute$((await ff_core_NodeSystem.NodeSystem_path$(system_, (mainFile_ + ".ff"), $task)), $task)), 1, 1);
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "This module does not contain a 'nodeMain' function"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
@@ -617,7 +618,7 @@ const localMainFile_ = (await ff_core_Path.Path_base$((await ff_core_NodeSystem.
 (await buildScript_$(localMainFile_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitBuild(), resolvedDependencies_, $task));
 (await buildScript_$(localMainFile_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitExecutable(), resolvedDependencies_, $task));
 (await ff_compiler_Main.bundleForPkg_$(system_, resolvedDependencies_.mainPackagePair_, localMainFile_, $task));
-(await ff_compiler_Main.importAndRun_$(fireflyPath_, "build", resolvedDependencies_.mainPackagePair_, localMainFile_, [], $task))
+(await ff_compiler_Main.importAndRun_$(system_, fireflyPath_, "build", resolvedDependencies_.mainPackagePair_, localMainFile_, [], $task))
 return
 }
 if(command_a.CheckCommand) {
@@ -631,7 +632,7 @@ return
 if(command_a.BootstrapCommand) {
 const workingDirectory_ = (await ff_core_NodeSystem.NodeSystem_path$(system_, ".", $task));
 const fakeLocation_ = ff_compiler_Syntax.Location("<core>", 0, 0);
-(await ff_compiler_Builder.build_$(system_, ff_compiler_JsEmitter.EmitNode(), ff_compiler_Syntax.PackagePair("ff", "compiler"), "Main", ff_compiler_Dependencies.ResolvedDependencies(ff_compiler_Syntax.PackagePair("ff", "compiler"), ff_core_List.List_toMap([ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "core"), ff_compiler_Syntax.PackageInfo(ff_compiler_Syntax.DPackage(fakeLocation_, ff_compiler_Syntax.PackagePair("ff", "core"), ff_compiler_Syntax.Version(fakeLocation_, 0, 0, 0), ff_compiler_Syntax.TargetNames(true, false)), [], [ff_compiler_Syntax.DInclude(fakeLocation_, "node_modules")]))], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toMap([ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "compiler"), (await ff_core_Path.Path_slash$(workingDirectory_, "compiler", $task))), ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "core"), (await ff_core_Path.Path_slash$(workingDirectory_, "core", $task)))], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toSet([], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair)), ff_core_Option.None(), (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(workingDirectory_, "output", $task)), "temporary", $task)), (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(workingDirectory_, "output", $task)), "js", $task)), true, ff_compiler_ModuleCache.new_(0), $task))
+(await ff_compiler_Builder.build_$(system_, ff_compiler_JsEmitter.EmitNode(), ff_compiler_Syntax.PackagePair("ff", "compiler"), ["Main"], ff_compiler_Dependencies.ResolvedDependencies(ff_compiler_Syntax.PackagePair("ff", "compiler"), ff_core_List.List_toMap([ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "core"), ff_compiler_Syntax.PackageInfo(ff_compiler_Syntax.DPackage(fakeLocation_, ff_compiler_Syntax.PackagePair("ff", "core"), ff_compiler_Syntax.Version(fakeLocation_, 0, 0, 0), ff_compiler_Syntax.TargetNames(true, false)), [], [ff_compiler_Syntax.DInclude(fakeLocation_, "node_modules")]))], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toMap([ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "compiler"), (await ff_core_Path.Path_slash$(workingDirectory_, "compiler", $task))), ff_core_Pair.Pair(ff_compiler_Syntax.PackagePair("ff", "core"), (await ff_core_Path.Path_slash$(workingDirectory_, "core", $task)))], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toSet([], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair)), ff_core_Option.None(), (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(workingDirectory_, "output", $task)), "temporary", $task)), (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(workingDirectory_, "output", $task)), "js", $task)), true, ff_compiler_ModuleCache.new_(0), $task))
 return
 }
 {
@@ -832,21 +833,22 @@ export async function bundleForBrowser_$(system_, packagePair_, mainFile_, $task
 const prefix_ = ".firefly/output/browser/";
 const mainJsFile_ = ((((prefix_ + ff_compiler_Syntax.PackagePair_groupName(packagePair_, "/")) + "/") + mainFile_) + ".mjs");
 const file_ = (prefix_ + "Main.bundle.js");
-const browserCode_ = ff_core_BuildSystem.BrowserCode(packagePair_.group_, packagePair_.name_, (await ff_core_NodeSystem.NodeSystem_path$(system_, mainFile_, $task)), ff_core_AssetSystem.AssetSystem(ff_core_List.List_toMap([ff_core_Pair.Pair("/", (async ($task) => {
-return (await ff_core_Path.Path_readStream$((await ff_core_NodeSystem.NodeSystem_path$(system_, ".", $task)), $task))
-}))], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)));
-(await ff_core_BuildSystem.internalCallEsBuild_$(browserCode_, mainJsFile_, file_, true, true, $task))
+(await ff_core_BuildSystem.internalCallEsBuild_$(system_, mainJsFile_, file_, true, true, $task))
 }
 
-export async function importAndRun_$(fireflyPath_, target_, packagePair_, mainFile_, arguments_, $task) {
+export async function importAndRun_$(system_, fireflyPath_, target_, packagePair_, mainFile_, arguments_, $task) {
 const process_ = (await import("process"));
 const cwd_ = process_.cwd();
 const workingDirectory_ = ((cwd_.indexOf(":") === 1)
 ? ("file:///" + cwd_)
 : cwd_);
 const packagePath_ = ((packagePair_.group_ + "/") + packagePair_.name_);
-const main_ = (await import((((((((workingDirectory_ + "/.firefly/output/") + target_) + "/") + packagePath_) + "/") + mainFile_) + ".mjs")));
-if(((typeof main_["$run$"]) !== "undefined")) {
+const runFile_ = (((((((workingDirectory_ + "/.firefly/output/") + target_) + "/") + packagePath_) + "/") + mainFile_) + ".run.mjs");
+const runFilePath_ = (ff_core_String.String_contains(runFile_, "://")
+? (await ff_core_NodeSystem.NodeSystem_pathFromUrl$(system_, runFile_, $task))
+: (await ff_core_NodeSystem.NodeSystem_path$(system_, runFile_, $task)));
+if((await ff_core_Path.Path_exists$(runFilePath_, false, false, false, $task))) {
+const main_ = (await import(runFile_));
 main_["$run$"](fireflyPath_.absolutePath_, arguments_);
 return true
 } else {
@@ -1621,28 +1623,3 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 }
 };
-
-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}
-let interval = setInterval(() => {}, 24 * 60 * 60 * 1000)
-let system = {
-task_: $task,
-array_: arguments_,
-fireflyPath_: fireflyPath_,
-mainPackagePair_: {group_: "ff", name_: "compiler"},
-executableMode_: false,
-buildMode_: false
-}
-try {
-await main_$(system, $task)
-} finally {
-ff_core_Task.Task_abort$($task)
-clearInterval(interval)
-}
-}
-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))
-})

package/output/js/ff/compiler/Main.run.mjs

@@ -0,0 +1,25 @@
+import {main_$} from './Main.mjs'
+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}
+let interval = setInterval(() => {}, 24 * 60 * 60 * 1000)
+let system = {
+task_: $task,
+array_: arguments_,
+fireflyPath_: fireflyPath_,
+mainPackagePair_: {group_: "ff", name_: "compiler"},
+executableMode_: false,
+buildMode_: false
+}
+try {
+await main_$(system, $task)
+} finally {
+$task.controller_.abort()
+clearInterval(interval)
+}
+}
+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))
+})

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

@@ -313,9 +313,9 @@ return result_
 }))
 }
 
-export function ModuleCache_cacheEmittedModule(self_, packagePaths_, packagePair_, moduleName_, body_) {
+export function ModuleCache_cacheEmittedModule(self_, packagePaths_, packagePair_, moduleName_, isMainModule_, body_) {
 const path_ = ff_compiler_ModuleCache.modulePath_(packagePaths_, packagePair_, moduleName_);
-if((!ff_core_Map.Map_contains(self_.emittedModules_, ff_core_Path.Path_absolute(path_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String))) {
+if((isMainModule_ || (!ff_core_Map.Map_contains(self_.emittedModules_, ff_core_Path.Path_absolute(path_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)))) {
 self_.emittedModules_ = ff_core_Map.Map_add(self_.emittedModules_, ff_core_Path.Path_absolute(path_), self_.version_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 try {
 body_(path_)
@@ -486,9 +486,9 @@ return result_
 }), $task))
 }
 
-export async function ModuleCache_cacheEmittedModule$(self_, packagePaths_, packagePair_, moduleName_, body_, $task) {
+export async function ModuleCache_cacheEmittedModule$(self_, packagePaths_, packagePair_, moduleName_, isMainModule_, body_, $task) {
 const path_ = (await ff_compiler_ModuleCache.modulePath_$(packagePaths_, packagePair_, moduleName_, $task));
-if((!ff_core_Map.Map_contains(self_.emittedModules_, (await ff_core_Path.Path_absolute$(path_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String))) {
+if((isMainModule_ || (!ff_core_Map.Map_contains(self_.emittedModules_, (await ff_core_Path.Path_absolute$(path_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)))) {
 self_.emittedModules_ = ff_core_Map.Map_add(self_.emittedModules_, (await ff_core_Path.Path_absolute$(path_, $task)), self_.version_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 try {
 (await body_(path_, $task))
@@ -500,5 +500,3 @@ ff_core_Error.Error_rethrow(error_)
 }
 
 
-
-

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

@@ -3284,5 +3284,3 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 }
 };
-
-

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

@@ -769,5 +769,3 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 }
 };
-
-

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

@@ -2315,5 +2315,3 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 }
 };
-
-

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

@@ -988,5 +988,3 @@ return ff_core_Map.Map_contains(self_.substitution_, index_, ff_core_Ordering.ff
 }
 
 
-
-

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

@@ -9529,5 +9529,3 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 }
 };
-
-

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

@@ -2260,5 +2260,3 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 }
 };
-
-

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

@@ -633,5 +633,3 @@ return ff_core_Array.Array_drain(tokens_)
 
 
 
-
-

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

@@ -1418,5 +1418,3 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 }
 };
-
-

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

@@ -524,5 +524,3 @@ return term_
 }
 
 
-
-

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

@@ -611,5 +611,3 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 }
 };
-
-

package/output/js/ff/core/Any.mjs

@@ -143,5 +143,3 @@ return self_
 }
 
 
-
-

package/output/js/ff/core/Array.mjs

@@ -707,5 +707,3 @@ array_.array.push("].toArray()");
 return ff_core_Array.Array_join(array_, "")
 }
 }}
-
-

package/output/js/ff/core/AssetSystem.mjs

@@ -266,5 +266,3 @@ return (await ff_core_Stream.Stream_toString$((await ff_core_AssetSystem.AssetSy
 }
 
 
-
-

package/output/js/ff/core/Atomic.mjs

@@ -222,5 +222,3 @@ return true
 }
 
 
-
-

package/output/js/ff/core/Bool.mjs

@@ -142,5 +142,3 @@ async anyTag_$($task) {
 return ff_core_Any.internalAnyTag_((("ff:core/Bool.Bool" + "[") + "]"))
 }
 };
-
-

package/output/js/ff/core/BrowserSystem.mjs

@@ -212,5 +212,3 @@ return ff_core_Option.Some(location.hash.slice(1))
 }
 
 
-
-

package/output/js/ff/core/Buffer.mjs

@@ -106,7 +106,7 @@ return (new DataView((shared_
 }
 
 export function fromByteList_(array_) {
-return (new DataView(Uint8Array(array_).buffer))
+return (new DataView((new Uint8Array(array_)).buffer))
 }
 
 export function fromBufferList_(array_) {
@@ -140,11 +140,20 @@ return (new DataView(arrayBuffer_))
 export function fromBase64_(base64_) {
 const binaryString_ = atob(base64_);
 const bytes_ = Uint8Array.from(binaryString_, ((char_) => {
-return char_.charCodeAt(0)
+return char_.codePointAt(0)
 }));
 return (new DataView(bytes_.buffer))
 }
 
+export function fromLetter16_(letters_) {
+const buffer_ = ff_core_Buffer.new_((letters_.length >>> 1), false);
+for(let for_i = 0, for_e = ff_core_Buffer.Buffer_size(buffer_); for_i < for_e; for_i++) {
+const i_ = for_i;
+ff_core_Buffer.Buffer_setUint8(buffer_, i_, ff_core_Int.Int_bitOr(ff_core_Int.Int_bitLeft(((ff_core_String.String_grab(letters_, ff_core_Int.Int_bitLeft(i_, 1)) & 0x1f) - 0x8), 4), ((ff_core_String.String_grab(letters_, ff_core_Int.Int_bitOr(ff_core_Int.Int_bitLeft(i_, 1), 1)) & 0x1f) - 0x8)))
+};
+return buffer_
+}
+
 export async function new_$(size_, shared_ = false, $task) {
 return (new DataView((shared_
 ? (new SharedArrayBuffer(size_))
@@ -152,7 +161,7 @@ return (new DataView((shared_
 }
 
 export async function fromByteList_$(array_, $task) {
-return (new DataView(Uint8Array(array_).buffer))
+return (new DataView((new Uint8Array(array_)).buffer))
 }
 
 export async function fromBufferList_$(array_, $task) {
@@ -186,11 +195,20 @@ return (new DataView(arrayBuffer_))
 export async function fromBase64_$(base64_, $task) {
 const binaryString_ = atob(base64_);
 const bytes_ = Uint8Array.from(binaryString_, ((char_) => {
-return char_.charCodeAt(0)
+return char_.codePointAt(0)
 }));
 return (new DataView(bytes_.buffer))
 }
 
+export async function fromLetter16_$(letters_, $task) {
+const buffer_ = ff_core_Buffer.new_((letters_.length >>> 1), false);
+for(let for_i = 0, for_e = ff_core_Buffer.Buffer_size(buffer_); for_i < for_e; for_i++) {
+const i_ = for_i;
+ff_core_Buffer.Buffer_setUint8(buffer_, i_, ff_core_Int.Int_bitOr(ff_core_Int.Int_bitLeft(((ff_core_String.String_grab(letters_, ff_core_Int.Int_bitLeft(i_, 1)) & 0x1f) - 0x8), 4), ((ff_core_String.String_grab(letters_, ff_core_Int.Int_bitOr(ff_core_Int.Int_bitLeft(i_, 1), 1)) & 0x1f) - 0x8)))
+};
+return buffer_
+}
+
 export function Buffer_grabUint64(self_, byteOffset_, littleEndian_ = true) {
 const high_ = self_.getUint32((byteOffset_ + (littleEndian_
 ? 4
@@ -333,7 +351,7 @@ TextDecoder.ffSingleton.decode(self_)
 return (new TextDecoder()).decode(self_)
 }
 
-export function Buffer_toByteArray(self_) {
+export function Buffer_toByteList(self_) {
 return [...(new Uint8Array(self_.buffer, self_.byteOffset, self_.byteLength))]
 }
 
@@ -348,10 +366,22 @@ return hex_
 
 export function Buffer_toBase64(self_) {
 const view_ = (new Uint8Array(self_.buffer, self_.byteOffset, self_.byteLength));
-const binaryString_ = (new TextDecoder("latin1")).decode(view_);
+const binaryString_ = Array.from(view_, ((byte_) => {
+return String.fromCodePoint(byte_)
+})).join("");
 return btoa(binaryString_)
 }
 
+export function Buffer_toLetter16(self_) {
+const result_ = ff_core_Buffer.new_(ff_core_Int.Int_bitLeft(ff_core_Buffer.Buffer_size(self_), 1), false);
+for(let for_i = 0, for_e = ff_core_Buffer.Buffer_size(self_); for_i < for_e; for_i++) {
+const i_ = for_i;
+const b_ = ff_core_Buffer.Buffer_grabUint8(self_, i_);
+ff_core_Buffer.Buffer_setUint16(result_, ff_core_Int.Int_bitLeft(i_, 1), ff_core_Int.Int_bitOr((((b_ >>> 4) & 0xf) + 0x68), ff_core_Int.Int_bitLeft(((b_ & 0xf) + 0x68), 8)), true)
+};
+return ff_core_Buffer.Buffer_toString(result_, "utf8")
+}
+
 export async function Buffer_grabUint64$(self_, byteOffset_, littleEndian_ = true, $task) {
 const high_ = self_.getUint32((byteOffset_ + (littleEndian_
 ? 4
@@ -494,7 +524,7 @@ TextDecoder.ffSingleton.decode(self_)
 return (new TextDecoder()).decode(self_)
 }
 
-export async function Buffer_toByteArray$(self_, $task) {
+export async function Buffer_toByteList$(self_, $task) {
 return [...(new Uint8Array(self_.buffer, self_.byteOffset, self_.byteLength))]
 }
 
@@ -509,10 +539,22 @@ return hex_
 
 export async function Buffer_toBase64$(self_, $task) {
 const view_ = (new Uint8Array(self_.buffer, self_.byteOffset, self_.byteLength));
-const binaryString_ = (new TextDecoder("latin1")).decode(view_);
+const binaryString_ = Array.from(view_, ((byte_) => {
+return String.fromCodePoint(byte_)
+})).join("");
 return btoa(binaryString_)
 }
 
+export async function Buffer_toLetter16$(self_, $task) {
+const result_ = ff_core_Buffer.new_(ff_core_Int.Int_bitLeft(ff_core_Buffer.Buffer_size(self_), 1), false);
+for(let for_i = 0, for_e = ff_core_Buffer.Buffer_size(self_); for_i < for_e; for_i++) {
+const i_ = for_i;
+const b_ = ff_core_Buffer.Buffer_grabUint8(self_, i_);
+ff_core_Buffer.Buffer_setUint16(result_, ff_core_Int.Int_bitLeft(i_, 1), ff_core_Int.Int_bitOr((((b_ >>> 4) & 0xf) + 0x68), ff_core_Int.Int_bitLeft(((b_ & 0xf) + 0x68), 8)), true)
+};
+return ff_core_Buffer.Buffer_toString(result_, "utf8")
+}
+
 export const ff_core_Show_Show$ff_core_Buffer_Buffer = {
 show_(value_) {
 return ((`Buffer.fromHex("` + ff_core_Buffer.Buffer_toHex(value_)) + `")`)
@@ -623,5 +665,3 @@ return ordering_
 }
 }
 };
-
-