firefly-compiler 0.4.78 → 0.4.80

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

@@ -120,11 +120,11 @@ throw new Error('Function internalListDirectoryWithoutOpendir is missing on this
 }
 
 export function internalProcessError_(problem_) {
-return ff_core_Try.Try_grab(ff_core_Try.Try_catchAny(ff_core_Core.try_((() => {
+return ff_core_Try.Try_catchAny(ff_core_Core.try_((() => {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_NodeSystem.ProcessException(problem_), ff_core_NodeSystem.ff_core_Any_HasAnyTag$ff_core_NodeSystem_ProcessException)})
 })), ((error_) => {
 return error_
-})))
+}))
 }
 
 export function internalWindowsWhere_(system_, cmd_, command_, directory_ = ff_core_Option.None(), environment_ = ff_core_Option.None()) {
@@ -156,11 +156,11 @@ export async function internalListDirectoryWithoutOpendir_$(system_, path_, $tas
 }
 
 export async function internalProcessError_$(problem_, $task) {
-return ff_core_Try.Try_grab(ff_core_Try.Try_catchAny(ff_core_Core.try_((() => {
+return ff_core_Try.Try_catchAny(ff_core_Core.try_((() => {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_NodeSystem.ProcessException(problem_), ff_core_NodeSystem.ff_core_Any_HasAnyTag$ff_core_NodeSystem_ProcessException)})
 })), ((error_) => {
 return error_
-})))
+}))
 }
 
 export async function internalWindowsWhere_$(system_, cmd_, command_, directory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), $task) {

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

@@ -215,7 +215,7 @@ const successChannel_ = ff_core_Task.Task_channel(self_, 0);
 const failureChannel_ = ff_core_Task.Task_channel(self_, 0);
 ff_core_Task.Task_spawn(self_, ((t_) => {
 const channel_ = ff_core_Task.Task_channel(t_, 0);
-ff_core_Try.Try_grab(ff_core_Try.Try_catchAny(ff_core_Core.try_((() => {
+ff_core_Try.Try_catchAny(ff_core_Core.try_((() => {
 ff_core_List.List_each(ff_core_List.List_pairs(tasks_), ((_1) => {
 {
 const i_ = _1.first_;
@@ -237,7 +237,7 @@ ff_core_Channel.Channel_write(successChannel_, result_)
 })), ((error_) => {
 ff_core_Channel.Channel_write(failureChannel_, error_);
 ff_core_Task.Task_abort(t_)
-})))
+}))
 }));
 return ff_core_Channel.ChannelAction_wait(ff_core_Channel.ChannelAction_readOr(ff_core_Channel.readOr_(successChannel_, ((_w1) => {
 return _w1
@@ -252,14 +252,14 @@ const failureChannel_ = ff_core_Task.Task_channel(self_, 0);
 let live_ = ff_core_List.List_size(tasks_);
 const started_ = ff_core_List.List_map(tasks_, ((task_) => {
 return ff_core_Task.Task_spawn(self_, ((_) => {
-ff_core_Try.Try_grab(ff_core_Try.Try_catchAny(ff_core_Core.try_((() => {
+ff_core_Try.Try_catchAny(ff_core_Core.try_((() => {
 ff_core_Channel.Channel_write(successChannel_, task_())
 })), ((e_) => {
 live_ -= 1;
 if((live_ === 0)) {
 ff_core_Channel.Channel_write(failureChannel_, e_)
 }
-})))
+}))
 }))
 }));
 try {
@@ -288,7 +288,7 @@ const successChannel_ = (await ff_core_Task.Task_channel$(self_, 0, $task));
 const failureChannel_ = (await ff_core_Task.Task_channel$(self_, 0, $task));
 (await ff_core_Task.Task_spawn$(self_, (async (t_, $task) => {
 const channel_ = (await ff_core_Task.Task_channel$(t_, 0, $task));
-ff_core_Try.Try_grab((await ff_core_Try.Try_catchAny$((await ff_core_Core.try_$((async ($task) => {
+(await ff_core_Try.Try_catchAny$((await ff_core_Core.try_$((async ($task) => {
 (await ff_core_List.List_each$(ff_core_List.List_pairs(tasks_), (async (_1, $task) => {
 {
 const i_ = _1.first_;
@@ -310,7 +310,7 @@ return _w1.second_
 }), $task)), (async (error_, $task) => {
 (await ff_core_Channel.Channel_write$(failureChannel_, error_, $task));
 (await ff_core_Task.Task_abort$(t_, $task))
-}), $task)))
+}), $task))
 }), $task));
 return (await ff_core_Channel.ChannelAction_wait$((await ff_core_Channel.ChannelAction_readOr$((await ff_core_Channel.readOr_$(successChannel_, (async (_w1, $task) => {
 return _w1
@@ -325,14 +325,14 @@ const failureChannel_ = (await ff_core_Task.Task_channel$(self_, 0, $task));
 let live_ = ff_core_List.List_size(tasks_);
 const started_ = (await ff_core_List.List_map$(tasks_, (async (task_, $task) => {
 return (await ff_core_Task.Task_spawn$(self_, (async (_, $task) => {
-ff_core_Try.Try_grab((await ff_core_Try.Try_catchAny$((await ff_core_Core.try_$((async ($task) => {
+(await ff_core_Try.Try_catchAny$((await ff_core_Core.try_$((async ($task) => {
 (await ff_core_Channel.Channel_write$(successChannel_, (await task_($task)), $task))
 }), $task)), (async (e_, $task) => {
 live_ -= 1;
 if((live_ === 0)) {
 (await ff_core_Channel.Channel_write$(failureChannel_, e_, $task))
 }
-}), $task)))
+}), $task))
 }), $task))
 }), $task));
 try {

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

@@ -139,6 +139,53 @@ return ff_core_Any.fromAny_(any_, ff_core_Any_HasAnyTag$E)
 }));
 if(_guard1.Some) {
 const e_ = _guard1.value_;
+return body_(e_, error_)
+}
+}
+{
+return ff_core_Try.Try_grab(self_)
+}
+}
+}
+
+export function Try_catchAny(self_, body_) {
+{
+const _1 = self_;
+if(_1.Failure) {
+const error_ = _1.error_;
+return body_(error_)
+}
+{
+return ff_core_Try.Try_grab(self_)
+}
+}
+}
+
+export function Try_finally(self_, body_) {
+{
+const _1 = self_;
+if(_1.Success) {
+const value_ = _1.value_;
+body_();
+return value_
+}
+if(_1.Failure) {
+body_();
+return ff_core_Try.Try_grab(self_)
+}
+}
+}
+
+export function Try_tryCatch(self_, body_, ff_core_Any_HasAnyTag$E) {
+{
+const _1 = self_;
+if(_1.Failure) {
+const error_ = _1.error_;
+const _guard1 = ff_core_Option.Option_flatMap(ff_core_Error.Error_exception(error_), ((any_) => {
+return ff_core_Any.fromAny_(any_, ff_core_Any_HasAnyTag$E)
+}));
+if(_guard1.Some) {
+const e_ = _guard1.value_;
 return ff_core_Core.try_((() => {
 return body_(e_, error_)
 }))
@@ -151,7 +198,7 @@ return self_
 }
 }
 
-export function Try_catchAny(self_, body_) {
+export function Try_tryCatchAny(self_, body_) {
 {
 const _1 = self_;
 if(_1.Failure) {
@@ -167,7 +214,7 @@ return self_
 }
 }
 
-export function Try_finally(self_, body_) {
+export function Try_tryFinally(self_, body_) {
 {
 const _1 = self_;
 if(_1.Success) {
@@ -267,6 +314,53 @@ return ff_core_Any.fromAny_(any_, ff_core_Any_HasAnyTag$E)
 }));
 if(_guard1.Some) {
 const e_ = _guard1.value_;
+return (await body_(e_, error_, $task))
+}
+}
+{
+return ff_core_Try.Try_grab(self_)
+}
+}
+}
+
+export async function Try_catchAny$(self_, body_, $task) {
+{
+const _1 = self_;
+if(_1.Failure) {
+const error_ = _1.error_;
+return (await body_(error_, $task))
+}
+{
+return ff_core_Try.Try_grab(self_)
+}
+}
+}
+
+export async function Try_finally$(self_, body_, $task) {
+{
+const _1 = self_;
+if(_1.Success) {
+const value_ = _1.value_;
+(await body_($task));
+return value_
+}
+if(_1.Failure) {
+(await body_($task));
+return ff_core_Try.Try_grab(self_)
+}
+}
+}
+
+export async function Try_tryCatch$(self_, body_, ff_core_Any_HasAnyTag$E, $task) {
+{
+const _1 = self_;
+if(_1.Failure) {
+const error_ = _1.error_;
+const _guard1 = ff_core_Option.Option_flatMap(ff_core_Error.Error_exception(error_), ((any_) => {
+return ff_core_Any.fromAny_(any_, ff_core_Any_HasAnyTag$E)
+}));
+if(_guard1.Some) {
+const e_ = _guard1.value_;
 return (await ff_core_Core.try_$((async ($task) => {
 return (await body_(e_, error_, $task))
 }), $task))
@@ -279,7 +373,7 @@ return self_
 }
 }
 
-export async function Try_catchAny$(self_, body_, $task) {
+export async function Try_tryCatchAny$(self_, body_, $task) {
 {
 const _1 = self_;
 if(_1.Failure) {
@@ -295,7 +389,7 @@ return self_
 }
 }
 
-export async function Try_finally$(self_, body_, $task) {
+export async function Try_tryFinally$(self_, body_, $task) {
 {
 const _1 = self_;
 if(_1.Success) {

package/package.json

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

package/postgresql/Pg.ff

@@ -98,7 +98,7 @@ extend self: PgPool {
         } finally {
             if(!done) {connection.statement("rollback").run()}
             connection.release()
-        } grab()
+        }
     }
 
 }

package/vscode/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly language support",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.4.78",
+    "version": "0.4.80",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"
@@ -37,6 +37,9 @@
                     "light": "./icons/firefly-icon.svg",
                     "dark": "./icons/firefly-icon.svg"
                 }
+            },
+            {
+                "id": "firefly-markdown-injection"
             }
         ],
         "grammars": [
@@ -47,6 +50,17 @@
                 "embeddedLanguages": {
                     "meta.embedded.block.javascript": "javascript"
                 }
+            },
+            {
+                "language": "firefly-markdown-injection",
+                "scopeName": "markdown.firefly.codeblock",
+                "path": "./syntaxes/firefly-markdown-injection.json",
+                "injectTo": [
+                    "text.html.markdown"
+                ],
+                "embeddedLanguages": {
+                    "meta.embedded.block.firefly": "firefly"
+                }
             }
         ],
         "problemMatchers": [

package/vscode/syntaxes/firefly-markdown-injection.json

@@ -0,0 +1,45 @@
+{
+    "fileTypes": [],
+    "injectionSelector": "L:text.html.markdown",
+    "patterns": [
+        {
+            "include": "#firefly-code-block"
+        }
+    ],
+    "repository": {
+        "firefly-code-block": {
+            "begin": "(^|\\G)(\\s*)(\\`{3,}|~{3,})\\s*(?i:(firefly)(\\s+[^`~]*)?$)",
+            "name": "markup.fenced_code.block.markdown",
+            "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
+            "beginCaptures": {
+                "3": {
+                    "name": "punctuation.definition.markdown"
+                },
+                "4": {
+                    "name": "fenced_code.block.language.markdown"
+                },
+                "5": {
+                    "name": "fenced_code.block.language.attributes.markdown"
+                }
+            },
+            "endCaptures": {
+                "3": {
+                    "name": "punctuation.definition.markdown"
+                }
+            },
+            "patterns": [
+                {
+                    "begin": "(^|\\G)(\\s*)(.*)",
+                    "while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
+                    "contentName": "meta.embedded.block.firefly",
+                    "patterns": [
+                        {
+                            "include": "source.firefly"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    "scopeName": "markdown.firefly.codeblock"
+}

package/webserver/.firefly/include/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "include",
-    "lockfileVersion": 3,
+    "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
@@ -12,5 +12,11 @@
             "version": "20.41.0",
             "resolved": "git+ssh://git@github.com/uNetworking/uWebSockets.js.git#105d9ec47126cb82e4a6f3a08aa2ac78b4bb14f1"
         }
+    },
+    "dependencies": {
+        "uWebSockets.js": {
+            "version": "git+ssh://git@github.com/uNetworking/uWebSockets.js.git#105d9ec47126cb82e4a6f3a08aa2ac78b4bb14f1",
+            "from": "uWebSockets.js@github:uNetworking/uWebSockets.js#v20.41.0"
+        }
     }
 }