firefly-compiler 0.4.19 → 0.4.21

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

@@ -111,7 +111,6 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Core.G
 export function Try_map(self_, body_) {
 {
 const _1 = self_;
-{
 if(_1.Success) {
 const value_ = _1.value_;
 return ff_core_Core.try_((() => {
@@ -119,13 +118,9 @@ return body_(value_)
 }))
 return
 }
-}
-{
 if(_1.Failure) {
 const error_ = _1.error_;
 return ff_core_Try.Failure(error_)
-return
-}
 }
 }
 }
@@ -137,7 +132,6 @@ return ff_core_Try.Try_flatten(ff_core_Try.Try_map(self_, body_))
 export function Try_catch(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_) => {
@@ -151,10 +145,8 @@ return body_(e_, error_)
 return
 }
 }
-}
 {
 return self_
-return
 }
 }
 }
@@ -162,7 +154,6 @@ return
 export function Try_catchAny(self_, body_) {
 {
 const _1 = self_;
-{
 if(_1.Failure) {
 const error_ = _1.error_;
 return ff_core_Core.try_((() => {
@@ -170,10 +161,8 @@ return body_(error_)
 }))
 return
 }
-}
 {
 return self_
-return
 }
 }
 }
@@ -181,7 +170,6 @@ return
 export function Try_finally(self_, body_) {
 {
 const _1 = self_;
-{
 if(_1.Success) {
 const value_ = _1.value_;
 return ff_core_Core.try_((() => {
@@ -190,48 +178,33 @@ return value_
 }))
 return
 }
-}
-{
 if(_1.Failure) {
 {
 const _1 = ff_core_Core.try_((() => {
 return body_()
 }));
-{
 if(_1.Success) {
 return self_
-return
-}
 }
-{
 if(_1.Failure) {
 const error_ = _1.error_;
 return ff_core_Try.Failure(error_)
-return
-}
 }
 }
 return
 }
 }
 }
-}
 
 export function Try_else(self_, body_) {
 {
 const _1 = self_;
-{
 if(_1.Success) {
 const value_ = _1.value_;
 return value_
-return
 }
-}
-{
 if(_1.Failure) {
 return body_()
-return
-}
 }
 }
 }
@@ -239,19 +212,13 @@ return
 export function Try_grab(self_) {
 {
 const _1 = self_;
-{
 if(_1.Success) {
 const value_ = _1.value_;
 return value_
-return
-}
 }
-{
 if(_1.Failure) {
 const error_ = _1.error_;
 return ff_core_Error.Error_rethrow(error_)
-return
-}
 }
 }
 }
@@ -259,18 +226,12 @@ return
 export function Try_toOption(self_) {
 {
 const _1 = self_;
-{
 if(_1.Success) {
 const value_ = _1.value_;
 return ff_core_Option.Some(value_)
-return
-}
 }
-{
 if(_1.Failure) {
 return ff_core_Option.None()
-return
-}
 }
 }
 }
@@ -278,7 +239,6 @@ return
 export async function Try_map$(self_, body_, $task) {
 {
 const _1 = self_;
-{
 if(_1.Success) {
 const value_ = _1.value_;
 return (await ff_core_Core.try_$((async ($task) => {
@@ -286,13 +246,9 @@ return (await body_(value_, $task))
 }), $task))
 return
 }
-}
-{
 if(_1.Failure) {
 const error_ = _1.error_;
 return ff_core_Try.Failure(error_)
-return
-}
 }
 }
 }
@@ -304,7 +260,6 @@ return ff_core_Try.Try_flatten((await ff_core_Try.Try_map$(self_, body_, $task))
 export async function Try_catch$(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_) => {
@@ -318,10 +273,8 @@ return (await body_(e_, error_, $task))
 return
 }
 }
-}
 {
 return self_
-return
 }
 }
 }
@@ -329,7 +282,6 @@ return
 export async function Try_catchAny$(self_, body_, $task) {
 {
 const _1 = self_;
-{
 if(_1.Failure) {
 const error_ = _1.error_;
 return (await ff_core_Core.try_$((async ($task) => {
@@ -337,10 +289,8 @@ return (await body_(error_, $task))
 }), $task))
 return
 }
-}
 {
 return self_
-return
 }
 }
 }
