Fix MapMembers grammar and update test

In IDL 2, map members can be mixed in, so Smithy grammar should reflect their optionality. smithy-lang#1533 incorrectly changed MapMembers grammar to make both MapKey and MapValue optional together, when they are optional separately. This PR fixes the MapMembers grammar to allow MapKey and MapValue to be optional separately, and updates a test case to reflect that.
milesziemer · Dec 13, 2022 · 641f56e · 641f56e
1 parent 3dbec6d
commit 641f56e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/docs/source-2.0/spec/idl.rst b/docs/source-2.0/spec/idl.rst
@@ -199,7 +199,7 @@ string support defined in :rfc:`7405`.
     ElidedListMember        :%s"$member"
     ExplicitListMember      :%s"member" *`SP` ":" *`SP` `ShapeId`
     MapStatement            :%s"map" `SP` `Identifier` [`Mixins`] *`WS` `MapMembers`
-    MapMembers              :"{" *`WS` [`MapKey` `WS` `MapValue`] *`WS` "}"
+    MapMembers              :"{" *`WS` [`MapKey` / `MapValue` / (`MapKey` `WS` `MapValue`)] *`WS` "}"
     MapKey                  :`TraitStatements` (`ElidedMapKey` / `ExplicitMapKey`)
     MapValue                :`TraitStatements` (`ElidedMapValue` / `ExplicitMapValue`)
     ElidedMapKey            :%s"$key"

diff --git a/.../resources/software/amazon/smithy/model/loader/valid/mixins/loads-mixins.flattened.smithy b/.../resources/software/amazon/smithy/model/loader/valid/mixins/loads-mixins.flattened.smithy
@@ -41,6 +41,11 @@ map MixedMap {
     value: String
 }
 
+map MixedMapRedefineValue {
+    key: String
+    value: String
+}
+
 service MixedService {}
 
 resource MixedResource {}

diff --git a/...del/src/test/resources/software/amazon/smithy/model/loader/valid/mixins/loads-mixins.json b/...del/src/test/resources/software/amazon/smithy/model/loader/valid/mixins/loads-mixins.json
@@ -233,6 +233,15 @@
                 "target": "smithy.example#MixinMap"
             }]
         },
+        "smithy.example#MixedMapRedefineValue": {
+            "type": "map",
+            "value": {
+                "target": "smithy.api#String"
+            },
+            "mixins": [{
+                "target": "smithy.example#MixinMap"
+            }]
+        },
         "smithy.example#MixinService": {
             "type": "service",
             "traits": {

diff --git a/...l/src/test/resources/software/amazon/smithy/model/loader/valid/mixins/loads-mixins.smithy b/...l/src/test/resources/software/amazon/smithy/model/loader/valid/mixins/loads-mixins.smithy
@@ -98,6 +98,10 @@ map MixinMap {
 
 map MixedMap with [MixinMap] {}
 
+map MixedMapRedefineValue with [MixinMap] {
+    value: String
+}
+
 @mixin
 service MixinService {}