chore: static schema compat

kuhe · kuhe · commit b3abba4331da · 2025-10-13T20:23:26.000-04:00
diff --git a/packages/core/src/submodules/protocols/ProtocolLib.ts b/packages/core/src/submodules/protocols/ProtocolLib.ts
@@ -1,5 +1,5 @@
 import { ErrorSchema, NormalizedSchema, TypeRegistry } from "@smithy/core/schema";
-import type { HttpResponse as IHttpResponse, MetadataBearer, ResponseMetadata } from "@smithy/types";
+import type { HttpResponse as IHttpResponse, MetadataBearer, ResponseMetadata, StaticErrorSchema } from "@smithy/types";
 
 /**
  * @internal
@@ -64,8 +64,8 @@ export class ProtocolLib {
     response: IHttpResponse,
     dataObject: any,
     metadata: ResponseMetadata,
-    getErrorSchema?: (registry: TypeRegistry, errorName: string) => ErrorSchema
-  ): Promise<{ errorSchema: ErrorSchema; errorMetadata: ErrorMetadataBearer }> {
+    getErrorSchema?: (registry: TypeRegistry, errorName: string) => StaticErrorSchema
+  ): Promise<{ errorSchema: StaticErrorSchema; errorMetadata: ErrorMetadataBearer }> {
     let namespace = defaultNamespace;
     let errorName = errorIdentifier;
     if (errorIdentifier.includes("#")) {
@@ -81,7 +81,8 @@ export class ProtocolLib {
     const registry = TypeRegistry.for(namespace);
 
     try {
-      const errorSchema = getErrorSchema?.(registry, errorName) ?? (registry.getSchema(errorIdentifier) as ErrorSchema);
+      const errorSchema =
+        getErrorSchema?.(registry, errorName) ?? (registry.getSchema(errorIdentifier) as StaticErrorSchema);
       return { errorSchema, errorMetadata };
     } catch (e) {
       dataObject.message = dataObject.message ?? dataObject.Message ?? "UnknownError";
diff --git a/packages/core/src/submodules/protocols/cbor/AwsSmithyRpcV2CborProtocol.ts b/packages/core/src/submodules/protocols/cbor/AwsSmithyRpcV2CborProtocol.ts
@@ -72,7 +72,7 @@ export class AwsSmithyRpcV2CborProtocol extends SmithyRpcV2CborProtocol {
 
     const ns = NormalizedSchema.of(errorSchema);
     const message = dataObject.message ?? dataObject.Message ?? "Unknown";
-    const ErrorCtor = TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+    const ErrorCtor = TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
     const exception = new ErrorCtor(message);
 
     const output = {} as any;
diff --git a/packages/core/src/submodules/protocols/json/AwsJsonRpcProtocol.ts b/packages/core/src/submodules/protocols/json/AwsJsonRpcProtocol.ts
@@ -107,7 +107,7 @@ export abstract class AwsJsonRpcProtocol extends RpcProtocol {
 
     const ns = NormalizedSchema.of(errorSchema);
     const message = dataObject.message ?? dataObject.Message ?? "Unknown";
-    const ErrorCtor = TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+    const ErrorCtor = TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
     const exception = new ErrorCtor(message);
 
     const output = {} as any;
diff --git a/packages/core/src/submodules/protocols/json/AwsRestJsonProtocol.ts b/packages/core/src/submodules/protocols/json/AwsRestJsonProtocol.ts
@@ -103,7 +103,7 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {
 
     const ns = NormalizedSchema.of(errorSchema);
     const message = dataObject.message ?? dataObject.Message ?? "Unknown";
-    const ErrorCtor = TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+    const ErrorCtor = TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
     const exception = new ErrorCtor(message);
 
     await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
diff --git a/packages/core/src/submodules/protocols/query/AwsQueryProtocol.ts b/packages/core/src/submodules/protocols/query/AwsQueryProtocol.ts
@@ -11,6 +11,7 @@ import type {
   OperationSchema,
   ResponseMetadata,
   SerdeFunctions,
+  StaticErrorSchema,
   TimestampDateTimeSchema,
 } from "@smithy/types";
 
@@ -160,11 +161,11 @@ export class AwsQueryProtocol extends RpcProtocol {
       (registry: TypeRegistry, errorName: string) =>
         registry.find(
           (schema) => (NormalizedSchema.of(schema).getMergedTraits().awsQueryError as any)?.[0] === errorName
-        ) as ErrorSchema
+        ) as StaticErrorSchema
     );
 
     const ns = NormalizedSchema.of(errorSchema);
-    const ErrorCtor = TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+    const ErrorCtor = TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
     const exception = new ErrorCtor(message);
 
     const output = {
diff --git a/packages/core/src/submodules/protocols/xml/AwsRestXmlProtocol.ts b/packages/core/src/submodules/protocols/xml/AwsRestXmlProtocol.ts
@@ -108,7 +108,7 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {
     const ns = NormalizedSchema.of(errorSchema);
     const message =
       dataObject.Error?.message ?? dataObject.Error?.Message ?? dataObject.message ?? dataObject.Message ?? "Unknown";
-    const ErrorCtor = TypeRegistry.for(errorSchema.namespace).getErrorCtor(errorSchema) ?? Error;
+    const ErrorCtor = TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
     const exception = new ErrorCtor(message);
 
     await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
diff --git a/private/aws-protocoltests-ec2-schema/src/schemas/schemas_0.ts b/private/aws-protocoltests-ec2-schema/src/schemas/schemas_0.ts
@@ -178,7 +178,7 @@ export const n0 = "aws.protocoltests.ec2";
 export const n1 = "aws.protocoltests.shared";
 
 // smithy-typescript generated code
-import { error, TypeRegistry } from "@smithy/core/schema";
+import { TypeRegistry } from "@smithy/core/schema";
 import {
   StaticErrorSchema,
   StaticListSchema,
@@ -429,7 +429,7 @@ export var XmlListsOutput: StaticStructureSchema = [
     64 | 4,
     64 | 0,
     64 | 1,
-    [1, n1, _NSL, 0, 64 | 0] as StaticListSchema,
+    [1, n1, _NSL, 0, 64 | 0],
     [
       () => RenamedListMembers,
       {
@@ -513,7 +513,7 @@ export var XmlTimestampsOutput: StaticStructureSchema = [
 export var GreetingStruct: StaticStructureSchema = [3, n1, _GS, 0, [_hi], [0]];
 export var Unit = "unit" as const;
 
-export var EC2ProtocolServiceException = error(_s, "EC2ProtocolServiceException", 0, [], [], null);
+export var EC2ProtocolServiceException: StaticErrorSchema = [-3, _s, "EC2ProtocolServiceException", 0, [], []];
 TypeRegistry.for(_s).registerError(EC2ProtocolServiceException, __EC2ProtocolServiceException);
 
 export var ListWithMemberNamespace: StaticListSchema = [
diff --git a/private/aws-protocoltests-json-10-schema/src/schemas/schemas_0.ts b/private/aws-protocoltests-json-10-schema/src/schemas/schemas_0.ts
@@ -136,7 +136,7 @@ export const n0 = "aws.protocoltests.json10";
 export const n1 = "aws.protocoltests.shared";
 
 // smithy-typescript generated code
-import { error, TypeRegistry } from "@smithy/core/schema";
+import { TypeRegistry } from "@smithy/core/schema";
 import {
   StaticErrorSchema,
   StaticListSchema,
@@ -368,7 +368,7 @@ export var TopLevel: StaticStructureSchema = [
 export var GreetingStruct: StaticStructureSchema = [3, n1, _GS, 0, [_h], [0]];
 export var Unit = "unit" as const;
 
-export var JSONRPC10ServiceException = error(_sm, "JSONRPC10ServiceException", 0, [], [], null);
+export var JSONRPC10ServiceException: StaticErrorSchema = [-3, _sm, "JSONRPC10ServiceException", 0, [], []];
 TypeRegistry.for(_sm).registerError(JSONRPC10ServiceException, __JSONRPC10ServiceException);
 
 export var DialogList: StaticListSchema = [1, n0, _DL, 0, () => Dialog];
diff --git a/private/aws-protocoltests-json-schema-machinelearning/src/schemas/schemas_0.ts b/private/aws-protocoltests-json-schema-machinelearning/src/schemas/schemas_0.ts
@@ -24,7 +24,7 @@ export const _sm = "smithy.ts.sdk.synthetic.com.amazonaws.machinelearning";
 export const n0 = "com.amazonaws.machinelearning";
 
 // smithy-typescript generated code
-import { error, TypeRegistry } from "@smithy/core/schema";
+import { TypeRegistry } from "@smithy/core/schema";
 import { StaticErrorSchema, StaticMapSchema, StaticOperationSchema, StaticStructureSchema } from "@smithy/types";
 
 import {
@@ -108,7 +108,7 @@ TypeRegistry.for(n0).registerError(ResourceNotFoundException, __ResourceNotFound
 
 export var Unit = "unit" as const;
 
-export var MachineLearningServiceException = error(_sm, "MachineLearningServiceException", 0, [], [], null);
+export var MachineLearningServiceException: StaticErrorSchema = [-3, _sm, "MachineLearningServiceException", 0, [], []];
 TypeRegistry.for(_sm).registerError(MachineLearningServiceException, __MachineLearningServiceException);
 
 export var DetailsMap = 128 | 0;
diff --git a/private/aws-protocoltests-json-schema/src/schemas/schemas_0.ts b/private/aws-protocoltests-json-schema/src/schemas/schemas_0.ts
@@ -137,7 +137,7 @@ export const n0 = "aws.protocoltests.json";
 export const n1 = "aws.protocoltests.shared";
 
 // smithy-typescript generated code
-import { error, TypeRegistry } from "@smithy/core/schema";
+import { TypeRegistry } from "@smithy/core/schema";
 import {
   StaticErrorSchema,
   StaticListSchema,
@@ -162,10 +162,11 @@ export var JsonValue: StaticSimpleSchema = [
   0,
   n0,
   _JV,
-  0,
   {
     [_mT]: _a,
   },
+
+  0,
 ];
 export var ComplexError: StaticErrorSchema = [
   -3,
@@ -322,13 +323,13 @@ export var KitchenSink: StaticStructureSchema = [
     1,
     5,
     [() => JsonValue, 0],
-    [1, n0, _LOLOS, 0, 64 | 0] as StaticListSchema,
-    [1, n0, _LOMOS, 0, 128 | 0] as StaticListSchema,
+    [1, n0, _LOLOS, 0, 64 | 0],
+    [1, n0, _LOMOS, 0, 128 | 0],
     64 | 0,
     () => ListOfStructs,
     1,
-    [2, n0, _MOLOS, 0, 64 | 0, 64 | 0] as StaticMapSchema,
-    [2, n0, _MOMOS, 0, 0, 128 | 0, 128 | 0] as StaticMapSchema,
+    [2, n0, _MOLOS, 0, 0, 64 | 0],
+    [2, n0, _MOMOS, 0, 0, 128 | 0],
     128 | 0,
     () => MapOfStructs,
     [() => ListOfKitchenSinks, 0],
@@ -393,7 +394,7 @@ export var UnionInputOutput: StaticStructureSchema = [3, n0, _UIO, 0, [_co], [()
 export var GreetingStruct: StaticStructureSchema = [3, n1, _GS, 0, [_h], [0]];
 export var Unit = "unit" as const;
 
-export var JsonProtocolServiceException = error(_sm, "JsonProtocolServiceException", 0, [], [], null);
+export var JsonProtocolServiceException: StaticErrorSchema = [-3, _sm, "JsonProtocolServiceException", 0, [], []];
 TypeRegistry.for(_sm).registerError(JsonProtocolServiceException, __JsonProtocolServiceException);
 
 export var ListOfKitchenSinks: StaticListSchema = [1, n0, _LOKS, 0, [() => KitchenSink, 0]];
diff --git a/private/aws-protocoltests-query-schema/src/schemas/schemas_0.ts b/private/aws-protocoltests-query-schema/src/schemas/schemas_0.ts
@@ -215,7 +215,7 @@ export const n0 = "aws.protocoltests.query";
 export const n1 = "aws.protocoltests.shared";
 
 // smithy-typescript generated code
-import { error, TypeRegistry } from "@smithy/core/schema";
+import { TypeRegistry } from "@smithy/core/schema";
 import {
   StaticErrorSchema,
   StaticListSchema,
@@ -426,7 +426,7 @@ export var QueryMapsInput: StaticStructureSchema = [
         [_xF]: 1,
       },
     ],
-    [2, n0, _MOL, 0, 64 | 0, 64 | 0] as StaticMapSchema,
+    [2, n0, _MOL, 0, 0, 64 | 0],
     () => NestedStructWithMap,
   ],
 ];
@@ -540,7 +540,7 @@ export var XmlListsOutput: StaticStructureSchema = [
     64 | 4,
     64 | 0,
     64 | 1,
-    [1, n1, _NSL, 0, 64 | 0] as StaticListSchema,
+    [1, n1, _NSL, 0, 64 | 0],
     [
       () => RenamedListMembers,
       {
@@ -633,7 +633,7 @@ export var XmlTimestampsOutput: StaticStructureSchema = [
 export var GreetingStruct: StaticStructureSchema = [3, n1, _GS, 0, [_hi], [0]];
 export var Unit = "unit" as const;
 
-export var QueryProtocolServiceException = error(_s, "QueryProtocolServiceException", 0, [], [], null);
+export var QueryProtocolServiceException: StaticErrorSchema = [-3, _s, "QueryProtocolServiceException", 0, [], []];
 TypeRegistry.for(_s).registerError(QueryProtocolServiceException, __QueryProtocolServiceException);
 
 export var ListWithMemberNamespace: StaticListSchema = [
diff --git a/private/aws-protocoltests-restjson-schema-apigateway/src/schemas/schemas_0.ts b/private/aws-protocoltests-restjson-schema-apigateway/src/schemas/schemas_0.ts
@@ -40,7 +40,7 @@ export const _w = "warnings";
 export const n0 = "com.amazonaws.apigateway";
 
 // smithy-typescript generated code
-import { error, TypeRegistry } from "@smithy/core/schema";
+import { TypeRegistry } from "@smithy/core/schema";
 import {
   StaticErrorSchema,
   StaticListSchema,
@@ -153,7 +153,7 @@ TypeRegistry.for(n0).registerError(UnauthorizedException, __UnauthorizedExceptio
 
 export var Unit = "unit" as const;
 
-export var APIGatewayServiceException = error(_s, "APIGatewayServiceException", 0, [], [], null);
+export var APIGatewayServiceException: StaticErrorSchema = [-3, _s, "APIGatewayServiceException", 0, [], []];
 TypeRegistry.for(_s).registerError(APIGatewayServiceException, __APIGatewayServiceException);
 
 export var ListOfEndpointType = 64 | 0;
diff --git a/private/aws-protocoltests-restjson-schema-glacier/src/schemas/schemas_0.ts b/private/aws-protocoltests-restjson-schema-glacier/src/schemas/schemas_0.ts
@@ -38,7 +38,7 @@ export const _xasth = "x-amz-sha256-tree-hash";
 export const n0 = "com.amazonaws.glacier";
 
 // smithy-typescript generated code
-import { error, TypeRegistry } from "@smithy/core/schema";
+import { TypeRegistry } from "@smithy/core/schema";
 import { StaticErrorSchema, StaticOperationSchema, StaticSimpleSchema, StaticStructureSchema } from "@smithy/types";
 
 import { GlacierServiceException as __GlacierServiceException } from "../models/GlacierServiceException";
@@ -56,10 +56,11 @@ export var _Stream: StaticSimpleSchema = [
   0,
   n0,
   _S,
-  42,
   {
     [_s]: 1,
   },
+
+  42,
 ];
 export var ArchiveCreationOutput: StaticStructureSchema = [
   3,
@@ -217,7 +218,7 @@ export var UploadMultipartPartOutput: StaticStructureSchema = [
     ],
   ],
 ];
-export var GlacierServiceException = error(_sm, "GlacierServiceException", 0, [], [], null);
+export var GlacierServiceException: StaticErrorSchema = [-3, _sm, "GlacierServiceException", 0, [], []];
 TypeRegistry.for(_sm).registerError(GlacierServiceException, __GlacierServiceException);
 
 export var UploadArchive: StaticOperationSchema = [
diff --git a/private/aws-protocoltests-restjson-schema/src/schemas/schemas_0.ts b/private/aws-protocoltests-restjson-schema/src/schemas/schemas_0.ts
diff --git a/private/aws-protocoltests-restxml-schema/src/schemas/schemas_0.ts b/private/aws-protocoltests-restxml-schema/src/schemas/schemas_0.ts
diff --git a/private/aws-protocoltests-smithy-rpcv2-cbor-schema/src/schemas/schemas_0.ts b/private/aws-protocoltests-smithy-rpcv2-cbor-schema/src/schemas/schemas_0.ts
