firefly-compiler 0.4.20 → 0.4.21

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

@@ -158,29 +158,17 @@ const compilerModulePath_ = ((ff_core_Equal.notEquals_(emitTarget_, ff_compiler_
 ? ff_core_Option.Some(ff_core_Path.Path_slash(ff_core_Path.Path_slash(ff_core_Path.Path_slash(ff_core_Path.Path_slash(fireflyPath_, "output"), "js"), "ff"), "compiler/Builder.mjs"))
 : ff_core_Option.None());
 const targetName_ = (((_1) => {
-{
 if(_1.EmitBuild) {
 return "build"
-return
 }
-}
-{
 if(_1.EmitNode) {
 return "node"
-return
-}
 }
-{
 if(_1.EmitBrowser) {
 return "browser"
-return
 }
-}
-{
 if(_1.EmitExecutable) {
 return "executable"
-return
-}
 }
 }))(emitTarget_);
 ff_compiler_Builder.build_(system_, emitTarget_, mainPackagePair_, mainFile_, (((_c) => {
@@ -188,9 +176,7 @@ return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.pac
 }))(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)
 }
 function runCommand_(command_) {
-{
 const command_a = command_;
-{
 if(command_a.RunCommand) {
 const mainFile_ = command_a.mainPath_;
 const arguments_ = command_a.argument_;
@@ -201,8 +187,6 @@ buildScript_(localMainFile_, resolvedDependencies_.mainPackagePair_, ff_compiler
 ff_compiler_Main.importAndRun_(fireflyPath_, "node", resolvedDependencies_.mainPackagePair_, localMainFile_, arguments_)
 return
 }
-}
-{
 if(command_a.BrowserCommand) {
 const mainFile_ = command_a.mainPath_;
 const resolvedDependencies_ = ff_compiler_Dependencies.process_(ff_core_NodeSystem.NodeSystem_httpClient(system_), ff_core_NodeSystem.NodeSystem_path(system_, (mainFile_ + ".ff")));
@@ -212,8 +196,6 @@ buildScript_(mainFile_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEm
 ff_compiler_Main.bundleForBrowser_(system_, resolvedDependencies_.mainPackagePair_, localMainFile_)
 return
 }
-}
-{
 if(command_a.BuildCommand) {
 const mainFile_ = command_a.mainPath_;
 const resolvedDependencies_ = ff_compiler_Dependencies.process_(ff_core_NodeSystem.NodeSystem_httpClient(system_), ff_core_NodeSystem.NodeSystem_path(system_, (mainFile_ + ".ff")));
@@ -225,30 +207,26 @@ ff_compiler_Main.bundleForPkg_(system_, resolvedDependencies_.mainPackagePair_,
 ff_compiler_Main.importAndRun_(fireflyPath_, "build", resolvedDependencies_.mainPackagePair_, localMainFile_, [])
 return
 }
-}
-{
 if(command_a.CheckCommand) {
 const filePath_ = command_a.filePath_;
-ff_compiler_Builder.check_(system_, fireflyPath_, ff_core_NodeSystem.NodeSystem_path(system_, filePath_), ff_core_Map.empty_(), ff_compiler_LspHook.disabled_(), true)
-return
+const errors_ = ff_compiler_Builder.check_(system_, fireflyPath_, ff_core_NodeSystem.NodeSystem_path(system_, filePath_), ff_core_Option.None(), ff_core_Map.empty_(), ff_compiler_LspHook.disabled_(), true);
+if((!ff_core_List.List_isEmpty(errors_))) {
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileErrors(errors_), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors)})
 }
+return
 }
-{
 if(command_a.BootstrapCommand) {
 const workingDirectory_ = ff_core_NodeSystem.NodeSystem_path(system_, ".");
 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_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)
 return
 }
 }
-}
-}
-ff_core_Try.Try_grab(ff_core_Try.Try_catch(ff_core_Try.Try_catch(ff_core_Core.try_((() => {
+ff_core_Try.Try_grab(ff_core_Try.Try_catch(ff_core_Try.Try_catch(ff_core_Try.Try_catch(ff_core_Core.try_((() => {
 const command_ = ff_compiler_Main.parseCommandLine_(ff_core_NodeSystem.NodeSystem_arguments(system_));
 return runCommand_(command_)
 })), ((_1, _2) => {
 {
 const message_ = _1.problem_;
-const error_ = _2;
 ff_core_Log.debug_(message_)
 return
 }
@@ -256,198 +234,127 @@ return
 {
 const at_ = _1.at_;
 const message_ = _1.message_;
-const error_ = _2;
 ff_core_Log.debug_(message_);
 ff_core_Log.debug_((((((" at " + ff_core_String.String_replace(at_.file_, "./", "")) + ":") + at_.line_) + ":") + at_.column_))
 return
 }
-}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError))
+}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError), ((_1, _2) => {
+{
+const errors_ = _1.errors_;
+ff_core_List.List_map(errors_, ((_1) => {
+{
+const at_ = _1.at_;
+const message_ = _1.message_;
+ff_core_Log.debug_(message_);
+return ff_core_Log.debug_((((((" at " + ff_core_String.String_replace(at_.file_, "./", "")) + ":") + at_.line_) + ":") + at_.column_))
+}
+}))
+return
+}
+}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors))
 }
 
 export function parseCommandLine_(arguments_) {
-{
 const arguments_a = arguments_;
-{
-if(arguments_a.length > 0) {
+if(arguments_a.length >= 1) {
 const mainFile_ = arguments_a[0];
 const mainArguments_ = arguments_a.slice(1);
 const _guard1 = ff_core_String.String_removeLast(mainFile_, ".ff");
 if(_guard1.Some) {
 const mainName_ = _guard1.value_;
 return ff_compiler_Main.RunCommand(mainName_, mainArguments_)
-return
-}
 }
 }
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "run") {
+if(arguments_a.length >= 1 && arguments_a[0] === "run") {
 const runArguments_ = arguments_a.slice(1);
 {
 const _1 = runArguments_;
-{
-if(_1.length > 0) {
+if(_1.length >= 1) {
 const mainFile_ = _1[0];
 const mainArguments_ = _1.slice(1);
 const _guard1 = ff_core_String.String_removeLast(mainFile_, ".ff");
 if(_guard1.Some) {
 const mainName_ = _guard1.value_;
 return ff_compiler_Main.RunCommand(mainName_, mainArguments_)
-return
-}
 }
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a Firefly file (.ff) as first argument to run." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
 }
 }
 return
 }
-}
-}
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "browser") {
+if(arguments_a.length >= 1 && arguments_a[0] === "browser") {
 const browserArguments_ = arguments_a.slice(1);
 {
 const _1 = browserArguments_;
-{
-if(_1.length > 0) {
-const mainFile_ = _1[0];
 if(_1.length === 1) {
+const mainFile_ = _1[0];
 const _guard1 = ff_core_String.String_removeLast(mainFile_, ".ff");
 if(_guard1.Some) {
 const mainName_ = _guard1.value_;
 return ff_compiler_Main.BrowserCommand(mainName_)
-return
-}
-}
 }
 }
-{
-if(_1.length > 0) {
-if(_1.length > 1) {
+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 browser." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
-}
-}
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a Firefly file (.ff) as the argument to browser." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
 }
 }
 return
 }
-}
-}
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "build") {
+if(arguments_a.length >= 1 && arguments_a[0] === "build") {
 const buildArguments_ = arguments_a.slice(1);
 {
 const _1 = buildArguments_;
-{
-if(_1.length > 0) {
-const mainFile_ = _1[0];
 if(_1.length === 1) {
+const mainFile_ = _1[0];
 const _guard1 = ff_core_String.String_removeLast(mainFile_, ".ff");
 if(_guard1.Some) {
 const mainName_ = _guard1.value_;
 return ff_compiler_Main.BuildCommand(mainName_)
-return
-}
 }
 }
-}
-{
-if(_1.length > 0) {
-if(_1.length > 1) {
+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 build." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
-}
-}
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a Firefly file (.ff) as the argument to build." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
 }
 }
 return
 }
-}
-}
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "check") {
+if(arguments_a.length >= 1 && arguments_a[0] === "check") {
 const checkArguments_ = arguments_a.slice(1);
 {
 const _1 = checkArguments_;
-{
-if(_1.length > 0) {
-const fileName_ = _1[0];
 if(_1.length === 1) {
-const _guard1 = ff_core_String.String_removeLast(fileName_, ".ff");
-if(_guard1.Some) {
+const fileName_ = _1[0];
 return ff_compiler_Main.CheckCommand(fileName_)
-return
-}
-}
 }
-}
-{
-if(_1.length > 0) {
-if(_1.length > 1) {
+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)})
-return
 }
+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)})
 }
 }
-{
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a Firefly file (.ff) as the argument to build." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
 return
 }
-}
-return
-}
-}
-}
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "bootstrap") {
-if(arguments_a.length > 1) {
-if(arguments_a.length === 2) {
+if(arguments_a.length === 2 && arguments_a[0] === "bootstrap") {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("bootstrap takes no arguments" + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
-}
-}
 }
-}
-}
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "bootstrap") {
-if(arguments_a.length === 1) {
+if(arguments_a.length === 1 && arguments_a[0] === "bootstrap") {
 return ff_compiler_Main.BootstrapCommand()
-return
-}
-}
-}
 }
