use block syntax for defaults

WORKSPACE

@@ -53,7 +53,7 @@ extension @dotnet {
         "TEAMCITY_VERSION"
         "JB_SPACE_API_URL"
     ]
-    defaults = {
-        configuration: $configuration
+    defaults {
+        `configuration` = $configuration
     }
 }

src/Terrabuild.Configuration.Tests/TestFiles/PROJECT

@@ -1,15 +1,15 @@
 # comment at top of file
 
 extension @dotnet {
-  defaults = { # comment at end of line
-    configuration : $configuration
+  defaults { # comment at end of line
+    `configuration` = $configuration
   }
 }
 
 extension @docker {
-  defaults = {
-    configuration: $configuration
-    image : "ghcr.io/magnusopera/dotnet-app"
+  defaults {
+    `configuration` = $configuration
+    `image` = "ghcr.io/magnusopera/dotnet-app"
   }
 
   variables = [ "ARM_TENANT_ID" ]

src/Terrabuild.Configuration.Tests/TestFiles/WORKSPACE

@@ -26,8 +26,8 @@ configuration dummy
 
 extension dotnet {
   container = "mcr.microsoft.com/dotnet/sdk:8.0.101"
-  defaults = {
-    configuration: $configuration
+  defaults {
+    `configuration` = $configuration
   }
 }
 

src/Terrabuild.Configuration.Tests/TestFiles/WORKSPACE2

@@ -47,10 +47,10 @@ configuration {
 
 extension dotnet {
   container = "mcr.microsoft.com/dotnet/sdk:8.0.101"
-  defaults = {
-    configuration1: $map.toto
-    configuration2: $map.?titi
-    configuration3: replace("toto titi", "toto", "titi")
+  defaults {
+    configuration1 = $map.toto
+    configuration2 = $map.?titi
+    configuration3 = replace("toto titi", "toto", "titi")
   }
 }
 

src/Terrabuild.Configuration/AST.fs

@@ -8,7 +8,7 @@ type ExtensionComponents =
     | Platform of Expr
     | Variables of Expr list
     | Script of Expr
-    | Defaults of Map<string, Expr>
+    | Defaults of (string * Expr) list
 
 type ExtensionBlock =
     { Container: Expr option
@@ -43,9 +43,9 @@ with
             | _ -> raiseParseError "multiple script declared"
 
         let defaults =
-            match components |> List.choose (function | ExtensionComponents.Defaults value -> Some value | _ -> None) with
+            match  components |> List.choose (function | ExtensionComponents.Defaults values -> Some values | _ -> None) with
             | [] -> Map.empty
-            | [value] -> value
+            | [values] -> values |> Map.ofList
             | _ -> raiseParseError "multiple defaults declared"
 
         name, { Container = container

src/Terrabuild.Configuration/Gen/ProjectParser.fsi

@@ -144,6 +144,8 @@ type nonTerminalId =
     | NONTERM_ExtensionVariables
     | NONTERM_ExtensionScript
     | NONTERM_ExtensionDefaults
+    | NONTERM_ExtensionDefaultsComponents
+    | NONTERM_ExtensionDefaultsComponentsVariable
     | NONTERM_Project
     | NONTERM_ProjectComponents
     | NONTERM_ProjectDependencies

src/Terrabuild.Configuration/Gen/WorkspaceParser.fsi

@@ -144,6 +144,8 @@ type nonTerminalId =
     | NONTERM_ExtensionVariables
     | NONTERM_ExtensionScript
     | NONTERM_ExtensionDefaults
+    | NONTERM_ExtensionDefaultsComponents
+    | NONTERM_ExtensionDefaultsComponentsVariable
     | NONTERM_Expr
     | NONTERM_InterpolatedExpr
     | NONTERM_TargetIdentifier

src/Terrabuild.Configuration/ProjectParser/Parser.fsy

@@ -94,7 +94,12 @@ ExtensionVariables:
 ExtensionScript:
     | SCRIPT EQUAL String { ExtensionComponents.Script $3 }
 ExtensionDefaults:
-    | DEFAULTS EQUAL ExprMap { ExtensionComponents.Defaults $3 }
+    | DEFAULTS LBRACE ExtensionDefaultsComponents RBRACE { ExtensionComponents.Defaults $3 }
+ExtensionDefaultsComponents:
+    | /* empty */ { [] }
+    | ExtensionDefaultsComponents ExtensionDefaultsComponentsVariable { $1 @ [$2] }
+ExtensionDefaultsComponentsVariable:
+    | IDENTIFIER EQUAL Expr { ($1, $3) }
 
 
 Project:

src/Terrabuild.Configuration/WorkspaceParser/Parser.fsy

@@ -119,7 +119,14 @@ ExtensionVariables:
 ExtensionScript:
     | SCRIPT EQUAL String { ExtensionComponents.Script $3 }
 ExtensionDefaults:
-    | DEFAULTS EQUAL ExprMap { ExtensionComponents.Defaults $3 }
+    | DEFAULTS LBRACE ExtensionDefaultsComponents RBRACE { ExtensionComponents.Defaults $3 }
+ExtensionDefaultsComponents:
+    | /* empty */ { [] }
+    | ExtensionDefaultsComponents ExtensionDefaultsComponentsVariable { $1 @ [$2] }
+ExtensionDefaultsComponentsVariable:
+    | IDENTIFIER EQUAL Expr { ($1, $3) }
+
+
 
 Expr:
     /* structures */

src/Terrabuild/PROJECT

@@ -5,8 +5,8 @@ project @dotnet {
 }
 
 extension @docker {
-  defaults = {
-    image: "ghcr.io/magnusopera/terrabuild"
+  defaults {
+    `image` = "ghcr.io/magnusopera/terrabuild"
   }
 }
 

tests/simple/WORKSPACE

@@ -37,16 +37,16 @@ target deploy {
 extension @dotnet {
   container = "mcr.microsoft.com/dotnet/sdk:9.0.202"
   platform = "linux/amd64"
-  defaults = {
-    configuration: $configuration
+  defaults {
+    `configuration` = $configuration
   }
 }
 
 extension @terraform {
   container = "hashicorp/terraform:1.10"
   platform = "linux/amd64"
-  defaults = {
-    workspace: $workspace
+  defaults {
+    `workspace` = $workspace
   }
 }
 

tests/simple/projects/dotnet-app/PROJECT

@@ -1,8 +1,8 @@
 
 extension @docker {
-    defaults = {
-        image: "ghcr.io/magnusopera/dotnet-app"
-        arguments: { configuration: $configuration }
+    defaults {
+        `image` = "ghcr.io/magnusopera/dotnet-app"
+        arguments = { configuration: $configuration }
     }
 }