@@ -348,7 +298,6 @@ return
 export async function Try_finally$(self_, body_, $task) {
 {
 const _1 = self_;
-{
 if(_1.Success) {
 const value_ = _1.value_;
 return (await ff_core_Core.try_$((async ($task) => {
@@ -357,48 +306,33 @@ return value_
 }), $task))
 return
 }
-}
-{
 if(_1.Failure) {
 {
 const _1 = (await ff_core_Core.try_$((async ($task) => {
 return (await body_($task))
 }), $task));
-{
 if(_1.Success) {
 return self_
-return
-}
 }
-{
 if(_1.Failure) {
 const error_ = _1.error_;
 return ff_core_Try.Failure(error_)
-return
-}
 }
 }
 return
 }
 }
 }
-}
 
 export async function Try_else$(self_, body_, $task) {
 {
 const _1 = self_;
-{
 if(_1.Success) {
 const value_ = _1.value_;
 return value_
-return
 }
-}
-{
 if(_1.Failure) {
 return (await body_($task))
-return
-}
 }
 }
 }
@@ -406,19 +340,13 @@ return
 export async function Try_grab$(self_, $task) {
 {
 const _1 = self_;
-{
 if(_1.Success) {
 const value_ = _1.value_;
 return value_
-return
-}
 }
-{
 if(_1.Failure) {
 const error_ = _1.error_;
 return ff_core_Error.Error_rethrow(error_)
-return
-}
 }
 }
 }
@@ -426,18 +354,12 @@ return
 export async function Try_toOption$(self_, $task) {
 {
 const _1 = self_;
-{
 if(_1.Success) {
 const value_ = _1.value_;
 return ff_core_Option.Some(value_)
-return
-}
 }
-{
 if(_1.Failure) {
 return ff_core_Option.None()
-return
-}
 }
 }
 }
@@ -445,30 +367,17 @@ return
 export function Try_flatten(self_) {
 {
 const _1 = self_;
-{
-if(_1.Success) {
+if(_1.Success && _1.value_.Success) {
 const t_ = _1.value_;
-if(_1.value_.Success) {
 return t_
-return
-}
 }
-}
-{
-if(_1.Success) {
+if(_1.Success && _1.value_.Failure) {
 const t_ = _1.value_;
-if(_1.value_.Failure) {
 return t_
-return
-}
-}
 }
-{
 if(_1.Failure) {
 const error_ = _1.error_;
 return ff_core_Try.Failure(error_)
-return
-}
 }
 }
 }
@@ -476,30 +385,17 @@ return
 export async function Try_flatten$(self_, $task) {
 {
 const _1 = self_;
-{
-if(_1.Success) {
+if(_1.Success && _1.value_.Success) {
 const t_ = _1.value_;
-if(_1.value_.Success) {
 return t_
-return
-}
 }
-}
-{
-if(_1.Success) {
+if(_1.Success && _1.value_.Failure) {
 const t_ = _1.value_;
-if(_1.value_.Failure) {
 return t_
-return
-}
-}
 }
-{
 if(_1.Failure) {
 const error_ = _1.error_;
 return ff_core_Try.Failure(error_)
-return
-}
 }
 }
 }

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

@@ -115,37 +115,23 @@ return ff_core_Any.internalAnyTag_((("ff:core/Unit.Unit" + "[") + "]"))
 
 export const ff_core_Equal_Equal$ff_core_Unit_Unit = {
 equals_(x_, y_) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return true
-return
-}
 }
 {
 return true
-return
-}
 }
 },
 async equals_$(x_, y_, $task) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return true
-return
-}
 }
 {
 return true
-return
-}
 }
 }
 };

package/package.json

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

package/postgresql/Pg.ff

