firefly-compiler 0.4.51 → 0.4.52

package/core/HttpClient.ff

@@ -1,87 +1,87 @@
-capability HttpClient {}
-capability FetchBody {}
-capability FetchResponse {}
-data FetchRedirect {
-    RedirectFollow
-    RedirectError
-    RedirectManual
-}
-
-extend self: HttpClient {
-
-    fetch(
-        url: String
-        method: String = "GET"
-        headers: List[Pair[String, String]] = emptyList
-        body: Option[FetchBody] = None
-        redirect: FetchRedirect = RedirectFollow
-        // The rest of the options are only respected by browsers - see the MDN fetch() documentation
-        referrer: Option[String] = None
-        integrity: Option[String] = None
-        mode: Option[String] = None
-        credentials: Option[String] = None
-        cache: Option[String] = None
-        throw: Bool = True
-    ): FetchResponse
-        target js async """
-            try {
-                const options = {headers: {}, signal: $task.controller.signal}
-                options.method = method_
-                headers_.forEach(pair => {options.headers[pair.first_] = pair.second_})
-                if(body_.value_) options.body = body_.value_
-                if(redirect_.RedirectError) options.redirect = "error"
-                else if(redirect_.RedirectManual) options.redirect = "manual"
-                if(referrer_.value_) options.referrer = referrer_.value_
-                if(integrity_.value_) options.integrity = integrity_.value_
-                if(mode_.value_) options.mode = mode_.value_
-                if(credentials_.value_) options.credentials = credentials_.value_
-                if(cache_.value_) options.cache = cache_.value_
-                let result = await fetch(url_, options)
-                if(throw_ && !result.ok) throw new Error("Unexpected HTTP status code: " + result.status)
-                return result
-            } finally {
-                if($task.controller.signal.aborted) $task.controller = new AbortController()
-            }
-        """
-
-}
-
-emptyList: List[Pair[String, String]] = [] // TODO: Why won't this type check when inlined? Probably some dangling unification variable?
-
-bodyText(body: String): FetchBody
-    target js sync "return body_"
-    target js async "return body_"
-
-bodyBuffer(body: Buffer): FetchBody
-    target js sync "return body_"
-    target js async "return body_"
-
-extend self: FetchResponse {
-
-    ok(): Bool
-        target js async "return self_.ok"
-
-    status(): Int
-        target js async "return self_.status"
-
-    statusText(): String
-        target js async "return self_.statusText"
-
-    header(name: String): Option[String]
-        target js async """
-            const header = self_.headers.get(name_)
-            return header != null
-                ? ff_core_Option.Some(header)
-                : ff_core_Option.None()
-        """
-
-    readText(): String
-        target js async "return await self_.text()"
-
-    readJson(): Json
-        target js async "return await self_.json()"
-
-    readBuffer(): Buffer
-        target js async "return new DataView(await self_.arrayBuffer())"
-
-}
+capability HttpClient {}
+capability FetchBody {}
+capability FetchResponse {}
+data FetchRedirect {
+    RedirectFollow
+    RedirectError
+    RedirectManual
+}
+
+extend self: HttpClient {
+
+    fetch(
+        url: String
+        method: String = "GET"
+        headers: List[Pair[String, String]] = emptyList
+        body: Option[FetchBody] = None
+        redirect: FetchRedirect = RedirectFollow
+        // The rest of the options are only respected by browsers - see the MDN fetch() documentation
+        referrer: Option[String] = None
+        integrity: Option[String] = None
+        mode: Option[String] = None
+        credentials: Option[String] = None
+        cache: Option[String] = None
+        throw: Bool = True
+    ): FetchResponse
+        target js async """
+            try {
+                const options = {headers: {}, signal: $task.controller.signal}
+                options.method = method_
+                headers_.forEach(pair => {options.headers[pair.first_] = pair.second_})
+                if(body_.value_) options.body = body_.value_
+                if(redirect_.RedirectError) options.redirect = "error"
+                else if(redirect_.RedirectManual) options.redirect = "manual"
+                if(referrer_.value_) options.referrer = referrer_.value_
+                if(integrity_.value_) options.integrity = integrity_.value_
+                if(mode_.value_) options.mode = mode_.value_
+                if(credentials_.value_) options.credentials = credentials_.value_
+                if(cache_.value_) options.cache = cache_.value_
+                let result = await fetch(url_, options)
+                if(throw_ && !result.ok) throw new Error("Unexpected HTTP status code: " + result.status)
+                return result
+            } finally {
+                if($task.controller.signal.aborted) $task.controller = new AbortController()
+            }
+        """
+
+}
+
+emptyList: List[Pair[String, String]] = [] // TODO: Why won't this type check when inlined? Probably some dangling unification variable?
+
+bodyText(body: String): FetchBody
+    target js sync "return body_"
+    target js async "return body_"
+
+bodyBuffer(body: Buffer): FetchBody
+    target js sync "return body_"
+    target js async "return body_"
+
+extend self: FetchResponse {
+
+    ok(): Bool
+        target js async "return self_.ok"
+
+    status(): Int
+        target js async "return self_.status"
+
+    statusText(): String
+        target js async "return self_.statusText"
+
+    header(name: String): Option[String]
+        target js async """
+            const header = self_.headers.get(name_)
+            return header != null
+                ? ff_core_Option.Some(header)
+                : ff_core_Option.None()
+        """
+
+    readText(): String
+        target js async "return await self_.text()"
+
+    readJson(): Json
+        target js async "return await self_.json()"
+
+    readBuffer(): Buffer
+        target js async "return new DataView(await self_.arrayBuffer())"
+
+}

