@smithy/core 3.18.1 → 3.18.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -76,8 +76,9 @@ class EventStreamSerde {
|
|
|
76
76
|
const unionMember = Object.keys(event).find((key) => {
|
|
77
77
|
return key !== "__type";
|
|
78
78
|
}) ?? "";
|
|
79
|
+
const body = event[unionMember].body;
|
|
79
80
|
if (unionMember === "initial-response") {
|
|
80
|
-
const dataObject = await this.deserializer.read(responseSchema,
|
|
81
|
+
const dataObject = await this.deserializer.read(responseSchema, body);
|
|
81
82
|
delete dataObject[eventStreamMember];
|
|
82
83
|
return {
|
|
83
84
|
[initialResponseMarker]: true,
|
|
@@ -86,8 +87,48 @@ class EventStreamSerde {
|
|
|
86
87
|
}
|
|
87
88
|
else if (unionMember in memberSchemas) {
|
|
88
89
|
const eventStreamSchema = memberSchemas[unionMember];
|
|
90
|
+
if (eventStreamSchema.isStructSchema()) {
|
|
91
|
+
const out = {};
|
|
92
|
+
let hasBindings = false;
|
|
93
|
+
for (const [name, member] of eventStreamSchema.structIterator()) {
|
|
94
|
+
const { eventHeader, eventPayload } = member.getMergedTraits();
|
|
95
|
+
hasBindings = hasBindings || Boolean(eventHeader || eventPayload);
|
|
96
|
+
if (eventPayload) {
|
|
97
|
+
if (member.isBlobSchema()) {
|
|
98
|
+
out[name] = body;
|
|
99
|
+
}
|
|
100
|
+
else if (member.isStringSchema()) {
|
|
101
|
+
out[name] = (this.serdeContext?.utf8Encoder ?? utilUtf8.toUtf8)(body);
|
|
102
|
+
}
|
|
103
|
+
else if (member.isStructSchema()) {
|
|
104
|
+
out[name] = await this.deserializer.read(member, body);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
else if (eventHeader) {
|
|
108
|
+
const value = event[unionMember].headers[name]?.value;
|
|
109
|
+
if (value != null) {
|
|
110
|
+
if (member.isNumericSchema()) {
|
|
111
|
+
if (value && typeof value === "object" && "bytes" in value) {
|
|
112
|
+
out[name] = BigInt(value.toString());
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
out[name] = Number(value);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
out[name] = value;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
if (hasBindings) {
|
|
125
|
+
return {
|
|
126
|
+
[unionMember]: out,
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
}
|
|
89
130
|
return {
|
|
90
|
-
[unionMember]: await this.deserializer.read(eventStreamSchema,
|
|
131
|
+
[unionMember]: await this.deserializer.read(eventStreamSchema, body),
|
|
91
132
|
};
|
|
92
133
|
}
|
|
93
134
|
else {
|
|
@@ -189,7 +189,7 @@ class HttpBindingProtocol extends HttpProtocol {
|
|
|
189
189
|
for (const [memberName, memberNs] of ns.structIterator()) {
|
|
190
190
|
const memberTraits = memberNs.getMergedTraits() ?? {};
|
|
191
191
|
const inputMemberValue = input[memberName];
|
|
192
|
-
if (inputMemberValue == null) {
|
|
192
|
+
if (inputMemberValue == null && !memberNs.isIdempotencyToken()) {
|
|
193
193
|
continue;
|
|
194
194
|
}
|
|
195
195
|
if (memberTraits.httpPayload) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { fromUtf8 } from "@smithy/util-utf8";
|
|
1
|
+
import { fromUtf8, toUtf8 } from "@smithy/util-utf8";
|
|
2
2
|
export class EventStreamSerde {
|
|
3
3
|
marshaller;
|
|
4
4
|
serializer;
|
|
@@ -73,8 +73,9 @@ export class EventStreamSerde {
|
|
|
73
73
|
const unionMember = Object.keys(event).find((key) => {
|
|
74
74
|
return key !== "__type";
|
|
75
75
|
}) ?? "";
|
|
76
|
+
const body = event[unionMember].body;
|
|
76
77
|
if (unionMember === "initial-response") {
|
|
77
|
-
const dataObject = await this.deserializer.read(responseSchema,
|
|
78
|
+
const dataObject = await this.deserializer.read(responseSchema, body);
|
|
78
79
|
delete dataObject[eventStreamMember];
|
|
79
80
|
return {
|
|
80
81
|
[initialResponseMarker]: true,
|
|
@@ -83,8 +84,48 @@ export class EventStreamSerde {
|
|
|
83
84
|
}
|
|
84
85
|
else if (unionMember in memberSchemas) {
|
|
85
86
|
const eventStreamSchema = memberSchemas[unionMember];
|
|
87
|
+
if (eventStreamSchema.isStructSchema()) {
|
|
88
|
+
const out = {};
|
|
89
|
+
let hasBindings = false;
|
|
90
|
+
for (const [name, member] of eventStreamSchema.structIterator()) {
|
|
91
|
+
const { eventHeader, eventPayload } = member.getMergedTraits();
|
|
92
|
+
hasBindings = hasBindings || Boolean(eventHeader || eventPayload);
|
|
93
|
+
if (eventPayload) {
|
|
94
|
+
if (member.isBlobSchema()) {
|
|
95
|
+
out[name] = body;
|
|
96
|
+
}
|
|
97
|
+
else if (member.isStringSchema()) {
|
|
98
|
+
out[name] = (this.serdeContext?.utf8Encoder ?? toUtf8)(body);
|
|
99
|
+
}
|
|
100
|
+
else if (member.isStructSchema()) {
|
|
101
|
+
out[name] = await this.deserializer.read(member, body);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
else if (eventHeader) {
|
|
105
|
+
const value = event[unionMember].headers[name]?.value;
|
|
106
|
+
if (value != null) {
|
|
107
|
+
if (member.isNumericSchema()) {
|
|
108
|
+
if (value && typeof value === "object" && "bytes" in value) {
|
|
109
|
+
out[name] = BigInt(value.toString());
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
out[name] = Number(value);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
out[name] = value;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
if (hasBindings) {
|
|
122
|
+
return {
|
|
123
|
+
[unionMember]: out,
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
}
|
|
86
127
|
return {
|
|
87
|
-
[unionMember]: await this.deserializer.read(eventStreamSchema,
|
|
128
|
+
[unionMember]: await this.deserializer.read(eventStreamSchema, body),
|
|
88
129
|
};
|
|
89
130
|
}
|
|
90
131
|
else {
|
|
@@ -48,7 +48,7 @@ export class HttpBindingProtocol extends HttpProtocol {
|
|
|
48
48
|
for (const [memberName, memberNs] of ns.structIterator()) {
|
|
49
49
|
const memberTraits = memberNs.getMergedTraits() ?? {};
|
|
50
50
|
const inputMemberValue = input[memberName];
|
|
51
|
-
if (inputMemberValue == null) {
|
|
51
|
+
if (inputMemberValue == null && !memberNs.isIdempotencyToken()) {
|
|
52
52
|
continue;
|
|
53
53
|
}
|
|
54
54
|
if (memberTraits.httpPayload) {
|
package/package.json
CHANGED