firefly-compiler 0.4.35 → 0.4.40

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

@@ -28,7 +28,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 
@@ -188,6 +188,10 @@ export function NodeSystem_mainTask(self_) {
 throw new Error('Function NodeSystem_mainTask is missing on this target in sync context.');
 }
 
+export function NodeSystem_crypto(self_) {
+throw new Error('Function NodeSystem_crypto is missing on this target in sync context.');
+}
+
 export function NodeSystem_js(self_) {
 throw new Error('Function NodeSystem_js is missing on this target in sync context.');
 }
@@ -290,6 +294,10 @@ export async function NodeSystem_mainTask$(self_, $task) {
 return self_.task_
 }
 
+export async function NodeSystem_crypto$(self_, $task) {
+return (typeof globalThis !== 'undefined' ? globalThis : window).crypto
+}
+
 export async function NodeSystem_js$(self_, $task) {
 return typeof globalThis !== 'undefined' ? globalThis : window
 }

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -28,7 +28,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -24,7 +24,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 
@@ -1098,7 +1098,7 @@ const builder_ = ff_core_Array.new_();
 ff_core_Stream.Stream_each(self_, ((_w1) => {
 ff_core_Array.Array_push(builder_, _w1)
 }));
-return ff_core_Buffer.fromBufferArray_(ff_core_Array.Array_drain(builder_))
+return ff_core_Buffer.fromBufferList_(ff_core_Array.Array_drain(builder_))
 }
 
 export function Stream_toString(self_, encoding_ = "utf8") {
@@ -1133,7 +1133,7 @@ const builder_ = ff_core_Array.new_();
 (await ff_core_Stream.Stream_each$(self_, (async (_w1, $task) => {
 ff_core_Array.Array_push(builder_, _w1)
 }), $task));
-return ff_core_Buffer.fromBufferArray_(ff_core_Array.Array_drain(builder_))
+return ff_core_Buffer.fromBufferList_(ff_core_Array.Array_drain(builder_))
 }
 
 export async function Stream_toString$(self_, encoding_ = "utf8", $task) {

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

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

@@ -22,7 +22,7 @@ import * as ff_core_Char from "../../ff/core/Char.mjs"
 
 import * as ff_core_Core from "../../ff/core/Core.mjs"
 
-import * as ff_core_Digest from "../../ff/core/Digest.mjs"
+import * as ff_core_Crypto from "../../ff/core/Crypto.mjs"
 
 import * as ff_core_Duration from "../../ff/core/Duration.mjs"
 

package/package.json

@@ -1,29 +1,29 @@
 {
-  "name": "firefly-compiler",
-  "displayName": "Firefly Compiler",
-  "description": "Firefly compiler",
-  "author": "Firefly team",
-  "license": "MIT",
-  "version": "0.4.35",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Ahnfelt/firefly-boot"
-  },
-  "publisher": "firefly-team",
-  "categories": [
-    "Programming Languages"
-  ],
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "main": "./vscode/client/out/extension",
-  "icon": "./vscode/icons/firefly-logo.png",
-  "dependencies": {
-    "pkg": "^5.8.0",
-    "tar": "^6.1.11",
-    "esbuild": "^0.21.3"
-  },
-  "bin": {
-    "firefly": "./bin/firefly.mjs"
-  }
+    "name": "firefly-compiler",
+    "displayName": "Firefly Compiler",
+    "description": "Firefly compiler",
+    "author": "Firefly team",
+    "license": "MIT",
+    "version": "0.4.40",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Ahnfelt/firefly-boot"
+    },
+    "publisher": "firefly-team",
+    "categories": [
+        "Programming Languages"
+    ],
+    "engines": {
+        "node": ">=18.0.0"
+    },
+    "main": "./vscode/client/out/extension",
+    "icon": "./vscode/icons/firefly-logo.png",
+    "dependencies": {
+        "pkg": "^5.8.0",
+        "tar": "^6.1.11",
+        "esbuild": "^0.21.3"
+    },
+    "bin": {
+        "firefly": "./bin/firefly.mjs"
+    }
 }

package/s3/.firefly/package.ff

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

package/s3/S3.ff

