fix(fast-xml-parser): populate contents from '#text' if available (aw…

…s#993)
AllanZhengYP · Mar 20, 2020 · a101bc1 · a101bc1
1 parent 18b84eb
commit a101bc1
Show file tree

Hide file tree

Showing 23 changed files with 184 additions and 23 deletions.
diff --git a/clients/client-auto-scaling/protocols/Aws_query.ts b/clients/client-auto-scaling/protocols/Aws_query.ts
@@ -9544,7 +9544,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-cloudformation/protocols/Aws_query.ts b/clients/client-cloudformation/protocols/Aws_query.ts
@@ -10730,7 +10730,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-cloudfront/protocols/Aws_restXml.ts b/clients/client-cloudfront/protocols/Aws_restXml.ts
@@ -13650,7 +13650,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-cloudsearch/protocols/Aws_query.ts b/clients/client-cloudsearch/protocols/Aws_query.ts
@@ -5856,7 +5856,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-cloudwatch/protocols/Aws_query.ts b/clients/client-cloudwatch/protocols/Aws_query.ts
@@ -6066,7 +6066,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-docdb/protocols/Aws_query.ts b/clients/client-docdb/protocols/Aws_query.ts
@@ -10102,7 +10102,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-ec2/protocols/Aws_ec2.ts b/clients/client-ec2/protocols/Aws_ec2.ts
@@ -73139,7 +73139,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-elastic-beanstalk/protocols/Aws_query.ts b/clients/client-elastic-beanstalk/protocols/Aws_query.ts
@@ -8918,7 +8918,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-elastic-load-balancing-v2/protocols/Aws_query.ts b/clients/client-elastic-load-balancing-v2/protocols/Aws_query.ts
@@ -9164,7 +9164,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-elastic-load-balancing/protocols/Aws_query.ts b/clients/client-elastic-load-balancing/protocols/Aws_query.ts
@@ -6334,7 +6334,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-elasticache/protocols/Aws_query.ts b/clients/client-elasticache/protocols/Aws_query.ts
@@ -12805,7 +12805,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-iam/protocols/Aws_query.ts b/clients/client-iam/protocols/Aws_query.ts
@@ -21920,7 +21920,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-neptune/protocols/Aws_query.ts b/clients/client-neptune/protocols/Aws_query.ts
@@ -13923,7 +13923,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-rds/protocols/Aws_query.ts b/clients/client-rds/protocols/Aws_query.ts
@@ -29806,7 +29806,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-redshift/protocols/Aws_query.ts b/clients/client-redshift/protocols/Aws_query.ts
@@ -20549,7 +20549,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-route-53/protocols/Aws_restXml.ts b/clients/client-route-53/protocols/Aws_restXml.ts
@@ -10089,7 +10089,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-s3-control/protocols/Aws_restXml.ts b/clients/client-s3-control/protocols/Aws_restXml.ts
@@ -3465,7 +3465,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-s3/protocols/Aws_restXml.ts b/clients/client-s3/protocols/Aws_restXml.ts
@@ -14965,7 +14965,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-ses/protocols/Aws_query.ts b/clients/client-ses/protocols/Aws_query.ts
@@ -11913,7 +11913,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-sns/protocols/Aws_query.ts b/clients/client-sns/protocols/Aws_query.ts
@@ -6245,7 +6245,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-sqs/protocols/Aws_query.ts b/clients/client-sqs/protocols/Aws_query.ts
@@ -3625,7 +3625,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/clients/client-sts/protocols/Aws_query.ts b/clients/client-sts/protocols/Aws_query.ts
@@ -1712,7 +1712,14 @@ const parseBody = (streamBody: any, context: __SerdeContext): any => {
         parseNodeValue: false,
         tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
       });
-      return parsedObj[Object.keys(parsedObj)[0]];
+      const textNodeName = "#text";
+      const key = Object.keys(parsedObj)[0];
+      const parsedObjToReturn = parsedObj[key];
+      if (parsedObjToReturn[textNodeName]) {
+        parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
+        delete parsedObjToReturn[textNodeName];
+      }
+      return parsedObjToReturn;
     }
     return {};
   });

diff --git a/...codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java b/...codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsProtocolUtils.java
@@ -126,7 +126,14 @@ static void generateXmlParseBody(GenerationContext context) {
                     writer.write("const parsedObj = xmlParse(encoded, { attributeNamePrefix: '', "
                             + "ignoreAttributes: false, parseNodeValue: false, tagValueProcessor: (val, tagName) "
                             + "=> decodeEscapedXML(val) });");
-                    writer.write("return parsedObj[Object.keys(parsedObj)[0]];");
+                    writer.write("const textNodeName = '#text';");
+                    writer.write("const key = Object.keys(parsedObj)[0];");
+                    writer.write("const parsedObjToReturn = parsedObj[key];");
+                    writer.openBlock("if (parsedObjToReturn[textNodeName]) {", "}", () -> {
+                        writer.write("parsedObjToReturn[key] = parsedObjToReturn[textNodeName];");
+                        writer.write("delete parsedObjToReturn[textNodeName];");
+                    });
+                    writer.write("return parsedObjToReturn;");
                 });
                 writer.write("return {};");
             });