@@ -217,47 +217,47 @@ extend self: PgStatement {
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withBoolArray(name: String, value: Array[Bool]): PgStatement {
+    withBoolArray(name: String, value: List[Bool]): PgStatement {
         let p = UnsafeJs.jsSystem().value(value)
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withNullableBoolArray(name: String, value: Option[Array[Bool]]): PgStatement {
+    withNullableBoolArray(name: String, value: Option[List[Bool]]): PgStatement {
         let p = value.map(UnsafeJs.jsSystem().value).else {UnsafeJs.jsSystem().null()}
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withIntArray(name: String, value: Array[Int]): PgStatement {
+    withIntArray(name: String, value: List[Int]): PgStatement {
         let p = UnsafeJs.jsSystem().value(value)
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withNullableIntArray(name: String, value: Option[Array[Int]]): PgStatement {
+    withNullableIntArray(name: String, value: Option[List[Int]]): PgStatement {
         let p = value.map(UnsafeJs.jsSystem().value).else {UnsafeJs.jsSystem().null()}
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withFloatArray(name: String, value: Array[Float]): PgStatement {
+    withFloatArray(name: String, value: List[Float]): PgStatement {
         let p = UnsafeJs.jsSystem().value(value)
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withNullableFloatArray(name: String, value: Option[Array[Float]]): PgStatement {
+    withNullableFloatArray(name: String, value: Option[List[Float]]): PgStatement {
         let p = value.map(UnsafeJs.jsSystem().value).else {UnsafeJs.jsSystem().null()}
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withStringArray(name: String, value: Array[String]): PgStatement {
+    withStringArray(name: String, value: List[String]): PgStatement {
         let p = UnsafeJs.jsSystem().value(value)
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withNullableStringArray(name: String, value: Option[Array[String]]): PgStatement {
+    withNullableStringArray(name: String, value: Option[List[String]]): PgStatement {
         let p = value.map(UnsafeJs.jsSystem().value).else {UnsafeJs.jsSystem().null()}
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withInstantArray(name: String, value: Array[Instant]): PgStatement {
+    withInstantArray(name: String, value: List[Instant]): PgStatement {
         let jsDate = UnsafeJs.jsSystem().global().get("Date")
         function toJsDate(instant: Instant): JsValue {
             jsDate.new1(instant.since1970.seconds * 1000.0)
@@ -266,7 +266,7 @@ extend self: PgStatement {
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withNullableInstantArray(name: String, value: Option[Array[Instant]]): PgStatement {
+    withNullableInstantArray(name: String, value: Option[List[Instant]]): PgStatement {
         let jsDate = UnsafeJs.jsSystem().global().get("Date")
         function toJsDate(instant: Instant): JsValue {
             jsDate.new1(instant.since1970.seconds * 1000.0)
@@ -275,12 +275,12 @@ extend self: PgStatement {
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withBufferArray(name: String, value: Array[Buffer]): PgStatement {
+    withBufferArray(name: String, value: List[Buffer]): PgStatement {
         let p = UnsafeJs.jsSystem().value(value)
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
 
-    withNullableBufferArray(name: String, value: Option[Array[Buffer]]): PgStatement {
+    withNullableBufferArray(name: String, value: Option[List[Buffer]]): PgStatement {
         let p = value.map(UnsafeJs.jsSystem().value).else {UnsafeJs.jsSystem().null()}
         self.PgStatement(parameters = self.parameters.add(name, p))
     }
@@ -342,27 +342,27 @@ extend self: PgRow {
         internalGet(self, name, lower) {_.grabBuffer()}
     }
 
-    getBoolArray(name: String, lower: Bool = True): Option[Array[Bool]] {
+    getBoolArray(name: String, lower: Bool = True): Option[List[Bool]] {
         internalGet(self, name, lower) {_.grabArray().map {(_.grabBool() && True) || False}}
     }
 
-    getIntArray(name: String, lower: Bool = True): Option[Array[Int]] {
+    getIntArray(name: String, lower: Bool = True): Option[List[Int]] {
         internalGet(self, name, lower) {_.grabArray().map {_.grabInt() * 1}}
     }
 
-    getFloatArray(name: String, lower: Bool = True): Option[Array[Float]] {
+    getFloatArray(name: String, lower: Bool = True): Option[List[Float]] {
         internalGet(self, name, lower) {_.grabArray().map {_.grabFloat() * 1.0}}
     }
 
-    getStringArray(name: String, lower: Bool = True): Option[Array[String]] {
+    getStringArray(name: String, lower: Bool = True): Option[List[String]] {
         internalGet(self, name, lower) {_.grabArray().map {"" + _.grabString()}}
     }
 
-    getInstantArray(name: String, lower: Bool = True): Option[Array[Instant]] {
+    getInstantArray(name: String, lower: Bool = True): Option[List[Instant]] {
         internalGet(self, name, lower) {_.grabArray().map {Instant(Duration(_.call0("getTime").grabInt() * 0.001))}}
     }
 
-    getBufferArray(name: String, lower: Bool = True): Option[Array[Buffer]] {
+    getBufferArray(name: String, lower: Bool = True): Option[List[Buffer]] {
         internalGet(self, name, lower) {_.grabArray().map {_.grabBuffer()}}
     }
 
@@ -384,7 +384,7 @@ internalRunStatement(statement: PgStatement, body: Option[PgRow => Bool]): Int {
         | None =>
             result.get("rowCount").grabInt()
         | Some(f) =>
-            let all = result.get("rows").grabArray().toList().all {row =>
+            let all = result.get("rows").grabArray().all {row =>
                 f(PgRow(row))
             }
             if(all) {1} else {0}
@@ -426,7 +426,7 @@ internalBatchStatements(
             | None =>
                 result.get("rowCount").grabInt()
             | Some(f) =>
-                let all = result.get("rows").grabArray().toList().all {row =>
+                let all = result.get("rows").grabArray().all {row =>
                     f(PgRow(row))
                 }
                 endBody.each {_()}
@@ -436,12 +436,12 @@ internalBatchStatements(
     results
 }
 
-internalCheckParameters(parameterNames: List[String], parameters: Map[String, JsValue]): Array[JsValue] {
-    let arguments = parameterNames.map { name =>
+internalCheckParameters(parameterNames: List[String], parameters: Map[String, JsValue]): List[JsValue] {
+    let arguments = parameterNames.map {name =>
         parameters.get(name).else {
             panic("No value for parameter: " + name)
         }
-    }.toArray()
+    }
     let unusedParameters = parameters.keys().removeAll(parameterNames.toSet())
     if(unusedParameters.size() > 0) {
         panic("Unused parameters: " + unusedParameters.toList().join(", "))

package/vscode/client/src/extension.ts

@@ -27,6 +27,34 @@ export function activate(context: vscode.ExtensionContext) {
         return fireflyCompiler;
     }));
     
+    let runFireflyProgramCommand = vscode.commands.registerCommand(
+		"extension.firefly-lang.runFireflyProgram",
+		async () => {
+			const editor = vscode.window.activeTextEditor;
+			if(!editor) {
+				vscode.window.showErrorMessage("No active text editor.");
+				return;
+			}
+			const filePath = editor.document.fileName;
+            const fileDirectory = require('path').dirname(filePath);
+            const fileName = require('path').basename(filePath);
+			const terminal = vscode.window.createTerminal("firefly");
+            terminal.sendText(`cd "${fileDirectory}" # npm install -g firefly-compiler`);
+            terminal.sendText(`firefly "${fileName}"`);
+			terminal.show();
+		}
+	);
+    
+    context.subscriptions.push(runFireflyProgramCommand);
+    
+    let runFireflyProgramButton = vscode.window.createStatusBarItem(
+		vscode.StatusBarAlignment.Left
+	);
+	runFireflyProgramButton.text = "$(triangle-right) Run Firefly Program";
+	runFireflyProgramButton.command = "extension.firefly-lang.runFireflyProgram";
+
+    context.subscriptions.push(runFireflyProgramButton);
+    
     const runOrDebug = {
         module: fireflyCompiler,
         args: ['LanguageServer.ff'],
@@ -55,7 +83,7 @@ export function activate(context: vscode.ExtensionContext) {
 
     client.start();
     
-    vscode.window.onDidChangeActiveTextEditor(editor => {
+    context.subscriptions.push(vscode.window.onDidChangeActiveTextEditor(editor => {
         if(editor && editor.document.languageId === 'firefly') {
             client.sendNotification('custom/focusDocument', {
                 "textDocument": {
@@ -64,7 +92,7 @@ export function activate(context: vscode.ExtensionContext) {
                 }
             });
         }
-    });
+    }));
 }
 
 export function deactivate(): Thenable<void> | undefined {

package/vscode/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly language support",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.4.19",
+    "version": "0.4.21",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"
@@ -82,8 +82,24 @@
             {
                 "command": "extension.firefly-lang.getFireflyCompiler",
                 "title": "Get the Firefly compiler main"
+            },
+            {
+              "command": "extension.firefly-lang.runFireflyProgram",
+              "title": "Run Firefly Program",
+              "icon": "$(run)",
+              "when": "editorLangId == firefly"
             }
         ],
+        "menus": {
+            "editor/title/run": [
+                {
+                    "command": "extension.firefly-lang.runFireflyProgram",
+                    "group": "1_run",
+                    "icon": "$(run)",
+                    "when": "editorLangId == firefly"
+                }
+            ]
+        },
         "configuration": {
             "type": "object",
             "title": "Firefly language support configuration",