firefly-compiler 0.4.77 → 0.4.79

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

@@ -110,36 +110,36 @@ return ff_core_Random.newFromFloat_(seed_)
 }
 
 export function newFromBuffer_(buffer_) {
-
-        var n = 0xefc8249d;
-        function mash(data) {
-            for(var i = 0; i < data.byteLength; i++) {
-                n += data.getUint8(i);
-                var h = 0.02519603282416938 * n;
-                n = h >>> 0;
-                h -= n;
-                h *= n;
-                n = h >>> 0;
-                h -= n;
-                n += h * 0x100000000; // 2^32
-            }
-            return (n >>> 0) * 2.3283064365386963e-10; // 2^-32
-        }
-        var space = new DataView(new Uint8Array([32]).buffer);
-        var r = {
-            s0: mash(space),
-            s1: mash(space),
-            s2: mash(space),
-            c: 1,
-            spareGauss: NaN
-        };
-        r.s0 -= mash(buffer_);
-        if(r.s0 < 0) r.s0 += 1;
-        r.s1 -= mash(buffer_);
-        if(r.s1 < 0) r.s1 += 1;
-        r.s2 -= mash(buffer_);
-        if(r.s2 < 0) r.s2 += 1;
-        return r;
+
+        var n = 0xefc8249d;
+        function mash(data) {
+            for(var i = 0; i < data.byteLength; i++) {
+                n += data.getUint8(i);
+                var h = 0.02519603282416938 * n;
+                n = h >>> 0;
+                h -= n;
+                h *= n;
+                n = h >>> 0;
+                h -= n;
+                n += h * 0x100000000; // 2^32
+            }
+            return (n >>> 0) * 2.3283064365386963e-10; // 2^-32
+        }
+        var space = new DataView(new Uint8Array([32]).buffer);
+        var r = {
+            s0: mash(space),
+            s1: mash(space),
+            s2: mash(space),
+            c: 1,
+            spareGauss: NaN
+        };
+        r.s0 -= mash(buffer_);
+        if(r.s0 < 0) r.s0 += 1;
+        r.s1 -= mash(buffer_);
+        if(r.s1 < 0) r.s1 += 1;
+        r.s2 -= mash(buffer_);
+        if(r.s2 < 0) r.s2 += 1;
+        return r;
     
 }
 
@@ -162,24 +162,24 @@ throw new Error('Function newFromBuffer is missing on this target in async conte
 }
 
 export function Random_copy(self_) {
-
-            return {...self_};
+
+            return {...self_};
         
 }
 
 export function Random_nextInt(self_, from_, until_) {
-
-            return Random_nextFloat(self_, from_, until_) | 0;
+
+            return Random_nextFloat(self_, from_, until_) | 0;
         
 }
 
 export function Random_nextFloat(self_, from_, until_) {
-
-            var t = 2091639 * self_.s0 + self_.c * 2.3283064365386963e-10; // 2^-32
-            self_.s0 = self_.s1;
-            self_.s1 = self_.s2;
-            var uniform = self_.s2 = t - (self_.c = t | 0);
-            return from_ + uniform * (until_ - from_);
+
+            var t = 2091639 * self_.s0 + self_.c * 2.3283064365386963e-10; // 2^-32
+            self_.s0 = self_.s1;
+            self_.s1 = self_.s2;
+            var uniform = self_.s2 = t - (self_.c = t | 0);
+            return from_ + uniform * (until_ - from_);
         
 }
 
