firefly-compiler 0.5.26 → 0.5.28

package/compiler/JsEmitter.ff

@@ -621,13 +621,16 @@ extend self: JsEmitter {
             } =>
                 let argumentCode = es.map {self.emitTerm(_, async)}.join(", ")
                 Some("(new " + self.emitTerm(e1, async) + "(" + argumentCode + ")" + ")")
-            | "ff:core/JsValue.JsValue_with" =>
+            | name {name == "ff:core/JsValue.JsValue_with" || name == "ff:core/Json.Json_with"} =>
                 function go(e: Term, fields: List[Pair[Term, Term]]): String {
                     e.{
-                        | ECall(_, StaticCall("ff:core/JsValue.JsValue_with", _, _), _, _, [a1, a2, a3], _) =>
+                        | ECall(_, StaticCall(n, _, _), _, _, [a1, a2, a3], _) {n == name} =>
                             go(a1.value, [Pair(a2.value, a3.value), ...fields])
-                        | ECall(_, StaticCall(name, _, _), _, _, [a], _) {
-                            name == "ff:core/JsSystem.JsSystem_object" || name == "ff:core/JsSystem.JsSystem_new0"
+                        | ECall(_, StaticCall(n, _, _), _, _, [a], _) {
+                            n == "ff:core/JsSystem.JsSystem_object" || 
+                            n == "ff:core/JsSystem.JsSystem_new0" ||
+                            n == "ff:core/Json.Json_object" ||
+                            n == "ff:core/Json.Json_new0"
                         } {
                             noSideEffects(a.value)
                         } =>
@@ -660,6 +663,28 @@ extend self: JsEmitter {
                 Some("null")
             | "ff:core/JsSystem.JsSystem_undefined" {arguments | [e]} {noSideEffects(e)} =>
                 Some("(void 0)")
+            | "ff:core/BrowserSystem.BrowserSystem_js" {arguments | [e]} {noSideEffects(e)} => 
+                Some("globalThis")
+            | "ff:core/BuildSystem.BuildSystem_js" {arguments | [e]} {noSideEffects(e)} => 
+                Some("globalThis")
+            | "ff:core/NodeSystem.NodeSystem_js" {arguments | [e]} {noSideEffects(e)} => 
+                Some("globalThis")
+            | "ff:core/UnsafeJs.jsSystem" =>
+                Some("globalThis")
+            | "ff:core/Json.string" {arguments | [e]} =>
+                Some(self.emitTerm(e, async))
+            | "ff:core/Json.int" {arguments | [e]} =>
+                Some(self.emitTerm(e, async))
+            | "ff:core/Json.float" {arguments | [e]} =>
+                Some(self.emitTerm(e, async))
+            | "ff:core/Json.bool" {arguments | [e]} =>
+                Some(self.emitTerm(e, async))
+            | "ff:core/Json.array" {arguments | [e]} =>
+                Some(self.emitTerm(e, async))
+            | "ff:core/Json.null" {arguments | [e]} =>
+                Some("null")
+            | "ff:core/Json.object" {arguments | [e]} =>
+                Some("{}")
             | _ =>
                 None
         }

package/compiler/Tokenizer.ff

@@ -173,6 +173,23 @@ tokenize(file: String, code: String, completionAt: Option[Location], attemptFixe
 
             } elseIf {code.grab(i).isAsciiDigit()} {
 
+                if(i + 2 < code.size() && code.grab(i) == '0' && (
+                    code.grab(i + 1) == 'x' || code.grab(i + 1) == 'X'
+                )) {
+                    i += 2
+                    while {i < code.size() && (code.grab(i).isAsciiDigit() || (
+                        code.grab(i) >= 'a' && code.grab(i) <= 'f'
+                    ) || (
+                        code.grab(i) >= 'A' && code.grab(i) <= 'F'
+                    ))} {
+                        i += 1
+                    }
+                    if(start == i - 2) {
+                        throwError("Unexpected character: " + Show.show(code.grab(start + 2)))
+                    }
+                    emitToken(LInt, start, i)
+                } else:
+
                 mutable dot = False
                 mutable exponent = False
                 while {i < code.size() && code.grab(i).isAsciiDigit()} {

package/core/Any.ff

@@ -1,30 +1,30 @@
-data Any {}
-data AnyTag[T] {}
-
-trait T: HasAnyTag {
-    anyTag(): AnyTag[T]
-}
-
-toAny[T: HasAnyTag](value: T): Any
-    target js sync """
-        const anyTag = ff_core_Any_HasAnyTag$T.anyTag_()
-        return {anyTag: anyTag, value: value_}
-    """
-
-fromAny[T: HasAnyTag](any: Any): Option[T]
-    target js sync """
-        const anyTag = ff_core_Any_HasAnyTag$T.anyTag_()
-        return any_.anyTag === anyTag ? ff_core_Option.Some(any_.value) : ff_core_Option.None()
-    """
-
-extend self[T]: AnyTag[T] {
-    show(): String
-        target js sync """
-            return self_
-        """
-}
-
-internalAnyTag[T](tag: String): AnyTag[T]
-    target js sync """
-        return tag_
-    """
+data Any {}
+data AnyTag[T] {}
+
+trait T: HasAnyTag {
+    anyTag(): AnyTag[T]
+}
+
+toAny[T: HasAnyTag](value: T): Any
+    target js sync """
+        const anyTag = ff_core_Any_HasAnyTag$T.anyTag_()
+        return {anyTag: anyTag, value: value_}
+    """
+
+fromAny[T: HasAnyTag](any: Any): Option[T]
+    target js sync """
+        const anyTag = ff_core_Any_HasAnyTag$T.anyTag_()
+        return any_.anyTag === anyTag ? ff_core_Option.Some(any_.value) : ff_core_Option.None()
+    """
+
+extend self[T]: AnyTag[T] {
+    show(): String
+        target js sync """
+            return self_
+        """
+}
+
+internalAnyTag[T](tag: String): AnyTag[T]
+    target js sync """
+        return tag_
+    """

package/core/Json.ff

@@ -44,6 +44,11 @@ object(): Json
         return {};
     """
 
+new0(): Json
+    target js sync """
+        return {};
+    """
+
 fields(body: ((String, Json) => Unit) => Unit): Json
     target js sync """
         const result = {};
@@ -176,6 +181,10 @@ extend self: Json {
             return self_ === null;
         """
 
+    get(key: String): Json {
+        self.field(key)
+    }
+
     field(key: String): Json
         target js sync """
             return typeof self_ === 'object' && self_ !== null && !Array.isArray(self_) && Object.hasOwn(self_, key_)

package/experimental/random/RunLength.ff

@@ -1,65 +1,65 @@
-main(system: NodeSystem) {
-    let inBuffers = 1.to(100).map {_ => Buffer.fromByteList([5, 5, 3, 1, 2].toArray())}
-    let inStream = inBuffers.toStream()
-    let outStream = toRunLength(inStream, 3)
-    printRunLength(outStream)
-}
-
-printRunLength(outStream: Stream[Buffer]) {
-    let buffer = Buffer.fromBufferList(outStream.toArray())
-    Log.debug(buffer.toHex())
-    let stack = Stack.make()
-    mutable i = 0
-    while {i < buffer.size()} {
-        1.to(buffer.grabUint8(i)).each {_ => stack.push(buffer.grabUint8(i + 1))}
-        i += 2
-    }
-    Log.debug(Buffer.fromByteList(stack.drain()).toHex())
-}
-
-toRunLength(stream: Stream[Buffer], bufferSize: Int = 65536): Stream[Buffer] {
-    mutable outBuffer = Buffer.new(bufferSize)
-    mutable outOffset = 0
-    let outBuffers = Stack.make()
-    function writeByte(byte: Int): Unit {
-        if(outOffset >= outBuffer.size()) {
-            outBuffers.push(outBuffer)
-            outBuffer = Buffer.new(bufferSize)
-            outOffset = 0
-        }
-        outBuffer.setUint8(outOffset, byte)
-        outOffset += 1
-    }
-    mutable extraCount = 0
-    mutable value = 0
-    let result = stream.flatMap {inBuffer =>
-        mutable i = 0
-        while {i < inBuffer.size()} {
-            value = if(extraCount > 0) {value} else {inBuffer.grabUint8(i)}
-            mutable j = if(extraCount > 0) {-1} else {0}
-            doWhile {
-                j += 1
-                j + extraCount < 256 && i + j < inBuffer.size() && inBuffer.grabUint8(i + j) == value
-            }
-            i += j
-            if(i < inBuffer.size() || j + extraCount == 256) {
-                writeByte(j + extraCount)
-                writeByte(value)
-                extraCount = 0
-            } else {
-                extraCount += j
-            }
-        }
-        outBuffers.drain().toStream()
-    }
-    result.addAll(Stream.init {
-        if(extraCount > 0) {
-            writeByte(extraCount)
-            writeByte(value)
-        }
-        if(outOffset > 0) {
-            outBuffers.push(outBuffer.view(0, outOffset))
-        }
-        outBuffers.drain().toStream()
-    })
-}
+main(system: NodeSystem) {
+    let inBuffers = 1.to(100).map {_ => Buffer.fromByteList([5, 5, 3, 1, 2].toArray())}
+    let inStream = inBuffers.toStream()
+    let outStream = toRunLength(inStream, 3)
+    printRunLength(outStream)
+}
+
+printRunLength(outStream: Stream[Buffer]) {
+    let buffer = Buffer.fromBufferList(outStream.toArray())
+    Log.debug(buffer.toHex())
+    let stack = Stack.make()
+    mutable i = 0
+    while {i < buffer.size()} {
+        1.to(buffer.grabUint8(i)).each {_ => stack.push(buffer.grabUint8(i + 1))}
+        i += 2
+    }
+    Log.debug(Buffer.fromByteList(stack.drain()).toHex())
+}
+
+toRunLength(stream: Stream[Buffer], bufferSize: Int = 65536): Stream[Buffer] {
+    mutable outBuffer = Buffer.new(bufferSize)
+    mutable outOffset = 0
+    let outBuffers = Stack.make()
+    function writeByte(byte: Int): Unit {
+        if(outOffset >= outBuffer.size()) {
+            outBuffers.push(outBuffer)
+            outBuffer = Buffer.new(bufferSize)
+            outOffset = 0
+        }
+        outBuffer.setUint8(outOffset, byte)
+        outOffset += 1
+    }
+    mutable extraCount = 0
+    mutable value = 0
+    let result = stream.flatMap {inBuffer =>
+        mutable i = 0
+        while {i < inBuffer.size()} {
+            value = if(extraCount > 0) {value} else {inBuffer.grabUint8(i)}
+            mutable j = if(extraCount > 0) {-1} else {0}
+            doWhile {
+                j += 1
+                j + extraCount < 256 && i + j < inBuffer.size() && inBuffer.grabUint8(i + j) == value
+            }
+            i += j
+            if(i < inBuffer.size() || j + extraCount == 256) {
+                writeByte(j + extraCount)
+                writeByte(value)
+                extraCount = 0
+            } else {
+                extraCount += j
+            }
+        }
+        outBuffers.drain().toStream()
+    }
+    result.addAll(Stream.init {
+        if(extraCount > 0) {
+            writeByte(extraCount)
+            writeByte(value)
+        }
+        if(outOffset > 0) {
+            outBuffers.push(outBuffer.view(0, outOffset))
+        }
+        outBuffers.drain().toStream()
+    })
+}

package/fireflysite/FrontPage.ff

@@ -99,7 +99,7 @@ new(): Document {
                 Text("You can usually fix these without even reading the error message.")
                 Text("And when you need to read the error messages, they're short and to the point.")
             ])
-            Image("/assets/image/edit-time-error.png")
+            Image("/assets/image/edit-time-error.webp")
         )
         SplitSection(
             "Type driven autocompletion"
@@ -107,7 +107,7 @@ new(): Document {
                 Text("The language server comes with type driven autocompletion.")
                 Text("It instantly presents a very precise list of completions, and the expected type is used to preselect a likely completion.")
             ])
-            Image("/assets/image/autocomplete-small.png")
+            Image("/assets/image/autocomplete-small.webp")
         )
         SplitSection(
             "No async dilemma"

package/fireflysite/Guide.ff

@@ -133,7 +133,7 @@ renderTopbar(lux: Lux, menu: Bool, setMenu: Bool => Unit) {
             lux.set("href", "/front/")
             lux.cssClass(Styles.guideTopbarLogoCss)
             lux.add("img") {
-                lux.set("src", "/assets/image/firefly-logo-yellow.png")
+                lux.set("src", "/assets/image/firefly-logo-yellow.webp")
             }
             lux.div {
                 lux.text("Firefly")
@@ -158,7 +158,7 @@ renderSidebar(lux: Lux, guides: List[Guide], selectedGuide: Guide, selectedHeadi
             lux.set("href", "/front/")
             lux.cssClass(Styles.guideSidebarLogoCss)
             lux.add("img") {
-                lux.set("src", "/assets/image/firefly-logo-yellow.png")
+                lux.set("src", "/assets/image/firefly-logo-yellow.webp")
             }
             lux.div {
                 lux.text("Firefly")
@@ -396,39 +396,51 @@ renderHighlightedCode(lux: Lux, code: String) {
     }.toOption().map {tokens => 
         mutable offset = 0
         mutable index = 0
-        tokens.each {token =>
-            if(token.startOffset > offset && index <= tokens.size() - 5) {
-                lux.span {
-                    lux.cssClass(Styles.codeCommentCss)
-                    lux.text(code.slice(offset, token.startOffset))
-                }
-            }
-            if(token.kind != LEnd) {
-                let css = token.kind.{
-                    | LChar => Styles.codeStringCss
-                    | LFloat => Styles.codeNumberCss
-                    | LInt => Styles.codeNumberCss
-                    | LKeyword => Styles.codeKeywordCss
-                    | LNamespace => Styles.codeTypeCss
-                    | LString => Styles.codeStringCss
-                    | LWildcard => Styles.codeVariableCss
-                    | LUpper {tokens.get(index - 1).any {_.kind == LArrowThin}} => Styles.codeStringCss
-                    | LUpper => Styles.codeTypeCss
-                    | LLower {tokens.get(index - 1).any {_.kind == LArrowThin}} => Styles.codeStringCss
-                    | LLower {tokens.get(index - 1).any {t => 
-                        t.kind == LBracketRight || t.kind == LDot
-                    }} => Styles.codeCallCss
-                    | LLower {tokens.grab(index + 1).kind == LBracketLeft} => Styles.codeCallCss
-                    | LLower => Styles.codeVariableCss
-                    | _ => Styles.codeOtherCss
+        lux.span {
+            lux.cssClass(Styles.codeOtherCss)
+            tokens.each {token =>
+                if(token.startOffset > offset && index <= tokens.size() - 5) {
+                    let text = code.slice(offset, token.startOffset)
+                    if(text.all {c => c == ' ' || c == '\n'}) {
+                        lux.text(text)
+                    } else {
+                        lux.span {
+                            lux.cssClass(Styles.codeCommentCss)
+                            lux.text(text)
+                        }
+                    }
                 }
-                lux.span {
-                    lux.cssClass(css)
-                    lux.text(code.slice(token.startOffset, token.stopOffset))
+                if(token.kind != LEnd) {
+                    let css = token.kind.{
+                        | LChar => Styles.codeStringCss
+                        | LFloat => Styles.codeNumberCss
+                        | LInt => Styles.codeNumberCss
+                        | LKeyword => Styles.codeKeywordCss
+                        | LNamespace => Styles.codeTypeCss
+                        | LString => Styles.codeStringCss
+                        | LWildcard => Styles.codeVariableCss
+                        | LUpper {tokens.get(index - 1).any {_.kind == LArrowThin}} => Styles.codeStringCss
+                        | LUpper => Styles.codeTypeCss
+                        | LLower {tokens.get(index - 1).any {_.kind == LArrowThin}} => Styles.codeStringCss
+                        | LLower {tokens.get(index - 1).any {t => 
+                            t.kind == LBracketRight || t.kind == LDot
+                        }} => Styles.codeCallCss
+                        | LLower {tokens.grab(index + 1).kind == LBracketLeft} => Styles.codeCallCss
+                        | LLower => Styles.codeVariableCss
+                        | _ => Styles.codeOtherCss
+                    }
+                    if(css == Styles.codeOtherCss) {
+                        lux.text(code.slice(token.startOffset, token.stopOffset))
+                    } else {
+                        lux.span {
+                            lux.cssClass(css)
+                            lux.text(code.slice(token.startOffset, token.stopOffset))
+                        }
+                    }
+                    offset = token.stopOffset
                 }
-                offset = token.stopOffset
+                index += 1
             }
-            index += 1
         }
     }.else {lux.text(code)}
 }

package/fireflysite/Main.ff

@@ -28,10 +28,10 @@ nodeMain(system: NodeSystem): Unit {
                 serveAsset(system, cacheSalt, request, "text/javascript; charset=UTF-8", asset)
             | ["favicon.ico"] =>
                 serveAsset(system, cacheSalt, request, "image/png", "/assets/image/firefly-logo-notext.png")
-            | ["assets", "font", "FireflyMono.ttf"] => 
-                serveAsset(system, cacheSalt, request, "font/ttf", "/assets/font/NotoSansMono-Regular.ttf")
-            | ["assets", "font", "FireflySans.ttf"] => 
-                serveAsset(system, cacheSalt, request, "font/ttf", "/assets/font/NunitoSans-VariableFont_YTLC,opsz,wdth,wght.ttf")
+            | ["assets", "font", "firefly-mono.woff2"] => 
+                serveAsset(system, cacheSalt, request, "font/woff2", "/assets/font/gf-noto-sans-mono-latin.woff2")
+            | ["assets", "font", "firefly-sans.woff2"] => 
+                serveAsset(system, cacheSalt, request, "font/woff2", "/assets/font/gf-nunito-sans-latin.woff2")
             | ["assets", ...rest] => serveAssets(system, cacheSalt, request, rest)
             | _ {serveGuide(system, request)} => 
             | _ =>
@@ -107,6 +107,7 @@ guessContentType(path: String): Option[String] {
     path.split('.').last().flatMap {
         | "md" => Some("text/markdown")
         | "png" => Some("image/png")
+        | "webp" => Some("image/webp")
         | "ttf" => Some("font/ttf")
         | _ => None
     }
@@ -132,16 +133,16 @@ serveGuideHtml(title: String, contentHtml: String, styleTags: String, request: W
     request.writeHeader("Content-Type", "text/html; charset=UTF-8")
     request.writeText("<!doctype html>")
     request.writeText("<html lang='en' style='background-color: #ffffff; color: #333333; width: 100%; height: 100%; color-scheme: light;'>")
-    request.writeText("<script type='module' src='/js/ff/fireflysite/Main.mjs'></script>")
     request.writeText("<head>")
     request.writeText("<title>" + title + "</title>")
     request.writeText("<meta name='viewport' content='width=device-width, initial-scale=1.0'>")
     request.writeText("<meta name='theme-color' content='#ecc45e'>")
-    request.writeText("<link rel='preload' href='/assets/font/FireflyMono.ttf' as='font' crossorigin='anonymous'>")
-    request.writeText("<link rel='preload' href='/assets/font/FireflySans.ttf' as='font' crossorigin='anonymous'>")
-    request.writeText("<link rel='preload' href='/assets/image/firefly-logo-yellow.png' as='image'>")
-    request.writeText("<style>@font-face { font-family: 'Firefly Mono'; font-display: fallback; src: url('/assets/font/FireflyMono.ttf'); unicode-range: U+000-5FF; }</style>")
-    request.writeText("<style>@font-face { font-family: 'Firefly Sans'; font-display: fallback; src: url('/assets/font/FireflySans.ttf'); unicode-range: U+000-5FF; }</style>")
+    request.writeText("<script type='module' src='/js/ff/fireflysite/Main.mjs'></script>")
+    request.writeText("<link rel='preload' href='/assets/font/firefly-mono.woff2' as='font' crossorigin='anonymous'>")
+    request.writeText("<link rel='preload' href='/assets/font/firefly-sans.woff2' as='font' crossorigin='anonymous'>")
+    request.writeText("<link rel='preload' href='/assets/image/firefly-logo-yellow.webp' as='image'>")
+    request.writeText("<style>@font-face { font-family: 'Firefly Mono'; font-display: fallback; src: url('/assets/font/firefly-mono.woff2'); }</style>")
+    request.writeText("<style>@font-face { font-family: 'Firefly Sans'; font-display: fallback; src: url('/assets/font/firefly-sans.woff2'); }</style>")
     request.writeText(styleTags)
     request.writeText("</head>")
     request.writeText("<body style='margin: 0; padding: 0; width: 100%; height: 100%; touch-action: manipulation;'>")

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

@@ -314,70 +314,50 @@ Firefly has methods, which are called like this:
 
 ```firefly
 Some(1).isEmpty() // False
-Some(1).map {_ + 1} // Some(2)
+Some(1).map({_ + 1}) // Some(2)
 ```
 
-The examples above, calls the two methods `isEmpty` and `map` defined on `Option`. The code below, shows how these methods are defined in `ff:core` package.
+The examples above, calls the two methods `isEmpty` and `map` defined on `Option`. The code below, shows how these methods are defined in `ff:core` package:
 
 ```firefly
-data Option[T] {
-    None
-    Some(value: T)
-}
-
 extend self[T]: Option[T] {
-    isEmpty(): Bool {
-        self.{
-            | None => True
-            | Some(_) => False
-        }
-    }
-    
-    map[R](body: T => R): Option[R] {
-        self.{
-            | None => None
-            | Some(v) => Some(body(v))
-        }
-    }    
+    isEmpty(): Bool {...}
+    map[R](body: T => R): Option[R] {...}    
 }
 ```
 
+The `extend` keyword is used to declare methods on values of a given type. The code above extend values of type `Option[T]` with two methods. The identifier `self` holds a reference to the value receiving the methods. The square bracket right after the self variable are optional and used to introduce type variables used to express the type extended with methods.
 
-Methods can be defined for a more narrow targer type, like `flatten` below:
+The two methods above are defined for all values of type `Option[T]`, but methods can be også be defined for a more narrow targer type, like `flatten` below:
 
 ```firefly
 extend self[T]: Option[Option[T]] {
-    flatten(): Option[T] {
-        self.{
-            | None => None
-            | Some(v) => v
-        }
-    }
+    flatten(): Option[T] {...}
 }
 ```
 
-The extend block above, will only define `flatten` for options types of options. 
-
-In code below, the extend block defines methods for the target type `Option[T]`, but only when `T` implements the `Equal` trait.
+The extend block above declares `self` as ` Option[Option[T]]`, and likewise will only define `flatten` for options types of options. 
 
+The scope of a method can also be narrowed down with trait constraints. 
 
 ```firefly
 extend self[T: Equal]: Option[T] {
-    contains(value: T): Bool {
-        self.{
-            | None => False
-            | Some(v) => v == value
-        }
-    }
+    contains(value: T): Bool {...}
 }
 ```
 
+In code above, the extend block defines methods for the target type `Option[T]`, but only when `T` implements the `Equal` trait.
+
+Extend blocks must reside in the same module at definition of the type that are extended with methods.
 
+Methods are equivalent to top level functions in terms of expressibility but differnt in terms of scoping. Each type definition has its own method scope.
 
 # Special method call syntax
 
 ```firefly
 if(x == 1) {"One"} else {"Several"}
+Some(1).map {_ + 1} // Some(2)
+
 ```
 
 # Trait functions

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

@@ -1795,20 +1795,25 @@ return ff_core_Option.Some(((((("(new " + ff_compiler_JsEmitter.JsEmitter_emitTe
 }
 }
 }
-if(_1 === "ff:core/JsValue.JsValue_with") {
+{
+const name_ = _1;
+if(((name_ === "ff:core/JsValue.JsValue_with") || (name_ === "ff:core/Json.Json_with"))) {
 function go_(e_, fields_) {
 {
 const _1 = e_;
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/JsValue.JsValue_with" && _1.arguments_.length === 3) {
+if(_1.ECall && _1.target_.StaticCall && _1.arguments_.length === 3) {
+const n_ = _1.target_.name_;
 const a1_ = _1.arguments_[0];
 const a2_ = _1.arguments_[1];
 const a3_ = _1.arguments_[2];
+if((n_ === name_)) {
 return go_(a1_.value_, [ff_core_Pair.Pair(a2_.value_, a3_.value_), ...fields_])
 }
+}
 if(_1.ECall && _1.target_.StaticCall && _1.arguments_.length === 1) {
-const name_ = _1.target_.name_;
+const n_ = _1.target_.name_;
 const a_ = _1.arguments_[0];
-const _guard2 = ((name_ === "ff:core/JsSystem.JsSystem_object") || (name_ === "ff:core/JsSystem.JsSystem_new0"));
+const _guard2 = ((((n_ === "ff:core/JsSystem.JsSystem_object") || (n_ === "ff:core/JsSystem.JsSystem_new0")) || (n_ === "ff:core/Json.Json_object")) || (n_ === "ff:core/Json.Json_new0"));
 if(_guard2 && ff_compiler_JsEmitter.noSideEffects_(a_.value_)) {
 return (("{" + ff_core_List.List_join(ff_core_List.List_map(fields_, ((p_) => {
 return ((ff_compiler_JsEmitter.JsEmitter_emitField(self_, p_.first_, async_, "") + ": ") + ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, p_.second_, async_))
@@ -1826,6 +1831,7 @@ return
 }
 return ff_core_Option.Some(go_(term_, []))
 }
+}
 {
 const name_ = _1;
 const _guard4 = ff_core_String.String_removeFirst(name_, "ff:core/JsSystem.JsSystem_call");
@@ -1931,6 +1937,85 @@ return ff_core_Option.Some("(void 0)")
 }
 }
 }
+if(_1 === "ff:core/BrowserSystem.BrowserSystem_js") {
+const _guard2 = arguments_;
+if(_guard2.length === 1) {
+const e_ = _guard2[0];
+if(ff_compiler_JsEmitter.noSideEffects_(e_)) {
+return ff_core_Option.Some("globalThis")
+}
+}
+}
+if(_1 === "ff:core/BuildSystem.BuildSystem_js") {
+const _guard2 = arguments_;
+if(_guard2.length === 1) {
+const e_ = _guard2[0];
+if(ff_compiler_JsEmitter.noSideEffects_(e_)) {
+return ff_core_Option.Some("globalThis")
+}
+}
+}
+if(_1 === "ff:core/NodeSystem.NodeSystem_js") {
+const _guard2 = arguments_;
+if(_guard2.length === 1) {
+const e_ = _guard2[0];
+if(ff_compiler_JsEmitter.noSideEffects_(e_)) {
+return ff_core_Option.Some("globalThis")
+}
+}
+}
+if(_1 === "ff:core/UnsafeJs.jsSystem") {
+return ff_core_Option.Some("globalThis")
+}
+if(_1 === "ff:core/Json.string") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some(ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_))
+}
+}
+if(_1 === "ff:core/Json.int") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some(ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_))
+}
+}
+if(_1 === "ff:core/Json.float") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some(ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_))
+}
+}
+if(_1 === "ff:core/Json.bool") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some(ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_))
+}
+}
+if(_1 === "ff:core/Json.array") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some(ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_))
+}
+}
+if(_1 === "ff:core/Json.null") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some("null")
+}
+}
+if(_1 === "ff:core/Json.object") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some("{}")
+}
+}
 {
 return ff_core_Option.None()
 }
@@ -3782,20 +3867,25 @@ return ff_core_Option.Some(((((("(new " + ff_compiler_JsEmitter.JsEmitter_emitTe
 }
 }
 }
-if(_1 === "ff:core/JsValue.JsValue_with") {
+{
+const name_ = _1;
+if(((name_ === "ff:core/JsValue.JsValue_with") || (name_ === "ff:core/Json.Json_with"))) {
 function go_(e_, fields_) {
 {
 const _1 = e_;
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/JsValue.JsValue_with" && _1.arguments_.length === 3) {
+if(_1.ECall && _1.target_.StaticCall && _1.arguments_.length === 3) {
+const n_ = _1.target_.name_;
 const a1_ = _1.arguments_[0];
 const a2_ = _1.arguments_[1];
 const a3_ = _1.arguments_[2];
+if((n_ === name_)) {
 return go_(a1_.value_, [ff_core_Pair.Pair(a2_.value_, a3_.value_), ...fields_])
 }
+}
 if(_1.ECall && _1.target_.StaticCall && _1.arguments_.length === 1) {
-const name_ = _1.target_.name_;
+const n_ = _1.target_.name_;
 const a_ = _1.arguments_[0];
-const _guard2 = ((name_ === "ff:core/JsSystem.JsSystem_object") || (name_ === "ff:core/JsSystem.JsSystem_new0"));
+const _guard2 = ((((n_ === "ff:core/JsSystem.JsSystem_object") || (n_ === "ff:core/JsSystem.JsSystem_new0")) || (n_ === "ff:core/Json.Json_object")) || (n_ === "ff:core/Json.Json_new0"));
 if(_guard2 && ff_compiler_JsEmitter.noSideEffects_(a_.value_)) {
 return (("{" + ff_core_List.List_join(ff_core_List.List_map(fields_, ((p_) => {
 return ((ff_compiler_JsEmitter.JsEmitter_emitField(self_, p_.first_, async_, "") + ": ") + ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, p_.second_, async_))
@@ -3813,6 +3903,7 @@ return
 }
 return ff_core_Option.Some(go_(term_, []))
 }
+}
 {
 const name_ = _1;
 const _guard4 = ff_core_String.String_removeFirst(name_, "ff:core/JsSystem.JsSystem_call");
@@ -3918,6 +4009,85 @@ return ff_core_Option.Some("(void 0)")
 }
 }
 }
+if(_1 === "ff:core/BrowserSystem.BrowserSystem_js") {
+const _guard2 = arguments_;
+if(_guard2.length === 1) {
+const e_ = _guard2[0];
+if(ff_compiler_JsEmitter.noSideEffects_(e_)) {
+return ff_core_Option.Some("globalThis")
+}
+}
+}
+if(_1 === "ff:core/BuildSystem.BuildSystem_js") {
+const _guard2 = arguments_;
+if(_guard2.length === 1) {
+const e_ = _guard2[0];
+if(ff_compiler_JsEmitter.noSideEffects_(e_)) {
+return ff_core_Option.Some("globalThis")
+}
+}
+}
+if(_1 === "ff:core/NodeSystem.NodeSystem_js") {
+const _guard2 = arguments_;
+if(_guard2.length === 1) {
+const e_ = _guard2[0];
+if(ff_compiler_JsEmitter.noSideEffects_(e_)) {
+return ff_core_Option.Some("globalThis")
+}
+}
+}
+if(_1 === "ff:core/UnsafeJs.jsSystem") {
+return ff_core_Option.Some("globalThis")
+}
+if(_1 === "ff:core/Json.string") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some(ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_))
+}
+}
+if(_1 === "ff:core/Json.int") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some(ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_))
+}
+}
+if(_1 === "ff:core/Json.float") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some(ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_))
+}
+}
+if(_1 === "ff:core/Json.bool") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some(ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_))
+}
+}
+if(_1 === "ff:core/Json.array") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some(ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, e_, async_))
+}
+}
+if(_1 === "ff:core/Json.null") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some("null")
+}
+}
+if(_1 === "ff:core/Json.object") {
+const _guard1 = arguments_;
+if(_guard1.length === 1) {
+const e_ = _guard1[0];
+return ff_core_Option.Some("{}")
+}
+}
 {
 return ff_core_Option.None()
 }

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