-{
 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)})
-return
 }
-}
-{
-if(arguments_a.length > 0) {
+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)})
-return
-}
-}
 }
 }
 
@@ -495,29 +402,17 @@ const compilerModulePath_ = ((ff_core_Equal.notEquals_(emitTarget_, ff_compiler_
 ? ff_core_Option.Some((await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(fireflyPath_, "output", $task)), "js", $task)), "ff", $task)), "compiler/Builder.mjs", $task)))
 : ff_core_Option.None());
 const targetName_ = (((_1) => {
-{
 if(_1.EmitBuild) {
 return "build"
-return
 }
-}
-{
 if(_1.EmitNode) {
 return "node"
-return
-}
 }
-{
 if(_1.EmitBrowser) {
 return "browser"
-return
-}
 }
-{
 if(_1.EmitExecutable) {
 return "executable"
-return
-}
 }
 }))(emitTarget_);
 (await ff_compiler_Builder.build_$(system_, emitTarget_, mainPackagePair_, mainFile_, (((_c) => {
@@ -525,9 +420,7 @@ return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.pac
 }))(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, $task))
 }
 async function runCommand_$(command_, $task) {
-{
 const command_a = command_;
-{
 if(command_a.RunCommand) {
 const mainFile_ = command_a.mainPath_;
 const arguments_ = command_a.argument_;
@@ -538,8 +431,6 @@ const localMainFile_ = (await ff_core_Path.Path_base$((await ff_core_NodeSystem.
 (await ff_compiler_Main.importAndRun_$(fireflyPath_, "node", resolvedDependencies_.mainPackagePair_, localMainFile_, arguments_, $task))
 return
 }
-}
-{
 if(command_a.BrowserCommand) {
 const mainFile_ = command_a.mainPath_;
 const resolvedDependencies_ = (await ff_compiler_Dependencies.process_$((await ff_core_NodeSystem.NodeSystem_httpClient$(system_, $task)), (await ff_core_NodeSystem.NodeSystem_path$(system_, (mainFile_ + ".ff"), $task)), $task));
@@ -549,8 +440,6 @@ const localMainFile_ = (await ff_core_Path.Path_base$((await ff_core_NodeSystem.
 (await ff_compiler_Main.bundleForBrowser_$(system_, resolvedDependencies_.mainPackagePair_, localMainFile_, $task))
 return
 }
-}
-{
 if(command_a.BuildCommand) {
 const mainFile_ = command_a.mainPath_;
 const resolvedDependencies_ = (await ff_compiler_Dependencies.process_$((await ff_core_NodeSystem.NodeSystem_httpClient$(system_, $task)), (await ff_core_NodeSystem.NodeSystem_path$(system_, (mainFile_ + ".ff"), $task)), $task));
@@ -562,30 +451,26 @@ const localMainFile_ = (await ff_core_Path.Path_base$((await ff_core_NodeSystem.
 (await ff_compiler_Main.importAndRun_$(fireflyPath_, "build", resolvedDependencies_.mainPackagePair_, localMainFile_, [], $task))
 return
 }
-}
-{
 if(command_a.CheckCommand) {
 const filePath_ = command_a.filePath_;
-(await ff_compiler_Builder.check_$(system_, fireflyPath_, (await ff_core_NodeSystem.NodeSystem_path$(system_, filePath_, $task)), ff_core_Map.empty_(), ff_compiler_LspHook.disabled_(), true, $task))
-return
+const errors_ = (await ff_compiler_Builder.check_$(system_, fireflyPath_, (await ff_core_NodeSystem.NodeSystem_path$(system_, filePath_, $task)), ff_core_Option.None(), ff_core_Map.empty_(), ff_compiler_LspHook.disabled_(), true, $task));
+if((!ff_core_List.List_isEmpty(errors_))) {
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileErrors(errors_), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors)})
 }
+return
 }
-{
 if(command_a.BootstrapCommand) {
 const workingDirectory_ = (await ff_core_NodeSystem.NodeSystem_path$(system_, ".", $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_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, $task))
 return
 }
 }
-}
-}
-ff_core_Try.Try_grab(ff_core_Try.Try_catch(ff_core_Try.Try_catch((await ff_core_Core.try_$((async ($task) => {
+ff_core_Try.Try_grab(ff_core_Try.Try_catch(ff_core_Try.Try_catch(ff_core_Try.Try_catch((await ff_core_Core.try_$((async ($task) => {
 const command_ = ff_compiler_Main.parseCommandLine_((await ff_core_NodeSystem.NodeSystem_arguments$(system_, $task)));
 return (await runCommand_$(command_, $task))
 }), $task)), ((_1, _2) => {
 {
 const message_ = _1.problem_;
-const error_ = _2;
 ff_core_Log.debug_(message_)
 return
 }
@@ -593,198 +478,127 @@ return
 {
 const at_ = _1.at_;
 const message_ = _1.message_;
-const error_ = _2;
 ff_core_Log.debug_(message_);
 ff_core_Log.debug_((((((" at " + ff_core_String.String_replace(at_.file_, "./", "")) + ":") + at_.line_) + ":") + at_.column_))
 return
 }
-}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError))
+}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError), ((_1, _2) => {
+{
+const errors_ = _1.errors_;
+ff_core_List.List_map(errors_, ((_1) => {
+{
+const at_ = _1.at_;
+const message_ = _1.message_;
+ff_core_Log.debug_(message_);
+return ff_core_Log.debug_((((((" at " + ff_core_String.String_replace(at_.file_, "./", "")) + ":") + at_.line_) + ":") + at_.column_))
+}
+}))
+return
+}
+}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors))
 }
 
 export async function parseCommandLine_$(arguments_, $task) {
-{
 const arguments_a = arguments_;
-{
-if(arguments_a.length > 0) {
+if(arguments_a.length >= 1) {
 const mainFile_ = arguments_a[0];
 const mainArguments_ = arguments_a.slice(1);
 const _guard1 = ff_core_String.String_removeLast(mainFile_, ".ff");
 if(_guard1.Some) {
 const mainName_ = _guard1.value_;
 return ff_compiler_Main.RunCommand(mainName_, mainArguments_)
-return
 }
 }
-}
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "run") {
+if(arguments_a.length >= 1 && arguments_a[0] === "run") {
 const runArguments_ = arguments_a.slice(1);
 {
 const _1 = runArguments_;
-{
-if(_1.length > 0) {
+if(_1.length >= 1) {
 const mainFile_ = _1[0];
 const mainArguments_ = _1.slice(1);
 const _guard1 = ff_core_String.String_removeLast(mainFile_, ".ff");
 if(_guard1.Some) {
 const mainName_ = _guard1.value_;
 return ff_compiler_Main.RunCommand(mainName_, mainArguments_)
-return
-}
 }
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a Firefly file (.ff) as first argument to run." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
 }
 }
 return
 }
-}
-}
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "browser") {
+if(arguments_a.length >= 1 && arguments_a[0] === "browser") {
 const browserArguments_ = arguments_a.slice(1);
 {
 const _1 = browserArguments_;
-{
-if(_1.length > 0) {
-const mainFile_ = _1[0];
 if(_1.length === 1) {
+const mainFile_ = _1[0];
 const _guard1 = ff_core_String.String_removeLast(mainFile_, ".ff");
 if(_guard1.Some) {
 const mainName_ = _guard1.value_;
 return ff_compiler_Main.BrowserCommand(mainName_)
-return
-}
-}
 }
 }
-{
-if(_1.length > 0) {
-if(_1.length > 1) {
+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 browser." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
-}
-}
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a Firefly file (.ff) as the argument to browser." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
 }
 }
 return
 }
-}
-}
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "build") {
+if(arguments_a.length >= 1 && arguments_a[0] === "build") {
 const buildArguments_ = arguments_a.slice(1);
 {
 const _1 = buildArguments_;
-{
-if(_1.length > 0) {
-const mainFile_ = _1[0];
 if(_1.length === 1) {
+const mainFile_ = _1[0];
 const _guard1 = ff_core_String.String_removeLast(mainFile_, ".ff");
 if(_guard1.Some) {
 const mainName_ = _guard1.value_;
 return ff_compiler_Main.BuildCommand(mainName_)
-return
-}
-}
 }
 }
-{
-if(_1.length > 0) {
-if(_1.length > 1) {
+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 build." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
-}
-}
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a Firefly file (.ff) as the argument to build." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
 }
 }
 return
 }
-}
-}
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "check") {
+if(arguments_a.length >= 1 && arguments_a[0] === "check") {
 const checkArguments_ = arguments_a.slice(1);
 {
 const _1 = checkArguments_;
-{
-if(_1.length > 0) {
-const fileName_ = _1[0];
 if(_1.length === 1) {
-const _guard1 = ff_core_String.String_removeLast(fileName_, ".ff");
-if(_guard1.Some) {
+const fileName_ = _1[0];
 return ff_compiler_Main.CheckCommand(fileName_)
-return
-}
-}
 }
-}
-{
-if(_1.length > 0) {
-if(_1.length > 1) {
+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)})
-return
-}
 }
-}
-{
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("You must specify a Firefly file (.ff) as the argument to build." + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
+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)})
 }
 }
 return
 }
-}
-}
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "bootstrap") {
-if(arguments_a.length > 1) {
-if(arguments_a.length === 2) {
+if(arguments_a.length === 2 && arguments_a[0] === "bootstrap") {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Main.CommandLineError(("bootstrap takes no arguments" + ff_compiler_Main.usageString_)), ff_compiler_Main.ff_core_Any_HasAnyTag$ff_compiler_Main_CommandLineError)})
-return
-}
-}
 }
-}
-}
-{
-if(arguments_a.length > 0) {
-if(arguments_a[0] === "bootstrap") {
-if(arguments_a.length === 1) {
+if(arguments_a.length === 1 && arguments_a[0] === "bootstrap") {
 return ff_compiler_Main.BootstrapCommand()
-return
-}
-}
-}
 }
-{
 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)})
