firefly-compiler 0.4.69 → 0.4.71

package/lsp/CompletionHandler.ff

@@ -7,6 +7,7 @@ import Handler
 data CompletionInfo(
     label: String
     extra: String
+    more: String
     snippet: String
     member: Bool
     type: Type
@@ -75,7 +76,7 @@ handleCompletion(lspHook: LspHook, toplevel: Bool, followedByOpenBracket: Bool):
             let fieldNames = n.split('$').dropFirst(1)
             let fieldCompletions = fieldNames.zip(ts).map {| Pair(name, t) =>
                 let t2 = h.unification.substitute(t)
-                CompletionInfo(name, "", name, True, t2, "(...)." + name + ": " + t2.show([]), Some(h.expected))
+                CompletionInfo(name, "", "", name, True, t2, "(...)." + name + ": " + t2.show([]), Some(h.expected))
             }
             [...fieldCompletions, ...completion(h.unification, h.environment, n, None, h.expected)]
         | InferArgumentHook h {
@@ -194,6 +195,7 @@ completionsToJson(completions: List[CompletionInfo]): Json {
                 .with("label", i.label)
                 .with("labelDetails", Json.object()
                     .with("detail", i.extra + if(shownType == "") {""} else {": " + shownType})
+                    .with("description", i.more)
                 )
                 .with("insertText", i.snippet)
                 .with("insertTextFormat", 2 /* Snippet */)
@@ -213,7 +215,7 @@ typeCompletion(types: Map[String, String], typeGenerics: Map[String, List[String
         let label = typeName 
         let extra = if(realGenerics.isEmpty()) {""} else {"[" + realGenerics.join(", ") + "]"}
         let snippet = typeName + if(realGenerics.isEmpty()) {""} else {"[$0]"}
-        CompletionInfo(label, extra, snippet, False, TConstructor(Location("", 0, 0), "type", []), full, None)
+        CompletionInfo(label, extra, "", snippet, False, TConstructor(Location("", 0, 0), "type", []), full, None)
     }
     completions
 }
@@ -384,6 +386,7 @@ makeCompletion(
     CompletionInfo(
         label = shortName
         extra = pair.first
+        more = ""
         snippet = shortName + pair.second
         member = member && !copy
         type = returnType
@@ -398,6 +401,7 @@ exhaustiveMatchCompletion(environment: Environment, prefix: String, inside: Bool
         [CompletionInfo(
             label = curly.first + "| "
             extra = "[] => ... | [first, ...rest] => ..." + curly.second
+            more = ""
             snippet = curly.first + "\n    | [] => $0\n    | [first, ...rest] =>\n" + curly.second
             member = True
             type = TConstructor(Location("", 0, 0), "exhaustive match", [])
@@ -439,6 +443,7 @@ exhaustiveMatchCompletion(environment: Environment, prefix: String, inside: Bool
     [CompletionInfo(
         label = label.slice(0, 2)
         extra = label.dropFirst(2)
+        more = ""
         snippet = snippet
         member = True
         type = TConstructor(Location("", 0, 0), "exhaustive match", [])
@@ -454,16 +459,16 @@ patternCompletion(unification: Unification, environment: Environment, expected:
     }
     if(typeName == "") {[]} else:
     if(typeName == "ff:core/List.List") {
-        [CompletionInfo("[...]", "", "[$0]", False, expected, "// List pattern", Some(expected))]
+        [CompletionInfo("[...]", "", "", "[$0]", False, expected, "// List pattern", Some(expected))]
     } else:
     if(typeName == "ff:core/String.String") {
-        [CompletionInfo("\"...\"", "", "\"$0\"", False, expected, "// String pattern", Some(expected))]
+        [CompletionInfo("\"...\"", "", "", "\"$0\"", False, expected, "// String pattern", Some(expected))]
     } else:
     if(typeName == "ff:core/Char.Char") {
-        [CompletionInfo("'...'", "", "'$0'", False, expected, "// Char pattern", Some(expected))]
+        [CompletionInfo("'...'", "", "", "'$0'", False, expected, "// Char pattern", Some(expected))]
     } else:
     if(typeName == "ff:core/Int.Int") {
-        [CompletionInfo("0", "", "0", False, expected, "// Int pattern", Some(expected))]
+        [CompletionInfo("0", "", "", "0", False, expected, "// Int pattern", Some(expected))]
     } else:
     let variants = do {
         environment.symbols.toList().filter {s =>
@@ -492,6 +497,7 @@ patternCompletion(unification: Unification, environment: Environment, expected:
         CompletionInfo(
             label = shortName
             extra = extra
+            more = ""
             snippet = shortName + if(scheme.signature.parameters.isEmpty()) {""} else {"($0)"}
             member = False
             type = expected
@@ -544,7 +550,7 @@ missingCompletion(
                 | TVariable _ => name + ": "
             }
             let documentation = "// Add missing parameter\n" + name + ": " + t.show([])
-            [CompletionInfo(name, "", snippet, False, t, documentation, Some(t))]
+            [CompletionInfo(name, "", "", snippet, False, t, documentation, Some(t))]
         | Some(as) {isParameter} =>
             let noEffect = TConstructor(instantiated.scheme.signature.at, "ff:core/Nothing.Nothing", [])
             let t = unification.substitute(TConstructor(
@@ -557,12 +563,12 @@ missingCompletion(
                 ]
             ))
             let documentation = "// Add missing parameter\n" + name + ": " + t.show([])
-            [CompletionInfo(name, "", name + ": " + t.show([]), False, t, documentation, Some(t))]
+            [CompletionInfo(name, "", "", name + ": " + t.show([]), False, t, documentation, Some(t))]
         | None =>
             let t = unification.substitute(instantiated.scheme.signature.returnType)
             let snippet = name + " = "
             let documentation = "// Define missing variable\n" + name + ": " + t.show([])
-            [CompletionInfo(snippet, "...", snippet, False, t, documentation, Some(t))]
+            [CompletionInfo(snippet, "...", "", snippet, False, t, documentation, Some(t))]
         | Some(as) =>
             mutable remainingParameters = instantiated.scheme.signature.parameters
             mutable usedNames = [].toSet()
@@ -603,7 +609,7 @@ missingCompletion(
             let snippet = if(shortSnippet.size() <= 100) {shortSnippet} else {longSnippet}
             let documentation = "// Define missing function\n" + 
                 if(shortSnippet.size() < 30) {shortSnippet} else {longSnippet}
-            [CompletionInfo(name, extra, snippet + " {\n    $0\n}", False, returnType, documentation, None)]
+            [CompletionInfo(name, extra, "", snippet + " {\n    $0\n}", False, returnType, documentation, None)]
     }
     if(keyword && arguments.isEmpty()) {
         ["let ", "mutable "].flatMap {k => completions.map {c =>
@@ -622,6 +628,7 @@ namedParameterCompletion(parameter: Parameter, index: Int, preselect: Bool): Com
     CompletionInfo(
         label = parameter.name + " = "
         extra = "..."
+        more = ""
         snippet = parameter.name + " = "
         member = False
         type = parameter.valueType
@@ -636,6 +643,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "package", 
             extra = " some:package:0.0.0", 
+            more = ""
             snippet = "package ", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -645,6 +653,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "dependency", 
             extra = " some:package:0.0.0", 
+            more = ""
             snippet = "dependency ", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -654,6 +663,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "import", 
             extra = " Module from some:package", 
+            more = ""
             snippet = "import ", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -663,6 +673,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "extend", 
             extra = " self[T]: SomeType[T] {...}", 
+            more = ""
             snippet = "extend ", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -672,6 +683,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "data", 
             extra = " SomeType[T](...) {...}", 
+            more = ""
             snippet = "data ", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -681,6 +693,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "class", 
             extra = " SomeType[T](...) {...}", 
+            more = ""
             snippet = "class ", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -690,6 +703,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "capability", 
             extra = " SomeType[T](...) {...}", 
+            more = ""
             snippet = "capability ", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -699,6 +713,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "trait", 
             extra = " T: SomeTrait {...}", 
+            more = ""
             snippet = "trait ", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -708,6 +723,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "instance", 
             extra = " SomeType: SomeTrait {...}", 
+            more = ""
             snippet = "instance ", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -717,6 +733,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "nodeMain", 
             extra = "(system: NodeSystem) {...}", 
+            more = ""
             snippet = "nodeMain(system: NodeSystem) {\n    $0\n}", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -726,6 +743,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "browserMain", 
             extra = "(system: BrowserSystem) {...}", 
+            more = ""
             snippet = "browserMain(system: BrowserSystem) {\n    $0\n}", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -735,6 +753,7 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "buildMain", 
             extra = "(system: BuildSystem) {...}", 
+            more = ""
             snippet = "buildMain(system: NodeSystem) {\n    $0\n}", 
             member = False, 
             type = TConstructor(lspHook.at, "", []), 
@@ -744,14 +763,15 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
         CompletionInfo(
             label = "webapp", 
             extra = " with frontend and backend", 
+            more = ""
             snippet = [
                 "dependency ff:webserver:0.0.0"
                 "import WebServer from ff:webserver"
                 ""
                 "browserMain(system: BrowserSystem): Unit {"
-                "    let response = system.httpClient().fetch(\"http://localhost:8080/hello\")"
+                "    let message = system.httpClient().get(\"http://localhost:8080/hello\", []) {_.readText()}"
                 "    let window = system.js().global().get(\"window\")"
-                "    window.call1(\"alert\", response.readText())"
+                "    window.call1(\"alert\", message)"
                 "}"
                 ""
                 "nodeMain(system: NodeSystem): Unit {"

package/lux/Main.ff

@@ -39,11 +39,7 @@ questionComponent(lux: Lux, http: HttpClient, question: String) {
         lux.div {lux.text("User: " + question)}
         lux.useLazy1(question): _ =>
         lux.useSuspense {lux.div {lux.text("Assistant typing...")}}: lux =>
-        let answer = http.fetch(
-            url = "/chat"
-            method = "POST"
-            body = Some(HttpClient.bodyText(question))
-        ).readText()
+        let answer = http.post("/chat", [], question.toBuffer()) {_.readText()}
         lux.div {lux.text("Assistant: " + answer)}
     }
 }
@@ -82,15 +78,14 @@ nodeMain(system: NodeSystem) {
 }
 
 fetchAnswer(httpClient: HttpClient, key: String, question: Json): String {
-    let json = httpClient.fetch(
+    let json = httpClient.post(
         url = "https://api.openai.com/v1/chat/completions"
-        method = "POST"
         headers = [
             Pair("Authorization", "Bearer " + key)
             Pair("Content-Type", "application/json")
         ]
-        body = Some(HttpClient.bodyText(question.write()))
-    ).readJson()
+        body = question.write().toBuffer()
+    ) {_.readJson()}
     json.field("choices").index(0).field("message").field("content").grabString()
 }
 

package/lux/Main2.ff

@@ -92,7 +92,7 @@ rhymeComponent(lux: Lux, system: BrowserSystem) {
 
 
 rhyme(system: BrowserSystem, text: String): String {
-    let result = system.httpClient().fetch("https://api.datamuse.com/words?rel_rhy=" + text)
+    let result = system.httpClient().get("https://api.datamuse.com/words?rel_rhy=" + text, [])
     let json = system.js().parseJson(result.readText())
     if(json.get(0).isNullOrUndefined()) {"?"} else {json.get(0).get("word").grabString()}
 }

package/output/js/ff/compiler/Dependencies.mjs

@@ -256,11 +256,12 @@ ff_compiler_DependencyLock.DependencyLock_do(dependencyLock_, ff_core_Path.Path_
 if((!ff_core_Path.Path_exists(donePath_, false, false, false))) {
 return ff_core_Option.Some((function() {
 ff_core_Log.trace_(("Fetching " + location_));
-const response_ = ff_core_HttpClient.HttpClient_fetch(httpClient_, location_, "GET", ff_core_HttpClient.emptyList_, ff_core_Option.None(), ff_core_HttpClient.RedirectFollow(), ff_core_Option.None(), ff_core_Option.None(), ff_core_Option.None(), ff_core_Option.None(), ff_core_Option.None(), false);
+const buffer_ = ff_core_HttpClient.HttpClient_get(httpClient_, location_, [], ((response_) => {
 if((!ff_core_HttpClient.FetchResponse_ok(response_))) {
 ff_core_Core.panic_(("Could not download dependency: " + location_))
 };
-const buffer_ = ff_core_HttpClient.FetchResponse_readBuffer(response_);
+return ff_core_HttpClient.FetchResponse_readBuffer(response_)
+}));
 if(ff_core_Path.Path_exists(dependencyPath_, false, false, false)) {
 ff_core_Path.Path_delete(dependencyPath_, 0, 100)
 };
@@ -360,11 +361,12 @@ if((!(await ff_core_Path.Path_exists$(donePath_, false, false, false, $task))))
 if((!(await ff_core_Path.Path_exists$(donePath_, false, false, false, $task)))) {
 return ff_core_Option.Some((await (async function() {
 ff_core_Log.trace_(("Fetching " + location_));
-const response_ = (await ff_core_HttpClient.HttpClient_fetch$(httpClient_, location_, "GET", ff_core_HttpClient.emptyList_, ff_core_Option.None(), ff_core_HttpClient.RedirectFollow(), ff_core_Option.None(), ff_core_Option.None(), ff_core_Option.None(), ff_core_Option.None(), ff_core_Option.None(), false, $task));
+const buffer_ = (await ff_core_HttpClient.HttpClient_get$(httpClient_, location_, [], (async (response_, $task) => {
 if((!(await ff_core_HttpClient.FetchResponse_ok$(response_, $task)))) {
 ff_core_Core.panic_(("Could not download dependency: " + location_))
 };
-const buffer_ = (await ff_core_HttpClient.FetchResponse_readBuffer$(response_, $task));
+return (await ff_core_HttpClient.FetchResponse_readBuffer$(response_, $task))
+}), $task));
 if((await ff_core_Path.Path_exists$(dependencyPath_, false, false, false, $task))) {
 (await ff_core_Path.Path_delete$(dependencyPath_, 0, 100, $task))
 };

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

@@ -132,7 +132,7 @@ throw new Error('Function BrowserSystem_urlFragment is missing on this target in
 }
 
 export async function BrowserSystem_httpClient$(self_, $task) {
-return null
+return typeof globalThis !== 'undefined' ? globalThis : window
 }
 
 export async function BrowserSystem_mainTask$(self_, $task) {

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

@@ -97,7 +97,7 @@ import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
 export function hypot_(values_) {
 
-        return Math.hypot(...values);
+        return Math.hypot(...values_);
     
 }
 
@@ -218,156 +218,159 @@ return self_.toFixed(digits_)
 }
 
 export function Float_min(self_, that_) {
-return Math.min(self, that)
+return Math.min(self_, that_)
 }
 
 export function Float_max(self_, that_) {
-return Math.max(self, that)
+return Math.max(self_, that_)
 }
 
 export function Float_clamp(self_, from_, to_) {
-if((self_ <= from_)) {
-return from_
-} else if((self_ >= to_)) {
-return to_
-} else {
-return self_
+return Math.min(Math.max(self_, from_), to_)
 }
+
+export function Float_lerp(self_, that_, factor_) {
+return (self_ + (factor_ * (that_ - self_)))
+}
+
+export function Float_smoothstep(self_, that_, factor_) {
+const t_ = ff_core_Float.Float_clamp(((factor_ - self_) / (that_ - self_)), 0.0, 1.0);
+return ((t_ * t_) * (3.0 - (2.0 * t_)))
 }
 
-export function Float_expDecay(self_, that_, decay_, delta_) {
-return (that_ + ((self_ - that_) * ff_core_Float.Float_exp(((-decay_) * delta_))))
+export function Float_expDecay(self_, that_, decay_, factor_) {
+return (that_ + ((self_ - that_) * ff_core_Float.Float_exp(((-decay_) * factor_))))
 }
 
 export function Float_acos(self_) {
 
-            return Math.acos(self);
+            return Math.acos(self_);
         
 }
 
 export function Float_acosh(self_) {
 
-            return Math.acosh(self);
+            return Math.acosh(self_);
         
 }
 
 export function Float_asin(self_) {
 
-            return Math.asin(self);
+            return Math.asin(self_);
         
 }
 
 export function Float_asinh(self_) {
 
-            return Math.asinh(self);
+            return Math.asinh(self_);
         
 }
 
 export function Float_atan(self_) {
 
-            return Math.atan(self);
+            return Math.atan(self_);
         
 }
 
 export function Float_atan2(self_, that_) {
 
-            return Math.atan2(self, that);
+            return Math.atan2(self_, that_);
         
 }
 
 export function Float_atanh(self_) {
 
-            return Math.atanh(self);
+            return Math.atanh(self_);
         
 }
 
 export function Float_cbrt(self_) {
 
-            return Math.cbrt(self);
+            return Math.cbrt(self_);
         
 }
 
 export function Float_cos(self_) {
 
-            return Math.cos(self);
+            return Math.cos(self_);
         
 }
 
 export function Float_cosh(self_) {
 
-            return Math.cosh(self);
+            return Math.cosh(self_);
         
 }
 
 export function Float_exp(self_) {
 
-            return Math.exp(self);
+            return Math.exp(self_);
         
 }
 
 export function Float_expm1(self_) {
 
-            return Math.expm1(self);
+            return Math.expm1(self_);
         
 }
 
 export function Float_log(self_, that_) {
 
-            return Math.log2(self) / Math.log2(that);
+            return Math.log2(self_) / Math.log2(that_);
         
 }
 
 export function Float_log10(self_) {
 
-            return Math.log10(self);
+            return Math.log10(self_);
         
 }
 
 export function Float_log2(self_) {
 
-            return Math.log2(self);
+            return Math.log2(self_);
         
 }
 
 export function Float_ln(self_) {
 
-            return Math.log(self);
+            return Math.log(self_);
         
 }
 
 export function Float_ln1p(self_) {
 
-            return Math.log1p(self);
+            return Math.log1p(self_);
         
 }
 
 export function Float_sin(self_) {
 
-            return Math.sin(self);
+            return Math.sin(self_);
         
 }
 
 export function Float_sinh(self_) {
 
-            return Math.sinh(self);
+            return Math.sinh(self_);
         
 }
 
 export function Float_sqrt(self_) {
 
-            return Math.sqrt(self);
+            return Math.sqrt(self_);
         
 }
 
 export function Float_tan(self_) {
 
-            return Math.tan(self);
+            return Math.tan(self_);
         
 }
 
 export function Float_tanh(self_) {
 
-            return Math.tanh(self);
+            return Math.tanh(self_);
         
 }
 
@@ -412,17 +415,20 @@ throw new Error('Function Float_max is missing on this target in async context.'
 }
 
 export async function Float_clamp$(self_, from_, to_, $task) {
-if((self_ <= from_)) {
-return from_
-} else if((self_ >= to_)) {
-return to_
-} else {
-return self_
+throw new Error('Function Float_clamp is missing on this target in async context.');
 }
+
+export async function Float_lerp$(self_, that_, factor_, $task) {
+return (self_ + (factor_ * (that_ - self_)))
+}
+
+export async function Float_smoothstep$(self_, that_, factor_, $task) {
+const t_ = ff_core_Float.Float_clamp(((factor_ - self_) / (that_ - self_)), 0.0, 1.0);
+return ((t_ * t_) * (3.0 - (2.0 * t_)))
 }
 
-export async function Float_expDecay$(self_, that_, decay_, delta_, $task) {
-return (that_ + ((self_ - that_) * ff_core_Float.Float_exp(((-decay_) * delta_))))
+export async function Float_expDecay$(self_, that_, decay_, factor_, $task) {
+return (that_ + ((self_ - that_) * ff_core_Float.Float_exp(((-decay_) * factor_))))
 }
 
 export async function Float_acos$(self_, $task) {