map literals

site/src/jsMain/kotlin/HomePage.kt

@@ -80,12 +80,19 @@ import lyng.stdlib
 val data = 1..5 // or [1,2,3,4,5]
 val evens2 = data.filter { it % 2 == 0 }.map { it * it }
 assertEquals([4, 16], evens2)
+
+// Map literal with identifier keys, shorthand, and spread
+val base = { a: 1, b: 2 }
+val patch = { b: 3, c: }
+val m = { "a": 0, ...base, ...patch, d: 4 }
+assertEquals(1, m["a"]) // base overwrites 0
+assertEquals(3, m["b"]) // patch overwrites base
+assertEquals(4, m["d"]) // literal key
 >>> void
 """.trimIndent()
-
-    val codeHtml = "<pre><code>" + htmlEscape(code) + "</code></pre>"
-    Div({ classes("markdown-body") }) {
-        UnsafeRawHtml(highlightLyngHtml(ensureBootstrapCodeBlocks(codeHtml)))
+    val mapHtml = "<pre><code>" + htmlEscape(code) + "</code></pre>"
+    Div({ classes("markdown-body", "mt-3") }) {
+        UnsafeRawHtml(highlightLyngHtml(ensureBootstrapCodeBlocks(mapHtml)))
     }
 
     // Short features list

site/src/jsMain/kotlin/TryLyngPage.kt

@@ -17,6 +17,7 @@
 
 import androidx.compose.runtime.*
 import kotlinx.coroutines.launch
+import net.sergeych.lyng.LyngVersion
 import net.sergeych.lyng.Scope
 import net.sergeych.lyng.ScriptError
 import net.sergeych.lyngweb.EditorWithOverlay
@@ -134,7 +135,7 @@ fun TryLyngPage() {
 
         // Editor
         Div({ classes("mb-3") }) {
-            Div({ classes("form-label", "fw-semibold") }) { Text("Code") }
+            Div({ classes("form-label", "fw-semibold") }) { Text("Code (v${LyngVersion})") }
             EditorWithOverlay(
                 code = code,
                 setCode = { code = it },

site/src/jsMain/resources/index.html

@@ -181,7 +181,7 @@
     <!-- Top-left version ribbon -->
     <div class="corner-ribbon bg-danger text-white">
         <span class="me-3">
-            v1.0.2
+            v1.0.3
         </span>
     </div>
     <!-- Fixed top navbar for the whole site -->

site/src/jsTest/kotlin/HighlightSmokeTest.kt

@@ -44,6 +44,26 @@ class HighlightSmokeTest {
         assertTrue(labeled.any { it.first == "2" && it.second == HighlightKind.Number })
     }
 
+    @Test
+    fun highlightMapLiteralHtml() {
+        val text = """
+            val base = { a: 1, b: }
+            val m = { "a": 1, b: , ...base, }
+        """.trimIndent()
+        val html = SiteHighlight.renderHtml(text)
+        // Curly braces and commas are punctuation
+        assertContains(html, "<span class=\"hl-punc\">{</span>")
+        assertContains(html, "<span class=\"hl-punc\">}</span>")
+        assertTrue(html.contains("hl-punc") && html.contains(","), "comma should be punctuation")
+        // Colon after key is punctuation
+        assertContains(html, "<span class=\"hl-punc\">:</span>")
+        // Spread operator present
+        assertContains(html, "<span class=\"hl-op\">...</span>")
+        // String key and identifier key appear
+        assertContains(html, "<span class=\"hl-str\">\"a\"</span>")
+        assertContains(html, "<span class=\"hl-id\">b</span>")
+    }
+
     @Test
     fun renderHtmlContainsCorrectClasses() {
         val text = "assertEquals( [9,10], r.takeLast(2).toList() )"