package/core/JsSystem.ff

@@ -1,69 +1,69 @@
-class JsSystem {} // TODO: It has to be async if the async ffi is to be called - solve in the compiler?
-
-extend self: JsSystem {
-
-    global(): JsValue
-        target js sync "return self_"
-
-    parseJson(json: String): JsValue
-        target js sync "return JSON.parse(json_)"
-
-    null(): JsValue
-        target js sync "return null"
-
-    undefined(): JsValue
-        target js sync "return void 0"
-
-    value[T: IsJsValue](jsValue: T): JsValue
-        target js sync "return jsValue_"
-
-    object(): JsValue
-        target js sync "return {}"
-
-    array(values: List[JsValue]): JsValue
-        target js sync "return values_.slice()"
-        
-    json(value: Json): JsValue
-        target js sync "return value_"
-
-    function0[R](body: () => R): JsValue
-        target js sync "return body_"
-        target js async "return () => body_($task)"
-
-    function1[R](body: JsValue => R): JsValue
-        target js sync "return body_"
-        target js async "return a1 => body_(a1, $task)"
-
-    function2[R](body: (JsValue, JsValue) => R): JsValue
-        target js sync "return body_"
-        target js async "return (a1, a2) => body_(a1, a2, $task)"
-
-    function3[R](body: (JsValue, JsValue, JsValue) => R): JsValue
-        target js sync "return body_"
-        target js async "return (a1, a2, a3) => body_(a1, a2, a3, $task)"
-
-    function4[R](body: (JsValue, JsValue, JsValue, JsValue) => R): JsValue
-        target js sync "return body_"
-        target js async "return (a1, a2, a3, a4) => body_(a1, a2, a3, a4, $task)"
-
-    function5[R](body: (JsValue, JsValue, JsValue, JsValue, JsValue) => R): JsValue
-        target js sync "return body_"
-        target js async "return (a1, a2, a3, a4, a5) => body_(a1, a2, a3, a4, a5, $task)"
-
-    function6[R](body: (JsValue, JsValue, JsValue, JsValue, JsValue, JsValue) => R): JsValue
-        target js sync "return body_"
-        target js async "return (a1, a2, a3, a4, a5, a6) => body_(a1, a2, a3, a4, a5, a6, $task)"
-
-    function7[R](body: (JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue) => R): JsValue
-        target js sync "return body_"
-        target js async "return (a1, a2, a3, a4, a5, a6, a7) => body_(a1, a2, a3, a4, a5, a6, a7, $task)"
-
-    function8[R](body: (JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue) => R): JsValue
-        target js sync "return body_"
-        target js async "return (a1, a2, a3, a4, a5, a6, a7, a8) => body_(a1, a2, a3, a4, a5, a6, a7, a8, $task)"
-
-    function9[R](body: (JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue) => R): JsValue
-        target js sync "return body_"
-        target js async "return (a1, a2, a3, a4, a5, a6, a7, a8, a9) => body_(a1, a2, a3, a4, a5, a6, a7, a8, a9, $task)"
-
-}
+class JsSystem {} // TODO: It has to be async if the async ffi is to be called - solve in the compiler?
+
+extend self: JsSystem {
+
+    global(): JsValue
+        target js sync "return self_"
+
+    parseJson(json: String): JsValue
+        target js sync "return JSON.parse(json_)"
+
+    null(): JsValue
+        target js sync "return null"
+
+    undefined(): JsValue
+        target js sync "return void 0"
+
+    value[T: IsJsValue](jsValue: T): JsValue
+        target js sync "return jsValue_"
+
+    object(): JsValue
+        target js sync "return {}"
+
+    array(values: List[JsValue]): JsValue
+        target js sync "return values_.slice()"
+        
+    json(value: Json): JsValue
+        target js sync "return value_"
+
+    function0[R](body: () => R): JsValue
+        target js sync "return body_"
+        target js async "return () => body_($task)"
+
+    function1[R](body: JsValue => R): JsValue
+        target js sync "return body_"
+        target js async "return a1 => body_(a1, $task)"
+
+    function2[R](body: (JsValue, JsValue) => R): JsValue
+        target js sync "return body_"
+        target js async "return (a1, a2) => body_(a1, a2, $task)"
+
+    function3[R](body: (JsValue, JsValue, JsValue) => R): JsValue
+        target js sync "return body_"
+        target js async "return (a1, a2, a3) => body_(a1, a2, a3, $task)"
+
+    function4[R](body: (JsValue, JsValue, JsValue, JsValue) => R): JsValue
+        target js sync "return body_"
+        target js async "return (a1, a2, a3, a4) => body_(a1, a2, a3, a4, $task)"
+
+    function5[R](body: (JsValue, JsValue, JsValue, JsValue, JsValue) => R): JsValue
+        target js sync "return body_"
+        target js async "return (a1, a2, a3, a4, a5) => body_(a1, a2, a3, a4, a5, $task)"
+
+    function6[R](body: (JsValue, JsValue, JsValue, JsValue, JsValue, JsValue) => R): JsValue
+        target js sync "return body_"
+        target js async "return (a1, a2, a3, a4, a5, a6) => body_(a1, a2, a3, a4, a5, a6, $task)"
+
+    function7[R](body: (JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue) => R): JsValue
+        target js sync "return body_"
+        target js async "return (a1, a2, a3, a4, a5, a6, a7) => body_(a1, a2, a3, a4, a5, a6, a7, $task)"
+
+    function8[R](body: (JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue) => R): JsValue
+        target js sync "return body_"
+        target js async "return (a1, a2, a3, a4, a5, a6, a7, a8) => body_(a1, a2, a3, a4, a5, a6, a7, a8, $task)"
+
+    function9[R](body: (JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue, JsValue) => R): JsValue
+        target js sync "return body_"
+        target js async "return (a1, a2, a3, a4, a5, a6, a7, a8, a9) => body_(a1, a2, a3, a4, a5, a6, a7, a8, a9, $task)"
+
+}