firefly-compiler 0.5.35 → 0.5.37

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

@@ -46,6 +46,8 @@ import * as ff_core_Int from "../../ff/core/Int.mjs"
 
 import * as ff_core_IntMap from "../../ff/core/IntMap.mjs"
 
+import * as ff_core_Js from "../../ff/core/Js.mjs"
+
 import * as ff_core_JsSystem from "../../ff/core/JsSystem.mjs"
 
 import * as ff_core_JsValue from "../../ff/core/JsValue.mjs"
@@ -72,6 +74,8 @@ import * as ff_core_Pair from "../../ff/core/Pair.mjs"
 
 import * as ff_core_Path from "../../ff/core/Path.mjs"
 
+import * as ff_core_Queue from "../../ff/core/Queue.mjs"
+
 import * as ff_core_Random from "../../ff/core/Random.mjs"
 
 import * as ff_core_Serializable from "../../ff/core/Serializable.mjs"
@@ -94,8 +98,6 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
-import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
-
 // type JsImporter
 export function JsImporter(imports_) {
 return {imports_};
@@ -126,7 +128,7 @@ const n_ = ("import$" + ff_core_Map.Map_size(self_.imports_, ff_core_Ordering.ff
 self_.imports_ = ff_core_Map.Map_add(self_.imports_, url_, n_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 return n_
 }
-if(_1.Some) {
+{
 const n_ = _1.value_;
 return n_
 }
@@ -138,26 +140,26 @@ export function JsImporter_process(self_, at_, code_) {
 const space_ = ff_core_String.String_takeWhile(code_, ((c_) => {
 return (((((c_ === 32) || (c_ === 9)) || (c_ === 13)) || (c_ === 10)) || (c_ === 59))
 }));
-const rest_ = ff_core_String.String_dropFirst(code_, ff_core_String.String_size(space_));
+const rest_ = ff_core_String.String_dropFirst(code_, space_.length);
 if((!ff_core_String.String_startsWith(rest_, "import * as ", 0))) {
 return code_
 } else {
-const rest2_ = ff_core_String.String_dropFirst(rest_, ff_core_String.String_size("import * as "));
+const rest2_ = ff_core_String.String_dropFirst(rest_, "import * as ".length);
 const name_ = ff_core_String.String_takeWhile(rest2_, ((_w1) => {
 return ff_core_Char.Char_isAsciiLetterOrDigit(_w1)
 }));
-if((ff_core_String.String_size(name_) === 0)) {
+if((name_.length === 0)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Expected alias after \"import * as \""), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-const rest3_ = ff_core_String.String_dropFirst(rest2_, ff_core_String.String_size(name_));
+const rest3_ = ff_core_String.String_dropFirst(rest2_, name_.length);
 if((!ff_core_String.String_startsWith(rest3_, " from '", 0))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Expected \" from '\" after \"import * as ...\""), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-const rest4_ = ff_core_String.String_dropFirst(rest3_, ff_core_String.String_size(" from '"));
+const rest4_ = ff_core_String.String_dropFirst(rest3_, " from '".length);
 const url_ = ff_core_String.String_takeWhile(rest4_, ((_w1) => {
 return (_w1 !== 39)
 }));
-if((ff_core_String.String_size(url_) === 0)) {
+if((url_.length === 0)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Expected module name after \" from '\""), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
 if(ff_core_String.String_any(url_, ((_w1) => {
@@ -165,7 +167,7 @@ return (_w1 === 10)
 }))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Unclosed module name string"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-const rest5_ = ff_core_String.String_dropFirst(rest4_, (ff_core_String.String_size(url_) + 1));
+const rest5_ = ff_core_String.String_dropFirst(rest4_, (url_.length + 1));
 const importName_ = ff_compiler_JsImporter.JsImporter_add(self_, url_);
 return (((((space_ + "const ") + name_) + " = ") + importName_) + ff_compiler_JsImporter.JsImporter_process(self_, at_, rest5_))
 }
@@ -193,7 +195,7 @@ const n_ = ("import$" + ff_core_Map.Map_size(self_.imports_, ff_core_Ordering.ff
 self_.imports_ = ff_core_Map.Map_add(self_.imports_, url_, n_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 return n_
 }
-if(_1.Some) {
+{
 const n_ = _1.value_;
 return n_
 }
@@ -205,26 +207,26 @@ export async function JsImporter_process$(self_, at_, code_, $task) {
 const space_ = ff_core_String.String_takeWhile(code_, ((c_) => {
 return (((((c_ === 32) || (c_ === 9)) || (c_ === 13)) || (c_ === 10)) || (c_ === 59))
 }));
-const rest_ = ff_core_String.String_dropFirst(code_, ff_core_String.String_size(space_));
+const rest_ = ff_core_String.String_dropFirst(code_, space_.length);
 if((!ff_core_String.String_startsWith(rest_, "import * as ", 0))) {
 return code_
 } else {
-const rest2_ = ff_core_String.String_dropFirst(rest_, ff_core_String.String_size("import * as "));
+const rest2_ = ff_core_String.String_dropFirst(rest_, "import * as ".length);
 const name_ = ff_core_String.String_takeWhile(rest2_, ((_w1) => {
 return ff_core_Char.Char_isAsciiLetterOrDigit(_w1)
 }));
-if((ff_core_String.String_size(name_) === 0)) {
+if((name_.length === 0)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Expected alias after \"import * as \""), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-const rest3_ = ff_core_String.String_dropFirst(rest2_, ff_core_String.String_size(name_));
+const rest3_ = ff_core_String.String_dropFirst(rest2_, name_.length);
 if((!ff_core_String.String_startsWith(rest3_, " from '", 0))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Expected \" from '\" after \"import * as ...\""), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-const rest4_ = ff_core_String.String_dropFirst(rest3_, ff_core_String.String_size(" from '"));
+const rest4_ = ff_core_String.String_dropFirst(rest3_, " from '".length);
 const url_ = ff_core_String.String_takeWhile(rest4_, ((_w1) => {
 return (_w1 !== 39)
 }));
-if((ff_core_String.String_size(url_) === 0)) {
+if((url_.length === 0)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Expected module name after \" from '\""), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
 if(ff_core_String.String_any(url_, ((_w1) => {
@@ -232,7 +234,7 @@ return (_w1 === 10)
 }))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Unclosed module name string"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-const rest5_ = ff_core_String.String_dropFirst(rest4_, (ff_core_String.String_size(url_) + 1));
+const rest5_ = ff_core_String.String_dropFirst(rest4_, (url_.length + 1));
 const importName_ = ff_compiler_JsImporter.JsImporter_add(self_, url_);
 return (((((space_ + "const ") + name_) + " = ") + importName_) + ff_compiler_JsImporter.JsImporter_process(self_, at_, rest5_))
 }

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

@@ -50,6 +50,8 @@ import * as ff_core_Int from "../../ff/core/Int.mjs"
 
 import * as ff_core_IntMap from "../../ff/core/IntMap.mjs"
 
+import * as ff_core_Js from "../../ff/core/Js.mjs"
+
 import * as ff_core_JsSystem from "../../ff/core/JsSystem.mjs"
 
 import * as ff_core_JsValue from "../../ff/core/JsValue.mjs"
@@ -76,6 +78,8 @@ import * as ff_core_Pair from "../../ff/core/Pair.mjs"
 
 import * as ff_core_Path from "../../ff/core/Path.mjs"
 
+import * as ff_core_Queue from "../../ff/core/Queue.mjs"
+
 import * as ff_core_Random from "../../ff/core/Random.mjs"
 
 import * as ff_core_Serializable from "../../ff/core/Serializable.mjs"
@@ -98,8 +102,6 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
-import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
-
 // type LspHook
 export function LspHook(at_, definedAt_, insertIdentifier_, trackSymbols_, arrayOfResults_) {
 return {at_, definedAt_, insertIdentifier_, trackSymbols_, arrayOfResults_};
@@ -335,7 +337,7 @@ const symbol_ = hook_a.symbol_;
 const explicitType_ = hook_a.explicitType_;
 return "ResolveTypeHook(...)"
 }
-if(hook_a.ResolveVariantFieldHook) {
+{
 const symbol_ = hook_a.symbol_;
 const type_ = hook_a.type_;
 const commonField_ = hook_a.commonField_;
@@ -471,7 +473,7 @@ const symbol_ = hook_a.symbol_;
 const explicitType_ = hook_a.explicitType_;
 return "ResolveTypeHook(...)"
 }
-if(hook_a.ResolveVariantFieldHook) {
+{
 const symbol_ = hook_a.symbol_;
 const type_ = hook_a.type_;
 const commonField_ = hook_a.commonField_;
@@ -589,7 +591,7 @@ if(value_a.SType) {
 const z_ = value_a;
 return "SType"
 }
-if(value_a.SParameter) {
+{
 const z_ = value_a;
 return "SParameter"
 }
@@ -628,7 +630,7 @@ if(value_a.SType) {
 const z_ = value_a;
 return "SType"
 }
-if(value_a.SParameter) {
+{
 const z_ = value_a;
 return "SParameter"
 }
@@ -812,7 +814,7 @@ return 6
 if(z_a.SType) {
 return 7
 }
-if(z_a.SParameter) {
+{
 return 8
 }
 }
@@ -874,7 +876,7 @@ return 6
 if(z_a.SType) {
 return 7
 }
-if(z_a.SParameter) {
+{
 return 8
 }
 }
@@ -1014,7 +1016,7 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 7
 serialization_.offset_ += 1
 return
 }
-if(value_a.SParameter) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 30), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -1138,7 +1140,7 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 7
 serialization_.offset_ += 1
 return
 }
-if(value_a.SParameter) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 30), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);

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

@@ -70,6 +70,8 @@ import * as ff_core_Int from "../../ff/core/Int.mjs"
 
 import * as ff_core_IntMap from "../../ff/core/IntMap.mjs"
 
+import * as ff_core_Js from "../../ff/core/Js.mjs"
+
 import * as ff_core_JsSystem from "../../ff/core/JsSystem.mjs"
 
 import * as ff_core_JsValue from "../../ff/core/JsValue.mjs"
@@ -96,6 +98,8 @@ import * as ff_core_Pair from "../../ff/core/Pair.mjs"
 
 import * as ff_core_Path from "../../ff/core/Path.mjs"
 
+import * as ff_core_Queue from "../../ff/core/Queue.mjs"
+
 import * as ff_core_Random from "../../ff/core/Random.mjs"
 
 import * as ff_core_Serializable from "../../ff/core/Serializable.mjs"
@@ -118,8 +122,6 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
-import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
-
 // type MainCommand
 const BootstrapCommand$ = {BootstrapCommand: true};
 export function BootstrapCommand() {
@@ -173,7 +175,7 @@ return "node"
 if(_1.EmitBrowser) {
 return "browser"
 }
-if(_1.EmitExecutable) {
+{
 return "executable"
 }
 }))(emitTarget_);
@@ -224,7 +226,7 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 }
 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))
@@ -347,7 +349,7 @@ return ff_compiler_Main.CheckCommand(fileName_)
 if(_1.length >= 2) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must only specify a single argument to check." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
 }
-if(_1.length === 0) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a Firefly file (.ff) or directory as the argument to check." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
 }
 }
@@ -362,7 +364,7 @@ return ff_compiler_Main.BootstrapCommand()
 if(arguments_a.length === 0) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a command or a main file to run." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
 }
-if(arguments_a.length >= 1) {
+{
 const s_ = arguments_a[0];
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(((("Unknown command '" + s_) + "'") + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
 }
@@ -386,7 +388,19 @@ ff_core_BuildSystem.internalCallEsBuild_(browserCode_, mainJsFile_, file_, true,
 }
 
 export function importAndRun_(fireflyPath_, target_, packagePair_, mainFile_, arguments_) {
-throw new Error('Function importAndRun is missing on this target in sync context.');
+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")) {
+main_["$run$"](fireflyPath_.absolutePath_, arguments_);
+return true
+} else {
+return false
+}
 }
 
 export function prepareFireflyDirectory_(path_) {
@@ -399,7 +413,14 @@ ff_core_Path.Path_createDirectory(ff_core_Path.Path_slash(ff_core_Path.Path_slas
 }
 
 export function detectFireflyPath_(system_) {
-throw new Error('Function detectFireflyPath is missing on this target in sync context.');
+const url_ = import$0;
+const suffix_ = "/output/js/ff/compiler/Main.mjs";
+const moduleUrl_ = import.meta.url;
+if((!import.meta.url.endsWith(suffix_))) {
+throw (new Error(((("Expected module path to end with: " + suffix_) + ", but got: ") + moduleUrl_)))
+} else {
+return ff_core_Path.Path(url_.fileURLToPath((new URL(moduleUrl_.slice(0, (-suffix_.length))))))
+}
 }
 
 export async function main_$(system_, $task) {
@@ -421,7 +442,7 @@ return "node"
 if(_1.EmitBrowser) {
 return "browser"
 }
-if(_1.EmitExecutable) {
+{
 return "executable"
 }
 }))(emitTarget_);
@@ -472,7 +493,7 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 }
 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))
@@ -595,7 +616,7 @@ return ff_compiler_Main.CheckCommand(fileName_)
 if(_1.length >= 2) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must only specify a single argument to check." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
 }
-if(_1.length === 0) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a Firefly file (.ff) or directory as the argument to check." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
 }
 }
@@ -610,7 +631,7 @@ return ff_compiler_Main.BootstrapCommand()
 if(arguments_a.length === 0) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a command or a main file to run." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
 }
-if(arguments_a.length >= 1) {
+{
 const s_ = arguments_a[0];
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(((("Unknown command '" + s_) + "'") + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
 }
@@ -634,19 +655,19 @@ return (await ff_core_Path.Path_readStream$((await ff_core_NodeSystem.NodeSystem
 }
 
 export async function importAndRun_$(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') {
-            await main.$run$(fireflyPath_, arguments_);
-            return true;
-        } else {
-            return false;
-        }
-    
+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")) {
+main_["$run$"](fireflyPath_.absolutePath_, arguments_);
+return true
+} else {
+return false
+}
 }
 
 export async function prepareFireflyDirectory_$(path_, $task) {
@@ -659,15 +680,14 @@ if((!(await ff_core_Path.Path_exists$((await ff_core_Path.Path_slash$(path_, ".f
 }
 
 export async function detectFireflyPath_$(system_, $task) {
-
-        const url = import$0
-        const suffix = '/output/js/ff/compiler/Main.mjs'
-        const moduleUrl = import.meta.url
-        if(!import.meta.url.endsWith(suffix)) {
-            throw 'Expected module path to end with: ' + suffix + ", but got: " + moduleUrl;
-        }
-        return url.fileURLToPath(new URL(moduleUrl.slice(0, -suffix.length)))
-    
+const url_ = import$0;
+const suffix_ = "/output/js/ff/compiler/Main.mjs";
+const moduleUrl_ = import.meta.url;
+if((!import.meta.url.endsWith(suffix_))) {
+throw (new Error(((("Expected module path to end with: " + suffix_) + ", but got: ") + moduleUrl_)))
+} else {
+return ff_core_Path.Path(url_.fileURLToPath((new URL(moduleUrl_.slice(0, (-suffix_.length))))))
+}
 }
 
 
@@ -709,7 +729,7 @@ if(value_a.BuildCommand) {
 const z_ = value_a;
 return ((("BuildCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.mainPath_)) + ")")
 }
-if(value_a.CheckCommand) {
+{
 const z_ = value_a;
 return ((("CheckCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.filePath_)) + ")")
 }
@@ -732,7 +752,7 @@ if(value_a.BuildCommand) {
 const z_ = value_a;
 return ((("BuildCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.mainPath_)) + ")")
 }
-if(value_a.CheckCommand) {
+{
 const z_ = value_a;
 return ((("CheckCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.filePath_)) + ")")
 }
@@ -913,7 +933,7 @@ return 2
 if(z_a.BuildCommand) {
 return 3
 }
-if(z_a.CheckCommand) {
+{
 return 4
 }
 }
@@ -990,7 +1010,7 @@ return 2
 if(z_a.BuildCommand) {
 return 3
 }
-if(z_a.CheckCommand) {
+{
 return 4
 }
 }
@@ -1074,7 +1094,7 @@ serialization_.offset_ += 1;
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.serializeUsing_(serialization_, v_.mainPath_)
 return
 }
-if(value_a.CheckCommand) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -1153,7 +1173,7 @@ serialization_.offset_ += 1;
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.serializeUsing_(serialization_, v_.mainPath_)
 return
 }
-if(value_a.CheckCommand) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -1254,7 +1274,7 @@ 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}
+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,

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

@@ -46,6 +46,8 @@ import * as ff_core_Int from "../../ff/core/Int.mjs"
 
 import * as ff_core_IntMap from "../../ff/core/IntMap.mjs"
 
+import * as ff_core_Js from "../../ff/core/Js.mjs"
+
 import * as ff_core_JsSystem from "../../ff/core/JsSystem.mjs"
 
 import * as ff_core_JsValue from "../../ff/core/JsValue.mjs"
@@ -72,6 +74,8 @@ import * as ff_core_Pair from "../../ff/core/Pair.mjs"
 
 import * as ff_core_Path from "../../ff/core/Path.mjs"
 
+import * as ff_core_Queue from "../../ff/core/Queue.mjs"
+
 import * as ff_core_Random from "../../ff/core/Random.mjs"
 
 import * as ff_core_Serializable from "../../ff/core/Serializable.mjs"
@@ -94,8 +98,6 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
-import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
-
 // type ModuleCache
 export function ModuleCache(version_, parsedModules_, resolvedModules_, derivedModules_, inferredModules_, emittedModules_) {
 return {version_, parsedModules_, resolvedModules_, derivedModules_, inferredModules_, emittedModules_};
@@ -315,12 +317,12 @@ export function ModuleCache_cacheEmittedModule(self_, packagePaths_, packagePair
 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))) {
 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);
-ff_core_Try.Try_catchAny(ff_core_Core.try_((() => {
+try {
 body_(path_)
-})), ((error_) => {
+} catch(error_) {
 self_.emittedModules_ = ff_core_Map.Map_remove(self_.emittedModules_, ff_core_Path.Path_absolute(path_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 ff_core_Error.Error_rethrow(error_)
-}))
+}
 }
 }
 
@@ -488,12 +490,12 @@ export async function ModuleCache_cacheEmittedModule$(self_, packagePaths_, pack
 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))) {
 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);
-(await ff_core_Try.Try_catchAny$((await ff_core_Core.try_$((async ($task) => {
+try {
 (await body_(path_, $task))
-}), $task)), (async (error_, $task) => {
+} catch(error_) {
 self_.emittedModules_ = ff_core_Map.Map_remove(self_.emittedModules_, (await ff_core_Path.Path_absolute$(path_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 ff_core_Error.Error_rethrow(error_)
-}), $task))
+}
 }
 }