firefly-compiler 0.4.83 → 0.4.85

package/core/JsSystem.ff

@@ -1,8 +1,8 @@
-class JsSystem {} // TODO: It has to be async if the async ffi is to be called - solve in the compiler?
+class JsSystem {}
 
 extend self: JsSystem {
 
-    global(): JsValue
+    globalThis(): JsValue
         target js sync "return self_"
 
     get(key: String): JsValue
@@ -16,6 +16,36 @@ extend self: JsSystem {
         
     decrement[V: IsJsValue](key: String, value: V): Unit
         target js sync "self_[key_] -= value_"
+
+    call0(name: String): JsValue
+        target js sync "return self_[name_].call(void 0)"
+
+    call1[A1: IsJsValue](name: String, a1: A1): JsValue
+        target js sync "return self_[name_].call(void 0, a1_)"
+
+    call2[A1: IsJsValue, A2: IsJsValue](name: String, a1: A1, a2: A2): JsValue
+        target js sync "return self_[name_].call(void 0, a1_, a2_)"
+
+    call3[A1: IsJsValue, A2: IsJsValue, A3: IsJsValue](name: String, a1: A1, a2: A2, a3: A3): JsValue
+        target js sync "return self_[name_].call(void 0, a1_, a2_, a3_)"
+
+    call4[A1: IsJsValue, A2: IsJsValue, A3: IsJsValue, A4: IsJsValue](name: String, a1: A1, a2: A2, a3: A3, a4: A4): JsValue
+        target js sync "return self_[name_].call(void 0, a1_, a2_, a3_, a4_)"
+
+    call5[A1: IsJsValue, A2: IsJsValue, A3: IsJsValue, A4: IsJsValue, A5: IsJsValue](name: String, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): JsValue
+        target js sync "return self_[name_].call(void 0, a1_, a2_, a3_, a4_, a5_)"
+
+    call6[A1: IsJsValue, A2: IsJsValue, A3: IsJsValue, A4: IsJsValue, A5: IsJsValue, A6: IsJsValue](name: String, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): JsValue
+        target js sync "return self_[name_].call(void 0, a1_, a2_, a3_, a4_, a5_, a6_)"
+
+    call7[A1: IsJsValue, A2: IsJsValue, A3: IsJsValue, A4: IsJsValue, A5: IsJsValue, A6: IsJsValue, A7: IsJsValue](name: String, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7): JsValue
+        target js sync "return self_[name_].call(void 0, a1_, a2_, a3_, a4_, a5_, a6_, a7_)"
+
+    call8[A1: IsJsValue, A2: IsJsValue, A3: IsJsValue, A4: IsJsValue, A5: IsJsValue, A6: IsJsValue, A7: IsJsValue, A8: IsJsValue](name: String, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7, a8: A8): JsValue
+        target js sync "return self_[name_].call(void 0, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_)"
+
+    call9[A1: IsJsValue, A2: IsJsValue, A3: IsJsValue, A4: IsJsValue, A5: IsJsValue, A6: IsJsValue, A7: IsJsValue, A8: IsJsValue, A9: IsJsValue](name: String, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7, a8: A8, a9: A9): JsValue
+        target js sync "return self_[name_].call(void 0, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_)"
         
     parseJson(json: String): JsValue
         target js sync "return JSON.parse(json_)"

package/core/Json.ff

@@ -184,7 +184,7 @@ extend self: Json {
 
     index(key: Int): Json
         target js sync """
-            return Array.isArray(self_) ? self_[key] ?? null : null;
+            return Array.isArray(self_) ? self_[key_] ?? null : null;
         """
 
     hasField(key: String): Bool

package/experimental/rhymeapp/Main.ff

@@ -3,7 +3,7 @@ import HttpServer from ff:httpserver
 
 browserMain(system: BrowserSystem): Unit {
 
-    let document = system.js().global().get("document")
+    let document = system.js().globalThis().get("document")
     let input = document.call1("getElementById", "input")
     let output = document.call1("getElementById", "output")
     let button = document.call1("getElementById", "button")

package/fireflysite/Guide.ff

@@ -413,6 +413,7 @@ renderHighlightedCode(lux: Lux, code: String) {
                     | LString => Styles.codeStringCss
                     | LUpper => Styles.codeTypeCss
                     | LWildcard => Styles.codeVariableCss
+                    | LLower {tokens.get(index - 1).any {_.kind == LArrowThin}} => Styles.codeStringCss
                     | LLower {tokens.get(index - 1).any {t => 
                         t.kind == LBracketRight || t.kind == LDot
                     }} => Styles.codeCallCss

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

@@ -12,14 +12,16 @@ Most JavaScript functionality can be accessed via the `JsSystem` object.
 
 ```firefly
 browserMain(system: BrowserSystem): Unit {
-    let document = system.js().global().get("document")
-    let element = document.call1("getElementById", "my-id")
-    element.set("innerText", "Hi!")
+    let document = system.js()->document
+    let element = document->getElementById("my-id")
+    element->innerText = "Hi!"
 }
 ```
 
 This example gets the global `document`, calls `getElementId("my-id")` on it, and sets `innerText = "Hi!"`.
 
+The `->` is shorthand for calling the methods `get`, `set`, `increment`, `decrement`, `call1` etc.
+
 The type of the `document` and `element` variables here is `JsValue`, which represents an arbitrary JavaScript value.
 
 

package/lsp/CompletionHandler.ff

@@ -770,8 +770,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
                 ""
                 "browserMain(system: BrowserSystem): Unit {"
                 "    let message = system.httpClient().get(\"http://localhost:8080/hello\", []) {_.readText()}"
-                "    let window = system.js().global().get(\"window\")"
-                "    window.call1(\"alert\", message)"
+                "    system.js()->alert(message)"
                 "}"
                 ""
                 "nodeMain(system: NodeSystem): Unit {"

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

@@ -99,7 +99,7 @@ import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
 
 
-export function JsSystem_global(self_) {
+export function JsSystem_globalThis(self_) {
 return self_
 }
 
@@ -119,6 +119,46 @@ export function JsSystem_decrement(self_, key_, value_, ff_core_JsValue_IsJsValu
 self_[key_] -= value_
 }
 
+export function JsSystem_call0(self_, name_) {
+return self_[name_].call(void 0)
+}
+
+export function JsSystem_call1(self_, name_, a1_, ff_core_JsValue_IsJsValue$A1) {
+return self_[name_].call(void 0, a1_)
+}
+
+export function JsSystem_call2(self_, name_, a1_, a2_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2) {
+return self_[name_].call(void 0, a1_, a2_)
+}
+
+export function JsSystem_call3(self_, name_, a1_, a2_, a3_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3) {
+return self_[name_].call(void 0, a1_, a2_, a3_)
+}
+
+export function JsSystem_call4(self_, name_, a1_, a2_, a3_, a4_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4) {
+return self_[name_].call(void 0, a1_, a2_, a3_, a4_)
+}
+
+export function JsSystem_call5(self_, name_, a1_, a2_, a3_, a4_, a5_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4, ff_core_JsValue_IsJsValue$A5) {
+return self_[name_].call(void 0, a1_, a2_, a3_, a4_, a5_)
+}
+
+export function JsSystem_call6(self_, name_, a1_, a2_, a3_, a4_, a5_, a6_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4, ff_core_JsValue_IsJsValue$A5, ff_core_JsValue_IsJsValue$A6) {
+return self_[name_].call(void 0, a1_, a2_, a3_, a4_, a5_, a6_)
+}
+
+export function JsSystem_call7(self_, name_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4, ff_core_JsValue_IsJsValue$A5, ff_core_JsValue_IsJsValue$A6, ff_core_JsValue_IsJsValue$A7) {
+return self_[name_].call(void 0, a1_, a2_, a3_, a4_, a5_, a6_, a7_)
+}
+
+export function JsSystem_call8(self_, name_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4, ff_core_JsValue_IsJsValue$A5, ff_core_JsValue_IsJsValue$A6, ff_core_JsValue_IsJsValue$A7, ff_core_JsValue_IsJsValue$A8) {
+return self_[name_].call(void 0, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_)
+}
+
+export function JsSystem_call9(self_, name_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4, ff_core_JsValue_IsJsValue$A5, ff_core_JsValue_IsJsValue$A6, ff_core_JsValue_IsJsValue$A7, ff_core_JsValue_IsJsValue$A8, ff_core_JsValue_IsJsValue$A9) {
+return self_[name_].call(void 0, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_)
+}
+
 export function JsSystem_parseJson(self_, json_) {
 return JSON.parse(json_)
 }
@@ -187,8 +227,8 @@ export function JsSystem_function9(self_, body_) {
 return body_
 }
 
-export async function JsSystem_global$(self_, $task) {
-throw new Error('Function JsSystem_global is missing on this target in async context.');
+export async function JsSystem_globalThis$(self_, $task) {
+throw new Error('Function JsSystem_globalThis is missing on this target in async context.');
 }
 
 export async function JsSystem_get$(self_, key_, $task) {
@@ -207,6 +247,46 @@ export async function JsSystem_decrement$(self_, key_, value_, ff_core_JsValue_I
 throw new Error('Function JsSystem_decrement is missing on this target in async context.');
 }
 
+export async function JsSystem_call0$(self_, name_, $task) {
+throw new Error('Function JsSystem_call0 is missing on this target in async context.');
+}
+
+export async function JsSystem_call1$(self_, name_, a1_, ff_core_JsValue_IsJsValue$A1, $task) {
+throw new Error('Function JsSystem_call1 is missing on this target in async context.');
+}
+
+export async function JsSystem_call2$(self_, name_, a1_, a2_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, $task) {
+throw new Error('Function JsSystem_call2 is missing on this target in async context.');
+}
+
+export async function JsSystem_call3$(self_, name_, a1_, a2_, a3_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, $task) {
+throw new Error('Function JsSystem_call3 is missing on this target in async context.');
+}
+
+export async function JsSystem_call4$(self_, name_, a1_, a2_, a3_, a4_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4, $task) {
+throw new Error('Function JsSystem_call4 is missing on this target in async context.');
+}
+
+export async function JsSystem_call5$(self_, name_, a1_, a2_, a3_, a4_, a5_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4, ff_core_JsValue_IsJsValue$A5, $task) {
+throw new Error('Function JsSystem_call5 is missing on this target in async context.');
+}
+
+export async function JsSystem_call6$(self_, name_, a1_, a2_, a3_, a4_, a5_, a6_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4, ff_core_JsValue_IsJsValue$A5, ff_core_JsValue_IsJsValue$A6, $task) {
+throw new Error('Function JsSystem_call6 is missing on this target in async context.');
+}
+
+export async function JsSystem_call7$(self_, name_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4, ff_core_JsValue_IsJsValue$A5, ff_core_JsValue_IsJsValue$A6, ff_core_JsValue_IsJsValue$A7, $task) {
+throw new Error('Function JsSystem_call7 is missing on this target in async context.');
+}
+
+export async function JsSystem_call8$(self_, name_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4, ff_core_JsValue_IsJsValue$A5, ff_core_JsValue_IsJsValue$A6, ff_core_JsValue_IsJsValue$A7, ff_core_JsValue_IsJsValue$A8, $task) {
+throw new Error('Function JsSystem_call8 is missing on this target in async context.');
+}
+
+export async function JsSystem_call9$(self_, name_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, ff_core_JsValue_IsJsValue$A1, ff_core_JsValue_IsJsValue$A2, ff_core_JsValue_IsJsValue$A3, ff_core_JsValue_IsJsValue$A4, ff_core_JsValue_IsJsValue$A5, ff_core_JsValue_IsJsValue$A6, ff_core_JsValue_IsJsValue$A7, ff_core_JsValue_IsJsValue$A8, ff_core_JsValue_IsJsValue$A9, $task) {
+throw new Error('Function JsSystem_call9 is missing on this target in async context.');
+}
+
 export async function JsSystem_parseJson$(self_, json_, $task) {
 throw new Error('Function JsSystem_parseJson is missing on this target in async context.');
 }

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

@@ -452,7 +452,7 @@ export function Json_field(self_, key_) {
 
 export function Json_index(self_, key_) {
 
-            return Array.isArray(self_) ? self_[key] ?? null : null;
+            return Array.isArray(self_) ? self_[key_] ?? null : null;
         
 }
 

package/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly compiler",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.4.83",
+    "version": "0.4.85",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"

package/postgresql/Pg.ff

@@ -190,7 +190,7 @@ extend self: PgStatement {
     }
 
     withInstant(name: String, value: Instant): PgStatement {
-        let jsDate = UnsafeJs.jsSystem().global().get("Date")
+        let jsDate = UnsafeJs.jsSystem().globalThis().get("Date")
         function toJsDate(instant: Instant): JsValue {
             jsDate.new1(instant.since1970.seconds * 1000.0)
         }
@@ -199,7 +199,7 @@ extend self: PgStatement {
     }
 
     withNullableInstant(name: String, value: Option[Instant]): PgStatement {
-        let jsDate = UnsafeJs.jsSystem().global().get("Date")
+        let jsDate = UnsafeJs.jsSystem().globalThis().get("Date")
         function toJsDate(instant: Instant): JsValue {
             jsDate.new1(instant.since1970.seconds * 1000.0)
         }
@@ -258,7 +258,7 @@ extend self: PgStatement {
     }
 
     withInstantArray(name: String, value: List[Instant]): PgStatement {
-        let jsDate = UnsafeJs.jsSystem().global().get("Date")
+        let jsDate = UnsafeJs.jsSystem().globalThis().get("Date")
         function toJsDate(instant: Instant): JsValue {
             jsDate.new1(instant.since1970.seconds * 1000.0)
         }
@@ -267,7 +267,7 @@ extend self: PgStatement {
     }
 
     withNullableInstantArray(name: String, value: Option[List[Instant]]): PgStatement {
-        let jsDate = UnsafeJs.jsSystem().global().get("Date")
+        let jsDate = UnsafeJs.jsSystem().globalThis().get("Date")
         function toJsDate(instant: Instant): JsValue {
             jsDate.new1(instant.since1970.seconds * 1000.0)
         }

package/vscode/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly language support",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.4.83",
+    "version": "0.4.85",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"

package/vscode/snippets.json

@@ -43,7 +43,7 @@
 			"",
 			"browserMain(system: BrowserSystem): Unit {",
 			"    let response = system.httpClient().fetch(\"http://localhost:8080/hello\")",
-			"    let window = system.js().global().get(\"window\")",
+			"    let window = system.js().globalThis().get(\"window\")",
 			"    window.call1(\"alert\", response.readText())",
 			"}",
 			"",