firefly-compiler 0.5.4 → 0.5.6

package/bin/Release.ff

@@ -35,7 +35,6 @@ release(
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "postgresql")
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "rpc")
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "s3")
-    releaseFireflyPackage(system, accessKeyId, secretAccessKey, "unsafejs")
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "webserver")
     runSuccessful(system, "git", ["commit", "-a", "-m", "Autorelease " + version], system.path(".."))
     runSuccessful(system, "git", ["push"], system.path(".."))

package/compiler/Parser.ff

@@ -1152,7 +1152,7 @@ extend self: Parser {
             True
         } else {False}
         mutable result = self.parseAtom()
-        while {self.current().is4(LBracketLeft, LColon, LDot, LArrowThin)} {
+        while {self.current().is4(LBracketLeft, LColon, LDot, LArrowThin) || self.current().rawIs2("!", "?")} {
             if(self.current().is(LDot)) {
                 self.skip(LDot)
                 if(self.current().rawIs("{")) {
@@ -1172,9 +1172,9 @@ extend self: Parser {
                 let method = if(token.rawIs("!")) {"ff:core/UnsafeJs.value"} else {"ff:core/UnsafeJs.fromValue"}
                 let target = DynamicCall(EVariable(token.at(), method), False)
                 let effect = self.freshUnificationVariable(token.at())
-                result = self.parseDynamicMember(ECall(token.at(), target, effect, [], [
+                result = ECall(token.at(), target, effect, [], [
                     Argument(result.at, None, result)
-                ], []))
+                ], [])
             } else {
                 let at = self.current().at()
                 let typeArguments = if(!self.current().rawIs("[")) {[]} else {self.parseTypeArguments()}

package/compiler/Tokenizer.ff

@@ -204,6 +204,14 @@ tokenize(file: String, code: String, completionAt: Option[Location], attemptFixe
                 i += 1
                 emitToken(LComma, start, i)
 
+            } elseIf {
+                (code.grab(i) == '!' || code.grab(i) == '?') && i + 1 < code.size() && 
+                (code.grab(i + 1) == '.' || code.grab(i + 1) == '-')
+            } {
+                
+                i += 1
+                emitToken(LOperator, start, i)
+                
             } elseIf {operatorCharacters.contains(code.grab(i))} {
 
                 i += 1

package/core/List.ff

@@ -308,6 +308,19 @@ extend self[T]: List[T] {
             return result;
         """
         
+    map2[S](body: T => S): List[S] {
+        if(!UnsafeJs.inAsync()) {
+            self!->map(body!)?
+        } else {
+            let result = Array.new()
+            0.until(self.size()).each {i =>
+                result.push(body(self.grab(i)))
+            }
+            result.drain()
+        }
+    }
+    
+        
     flatMap[S](body: T => List[S]): List[S] {
         let results = Array.new()
         self.each {x =>

package/fireflysite/assets/markdown/reference/JavascriptInterop.md

@@ -40,6 +40,8 @@ The `->` is shorthand for calling the methods `get`, `set`, `increment`, `decrem
 
 The `js` variable is of the type `JsSystem` and the rest of the expressions return `JsValue`, which represents an arbitrary JavaScript value.
 
+In addition, the `!` and `?` postfix operators can be used as shorthand for `UnsafeJs.value(...)` and `UnsafeJs.fromValue(...)`.
+
 
 # The UnsafeJs module
 
@@ -61,8 +63,23 @@ throwIfCancelled(): Unit
 // Returns true if the current task has been aborted
 cancelled(): Bool
 
+// Returns true if the current target is async
+inAsync(): Bool
+    
+// Returns true if the current target is browser
+inBrowser(): Bool
+    
+// Returns true if the current target is node
+inNode(): Bool
+    
+// Returns true if the current target is build
+inBuild(): Bool
+
 // Casts any Firefly value to a JavaScript value without conversion
 value[T](value: T): JsValue
+
+// Casts any JavaScript value to a Firefly value without conversion
+fromValue[T](value: JsValue): T
 ```
 
 In the future, it may be possible to provide a whitelist of dependencies that are allowed to use this module.

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

@@ -1507,7 +1507,7 @@ return true
 })()
 : false);
 let result_ = ff_compiler_Parser.Parser_parseAtom(self_);
-while(ff_compiler_Token.Token_is4(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketLeft(), ff_compiler_Token.LColon(), ff_compiler_Token.LDot(), ff_compiler_Token.LArrowThin())) {
+while((ff_compiler_Token.Token_is4(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketLeft(), ff_compiler_Token.LColon(), ff_compiler_Token.LDot(), ff_compiler_Token.LArrowThin()) || ff_compiler_Token.Token_rawIs2(ff_compiler_Parser.Parser_current(self_), "!", "?"))) {
 if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LDot())) {
 ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LDot());
 if(ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "{")) {
@@ -1529,7 +1529,7 @@ const method_ = (ff_compiler_Token.Token_rawIs(token_, "!")
 : "ff:core/UnsafeJs.fromValue");
 const target_ = ff_compiler_Syntax.DynamicCall(ff_compiler_Syntax.EVariable(ff_compiler_Token.Token_at(token_), method_), false);
 const effect_ = ff_compiler_Parser.Parser_freshUnificationVariable(self_, ff_compiler_Token.Token_at(token_));
-result_ = ff_compiler_Parser.Parser_parseDynamicMember(self_, ff_compiler_Syntax.ECall(ff_compiler_Token.Token_at(token_), target_, effect_, [], [ff_compiler_Syntax.Argument(result_.at_, ff_core_Option.None(), result_)], []))
+result_ = ff_compiler_Syntax.ECall(ff_compiler_Token.Token_at(token_), target_, effect_, [], [ff_compiler_Syntax.Argument(result_.at_, ff_core_Option.None(), result_)], [])
 } else {
 const at_ = ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_));
 const typeArguments_ = ((!ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "["))
@@ -3125,7 +3125,7 @@ return true
 })())
 : false);
 let result_ = ff_compiler_Parser.Parser_parseAtom(self_);
-while(ff_compiler_Token.Token_is4(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketLeft(), ff_compiler_Token.LColon(), ff_compiler_Token.LDot(), ff_compiler_Token.LArrowThin())) {
+while((ff_compiler_Token.Token_is4(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketLeft(), ff_compiler_Token.LColon(), ff_compiler_Token.LDot(), ff_compiler_Token.LArrowThin()) || ff_compiler_Token.Token_rawIs2(ff_compiler_Parser.Parser_current(self_), "!", "?"))) {
 if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LDot())) {
 ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LDot());
 if(ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "{")) {
@@ -3147,7 +3147,7 @@ const method_ = (ff_compiler_Token.Token_rawIs(token_, "!")
 : "ff:core/UnsafeJs.fromValue");
 const target_ = ff_compiler_Syntax.DynamicCall(ff_compiler_Syntax.EVariable(ff_compiler_Token.Token_at(token_), method_), false);
 const effect_ = ff_compiler_Parser.Parser_freshUnificationVariable(self_, ff_compiler_Token.Token_at(token_));
-result_ = ff_compiler_Parser.Parser_parseDynamicMember(self_, ff_compiler_Syntax.ECall(ff_compiler_Token.Token_at(token_), target_, effect_, [], [ff_compiler_Syntax.Argument(result_.at_, ff_core_Option.None(), result_)], []))
+result_ = ff_compiler_Syntax.ECall(ff_compiler_Token.Token_at(token_), target_, effect_, [], [ff_compiler_Syntax.Argument(result_.at_, ff_core_Option.None(), result_)], [])
 } else {
 const at_ = ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_));
 const typeArguments_ = ((!ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "["))

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

@@ -280,6 +280,9 @@ emitToken_(ff_compiler_Token.LWildcard(), start_, i_)
 } else if((ff_core_String.String_grab(code_, i_) === 44)) {
 i_ += 1;
 emitToken_(ff_compiler_Token.LComma(), start_, i_)
+} else if(((((ff_core_String.String_grab(code_, i_) === 33) || (ff_core_String.String_grab(code_, i_) === 63)) && ((i_ + 1) < ff_core_String.String_size(code_))) && ((ff_core_String.String_grab(code_, (i_ + 1)) === 46) || (ff_core_String.String_grab(code_, (i_ + 1)) === 45)))) {
+i_ += 1;
+emitToken_(ff_compiler_Token.LOperator(), start_, i_)
 } else if(ff_core_Set.Set_contains(operatorCharacters_, ff_core_String.String_grab(code_, i_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_Char_Char)) {
 i_ += 1;
 if(((((ff_core_String.String_grab(code_, (i_ - 1)) === 46) && ((i_ + 1) < ff_core_String.String_size(code_))) && (ff_core_String.String_grab(code_, i_) === 46)) && (ff_core_String.String_grab(code_, (i_ + 1)) !== 46))) {
@@ -524,6 +527,9 @@ emitToken_(ff_compiler_Token.LWildcard(), start_, i_)
 } else if((ff_core_String.String_grab(code_, i_) === 44)) {
 i_ += 1;
 emitToken_(ff_compiler_Token.LComma(), start_, i_)
+} else if(((((ff_core_String.String_grab(code_, i_) === 33) || (ff_core_String.String_grab(code_, i_) === 63)) && ((i_ + 1) < ff_core_String.String_size(code_))) && ((ff_core_String.String_grab(code_, (i_ + 1)) === 46) || (ff_core_String.String_grab(code_, (i_ + 1)) === 45)))) {
+i_ += 1;
+emitToken_(ff_compiler_Token.LOperator(), start_, i_)
 } else if(ff_core_Set.Set_contains(operatorCharacters_, ff_core_String.String_grab(code_, i_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_Char_Char)) {
 i_ += 1;
 if(((((ff_core_String.String_grab(code_, (i_ - 1)) === 46) && ((i_ + 1) < ff_core_String.String_size(code_))) && (ff_core_String.String_grab(code_, i_) === 46)) && (ff_core_String.String_grab(code_, (i_ + 1)) !== 46))) {

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

@@ -453,6 +453,18 @@ export function List_map(self_, body_) {
         
 }
 
+export function List_map2(self_, body_) {
+if((!false)) {
+return ff_core_JsValue.JsValue_call1(self_, "map", body_, ff_core_JsValue.ff_core_JsValue_IsJsValue$ff_core_JsValue_JsValue)
+} else {
+const result_ = ff_core_Array.new_();
+ff_core_List.List_each(ff_core_Int.Int_until(0, ff_core_List.List_size(self_)), ((i_) => {
+ff_core_Array.Array_push(result_, body_((self_[i_] ?? ff_core_List.internalGrab_(self_, i_))))
+}));
+return ff_core_Array.Array_drain(result_)
+}
+}
+
 export function List_flatMap(self_, body_) {
 const results_ = ff_core_Array.new_();
 ff_core_List.List_each(self_, ((x_) => {
@@ -815,6 +827,18 @@ export async function List_map$(self_, body_, $task) {
         
 }
 
+export async function List_map2$(self_, body_, $task) {
+if((!true)) {
+return ff_core_JsValue.JsValue_call1(self_, "map", body_, ff_core_JsValue.ff_core_JsValue_IsJsValue$ff_core_JsValue_JsValue)
+} else {
+const result_ = ff_core_Array.new_();
+(await ff_core_List.List_each$(ff_core_Int.Int_until(0, ff_core_List.List_size(self_)), (async (i_, $task) => {
+ff_core_Array.Array_push(result_, (await body_((self_[i_] ?? ff_core_List.internalGrab_(self_, i_)), $task)))
+}), $task));
+return ff_core_Array.Array_drain(result_)
+}
+}
+
 export async function List_flatMap$(self_, body_, $task) {
 const results_ = ff_core_Array.new_();
 (await ff_core_List.List_each$(self_, (async (x_, $task) => {

package/package.json

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

package/vscode/package.json

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