firefly-compiler 0.5.35 → 0.5.37

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

@@ -54,6 +54,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"
@@ -80,6 +82,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"
@@ -102,8 +106,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 Inference
 export function Inference(unification_, missing_, lspHook_) {
 return {unification_, missing_, lspHook_};
@@ -130,7 +132,7 @@ if(_1.TConstructor) {
 const name_ = _1.name_;
 return name_
 }
-if(_1.TVariable) {
+{
 const at_ = _1.at_;
 const i_ = _1.index_;
 return ff_compiler_Inference.fail_(c_.at_, ("Unexpected unification variable: $" + i_))
@@ -159,7 +161,7 @@ if(_1.TConstructor) {
 const name_ = _1.name_;
 return name_
 }
-if(_1.TVariable) {
+{
 const at_ = _1.at_;
 const i_ = _1.index_;
 return ff_compiler_Inference.fail_(c_.at_, ("Unexpected unification variable: $" + i_))
@@ -217,7 +219,7 @@ if((traitDefinition_.generics_.length !== definition_.typeArguments_.length)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(definition_.at_, ((((("Wrong number of type arguments for " + traitName_) + ", expected ") + (traitDefinition_.generics_.length - 1)) + ", got ") + (definition_.typeArguments_.length - 1))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
 const instantiationMap_ = ff_core_List.List_toMap(ff_core_List.List_zip(traitDefinition_.generics_, definition_.typeArguments_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
-for(let for_i = 0, for_a = traitDefinition_.methods_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = traitDefinition_.methods_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const traitMethod_ = for_a[for_i];
 const found_ = ff_core_List.List_filter(definition_.methods_, ((_w1) => {
 return (_w1.signature_.name_ === traitMethod_.name_)
@@ -225,7 +227,7 @@ return (_w1.signature_.name_ === traitMethod_.name_)
 if(ff_core_List.List_isEmpty(found_)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(definition_.at_, ("Missing instance method: " + traitMethod_.name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-for(let for_i = 1, for_a = found_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = found_, for_i = 1, for_l = for_a.length; for_i < for_l; for_i++) {
 const duplicateMethod_ = for_a[for_i];
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(duplicateMethod_.at_, ("Duplicated instance method: " + traitMethod_.name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
@@ -252,22 +254,19 @@ return ff_compiler_Syntax.Parameter(_c.at_, _c.mutable_, _c.name_, ff_compiler_U
 }
 }));
 const returnType_ = ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, traitMethodScheme_.signature_.returnType_);
-for(let for_i = Math.max(parameters_.length, 0), for_a = instanceFunction_.signature_.parameters_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = instanceFunction_.signature_.parameters_, for_i = Math.max(parameters_.length, 0), for_l = for_a.length; for_i < for_l; for_i++) {
 const instanceParameter_ = for_a[for_i];
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(instanceParameter_.at_, ("Unexpected parameter: " + instanceParameter_.name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-for(let for_i = Math.max(instanceFunction_.signature_.parameters_.length, 0), for_a = parameters_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = parameters_, for_i = Math.max(instanceFunction_.signature_.parameters_.length, 0), for_l = for_a.length; for_i < for_l; for_i++) {
 const traitParameter_ = for_a[for_i];
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(instanceFunction_.at_, ("Missing parameter: " + traitParameter_.name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-ff_core_List.List_each(ff_core_List.List_zip(parameters_, instanceFunction_.signature_.parameters_), ((_1) => {
-{
-const traitParameter_ = _1.first_;
-const instanceParameter_ = _1.second_;
+for(let for_a = parameters_, for_i = 0, for_l = for_a.length, for_a2 = instanceFunction_.signature_.parameters_, for_i2 = 0, for_l2 = for_a2.length; for_i < for_l && for_i2 < for_l2; for_i++, for_i2++) {
+const traitParameter_ = for_a[for_i];
+const instanceParameter_ = for_a2[for_i2];
 ff_compiler_Unification.Unification_unify(self_.unification_, instanceParameter_.valueType_.at_, traitParameter_.valueType_, instanceParameter_.valueType_)
-return
-}
-}));
+};
 ff_compiler_Unification.Unification_unify(self_.unification_, instanceFunction_.signature_.returnType_.at_, returnType_, instanceFunction_.signature_.returnType_);
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, instanceFunction_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, traitMethodScheme_.signature_.at_))) {
 const symbolHook_ = ff_compiler_LspHook.SymbolHook(instanceFunction_.signature_.name_, instanceFunction_.at_, traitMethodScheme_.signature_.at_);
@@ -300,12 +299,8 @@ const functions_ = ff_core_List.List_map(definition_.methods_, ((method_) => {
 const signature_ = (((_c) => {
 return ff_compiler_Syntax.Signature(_c.at_, _c.name_, _c.member_, [...definition_.generics_, ...method_.signature_.generics_], [...definition_.constraints_, ...method_.signature_.constraints_], [selfParameter_, ...method_.signature_.parameters_], _c.returnType_, _c.effect_)
 }))(method_.signature_);
-const body_ = ff_compiler_Syntax.Target_mapFirefly(method_.body_, ((lambda_) => {
-{
-const _1 = lambda_;
-{
-const _c = _1;
-return ff_compiler_Syntax.Lambda(_c.at_, _c.effect_, ff_core_List.List_map(lambda_.cases_, ((case_) => {
+const body_ = (((_c) => {
+return ff_compiler_Syntax.Lambda(_c.at_, _c.effect_, ff_core_List.List_map(method_.body_.cases_, ((case_) => {
 {
 const _1 = case_;
 {
@@ -314,10 +309,7 @@ return ff_compiler_Syntax.MatchCase(_c.at_, [ff_compiler_Syntax.PVariable(method
 }
 }
 })))
-return
-}
-}
-}));
+}))(method_.body_);
 const function_ = (((_c) => {
 return ff_compiler_Syntax.DFunction(_c.at_, signature_, body_)
 }))(method_);
@@ -360,10 +352,7 @@ return ff_compiler_Unification.Unification_withLocalInstances(self_.unification_
 const _1 = definition_;
 {
 const _c = _1;
-return ff_compiler_Syntax.DFunction(_c.at_, _c.signature_, ff_compiler_Syntax.Target_mapFirefly(definition_.body_, ((_w1) => {
-return ff_compiler_Inference.Inference_inferLambda(self_, environment2_, functionType_, _w1)
-})))
-return
+return ff_compiler_Syntax.DFunction(_c.at_, _c.signature_, ff_compiler_Inference.Inference_inferLambda(self_, environment2_, functionType_, definition_.body_))
 }
 }
 }))
@@ -561,7 +550,7 @@ return ff_compiler_Syntax.TConstructor(p_.at_, _c.name_, _c.generics_)
 }
 return
 }
-if(_1.TVariable) {
+{
 const t_ = _1;
 {
 const _1 = t_;
@@ -600,7 +589,7 @@ const headVariables_ = ff_compiler_Inference.Inference_inferPattern(self_, envir
 const tailVariables_ = ff_compiler_Inference.Inference_inferPattern(self_, environment_, listType_, tail_);
 return ff_core_Map.Map_addAll(headVariables_, tailVariables_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 }
-if(_1.PVariant) {
+{
 const at_ = _1.at_;
 const name_ = _1.name_;
 const patterns_ = _1.patterns_;
@@ -669,10 +658,12 @@ if(_1.EField) {
 const e_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, term_.at_)) {
-for(const for_o = hookRecordTypeBox_; for_o.Some;) {
-const _w1 = for_o.value_;
+{
+const if_o = hookRecordTypeBox_
+if(if_o.Some) {
+const _w1 = if_o.value_;
 _w1.value_ = ff_core_Option.Some(recordType_)
-break
+}
 }
 };
 const record_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, recordType_, e_.record_);
@@ -706,7 +697,7 @@ return (_w1.second_ === e_.field_)
 })), ((_w1) => {
 return _w1.first_
 })), ((index_) => {
-const t1_ = (typeArguments_[index_] ?? ff_core_List.internalGrab_(typeArguments_, index_));
+const t1_ = (typeArguments_[index_] ?? ff_core_List.List_grab(typeArguments_, index_));
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_);
 {
 const _1 = e_;
@@ -739,7 +730,7 @@ if((!instantiated_.scheme_.isVariable_)) {
 const signature_ = (((_c) => {
 return ff_compiler_Syntax.Signature(_c.at_, _c.name_, _c.member_, _c.generics_, _c.constraints_, ff_core_List.List_dropFirst(instantiated_.scheme_.signature_.parameters_, 1), _c.returnType_, _c.effect_)
 }))(instantiated_.scheme_.signature_);
-ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, recordType_, (instantiated_.scheme_.signature_.parameters_[0] ?? ff_core_List.internalGrab_(instantiated_.scheme_.signature_.parameters_, 0)).valueType_);
+ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, recordType_, (instantiated_.scheme_.signature_.parameters_[0] ?? ff_core_List.List_grab(instantiated_.scheme_.signature_.parameters_, 0)).valueType_);
 return ff_compiler_Inference.Inference_inferEtaExpansion(self_, environment_, expected_, e_.at_, signature_, term_)
 }
 }
@@ -755,7 +746,7 @@ return ff_compiler_Syntax.EField(_c.at_, instantiated_.scheme_.isNewtype_, recor
 }
 return
 }
-if(_1.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 }
@@ -764,7 +755,7 @@ return
 if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 return term_
 }
-if(_1.TVariable) {
+{
 const index_ = _1.index_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
@@ -1004,7 +995,6 @@ break
 }
 {
 
-break
 }
 } while(false);
 const lambda_ = ff_compiler_Inference.Inference_inferLambda(self_, environment_, expected_, l_);
@@ -1068,10 +1058,9 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 };
 const signature_ = scheme_.signature_;
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
-ff_core_List.List_each(ff_core_List.List_pairs(e_.arguments_), ((_1) => {
-{
-const i_ = _1.first_;
-const a_ = _1.second_;
+for(let for_a = e_.arguments_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
+const i_ = for_i;
+const a_ = for_a[for_i];
 const p_ = ff_core_List.List_find(signature_.parameters_, ((_w1) => {
 return (_w1.name_ === a_.name_)
 }));
@@ -1089,9 +1078,7 @@ return ff_compiler_Syntax.Argument(_c.at_, ff_core_Option.Some(f_.name_), _c.val
 }));
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferArgumentHook(self_.unification_, environment_, true, term_.at_, e_.name_, signature_.parameters_, arguments_, i_))
 }
-return
 }
-}))
 };
 const parameterNames_ = ff_core_List.List_map(signature_.parameters_, ((_w1) => {
 return _w1.name_
@@ -1166,7 +1153,7 @@ tailCall_: call_.tailCall_
 }
 return
 }
-if(_1.StaticCall) {
+{
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in the Inference phase")
 }
 }))(e_.target_);
@@ -1192,7 +1179,7 @@ return ff_compiler_Inference.Inference_inferFunctionCall(self_, environment_, ex
 }
 return
 }
-if(_1.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(variableAt_, ("No such function: " + x_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 }
@@ -1203,10 +1190,12 @@ if(_1.EField) {
 const f_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, f_.at_);
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, term_.at_)) {
-for(const for_o = hookRecordTypeBox_; for_o.Some;) {
-const _w1 = for_o.value_;
+{
+const if_o = hookRecordTypeBox_
+if(if_o.Some) {
+const _w1 = if_o.value_;
 _w1.value_ = ff_core_Option.Some(recordType_)
-break
+}
 }
 };
 const record_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, recordType_, f_.record_);
@@ -1236,7 +1225,7 @@ if(_1.Some) {
 const instantiated_ = _1.value_;
 return ff_compiler_Inference.Inference_inferLambdaCall(self_, environment_, expected_, e2_)
 }
-if(_1.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(f_.at_, ((("No such field " + f_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 }
@@ -1245,7 +1234,7 @@ return
 if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 return ff_compiler_Inference.Inference_inferLambdaCall(self_, environment_, expected_, e2_)
 }
-if(_1.TVariable) {
+{
 const index_ = _1.index_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(f_.at_, ((("No such field " + f_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
@@ -1331,7 +1320,7 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 }))
 return
 }
-if(_1.EAssignField) {
+{
 const e_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const record_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, recordType_, e_.record_);
@@ -1370,7 +1359,7 @@ if(_1.Some) {
 const instantiated_ = _1.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("Can't assign an immutable field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
-if(_1.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 }
@@ -1379,7 +1368,7 @@ return
 if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 return term_
 }
-if(_1.TVariable) {
+{
 const index_ = _1.index_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
@@ -1391,12 +1380,24 @@ return
 
 export function Inference_inferAssignment(self_, environment_, expected_, at_, operator_, value_, signature_) {
 const t_ = signature_.returnType_;
-if(((operator_ === "+") || (operator_ === "-"))) {
+const newValue_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, value_);
+if(((((operator_ === "+") || (operator_ === "-")) || (operator_ === "*")) || (operator_ === "/"))) {
+do {
+const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, t_);
+if(_1.TConstructor) {
+const name_ = _1.name_;
+if(((((name_ === ff_compiler_Inference.core_("Int")) || (name_ === ff_compiler_Inference.core_("Float"))) || (name_ === ff_compiler_Inference.core_("JsValue"))) || ((name_ === ff_compiler_Inference.core_("String")) && (operator_ === "+")))) {
+
+break
+}
+}
+{
 ff_compiler_Unification.Unification_unify(self_.unification_, at_, t_, ff_compiler_Syntax.TConstructor(at_, ff_compiler_Inference.core_("Int"), []))
+}
+} while(false)
 } else if((operator_ !== "")) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, (("Only +=, -= and = assignments are supported. Got: " + operator_) + "=")), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, (("Only +=, -=, *=, /= and = assignments are supported. Got: " + operator_) + "=")), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 } else {};
-const newValue_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, value_);
 ff_compiler_Unification.Unification_unify(self_.unification_, at_, expected_, ff_compiler_Syntax.TConstructor(at_, ff_compiler_Inference.core_("Unit"), []));
 return newValue_
 }
@@ -1411,7 +1412,7 @@ if(_1.DynamicCall) {
 const call_ = _1;
 return call_.tailCall_
 }
-if(_1.StaticCall) {
+{
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferMethodCall")
 }
 }))(e_.target_);
@@ -1444,23 +1445,41 @@ export function Inference_inferFunctionCall(self_, environment_, expected_, sign
 const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
+let isUnsafeJsAwaitCall_ = false;
 const tailCall_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
+do {
+const _1 = call_.function_;
+if(_1.EVariable && _1.name_ === "ff:core/Js.await") {
+isUnsafeJsAwaitCall_ = true
+break
+}
+if(_1.EVariable && _1.name_ === "ff:core/Js.awaitCancellablePromise") {
+isUnsafeJsAwaitCall_ = true
+break
+}
+{
+
+}
+} while(false);
 return call_.tailCall_
 }
-if(_1.StaticCall) {
+{
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferFunctionCall")
 }
 }))(e_.target_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, signature_.returnType_);
 const arguments_ = ff_compiler_Inference.Inference_inferArguments(self_, e_.at_, name_, environment_, signature_.parameters_, e_.arguments_);
-ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, signature_.effect_, environment_.effect_);
+const effect_ = (isUnsafeJsAwaitCall_
+? ff_compiler_Syntax.TConstructor(term_.at_, "Q$", [])
+: signature_.effect_);
+ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, effect_, environment_.effect_);
 {
 const _1 = e_;
 {
 const _c = _1;
-return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, instanceCall_), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
+return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, instanceCall_), effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
 return _w1.second_
 })), arguments_, _c.dictionaries_)
 return
@@ -1493,7 +1512,7 @@ return
 if(_1.DynamicCall) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Tailcalls not supported on lambda functions"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
-if(_1.StaticCall) {
+{
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferLambdaCall")
 }
 }))(e_.target_);
@@ -1507,10 +1526,12 @@ const arguments_ = ff_core_List.List_map(ff_core_List.List_zip(e_.arguments_, ar
 {
 const argument_ = _1.first_;
 const t_ = _1.second_;
-for(const for_o = argument_.name_; for_o.Some;) {
-const name_ = for_o.value_;
+{
+const if_o = argument_.name_
+if(if_o.Some) {
+const name_ = if_o.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(argument_.at_, ("Named argument not allowed here: " + name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-break
+}
 };
 {
 const _1 = argument_;
@@ -1522,10 +1543,12 @@ return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Inference.Infer
 return
 }
 }));
-for(const for_o = ff_core_List.List_first(e_.typeArguments_); for_o.Some;) {
-const typeArgument_ = for_o.value_;
+{
+const if_o = ff_core_List.List_first(e_.typeArguments_)
+if(if_o.Some) {
+const typeArgument_ = if_o.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(typeArgument_.at_, "Type arguments not allowed here"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-break
+}
 };
 ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, effect_, environment_.effect_);
 {
@@ -1723,6 +1746,12 @@ const magic_ = ((t_) => {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, t_);
 if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
+if((name_ === ff_compiler_Inference.core_("JsValue"))) {
+return ff_core_Option.Some("JsValue")
+}
+}
+if(_1.TConstructor && _1.generics_.length === 0) {
+const name_ = _1.name_;
 if((name_ === ff_compiler_Inference.core_("Float"))) {
 return ff_core_Option.Some("Float")
 }
@@ -1745,6 +1774,16 @@ return ff_core_Option.None()
 }
 });
 const chooseType_ = ((_1, _2) => {
+if(_1.Some && _1.value_ === "JsValue") {
+ff_compiler_Unification.Unification_unify(self_.unification_, e2_.at_, t1_, t2_);
+ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
+return
+}
+if(_2.Some && _2.value_ === "JsValue") {
+ff_compiler_Unification.Unification_unify(self_.unification_, e1_.at_, t2_, t1_);
+ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
+return
+}
 if(_1.Some && _1.value_ === "String" && _2.Some) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
@@ -1770,12 +1809,12 @@ ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_,
 return
 }
 if(_1.Some && _2.None) {
-ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, t1_, t2_);
+ff_compiler_Unification.Unification_unify(self_.unification_, e2_.at_, t1_, t2_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
 }
 if(_1.None && _2.Some) {
-ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, t2_, t1_);
+ff_compiler_Unification.Unification_unify(self_.unification_, e1_.at_, t2_, t1_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
 return
 }
@@ -1786,7 +1825,7 @@ return
 if(_1.Some && _2.Some) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Operators on these types not currently supported"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
-if(_1.None && _2.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Operators on unknown types not currently supported"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 });
@@ -1842,10 +1881,9 @@ return ff_compiler_Environment.Environment(_c.modulePrefix_, _c.symbols_, _c.tra
 
 export function Inference_inferArguments(self_, callAt_, callName_, environment_, parameters_, arguments_) {
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
-ff_core_List.List_each(ff_core_List.List_pairs(arguments_), ((_1) => {
-{
-const i_ = _1.first_;
-const a_ = _1.second_;
+for(let for_a = arguments_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
+const i_ = for_i;
+const a_ = for_a[for_i];
 const p_ = ff_core_List.List_find(parameters_, ((p_) => {
 return ff_core_Option.Option_any(a_.name_, ((_w1) => {
 return (_w1 === p_.name_)
@@ -1856,9 +1894,7 @@ return ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, _w1.at_)
 })))) {
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferArgumentHook(self_.unification_, environment_, false, callAt_, callName_, parameters_, arguments_, i_))
 }
-return
 }
-}))
 };
 let remainingArguments_ = ff_core_List.List_toArray(arguments_);
 ff_core_Array.Array_reverse(remainingArguments_);
@@ -1889,12 +1925,14 @@ return ff_core_Option.Option_contains(_w1.name_, p_.name_, ff_core_Equal.ff_core
 {
 const at_ = _1.at_;
 const e_ = _1.value_;
-for(const for_o = ff_core_Array.Array_indexWhere(remainingArguments_, ((_w1) => {
+{
+const if_o = ff_core_Array.Array_indexWhere(remainingArguments_, ((_w1) => {
 return ff_core_Option.Option_contains(_w1.name_, p_.name_, ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String)
-})); for_o.Some;) {
-const _w1 = for_o.value_;
+}))
+if(if_o.Some) {
+const _w1 = if_o.value_;
 ff_core_Array.Array_delete(remainingArguments_, _w1, 1)
-break
+}
 };
 const e2_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, e_);
 return ff_compiler_Syntax.Argument(at_, ff_core_Option.Some(p_.name_), e2_)
@@ -1911,7 +1949,7 @@ const callAt_ = _1.at_;
 ff_compiler_Inference.fail_(callAt_, "Too many arguments")
 return
 }
-if(_1.name_.Some) {
+{
 const callAt_ = _1.at_;
 const n_ = _1.name_.value_;
 ff_compiler_Inference.fail_(callAt_, ("Unknown argument: " + n_))
@@ -1993,7 +2031,7 @@ return ff_compiler_Syntax.Parameter(_c.at_, _c.mutable_, _c.name_, ff_compiler_U
 }));
 const returnType_ = ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, scheme_.signature_.returnType_);
 const effect_ = ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, scheme_.signature_.effect_);
-for(let for_i = 0, for_a = scheme_.signature_.constraints_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = scheme_.signature_.constraints_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const c_ = for_a[for_i];
 const generics_ = ff_core_List.List_map(c_.generics_, ((_w1) => {
 return ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, _w1)
@@ -2079,7 +2117,7 @@ if((traitDefinition_.generics_.length !== definition_.typeArguments_.length)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(definition_.at_, ((((("Wrong number of type arguments for " + traitName_) + ", expected ") + (traitDefinition_.generics_.length - 1)) + ", got ") + (definition_.typeArguments_.length - 1))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
 const instantiationMap_ = ff_core_List.List_toMap(ff_core_List.List_zip(traitDefinition_.generics_, definition_.typeArguments_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
-for(let for_i = 0, for_a = traitDefinition_.methods_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = traitDefinition_.methods_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const traitMethod_ = for_a[for_i];
 const found_ = ff_core_List.List_filter(definition_.methods_, ((_w1) => {
 return (_w1.signature_.name_ === traitMethod_.name_)
@@ -2087,7 +2125,7 @@ return (_w1.signature_.name_ === traitMethod_.name_)
 if(ff_core_List.List_isEmpty(found_)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(definition_.at_, ("Missing instance method: " + traitMethod_.name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-for(let for_i = 1, for_a = found_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = found_, for_i = 1, for_l = for_a.length; for_i < for_l; for_i++) {
 const duplicateMethod_ = for_a[for_i];
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(duplicateMethod_.at_, ("Duplicated instance method: " + traitMethod_.name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
@@ -2114,22 +2152,19 @@ return ff_compiler_Syntax.Parameter(_c.at_, _c.mutable_, _c.name_, ff_compiler_U
 }
 }));
 const returnType_ = ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, traitMethodScheme_.signature_.returnType_);
-for(let for_i = Math.max(parameters_.length, 0), for_a = instanceFunction_.signature_.parameters_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = instanceFunction_.signature_.parameters_, for_i = Math.max(parameters_.length, 0), for_l = for_a.length; for_i < for_l; for_i++) {
 const instanceParameter_ = for_a[for_i];
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(instanceParameter_.at_, ("Unexpected parameter: " + instanceParameter_.name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-for(let for_i = Math.max(instanceFunction_.signature_.parameters_.length, 0), for_a = parameters_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = parameters_, for_i = Math.max(instanceFunction_.signature_.parameters_.length, 0), for_l = for_a.length; for_i < for_l; for_i++) {
 const traitParameter_ = for_a[for_i];
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(instanceFunction_.at_, ("Missing parameter: " + traitParameter_.name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-ff_core_List.List_each(ff_core_List.List_zip(parameters_, instanceFunction_.signature_.parameters_), ((_1) => {
-{
-const traitParameter_ = _1.first_;
-const instanceParameter_ = _1.second_;
+for(let for_a = parameters_, for_i = 0, for_l = for_a.length, for_a2 = instanceFunction_.signature_.parameters_, for_i2 = 0, for_l2 = for_a2.length; for_i < for_l && for_i2 < for_l2; for_i++, for_i2++) {
+const traitParameter_ = for_a[for_i];
+const instanceParameter_ = for_a2[for_i2];
 ff_compiler_Unification.Unification_unify(self_.unification_, instanceParameter_.valueType_.at_, traitParameter_.valueType_, instanceParameter_.valueType_)
-return
-}
-}));
+};
 ff_compiler_Unification.Unification_unify(self_.unification_, instanceFunction_.signature_.returnType_.at_, returnType_, instanceFunction_.signature_.returnType_);
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, instanceFunction_.at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, traitMethodScheme_.signature_.at_))) {
 const symbolHook_ = ff_compiler_LspHook.SymbolHook(instanceFunction_.signature_.name_, instanceFunction_.at_, traitMethodScheme_.signature_.at_);
@@ -2162,12 +2197,8 @@ const functions_ = ff_core_List.List_map(definition_.methods_, ((method_) => {
 const signature_ = (((_c) => {
 return ff_compiler_Syntax.Signature(_c.at_, _c.name_, _c.member_, [...definition_.generics_, ...method_.signature_.generics_], [...definition_.constraints_, ...method_.signature_.constraints_], [selfParameter_, ...method_.signature_.parameters_], _c.returnType_, _c.effect_)
 }))(method_.signature_);
-const body_ = ff_compiler_Syntax.Target_mapFirefly(method_.body_, ((lambda_) => {
-{
-const _1 = lambda_;
-{
-const _c = _1;
-return ff_compiler_Syntax.Lambda(_c.at_, _c.effect_, ff_core_List.List_map(lambda_.cases_, ((case_) => {
+const body_ = (((_c) => {
+return ff_compiler_Syntax.Lambda(_c.at_, _c.effect_, ff_core_List.List_map(method_.body_.cases_, ((case_) => {
 {
 const _1 = case_;
 {
@@ -2176,10 +2207,7 @@ return ff_compiler_Syntax.MatchCase(_c.at_, [ff_compiler_Syntax.PVariable(method
 }
 }
 })))
-return
-}
-}
-}));
+}))(method_.body_);
 const function_ = (((_c) => {
 return ff_compiler_Syntax.DFunction(_c.at_, signature_, body_)
 }))(method_);
@@ -2222,10 +2250,7 @@ return ff_compiler_Unification.Unification_withLocalInstances(self_.unification_
 const _1 = definition_;
 {
 const _c = _1;
-return ff_compiler_Syntax.DFunction(_c.at_, _c.signature_, ff_compiler_Syntax.Target_mapFirefly(definition_.body_, ((_w1) => {
-return ff_compiler_Inference.Inference_inferLambda(self_, environment2_, functionType_, _w1)
-})))
-return
+return ff_compiler_Syntax.DFunction(_c.at_, _c.signature_, ff_compiler_Inference.Inference_inferLambda(self_, environment2_, functionType_, definition_.body_))
 }
 }
 }))
@@ -2423,7 +2448,7 @@ return ff_compiler_Syntax.TConstructor(p_.at_, _c.name_, _c.generics_)
 }
 return
 }
-if(_1.TVariable) {
+{
 const t_ = _1;
 {
 const _1 = t_;
@@ -2462,7 +2487,7 @@ const headVariables_ = ff_compiler_Inference.Inference_inferPattern(self_, envir
 const tailVariables_ = ff_compiler_Inference.Inference_inferPattern(self_, environment_, listType_, tail_);
 return ff_core_Map.Map_addAll(headVariables_, tailVariables_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 }
-if(_1.PVariant) {
+{
 const at_ = _1.at_;
 const name_ = _1.name_;
 const patterns_ = _1.patterns_;
@@ -2531,10 +2556,12 @@ if(_1.EField) {
 const e_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, term_.at_)) {
-for(const for_o = hookRecordTypeBox_; for_o.Some;) {
-const _w1 = for_o.value_;
+{
+const if_o = hookRecordTypeBox_
+if(if_o.Some) {
+const _w1 = if_o.value_;
 _w1.value_ = ff_core_Option.Some(recordType_)
-break
+}
 }
 };
 const record_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, recordType_, e_.record_);
@@ -2568,7 +2595,7 @@ return (_w1.second_ === e_.field_)
 })), ((_w1) => {
 return _w1.first_
 })), ((index_) => {
-const t1_ = (typeArguments_[index_] ?? ff_core_List.internalGrab_(typeArguments_, index_));
+const t1_ = (typeArguments_[index_] ?? ff_core_List.List_grab(typeArguments_, index_));
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_);
 {
 const _1 = e_;
@@ -2601,7 +2628,7 @@ if((!instantiated_.scheme_.isVariable_)) {
 const signature_ = (((_c) => {
 return ff_compiler_Syntax.Signature(_c.at_, _c.name_, _c.member_, _c.generics_, _c.constraints_, ff_core_List.List_dropFirst(instantiated_.scheme_.signature_.parameters_, 1), _c.returnType_, _c.effect_)
 }))(instantiated_.scheme_.signature_);
-ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, recordType_, (instantiated_.scheme_.signature_.parameters_[0] ?? ff_core_List.internalGrab_(instantiated_.scheme_.signature_.parameters_, 0)).valueType_);
+ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, recordType_, (instantiated_.scheme_.signature_.parameters_[0] ?? ff_core_List.List_grab(instantiated_.scheme_.signature_.parameters_, 0)).valueType_);
 return ff_compiler_Inference.Inference_inferEtaExpansion(self_, environment_, expected_, e_.at_, signature_, term_)
 }
 }
@@ -2617,7 +2644,7 @@ return ff_compiler_Syntax.EField(_c.at_, instantiated_.scheme_.isNewtype_, recor
 }
 return
 }
-if(_1.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 }
@@ -2626,7 +2653,7 @@ return
 if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 return term_
 }
-if(_1.TVariable) {
+{
 const index_ = _1.index_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
@@ -2866,7 +2893,6 @@ break
 }
 {
 
-break
 }
 } while(false);
 const lambda_ = ff_compiler_Inference.Inference_inferLambda(self_, environment_, expected_, l_);
@@ -2930,10 +2956,9 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 };
 const signature_ = scheme_.signature_;
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
-ff_core_List.List_each(ff_core_List.List_pairs(e_.arguments_), ((_1) => {
-{
-const i_ = _1.first_;
-const a_ = _1.second_;
+for(let for_a = e_.arguments_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
+const i_ = for_i;
+const a_ = for_a[for_i];
 const p_ = ff_core_List.List_find(signature_.parameters_, ((_w1) => {
 return (_w1.name_ === a_.name_)
 }));
@@ -2951,9 +2976,7 @@ return ff_compiler_Syntax.Argument(_c.at_, ff_core_Option.Some(f_.name_), _c.val
 }));
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferArgumentHook(self_.unification_, environment_, true, term_.at_, e_.name_, signature_.parameters_, arguments_, i_))
 }
-return
 }
-}))
 };
 const parameterNames_ = ff_core_List.List_map(signature_.parameters_, ((_w1) => {
 return _w1.name_
@@ -3028,7 +3051,7 @@ tailCall_: call_.tailCall_
 }
 return
 }
-if(_1.StaticCall) {
+{
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in the Inference phase")
 }
 }))(e_.target_);
@@ -3054,7 +3077,7 @@ return ff_compiler_Inference.Inference_inferFunctionCall(self_, environment_, ex
 }
 return
 }
-if(_1.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(variableAt_, ("No such function: " + x_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 }
@@ -3065,10 +3088,12 @@ if(_1.EField) {
 const f_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, f_.at_);
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, term_.at_)) {
-for(const for_o = hookRecordTypeBox_; for_o.Some;) {
-const _w1 = for_o.value_;
+{
+const if_o = hookRecordTypeBox_
+if(if_o.Some) {
+const _w1 = if_o.value_;
 _w1.value_ = ff_core_Option.Some(recordType_)
-break
+}
 }
 };
 const record_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, recordType_, f_.record_);
@@ -3098,7 +3123,7 @@ if(_1.Some) {
 const instantiated_ = _1.value_;
 return ff_compiler_Inference.Inference_inferLambdaCall(self_, environment_, expected_, e2_)
 }
-if(_1.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(f_.at_, ((("No such field " + f_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 }
@@ -3107,7 +3132,7 @@ return
 if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 return ff_compiler_Inference.Inference_inferLambdaCall(self_, environment_, expected_, e2_)
 }
-if(_1.TVariable) {
+{
 const index_ = _1.index_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(f_.at_, ((("No such field " + f_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
@@ -3193,7 +3218,7 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 }))
 return
 }
-if(_1.EAssignField) {
+{
 const e_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const record_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, recordType_, e_.record_);
@@ -3232,7 +3257,7 @@ if(_1.Some) {
 const instantiated_ = _1.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("Can't assign an immutable field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
-if(_1.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 }
@@ -3241,7 +3266,7 @@ return
 if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 return term_
 }
-if(_1.TVariable) {
+{
 const index_ = _1.index_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
@@ -3253,12 +3278,24 @@ return
 
 export async function Inference_inferAssignment$(self_, environment_, expected_, at_, operator_, value_, signature_, $task) {
 const t_ = signature_.returnType_;
-if(((operator_ === "+") || (operator_ === "-"))) {
+const newValue_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, value_);
+if(((((operator_ === "+") || (operator_ === "-")) || (operator_ === "*")) || (operator_ === "/"))) {
+do {
+const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, t_);
+if(_1.TConstructor) {
+const name_ = _1.name_;
+if(((((name_ === ff_compiler_Inference.core_("Int")) || (name_ === ff_compiler_Inference.core_("Float"))) || (name_ === ff_compiler_Inference.core_("JsValue"))) || ((name_ === ff_compiler_Inference.core_("String")) && (operator_ === "+")))) {
+
+break
+}
+}
+{
 ff_compiler_Unification.Unification_unify(self_.unification_, at_, t_, ff_compiler_Syntax.TConstructor(at_, ff_compiler_Inference.core_("Int"), []))
+}
+} while(false)
 } else if((operator_ !== "")) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, (("Only +=, -= and = assignments are supported. Got: " + operator_) + "=")), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, (("Only +=, -=, *=, /= and = assignments are supported. Got: " + operator_) + "=")), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 } else {};
-const newValue_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, value_);
 ff_compiler_Unification.Unification_unify(self_.unification_, at_, expected_, ff_compiler_Syntax.TConstructor(at_, ff_compiler_Inference.core_("Unit"), []));
 return newValue_
 }
@@ -3273,7 +3310,7 @@ if(_1.DynamicCall) {
 const call_ = _1;
 return call_.tailCall_
 }
-if(_1.StaticCall) {
+{
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferMethodCall")
 }
 }))(e_.target_);
@@ -3306,23 +3343,41 @@ export async function Inference_inferFunctionCall$(self_, environment_, expected
 const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
+let isUnsafeJsAwaitCall_ = false;
 const tailCall_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
+do {
+const _1 = call_.function_;
+if(_1.EVariable && _1.name_ === "ff:core/Js.await") {
+isUnsafeJsAwaitCall_ = true
+break
+}
+if(_1.EVariable && _1.name_ === "ff:core/Js.awaitCancellablePromise") {
+isUnsafeJsAwaitCall_ = true
+break
+}
+{
+
+}
+} while(false);
 return call_.tailCall_
 }
-if(_1.StaticCall) {
+{
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferFunctionCall")
 }
 }))(e_.target_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, signature_.returnType_);
 const arguments_ = ff_compiler_Inference.Inference_inferArguments(self_, e_.at_, name_, environment_, signature_.parameters_, e_.arguments_);
-ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, signature_.effect_, environment_.effect_);
+const effect_ = (isUnsafeJsAwaitCall_
+? ff_compiler_Syntax.TConstructor(term_.at_, "Q$", [])
+: signature_.effect_);
+ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, effect_, environment_.effect_);
 {
 const _1 = e_;
 {
 const _c = _1;
-return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, instanceCall_), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
+return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, instanceCall_), effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
 return _w1.second_
 })), arguments_, _c.dictionaries_)
 return
@@ -3355,7 +3410,7 @@ return
 if(_1.DynamicCall) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Tailcalls not supported on lambda functions"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
-if(_1.StaticCall) {
+{
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferLambdaCall")
 }
 }))(e_.target_);
@@ -3369,10 +3424,12 @@ const arguments_ = ff_core_List.List_map(ff_core_List.List_zip(e_.arguments_, ar
 {
 const argument_ = _1.first_;
 const t_ = _1.second_;
-for(const for_o = argument_.name_; for_o.Some;) {
-const name_ = for_o.value_;
+{
+const if_o = argument_.name_
+if(if_o.Some) {
+const name_ = if_o.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(argument_.at_, ("Named argument not allowed here: " + name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-break
+}
 };
 {
 const _1 = argument_;
@@ -3384,10 +3441,12 @@ return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Inference.Infer
 return
 }
 }));
-for(const for_o = ff_core_List.List_first(e_.typeArguments_); for_o.Some;) {
-const typeArgument_ = for_o.value_;
+{
+const if_o = ff_core_List.List_first(e_.typeArguments_)
+if(if_o.Some) {
+const typeArgument_ = if_o.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(typeArgument_.at_, "Type arguments not allowed here"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-break
+}
 };
 ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, effect_, environment_.effect_);
 {
@@ -3585,6 +3644,12 @@ const magic_ = ((t_) => {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, t_);
 if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
+if((name_ === ff_compiler_Inference.core_("JsValue"))) {
+return ff_core_Option.Some("JsValue")
+}
+}
+if(_1.TConstructor && _1.generics_.length === 0) {
+const name_ = _1.name_;
 if((name_ === ff_compiler_Inference.core_("Float"))) {
 return ff_core_Option.Some("Float")
 }
@@ -3607,6 +3672,16 @@ return ff_core_Option.None()
 }
 });
 const chooseType_ = ((_1, _2) => {
+if(_1.Some && _1.value_ === "JsValue") {
+ff_compiler_Unification.Unification_unify(self_.unification_, e2_.at_, t1_, t2_);
+ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
+return
+}
+if(_2.Some && _2.value_ === "JsValue") {
+ff_compiler_Unification.Unification_unify(self_.unification_, e1_.at_, t2_, t1_);
+ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
+return
+}
 if(_1.Some && _1.value_ === "String" && _2.Some) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
@@ -3632,12 +3707,12 @@ ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_,
 return
 }
 if(_1.Some && _2.None) {
-ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, t1_, t2_);
+ff_compiler_Unification.Unification_unify(self_.unification_, e2_.at_, t1_, t2_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
 }
 if(_1.None && _2.Some) {
-ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, t2_, t1_);
+ff_compiler_Unification.Unification_unify(self_.unification_, e1_.at_, t2_, t1_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
 return
 }
@@ -3648,7 +3723,7 @@ return
 if(_1.Some && _2.Some) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Operators on these types not currently supported"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
-if(_1.None && _2.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Operators on unknown types not currently supported"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 });
@@ -3704,10 +3779,9 @@ return ff_compiler_Environment.Environment(_c.modulePrefix_, _c.symbols_, _c.tra
 
 export async function Inference_inferArguments$(self_, callAt_, callName_, environment_, parameters_, arguments_, $task) {
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
-ff_core_List.List_each(ff_core_List.List_pairs(arguments_), ((_1) => {
-{
-const i_ = _1.first_;
-const a_ = _1.second_;
+for(let for_a = arguments_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
+const i_ = for_i;
+const a_ = for_a[for_i];
 const p_ = ff_core_List.List_find(parameters_, ((p_) => {
 return ff_core_Option.Option_any(a_.name_, ((_w1) => {
 return (_w1 === p_.name_)
@@ -3718,9 +3792,7 @@ return ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, _w1.at_)
 })))) {
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferArgumentHook(self_.unification_, environment_, false, callAt_, callName_, parameters_, arguments_, i_))
 }
-return
 }
-}))
 };
 let remainingArguments_ = ff_core_List.List_toArray(arguments_);
 ff_core_Array.Array_reverse(remainingArguments_);
@@ -3751,12 +3823,14 @@ return ff_core_Option.Option_contains(_w1.name_, p_.name_, ff_core_Equal.ff_core
 {
 const at_ = _1.at_;
 const e_ = _1.value_;
-for(const for_o = ff_core_Array.Array_indexWhere(remainingArguments_, ((_w1) => {
+{
+const if_o = ff_core_Array.Array_indexWhere(remainingArguments_, ((_w1) => {
 return ff_core_Option.Option_contains(_w1.name_, p_.name_, ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String)
-})); for_o.Some;) {
-const _w1 = for_o.value_;
+}))
+if(if_o.Some) {
+const _w1 = if_o.value_;
 ff_core_Array.Array_delete(remainingArguments_, _w1, 1)
-break
+}
 };
 const e2_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, e_);
 return ff_compiler_Syntax.Argument(at_, ff_core_Option.Some(p_.name_), e2_)
@@ -3773,7 +3847,7 @@ const callAt_ = _1.at_;
 ff_compiler_Inference.fail_(callAt_, "Too many arguments")
 return
 }
-if(_1.name_.Some) {
+{
 const callAt_ = _1.at_;
 const n_ = _1.name_.value_;
 ff_compiler_Inference.fail_(callAt_, ("Unknown argument: " + n_))
@@ -3855,7 +3929,7 @@ return ff_compiler_Syntax.Parameter(_c.at_, _c.mutable_, _c.name_, ff_compiler_U
 }));
 const returnType_ = ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, scheme_.signature_.returnType_);
 const effect_ = ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, scheme_.signature_.effect_);
-for(let for_i = 0, for_a = scheme_.signature_.constraints_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = scheme_.signature_.constraints_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const c_ = for_a[for_i];
 const generics_ = ff_core_List.List_map(c_.generics_, ((_w1) => {
 return ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, _w1)