Mapped type tests

CodeStix · CodeStix · commit 4955bebd0fc8 · 2021-04-26T15:15:28.000+02:00
diff --git a/src/schemas.ts b/src/schemas.ts
@@ -590,14 +590,14 @@ export class MappedSchema<K extends string | number | symbol, V> extends Schema<
         super(requiredMessage);
     }
 
-    public validate(value: unknown, context: ValidationContext): ErrorType<{ [Key in K]: V }, string> | undefined {
+    public validate(value: unknown, context: ValidationContext = {}): ErrorType<{ [Key in K]: V }, string> | undefined {
         let v = this.validateNullable(value);
         if (v !== null) return v;
 
         if (typeof value !== "object") return "Must be object";
 
         let err: any = {};
-        let keys = Object.keys(value!);
+        let keys = Array.isArray(value) ? Array.from(value.keys()) : Object.keys(value!);
         for (let i = 0; i < keys.length; i++) {
             let key = keys[i];
             let keyError = this.keySchema.validate(key, context);
diff --git a/tests/object.test.js b/tests/object.test.js
@@ -23,3 +23,17 @@ test("array", () => {
     expect(tv.array(tv.boolean()).validate([true, false, true])).toBeUndefined();
     expect(tv.array(tv.boolean()).validate([true, false, 0])).toStrictEqual({ 2: "Must be boolean" });
 });
+
+test("mapped", () => {
+    let t = tv.mapped(tv.value("a").or(tv.value("b")), tv.string());
+    expect(t.validate(undefined)).toBe("Enter a value");
+    expect(t.validate(null)).toBe("Null is not acceptable");
+    expect(t.validate({ a: "nice" })).toBeUndefined();
+    expect(t.validate({ b: "" })).toBeUndefined();
+    expect(t.validate({ c: "" })).toStrictEqual({ c: "Does not match possible values" });
+    expect(t.validate({ a: 100 })).toStrictEqual({ a: "Must be string" });
+    expect(t.validate({ b: false })).toStrictEqual({ b: "Must be string" });
+
+    expect(tv.mapped(tv.number(), tv.array(tv.number())).validate([[100]])).toBeUndefined();
+    expect(tv.mapped(tv.number(), tv.array(tv.number())).validate([[[100]]])).toStrictEqual({ 0: { 0: "Must be number" } });
+});
