@smithy/core 3.14.0 → 3.16.0
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.
- package/dist-cjs/submodules/cbor/index.js +4 -16
- package/dist-cjs/submodules/event-streams/index.js +5 -3
- package/dist-cjs/submodules/protocols/index.js +48 -44
- package/dist-cjs/submodules/schema/index.js +273 -319
- package/dist-cjs/submodules/serde/index.js +126 -34
- package/dist-es/index.js +1 -1
- package/dist-es/submodules/cbor/CborCodec.js +6 -17
- package/dist-es/submodules/event-streams/EventStreamSerde.js +5 -3
- package/dist-es/submodules/protocols/HttpBindingProtocol.js +4 -4
- package/dist-es/submodules/protocols/HttpProtocol.js +6 -5
- package/dist-es/submodules/protocols/RpcProtocol.js +2 -2
- package/dist-es/submodules/protocols/SerdeContext.js +6 -0
- package/dist-es/submodules/protocols/index.js +1 -0
- package/dist-es/submodules/protocols/serde/FromStringShapeDeserializer.js +22 -22
- package/dist-es/submodules/protocols/serde/HttpInterceptingShapeDeserializer.js +3 -2
- package/dist-es/submodules/protocols/serde/ToStringShapeSerializer.js +7 -9
- package/dist-es/submodules/protocols/serde/determineTimestampFormat.js +5 -6
- package/dist-es/submodules/schema/TypeRegistry.js +4 -4
- package/dist-es/submodules/schema/index.js +1 -0
- package/dist-es/submodules/schema/middleware/schemaDeserializationMiddleware.js +5 -1
- package/dist-es/submodules/schema/middleware/schemaSerializationMiddleware.js +5 -1
- package/dist-es/submodules/schema/schemas/NormalizedSchema.js +104 -180
- package/dist-es/submodules/schema/schemas/translateTraits.js +22 -0
- package/dist-es/submodules/serde/index.js +1 -0
- package/dist-es/submodules/serde/schema-serde-lib/schema-date-utils.js +110 -0
- package/dist-es/submodules/serde/value/NumericValue.js +4 -26
- package/dist-types/index.d.ts +1 -1
- package/dist-types/submodules/cbor/CborCodec.d.ts +5 -10
- package/dist-types/submodules/protocols/HttpProtocol.d.ts +5 -2
- package/dist-types/submodules/protocols/SerdeContext.d.ts +8 -0
- package/dist-types/submodules/protocols/index.d.ts +1 -0
- package/dist-types/submodules/protocols/serde/FromStringShapeDeserializer.d.ts +3 -4
- package/dist-types/submodules/protocols/serde/HttpInterceptingShapeDeserializer.d.ts +5 -2
- package/dist-types/submodules/protocols/serde/HttpInterceptingShapeSerializer.d.ts +5 -2
- package/dist-types/submodules/protocols/serde/ToStringShapeSerializer.d.ts +3 -4
- package/dist-types/submodules/schema/TypeRegistry.d.ts +4 -4
- package/dist-types/submodules/schema/index.d.ts +1 -0
- package/dist-types/submodules/schema/schemas/NormalizedSchema.d.ts +26 -24
- package/dist-types/submodules/schema/schemas/sentinels.d.ts +2 -0
- package/dist-types/submodules/schema/schemas/translateTraits.d.ts +7 -0
- package/dist-types/submodules/serde/index.d.ts +1 -0
- package/dist-types/submodules/serde/schema-serde-lib/schema-date-utils.d.ts +47 -0
- package/dist-types/ts3.4/index.d.ts +1 -1
- package/dist-types/ts3.4/submodules/cbor/CborCodec.d.ts +5 -10
- package/dist-types/ts3.4/submodules/protocols/HttpProtocol.d.ts +5 -2
- package/dist-types/ts3.4/submodules/protocols/SerdeContext.d.ts +8 -0
- package/dist-types/ts3.4/submodules/protocols/index.d.ts +1 -0
- package/dist-types/ts3.4/submodules/protocols/serde/FromStringShapeDeserializer.d.ts +3 -4
- package/dist-types/ts3.4/submodules/protocols/serde/HttpInterceptingShapeDeserializer.d.ts +5 -2
- package/dist-types/ts3.4/submodules/protocols/serde/HttpInterceptingShapeSerializer.d.ts +5 -2
- package/dist-types/ts3.4/submodules/protocols/serde/ToStringShapeSerializer.d.ts +3 -4
- package/dist-types/ts3.4/submodules/schema/TypeRegistry.d.ts +4 -4
- package/dist-types/ts3.4/submodules/schema/index.d.ts +1 -0
- package/dist-types/ts3.4/submodules/schema/schemas/NormalizedSchema.d.ts +26 -24
- package/dist-types/ts3.4/submodules/schema/schemas/sentinels.d.ts +2 -0
- package/dist-types/ts3.4/submodules/schema/schemas/translateTraits.d.ts +7 -0
- package/dist-types/ts3.4/submodules/serde/index.d.ts +1 -0
- package/dist-types/ts3.4/submodules/serde/schema-serde-lib/schema-date-utils.d.ts +47 -0
- package/package.json +8 -8
- /package/dist-es/{protocols → request-builder}/requestBuilder.js +0 -0
- /package/dist-types/{protocols → request-builder}/requestBuilder.d.ts +0 -0
- /package/dist-types/ts3.4/{protocols → request-builder}/requestBuilder.d.ts +0 -0
|
@@ -780,8 +780,7 @@ const buildHttpRpcRequest = async (context, headers, path, resolvedHostname, bod
|
|
|
780
780
|
return new protocolHttp.HttpRequest(contents);
|
|
781
781
|
};
|
|
782
782
|
|
|
783
|
-
class CborCodec {
|
|
784
|
-
serdeContext;
|
|
783
|
+
class CborCodec extends protocols.SerdeContext {
|
|
785
784
|
createSerializer() {
|
|
786
785
|
const serializer = new CborShapeSerializer();
|
|
787
786
|
serializer.setSerdeContext(this.serdeContext);
|
|
@@ -792,16 +791,9 @@ class CborCodec {
|
|
|
792
791
|
deserializer.setSerdeContext(this.serdeContext);
|
|
793
792
|
return deserializer;
|
|
794
793
|
}
|
|
795
|
-
setSerdeContext(serdeContext) {
|
|
796
|
-
this.serdeContext = serdeContext;
|
|
797
|
-
}
|
|
798
794
|
}
|
|
799
|
-
class CborShapeSerializer {
|
|
800
|
-
serdeContext;
|
|
795
|
+
class CborShapeSerializer extends protocols.SerdeContext {
|
|
801
796
|
value;
|
|
802
|
-
setSerdeContext(serdeContext) {
|
|
803
|
-
this.serdeContext = serdeContext;
|
|
804
|
-
}
|
|
805
797
|
write(schema, value) {
|
|
806
798
|
this.value = this.serialize(schema, value);
|
|
807
799
|
}
|
|
@@ -875,11 +867,7 @@ class CborShapeSerializer {
|
|
|
875
867
|
return buffer;
|
|
876
868
|
}
|
|
877
869
|
}
|
|
878
|
-
class CborShapeDeserializer {
|
|
879
|
-
serdeContext;
|
|
880
|
-
setSerdeContext(serdeContext) {
|
|
881
|
-
this.serdeContext = serdeContext;
|
|
882
|
-
}
|
|
870
|
+
class CborShapeDeserializer extends protocols.SerdeContext {
|
|
883
871
|
read(schema, bytes) {
|
|
884
872
|
const data = cbor.deserialize(bytes);
|
|
885
873
|
return this.readValue(schema, data);
|
|
@@ -887,7 +875,7 @@ class CborShapeDeserializer {
|
|
|
887
875
|
readValue(_schema, value) {
|
|
888
876
|
const ns = schema.NormalizedSchema.of(_schema);
|
|
889
877
|
if (ns.isTimestampSchema() && typeof value === "number") {
|
|
890
|
-
return serde.
|
|
878
|
+
return serde._parseEpochTimestamp(value);
|
|
891
879
|
}
|
|
892
880
|
if (ns.isBlobSchema()) {
|
|
893
881
|
if (typeof value === "string") {
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var schema = require('@smithy/core/schema');
|
|
4
3
|
var utilUtf8 = require('@smithy/util-utf8');
|
|
5
4
|
|
|
6
5
|
class EventStreamSerde {
|
|
@@ -131,12 +130,15 @@ class EventStreamSerde {
|
|
|
131
130
|
let eventType = unionMember;
|
|
132
131
|
let explicitPayloadMember = null;
|
|
133
132
|
let explicitPayloadContentType;
|
|
134
|
-
const isKnownSchema =
|
|
133
|
+
const isKnownSchema = (() => {
|
|
134
|
+
const struct = unionSchema.getSchema();
|
|
135
|
+
return struct.memberNames.includes(unionMember);
|
|
136
|
+
})();
|
|
135
137
|
const additionalHeaders = {};
|
|
136
138
|
if (!isKnownSchema) {
|
|
137
139
|
const [type, value] = event[unionMember];
|
|
138
140
|
eventType = type;
|
|
139
|
-
serializer.write(
|
|
141
|
+
serializer.write(15, value);
|
|
140
142
|
}
|
|
141
143
|
else {
|
|
142
144
|
const eventSchema = unionSchema.getMemberSchema(unionMember);
|
|
@@ -24,10 +24,17 @@ function extendedEncodeURIComponent(str) {
|
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
class
|
|
28
|
-
options;
|
|
27
|
+
class SerdeContext {
|
|
29
28
|
serdeContext;
|
|
29
|
+
setSerdeContext(serdeContext) {
|
|
30
|
+
this.serdeContext = serdeContext;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
class HttpProtocol extends SerdeContext {
|
|
35
|
+
options;
|
|
30
36
|
constructor(options) {
|
|
37
|
+
super();
|
|
31
38
|
this.options = options;
|
|
32
39
|
}
|
|
33
40
|
getRequestType() {
|
|
@@ -53,10 +60,10 @@ class HttpProtocol {
|
|
|
53
60
|
request.fragment = endpoint.url.hash || void 0;
|
|
54
61
|
request.username = endpoint.url.username || void 0;
|
|
55
62
|
request.password = endpoint.url.password || void 0;
|
|
63
|
+
if (!request.query) {
|
|
64
|
+
request.query = {};
|
|
65
|
+
}
|
|
56
66
|
for (const [k, v] of endpoint.url.searchParams.entries()) {
|
|
57
|
-
if (!request.query) {
|
|
58
|
-
request.query = {};
|
|
59
|
-
}
|
|
60
67
|
request.query[k] = v;
|
|
61
68
|
}
|
|
62
69
|
return request;
|
|
@@ -165,7 +172,7 @@ class HttpBindingProtocol extends HttpProtocol {
|
|
|
165
172
|
if (endpoint) {
|
|
166
173
|
this.updateServiceEndpoint(request, endpoint);
|
|
167
174
|
this.setHostPrefix(request, operationSchema, input);
|
|
168
|
-
const opTraits = schema.
|
|
175
|
+
const opTraits = schema.translateTraits(operationSchema.traits);
|
|
169
176
|
if (opTraits.http) {
|
|
170
177
|
request.method = opTraits.http[0];
|
|
171
178
|
const [path, search] = opTraits.http[1].split("?");
|
|
@@ -289,7 +296,7 @@ class HttpBindingProtocol extends HttpProtocol {
|
|
|
289
296
|
if (response.statusCode >= 300) {
|
|
290
297
|
const bytes = await collectBody(response.body, context);
|
|
291
298
|
if (bytes.byteLength > 0) {
|
|
292
|
-
Object.assign(dataObject, await deserializer.read(
|
|
299
|
+
Object.assign(dataObject, await deserializer.read(15, bytes));
|
|
293
300
|
}
|
|
294
301
|
await this.handleError(operationSchema, context, response, dataObject, this.deserializeMetadata(response));
|
|
295
302
|
throw new Error("@smithy/core/protocols - HTTP Protocol error handler failed to throw.");
|
|
@@ -355,7 +362,7 @@ class HttpBindingProtocol extends HttpProtocol {
|
|
|
355
362
|
headerListValueSchema.getMergedTraits().httpHeader = key;
|
|
356
363
|
let sections;
|
|
357
364
|
if (headerListValueSchema.isTimestampSchema() &&
|
|
358
|
-
headerListValueSchema.getSchema() ===
|
|
365
|
+
headerListValueSchema.getSchema() === 4) {
|
|
359
366
|
sections = serde.splitEvery(value, ",", 2);
|
|
360
367
|
}
|
|
361
368
|
else {
|
|
@@ -455,7 +462,7 @@ class RpcProtocol extends HttpProtocol {
|
|
|
455
462
|
if (response.statusCode >= 300) {
|
|
456
463
|
const bytes = await collectBody(response.body, context);
|
|
457
464
|
if (bytes.byteLength > 0) {
|
|
458
|
-
Object.assign(dataObject, await deserializer.read(
|
|
465
|
+
Object.assign(dataObject, await deserializer.read(15, bytes));
|
|
459
466
|
}
|
|
460
467
|
await this.handleError(operationSchema, context, response, dataObject, this.deserializeMetadata(response));
|
|
461
468
|
throw new Error("@smithy/core/protocols - RPC Protocol error handler failed to throw.");
|
|
@@ -574,32 +581,29 @@ class RequestBuilder {
|
|
|
574
581
|
function determineTimestampFormat(ns, settings) {
|
|
575
582
|
if (settings.timestampFormat.useTrait) {
|
|
576
583
|
if (ns.isTimestampSchema() &&
|
|
577
|
-
(ns.getSchema() ===
|
|
578
|
-
ns.getSchema() ===
|
|
579
|
-
ns.getSchema() ===
|
|
584
|
+
(ns.getSchema() === 5 ||
|
|
585
|
+
ns.getSchema() === 6 ||
|
|
586
|
+
ns.getSchema() === 7)) {
|
|
580
587
|
return ns.getSchema();
|
|
581
588
|
}
|
|
582
589
|
}
|
|
583
590
|
const { httpLabel, httpPrefixHeaders, httpHeader, httpQuery } = ns.getMergedTraits();
|
|
584
591
|
const bindingFormat = settings.httpBindings
|
|
585
592
|
? typeof httpPrefixHeaders === "string" || Boolean(httpHeader)
|
|
586
|
-
?
|
|
593
|
+
? 6
|
|
587
594
|
: Boolean(httpQuery) || Boolean(httpLabel)
|
|
588
|
-
?
|
|
595
|
+
? 5
|
|
589
596
|
: undefined
|
|
590
597
|
: undefined;
|
|
591
598
|
return bindingFormat ?? settings.timestampFormat.default;
|
|
592
599
|
}
|
|
593
600
|
|
|
594
|
-
class FromStringShapeDeserializer {
|
|
601
|
+
class FromStringShapeDeserializer extends SerdeContext {
|
|
595
602
|
settings;
|
|
596
|
-
serdeContext;
|
|
597
603
|
constructor(settings) {
|
|
604
|
+
super();
|
|
598
605
|
this.settings = settings;
|
|
599
606
|
}
|
|
600
|
-
setSerdeContext(serdeContext) {
|
|
601
|
-
this.serdeContext = serdeContext;
|
|
602
|
-
}
|
|
603
607
|
read(_schema, data) {
|
|
604
608
|
const ns = schema.NormalizedSchema.of(_schema);
|
|
605
609
|
if (ns.isListSchema()) {
|
|
@@ -611,12 +615,12 @@ class FromStringShapeDeserializer {
|
|
|
611
615
|
if (ns.isTimestampSchema()) {
|
|
612
616
|
const format = determineTimestampFormat(ns, this.settings);
|
|
613
617
|
switch (format) {
|
|
614
|
-
case
|
|
615
|
-
return serde.
|
|
616
|
-
case
|
|
617
|
-
return serde.
|
|
618
|
-
case
|
|
619
|
-
return serde.
|
|
618
|
+
case 5:
|
|
619
|
+
return serde._parseRfc3339DateTimeWithOffset(data);
|
|
620
|
+
case 6:
|
|
621
|
+
return serde._parseRfc7231DateTime(data);
|
|
622
|
+
case 7:
|
|
623
|
+
return serde._parseEpochTimestamp(data);
|
|
620
624
|
default:
|
|
621
625
|
console.warn("Missing timestamp format, parsing value with Date constructor:", data);
|
|
622
626
|
return new Date(data);
|
|
@@ -636,15 +640,17 @@ class FromStringShapeDeserializer {
|
|
|
636
640
|
return intermediateValue;
|
|
637
641
|
}
|
|
638
642
|
}
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
643
|
+
if (ns.isNumericSchema()) {
|
|
644
|
+
return Number(data);
|
|
645
|
+
}
|
|
646
|
+
if (ns.isBigIntegerSchema()) {
|
|
647
|
+
return BigInt(data);
|
|
648
|
+
}
|
|
649
|
+
if (ns.isBigDecimalSchema()) {
|
|
650
|
+
return new serde.NumericValue(data, "bigDecimal");
|
|
651
|
+
}
|
|
652
|
+
if (ns.isBooleanSchema()) {
|
|
653
|
+
return String(data).toLowerCase() === "true";
|
|
648
654
|
}
|
|
649
655
|
return data;
|
|
650
656
|
}
|
|
@@ -653,11 +659,11 @@ class FromStringShapeDeserializer {
|
|
|
653
659
|
}
|
|
654
660
|
}
|
|
655
661
|
|
|
656
|
-
class HttpInterceptingShapeDeserializer {
|
|
662
|
+
class HttpInterceptingShapeDeserializer extends SerdeContext {
|
|
657
663
|
codecDeserializer;
|
|
658
664
|
stringDeserializer;
|
|
659
|
-
serdeContext;
|
|
660
665
|
constructor(codecDeserializer, codecSettings) {
|
|
666
|
+
super();
|
|
661
667
|
this.codecDeserializer = codecDeserializer;
|
|
662
668
|
this.stringDeserializer = new FromStringShapeDeserializer(codecSettings);
|
|
663
669
|
}
|
|
@@ -692,16 +698,13 @@ class HttpInterceptingShapeDeserializer {
|
|
|
692
698
|
}
|
|
693
699
|
}
|
|
694
700
|
|
|
695
|
-
class ToStringShapeSerializer {
|
|
701
|
+
class ToStringShapeSerializer extends SerdeContext {
|
|
696
702
|
settings;
|
|
697
703
|
stringBuffer = "";
|
|
698
|
-
serdeContext = undefined;
|
|
699
704
|
constructor(settings) {
|
|
705
|
+
super();
|
|
700
706
|
this.settings = settings;
|
|
701
707
|
}
|
|
702
|
-
setSerdeContext(serdeContext) {
|
|
703
|
-
this.serdeContext = serdeContext;
|
|
704
|
-
}
|
|
705
708
|
write(schema$1, value) {
|
|
706
709
|
const ns = schema.NormalizedSchema.of(schema$1);
|
|
707
710
|
switch (typeof value) {
|
|
@@ -716,13 +719,13 @@ class ToStringShapeSerializer {
|
|
|
716
719
|
}
|
|
717
720
|
const format = determineTimestampFormat(ns, this.settings);
|
|
718
721
|
switch (format) {
|
|
719
|
-
case
|
|
722
|
+
case 5:
|
|
720
723
|
this.stringBuffer = value.toISOString().replace(".000Z", "Z");
|
|
721
724
|
break;
|
|
722
|
-
case
|
|
725
|
+
case 6:
|
|
723
726
|
this.stringBuffer = serde.dateToUtcString(value);
|
|
724
727
|
break;
|
|
725
|
-
case
|
|
728
|
+
case 7:
|
|
726
729
|
this.stringBuffer = String(value.getTime() / 1000);
|
|
727
730
|
break;
|
|
728
731
|
default:
|
|
@@ -816,6 +819,7 @@ exports.HttpInterceptingShapeSerializer = HttpInterceptingShapeSerializer;
|
|
|
816
819
|
exports.HttpProtocol = HttpProtocol;
|
|
817
820
|
exports.RequestBuilder = RequestBuilder;
|
|
818
821
|
exports.RpcProtocol = RpcProtocol;
|
|
822
|
+
exports.SerdeContext = SerdeContext;
|
|
819
823
|
exports.ToStringShapeSerializer = ToStringShapeSerializer;
|
|
820
824
|
exports.collectBody = collectBody;
|
|
821
825
|
exports.determineTimestampFormat = determineTimestampFormat;
|