Improve oneOf errors

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>dev.mccue</groupId>
     <artifactId>json</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
     <packaging>jar</packaging>
 
     <properties>

src/main/java/dev/mccue/json/Json.java

@@ -1,6 +1,8 @@
 package dev.mccue.json;
 
 import dev.mccue.json.internal.*;
+import dev.mccue.json.stream.JsonValueHandler;
+import dev.mccue.json.stream.JsonWriteable;
 
 import java.io.*;
 import java.math.BigDecimal;
@@ -198,7 +200,7 @@ static JsonReader reader(Reader reader) {
                 .withEOFBehavior(EOFBehavior.RETURN_NULL));
     }
 
-    static void readStream(Reader reader, Json.ValueHandler handler, StreamReadOptions options) throws IOException, JsonReadException {
+    static void readStream(Reader reader, JsonValueHandler handler, StreamReadOptions options) throws IOException, JsonReadException {
         JsonReaderMethods.readStream(
                 new PushbackReader(reader, JsonReaderMethods.MINIMUM_PUSHBACK_BUFFER_SIZE),
                 false,
@@ -207,7 +209,7 @@ static void readStream(Reader reader, Json.ValueHandler handler, StreamReadOptio
         );
     }
 
-    static void readStream(Reader reader, Json.ValueHandler handler) throws IOException, JsonReadException {
+    static void readStream(Reader reader, JsonValueHandler handler) throws IOException, JsonReadException {
         JsonReaderMethods.readStream(
                 new PushbackReader(reader, JsonReaderMethods.MINIMUM_PUSHBACK_BUFFER_SIZE),
                 false,
@@ -340,29 +342,8 @@ public EventReadOptions withUseBigDecimals(boolean useBigDecimals) {
         }
     }
 
-    interface ObjectHandler {
-        Json.ValueHandler onField(java.lang.String fieldName);
 
-        void objectEnd();
-    }
-
-    interface ArrayHandler extends Json.ValueHandler {
-        void onArrayEnd();
-    }
-
-    interface ValueHandler {
-        Json.ObjectHandler onObjectStart();
 
-        Json.ArrayHandler onArrayStart();
 
-        void onNumber(JsonNumber number);
 
-        void onString(java.lang.String value);
-
-        void onNull();
-
-        void onTrue();
-
-        void onFalse();
-    }
 }

src/main/java/dev/mccue/json/JsonDecoder.java

@@ -435,6 +435,19 @@ static <T> T oneOf(Json json, JsonDecoder<? extends T> decoderA, JsonDecoder<? e
                     errors.add(e2);
                 }
 
+                throw JsonDecodeException.oneOf(Collections.unmodifiableList(errors));
+            }
+            catch (Exception e2) {
+                var errors = new ArrayList<JsonDecodeException>();
+                if (e1 instanceof JsonDecodeException.OneOf oneOf) {
+                    errors.addAll(oneOf.getCauses());
+                }
+                else {
+                    errors.add(e1);
+                }
+
+                errors.add(JsonDecodeException.of(e2, json));
+
                 throw JsonDecodeException.oneOf(Collections.unmodifiableList(errors));
             }
         }
@@ -469,6 +482,8 @@ static <T> T oneOf(Json json, JsonDecoder<? extends T> decoderA, JsonDecoder<? e
                     } else {
                         errors.add(e2);
                     }
+                } catch (Exception e2) {
+                    errors.add(JsonDecodeException.of(e2, json));
                 }
             }
 

src/main/java/dev/mccue/json/JsonEncodable.java

@@ -1,6 +1,7 @@
 package dev.mccue.json;
 
 import dev.mccue.json.stream.JsonGenerator;
