test fixes

Author: kuhe

.changeset/good-students-play.md

@@ -1,4 +1,5 @@
 ---
+"@smithy/smithy-client": minor
 "@smithy/types": minor
 "@smithy/core": minor
 ---

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

@@ -1,12 +1,12 @@
 import type {
+  $MemberSchema,
   BigDecimalSchema,
   BigIntegerSchema,
   BlobSchema,
   BooleanSchema,
   DocumentSchema,
   ListSchemaModifier,
   MapSchemaModifier,
-  MemberSchema,
   NumericSchema,
   StaticListSchema,
   StaticMapSchema,
@@ -222,7 +222,7 @@ describe(NormalizedSchema.name, () => {
   });
 
   describe("traits", () => {
-    const member: MemberSchema = [
+    const member: $MemberSchema = [
       [0, "ack", "SimpleString", { idempotencyToken: 1 }, 0] satisfies StaticSimpleSchema,
       0b0000_0001,
     ];

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

@@ -64,7 +64,10 @@ 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 readonly memberName?: string) {
+  private constructor(
+    readonly ref: $SchemaRef,
+    private readonly memberName?: string
+  ) {
     const traitStack = [] as SchemaTraits[];
     let _ref = ref;
     let schema = ref;
@@ -320,10 +323,10 @@ export class NormalizedSchema implements INormalizedSchema {
       typeof sc === "number"
         ? 0b0011_1111 & sc
         : sc && typeof sc === "object" && (isMap || isList)
-        ? ((sc as StaticMapSchema | StaticListSchema)[3 + (sc as StaticSchema)[0]] as typeof sc)
-        : isDoc
-        ? (15 satisfies DocumentSchema)
-        : void 0;
+          ? ((sc as StaticMapSchema | StaticListSchema)[3 + (sc as StaticSchema)[0]] as typeof sc)
+          : isDoc
+            ? (15 satisfies DocumentSchema)
+            : void 0;
     if (memberSchema != null) {
       return member([memberSchema, 0], isMap ? "value" : "member");
     }

packages/smithy-client/src/schemaLogFilter.spec.ts

@@ -1,39 +1,47 @@
-import { list, map, SCHEMA, sim, struct } from "@smithy/core/schema";
+import type {
+  BooleanSchema,
+  NumericSchema,
+  StaticSimpleSchema,
+  StaticStructureSchema,
+  StringSchema,
+} from "@smithy/types";
 import { describe, expect, test as it } from "vitest";
 
 import { schemaLogFilter } from "./schemaLogFilter";
 
 describe(schemaLogFilter.name, () => {
   it("should filter sensitive trait-marked fields", () => {
-    const sensitiveString = sim("ns", "SensitiveString", 0, { sensitive: 1 });
+    const sensitiveString: StaticSimpleSchema = [0, "ns", "SensitiveString", { sensitive: 1 }, 0];
 
-    const schema = struct(
+    const schema: StaticStructureSchema = [
+      3,
       "ns",
       "Struct",
       0,
       ["a", "b", "sensitive", "nestedSensitive", "various"],
       [
-        SCHEMA.STRING,
-        SCHEMA.STRING,
+        0 satisfies StringSchema,
+        0 satisfies StringSchema,
         sensitiveString,
-        struct("ns", "NestedSensitiveStruct", 0, ["sensitive"], [sensitiveString]),
-        struct(
+        [3, "ns", "NestedSensitiveStruct", 0, ["sensitive"], [sensitiveString]],
+        [
+          3,
           "ns",
           "Various",
           0,
           ["boolean", "number", "struct", "list-s", "list", "map-s", "map"],
           [
-            sim("ns", "Boolean", SCHEMA.BOOLEAN, { sensitive: 1 }),
-            sim("ns", "Numeric", SCHEMA.NUMERIC, { sensitive: 1 }),
-            struct("ns", "SensitiveStruct", { sensitive: 1 }, [], []),
-            list("ns", "List", 0, sensitiveString),
-            list("ns", "List", 0, SCHEMA.STRING),
-            map("ns", "Map", 0, sensitiveString, SCHEMA.STRING),
-            map("ns", "Map", 0, SCHEMA.STRING, SCHEMA.STRING),
-          ]
-        ),
-      ]
-    );
+            [0, "ns", "Boolean", { sensitive: 1 }, 2 satisfies BooleanSchema],
+            [0, "ns", "Numeric", { sensitive: 1 }, 1 satisfies NumericSchema],
+            [3, "ns", "SensitiveStruct", { sensitive: 1 }, [], []],
+            [1, "ns", "List", 0, sensitiveString],
+            [1, "ns", "List", 0, 0 satisfies StringSchema],
+            [2, "ns", "Map", 0, sensitiveString, 0 satisfies StringSchema],
+            [2, "ns", "Map", 0, 0 satisfies StringSchema, 0 satisfies StringSchema],
+          ],
+        ],
+      ],
+    ];
 
     expect(
       schemaLogFilter(schema, {

packages/types/src/schema/schema-deprecated.ts

@@ -1,9 +1,9 @@
-import type { SchemaTraits, UnitSchema, SimpleSchema, NormalizedSchema, ConfigurableSerdeContext } from "./schema";
-import type { StaticSchema } from "./static-schemas";
+import type { EndpointV2 } from "../endpoint";
+import type { HandlerExecutionContext } from "../middleware";
 import type { MetadataBearer } from "../response";
 import type { EndpointBearer, SerdeFunctions } from "../serde";
-import type { HandlerExecutionContext } from "../middleware";
-import type { EndpointV2 } from "../endpoint";
+import type { ConfigurableSerdeContext, NormalizedSchema, SchemaTraits, SimpleSchema, UnitSchema } from "./schema";
+import type { StaticSchema } from "./static-schemas";
 
 /**
  * A schema is an object or value that describes how to serialize/deserialize data.