Skip to content

Commit 1e6bb7e

Browse files
AllanZhengYPAllanZhengYP
committed
feat(codegen): upgrade fast-xml-parser to 4.0.10
1 parent d6d169a commit 1e6bb7e

File tree

50 files changed

+207
-126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+207
-126
lines changed

‎clients/client-auto-scaling/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"@aws-sdk/util-utf8-browser": "*",
5252
"@aws-sdk/util-utf8-node": "*",
5353
"@aws-sdk/util-waiter": "*",
54-
"entities": "2.2.0",
5554
"fast-xml-parser": "4.0.10",
5655
"tslib": "^2.3.1"
5756
},

‎clients/client-auto-scaling/src/protocols/Aws_query.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
ResponseMetadata as __ResponseMetadata,
2121
SerdeContext as __SerdeContext,
2222
} from "@aws-sdk/types";
23-
import { decodeHTML } from "entities";
2423
import { XMLParser } from "fast-xml-parser";
2524

2625
import { AttachInstancesCommandInput, AttachInstancesCommandOutput } from "../commands/AttachInstancesCommand";
@@ -9837,13 +9836,18 @@ const buildHttpRpcRequest = async (
98379836
const parseBody = (streamBody: any, context: __SerdeContext): any =>
98389837
collectBodyString(streamBody, context).then((encoded) => {
98399838
if (encoded.length) {
9840-
const parsedObj = new XMLParser({
9839+
const parser = new XMLParser({
98419840
attributeNamePrefix: "",
9841+
htmlEntities: true,
98429842
ignoreAttributes: false,
9843+
ignoreDeclaration: true,
98439844
parseTagValue: false,
98449845
trimValues: false,
9845-
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
9846-
}).parse(encoded);
9846+
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
9847+
});
9848+
parser.addEntity("#xD", "\r");
9849+
parser.addEntity("#10", "\n");
9850+
const parsedObj = parser.parse(encoded);
98479851
const textNodeName = "#text";
98489852
const key = Object.keys(parsedObj)[0];
98499853
const parsedObjToReturn = parsedObj[key];

‎clients/client-cloudformation/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"@aws-sdk/util-utf8-browser": "*",
5252
"@aws-sdk/util-utf8-node": "*",
5353
"@aws-sdk/util-waiter": "*",
54-
"entities": "2.2.0",
5554
"fast-xml-parser": "4.0.10",
5655
"tslib": "^2.3.1",
5756
"uuid": "^8.3.2"

‎clients/client-cloudformation/src/protocols/Aws_query.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
ResponseMetadata as __ResponseMetadata,
1919
SerdeContext as __SerdeContext,
2020
} from "@aws-sdk/types";
21-
import { decodeHTML } from "entities";
2221
import { XMLParser } from "fast-xml-parser";
2322
import { v4 as generateIdempotencyToken } from "uuid";
2423

@@ -10247,13 +10246,18 @@ const buildHttpRpcRequest = async (
1024710246
const parseBody = (streamBody: any, context: __SerdeContext): any =>
1024810247
collectBodyString(streamBody, context).then((encoded) => {
1024910248
if (encoded.length) {
10250-
const parsedObj = new XMLParser({
10249+
const parser = new XMLParser({
1025110250
attributeNamePrefix: "",
10251+
htmlEntities: true,
1025210252
ignoreAttributes: false,
10253+
ignoreDeclaration: true,
1025310254
parseTagValue: false,
1025410255
trimValues: false,
10255-
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
10256-
}).parse(encoded);
10256+
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
10257+
});
10258+
parser.addEntity("#xD", "\r");
10259+
parser.addEntity("#10", "\n");
10260+
const parsedObj = parser.parse(encoded);
1025710261
const textNodeName = "#text";
1025810262
const key = Object.keys(parsedObj)[0];
1025910263
const parsedObjToReturn = parsedObj[key];

‎clients/client-cloudfront/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
"@aws-sdk/util-utf8-node": "*",
5353
"@aws-sdk/util-waiter": "*",
5454
"@aws-sdk/xml-builder": "*",
55-
"entities": "2.2.0",
5655
"fast-xml-parser": "4.0.10",
5756
"tslib": "^2.3.1"
5857
},

‎clients/client-cloudfront/src/protocols/Aws_restXml.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import {
2323
SerdeContext as __SerdeContext,
2424
} from "@aws-sdk/types";
2525
import { XmlNode as __XmlNode, XmlText as __XmlText } from "@aws-sdk/xml-builder";
26-
import { decodeHTML } from "entities";
2726
import { XMLParser } from "fast-xml-parser";
2827

2928
import { AssociateAliasCommandInput, AssociateAliasCommandOutput } from "../commands/AssociateAliasCommand";
@@ -17269,13 +17268,18 @@ const isSerializableHeaderValue = (value: any): boolean =>
1726917268
const parseBody = (streamBody: any, context: __SerdeContext): any =>
1727017269
collectBodyString(streamBody, context).then((encoded) => {
1727117270
if (encoded.length) {
17272-
const parsedObj = new XMLParser({
17271+
const parser = new XMLParser({
1727317272
attributeNamePrefix: "",
17273+
htmlEntities: true,
1727417274
ignoreAttributes: false,
17275+
ignoreDeclaration: true,
1727517276
parseTagValue: false,
1727617277
trimValues: false,
17277-
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
17278-
}).parse(encoded);
17278+
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
17279+
});
17280+
parser.addEntity("#xD", "\r");
17281+
parser.addEntity("#10", "\n");
17282+
const parsedObj = parser.parse(encoded);
1727917283
const textNodeName = "#text";
1728017284
const key = Object.keys(parsedObj)[0];
1728117285
const parsedObjToReturn = parsedObj[key];

‎clients/client-cloudsearch/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"@aws-sdk/util-user-agent-node": "*",
5151
"@aws-sdk/util-utf8-browser": "*",
5252
"@aws-sdk/util-utf8-node": "*",
53-
"entities": "2.2.0",
5453
"fast-xml-parser": "4.0.10",
5554
"tslib": "^2.3.1"
5655
},

‎clients/client-cloudsearch/src/protocols/Aws_query.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import {
2121
ResponseMetadata as __ResponseMetadata,
2222
SerdeContext as __SerdeContext,
2323
} from "@aws-sdk/types";
24-
import { decodeHTML } from "entities";
2524
import { XMLParser } from "fast-xml-parser";
2625

2726
import { BuildSuggestersCommandInput, BuildSuggestersCommandOutput } from "../commands/BuildSuggestersCommand";
@@ -4185,13 +4184,18 @@ const buildHttpRpcRequest = async (
41854184
const parseBody = (streamBody: any, context: __SerdeContext): any =>
41864185
collectBodyString(streamBody, context).then((encoded) => {
41874186
if (encoded.length) {
4188-
const parsedObj = new XMLParser({
4187+
const parser = new XMLParser({
41894188
attributeNamePrefix: "",
4189+
htmlEntities: true,
41904190
ignoreAttributes: false,
4191+
ignoreDeclaration: true,
41914192
parseTagValue: false,
41924193
trimValues: false,
4193-
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
4194-
}).parse(encoded);
4194+
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
4195+
});
4196+
parser.addEntity("#xD", "\r");
4197+
parser.addEntity("#10", "\n");
4198+
const parsedObj = parser.parse(encoded);
41954199
const textNodeName = "#text";
41964200
const key = Object.keys(parsedObj)[0];
41974201
const parsedObjToReturn = parsedObj[key];

‎clients/client-cloudwatch/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"@aws-sdk/util-utf8-browser": "*",
5252
"@aws-sdk/util-utf8-node": "*",
5353
"@aws-sdk/util-waiter": "*",
54-
"entities": "2.2.0",
5554
"fast-xml-parser": "4.0.10",
5655
"tslib": "^2.3.1"
5756
},

‎clients/client-cloudwatch/src/protocols/Aws_query.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import {
2121
ResponseMetadata as __ResponseMetadata,
2222
SerdeContext as __SerdeContext,
2323
} from "@aws-sdk/types";
24-
import { decodeHTML } from "entities";
2524
import { XMLParser } from "fast-xml-parser";
2625

2726
import { DeleteAlarmsCommandInput, DeleteAlarmsCommandOutput } from "../commands/DeleteAlarmsCommand";
@@ -6188,13 +6187,18 @@ const buildHttpRpcRequest = async (
61886187
const parseBody = (streamBody: any, context: __SerdeContext): any =>
61896188
collectBodyString(streamBody, context).then((encoded) => {
61906189
if (encoded.length) {
6191-
const parsedObj = new XMLParser({
6190+
const parser = new XMLParser({
61926191
attributeNamePrefix: "",
6192+
htmlEntities: true,
61936193
ignoreAttributes: false,
6194+
ignoreDeclaration: true,
61946195
parseTagValue: false,
61956196
trimValues: false,
6196-
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
6197-
}).parse(encoded);
6197+
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
6198+
});
6199+
parser.addEntity("#xD", "\r");
6200+
parser.addEntity("#10", "\n");
6201+
const parsedObj = parser.parse(encoded);
61986202
const textNodeName = "#text";
61996203
const key = Object.keys(parsedObj)[0];
62006204
const parsedObjToReturn = parsedObj[key];

‎clients/client-docdb/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
"@aws-sdk/util-utf8-browser": "*",
5353
"@aws-sdk/util-utf8-node": "*",
5454
"@aws-sdk/util-waiter": "*",
55-
"entities": "2.2.0",
5655
"fast-xml-parser": "4.0.10",
5756
"tslib": "^2.3.1"
5857
},

‎clients/client-docdb/src/protocols/Aws_query.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
ResponseMetadata as __ResponseMetadata,
1919
SerdeContext as __SerdeContext,
2020
} from "@aws-sdk/types";
21-
import { decodeHTML } from "entities";
2221
import { XMLParser } from "fast-xml-parser";
2322

2423
import {
@@ -9081,13 +9080,18 @@ const buildHttpRpcRequest = async (
90819080
const parseBody = (streamBody: any, context: __SerdeContext): any =>
90829081
collectBodyString(streamBody, context).then((encoded) => {
90839082
if (encoded.length) {
9084-
const parsedObj = new XMLParser({
9083+
const parser = new XMLParser({
90859084
attributeNamePrefix: "",
9085+
htmlEntities: true,
90869086
ignoreAttributes: false,
9087+
ignoreDeclaration: true,
90879088
parseTagValue: false,
90889089
trimValues: false,
9089-
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
9090-
}).parse(encoded);
9090+
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
9091+
});
9092+
parser.addEntity("#xD", "\r");
9093+
parser.addEntity("#10", "\n");
9094+
const parsedObj = parser.parse(encoded);
90919095
const textNodeName = "#text";
90929096
const key = Object.keys(parsedObj)[0];
90939097
const parsedObjToReturn = parsedObj[key];

‎clients/client-ec2/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
"@aws-sdk/util-utf8-browser": "*",
5353
"@aws-sdk/util-utf8-node": "*",
5454
"@aws-sdk/util-waiter": "*",
55-
"entities": "2.2.0",
5655
"fast-xml-parser": "4.0.10",
5756
"tslib": "^2.3.1",
5857
"uuid": "^8.3.2"

‎clients/client-ec2/src/protocols/Aws_ec2.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
ResponseMetadata as __ResponseMetadata,
2121
SerdeContext as __SerdeContext,
2222
} from "@aws-sdk/types";
23-
import { decodeHTML } from "entities";
2423
import { XMLParser } from "fast-xml-parser";
2524
import { v4 as generateIdempotencyToken } from "uuid";
2625

@@ -80327,13 +80326,18 @@ const buildHttpRpcRequest = async (
8032780326
const parseBody = (streamBody: any, context: __SerdeContext): any =>
8032880327
collectBodyString(streamBody, context).then((encoded) => {
8032980328
if (encoded.length) {
80330-
const parsedObj = new XMLParser({
80329+
const parser = new XMLParser({
8033180330
attributeNamePrefix: "",
80331+
htmlEntities: true,
8033280332
ignoreAttributes: false,
80333+
ignoreDeclaration: true,
8033380334
parseTagValue: false,
8033480335
trimValues: false,
80335-
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
80336-
}).parse(encoded);
80336+
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
80337+
});
80338+
parser.addEntity("#xD", "\r");
80339+
parser.addEntity("#10", "\n");
80340+
const parsedObj = parser.parse(encoded);
8033780341
const textNodeName = "#text";
8033880342
const key = Object.keys(parsedObj)[0];
8033980343
const parsedObjToReturn = parsedObj[key];

‎clients/client-elastic-beanstalk/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"@aws-sdk/util-utf8-browser": "*",
5252
"@aws-sdk/util-utf8-node": "*",
5353
"@aws-sdk/util-waiter": "*",
54-
"entities": "2.2.0",
5554
"fast-xml-parser": "4.0.10",
5655
"tslib": "^2.3.1"
5756
},

‎clients/client-elastic-beanstalk/src/protocols/Aws_query.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
ResponseMetadata as __ResponseMetadata,
2121
SerdeContext as __SerdeContext,
2222
} from "@aws-sdk/types";
23-
import { decodeHTML } from "entities";
2423
import { XMLParser } from "fast-xml-parser";
2524

2625
import {
@@ -7278,13 +7277,18 @@ const buildHttpRpcRequest = async (
72787277
const parseBody = (streamBody: any, context: __SerdeContext): any =>
72797278
collectBodyString(streamBody, context).then((encoded) => {
72807279
if (encoded.length) {
7281-
const parsedObj = new XMLParser({
7280+
const parser = new XMLParser({
72827281
attributeNamePrefix: "",
7282+
htmlEntities: true,
72837283
ignoreAttributes: false,
7284+
ignoreDeclaration: true,
72847285
parseTagValue: false,
72857286
trimValues: false,
7286-
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
7287-
}).parse(encoded);
7287+
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
7288+
});
7289+
parser.addEntity("#xD", "\r");
7290+
parser.addEntity("#10", "\n");
7291+
const parsedObj = parser.parse(encoded);
72887292
const textNodeName = "#text";
72897293
const key = Object.keys(parsedObj)[0];
72907294
const parsedObjToReturn = parsedObj[key];

‎clients/client-elastic-load-balancing-v2/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"@aws-sdk/util-utf8-browser": "*",
5252
"@aws-sdk/util-utf8-node": "*",
5353
"@aws-sdk/util-waiter": "*",
54-
"entities": "2.2.0",
5554
"fast-xml-parser": "4.0.10",
5655
"tslib": "^2.3.1"
5756
},

‎clients/client-elastic-load-balancing-v2/src/protocols/Aws_query.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import {
1919
ResponseMetadata as __ResponseMetadata,
2020
SerdeContext as __SerdeContext,
2121
} from "@aws-sdk/types";
22-
import { decodeHTML } from "entities";
2322
import { XMLParser } from "fast-xml-parser";
2423

2524
import {
@@ -6702,13 +6701,18 @@ const buildHttpRpcRequest = async (
67026701
const parseBody = (streamBody: any, context: __SerdeContext): any =>
67036702
collectBodyString(streamBody, context).then((encoded) => {
67046703
if (encoded.length) {
6705-
const parsedObj = new XMLParser({
6704+
const parser = new XMLParser({
67066705
attributeNamePrefix: "",
6706+
htmlEntities: true,
67076707
ignoreAttributes: false,
6708+
ignoreDeclaration: true,
67086709
parseTagValue: false,
67096710
trimValues: false,
6710-
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
6711-
}).parse(encoded);
6711+
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
6712+
});
6713+
parser.addEntity("#xD", "\r");
6714+
parser.addEntity("#10", "\n");
6715+
const parsedObj = parser.parse(encoded);
67126716
const textNodeName = "#text";
67136717
const key = Object.keys(parsedObj)[0];
67146718
const parsedObjToReturn = parsedObj[key];

‎clients/client-elastic-load-balancing/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"@aws-sdk/util-utf8-browser": "*",
5252
"@aws-sdk/util-utf8-node": "*",
5353
"@aws-sdk/util-waiter": "*",
54-
"entities": "2.2.0",
5554
"fast-xml-parser": "4.0.10",
5655
"tslib": "^2.3.1"
5756
},

‎clients/client-elastic-load-balancing/src/protocols/Aws_query.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import {
1919
ResponseMetadata as __ResponseMetadata,
2020
SerdeContext as __SerdeContext,
2121
} from "@aws-sdk/types";
22-
import { decodeHTML } from "entities";
2322
import { XMLParser } from "fast-xml-parser";
2423

2524
import { AddTagsCommandInput, AddTagsCommandOutput } from "../commands/AddTagsCommand";
@@ -4656,13 +4655,18 @@ const buildHttpRpcRequest = async (
46564655
const parseBody = (streamBody: any, context: __SerdeContext): any =>
46574656
collectBodyString(streamBody, context).then((encoded) => {
46584657
if (encoded.length) {
4659-
const parsedObj = new XMLParser({
4658+
const parser = new XMLParser({
46604659
attributeNamePrefix: "",
4660+
htmlEntities: true,
46614661
ignoreAttributes: false,
4662+
ignoreDeclaration: true,
46624663
parseTagValue: false,
46634664
trimValues: false,
4664-
tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : decodeHTML(val)),
4665-
}).parse(encoded);
4665+
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
4666+
});
4667+
parser.addEntity("#xD", "\r");
4668+
parser.addEntity("#10", "\n");
4669+
const parsedObj = parser.parse(encoded);
46664670
const textNodeName = "#text";
46674671
const key = Object.keys(parsedObj)[0];
46684672
const parsedObjToReturn = parsedObj[key];

‎clients/client-elasticache/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"@aws-sdk/util-utf8-browser": "*",
5252
"@aws-sdk/util-utf8-node": "*",
5353
"@aws-sdk/util-waiter": "*",
54-
"entities": "2.2.0",
5554
"fast-xml-parser": "4.0.10",
5655
"tslib": "^2.3.1"
5756
},

0 commit comments

Comments
 (0)