+import dev.mccue.json.stream.JsonWriteable;
 
 /**
  * An object that can be converted to JSON.

src/main/java/dev/mccue/json/JsonNull.java

@@ -28,7 +28,6 @@ private Object writeReplace() {
         return new JsonSerializationProxy(Json.writeString(this));
     }
 
-
     @Serial
     private Object readResolve() {
         throw new IllegalStateException();

src/main/java/dev/mccue/json/JsonNumber.java

@@ -9,11 +9,10 @@
 import java.io.Serial;
 import java.math.BigDecimal;
 
-public sealed abstract class JsonNumber extends java.lang.Number implements Json permits
-        BigDecimalImpl,
-        DoubleImpl,
-        LongImpl,
-        BigIntegerImpl {
+public sealed abstract class JsonNumber
+        extends Number
+        implements Json
+        permits BigDecimalImpl, DoubleImpl, LongImpl, BigIntegerImpl {
     @Serial
     private static final long serialVersionUID = 1L;
 

src/main/java/dev/mccue/json/internal/DelegatingJsonGenerator.java

@@ -5,17 +5,13 @@
 import dev.mccue.json.JsonNumber;
 
 class DelegatingJsonGenerator implements JsonGenerator {
-    private final Json.WriteOptions writeOptions;
-    private final Appendable out;
     private JsonGenerator delegate;
 
     DelegatingJsonGenerator(
             Json.WriteOptions writeOptions,
             Appendable out,
             JsonGenerator delegate
     ) {
-        this.writeOptions = writeOptions;
-        this.out = out;
         this.delegate = delegate;
     }
 

src/main/java/dev/mccue/json/internal/Handlers.java

@@ -4,20 +4,23 @@
 import dev.mccue.json.internal.ArrayBuilderImpl;
 import dev.mccue.json.internal.ObjectBuilder;
 import dev.mccue.json.internal.ValueCandidate;
+import dev.mccue.json.stream.JsonArrayHandler;
+import dev.mccue.json.stream.JsonObjectHandler;
+import dev.mccue.json.stream.JsonValueHandler;
 
 import java.util.function.Consumer;
 
 final class Handlers {
     private Handlers() {}
 
     @ValueCandidate
-    record TreeObjectHandler(JsonObject.Builder builder, Consumer<JsonObject> onObject) implements Json.ObjectHandler {
+    record TreeObjectHandler(JsonObject.Builder builder, Consumer<JsonObject> onObject) implements JsonObjectHandler {
         TreeObjectHandler(Consumer<JsonObject> onObject) {
             this(Json.objectBuilder(), onObject);
         }
 
         @Override
-        public Json.ValueHandler onField(java.lang.String fieldName) {
+        public JsonValueHandler onField(java.lang.String fieldName) {
             return new TreeValueHandler(value -> builder.put(fieldName, value));
         }
 
@@ -31,7 +34,7 @@ public void objectEnd() {
     record TreeArrayHandler(
             JsonArray.Builder builder,
             Consumer<JsonArray> onArray
-    ) implements Json.ArrayHandler {
+    ) implements JsonArrayHandler {
         TreeArrayHandler(Consumer<JsonArray> onArray) {
             this(Json.arrayBuilder(), onArray);
         }
@@ -42,12 +45,12 @@ public void onArrayEnd() {
         }
 
         @Override
-        public Json.ObjectHandler onObjectStart() {
+        public JsonObjectHandler onObjectStart() {
             return new TreeObjectHandler(builder::add);
         }
 
         @Override
-        public Json.ArrayHandler onArrayStart() {
+        public JsonArrayHandler onArrayStart() {
             return new TreeArrayHandler(builder::add);
         }
 
@@ -81,15 +84,15 @@ public void onFalse() {
      * Basic handler that reads values into an immutable tree.
      */
     @ValueCandidate