-return
 }
-}
-{
-if(arguments_a.length > 0) {
+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)})
-return
-}
-}
 }
 }
 
@@ -859,280 +673,165 @@ return ff_core_Any.internalAnyTag_((("ff:compiler/Main.CommandLineError" + "[")
 
 export const ff_core_Show_Show$ff_compiler_Main_MainCommand = {
 show_(value_) {
-{
 const value_a = value_;
-{
 if(value_a.BootstrapCommand) {
 const z_ = value_a;
 return "BootstrapCommand"
-return
-}
 }
-{
 if(value_a.RunCommand) {
 const z_ = value_a;
 return ((((("RunCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.mainPath_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_List_List(ff_core_Show.ff_core_Show_Show$ff_core_String_String).show_(z_.argument_)) + ")")
-return
-}
 }
-{
 if(value_a.BrowserCommand) {
 const z_ = value_a;
 return ((("BrowserCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.mainPath_)) + ")")
-return
 }
-}
-{
 if(value_a.BuildCommand) {
 const z_ = value_a;
 return ((("BuildCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.mainPath_)) + ")")
-return
-}
 }
-{
 if(value_a.CheckCommand) {
 const z_ = value_a;
 return ((("CheckCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.filePath_)) + ")")
-return
-}
-}
 }
 },
 async show_$(value_, $task) {
-{
 const value_a = value_;
-{
 if(value_a.BootstrapCommand) {
 const z_ = value_a;
 return "BootstrapCommand"
-return
 }
-}
-{
 if(value_a.RunCommand) {
 const z_ = value_a;
 return ((((("RunCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.mainPath_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_List_List(ff_core_Show.ff_core_Show_Show$ff_core_String_String).show_(z_.argument_)) + ")")
-return
-}
 }
-{
 if(value_a.BrowserCommand) {
 const z_ = value_a;
 return ((("BrowserCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.mainPath_)) + ")")
-return
 }
-}
-{
 if(value_a.BuildCommand) {
 const z_ = value_a;
 return ((("BuildCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.mainPath_)) + ")")
-return
 }
-}
-{
 if(value_a.CheckCommand) {
 const z_ = value_a;
 return ((("CheckCommand" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.filePath_)) + ")")
-return
-}
-}
 }
 }
 };
 
 export const ff_core_Show_Show$ff_compiler_Main_CommandLineError = {
 show_(value_) {
-{
 const value_a = value_;
 {
 const z_ = value_a;
 return ((("CommandLineError" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.problem_)) + ")")
-return
-}
 }
 },
 async show_$(value_, $task) {
-{
 const value_a = value_;
 {
 const z_ = value_a;
 return ((("CommandLineError" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.problem_)) + ")")
-return
-}
 }
 }
 };
 
 export const ff_core_Equal_Equal$ff_compiler_Main_MainCommand = {
 equals_(x_, y_) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return true
-return
 }
-}
-{
-if(x_a.RunCommand) {
+if(x_a.RunCommand && y_a.RunCommand) {
 const x_ = x_a;
-if(y_a.RunCommand) {
 const y_ = y_a;
 return ((x_.mainPath_ === y_.mainPath_) && ff_core_List.ff_core_Equal_Equal$ff_core_List_List(ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String).equals_(x_.argument_, y_.argument_))
-return
-}
 }
-}
-{
-if(x_a.BrowserCommand) {
+if(x_a.BrowserCommand && y_a.BrowserCommand) {
 const x_ = x_a;
-if(y_a.BrowserCommand) {
 const y_ = y_a;
 return (x_.mainPath_ === y_.mainPath_)
-return
-}
 }
-}
-{
-if(x_a.BuildCommand) {
+if(x_a.BuildCommand && y_a.BuildCommand) {
 const x_ = x_a;
-if(y_a.BuildCommand) {
 const y_ = y_a;
 return (x_.mainPath_ === y_.mainPath_)
-return
-}
 }
-}
-{
-if(x_a.CheckCommand) {
+if(x_a.CheckCommand && y_a.CheckCommand) {
 const x_ = x_a;
-if(y_a.CheckCommand) {
 const y_ = y_a;
 return (x_.filePath_ === y_.filePath_)
-return
-}
-}
 }
 {
 return false
-return
-}
 }
 },
 async equals_$(x_, y_, $task) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return true
-return
 }
-}
-{
-if(x_a.RunCommand) {
+if(x_a.RunCommand && y_a.RunCommand) {
 const x_ = x_a;
-if(y_a.RunCommand) {
 const y_ = y_a;
 return ((x_.mainPath_ === y_.mainPath_) && ff_core_List.ff_core_Equal_Equal$ff_core_List_List(ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String).equals_(x_.argument_, y_.argument_))
-return
-}
 }
-}
-{
-if(x_a.BrowserCommand) {
+if(x_a.BrowserCommand && y_a.BrowserCommand) {
 const x_ = x_a;
-if(y_a.BrowserCommand) {
 const y_ = y_a;
 return (x_.mainPath_ === y_.mainPath_)
-return
 }
-}
-}
-{
-if(x_a.BuildCommand) {
+if(x_a.BuildCommand && y_a.BuildCommand) {
 const x_ = x_a;
-if(y_a.BuildCommand) {
 const y_ = y_a;
 return (x_.mainPath_ === y_.mainPath_)
-return
 }
-}
-}
-{
-if(x_a.CheckCommand) {
+if(x_a.CheckCommand && y_a.CheckCommand) {
 const x_ = x_a;
-if(y_a.CheckCommand) {
 const y_ = y_a;
 return (x_.filePath_ === y_.filePath_)
-return
-}
-}
 }
 {
 return false
-return
-}
 }
 }
 };
 
 export const ff_core_Equal_Equal$ff_compiler_Main_CommandLineError = {
 equals_(x_, y_) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return true
-return
-}
 }
 {
 return (x_.problem_ === y_.problem_)
-return
-}
 }
 },
 async equals_$(x_, y_, $task) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return true
-return
-}
 }
 {
 return (x_.problem_ === y_.problem_)
-return
-}
 }
 }
 };
 
 export const ff_core_Ordering_Order$ff_compiler_Main_MainCommand = {
 compare_(x_, y_) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return ff_core_Ordering.OrderingSame()
-return
-}
 }
-{
-if(x_a.RunCommand) {
+if(x_a.RunCommand && y_a.RunCommand) {
 const x_ = x_a;
-if(y_a.RunCommand) {
 const y_ = y_a;
 const mainPathOrdering_ = ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String.compare_(x_.mainPath_, y_.mainPath_);
 if((mainPathOrdering_ !== ff_core_Ordering.OrderingSame())) {
@@ -1147,12 +846,8 @@ return ff_core_Ordering.OrderingSame()
 }
 return
 }
-}
-}
-{
-if(x_a.BrowserCommand) {
+if(x_a.BrowserCommand && y_a.BrowserCommand) {
 const x_ = x_a;
-if(y_a.BrowserCommand) {
 const y_ = y_a;
 const mainPathOrdering_ = ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String.compare_(x_.mainPath_, y_.mainPath_);
 if((mainPathOrdering_ !== ff_core_Ordering.OrderingSame())) {
@@ -1162,12 +857,8 @@ return ff_core_Ordering.OrderingSame()
 }
 return
 }
-}
-}
-{
-if(x_a.BuildCommand) {
+if(x_a.BuildCommand && y_a.BuildCommand) {
 const x_ = x_a;
-if(y_a.BuildCommand) {
 const y_ = y_a;
 const mainPathOrdering_ = ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String.compare_(x_.mainPath_, y_.mainPath_);
 if((mainPathOrdering_ !== ff_core_Ordering.OrderingSame())) {
@@ -1177,12 +868,8 @@ return ff_core_Ordering.OrderingSame()
 }
 return
 }
-}
-}
-{
-if(x_a.CheckCommand) {
+if(x_a.CheckCommand && y_a.CheckCommand) {
 const x_ = x_a;
-if(y_a.CheckCommand) {
 const y_ = y_a;
 const filePathOrdering_ = ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String.compare_(x_.filePath_, y_.filePath_);
 if((filePathOrdering_ !== ff_core_Ordering.OrderingSame())) {
@@ -1192,64 +879,36 @@ return ff_core_Ordering.OrderingSame()
 }
 return
 }
-}
-}
 {
 function number_(z_) {
-{
 const z_a = z_;
-{
 if(z_a.BootstrapCommand) {
 return 0
-return
 }
-}
-{
 if(z_a.RunCommand) {
 return 1
-return
-}
 }
-{
 if(z_a.BrowserCommand) {
 return 2
-return
-}
 }
-{
 if(z_a.BuildCommand) {
 return 3
-return
 }
-}
-{
 if(z_a.CheckCommand) {
 return 4
-return
-}
-}
 }
 }
 return ff_core_Ordering.ff_core_Ordering_Order$ff_core_Int_Int.compare_(number_(x_), number_(y_))
-return
-}
 }
 },
 async compare_$(x_, y_, $task) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return ff_core_Ordering.OrderingSame()
-return
-}
 }
-{
-if(x_a.RunCommand) {
+if(x_a.RunCommand && y_a.RunCommand) {
 const x_ = x_a;
-if(y_a.RunCommand) {
 const y_ = y_a;
 const mainPathOrdering_ = ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String.compare_(x_.mainPath_, y_.mainPath_);
 if((mainPathOrdering_ !== ff_core_Ordering.OrderingSame())) {
@@ -1264,12 +923,8 @@ return ff_core_Ordering.OrderingSame()
 }
 return
 }
-}
-}
-{
-if(x_a.BrowserCommand) {
+if(x_a.BrowserCommand && y_a.BrowserCommand) {
 const x_ = x_a;
-if(y_a.BrowserCommand) {
 const y_ = y_a;
 const mainPathOrdering_ = ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String.compare_(x_.mainPath_, y_.mainPath_);
 if((mainPathOrdering_ !== ff_core_Ordering.OrderingSame())) {
@@ -1279,12 +934,8 @@ return ff_core_Ordering.OrderingSame()
 }
 return
 }
-}
-}
-{
-if(x_a.BuildCommand) {
+if(x_a.BuildCommand && y_a.BuildCommand) {
 const x_ = x_a;
-if(y_a.BuildCommand) {
 const y_ = y_a;
 const mainPathOrdering_ = ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String.compare_(x_.mainPath_, y_.mainPath_);
 if((mainPathOrdering_ !== ff_core_Ordering.OrderingSame())) {
@@ -1294,12 +945,8 @@ return ff_core_Ordering.OrderingSame()
 }
 return
 }
-}
-}
-{
-if(x_a.CheckCommand) {
+if(x_a.CheckCommand && y_a.CheckCommand) {
 const x_ = x_a;
-if(y_a.CheckCommand) {
 const y_ = y_a;
 const filePathOrdering_ = ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String.compare_(x_.filePath_, y_.filePath_);
 if((filePathOrdering_ !== ff_core_Ordering.OrderingSame())) {
@@ -1309,62 +956,36 @@ return ff_core_Ordering.OrderingSame()
 }
 return
 }
-}
-}
 {
 function number_(z_) {
-{
 const z_a = z_;
-{
 if(z_a.BootstrapCommand) {
 return 0
-return
-}
 }
-{
 if(z_a.RunCommand) {
 return 1
-return
 }
-}
-{
 if(z_a.BrowserCommand) {
 return 2
-return
-}
 }
-{
 if(z_a.BuildCommand) {
 return 3
-return
-}
 }
-{
 if(z_a.CheckCommand) {
 return 4
-return
-}
-}
 }
 }
 return ff_core_Ordering.ff_core_Ordering_Order$ff_core_Int_Int.compare_(number_(x_), number_(y_))
-return
-}
 }
 }
 };
 
 export const ff_core_Ordering_Order$ff_compiler_Main_CommandLineError = {
 compare_(x_, y_) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return ff_core_Ordering.OrderingSame()
-return
-}
 }
 {
 const problemOrdering_ = ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String.compare_(x_.problem_, y_.problem_);
@@ -1375,18 +996,12 @@ return ff_core_Ordering.OrderingSame()
 }
 return
 }
-}
 },
 async compare_$(x_, y_, $task) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return ff_core_Ordering.OrderingSame()
-return
-}
 }
 {
 const problemOrdering_ = ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String.compare_(x_.problem_, y_.problem_);
@@ -1398,15 +1013,12 @@ return ff_core_Ordering.OrderingSame()
 return
 }
 }
-}
 };
 
 export const ff_core_Serializable_Serializable$ff_compiler_Main_MainCommand = {
 serializeUsing_(serialization_, value_) {
-{
 const serialization_a = serialization_;
 const value_a = value_;
-{
 if(value_a.BootstrapCommand) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 33), 0);
@@ -1415,8 +1027,6 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 0
 serialization_.offset_ += 1
 return
 }
-}
-{
 if(value_a.RunCommand) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 27), 0);
@@ -1427,8 +1037,6 @@ ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.ser
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_List_List(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).serializeUsing_(serialization_, v_.argument_)
 return
 }
-}
-{
 if(value_a.BrowserCommand) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 31), 0);