@@ -194,22 +194,22 @@ ff_core_Buffer.Buffer_setUint8(buffer_, i_, ff_core_Random.Random_nextInt(self_,
 }
 
 export function Random_nextGauss(self_, mean_, standardDeviation_) {
-
-            if(!isNaN(self_.spareGauss)) {
-                const result = self_.spareGauss * standardDeviation_ + mean_;
-                self_.spareGauss = NaN;
-                return result;
-            } else {
-                let u = 0.5, v = 0.5, s = 0.5;
-                do {
-                    u = Random_nextFloat(self_, 0.0, 1.0) * 2 - 1;
-                    v = Random_nextFloat(self_, 0.0, 1.0) * 2 - 1;
-                    s = u * u + v * v;
-                } while(s >= 1 || s == 0);
-                s = Math.sqrt(-2.0 * Math.log(s) / s);
-                self_.spareGauss = v * s;
-                return mean_ + standardDeviation_ * u * s;
-            }
+
+            if(!isNaN(self_.spareGauss)) {
+                const result = self_.spareGauss * standardDeviation_ + mean_;
+                self_.spareGauss = NaN;
+                return result;
+            } else {
+                let u = 0.5, v = 0.5, s = 0.5;
+                do {
+                    u = Random_nextFloat(self_, 0.0, 1.0) * 2 - 1;
+                    v = Random_nextFloat(self_, 0.0, 1.0) * 2 - 1;
+                    s = u * u + v * v;
+                } while(s >= 1 || s == 0);
+                s = Math.sqrt(-2.0 * Math.log(s) / s);
+                self_.spareGauss = v * s;
+                return mean_ + standardDeviation_ * u * s;
+            }
         
 }
 

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

@@ -329,6 +329,16 @@ export function String_all(self_, body_) {
         
 }
 
+export function String_filter(self_, body_) {
+
+            const result = [];
+            for(let i = 0; i < self_.length; i++) {
+                if(body_(self_.charCodeAt(i))) result.push(self_.charAt(i));
+            }
+            return result.join("");
+        
+}
+
 export function String_toBuffer(self_) {
 
             const encoded = new TextEncoder().encode(self_)
@@ -510,6 +520,16 @@ export async function String_all$(self_, body_, $task) {
         
 }
 
+export async function String_filter$(self_, body_, $task) {
+
+            const result = [];
+            for(let i = 0; i < self_.length; i++) {
+                if(await body_(self_.charCodeAt(i))) result.push(self_.charAt(i));
+            }
+            return result.join("");
+        
+}
+
 export async function String_toBuffer$(self_, $task) {
 throw new Error('Function String_toBuffer is missing on this target in async context.');
 }

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

@@ -100,39 +100,39 @@ import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
 
 export function Task_spawn(self_, body_) {
-
-            ff_core_Task.Task_throwIfAborted(self_)
-            const task = {controller: new AbortController(), subtasks: new Set(), started: performance.now() * 0.001}
-            self_.subtasks.add(task)
-            task.promise = Promise.resolve(task).then(async () => {
-                try {
-                    await body_(task, task)
-                } catch(e) {
-                    await ff_core_Task.Task_abort$(self_)
-                    throw e
-                } finally {
-                    for(const subtask of task.subtasks) subtask.controller.abort()
-                    await Promise.allSettled([...task.subtasks].map(subtask => subtask.promise))
-                    self_.subtasks.delete(task)
-                }
-            })
-            return task
+
+            ff_core_Task.Task_throwIfAborted(self_)
+            const task = {controller: new AbortController(), subtasks: new Set(), started: performance.now() * 0.001}
+            self_.subtasks.add(task)
+            task.promise = Promise.resolve(task).then(async () => {
+                try {
+                    await body_(task, task)
+                } catch(e) {
+                    await ff_core_Task.Task_abort$(self_)
+                    throw e
+                } finally {
+                    for(const subtask of task.subtasks) subtask.controller.abort()
+                    await Promise.allSettled([...task.subtasks].map(subtask => subtask.promise))
+                    self_.subtasks.delete(task)
+                }
+            })
+            return task
         
 }
 
 export function Task_throwIfAborted(self_) {
-
-            if(self_.controller.signal.aborted) {
-                const signal = self_.controller.signal
-                self_.controller = new AbortController()
-                signal.throwIfAborted()
-            }
+
+            if(self_.controller.signal.aborted) {
+                const signal = self_.controller.signal
+                self_.controller = new AbortController()
+                signal.throwIfAborted()
+            }
         
 }
 
 export function Task_abort(self_) {
-
-            self_.controller.abort()
+
+            self_.controller.abort()
         
 }
 
@@ -161,20 +161,20 @@ return ff_core_Pair.Pair(result_, duration_)
 }
 
 export async function Task_spawn$(self_, body_, $task) {
-
-            return ff_core_Task.Task_spawn(self_, body_)
+
+            return ff_core_Task.Task_spawn(self_, body_)
         
 }
 
 export async function Task_throwIfAborted$(self_, $task) {
-
-            ff_core_Task.Task_throwIfAborted(self_)
+
+            ff_core_Task.Task_throwIfAborted(self_)
         
 }
 
 export async function Task_abort$(self_, $task) {
-
-            self_.controller.abort()
+
+            self_.controller.abort()
         
 }
 

package/package.json

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

package/rpc/.firefly/package.ff

@@ -1 +1 @@
-package ff:rpc:0.0.0
+package ff:rpc:0.0.0

package/rpc/Rpc.ff

@@ -1,70 +1,70 @@
-trait I: Rpc[O] {}
-
-capability RpcServer[I, O, C](
-    handlers: StringMap[(C, I) => O]
-)
-
-newServer[I, O, C](): RpcServer[I, O, C] {
-    RpcServer(StringMap.new())
-}
-
-extend self[I, O, C]: RpcServer[I, O, C] {
-    handle(name: String, context: C, input: I): Option[O] {
-        self.handlers.get(name).map {handler =>
-            handler(context, input)
-        }
-    }
-    
-    addCustom(
-        handler: (C, I) => O
-    ): Unit {
-        let name = "TODO"
-        self.handlers.set(name) {context, input =>
-            handler(context, input)
-        }
-    }
-}
-
-extend self[C]: RpcServer[Buffer, Buffer, C] {
-    add[I: Rpc[O]: HasAnyTag: Serializable, O: Serializable](
-        handler: (C, I) => O
-    ): Unit {
-        let name = Any.anyTag[I]().show()
-        self.handlers.set(name) {context, message =>
-            let input = Serializable.deserialize(message)
-            let output = handler(context, input)
-            Serializable.serialize(output)
-        }
-    }
-}
-
-capability RpcClient(
-    binaryCall: (String, Buffer) => Buffer
-)
-
-extend self: RpcClient {
-    call[I: Rpc[O]: HasAnyTag: Serializable, O: Serializable](
-        message: I
-    ): O {
-        let name = Any.anyTag[I]().show()
-        let input = Serializable.serialize(message)
-        let response = self.binaryCall(name, input)
-        Serializable.deserialize(response)
-    }
-}
-
-newClient(
-    httpClient: HttpClient
-    prefix: String
-    method: String = "POST"
-): RpcClient {
-    RpcClient {name, buffer =>
-        httpClient.fetch(
-            method = method
-            url = prefix + name
-            headers = []
-            payload = Some(buffer)
-            options = FetchOptions()
-        ) {_.readBuffer()}
-    }
-}
+trait I: Rpc[O] {}
+
+capability RpcServer[I, O, C](
+    handlers: StringMap[(C, I) => O]
+)
+
+newServer[I, O, C](): RpcServer[I, O, C] {
+    RpcServer(StringMap.new())
+}
+
+extend self[I, O, C]: RpcServer[I, O, C] {
+    handle(name: String, context: C, input: I): Option[O] {
+        self.handlers.get(name).map {handler =>
+            handler(context, input)
+        }
+    }
+    
+    addCustom(
+        handler: (C, I) => O
+    ): Unit {
+        let name = "TODO"
+        self.handlers.set(name) {context, input =>
+            handler(context, input)
+        }
+    }
+}
+
+extend self[C]: RpcServer[Buffer, Buffer, C] {
+    add[I: Rpc[O]: HasAnyTag: Serializable, O: Serializable](
+        handler: (C, I) => O
+    ): Unit {
+        let name = Any.anyTag[I]().show()
+        self.handlers.set(name) {context, message =>
+            let input = Serializable.deserialize(message)
+            let output = handler(context, input)
+            Serializable.serialize(output)
+        }
+    }
+}
+
+capability RpcClient(
+    binaryCall: (String, Buffer) => Buffer
+)
+
+extend self: RpcClient {
+    call[I: Rpc[O]: HasAnyTag: Serializable, O: Serializable](
+        message: I
+    ): O {
+        let name = Any.anyTag[I]().show()
+        let input = Serializable.serialize(message)
+        let response = self.binaryCall(name, input)
+        Serializable.deserialize(response)
+    }
+}
+
+newClient(
+    httpClient: HttpClient
+    prefix: String
+    method: String = "POST"
+): RpcClient {
+    RpcClient {name, buffer =>
+        httpClient.fetch(
+            method = method
+            url = prefix + name
+            headers = []
+            payload = Some(buffer)
+            options = FetchOptions()
+        ) {_.readBuffer()}
+    }
+}

package/s3/.firefly/package.ff

@@ -1 +1 @@
-package ff:s3:0.0.0
+package ff:s3:0.0.0

package/s3/S3.ff

@@ -1,94 +1,94 @@
-put(
-    system: NodeSystem
-    accessKeyId: String
-    secretAccessKey: String
-    region: String
-    bucket: String
-    objectKey: String
-    body: Buffer
-    headers: List[Pair[String, String]]
-): Unit {
-    let now = system.mainTask().now()
-    let amzDate = toIsoString(now)
-    let contentHash = system.crypto().sha256(body).toHex()
-    let host = bucket + ".s3.amazonaws.com"
-    let encodedKey = encode(objectKey)
-    let canonicalHeaders = [
-        Pair("host", host)
-        Pair("x-amz-date", amzDate)
-        Pair("x-amz-content-sha256", contentHash)
-        ...headers
-    ]
-    let authenticationHeader = makeS3AuthorizationHeader(system, accessKeyId, secretAccessKey, region, bucket, encodedKey, body, canonicalHeaders, amzDate)
-    let allHeaders = [...canonicalHeaders, Pair("Authorization", authenticationHeader)]
-    
-    let url = "https://" + host + "/" + encodedKey
-    system.httpClient().put(url, allHeaders, body) {response => 
-        if(!response.ok()) {
-            panic(response.status() + " " + response.statusText() + "\n" + response.readText())
-        }
-    }
-}
-
-makeS3AuthorizationHeader(
-    system: NodeSystem
-    accessKeyId: String
-    secretAccessKey: String
-    region: String
-    bucket: String
-    encodedKey: String
-    body: Buffer
-    canonicalHeaders: List[Pair[String, String]]
-    amzDate: String
-): String {
-    // CanonicalRequest
-    let canonicalQuerystring = "";
-    let contentHash = system.crypto().sha256(body).toHex()
-    let headers = canonicalHeaders.map {_.mapFirst {_.lower()}.mapSecond {_.trim()}}.sort()
-    let signedHeaders = headers.map {_.first}.join(";")
-    let canonicalRequest = [
-        "PUT"
-        "/" + encodedKey
-        canonicalQuerystring
-        ...headers.map {p => p.first + ":" + p.second}
-        ""
-        signedHeaders
-        contentHash
-    ].join("\n")
-    
-    // StringToSign
-    let scopeDate = amzDate.slice(0, 8) // YYYYMMDD
-    let credentialScope = [scopeDate, region, "s3", "aws4_request"].join("/")
-    let algorithm = "AWS4-HMAC-SHA256"
-    let stringToSign = [
-        algorithm
-        amzDate
-        credentialScope
-        system.crypto().sha256(canonicalRequest.toBuffer()).toHex()
-    ].join("\n")
-
-    function hmacSha256(key: Buffer, message: String): Buffer {
-        system.crypto().hmacSha256(key, message.toBuffer())
-    }
-    
-    // Signature
-    let signingKey = hmacSha256(hmacSha256(hmacSha256(hmacSha256(("AWS4" + secretAccessKey).toBuffer(), scopeDate), region), "s3"), "aws4_request")
-    let signature = hmacSha256(signingKey, stringToSign).toHex()
-
-    algorithm + " Credential=" + accessKeyId + "/" + credentialScope + ",SignedHeaders=" + signedHeaders + ",Signature=" + signature
-}
-
-toIsoString(instant: Instant): String
-    target js sync """
-        const d = new Date(instant_ * 1000);
-        return d.toISOString().replaceAll(/[-:]|[.].../g, "");
-    """
-
-encodeURIComponent(text: String): String 
-    target js sync """
-        return encodeURIComponent(text_);
-    """
-    
-encode(text: String): String {
-    text.split('/').map {encodeURIComponent(_)}.join("/")
-}
+put(
+    system: NodeSystem
+    accessKeyId: String
+    secretAccessKey: String
+    region: String
+    bucket: String
+    objectKey: String
+    body: Buffer
+    headers: List[Pair[String, String]]
+): Unit {
+    let now = system.mainTask().now()
+    let amzDate = toIsoString(now)
+    let contentHash = system.crypto().sha256(body).toHex()
+    let host = bucket + ".s3.amazonaws.com"
+    let encodedKey = encode(objectKey)
+    let canonicalHeaders = [
+        Pair("host", host)
+        Pair("x-amz-date", amzDate)
+        Pair("x-amz-content-sha256", contentHash)
+        ...headers
+    ]
+    let authenticationHeader = makeS3AuthorizationHeader(system, accessKeyId, secretAccessKey, region, bucket, encodedKey, body, canonicalHeaders, amzDate)
+    let allHeaders = [...canonicalHeaders, Pair("Authorization", authenticationHeader)]
+    
+    let url = "https://" + host + "/" + encodedKey
+    system.httpClient().put(url, allHeaders, body) {response => 
+        if(!response.ok()) {
+            panic(response.status() + " " + response.statusText() + "\n" + response.readText())
+        }
+    }
+}
+
+makeS3AuthorizationHeader(
+    system: NodeSystem
+    accessKeyId: String
+    secretAccessKey: String
+    region: String
+    bucket: String
+    encodedKey: String
+    body: Buffer
+    canonicalHeaders: List[Pair[String, String]]
+    amzDate: String
+): String {
+    // CanonicalRequest
+    let canonicalQuerystring = "";
+    let contentHash = system.crypto().sha256(body).toHex()
+    let headers = canonicalHeaders.map {_.mapFirst {_.lower()}.mapSecond {_.trim()}}.sort()
+    let signedHeaders = headers.map {_.first}.join(";")
+    let canonicalRequest = [
+        "PUT"
+        "/" + encodedKey
+        canonicalQuerystring
+        ...headers.map {p => p.first + ":" + p.second}
+        ""
+        signedHeaders
+        contentHash
+    ].join("\n")
+    
+    // StringToSign
+    let scopeDate = amzDate.slice(0, 8) // YYYYMMDD
+    let credentialScope = [scopeDate, region, "s3", "aws4_request"].join("/")
+    let algorithm = "AWS4-HMAC-SHA256"
+    let stringToSign = [
+        algorithm
+        amzDate
+        credentialScope
+        system.crypto().sha256(canonicalRequest.toBuffer()).toHex()
+    ].join("\n")
+
+    function hmacSha256(key: Buffer, message: String): Buffer {
+        system.crypto().hmacSha256(key, message.toBuffer())
+    }
+    
+    // Signature
+    let signingKey = hmacSha256(hmacSha256(hmacSha256(hmacSha256(("AWS4" + secretAccessKey).toBuffer(), scopeDate), region), "s3"), "aws4_request")
+    let signature = hmacSha256(signingKey, stringToSign).toHex()
+
+    algorithm + " Credential=" + accessKeyId + "/" + credentialScope + ",SignedHeaders=" + signedHeaders + ",Signature=" + signature
+}
+
+toIsoString(instant: Instant): String
+    target js sync """
+        const d = new Date(instant_ * 1000);
+        return d.toISOString().replaceAll(/[-:]|[.].../g, "");
+    """
+
+encodeURIComponent(text: String): String 
+    target js sync """
+        return encodeURIComponent(text_);
+    """
+    
+encode(text: String): String {
+    text.split('/').map {encodeURIComponent(_)}.join("/")
+}

package/unsafejs/UnsafeJs.ff

@@ -1,19 +1,19 @@
-jsSystem(): JsSystem
-    target js async "return typeof globalThis !== 'undefined' ? globalThis : window"
-    target js sync "return typeof globalThis !== 'undefined' ? globalThis : window"
-
-import(module: String): JsValue
-    // Replaced by the compiler ~ hoisted top level import - dynamic imports not currently supported
-    target js sync "throw Error('Dynamic JS imports are not currently supported.')"
-
-await[T](body: () => T): T // This is never actually called async, but will be rewitten by the compiler
-    // Replaced by the compiler
-    target js sync "return body_()"
-
-throwIfCancelled(): Unit
-    // Replaced by the compiler
-    target js sync ""
-
-cancelled(): Bool
-    // Replaced by the compiler
-    target js sync "return false"
+jsSystem(): JsSystem
+    target js async "return typeof globalThis !== 'undefined' ? globalThis : window"
+    target js sync "return typeof globalThis !== 'undefined' ? globalThis : window"
+
+import(module: String): JsValue
+    // Replaced by the compiler ~ hoisted top level import - dynamic imports not currently supported
+    target js sync "throw Error('Dynamic JS imports are not currently supported.')"
+
+await[T](body: () => T): T // This is never actually called async, but will be rewitten by the compiler
+    // Replaced by the compiler
+    target js sync "return body_()"
+
+throwIfCancelled(): Unit
+    // Replaced by the compiler
+    target js sync ""
+
+cancelled(): Bool
+    // Replaced by the compiler
+    target js sync "return false"