Allow the xmlFlattened trait to be on members

smithy-lang · Oct 22, 2019 · ad470cd · ad470cd
1 parent 2150120
commit ad470cd
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/docs/source/spec/xml.rst b/docs/source/spec/xml.rst
@@ -98,7 +98,7 @@ Summary
     Moves serialized collection members from their collection element to that
     of the collection's container.
 Trait selector
-    ``collection``
+    ``:test(collection, member:of(structure) > collection)``
 
     *Any list or set*
 Value type

diff --git a/smithy-model/src/main/resources/software/amazon/smithy/model/loader/prelude-traits.smithy b/smithy-model/src/main/resources/software/amazon/smithy/model/loader/prelude-traits.smithy
@@ -148,7 +148,7 @@ structure xmlAttribute {}
 
 /// Moves serialized collection members from their collection element to that of
 /// the collection's container.
-@trait(selector: "collection")
+@trait(selector: ":test(collection, member:of(structure) > collection)")
 @tags(["diff.error.const"])
 structure xmlFlattened {}
 

diff --git a/...rc/test/resources/software/amazon/smithy/model/errorfiles/validators/xml-flattened.errors b/...rc/test/resources/software/amazon/smithy/model/errorfiles/validators/xml-flattened.errors
diff --git a/.../src/test/resources/software/amazon/smithy/model/errorfiles/validators/xml-flattened.json b/.../src/test/resources/software/amazon/smithy/model/errorfiles/validators/xml-flattened.json
@@ -0,0 +1,37 @@
+{
+    "smithy": "0.4.0",
+    "ns.foo": {
+        "shapes": {
+            "FlatCollection": {
+                "type": "list",
+                "member": {
+                    "target": "smithy.api#String"
+                },
+                "smithy.api#xmlFlattened": true
+            },
+            "NotFlatCollection": {
+                "type": "list",
+                "member": {
+                    "target": "smithy.api#String"
+                }
+            },
+            "ValidStructure1": {
+                "type": "structure",
+                "members": {
+                    "flatList": {
+                        "target": "FlatCollection"
+                    }
+                }
+            },
+            "ValidStructure2": {
+                "type": "structure",
+                "members": {
+                    "flatList": {
+                        "target": "NotFlatCollection",
+                        "smithy.api#xmlFlattened": true
+                    }
+                }
+            }
+        }
+    }
+}