-    record TreeValueHandler(Consumer<Json> onValue) implements Json.ValueHandler {
+    record TreeValueHandler(Consumer<Json> onValue) implements JsonValueHandler {
 
         @Override
-        public Json.ObjectHandler onObjectStart() {
+        public JsonObjectHandler onObjectStart() {
             return new TreeObjectHandler(onValue::accept);
         }
 
         @Override
-        public Json.ArrayHandler onArrayStart() {
+        public JsonArrayHandler onArrayStart() {
             return new TreeArrayHandler(onValue::accept);
         }
 
@@ -119,7 +122,7 @@ public void onFalse() {
         }
     }
 
-    static final class BaseTreeValueHandler implements Json.ValueHandler {
+    static final class BaseTreeValueHandler implements JsonValueHandler {
         Json result;
         final TreeValueHandler delegate;
 
@@ -129,12 +132,12 @@ static final class BaseTreeValueHandler implements Json.ValueHandler {
         }
 
         @Override
-        public Json.ObjectHandler onObjectStart() {
+        public JsonObjectHandler onObjectStart() {
             return delegate.onObjectStart();
         }
 
         @Override
-        public Json.ArrayHandler onArrayStart() {
+        public JsonArrayHandler onArrayStart() {
             return delegate.onArrayStart();
         }
 

src/main/java/dev/mccue/json/internal/JsonReaderMethods.java

@@ -2,9 +2,11 @@
 
 
 import dev.mccue.json.Json;
+import dev.mccue.json.stream.JsonArrayHandler;
 import dev.mccue.json.stream.JsonEvent;
 import dev.mccue.json.JsonNumber;
 import dev.mccue.json.JsonReadException;
+import dev.mccue.json.stream.JsonValueHandler;
 
 import java.io.IOException;
 import java.io.PushbackReader;
@@ -385,7 +387,7 @@ private static boolean readAlse(PushbackReader stream) throws IOException {
     private static void readArrayHelperStream(
             PushbackReader stream,
             Json.StreamReadOptions options,
-            Json.ArrayHandler arrayHandler
+            JsonArrayHandler arrayHandler
     ) throws IOException {
         while (true) {
             readStream(stream, true, options, arrayHandler);
@@ -404,7 +406,7 @@ private static void readArrayHelperStream(
     private static void readArrayStream(
             PushbackReader stream,
             Json.StreamReadOptions options,
-            Json.ValueHandler valueHandler
+            JsonValueHandler valueHandler
     ) throws IOException {
         var arrayHandler = valueHandler.onArrayStart();
         var c = nextToken(stream);
@@ -423,7 +425,7 @@ private static void readArrayStream(
     private static void readObjectStream(
             PushbackReader stream,
             Json.StreamReadOptions options,
-            Json.ValueHandler valueHandler
+            JsonValueHandler valueHandler
     ) throws IOException {
         boolean readSomeEntry = false;
         var objectHandler = valueHandler.onObjectStart();
@@ -459,7 +461,7 @@ public static void readStream(
             PushbackReader stream,
             boolean throwIfEofEncountered,
             Json.StreamReadOptions options,
-            Json.ValueHandler valueHandler
+            JsonValueHandler valueHandler
     ) throws IOException {
         int c = nextToken(stream);
         switch (c) {

src/main/java/dev/mccue/json/stream/JsonArrayHandler.java

@@ -0,0 +1,7 @@
+package dev.mccue.json.stream;
+
+import dev.mccue.json.Json;
+
+public interface JsonArrayHandler extends JsonValueHandler {
+    void onArrayEnd();
+}

src/main/java/dev/mccue/json/stream/JsonObjectHandler.java

@@ -0,0 +1,9 @@
+package dev.mccue.json.stream;
+
+
+public interface JsonObjectHandler {
+    JsonValueHandler onField(String fieldName);
+
+    void objectEnd();
+}
+

src/main/java/dev/mccue/json/stream/JsonValueHandler.java

@@ -0,0 +1,20 @@
+package dev.mccue.json.stream;
+
+import dev.mccue.json.Json;
+import dev.mccue.json.JsonNumber;
+
+public interface JsonValueHandler {
+    JsonObjectHandler onObjectStart();
+
+    JsonArrayHandler onArrayStart();
+
+    void onNumber(JsonNumber number);
+
+    void onString(String value);
+
+    void onNull();
+
+    void onTrue();
+
+    void onFalse();
+}

src/main/java/dev/mccue/json/JsonWriteable.java → src/main/java/dev/mccue/json/stream/JsonWriteable.java

@@ -1,4 +1,4 @@
-package dev.mccue.json;
+package dev.mccue.json.stream;
 
 import dev.mccue.json.stream.JsonGenerator;