fix: preserve correct error for optionalField

chore: test optionalField error
mlms13 · Oct 15, 2023 · 9771719 · 9771719
1 parent efab581
commit 9771719
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Decode_Base.re b/src/Decode_Base.re
@@ -235,9 +235,8 @@ module Make =
     |> flatMap(
          fun
          | None => pure(None)
-         | Some(v) => (_ => optional(decode, v)),
-       )
-    >> T.objErr(name);
+         | Some(v) => (_ => optional(decode, v) |> T.objErr(name)),
+       );
 
   let fallback = (decode, recovery) => alt(decode, pure(recovery));
 

diff --git a/test/Decode_AsResult_OfParseError_test.re b/test/Decode_AsResult_OfParseError_test.re
@@ -256,6 +256,11 @@ describe("Inner decoders", () => {
        )
   );
 
+  test("optionalField (failure on outer structure)", () =>
+    expect(Decode.optionalField("field", Decode.string, Sample.jsonString))
+    |> toEqual(valErr(`ExpectedObject, Sample.jsonString))
+  );
+
   test("optionalField (failure on inner decode)", () =>
     expect(Decode.(optionalField("title", boolean, Sample.jsonJobCeo)))
     |> toEqual(