Skip to content

Commit 8c117e3

Browse files
kuhekuhe
authored
chore(core/protocols): organize json codec folders (#8230)
1 parent 1b94f0b commit 8c117e3

16 files changed

Lines changed: 716 additions & 39 deletions

‎packages-internal/core/scripts/benchmark-json-serializer.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import type {
2828
StaticListSchema,
2929
} from "@smithy/types";
3030

31-
import { ByteJsonShapeSerializer } from "../src/submodules/protocols/json/experimental/ByteJsonShapeSerializer";
32-
import { BufferJsonShapeDeserializer } from "../src/submodules/protocols/json/experimental/BufferJsonShapeDeserializer";
33-
import { JsonShapeDeserializer } from "../src/submodules/protocols/json/JsonShapeDeserializer";
34-
import { JsonShapeSerializer } from "../src/submodules/protocols/json/JsonShapeSerializer";
31+
import { ByteJsonShapeSerializer } from "../src/submodules/protocols/json/codec-v2/ByteJsonShapeSerializer";
32+
import { BufferJsonShapeDeserializer } from "../src/submodules/protocols/json/codec-v2/BufferJsonShapeDeserializer";
33+
import { JsonShapeDeserializer } from "../src/submodules/protocols/json/codec-v1/JsonShapeDeserializer";
34+
import { JsonShapeSerializer } from "../src/submodules/protocols/json/codec-v1/JsonShapeSerializer";
3535
import { AttributeValue$ } from "../../../clients/client-dynamodb/src/schemas/schemas_0";
3636
import { DynamoDBJsonCodec } from "../../../packages-internal/dynamodb-codec/src/index";
3737

‎packages-internal/core/src/submodules/protocols/idempotencyToken.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { CborShapeSerializer } from "@smithy/core/cbor";
22
import type { StaticSimpleSchema, StaticStructureSchema } from "@smithy/types";
33
import { describe, expect, test as it } from "vitest";
44

5-
import { JsonShapeSerializer } from "./json/JsonShapeSerializer";
5+
import { JsonShapeSerializer } from "./json/codec-v1/JsonShapeSerializer";
66
import { QueryShapeSerializer } from "./query/QueryShapeSerializer";
77
import { XmlShapeSerializer } from "./xml/XmlShapeSerializer";
88

‎packages-internal/core/src/submodules/protocols/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ export { AwsJsonRpcProtocol } from "./json/AwsJsonRpcProtocol";
66
export { AwsRestJsonProtocol } from "./json/AwsRestJsonProtocol";
77
export { JsonCodec } from "./json/JsonCodec";
88
export type { JsonSettings } from "./json/JsonCodec";
9-
export { JsonShapeDeserializer } from "./json/JsonShapeDeserializer";
10-
export { JsonShapeSerializer } from "./json/JsonShapeSerializer";
9+
export { JsonShapeDeserializer } from "./json/codec-v1/JsonShapeDeserializer";
10+
export { JsonShapeSerializer } from "./json/codec-v1/JsonShapeSerializer";
1111
export { awsExpectUnion } from "./json/awsExpectUnion";
1212
export { parseJsonBody, parseJsonErrorBody, loadRestJsonErrorCode, loadJsonRpcErrorCode } from "./json/parseJsonBody";
1313
export { AwsEc2QueryProtocol } from "./query/AwsEc2QueryProtocol";

‎packages-internal/core/src/submodules/protocols/json/JsonCodec.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { describe, expect, test as it, vi } from "vitest";
22

33
import { JsonCodec } from "./JsonCodec";
4-
import { JsonShapeDeserializer } from "./JsonShapeDeserializer";
5-
import { JsonShapeSerializer } from "./JsonShapeSerializer";
4+
import { JsonShapeDeserializer } from "./codec-v1/JsonShapeDeserializer";
5+
import { JsonShapeSerializer } from "./codec-v1/JsonShapeSerializer";
66

77
describe(JsonCodec.name, () => {
88
it("provides a serializer", () => {

‎packages-internal/core/src/submodules/protocols/json/JsonCodec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { Codec, CodecSettings } from "@smithy/types";
22

33
import { SerdeContextConfig } from "../ConfigurableSerdeContext";
4-
import { JsonShapeDeserializer } from "./JsonShapeDeserializer";
5-
import { JsonShapeSerializer } from "./JsonShapeSerializer";
4+
import { JsonShapeDeserializer } from "./codec-v1/JsonShapeDeserializer";
5+
import { JsonShapeSerializer } from "./codec-v1/JsonShapeSerializer";
66

77
/**
88
* @public

packages-internal/core/src/submodules/protocols/json/JsonShapeDeserializer.spec.ts renamed to packages-internal/core/src/submodules/protocols/json/codec-v1/JsonShapeDeserializer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { NumericValue } from "@smithy/core/serde";
22
import type { TimestampEpochSecondsSchema } from "@smithy/types";
33
import { describe, expect, test as it } from "vitest";
44

5-
import { createNestingWidget, nestingWidget, unionStruct, unionStructControl, widget } from "../test-schema.spec";
5+
import { createNestingWidget, nestingWidget, unionStruct, unionStructControl, widget } from "../../test-schema.spec";
66
import { JsonShapeDeserializer } from "./JsonShapeDeserializer";
77
import { JsonShapeSerializer } from "./JsonShapeSerializer";
88

packages-internal/core/src/submodules/protocols/json/JsonShapeDeserializer.ts renamed to packages-internal/core/src/submodules/protocols/json/codec-v1/JsonShapeDeserializer.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import type {
1717
TimestampHttpDateSchema,
1818
} from "@smithy/types";
1919

20-
import { SerdeContextConfig } from "../ConfigurableSerdeContext";
21-
import { UnionSerde } from "../UnionSerde";
22-
import type { JsonSettings } from "./JsonCodec";
23-
import { jsonReviver } from "./jsonReviver";
24-
import { needsReviver } from "./needsReviver";
25-
import { parseJsonBody } from "./parseJsonBody";
26-
import { writeKey } from "../writeKey";
20+
import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
21+
import { UnionSerde } from "../../UnionSerde";
22+
import type { JsonSettings } from "../JsonCodec";
23+
import { jsonReviver } from "../jsonReviver";
24+
import { needsReviver } from "../needsReviver";
25+
import { parseJsonBody } from "../parseJsonBody";
26+
import { writeKey } from "../../writeKey";
2727

2828
/**
2929
* @public

packages-internal/core/src/submodules/protocols/json/JsonShapeSerializer.spec.ts renamed to packages-internal/core/src/submodules/protocols/json/codec-v1/JsonShapeSerializer.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { NumericValue } from "@smithy/core/serde";
22
import type { StaticSimpleSchema, StaticStructureSchema, TimestampEpochSecondsSchema } from "@smithy/types";
33
import { describe, expect, test as it } from "vitest";
44

5-
import { createNestingWidget, nestingWidget, unionStruct, widget } from "../test-schema.spec";
6-
import { ByteJsonShapeSerializer } from "./experimental/ByteJsonShapeSerializer";
5+
import { createNestingWidget, nestingWidget, unionStruct, widget } from "../../test-schema.spec";
6+
import { ByteJsonShapeSerializer } from "../codec-v2/ByteJsonShapeSerializer";
77
import { JsonShapeSerializer } from "./JsonShapeSerializer";
88

99
const decoder = new TextDecoder();

packages-internal/core/src/submodules/protocols/json/JsonShapeSerializer.ts renamed to packages-internal/core/src/submodules/protocols/json/codec-v1/JsonShapeSerializer.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import type {
1010
TimestampHttpDateSchema,
1111
} from "@smithy/types";
1212

13-
import { SerdeContextConfig } from "../ConfigurableSerdeContext";
14-
import type { JsonSettings } from "./JsonCodec";
15-
import { JsonReplacer } from "./jsonReplacer";
16-
import { writeKey } from "../writeKey";
13+
import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
14+
import type { JsonSettings } from "../JsonCodec";
15+
import { JsonReplacer } from "../jsonReplacer";
16+
import { writeKey } from "../../writeKey";
1717

1818
/**
1919
* @public

packages-internal/core/src/submodules/protocols/json/experimental/BufferJsonShapeDeserializer.spec.ts renamed to packages-internal/core/src/submodules/protocols/json/codec-v2/BufferJsonShapeDeserializer.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import type { TimestampEpochSecondsSchema } from "@smithy/types";
33
import { describe, expect, test as it } from "vitest";
44

55
import { createNestingWidget, nestingWidget, unionStruct, unionStructControl, widget } from "../../test-schema.spec";
6-
import { JsonShapeDeserializer } from "../JsonShapeDeserializer";
7-
import { JsonShapeSerializer } from "../JsonShapeSerializer";
6+
import { JsonShapeDeserializer } from "../codec-v1/JsonShapeDeserializer";
7+
import { JsonShapeSerializer } from "../codec-v1/JsonShapeSerializer";
88
import { BufferJsonShapeDeserializer } from "./BufferJsonShapeDeserializer";
99

1010
describe(BufferJsonShapeDeserializer.name, () => {
@@ -106,7 +106,7 @@ describe(BufferJsonShapeDeserializer.name, () => {
106106
await deserializer.read(
107107
widget,
108108
`{
109-
"bigint": "1000000000000000000000000000000000000"
109+
"bigint": "1000000000000000000000000000000000000"
110110
}`
111111
)
112112
).toEqual({
@@ -132,7 +132,7 @@ describe(BufferJsonShapeDeserializer.name, () => {
132132
await deserializer.read(
133133
widget,
134134
`{
135-
"bigdecimal": "0.0000000000000000000000000000000000001"
135+
"bigdecimal": "0.0000000000000000000000000000000000001"
136136
}`
137137
)
138138
).toEqual({
@@ -143,7 +143,7 @@ describe(BufferJsonShapeDeserializer.name, () => {
143143
await deserializer.read(
144144
widget,
145145
`{
146-
"bigdecimal": 0.0001
146+
"bigdecimal": 0.0001
147147
}`
148148
)
149149
).toEqual({

0 commit comments

Comments
 (0)