feat: populate contents from '#text' recursively in parseBody

[trivikr]

Issue #, if available:

• Fixes: Export check for ["#text"] to a utility function #1152
• PR which added checks for undefined in ["#text"]: fix: XML Namespace Serde issues #1077
• PR which removed ["#text"] at root in parseBody: fix(fast-xml-parser): populate contents from '#text' if available #993

Description of changes:

• Populate contents from '#text' recursively in parseBody

• Verified that:

  • protocol tests are successful which tests fix in fix: XML Namespace Serde issues #1077
  • integration tests are successful which tests fix in fix(fast-xml-parser): populate contents from '#text' if available #993

• deserializer function:

  • before:

    const deserializeAws_restXmlRenamedListMembers = (
      output: any,
      context: __SerdeContext
    ): string[] => {
      return (output || []).map((entry: any) =>
        entry["#text"] !== undefined ? entry["#text"] : entry
      );
    };

  • after:

    const deserializeAws_restXmlRenamedListMembers = (
      output: any,
      context: __SerdeContext
    ): string[] => {
      return (output || []).map((entry: any) => entry);
    };

• parseBody:

  • before

    const parseBody = (streamBody: any, context: __SerdeContext): any =>
      collectBodyString(streamBody, context).then(encoded => {
        if (encoded.length) {
          const parsedObj = xmlParse(encoded, {
            attributeNamePrefix: "",
            ignoreAttributes: false,
            parseNodeValue: false,
            tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
          });
          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 {};
      });

  • after

    const parseBody = (streamBody: any, context: __SerdeContext): any =>
      collectBodyString(streamBody, context).then(encoded => {
        if (encoded.length) {
          const parsedObj = xmlParse(encoded, {
            attributeNamePrefix: "",
            ignoreAttributes: false,
            parseNodeValue: false,
            tagValueProcessor: (val, tagName) => decodeEscapedXML(val)
          });
          const textNodeName = "#text";
          const key = Object.keys(parsedObj)[0];
          const parsedObjToReturn = parsedObj[key];
          if (parsedObjToReturn[textNodeName]) {
            parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
            delete parsedObjToReturn[textNodeName];
          }
          return __getValueFromTextNode(parsedObjToReturn);
        }
        return {};
      });

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

[codecov-io]

Codecov Report

Merging #1154 into master will increase coverage by 0.16%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1154      +/-   ##
==========================================
+ Coverage   73.85%   74.02%   +0.16%     
==========================================
  Files         284      285       +1     
  Lines       13175    12736     -439     
  Branches     3106     2809     -297     
==========================================
- Hits         9731     9428     -303     
+ Misses       3444     3308     -136     

Impacted Files	Coverage Δ
...ages/smithy-client/src/get-value-from-text-node.ts	100.00% <ø> (ø)
protocol_tests/aws-ec2/protocols/Aws_ec2.ts	64.37% <ø> (-0.57%)	⬇️
protocol_tests/aws-json/protocols/Aws_json1_1.ts	69.32% <ø> (ø)
protocol_tests/aws-query/protocols/Aws_query.ts	69.48% <ø> (-0.06%)	⬇️
...ol_tests/aws-restjson/protocols/Aws_restJson1_1.ts	65.83% <ø> (ø)
...rotocol_tests/aws-restxml/protocols/Aws_restXml.ts	68.67% <ø> (-0.07%)	⬇️
... and 1 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bcfa99c...61b70fe. Read the comment docs.

[aws-sdk-js-automation]

AWS CodeBuild CI Report

• CodeBuild project: sdk-staging-test
• Commit ID: c80add7
• Result: SUCCEEDED
• Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

[alexforsyth]

LGTM. Great cleanup +1

[AllanZhengYP]

Looks awesome.

[lock]

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs and link to relevant comments in this thread.