firefly-compiler 0.5.3 → 0.5.5

package/bin/Release.ff

@@ -35,7 +35,6 @@ release(
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "postgresql")
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "rpc")
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "s3")
-    releaseFireflyPackage(system, accessKeyId, secretAccessKey, "unsafejs")
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "webserver")
     runSuccessful(system, "git", ["commit", "-a", "-m", "Autorelease " + version], system.path(".."))
     runSuccessful(system, "git", ["push"], system.path(".."))

package/compiler/Compiler.ff

@@ -100,6 +100,7 @@ coreImports: List[DImport] =
         "Task"
         "Try"
         "Unit"
+        "UnsafeJs"
     ].map {moduleName =>
         DImport(
             at = Location("<prelude>", 1, 1)

package/compiler/JsEmitter.ff

@@ -362,15 +362,30 @@ extend self: JsEmitter {
         | ECall(at, StaticCall("ff:core/Array.Array_grab", _, _), _, _, [Argument(_, _, EVariable(_, x1)), Argument(_, _, EVariable(_, x2))], _) =>
             "(" + escapeResolved(x1) + ".array[" + escapeResolved(x2) + "] ?? " + 
             "ff_core_Array.internalGrab_(" + escapeResolved(x1) + ", " + escapeResolved(x2) + "))"
-        | ECall(at, StaticCall("ff:unsafejs/UnsafeJs.import", _, _), _, _, [Argument(_, _, EString(_, url))], _) =>
+        | ECall(at, StaticCall("ff:core/UnsafeJs.import", _, _), _, _, [Argument(_, _, EString(_, url))], _) =>
             self.jsImporter.add(url.replace("\"", ""))
-        | ECall(at, StaticCall("ff:unsafejs/UnsafeJs.await", _, _), _, _, [Argument(_, _, body)], _) =>
-            let emittedBody = self.emitTerm(body, async)
-            if(async) {"(await " + emittedBody + "($task))"} else {"(" + emittedBody + "())"}
-        | ECall(at, StaticCall("ff:unsafejs/UnsafeJs.cancelled", _, _), _, _, [], _) =>
+        | ECall(at, StaticCall("ff:core/UnsafeJs.await", _, _), _, _, [Argument(_, _, body)], _) =>
+            if(async) {
+                "(await " + self.emitTerm(body, async) + "($task))"
+            } else {
+                self.emitTerm(invokeImmediately(body), async)
+            }
+        | ECall(at, StaticCall("ff:core/UnsafeJs.cancelled", _, _), _, _, [], _) =>
             if(async) {"$task.controller.signal.aborted"} else {"false"}
-        | ECall(at, StaticCall("ff:unsafejs/UnsafeJs.throwIfCancelled", _, _), _, _, [], _) =>
+        | ECall(at, StaticCall("ff:core/UnsafeJs.throwIfCancelled", _, _), _, _, [], _) =>
             if(async) {"((() => ff_core_Task.Task_throwIfAborted($task))())"} else {""}
+        | ECall(at, StaticCall("ff:core/UnsafeJs.inAsync", _, _), _, _, [], _) =>
+            if(self.emittingAsync) {"true"} else {"false"}
+        | ECall(at, StaticCall("ff:core/UnsafeJs.inBrowser", _, _), _, _, [], _) =>
+            if(self.emitTarget == EmitBrowser) {"true"} else {"false"}
+        | ECall(at, StaticCall("ff:core/UnsafeJs.inNode", _, _), _, _, [], _) =>
+            if(self.emitTarget == EmitNode) {"true"} else {"false"}
+        | ECall(at, StaticCall("ff:core/UnsafeJs.inBuild", _, _), _, _, [], _) =>
+            if(self.emitTarget == EmitBuild) {"true"} else {"false"}
+        | ECall(at, StaticCall("ff:core/UnsafeJs.value", _, _), _, _, [Argument(_, _, e)], _) =>
+            self.emitTerm(e, async)
+        | ECall(at, StaticCall("ff:core/UnsafeJs.fromValue", _, _), _, _, [Argument(_, _, e)], _) =>
+            self.emitTerm(e, async)
         | ECall(at, StaticCall("ff:core/Equal.equals", _, _), _, _, [left, right], [Dictionary(_, _, _, typeName, [])]) {
             primitiveTypes.contains(typeName) || typeName == "ff:core/Ordering.Ordering"
         } =>
@@ -545,7 +560,7 @@ extend self: JsEmitter {
                 self.emitTryCatchFinally(term, last, async) | Some(code)
             } =>
                 code
-            | ECall(at, StaticCall("ff:unsafejs/UnsafeJs.throwIfCancelled", _, _), _, _, [], _) =>
+            | ECall(at, StaticCall("ff:core/UnsafeJs.throwIfCancelled", _, _), _, _, [], _) =>
                 if(async) {"ff_core_Task.Task_throwIfAborted($task)"} else {""}
             | ECall(at, StaticCall(name, True, instanceCall), effect, _, arguments, _) =>
                 if(instanceCall) {throw(CompileError(at, "Not yet implemented: Tail calls on trait methods."))}

package/compiler/Parser.ff

@@ -1152,7 +1152,7 @@ extend self: Parser {
             True
         } else {False}
         mutable result = self.parseAtom()
-        while {self.current().is4(LBracketLeft, LColon, LDot, LArrowThin)} {
+        while {self.current().is4(LBracketLeft, LColon, LDot, LArrowThin) || self.current().rawIs2("!", "?")} {
             if(self.current().is(LDot)) {
                 self.skip(LDot)
                 if(self.current().rawIs("{")) {
@@ -1167,6 +1167,14 @@ extend self: Parser {
                 }
             } elseIf {self.current().is(LArrowThin)} {
                 result = self.parseDynamicMember(result)
+            } elseIf {self.current().rawIs2("!", "?")} {
+                let token = self.skip(LOperator)
+                let method = if(token.rawIs("!")) {"ff:core/UnsafeJs.value"} else {"ff:core/UnsafeJs.fromValue"}
+                let target = DynamicCall(EVariable(token.at(), method), False)
+                let effect = self.freshUnificationVariable(token.at())
+                result = self.parseDynamicMember(ECall(token.at(), target, effect, [], [
+                    Argument(result.at, None, result)
+                ], []))
             } else {
                 let at = self.current().at()
                 let typeArguments = if(!self.current().rawIs("[")) {[]} else {self.parseTypeArguments()}

package/compiler/Tokenizer.ff

@@ -204,6 +204,14 @@ tokenize(file: String, code: String, completionAt: Option[Location], attemptFixe
                 i += 1
                 emitToken(LComma, start, i)
 
+            } elseIf {
+                (code.grab(i) == '!' || code.grab(i) == '?') && i + 1 < code.size() && 
+                (code.grab(i + 1) == '.' || code.grab(i + 1) == '-')
+            } {
+                
+                i += 1
+                emitToken(LOperator, start, i)
+                
             } elseIf {operatorCharacters.contains(code.grab(i))} {
 
                 i += 1

package/{unsafejs → core}/UnsafeJs.ff

@@ -18,5 +18,25 @@ cancelled(): Bool
     // Replaced by the compiler
     target js sync "return false"
 
+inAsync(): Bool
+    // Replaced by the compiler
+    target js sync "return false"
+    
+inBrowser(): Bool
+    // Replaced by the compiler
+    target js sync "return false"
+    
+inNode(): Bool
+    // Replaced by the compiler
+    target js sync "return false"
+    
+inBuild(): Bool
+    // Replaced by the compiler
+    target js sync "return false"
+    
 value[T](value: T): JsValue
     target js sync "return value_"
+
+fromValue[T](value: JsValue): T
+    target js sync "return value_"
+

package/fireflysite/Guide.ff

@@ -411,8 +411,9 @@ renderHighlightedCode(lux: Lux, code: String) {
                     | LKeyword => Styles.codeKeywordCss
                     | LNamespace => Styles.codeTypeCss
                     | LString => Styles.codeStringCss
-                    | LUpper => Styles.codeTypeCss
                     | LWildcard => Styles.codeVariableCss
+                    | LUpper {tokens.get(index - 1).any {_.kind == LArrowThin}} => Styles.codeStringCss
+                    | LUpper => Styles.codeTypeCss
                     | LLower {tokens.get(index - 1).any {_.kind == LArrowThin}} => Styles.codeStringCss
                     | LLower {tokens.get(index - 1).any {t => 
                         t.kind == LBracketRight || t.kind == LDot

package/fireflysite/Test.ff

@@ -27,6 +27,12 @@ nodeMain(system: NodeSystem) {
     let foo = {{_ + 1}(_)}
     Log.show(foo(1))
     
+    let x1 = work(initial = 3) {i => 
+        i + 1
+    } {s => 
+        "*" + s + "*"
+    }
+    //let x2 = work(initial = 3, {i => i + 1}, {s => s + "*"}) 
 }
 
 factorial(n: Int): Int {
@@ -43,4 +49,8 @@ factorialTail(n: Int, acc: Int = 1): Int {
     } else {
         tailcall factorialTail(n - 1, n * acc)
     }
+}
+
+work(f: Int => Int, g: String => String, initial: Int = 0): String {
+    g("" + f(initial))
 }

package/fireflysite/assets/markdown/reference/FunctionsAndMethods.md

@@ -240,27 +240,55 @@ let f: Int => Int = {{_ + 1}(_)}
 In this code, there is an outer and an inner anonymous function, both taking one argument. The first underscore belongs to the inner function, which is called immediately by the outer function with the outer function's anonymous parameter as the argument.
 
 
-# Local functions
+# Trailing lambda calls
 
-Local functions are declared exactly like top-level functions but with the `function` keyword in front of the signature, like this:
+Firefly has special syntax for passing an anonymous function as the last argument in a function call. Consider the `if` function from the standard library, with this signature:
 
+```firefly
+if[T](condition: Bool, body: () => T): Option[T]
+```
+
+The `if` function takes two parameters, where the last is a function. Calling `if` with the standard syntax looks like this:
 
 ```firefly
-function square(n: Int): Int {
-    n * n
-}
+if(x == 0, {"Zero"}) 
 ```
 
-The above local function definition is a statement, similar to local variables declared with `let`. The function name `square` will be in scope for the rest of the code block.
+Using the special syntax for trailing lambda calls, it looks like this:
 
-Furthermore, local functions declared in sequence are in scope within each other's bodies, allowing them to be mutually recursive.
+```firefly
+if(x == 0) {"Zero"}
+```
 
-# Trailing lambda calls
+With this trailing lambda call syntax, the anonymous function is written after the call parentheses. This syntax is available for multiple trailing function arguments in sequence.
+
+The function below takes three parameters. Two functions and one `Int` with a default value:
+
+```firefly
+work(f: Int => Int, g: String => String, initial: Int = 0): String {
+    g("" + f(initial))
+}
+```
+
+This function may be called with two trailling lambda arguments, like this:
 
 ```firefly
-if(x == 1) {"One"}
+work(initial = 3) {i => 
+    i + 1
+} {s => 
+    "*" + s + "*"
+}
 ```
 
+
+# Local functions
+
+Local functions are declared exactly like top-level functions but with the `function` keyword in front of the signature, like this:
+
+The above local function definition is a statement, similar to local variables declared with `let`. The function name `square` will be in scope for the rest of the code block.
+
+Furthermore, local functions declared in sequence are in scope within each other's bodies, allowing them to be mutually recursive.
+
 # Methods
 
 Firefly has methods, which are called like this:

package/fireflysite/assets/markdown/reference/JavascriptInterop.md

@@ -27,24 +27,25 @@ browserMain(system: BrowserSystem): Unit {
 This is equivalent to the following JavaScript:
 
 ```js
-document.onclick = {() =>
-    Notification.requestPermission().then({() =>
+document.onclick = () =>
+    Notification.requestPermission().then(() =>
         new Notification(
             "Hi!",
             {body: "From the Firefly JS FFI"}
         )
-    })
-}
+    )
 ```
 
 The `->` is shorthand for calling the methods `get`, `set`, `increment`, `decrement`, `object`, `call1`, `new1` and `function1` (substitute 0 to 9 for 1).
 
 The `js` variable is of the type `JsSystem` and the rest of the expressions return `JsValue`, which represents an arbitrary JavaScript value.
 
+In addition, the `!` and `?` postfix operators can be used as shorthand for `UnsafeJs.value(...)` and `UnsafeJs.fromValue(...)`.
 
-# The ff:unsafejs package
 
-This package provides access to unsafe JavaScript features:
+# The UnsafeJs module
+
+This module provides access to unsafe JavaScript features:
 
 ```firefly
 // Obtains the JsSystem without a capability
@@ -62,11 +63,26 @@ throwIfCancelled(): Unit
 // Returns true if the current task has been aborted
 cancelled(): Bool
 
+// Returns true if the current target is async
+inAsync(): Bool
+    
+// Returns true if the current target is browser
+inBrowser(): Bool
+    
+// Returns true if the current target is node
+inNode(): Bool
+    
+// Returns true if the current target is build
+inBuild(): Bool
+
 // Casts any Firefly value to a JavaScript value without conversion
 value[T](value: T): JsValue
+
+// Casts any JavaScript value to a Firefly value without conversion
+fromValue[T](value: JsValue): T
 ```
 
-In the future, it may be possible to provide a whitelist of dependencies that are allowed to use this package.
+In the future, it may be possible to provide a whitelist of dependencies that are allowed to use this module.
 
 
 # Internal FFI

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

@@ -114,6 +114,8 @@ 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 PackageFiles
 export function PackageFiles(root_, packageFile_, files_) {
 return {root_, packageFile_, files_};

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

@@ -114,12 +114,14 @@ 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 Compiler
 export function Compiler(emitTarget_, task_, compilerModulePath_, jsOutputPath_, packagePaths_, singleFilePackages_, virtualFiles_, cache_, lspHook_, phaseDurationDelta_, phaseDurations_) {
 return {emitTarget_, task_, compilerModulePath_, jsOutputPath_, packagePaths_, singleFilePackages_, virtualFiles_, cache_, lspHook_, phaseDurationDelta_, phaseDurations_};
 }
 
-export const coreImports_ = ff_core_List.List_map(["Any", "Array", "AssetSystem", "Atomic", "Bool", "BrowserSystem", "Buffer", "BuildSystem", "Channel", "Char", "Core", "Crypto", "Duration", "Equal", "Error", "FileHandle", "Float", "HttpClient", "Instant", "Int", "IntMap", "Json", "JsValue", "JsSystem", "List", "Lock", "Log", "Map", "NodeSystem", "Nothing", "Option", "Ordering", "Pair", "Path", "Random", "Serializable", "Set", "Show", "SourceLocation", "Stream", "String", "StringMap", "Task", "Try", "Unit"], ((moduleName_) => {
+export const coreImports_ = ff_core_List.List_map(["Any", "Array", "AssetSystem", "Atomic", "Bool", "BrowserSystem", "Buffer", "BuildSystem", "Channel", "Char", "Core", "Crypto", "Duration", "Equal", "Error", "FileHandle", "Float", "HttpClient", "Instant", "Int", "IntMap", "Json", "JsValue", "JsSystem", "List", "Lock", "Log", "Map", "NodeSystem", "Nothing", "Option", "Ordering", "Pair", "Path", "Random", "Serializable", "Set", "Show", "SourceLocation", "Stream", "String", "StringMap", "Task", "Try", "Unit", "UnsafeJs"], ((moduleName_) => {
 return ff_compiler_Syntax.DImport(ff_compiler_Syntax.Location("<prelude>", 1, 1), moduleName_, ff_compiler_Syntax.PackagePair("ff", "core"), [], moduleName_)
 }));
 

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

@@ -104,6 +104,8 @@ 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 Dependencies
 export function Dependencies(workspace_, packages_, packagePaths_, singleFilePackages_) {
 return {workspace_, packages_, packagePaths_, singleFilePackages_};

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

@@ -92,6 +92,8 @@ 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 DependencyLock
 export function DependencyLock(doneLocks_, task_) {
 return {doneLocks_, task_};

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

@@ -94,6 +94,8 @@ 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 Deriver
 const Deriver$ = {Deriver: true};
 export function Deriver() {

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

@@ -98,6 +98,8 @@ 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 Dictionaries
 export function Dictionaries(instances_) {
 return {instances_};

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

@@ -94,6 +94,8 @@ 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 Environment
 export function Environment(modulePrefix_, symbols_, traits_, imports_, effect_, selfVariable_) {
 return {modulePrefix_, symbols_, traits_, imports_, effect_, selfVariable_};

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

@@ -102,6 +102,8 @@ 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_};

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

@@ -98,6 +98,8 @@ 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 JsEmitter
 export function JsEmitter(otherModules_, jsImporter_, emitTarget_, isMainModule_, compilerModulePath_, packagePair_, moduleName_, emittingAsync_, tailCallUsed_) {
 return {otherModules_, jsImporter_, emitTarget_, isMainModule_, compilerModulePath_, packagePair_, moduleName_, emittingAsync_, tailCallUsed_};
@@ -931,23 +933,22 @@ const x1_ = _1.arguments_[0].value_.name_;
 const x2_ = _1.arguments_[1].value_.name_;
 return ((((((((("(" + ff_compiler_JsEmitter.escapeResolved_(x1_)) + ".array[") + ff_compiler_JsEmitter.escapeResolved_(x2_)) + "] ?? ") + "ff_core_Array.internalGrab_(") + ff_compiler_JsEmitter.escapeResolved_(x1_)) + ", ") + ff_compiler_JsEmitter.escapeResolved_(x2_)) + "))")
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:unsafejs/UnsafeJs.import" && _1.arguments_.length === 1 && _1.arguments_[0].value_.EString) {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.import" && _1.arguments_.length === 1 && _1.arguments_[0].value_.EString) {
 const at_ = _1.at_;
 const url_ = _1.arguments_[0].value_.value_;
 return ff_compiler_JsImporter.JsImporter_add(self_.jsImporter_, ff_core_String.String_replace(url_, "\"", ""))
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:unsafejs/UnsafeJs.await" && _1.arguments_.length === 1) {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.await" && _1.arguments_.length === 1) {
 const at_ = _1.at_;
 const body_ = _1.arguments_[0].value_;
-const emittedBody_ = ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, body_, async_);
 if(async_) {
-return (("(await " + emittedBody_) + "($task))")
+return (("(await " + ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, body_, async_)) + "($task))")
 } else {
-return (("(" + emittedBody_) + "())")
+return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, ff_compiler_JsEmitter.invokeImmediately_(body_), async_)
 }
 return
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:unsafejs/UnsafeJs.cancelled" && _1.arguments_.length === 0) {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.cancelled" && _1.arguments_.length === 0) {
 const at_ = _1.at_;
 if(async_) {
 return "$task.controller.signal.aborted"
@@ -956,7 +957,7 @@ return "false"
 }
 return
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:unsafejs/UnsafeJs.throwIfCancelled" && _1.arguments_.length === 0) {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.throwIfCancelled" && _1.arguments_.length === 0) {
 const at_ = _1.at_;
 if(async_) {
 return "((() => ff_core_Task.Task_throwIfAborted($task))())"
@@ -965,6 +966,52 @@ return ""
 }
 return
 }
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.inAsync" && _1.arguments_.length === 0) {
+const at_ = _1.at_;
+if(self_.emittingAsync_) {
+return "true"
+} else {
+return "false"
+}
+return
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.inBrowser" && _1.arguments_.length === 0) {
+const at_ = _1.at_;
+if(ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser())) {
+return "true"
+} else {
+return "false"
+}
+return
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.inNode" && _1.arguments_.length === 0) {
+const at_ = _1.at_;
+if(ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitNode())) {
+return "true"
+} else {
+return "false"
+}
+return
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.inBuild" && _1.arguments_.length === 0) {
+const at_ = _1.at_;
+if(ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBuild())) {
+return "true"
+} else {
+return "false"
+}
+return
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.value" && _1.arguments_.length === 1) {
+const at_ = _1.at_;
+const e_ = _1.arguments_[0].value_;
+return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_)
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.fromValue" && _1.arguments_.length === 1) {
+const at_ = _1.at_;
+const e_ = _1.arguments_[0].value_;
+return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_)
+}
 if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Equal.equals" && _1.arguments_.length === 2 && _1.dictionaries_.length === 1 && _1.dictionaries_[0].dictionaries_.length === 0) {
 const at_ = _1.at_;
 const left_ = _1.arguments_[0];
@@ -1331,7 +1378,7 @@ const code_ = _guard1.value_;
 return code_
 }
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:unsafejs/UnsafeJs.throwIfCancelled" && _1.arguments_.length === 0) {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.throwIfCancelled" && _1.arguments_.length === 0) {
 const at_ = _1.at_;
 if(async_) {
 return "ff_core_Task.Task_throwIfAborted($task)"
@@ -2269,23 +2316,22 @@ const x1_ = _1.arguments_[0].value_.name_;
 const x2_ = _1.arguments_[1].value_.name_;
 return ((((((((("(" + ff_compiler_JsEmitter.escapeResolved_(x1_)) + ".array[") + ff_compiler_JsEmitter.escapeResolved_(x2_)) + "] ?? ") + "ff_core_Array.internalGrab_(") + ff_compiler_JsEmitter.escapeResolved_(x1_)) + ", ") + ff_compiler_JsEmitter.escapeResolved_(x2_)) + "))")
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:unsafejs/UnsafeJs.import" && _1.arguments_.length === 1 && _1.arguments_[0].value_.EString) {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.import" && _1.arguments_.length === 1 && _1.arguments_[0].value_.EString) {
 const at_ = _1.at_;
 const url_ = _1.arguments_[0].value_.value_;
 return ff_compiler_JsImporter.JsImporter_add(self_.jsImporter_, ff_core_String.String_replace(url_, "\"", ""))
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:unsafejs/UnsafeJs.await" && _1.arguments_.length === 1) {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.await" && _1.arguments_.length === 1) {
 const at_ = _1.at_;
 const body_ = _1.arguments_[0].value_;
-const emittedBody_ = (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, body_, async_, $task));
 if(async_) {
-return (("(await " + emittedBody_) + "($task))")
+return (("(await " + (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, body_, async_, $task))) + "($task))")
 } else {
-return (("(" + emittedBody_) + "())")
+return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, ff_compiler_JsEmitter.invokeImmediately_(body_), async_, $task))
 }
 return
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:unsafejs/UnsafeJs.cancelled" && _1.arguments_.length === 0) {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.cancelled" && _1.arguments_.length === 0) {
 const at_ = _1.at_;
 if(async_) {
 return "$task.controller.signal.aborted"
@@ -2294,7 +2340,7 @@ return "false"
 }
 return
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:unsafejs/UnsafeJs.throwIfCancelled" && _1.arguments_.length === 0) {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.throwIfCancelled" && _1.arguments_.length === 0) {
 const at_ = _1.at_;
 if(async_) {
 return "((() => ff_core_Task.Task_throwIfAborted($task))())"
@@ -2303,6 +2349,52 @@ return ""
 }
 return
 }
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.inAsync" && _1.arguments_.length === 0) {
+const at_ = _1.at_;
+if(self_.emittingAsync_) {
+return "true"
+} else {
+return "false"
+}
+return
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.inBrowser" && _1.arguments_.length === 0) {
+const at_ = _1.at_;
+if(ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBrowser())) {
+return "true"
+} else {
+return "false"
+}
+return
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.inNode" && _1.arguments_.length === 0) {
+const at_ = _1.at_;
+if(ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitNode())) {
+return "true"
+} else {
+return "false"
+}
+return
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.inBuild" && _1.arguments_.length === 0) {
+const at_ = _1.at_;
+if(ff_compiler_JsEmitter.ff_core_Equal_Equal$ff_compiler_JsEmitter_EmitTarget.equals_(self_.emitTarget_, ff_compiler_JsEmitter.EmitBuild())) {
+return "true"
+} else {
+return "false"
+}
+return
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.value" && _1.arguments_.length === 1) {
+const at_ = _1.at_;
+const e_ = _1.arguments_[0].value_;
+return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, e_, async_, $task))
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.fromValue" && _1.arguments_.length === 1) {
+const at_ = _1.at_;
+const e_ = _1.arguments_[0].value_;
+return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, e_, async_, $task))
+}
 if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Equal.equals" && _1.arguments_.length === 2 && _1.dictionaries_.length === 1 && _1.dictionaries_[0].dictionaries_.length === 0) {
 const at_ = _1.at_;
 const left_ = _1.arguments_[0];