@@ -1438,8 +1046,6 @@ serialization_.offset_ += 1;
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.serializeUsing_(serialization_, v_.mainPath_)
 return
 }
-}
-{
 if(value_a.BuildCommand) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
@@ -1449,8 +1055,6 @@ 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);
@@ -1460,60 +1064,40 @@ serialization_.offset_ += 1;
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.serializeUsing_(serialization_, v_.filePath_)
 return
 }
-}
-}
 },
 deserializeUsing_(serialization_) {
 const variantIndex_ = ff_core_Buffer.Buffer_grabUint8(serialization_.buffer_, serialization_.offset_);
 serialization_.offset_ += 1;
 {
 const _1 = variantIndex_;
-{
 if(_1 === 0) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 33), 0);
 return ff_compiler_Main.BootstrapCommand()
-return
-}
 }
-{
 if(_1 === 1) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 27), 0);
 return ff_compiler_Main.RunCommand(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.deserializeUsing_(serialization_), ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_List_List(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).deserializeUsing_(serialization_))
-return
 }
-}
-{
 if(_1 === 2) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 31), 0);
 return ff_compiler_Main.BrowserCommand(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.deserializeUsing_(serialization_))
-return
-}
 }
-{
 if(_1 === 3) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 return ff_compiler_Main.BuildCommand(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.deserializeUsing_(serialization_))
-return
 }
