test types and other fixes

Author: kuhe

packages/core/src/submodules/cbor/SmithyRpcV2CborProtocol.spec.ts

@@ -153,6 +153,7 @@ describe(SmithyRpcV2CborProtocol.name, () => {
         const protocol = new SmithyRpcV2CborProtocol({ defaultNamespace: "" });
         const httpRequest = await protocol.serializeRequest(
           {
+            namespace: "ns",
             name: "dummy",
             input: testCase.schema,
             output: "unit",
@@ -256,6 +257,7 @@ describe(SmithyRpcV2CborProtocol.name, () => {
         });
         const output = await protocol.deserializeResponse(
           {
+            namespace: "ns",
             name: "dummy",
             input: "unit",
             output: testCase.schema,

packages/core/src/submodules/cbor/SmithyRpcV2CborProtocol.ts

@@ -1,12 +1,13 @@
 import { RpcProtocol } from "@smithy/core/protocols";
-import type { ErrorSchema, OperationSchema } from "@smithy/core/schema";
+import type { ErrorSchema } from "@smithy/core/schema";
 import { deref, NormalizedSchema, TypeRegistry } from "@smithy/core/schema";
 import type {
   EndpointBearer,
   HandlerExecutionContext,
   HttpRequest as IHttpRequest,
   HttpResponse as IHttpResponse,
   MetadataBearer,
+  OperationSchema,
   ResponseMetadata,
   SerdeFunctions,
 } from "@smithy/types";

packages/core/src/submodules/schema/schemas/NormalizedSchema.ts

@@ -37,10 +37,7 @@ export class NormalizedSchema implements INormalizedSchema {
    * @param ref - a polymorphic SchemaRef to be dereferenced/normalized.
    * @param memberName - optional memberName if this NormalizedSchema should be considered a member schema.
    */
-  private constructor(
-    readonly ref: SchemaRef,
-    private memberName?: string
-  ) {
+  private constructor(readonly ref: SchemaRef, private memberName?: string) {
     const traitStack = [] as SchemaTraits[];
     let _ref = ref;
     let schema = ref;
@@ -95,13 +92,18 @@ export class NormalizedSchema implements INormalizedSchema {
    * Static constructor that attempts to avoid wrapping a NormalizedSchema within another.
    */
   public static of(ref: SchemaRef): NormalizedSchema {
+    if (ref instanceof NormalizedSchema) {
+      return ref;
+    }
     if (Array.isArray(ref)) {
+      const [ns, traits] = ref;
+      if (ns instanceof NormalizedSchema) {
+        Object.assign(ns.getMergedTraits(), NormalizedSchema.translateTraits(traits));
+        return ns;
+      }
       // An aggregate schema must be initialized with members and the member retrieved through the aggregate
       // container.
-      throw new Error("@smithy/core/schema - may not init member schema.");
-    }
-    if (ref instanceof NormalizedSchema) {
-      return ref;
+      throw new Error(`@smithy/core/schema - may not init unwrapped member schema=${JSON.stringify(ref, null, 2)}.`);
     }
     return new NormalizedSchema(ref);
   }
@@ -386,15 +388,17 @@ export class NormalizedSchema implements INormalizedSchema {
    *
    * This does NOT return list and map members, it is only for structures.
    *
-   * @deprecated use structIterator instead.
+   * @deprecated use (checked) structIterator instead.
    *
    * @returns a map of member names to member schemas (normalized).
    */
   public getMemberSchemas(): Record<string, NormalizedSchema> {
     const buffer = {} as any;
-    for (const [k, v] of this.structIterator()) {
-      buffer[k] = v;
-    }
+    try {
+      for (const [k, v] of this.structIterator()) {
+        buffer[k] = v;
+      }
+    } catch (ignored) {}
     return buffer;
   }
 

packages/types/src/schema/schema.ts

@@ -50,6 +50,7 @@ export type SchemaTraits = TraitBitVector | SchemaTraitsObject;
  * @public
  */
 export interface TraitsSchema {
+  namespace: string;
   name: string;
   traits: SchemaTraits;
 }