@@ -2669,7 +2761,7 @@ const code_ = _guard1.value_;
 return code_
 }
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:unsafejs/UnsafeJs.throwIfCancelled" && _1.arguments_.length === 0) {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/UnsafeJs.throwIfCancelled" && _1.arguments_.length === 0) {
 const at_ = _1.at_;
 if(async_) {
 return "ff_core_Task.Task_throwIfAborted($task)"

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

@@ -94,6 +94,8 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
+import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
+
 // type JsImporter
 export function JsImporter(imports_) {
 return {imports_};

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

@@ -98,6 +98,8 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
+import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
+
 // type LspHook
 export function LspHook(at_, definedAt_, insertIdentifier_, trackSymbols_, arrayOfResults_) {
 return {at_, definedAt_, insertIdentifier_, trackSymbols_, arrayOfResults_};

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

@@ -118,6 +118,8 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
+import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
+
 // type MainCommand
 const BootstrapCommand$ = {BootstrapCommand: true};
 export function BootstrapCommand() {

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

@@ -94,6 +94,8 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
+import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
+
 // type ModuleCache
 export function ModuleCache(version_, parsedModules_, resolvedModules_, derivedModules_, inferredModules_, emittedModules_) {
 return {version_, parsedModules_, resolvedModules_, derivedModules_, inferredModules_, emittedModules_};