-}
-{
 if(_1 === 4) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 return ff_compiler_Main.CheckCommand(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.deserializeUsing_(serialization_))
-return
-}
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serializable.DeserializationChecksumException(), ff_core_Serializable.ff_core_Any_HasAnyTag$ff_core_Serializable_DeserializationChecksumException)})
-return
 }
 }
 },
 async serializeUsing_$(serialization_, value_, $task) {
-{
 const serialization_a = serialization_;
 const value_a = value_;
-{
 if(value_a.BootstrapCommand) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 33), 0);
@@ -1522,8 +1106,6 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 0
 serialization_.offset_ += 1
 return
 }
-}
-{
 if(value_a.RunCommand) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 27), 0);
@@ -1534,8 +1116,6 @@ ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.ser
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_List_List(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).serializeUsing_(serialization_, v_.argument_)
 return
 }
-}
-{
 if(value_a.BrowserCommand) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 31), 0);
@@ -1545,8 +1125,6 @@ serialization_.offset_ += 1;
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.serializeUsing_(serialization_, v_.mainPath_)
 return
 }
-}
-{
 if(value_a.BuildCommand) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
@@ -1556,8 +1134,6 @@ 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);
@@ -1567,52 +1143,34 @@ serialization_.offset_ += 1;
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.serializeUsing_(serialization_, v_.filePath_)
 return
 }