@@ -0,0 +1,93 @@
+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
+    let response = system.httpClient().fetch(url, method = "PUT", headers = allHeaders, body = Some(HttpClient.bodyBuffer(body)), throw = False)
+    system.writeLine("" + response.status())
+    system.writeLine(response.statusText())
+    system.writeLine(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/vscode/package.json

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

package/core/Digest.ff

@@ -1,51 +0,0 @@
-class Digest {}
-
-hmacSha256(key: Buffer, buffer: Buffer = Buffer.new(0)): Digest {
-    new("sha256", Some(key), buffer)
-}
-
-sha256(buffer: Buffer = Buffer.new(0)): Digest {
-    new("sha256", None, buffer)
-}
-
-new(algorithm: String, hmacKey: Option[Buffer] = None, buffer: Buffer = Buffer.new(0)): Digest
-    target node sync """
-        import * as crypto from 'node:crypto'
-        const digest = typeof hmacKey_.value_ !== 'undefined'
-            ? crypto.createHmac(algorithm_, hmacKey_.value_)
-            : crypto.createHash(algorithm_);
-        if(buffer_.byteLength > 0) digest.update(buffer_);
-        return digest;
-    """
-
-extend self: Digest {
-    
-    writeText(text: String, encoding: String = "utf8"): Unit
-        target node sync """
-            self_.update(text_, encoding_);
-        """
-
-    writeBuffer(buffer: Buffer): Unit
-        target node sync """
-            self_.update(buffer_);
-        """
-    
-    writeStream(stream: Stream[Buffer]): Unit {
-        stream.each {self.writeBuffer(_)}
-    }
-    
-    toBuffer(): Buffer
-        target node sync """
-            const b = self_.digest();
-            return new DataView(b.buffer, b.byteOffset, b.length);
-        """
-        
-    toHex(): String {
-        self.toBuffer().toHex()
-    }
-
-    toBase64(): String {
-        self.toBuffer().toBase64()
-    }
-
-}

package/experimental/s3/S3.ff

@@ -1,126 +0,0 @@
-import Digest from ff:core
-
-nodeMain(system: NodeSystem) {
-    system.writeLine(Digest.sha256("".toBuffer()).toHex())
-    system.writeLine(Digest.hmacSha256("key".toBuffer(), "The quick brown fox jumps over the lazy dog".toBuffer()).toHex())
-    
-    // Trying to reproduce the result from an example here 
-    // https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-header-based-auth.html
-    let expectedHeader = "AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130524/us-east-1/s3/aws4_request,SignedHeaders=date;host;x-amz-content-sha256;x-amz-date;x-amz-storage-class,Signature=98ad721746da40c64f1a55b78f14c238d841ea1380cd77a1b5971af0ece108bd"
-    let amzDate = "20130524T000000Z" // TODO
-    let headerDate = "Fri, 24 May 2013 00:00:00 GMT" // TODO
-    let bucket = "examplebucket"
-    let body = "Welcome to Amazon S3.".toBuffer()
-    let actualHeader = makeS3AuthorizationHeader(
-        system = system
-        accessKeyId = "AKIAIOSFODNN7EXAMPLE"
-        secretAccessKey = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
-        region = "us-east-1"
-        bucket = bucket
-        objectKey = "test%24file.text" // TODO URI encoded "test$file.text"
-        body = body
-        canonicalHeaders = [
-            Pair("date", headerDate) 
-            Pair("host", bucket + ".s3.amazonaws.com")
-            Pair("x-amz-date", amzDate)
-            Pair("x-amz-content-sha256", Digest.sha256(body).toHex())
-            Pair("x-amz-storage-class", "REDUCED_REDUNDANCY")
-        ]        
-        amzDate = amzDate
-    )
-    system.writeLine("")
-    system.writeLine("actual  : " + actualHeader)
-    system.writeLine("")
-    system.writeLine("expected: " + expectedHeader)
-    
-    
-
-    /*put(system, 
-        accessKeyId = ""
-        secretAccessKey = ""
-        region = "eu-central-1"
-        bucket = "firefly-site"
-        objectKey = "tmp/test2"
-        "Hello S3".toBuffer()
-    )*/
-}
-
-put(
-    system: NodeSystem
-    accessKeyId: String
-    secretAccessKey: String
-    region: String
-    bucket: String
-    objectKey: String
-    body: Buffer
-): Unit {
-    let amzDate = "20240523T122636Z" // TODO
-    let headerDate = "Thu May 23 2024 12:20:09 GMT" // TODO
-    let contentHash = Digest.sha256(body).toHex()
-    let host = bucket + ".s3.amazonaws.com"
-    let canonicalHeaders = [
-        Pair("date", headerDate) 
-        Pair("host", host)
-        Pair("x-amz-date", amzDate)
-        Pair("x-amz-content-sha256", contentHash)
-        Pair("x-amz-storage-class", "REDUCED_REDUNDANCY")
-        Pair("Content-Type", "text/plain")
-    ]
-    let authenticationHeader = makeS3AuthorizationHeader(system, accessKeyId, secretAccessKey, region, bucket, objectKey, body, canonicalHeaders, amzDate)
-    let headers = [...canonicalHeaders, Pair("Authorization", authenticationHeader)]
-    
-    let url = "https://" + host + "/" + objectKey
-    let response = system.httpClient().fetch(url, method = "PUT", headers = headers, body = Some(HttpClient.bodyBuffer(body)), throw = False)
-    system.writeLine("" + response.status())
-    system.writeLine(response.statusText())
-    system.writeLine(response.readText())
-}
-
-makeS3AuthorizationHeader(
-    system: NodeSystem
-    accessKeyId: String
-    secretAccessKey: String
-    region: String
-    bucket: String
-    objectKey: String
-    body: Buffer
-    canonicalHeaders: List[Pair[String, String]]
-    amzDate: String
-): String {
-    let scopeDate = amzDate.slice(0, 8) // YYYYMMDD
-
-    // CanonicalRequest
-    let canonicalQuerystring = "";
-    let contentHash = Digest.sha256(body).toHex()
-    let headers = canonicalHeaders.map {_.mapFirst {_.lower()}.mapSecond {_.trim()}}.sort()
-    let signedHeaders = headers.map {_.first}.join(";")
-    let canonicalRequest = [
-        "PUT"
-        "/" + objectKey
-        canonicalQuerystring
-        ...headers.map {p => p.first + ":" + p.second}
-        ""
-        signedHeaders
-        contentHash
-    ].join("\n")
-    
-    // StringToSign
-    let credentialScope = [scopeDate, region, "s3", "aws4_request"].join("/")
-    let algorithm = "AWS4-HMAC-SHA256"
-    let stringToSign = [
-        algorithm
-        amzDate
-        credentialScope
-        Digest.sha256(canonicalRequest.toBuffer()).toHex()
-    ].join("\n")
-
-    // 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
-}
-
-hmacSha256(key: Buffer, message: String): Buffer {
-    Digest.hmacSha256(key, message.toBuffer()).toBuffer()
-}