firefly-compiler 0.5.34 → 0.5.36

package/s3/S3.ff

@@ -1,94 +1,92 @@
-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 {
+    let d = Js->Date->(instant.since1970.seconds * 1000)
+    d->toISOString()->replaceAll(Js->RegExp->("[-:]|[.]...", "g"), "")?
+}
+
+encodeURIComponent(text: String): String {
+    Js->encodeURIComponent(text)?
+}
+    
+encode(text: String): String {
+    text.split('/').map {encodeURIComponent(_)}.join("/")
+}

package/vscode/LICENSE.txt

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020-2023 Joakim Ahnfelt-Rønne, Michael Werk Ravnsmed
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2020-2023 Joakim Ahnfelt-Rønne, Michael Werk Ravnsmed
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/vscode/Prepublish.ff

@@ -1,15 +1,15 @@
-nodeMain(system: NodeSystem) {
-    if(!system.path(".").endsWith(["vscode"])) {
-        panic("Must stand in the Firefly vscode/ directory.")
-    }
-    let fireflyOutputPath = system.path("firefly")
-    if(fireflyOutputPath.exists()) {fireflyOutputPath.delete()}
-    fireflyOutputPath.createDirectory()
-    system.path("../output").copyTo(fireflyOutputPath.slash("output"))
-    system.path("../compiler").copyTo(fireflyOutputPath.slash("compiler"))
-    system.path("../core").copyTo(fireflyOutputPath.slash("core"))
-    system.path("../lsp").copyTo(fireflyOutputPath.slash("lsp"))
-    system.path("../.firefly-workspace").copyTo(fireflyOutputPath.slash(".firefly-workspace"))
-    system.path("../package.json").copyTo(fireflyOutputPath.slash("package.json"))
-    system.path("../node_modules").copyTo(fireflyOutputPath.slash("node_modules"))
-}
+nodeMain(system: NodeSystem) {
+    if(!system.path(".").endsWith(["vscode"])) {
+        panic("Must stand in the Firefly vscode/ directory.")
+    }
+    let fireflyOutputPath = system.path("firefly")
+    if(fireflyOutputPath.exists()) {fireflyOutputPath.delete()}
+    fireflyOutputPath.createDirectory()
+    system.path("../output").copyTo(fireflyOutputPath.slash("output"))
+    system.path("../compiler").copyTo(fireflyOutputPath.slash("compiler"))
+    system.path("../core").copyTo(fireflyOutputPath.slash("core"))
+    system.path("../lsp").copyTo(fireflyOutputPath.slash("lsp"))
+    system.path("../.firefly-workspace").copyTo(fireflyOutputPath.slash(".firefly-workspace"))
+    system.path("../package.json").copyTo(fireflyOutputPath.slash("package.json"))
+    system.path("../node_modules").copyTo(fireflyOutputPath.slash("node_modules"))
+}

package/vscode/README.md

@@ -1,16 +1,16 @@
-# Firefly language support
-
-This extension adds support for the Firefly programming language (`.ff` files). It should work out of the box with no configuration, and comes with the following features:
-
-- Autocompletion
-- Go to definition
-- Find references
-- Signature help
-- Symbol renaming
-- Document and workspace symbols
-- Show type on hover
-- Diagnostics
-- Run in terminal
-
-To install the Firefly compiler, run the following command in the terminal:  
-```npm install -g firefly-compiler```
+# Firefly language support
+
+This extension adds support for the Firefly programming language (`.ff` files). It should work out of the box with no configuration, and comes with the following features:
+
+- Autocompletion
+- Go to definition
+- Find references
+- Signature help
+- Symbol renaming
+- Document and workspace symbols
+- Show type on hover
+- Diagnostics
+- Run in terminal
+
+To install the Firefly compiler, run the following command in the terminal:  
+```npm install -g firefly-compiler```