-}
-}
 },
 async deserializeUsing_$(serialization_, $task) {
 const variantIndex_ = ff_core_Buffer.Buffer_grabUint8(serialization_.buffer_, serialization_.offset_);
 serialization_.offset_ += 1;
 {
 const _1 = variantIndex_;
-{
 if(_1 === 0) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 33), 0);
 return ff_compiler_Main.BootstrapCommand()
-return
 }
-}
-{
 if(_1 === 1) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 27), 0);
 return ff_compiler_Main.RunCommand(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.deserializeUsing_(serialization_), ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_List_List(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).deserializeUsing_(serialization_))
-return
-}
 }
-{
 if(_1 === 2) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 31), 0);
 return ff_compiler_Main.BrowserCommand(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.deserializeUsing_(serialization_))
-return
-}
 }
-{
 if(_1 === 3) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 return ff_compiler_Main.BuildCommand(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.deserializeUsing_(serialization_))
-return
 }
-}
-{
 if(_1 === 4) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 return ff_compiler_Main.CheckCommand(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.deserializeUsing_(serialization_))
-return
-}
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serializable.DeserializationChecksumException(), ff_core_Serializable.ff_core_Any_HasAnyTag$ff_core_Serializable_DeserializationChecksumException)})
-return
 }
 }
 }