@@ -254,6 +254,16 @@ emitToken_(ff_compiler_Token.LNamespace(), start_, i_)
 emitToken_(kind_, start_, i_)
 }
 } else if(ff_core_Char.Char_isAsciiDigit(ff_core_String.String_grab(code_, i_))) {
+if(((((i_ + 2) < ff_core_String.String_size(code_)) && (ff_core_String.String_grab(code_, i_) === 48)) && ((ff_core_String.String_grab(code_, (i_ + 1)) === 120) || (ff_core_String.String_grab(code_, (i_ + 1)) === 88)))) {
+i_ += 2;
+while(((i_ < ff_core_String.String_size(code_)) && ((ff_core_Char.Char_isAsciiDigit(ff_core_String.String_grab(code_, i_)) || ((ff_core_String.String_grab(code_, i_) >= 97) && (ff_core_String.String_grab(code_, i_) <= 102))) || ((ff_core_String.String_grab(code_, i_) >= 65) && (ff_core_String.String_grab(code_, i_) <= 70))))) {
+i_ += 1
+};
+if((start_ === (i_ - 2))) {
+throwError_(("Unexpected character: " + ff_core_Show.ff_core_Show_Show$ff_core_Char_Char.show_(ff_core_String.String_grab(code_, (start_ + 2)))))
+};
+emitToken_(ff_compiler_Token.LInt(), start_, i_)
+} else {
 let dot_ = false;
 let exponent_ = false;
 while(((i_ < ff_core_String.String_size(code_)) && ff_core_Char.Char_isAsciiDigit(ff_core_String.String_grab(code_, i_)))) {
@@ -274,6 +284,7 @@ dot_ = true
 emitToken_(((dot_ || exponent_)
 ? ff_compiler_Token.LFloat()
 : ff_compiler_Token.LInt()), start_, i_)
+}
 } else if((ff_core_String.String_grab(code_, i_) === 95)) {
 i_ += 1;
 emitToken_(ff_compiler_Token.LWildcard(), start_, i_)
@@ -501,6 +512,16 @@ emitToken_(ff_compiler_Token.LNamespace(), start_, i_)
 emitToken_(kind_, start_, i_)
 }
 } else if(ff_core_Char.Char_isAsciiDigit(ff_core_String.String_grab(code_, i_))) {
+if(((((i_ + 2) < ff_core_String.String_size(code_)) && (ff_core_String.String_grab(code_, i_) === 48)) && ((ff_core_String.String_grab(code_, (i_ + 1)) === 120) || (ff_core_String.String_grab(code_, (i_ + 1)) === 88)))) {
+i_ += 2;
+while(((i_ < ff_core_String.String_size(code_)) && ((ff_core_Char.Char_isAsciiDigit(ff_core_String.String_grab(code_, i_)) || ((ff_core_String.String_grab(code_, i_) >= 97) && (ff_core_String.String_grab(code_, i_) <= 102))) || ((ff_core_String.String_grab(code_, i_) >= 65) && (ff_core_String.String_grab(code_, i_) <= 70))))) {
+i_ += 1
+};
+if((start_ === (i_ - 2))) {
+throwError_(("Unexpected character: " + ff_core_Show.ff_core_Show_Show$ff_core_Char_Char.show_(ff_core_String.String_grab(code_, (start_ + 2)))))
+};
+emitToken_(ff_compiler_Token.LInt(), start_, i_)
+} else {
 let dot_ = false;
 let exponent_ = false;
 while(((i_ < ff_core_String.String_size(code_)) && ff_core_Char.Char_isAsciiDigit(ff_core_String.String_grab(code_, i_)))) {
@@ -521,6 +542,7 @@ dot_ = true
 emitToken_(((dot_ || exponent_)
 ? ff_compiler_Token.LFloat()
 : ff_compiler_Token.LInt()), start_, i_)
+}
 } else if((ff_core_String.String_grab(code_, i_) === 95)) {
 i_ += 1;
 emitToken_(ff_compiler_Token.LWildcard(), start_, i_)

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

@@ -101,22 +101,22 @@ import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
 
 
 export function toAny_(value_, ff_core_Any_HasAnyTag$T) {
-
-        const anyTag = ff_core_Any_HasAnyTag$T.anyTag_()
-        return {anyTag: anyTag, value: value_}
+
+        const anyTag = ff_core_Any_HasAnyTag$T.anyTag_()
+        return {anyTag: anyTag, value: value_}
     
 }
 
 export function fromAny_(any_, ff_core_Any_HasAnyTag$T) {
-
-        const anyTag = ff_core_Any_HasAnyTag$T.anyTag_()
-        return any_.anyTag === anyTag ? ff_core_Option.Some(any_.value) : ff_core_Option.None()
+
+        const anyTag = ff_core_Any_HasAnyTag$T.anyTag_()
+        return any_.anyTag === anyTag ? ff_core_Option.Some(any_.value) : ff_core_Option.None()
     
 }
 
 export function internalAnyTag_(tag_) {
-
-        return tag_
+
+        return tag_
     
 }
 
@@ -133,8 +133,8 @@ throw new Error('Function internalAnyTag is missing on this target in async cont
 }
 
 export function AnyTag_show(self_) {
-
-            return self_
+
+            return self_
         
 }
 

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

@@ -149,6 +149,12 @@ export function object_() {
     
 }
 
+export function new0_() {
+
+        return {};
+    
+}
+
 export function fields_(body_) {
 
         const result = {};
@@ -273,6 +279,10 @@ export async function object_$($task) {
 throw new Error('Function object is missing on this target in async context.');
 }
 
+export async function new0_$($task) {
+throw new Error('Function new0 is missing on this target in async context.');
+}
+
 export async function fields_$(body_, $task) {
 
         const result = {};
@@ -445,6 +455,10 @@ export function Json_isNull(self_) {
         
 }
 
+export function Json_get(self_, key_) {
+return ff_core_Json.Json_field(self_, key_)
+}
+
 export function Json_field(self_, key_) {
 
             return typeof self_ === 'object' && self_ !== null && !Array.isArray(self_) && Object.hasOwn(self_, key_)
@@ -636,6 +650,10 @@ export async function Json_isNull$(self_, $task) {
 throw new Error('Function Json_isNull is missing on this target in async context.');
 }
 
+export async function Json_get$(self_, key_, $task) {
+return ff_core_Json.Json_field(self_, key_)
+}
+
 export async function Json_field$(self_, key_, $task) {
 throw new Error('Function Json_field is missing on this target in async context.');
 }
@@ -725,7 +743,7 @@ return ff_core_Option.Some(json_)
 
 export const ff_core_Json_JsonLike$ff_core_String_String = {
 toJson_(value_) {
-return ff_core_Json.string_(value_)
+return value_
 },
 fromJson_(json_) {
 const json_a = json_;
@@ -735,7 +753,7 @@ return ff_core_Json.Json_getString(_w1)
 }
 },
 async toJson_$(value_, $task) {
-return ff_core_Json.string_(value_)
+return value_
 },
 async fromJson_$(json_, $task) {
 const json_a = json_;
@@ -748,7 +766,7 @@ return ff_core_Json.Json_getString(_w1)
 
 export const ff_core_Json_JsonLike$ff_core_Int_Int = {
 toJson_(value_) {
-return ff_core_Json.int_(value_)
+return value_
 },
 fromJson_(json_) {
 const json_a = json_;
@@ -758,7 +776,7 @@ return ff_core_Json.Json_getInt(_w1)
 }
 },
 async toJson_$(value_, $task) {
-return ff_core_Json.int_(value_)
+return value_
 },
 async fromJson_$(json_, $task) {
 const json_a = json_;
@@ -771,7 +789,7 @@ return ff_core_Json.Json_getInt(_w1)
 
 export const ff_core_Json_JsonLike$ff_core_Float_Float = {
 toJson_(value_) {
-return ff_core_Json.float_(value_)
+return value_
 },
 fromJson_(json_) {
 const json_a = json_;
@@ -781,7 +799,7 @@ return ff_core_Json.Json_getFloat(_w1)
 }
 },
 async toJson_$(value_, $task) {
-return ff_core_Json.float_(value_)
+return value_
 },
 async fromJson_$(json_, $task) {
 const json_a = json_;
@@ -794,7 +812,7 @@ return ff_core_Json.Json_getFloat(_w1)
 
 export const ff_core_Json_JsonLike$ff_core_Bool_Bool = {
 toJson_(value_) {
-return ff_core_Json.bool_(value_)
+return value_
 },
 fromJson_(json_) {
 const json_a = json_;
@@ -804,7 +822,7 @@ return ff_core_Json.Json_getBool(_w1)
 }
 },
 async toJson_$(value_, $task) {
-return ff_core_Json.bool_(value_)
+return value_
 },
 async fromJson_$(json_, $task) {
 const json_a = json_;
@@ -817,9 +835,9 @@ return ff_core_Json.Json_getBool(_w1)
 
 export function ff_core_Json_JsonLike$ff_core_List_List(ff_core_Json_JsonLike$T) { return {
 toJson_(value_) {
-return ff_core_Json.array_(ff_core_List.List_map(value_, ((value_) => {
+return ff_core_List.List_map(value_, ((value_) => {
 return ff_core_Json_JsonLike$T.toJson_(value_)
-})))
+}))
 },
 fromJson_(json_) {
 return ff_core_Option.Option_flatMap(ff_core_Json.Json_getArray(json_), ((array_) => {
@@ -847,9 +865,9 @@ return ff_core_Option.Some(ff_core_Array.Array_drain(result_))
 }))
 },
 async toJson_$(value_, $task) {
-return ff_core_Json.array_(ff_core_List.List_map(value_, ((value_) => {
+return ff_core_List.List_map(value_, ((value_) => {
 return ff_core_Json_JsonLike$T.toJson_(value_)
-})))
+}))
 },
 async fromJson_$(json_, $task) {
 return ff_core_Option.Option_flatMap(ff_core_Json.Json_getArray(json_), ((array_) => {

package/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly compiler",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.26",
+    "version": "0.5.28",
     "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.26",
+    "version": "0.5.28",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"