npm - firefly-compiler - Versions diffs - 0.4.79 → 0.4.81 - Mend

firefly-compiler 0.4.79 → 0.4.81

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (164) hide show

package/.hintrc +4 -4
package/.vscode/settings.json +4 -4
package/bin/Release.ff +153 -153
package/bin/firefly.mjs +1 -1
package/compiler/Builder.ff +257 -257
package/compiler/Compiler.ff +227 -227
package/compiler/Dependencies.ff +187 -187
package/compiler/DependencyLock.ff +17 -17
package/compiler/Inference.ff +2 -1
package/compiler/JsEmitter.ff +940 -946
package/compiler/LspHook.ff +202 -202
package/compiler/Main.ff +3 -3
package/compiler/ModuleCache.ff +178 -178
package/compiler/Tokenizer.ff +1 -1
package/compiler/Unification.ff +1 -1
package/compiler/Workspace.ff +88 -88
package/core/.firefly/include/package-lock.json +564 -564
package/core/.firefly/include/package.json +5 -5
package/core/.firefly/include/prepare.sh +1 -1
package/core/.firefly/package.ff +2 -2
package/core/Array.ff +265 -265
package/core/Atomic.ff +64 -64
package/core/Box.ff +7 -7
package/core/BrowserSystem.ff +40 -40
package/core/BuildSystem.ff +148 -148
package/core/Crypto.ff +96 -96
package/core/Equal.ff +36 -36
package/core/Float.ff +25 -0
package/core/HttpClient.ff +148 -148
package/core/JsSystem.ff +69 -69
package/core/Json.ff +434 -434
package/core/List.ff +486 -486
package/core/Lock.ff +144 -144
package/core/NodeSystem.ff +216 -216
package/core/Ordering.ff +161 -161
package/core/Path.ff +401 -401
package/core/Random.ff +134 -134
package/core/RbMap.ff +216 -216
package/core/Show.ff +43 -43
package/core/SourceLocation.ff +68 -68
package/core/Stream.ff +9 -9
package/core/Task.ff +149 -141
package/core/Try.ff +25 -4
package/experimental/benchmarks/ListGrab.ff +23 -23
package/experimental/benchmarks/ListGrab.java +55 -55
package/experimental/benchmarks/Pyrotek45.ff +30 -30
package/experimental/benchmarks/Pyrotek45.java +64 -64
package/experimental/bidirectional/Bidi.ff +88 -88
package/experimental/random/Index.ff +53 -53
package/experimental/random/Process.ff +120 -120
package/experimental/random/Scrape.ff +51 -51
package/experimental/random/Symbols.ff +73 -73
package/experimental/random/Tensor.ff +52 -52
package/experimental/random/Units.ff +36 -36
package/experimental/s3/S3TestAuthorizationHeader.ff +39 -39
package/experimental/s3/S3TestPut.ff +16 -16
package/experimental/tests/TestJson.ff +26 -26
package/firefly.sh +0 -0
package/fireflysite/.firefly/package.ff +4 -4
package/fireflysite/CommunityOverview.ff +20 -20
package/fireflysite/CountingButtonDemo.ff +58 -58
package/fireflysite/DocumentParser.ff +331 -217
package/fireflysite/ExamplesOverview.ff +40 -40
package/fireflysite/FrontPage.ff +344 -360
package/fireflysite/{GuideIntroduction.ff → GettingStarted.ff} +45 -52
package/fireflysite/Guide.ff +442 -411
package/fireflysite/Main.ff +151 -137
package/fireflysite/MatchingPasswordsDemo.ff +82 -82
package/fireflysite/PackagesOverview.ff +49 -49
package/fireflysite/PostgresqlDemo.ff +34 -34
package/fireflysite/ReferenceAll.ff +18 -0
package/fireflysite/ReferenceIntroduction.ff +11 -0
package/fireflysite/Styles.ff +567 -495
package/fireflysite/Test.ff +46 -0
package/fireflysite/assets/markdown/reference/BaseTypes.md +209 -0
package/fireflysite/assets/markdown/reference/EmittedJavascript.md +66 -0
package/fireflysite/assets/markdown/reference/Exceptions.md +101 -0
package/fireflysite/assets/markdown/reference/FunctionsAndMethods.md +338 -0
package/fireflysite/assets/markdown/reference/JavascriptInterop.md +134 -0
package/fireflysite/assets/markdown/reference/ModulesAndPackages.md +162 -0
package/fireflysite/assets/markdown/reference/OldStructuredConcurrency.md +48 -0
package/fireflysite/assets/markdown/reference/PatternMatching.md +224 -0
package/fireflysite/assets/markdown/reference/StatementsAndExpressions.md +86 -0
package/fireflysite/assets/markdown/reference/StructuredConcurrency.md +99 -0
package/fireflysite/assets/markdown/reference/TraitsAndInstances.md +100 -0
package/fireflysite/assets/markdown/reference/UserDefinedTypes.md +184 -0
package/fireflysite/assets/markdown/{ControlFlow.md → scratch/ControlFlow.md} +136 -136
package/fireflysite/assets/markdown/scratch/Toc.md +41 -0
package/lsp/.firefly/package.ff +1 -1
package/lsp/CompletionHandler.ff +828 -828
package/lsp/Handler.ff +714 -714
package/lsp/HoverHandler.ff +79 -79
package/lsp/LanguageServer.ff +272 -272
package/lsp/SignatureHelpHandler.ff +55 -55
package/lsp/SymbolHandler.ff +181 -181
package/lsp/TestReferences.ff +17 -17
package/lsp/TestReferencesCase.ff +7 -7
package/lsp/stderr.txt +1 -1
package/lsp/stdout.txt +34 -34
package/lux/.firefly/package.ff +1 -1
package/lux/Css.ff +648 -648
package/lux/CssTest.ff +48 -48
package/lux/Lux.ff +593 -487
package/lux/LuxEvent.ff +116 -116
package/lux/Main.ff +123 -123
package/lux/Main2.ff +143 -143
package/lux/TestDry.ff +27 -0
package/output/js/ff/compiler/Builder.mjs +47 -47
package/output/js/ff/compiler/Dependencies.mjs +3 -3
package/output/js/ff/compiler/Inference.mjs +2 -2
package/output/js/ff/compiler/JsEmitter.mjs +18 -72
package/output/js/ff/compiler/Main.mjs +4 -4
package/output/js/ff/compiler/ModuleCache.mjs +4 -4
package/output/js/ff/core/Array.mjs +59 -59
package/output/js/ff/core/Atomic.mjs +36 -36
package/output/js/ff/core/BrowserSystem.mjs +11 -11
package/output/js/ff/core/BuildSystem.mjs +30 -30
package/output/js/ff/core/Crypto.mjs +40 -40
package/output/js/ff/core/Float.mjs +50 -0
package/output/js/ff/core/HttpClient.mjs +56 -56
package/output/js/ff/core/Json.mjs +147 -147
package/output/js/ff/core/List.mjs +50 -50
package/output/js/ff/core/Lock.mjs +97 -97
package/output/js/ff/core/NodeSystem.mjs +87 -87
package/output/js/ff/core/Ordering.mjs +8 -8
package/output/js/ff/core/Path.mjs +231 -231
package/output/js/ff/core/Random.mjs +56 -56
package/output/js/ff/core/Task.mjs +71 -39
package/output/js/ff/core/Try.mjs +98 -4
package/package.json +1 -1
package/postgresql/Pg.ff +1 -1
package/rpc/.firefly/package.ff +1 -1
package/rpc/Rpc.ff +70 -70
package/s3/.firefly/package.ff +1 -1
package/s3/S3.ff +94 -94
package/unsafejs/UnsafeJs.ff +19 -19
package/vscode/LICENSE.txt +21 -21
package/vscode/Prepublish.ff +15 -15
package/vscode/README.md +16 -16
package/vscode/client/package.json +22 -22
package/vscode/client/src/extension.ts +104 -104
package/vscode/icons/firefly-icon.svg +10 -10
package/vscode/language-configuration.json +61 -61
package/vscode/package-lock.json +3623 -3623
package/vscode/package.json +1 -1
package/vscode/snippets.json +241 -241
package/vscode/syntaxes/firefly-markdown-injection.json +45 -45
package/webserver/.firefly/include/package-lock.json +22 -22
package/webserver/.firefly/include/package.json +5 -5
package/webserver/.firefly/package.ff +2 -2
package/webserver/WebServer.ff +685 -685
package/websocket/.firefly/package.ff +1 -1
package/websocket/WebSocket.ff +131 -131
package/fireflysite/GuideAll.ff +0 -21
package/fireflysite/GuideBaseTypes.ff +0 -168
package/fireflysite/GuideControlFlow.ff +0 -212
package/fireflysite/assets/markdown/Example.md +0 -78
/package/fireflysite/assets/{NotoSansMono-Regular.ttf → font/NotoSansMono-Regular.ttf} +0 -0
/package/fireflysite/assets/{NunitoSans-VariableFont_YTLC,opsz,wdth,wght.ttf → font/NunitoSans-VariableFont_YTLC,opsz,wdth,wght.ttf} +0 -0
/package/fireflysite/assets/{autocomplete-small.png → image/autocomplete-small.png} +0 -0
/package/fireflysite/assets/{autocomplete.png → image/autocomplete.png} +0 -0
/package/fireflysite/assets/{edit-time-error.png → image/edit-time-error.png} +0 -0
/package/fireflysite/assets/{firefly-logo-notext.png → image/firefly-logo-notext.png} +0 -0
/package/fireflysite/assets/{firefly-logo-yellow.png → image/firefly-logo-yellow.png} +0 -0

