fixing parsing AS after map projection

Author: orneryd

pkg/cypher/executor.go

@@ -1852,6 +1852,8 @@ func (e *StorageExecutor) parseRemoveProperties(removePart string) []string {
 // smartSplitReturnItems splits a RETURN clause by commas, but respects:
 // - CASE/END boundaries
 // - Parentheses (function calls)
+// - Curly braces (map projections like n { .*, key: value })
+// - Square brackets (list literals)
 // - String literals
 // smartSplitReturnItems splits RETURN items by comma, respecting strings, parentheses, and CASE/END.
 // Properly handles UTF-8 encoded strings with multi-byte characters.
@@ -1861,6 +1863,8 @@ func (e *StorageExecutor) smartSplitReturnItems(returnPart string) []string {
 	var inString bool
 	var stringChar rune
 	var parenDepth int
+	var braceDepth int
+	var bracketDepth int
 	var caseDepth int
 
 	runes := []rune(returnPart)
@@ -1910,6 +1914,30 @@ func (e *StorageExecutor) smartSplitReturnItems(returnPart string) []string {
 			continue
 		}
 
+		// Track curly braces (map projections)
+		if ch == '{' {
+			braceDepth++
+			current.WriteRune(ch)
+			continue
+		}
+		if ch == '}' {
+			braceDepth--
+			current.WriteRune(ch)
+			continue
+		}
+
+		// Track square brackets (list literals)
+		if ch == '[' {
+			bracketDepth++
+			current.WriteRune(ch)
+			continue
+		}
+		if ch == ']' {
+			bracketDepth--
+			current.WriteRune(ch)
+			continue
+		}
+
 		// Track CASE/END keywords (using byte positions for substring comparison)
 		if bytePos+4 <= len(returnPart) && upper[bytePos:bytePos+4] == "CASE" {
 			// Check if CASE is a word boundary
@@ -1937,8 +1965,8 @@ func (e *StorageExecutor) smartSplitReturnItems(returnPart string) []string {
 			}
 		}
 
-		// Split on comma only if we're not inside parens, CASE, or strings
-		if ch == ',' && parenDepth == 0 && caseDepth == 0 {
+		// Split on comma only if we're not inside parens, braces, brackets, CASE, or strings
+		if ch == ',' && parenDepth == 0 && braceDepth == 0 && bracketDepth == 0 && caseDepth == 0 {
 			result = append(result, current.String())
 			current.Reset()
 			continue

pkg/cypher/executor_test.go

@@ -2288,6 +2288,32 @@ func TestParseReturnItemsWithAlias(t *testing.T) {
 	assert.Equal(t, "val", result.Columns[0])
 }
 
+func TestParseReturnItemsMapProjectionWithAlias(t *testing.T) {
+	store := storage.NewMemoryEngine()
+	exec := NewStorageExecutor(store)
+	ctx := context.Background()
+
+	// Test that map projection syntax n { .*, key: value } AS n is parsed correctly
+	// The comma inside {} should NOT split the return items
+	params := map[string]interface{}{
+		"props": map[string]interface{}{
+			"name":      "TestNode",
+			"value":     float64(42),
+			"embedding": []float64{0.1, 0.2, 0.3},
+		},
+	}
+
+	result, err := exec.Execute(ctx, "CREATE (n:Node $props) RETURN n { .*, embedding: null } AS n", params)
+	require.NoError(t, err)
+
+	// Should have exactly 1 column named "n", not 2 columns
+	assert.Len(t, result.Columns, 1, "Should have exactly 1 column, not split on comma inside {}")
+	assert.Equal(t, "n", result.Columns[0], "Column should be named 'n' from AS alias")
+
+	// Should have 1 row
+	assert.Len(t, result.Rows, 1)
+}
+
 func TestParseReturnItemsOrderByLimit(t *testing.T) {
 	store := storage.NewMemoryEngine()
 	exec := NewStorageExecutor(store)

ui/src/pages/Browser.tsx

@@ -712,17 +712,25 @@ function JsonPreview({ data, expanded = false }: { data: unknown; expanded?: boo
   if (typeof data === 'number') return <span className="json-number">{data}</span>;
   if (typeof data === 'boolean') return <span className="json-boolean">{String(data)}</span>;
   if (Array.isArray(data)) {
-    if (!expanded && data.length > 3) {
-      return <span className="text-norse-silver">[{data.length} items]</span>;
+    if (expanded) {
+      return (
+        <pre className="text-xs text-norse-silver bg-norse-shadow/50 rounded p-2 overflow-x-auto max-h-48 overflow-y-auto">
+          {JSON.stringify(data, null, 2)}
+        </pre>
+      );
     }
-    return <span className="text-norse-silver">[...]</span>;
+    return <span className="text-norse-silver">[{data.length} items]</span>;
   }
   if (typeof data === 'object') {
-    const keys = Object.keys(data);
-    if (!expanded && keys.length > 3) {
-      return <span className="text-norse-silver">{'{'}...{keys.length} props{'}'}</span>;
+    if (expanded) {
+      return (
+        <pre className="text-xs text-norse-silver bg-norse-shadow/50 rounded p-2 overflow-x-auto max-h-48 overflow-y-auto">
+          {JSON.stringify(data, null, 2)}
+        </pre>
+      );
     }
-    return <span className="text-norse-silver">{'{'}...{'}'}</span>;
+    const keys = Object.keys(data);
+    return <span className="text-norse-silver">{'{'}...{keys.length} props{'}'}</span>;
   }
   return <span>{String(data)}</span>;
 }