Update tests

Author: Elias Mulhall

test/json-decode.test.ts

@@ -124,7 +124,7 @@ describe('constant', () => {
     interface TrueValue {
       x: true;
     }
-    const decoder: Decoder<TrueValue> = object({x: constant(true)});
+    const decoder: Decoder<TrueValue> = object<TrueValue>({x: constant(true)});
 
     expect(decoder.run({x: true})).toEqual({ok: true, result: {x: true}});
   });
@@ -133,7 +133,7 @@ describe('constant', () => {
     interface FalseValue {
       x: false;
     }
-    const decoder: Decoder<FalseValue> = object({x: constant(false)});
+    const decoder = object<FalseValue>({x: constant(false)});
 
     expect(decoder.run({x: false})).toEqual({ok: true, result: {x: false}});
   });
@@ -142,7 +142,7 @@ describe('constant', () => {
     interface NullValue {
       x: null;
     }
-    const decoder: Decoder<NullValue> = object({x: constant(null)});
+    const decoder = object<NullValue>({x: constant(null)});
 
     expect(decoder.run({x: null})).toEqual({ok: true, result: {x: null}});
   });
@@ -243,14 +243,53 @@ describe('object', () => {
     });
   });
 
-  it('ignores optional fields that decode to undefined', () => {
-    const decoder = object({
-      a: number(),
-      b: optional(string())
+  describe('optional and undefined fields', () => {
+    it('ignores optional fields that decode to undefined', () => {
+      interface AB {
+        a: number;
+        b?: string;
+      }
+
+      const decoder: Decoder<AB> = object<AB>({
+        a: number(),
+        b: optional(string())
+      });
+
+      expect(decoder.run({a: 12, b: 'hats'})).toEqual({ok: true, result: {a: 12, b: 'hats'}});
+      expect(decoder.run({a: 12})).toEqual({ok: true, result: {a: 12}});
     });
 
-    expect(decoder.run({a: 12, b: 'hats'})).toEqual({ok: true, result: {a: 12, b: 'hats'}});
-    expect(decoder.run({a: 12})).toEqual({ok: true, result: {a: 12}});
+    it('includes fields that are mapped to a value when not found', () => {
+      interface AB {
+        a: number;
+        b: string;
+      }
+
+      const decoder: Decoder<AB> = object<AB>({
+        a: number(),
+        b: oneOf(string(), constant(undefined)).map(
+          (b: string | undefined) => (b === undefined ? 'b not found' : b)
+        )
+      });
+
+      expect(decoder.run({a: 12, b: 'hats'})).toEqual({ok: true, result: {a: 12, b: 'hats'}});
+      expect(decoder.run({a: 12})).toEqual({ok: true, result: {a: 12, b: 'b not found'}});
+    });
+
+    it('includes fields that are mapped to a undefined when not found', () => {
+      interface AB {
+        a: number;
+        b: string | undefined;
+      }
+
+      const decoder: Decoder<AB> = object<AB>({
+        a: number(),
+        b: oneOf(string(), constant(undefined))
+      });
+
+      expect(decoder.run({a: 12, b: 'hats'})).toEqual({ok: true, result: {a: 12, b: 'hats'}});
+      expect(decoder.run({a: 12})).toEqual({ok: true, result: {a: 12, b: undefined}});
+    });
   });
 });
 
@@ -334,32 +373,13 @@ describe('dict', () => {
 });
 
 describe('optional', () => {
-  describe('decoding a non-object type', () => {
-    const decoder = optional(number());
-
-    it('can decode the given type', () => {
-      expect(decoder.run(5)).toEqual({ok: true, result: 5});
-    });
-
-    it('can decode undefined', () => {
-      expect(decoder.run(undefined)).toEqual({ok: true, result: undefined});
-    });
-
-    it('fails when the value is invalid', () => {
-      expect(decoder.run(false)).toMatchObject({
-        ok: false,
-        error: {at: 'input', message: 'expected a number, got a boolean'}
-      });
-    });
-  });
-
   describe('decoding an interface with optional fields', () => {
     interface User {
       id: number;
       isDog?: boolean;
     }
 
-    const decoder: Decoder<User> = object({
+    const decoder = object<User>({
       id: number(),
       isDog: optional(boolean())
     });
@@ -449,8 +469,8 @@ describe('union', () => {
   type C = A | B;
 
   const decoder: Decoder<C> = union(
-    object({kind: constant<'a'>('a'), value: number()}),
-    object({kind: constant<'b'>('b'), value: boolean()})
+    object<A>({kind: constant<'a'>('a'), value: number()}),
+    object<B>({kind: constant<'b'>('b'), value: boolean()})
   );
 
   it('can decode a value that matches one of the union types', () => {
@@ -527,7 +547,7 @@ describe('valueAt', () => {
   });
 
   describe('decode an optional field', () => {
-    const decoder = valueAt(['a', 'b', 'c'], optional(string()));
+    const decoder = valueAt(['a', 'b', 'c'], oneOf(string(), constant(undefined)));
 
     it('fails when the path does not exist', () => {
       const error = decoder.run({a: {x: 'cats'}});
@@ -628,7 +648,7 @@ describe('lazy', () => {
       replies: Comment[];
     }
 
-    const decoder: Decoder<Comment> = object({
+    const decoder: Decoder<Comment> = object<Comment>({
       msg: string(),
       replies: lazy(() => array(decoder))
     });

test/phone-example.test.ts

@@ -42,14 +42,14 @@ describe('decode phone number objects', () => {
     constant(PhoneUse.Work)
   );
 
-  const internationalPhoneDecoder: Decoder<InternationalPhone> = object({
+  const internationalPhoneDecoder = object<InternationalPhone>({
     id: number(),
     use: optional(phoneUseDecoder),
     international: constant(true),
     rawNumber: string()
   });
 
-  const domesticPhoneDecoder: Decoder<DomesticPhone> = object({
+  const domesticPhoneDecoder = object<DomesticPhone>({
     id: number(),
     use: optional(phoneUseDecoder),
     international: constant(false),
@@ -58,7 +58,10 @@ describe('decode phone number objects', () => {
     lineNumber: string()
   });
 
-  const phoneDecoder: Decoder<Phone> = union(domesticPhoneDecoder, internationalPhoneDecoder);
+  const phoneDecoder: Decoder<Phone> = union<DomesticPhone, InternationalPhone>(
+    domesticPhoneDecoder,
+    internationalPhoneDecoder
+  );
 
   const phonesDecoder: Decoder<Phone[]> = array(phoneDecoder);
 

test/user-example.test.ts

@@ -1,4 +1,4 @@
-import {Decoder, string, number, boolean, object} from '../src/index';
+import {string, number, boolean, object} from '../src/index';
 
 describe('decode json as User interface', () => {
   interface User {
@@ -22,7 +22,7 @@ describe('decode json as User interface', () => {
     active: false
   };
 
-  const userDecoder: Decoder<User> = object({
+  const userDecoder = object<User>({
     firstname: string(),
     lastname: string(),
     age: number(),