@@ -1620,7 +1178,6 @@ return
 
 export const ff_core_Serializable_Serializable$ff_compiler_Main_CommandLineError = {
 serializeUsing_(serialization_, value_) {
-{
 const serialization_a = serialization_;
 const value_a = value_;
 {
@@ -1632,28 +1189,22 @@ serialization_.offset_ += 1;
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.serializeUsing_(serialization_, v_.problem_)
 return
 }
-}
 },
 deserializeUsing_(serialization_) {
 const variantIndex_ = ff_core_Buffer.Buffer_grabUint8(serialization_.buffer_, serialization_.offset_);
 serialization_.offset_ += 1;
 {
 const _1 = variantIndex_;
-{
 if(_1 === 0) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 33), 0);
 return ff_compiler_Main.CommandLineError(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.deserializeUsing_(serialization_))
-return
-}
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serializable.DeserializationChecksumException(), ff_core_Serializable.ff_core_Any_HasAnyTag$ff_core_Serializable_DeserializationChecksumException)})
-return
 }
 }
 },
 async serializeUsing_$(serialization_, value_, $task) {
-{
 const serialization_a = serialization_;
 const value_a = value_;
 {
@@ -1665,23 +1216,18 @@ serialization_.offset_ += 1;
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.serializeUsing_(serialization_, v_.problem_)
 return
 }
-}
 },
 async deserializeUsing_$(serialization_, $task) {
 const variantIndex_ = ff_core_Buffer.Buffer_grabUint8(serialization_.buffer_, serialization_.offset_);
 serialization_.offset_ += 1;
 {
 const _1 = variantIndex_;
-{
 if(_1 === 0) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 33), 0);
 return ff_compiler_Main.CommandLineError(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.deserializeUsing_(serialization_))
-return
-}
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serializable.DeserializationChecksumException(), ff_core_Serializable.ff_core_Any_HasAnyTag$ff_core_Serializable_DeserializationChecksumException)})
-return
 }
 }
 }