package/lux/Main2.ff CHANGED Viewed

@@ -1,143 +1,143 @@
-import HttpServer from ff:httpserver
-import Lux
-import LuxEvent
-mainComponent(lux: Lux, system: BrowserSystem) {
-    sleepComponent(lux, system)
-}
-sleepComponent(lux: Lux, system: BrowserSystem) {
-    lux.useState(False): start, setStart =>
-    if(start) {
-        lux.useSuspense {
-            lux.div {
-                lux.div {lux.text("Sleeping")}
-                lux.button {
-                    lux.text("Cancel")
-                    lux.onClick {event =>
-                        event.preventDefault()
-                        setStart(False)
-                    }
-                }
-            }
-        } {lux =>
-            trySleep(lux.task, "A")
-            lux.div {lux.text("Done sleeping")}
-        }
-    } else {
-        lux.button {
-            lux.text("Start")
-            lux.onClick {event =>
-                event.preventDefault()
-                setStart(True)
-            }
-        }
-    }
-}
-ifComponent(lux: Lux, system: BrowserSystem) {
-    lux.useState(False): start, setStart =>
-    if(start) {
-        lux.div {lux.text("Started")}
-    } else {
-        lux.button {
-            lux.text("Start")
-            lux.onClick {event =>
-                event.preventDefault()
-                setStart(True)
-            }
-        }
-    }
-}
-rhymeComponent(lux: Lux, system: BrowserSystem) {
-    lux.div {
-        lux.useState(0): count, setCount =>
-        Log.debug("useState(0)")
-        lux.useState("Ɛ"): text, setText =>
-        lux.div {
-            lux.button {
-                lux.text("Count: " + count)
-                lux.onClick {event =>
-                    setCount(count + 1)
-                }
-            }
-            lux.div {
-                lux.useCallback1(setText): setText =>
-                lux.useLazy1(text): text =>
-                lux.div {
-                    lux.div {
-                        lux.text("Text: " + text + " -> ")
-                        lux.useSuspense {lux.span {lux.text("Rhyming...")}} {lux =>
-                            lux.span {
-                                lux.text(rhyme(system, text))
-                            }
-                        }
-                    }
-                    lux.input {
-                        lux.setValue(text)
-                        Log.debug("setValue: " + text)
-                        lux.onInput {event =>
-                            Log.debug(text + " -> " + event.text())
-                            setText(event.text())
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-rhyme(system: BrowserSystem, text: String): String {
-    let json = system.httpClient().get("https://api.datamuse.com/words?rel_rhy=" + text, []) {_.readJson()}
-    json.index(0).field("word").getString().else {"?"}
-}
-browserMain(system: BrowserSystem): Unit {
-    Lux.renderById(system, "main") {lux =>
-        lux.div {
-            mainComponent(lux, system)
-        }
-    }
-}
-nodeMain(system: NodeSystem): Unit {
-    HttpServer.listen(system, "localhost", 8080) {request, response =>
-        if(request.path() == "/") {
-            response.setHeader("Content-Type", ["text/html; charset=UTF-8"])
-            response.writeText("<!doctype html>")
-            response.writeText("<div id='main'></div>")
-            response.writeText("<script type='module' src='/js/script/script/Main2.mjs'></script>")
-        } elseIf {request.path().startsWith("/js/") && !request.path().contains("..")} {
-            response.setHeader("Content-Type", ["text/javascript; charset=UTF-8"])
-            response.writeText(system.assets().readText(request.path()))
-        } elseIf {request.path() == "/chat"} {
-            system.mainTask().sleep(Duration(request.readText().size().toFloat()))
-            response.setHeader("Content-Type", ["text/plain; charset=UTF-8"])
-            response.writeText("Hello there!")
-        } else {
-            response.writeStatus(404, Some("Not found"))
-        }
-    }
-}
-buildMain(system: BuildSystem) {
-    let browser = system.compileForBrowser("Main2.ff")
-    let assets = AssetSystem.create().addAssets("/js", browser.assets())
-    system.setAssets(assets)
-}
-trySleep(task: Task, name: String) {
-    try {
-        task.sleep(Duration(4.0))
-        Log.debug("Slept!")
-    } catchAny {error =>
-        if(error.name() == "AbortError") {
-            Log.debug(name + " aborted")
-        }
-        error.rethrow()
-    } grab()
-}
+import HttpServer from ff:httpserver
+import Lux
+import LuxEvent
+mainComponent(lux: Lux, system: BrowserSystem) {
+    sleepComponent(lux, system)
+}
+sleepComponent(lux: Lux, system: BrowserSystem) {
+    lux.useState(False): start, setStart =>
+    if(start) {
+        lux.useSuspense {
+            lux.div {
+                lux.div {lux.text("Sleeping")}
+                lux.button {
+                    lux.text("Cancel")
+                    lux.onClick {event =>
+                        event.preventDefault()
+                        setStart(False)
+                    }
+                }
+            }
+        } {lux =>
+            trySleep(lux.task, "A")
+            lux.div {lux.text("Done sleeping")}
+        }
+    } else {
+        lux.button {
+            lux.text("Start")
+            lux.onClick {event =>
+                event.preventDefault()
+                setStart(True)
+            }
+        }
+    }
+}
+ifComponent(lux: Lux, system: BrowserSystem) {
+    lux.useState(False): start, setStart =>
+    if(start) {
+        lux.div {lux.text("Started")}
+    } else {
+        lux.button {
+            lux.text("Start")
+            lux.onClick {event =>
+                event.preventDefault()
+                setStart(True)
+            }
+        }
+    }
+}
+rhymeComponent(lux: Lux, system: BrowserSystem) {
+    lux.div {
+        lux.useState(0): count, setCount =>
+        Log.debug("useState(0)")
+        lux.useState("Ɛ"): text, setText =>
+        lux.div {
+            lux.button {
+                lux.text("Count: " + count)
+                lux.onClick {event =>
+                    setCount(count + 1)
+                }
+            }
+            lux.div {
+                lux.useCallback1(setText): setText =>
+                lux.useLazy1(text): text =>
+                lux.div {
+                    lux.div {
+                        lux.text("Text: " + text + " -> ")
+                        lux.useSuspense {lux.span {lux.text("Rhyming...")}} {lux =>
+                            lux.span {
+                                lux.text(rhyme(system, text))
+                            }
+                        }
+                    }
+                    lux.input {
+                        lux.setValue(text)
+                        Log.debug("setValue: " + text)
+                        lux.onInput {event =>
+                            Log.debug(text + " -> " + event.text())
+                            setText(event.text())
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+rhyme(system: BrowserSystem, text: String): String {
+    let json = system.httpClient().get("https://api.datamuse.com/words?rel_rhy=" + text, []) {_.readJson()}
+    json.index(0).field("word").getString().else {"?"}
+}
+browserMain(system: BrowserSystem): Unit {
+    Lux.renderById(system, "main") {lux =>
+        lux.div {
+            mainComponent(lux, system)
+        }
+    }
+}
+nodeMain(system: NodeSystem): Unit {
+    HttpServer.listen(system, "localhost", 8080) {request, response =>
+        if(request.path() == "/") {
+            response.setHeader("Content-Type", ["text/html; charset=UTF-8"])
+            response.writeText("<!doctype html>")
+            response.writeText("<div id='main'></div>")
+            response.writeText("<script type='module' src='/js/script/script/Main2.mjs'></script>")
+        } elseIf {request.path().startsWith("/js/") && !request.path().contains("..")} {
+            response.setHeader("Content-Type", ["text/javascript; charset=UTF-8"])
+            response.writeText(system.assets().readText(request.path()))
+        } elseIf {request.path() == "/chat"} {
+            system.mainTask().sleep(Duration(request.readText().size().toFloat()))
+            response.setHeader("Content-Type", ["text/plain; charset=UTF-8"])
+            response.writeText("Hello there!")
+        } else {
+            response.writeStatus(404, Some("Not found"))
+        }
+    }
+}
+buildMain(system: BuildSystem) {
+    let browser = system.compileForBrowser("Main2.ff")
+    let assets = AssetSystem.create().addAssets("/js", browser.assets())
+    system.setAssets(assets)
+}
+trySleep(task: Task, name: String) {
+    try {
+        task.sleep(Duration(4.0))
+        Log.debug("Slept!")
+    } catchAny {error =>
+        if(error.name() == "AbortError") {
+            Log.debug(name + " aborted")
+        }
+        error.rethrow()
+    }
+}

package/lux/TestDry.ff ADDED Viewed

@@ -0,0 +1,27 @@
+import Lux
+nodeMain(system: NodeSystem) {
+    let html = Lux.renderToString(system, render)
+    Log.trace(html)
+}
+render(lux: Lux): Unit {
+    lux.div {
+        lux.set("id", "its-me")
+        lux.span {
+            lux.text("Hello")
+            lux.div {
+                lux.set("id", "it's \"a-me\"")
+                lux.span {
+                    lux.text("Hello ]]>")
+                }
+                lux.text("Hi")
+            }
+        }
+        lux.text("Hi")
+    }
+}

package/output/js/ff/compiler/Builder.mjs CHANGED Viewed

@@ -203,7 +203,7 @@ return (!ff_core_Path.Path_contains(_w1, [".firefly", "dependencies"]))
 })));
 ff_core_List.List_each(files_, ((file_) => {
 const localFile_ = ff_core_Path.Path_base(file_);
-ff_core_Try.Try_grab(ff_core_Try.Try_catch(ff_core_Try.Try_catch(ff_core_Core.try_((() => {
+ff_core_Try.Try_catch(ff_core_Try.Try_tryCatch(ff_core_Core.try_((() => {
 if(infer_) {
 ff_compiler_Compiler.Compiler_infer(compiler_, resolvedDependencies_.mainPackagePair_, ff_core_String.String_dropLast(localFile_, ff_core_String.String_size(".ff")))
 } else {
@@ -223,7 +223,7 @@ const error_ = _2;
 ff_core_Array.Array_pushList(errors_, compileErrors_)
 return
 }
-}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors))
+}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors)
 }));
 ff_compiler_ModuleCache.ModuleCache_mergeVersions(cache_, compiler_.cache_)
 }));
@@ -287,24 +287,24 @@ ff_core_Path.Path_writeStream(p_, makeStream_(), false)
 return
 }
 }));
-const json_ = `{
-            "name": "main",
-            "bin": {
-                "firefly-main": "Main.bundle.js"
-            },
-            "devDependencies": {
-                "pkg": "^5.8.0"
-            },
-            "pkg": {
-                "scripts": "Main.bundle.js",
-                "outputPath": "bin",
-                "assets": ["../assets/**/*"],
-                "targets": [
-                    "node18-linux-x64",
-                    "node18-macos-x64",
-                    "node18-win-x64"
-                ]
-            }
+const json_ = `{
+            "name": "main",
+            "bin": {
+                "firefly-main": "Main.bundle.js"
+            },
+            "devDependencies": {
+                "pkg": "^5.8.0"
+            },
+            "pkg": {
+                "scripts": "Main.bundle.js",
+                "outputPath": "bin",
+                "assets": ["../assets/**/*"],
+                "targets": [
+                    "node18-linux-x64",
+                    "node18-macos-x64",
+                    "node18-win-x64"
+                ]
+            }
         }`;
 const packageFile_ = ff_core_Path.Path_slash(outputPath_, "executable/package.json");
 ff_core_Path.Path_writeText(packageFile_, json_);
@@ -397,7 +397,7 @@ return (!(await ff_core_Path.Path_contains$(_w1, [".firefly", "dependencies"], $
 }), $task)));
 (await ff_core_List.List_each$(files_, (async (file_, $task) => {
 const localFile_ = (await ff_core_Path.Path_base$(file_, $task));
-ff_core_Try.Try_grab(ff_core_Try.Try_catch(ff_core_Try.Try_catch((await ff_core_Core.try_$((async ($task) => {
+ff_core_Try.Try_catch(ff_core_Try.Try_tryCatch((await ff_core_Core.try_$((async ($task) => {
 if(infer_) {
 (await ff_compiler_Compiler.Compiler_infer$(compiler_, resolvedDependencies_.mainPackagePair_, ff_core_String.String_dropLast(localFile_, ff_core_String.String_size(".ff")), $task))
 } else {
@@ -417,7 +417,7 @@ const error_ = _2;
 ff_core_Array.Array_pushList(errors_, compileErrors_)
 return
 }
-}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors))
+}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors)
 }), $task));
 ff_compiler_ModuleCache.ModuleCache_mergeVersions(cache_, compiler_.cache_)
 }), $task));
@@ -481,24 +481,24 @@ const p_ = (await ff_core_Path.Path_slash$(assetOutputPath_, path_, $task));
 return
 }
 }), $task));
-const json_ = `{
-            "name": "main",
-            "bin": {
-                "firefly-main": "Main.bundle.js"
-            },
-            "devDependencies": {
-                "pkg": "^5.8.0"
-            },
-            "pkg": {
-                "scripts": "Main.bundle.js",
-                "outputPath": "bin",
-                "assets": ["../assets/**/*"],
-                "targets": [
-                    "node18-linux-x64",
-                    "node18-macos-x64",
-                    "node18-win-x64"
-                ]
-            }
+const json_ = `{
+            "name": "main",
+            "bin": {
+                "firefly-main": "Main.bundle.js"
+            },
+            "devDependencies": {
+                "pkg": "^5.8.0"
+            },
+            "pkg": {
+                "scripts": "Main.bundle.js",
+                "outputPath": "bin",
+                "assets": ["../assets/**/*"],
+                "targets": [
+                    "node18-linux-x64",
+                    "node18-macos-x64",
+                    "node18-win-x64"
+                ]
+            }
         }`;
 const packageFile_ = (await ff_core_Path.Path_slash$(outputPath_, "executable/package.json", $task));
 (await ff_core_Path.Path_writeText$(packageFile_, json_, $task));
@@ -506,13 +506,13 @@ const packageFile_ = (await ff_core_Path.Path_slash$(outputPath_, "executable/pa
 }
 export async function internalCallPkg_$(self_, packageFile_, outputPath_, targets_, $task) {
-        const pkg = import$0
-        return await pkg.exec([
-            packageFile_,
-            '--out-path', outputPath_,
-            '--target', targets_.join(',')
-        ])
+        const pkg = import$0
+        return await pkg.exec([
+            packageFile_,
+            '--out-path', outputPath_,
+            '--target', targets_.join(',')
+        ])
 }

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

@@ -187,9 +187,9 @@ ff_core_Core.panic_(((("Dependency declaration and package declaration disagree
 }
 export async function internalExtractTarGz_$(tarGzPath_, path_, $task) {
-        const tar = import$0
-        await tar.extract({file: tarGzPath_, cwd: path_, strict: true})
+        const tar = import$0
+        await tar.extract({file: tarGzPath_, cwd: path_, strict: true})
 }

package/output/js/ff/compiler/Inference.mjs CHANGED Viewed

@@ -899,7 +899,7 @@ const c_ = _guard3;
 const _guard2 = c_.function_;
 if(_guard2.EField) {
 const f_ = _guard2;
-if(((((((f_.field_ === "else") || (f_.field_ === "elseIf")) || (f_.field_ === "grab")) || (f_.field_ === "catch")) || (f_.field_ === "catchAny")) || (f_.field_ === "finally"))) {
+if(((((((((f_.field_ === "else") || (f_.field_ === "elseIf")) || (f_.field_ === "tryCatch")) || (f_.field_ === "tryCatchAny")) || (f_.field_ === "tryFinally")) || (f_.field_ === "catch")) || (f_.field_ === "catchAny")) || (f_.field_ === "finally"))) {
 {
 const _1 = e_;
 {
@@ -2746,7 +2746,7 @@ const c_ = _guard3;
 const _guard2 = c_.function_;
 if(_guard2.EField) {
 const f_ = _guard2;
-if(((((((f_.field_ === "else") || (f_.field_ === "elseIf")) || (f_.field_ === "grab")) || (f_.field_ === "catch")) || (f_.field_ === "catchAny")) || (f_.field_ === "finally"))) {
+if(((((((((f_.field_ === "else") || (f_.field_ === "elseIf")) || (f_.field_ === "tryCatch")) || (f_.field_ === "tryCatchAny")) || (f_.field_ === "tryFinally")) || (f_.field_ === "catch")) || (f_.field_ === "catchAny")) || (f_.field_ === "finally"))) {
 {
 const _1 = e_;
 {

package/output/js/ff/compiler/JsEmitter.mjs CHANGED Viewed

@@ -1307,52 +1307,25 @@ const d_ = ff_compiler_JsEmitter.JsEmitter_emitDictionary(self_, dictionary_);
 const a_ = ff_compiler_JsEmitter.JsEmitter_emitArgument(self_, at_, argument_, async_);
 return (((("throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(" + a_) + ", ") + d_) + ")})")
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Core.try") {
-const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a try without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_map") {
-const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a map without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_flatMap") {
-const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a flatMap without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_flatten") {
-const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a flatten without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}
 if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_catch") {
 const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a catch without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+const _guard1 = ff_compiler_JsEmitter.JsEmitter_emitTryCatchFinally(self_, term_, last_, async_);
+if(_guard1.Some) {
+const code_ = _guard1.value_;
+return code_
 }
 }
 if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_catchAny") {
 const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a catchAny without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+const _guard1 = ff_compiler_JsEmitter.JsEmitter_emitTryCatchFinally(self_, term_, last_, async_);
+if(_guard1.Some) {
+const code_ = _guard1.value_;
+return code_
 }
 }
 if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_finally") {
 const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a finally without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_grab" && _1.arguments_.length === 1) {
-const at_ = _1.at_;
-const argument_ = _1.arguments_[0];
-const _guard1 = ff_compiler_JsEmitter.JsEmitter_emitTryCatchFinally(self_, argument_.value_, last_, async_);
+const _guard1 = ff_compiler_JsEmitter.JsEmitter_emitTryCatchFinally(self_, term_, last_, async_);
 if(_guard1.Some) {
 const code_ = _guard1.value_;
 return code_
@@ -2672,52 +2645,25 @@ const d_ = (await ff_compiler_JsEmitter.JsEmitter_emitDictionary$(self_, diction
 const a_ = (await ff_compiler_JsEmitter.JsEmitter_emitArgument$(self_, at_, argument_, async_, $task));
 return (((("throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(" + a_) + ", ") + d_) + ")})")
 }
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Core.try") {
-const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a try without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_map") {
-const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a map without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_flatMap") {
-const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a flatMap without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_flatten") {
-const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a flatten without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}
 if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_catch") {
 const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a catch without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+const _guard1 = (await ff_compiler_JsEmitter.JsEmitter_emitTryCatchFinally$(self_, term_, last_, async_, $task));
+if(_guard1.Some) {
+const code_ = _guard1.value_;
+return code_
 }
 }
 if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_catchAny") {
 const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a catchAny without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+const _guard1 = (await ff_compiler_JsEmitter.JsEmitter_emitTryCatchFinally$(self_, term_, last_, async_, $task));
+if(_guard1.Some) {
+const code_ = _guard1.value_;
+return code_
 }
 }
 if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_finally") {
 const at_ = _1.at_;
-if((!last_)) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "Statements can't be a finally without a grab"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/Try.Try_grab" && _1.arguments_.length === 1) {
-const at_ = _1.at_;
-const argument_ = _1.arguments_[0];
-const _guard1 = (await ff_compiler_JsEmitter.JsEmitter_emitTryCatchFinally$(self_, argument_.value_, last_, async_, $task));
+const _guard1 = (await ff_compiler_JsEmitter.JsEmitter_emitTryCatchFinally$(self_, term_, last_, async_, $task));
 if(_guard1.Some) {
 const code_ = _guard1.value_;
 return code_

package/output/js/ff/compiler/Main.mjs CHANGED Viewed

@@ -229,7 +229,7 @@ ff_compiler_Builder.build_(system_, ff_compiler_JsEmitter.EmitNode(), ff_compile
 return
 }
 }
-ff_core_Try.Try_grab(ff_core_Try.Try_catch(ff_core_Try.Try_catch(ff_core_Try.Try_catch(ff_core_Core.try_((() => {
+ff_core_Try.Try_catch(ff_core_Try.Try_tryCatch(ff_core_Try.Try_tryCatch(ff_core_Core.try_((() => {
 const command_ = ff_compiler_Main.parseCommandLine_(ff_core_NodeSystem.NodeSystem_arguments(system_));
 runCommand_(command_)
 })), ((_1, _2) => {
@@ -259,7 +259,7 @@ return ff_core_Log.debug_((((((" at " + ff_core_String.String_replace(at_.file_,
 }))
 return
 }
-}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors))
+}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors)
 }
 export function parseCommandLine_(arguments_) {
@@ -477,7 +477,7 @@ const fakeLocation_ = ff_compiler_Syntax.Location("<core>", 0, 0);
 return
 }
 }
-ff_core_Try.Try_grab(ff_core_Try.Try_catch(ff_core_Try.Try_catch(ff_core_Try.Try_catch((await ff_core_Core.try_$((async ($task) => {
+ff_core_Try.Try_catch(ff_core_Try.Try_tryCatch(ff_core_Try.Try_tryCatch((await ff_core_Core.try_$((async ($task) => {
 const command_ = ff_compiler_Main.parseCommandLine_((await ff_core_NodeSystem.NodeSystem_arguments$(system_, $task)));
 (await runCommand_$(command_, $task))
 }), $task)), ((_1, _2) => {
@@ -507,7 +507,7 @@ return ff_core_Log.debug_((((((" at " + ff_core_String.String_replace(at_.file_,
 }))
 return
 }
-}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors))
+}), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors)
 }
 export async function parseCommandLine_$(arguments_, $task) {