chore(core/protocols): inline schema number values (#7412)

* chore(core/protocols): inline schema number values

* test: update types in unit tests

Author: kuhe

packages/core/src/submodules/account-id-endpoint/AccountIdEndpointModeConfigResolver.ts

@@ -1,4 +1,4 @@
-import { Provider } from "@smithy/types";
+import type { Provider } from "@smithy/types";
 import { normalizeProvider } from "@smithy/util-middleware";
 
 import {

packages/core/src/submodules/httpAuthSchemes/aws_sdk/AwsSdkSigV4ASigner.ts

@@ -1,5 +1,5 @@
 import { HttpRequest } from "@smithy/protocol-http";
-import { AwsCredentialIdentity, HttpRequest as IHttpRequest } from "@smithy/types";
+import type { AwsCredentialIdentity, HttpRequest as IHttpRequest } from "@smithy/types";
 
 import { getSkewCorrectedDate } from "../utils";
 import { AwsSdkSigV4Signer, validateSigningProperties } from "./AwsSdkSigV4Signer";

packages/core/src/submodules/httpAuthSchemes/aws_sdk/AwsSdkSigV4Signer.ts

@@ -1,6 +1,6 @@
 import { HttpRequest } from "@smithy/protocol-http";
 import { ServiceException } from "@smithy/smithy-client";
-import {
+import type {
   AuthScheme,
   AwsCredentialIdentity,
   HandlerExecutionContext,

packages/core/src/submodules/httpAuthSchemes/aws_sdk/resolveAwsSdkSigV4AConfig.ts

@@ -1,7 +1,7 @@
 import { normalizeProvider } from "@smithy/core";
 import { LoadedConfigSelectors } from "@smithy/node-config-provider";
 import { ProviderError } from "@smithy/property-provider";
-import { Profile, Provider } from "@smithy/types";
+import type { Profile, Provider } from "@smithy/types";
 
 /**
  * @public

packages/core/src/submodules/httpAuthSchemes/aws_sdk/resolveAwsSdkSigV4Config.spec.ts

@@ -1,4 +1,4 @@
-import { AwsCredentialIdentityProvider, IdentityProvider } from "@smithy/types";
+import type { AwsCredentialIdentityProvider } from "@smithy/types";
 import { describe, expect, test as it, vi } from "vitest";
 
 import { resolveAwsSdkSigV4Config } from "./resolveAwsSdkSigV4Config";

packages/core/src/submodules/httpAuthSchemes/aws_sdk/resolveAwsSdkSigV4Config.ts

@@ -7,7 +7,7 @@ import {
   normalizeProvider,
 } from "@smithy/core";
 import { SignatureV4, SignatureV4CryptoInit, SignatureV4Init } from "@smithy/signature-v4";
-import {
+import type {
   AuthScheme,
   AwsCredentialIdentity,
   AwsCredentialIdentityProvider,

packages/core/src/submodules/protocols/ConfigurableSerdeContext.ts

@@ -1,4 +1,4 @@
-import { ConfigurableSerdeContext, SerdeFunctions } from "@smithy/types";
+import type { ConfigurableSerdeContext, SerdeFunctions } from "@smithy/types";
 
 /**
  * @internal

packages/core/src/submodules/protocols/cbor/AwsSmithyRpcV2CborProtocol.spec.ts

@@ -1,7 +1,8 @@
 import { cbor } from "@smithy/core/cbor";
-import { op, SCHEMA } from "@smithy/core/schema";
+import { op } from "@smithy/core/schema";
 import { error as registerError } from "@smithy/core/schema";
 import { HttpResponse } from "@smithy/protocol-http";
+import type { NumericSchema, StringSchema } from "@smithy/types";
 import { describe, expect, test as it } from "vitest";
 
 import { AwsSmithyRpcV2CborProtocol } from "./AwsSmithyRpcV2CborProtocol";
@@ -20,7 +21,7 @@ describe(AwsSmithyRpcV2CborProtocol.name, () => {
       "MyQueryError",
       { error: "client" },
       ["Message", "Prop2"],
-      [SCHEMA.STRING, SCHEMA.NUMERIC],
+      [0 satisfies StringSchema, 1 satisfies NumericSchema],
       MyQueryError
     );
 

packages/core/src/submodules/protocols/json/AwsJson1_0Protocol.spec.ts

@@ -1,4 +1,12 @@
-import { map, op, SCHEMA, sim, struct } from "@smithy/core/schema";
+import { map, op, sim, struct } from "@smithy/core/schema";
+import type {
+  BlobSchema,
+  BooleanSchema,
+  DocumentSchema,
+  NumericSchema,
+  StringSchema,
+  TimestampDefaultSchema,
+} from "@smithy/types";
 import { toBase64 } from "@smithy/util-base64";
 import { toUtf8 } from "@smithy/util-utf8";
 import { describe, expect, test as it } from "vitest";
@@ -19,7 +27,13 @@ describe(AwsJson1_0Protocol.name, () => {
     "MyStruct",
     0,
     [...Object.keys(json)],
-    [SCHEMA.STRING, SCHEMA.NUMERIC, SCHEMA.BOOLEAN, SCHEMA.BLOB, SCHEMA.TIMESTAMP_DEFAULT]
+    [
+      0 satisfies StringSchema,
+      1 satisfies NumericSchema,
+      2 satisfies BooleanSchema,
+      21 satisfies BlobSchema,
+      4 satisfies TimestampDefaultSchema,
+    ]
   );
   const serdeContext = {
     base64Encoder: toBase64,
@@ -85,18 +99,18 @@ describe(AwsJson1_0Protocol.name, () => {
         {},
         ["header", "query", "headerMap", "payload"],
         [
-          sim("ns", "MyHeader", SCHEMA.STRING, { httpHeader: "header", jsonName: "MyHeader" }),
-          sim("ns", "MyQuery", SCHEMA.STRING, { httpQuery: "query" }),
+          sim("ns", "MyHeader", 0 satisfies StringSchema, { httpHeader: "header", jsonName: "MyHeader" }),
+          sim("ns", "MyQuery", 0 satisfies StringSchema, { httpQuery: "query" }),
           map(
             "ns",
             "HeaderMap",
             {
               httpPrefixHeaders: "",
             },
-            SCHEMA.STRING,
-            SCHEMA.NUMERIC
+            0 satisfies StringSchema,
+            1 satisfies NumericSchema
           ),
-          sim("ns", "MyPayload", SCHEMA.DOCUMENT, { httpPayload: 1 }),
+          sim("ns", "MyPayload", 15 satisfies DocumentSchema, { httpPayload: 1 }),
         ]
       );
       const operationSchema = op("ns", "MyOperation", {}, schema, "unit");

packages/core/src/submodules/protocols/json/AwsJsonRpcProtocol.spec.ts

@@ -1,5 +1,6 @@
-import { error as registerError, op, SCHEMA } from "@smithy/core/schema";
+import { error as registerError, op } from "@smithy/core/schema";
 import { HttpResponse } from "@smithy/protocol-http";
+import type { NumericSchema, StringSchema, TimestampEpochSecondsSchema } from "@smithy/types";
 import { fromUtf8 } from "@smithy/util-utf8";
 import { describe, expect, test as it } from "vitest";
 
@@ -25,7 +26,7 @@ describe(AwsJsonRpcProtocol.name, () => {
     expect(codec.settings).toEqual({
       jsonName: false,
       timestampFormat: {
-        default: SCHEMA.TIMESTAMP_EPOCH_SECONDS,
+        default: 7 satisfies TimestampEpochSecondsSchema,
         useTrait: true,
       },
     });
@@ -39,7 +40,7 @@ describe(AwsJsonRpcProtocol.name, () => {
       "MyQueryError",
       { error: "client" },
       ["Message", "Prop2"],
-      [SCHEMA.STRING, SCHEMA.NUMERIC],
+      [0 satisfies StringSchema, 1 satisfies NumericSchema],
       MyQueryError
     );