Merge pull request #387 from walmartlabs/hls/restore-multi-errors

Restore ability to add multiple errors at once

CHANGES.md

@@ -7,10 +7,6 @@ to boost performance.
 
 ### Incompatible Changes
 
-* `com.walmartlabs.lacinia.resolve/resolve-as` and `with-error` did, in prior releases,
-support an argument that could be either a single error map, or a sequence of error maps. This was rarely used, and
-has been changed: only a single error map is supported.
-
 * Previously, a resolver, including a default resolver, could return a map containing a value that was
   a `ResolverResult`, and Lacinia would de-reference it; this is no longer allowed, resolvers must return
   a value (or a value delivered by a `ResolverResult`).  The value may be wrapped

src/com/walmartlabs/lacinia/resolve.clj

@@ -50,8 +50,18 @@
     "The analog of a field resolver function, this method is passed the instance, and the standard
     context, field arguments, and container value, and returns a resolved value."))
 
+(defn ^:private wrap-error-maps
+  [value behavior error]
+  (cond
+    ;; Old behavior --- supported but not documented
+    (sequential? error)
+    (reduce #(wrap-value %1 behavior (assert-error-map %2)) value (reverse error))
+
+    (some? error)
+    (wrap-value value behavior (assert-error-map error))))
+
 (defn with-error
-  "Wraps a value, modifying it to include an error map (or seq of error maps).
+  "Wraps a value, modifying it to include an error map.
 
   The provided error map will be enhanced with a :location key,
   identifying where field occurs within the query document, and a :path key,
@@ -62,9 +72,7 @@
   and must be a string) will be added to an embedded :extensions map."
   {:added "0.19.0"}
   [value error]
-  (if error
-    (wrap-value value :error (assert-error-map error))
-    value))
+  (wrap-error-maps value :error error))
 
 (defn with-context
   "Wraps a value so that when nested fields (at any depth) are executed, the provided values will be in the context.
@@ -328,6 +336,4 @@
   for an error and what call for a warning."
   {:added "0.31.0"}
   [value warning]
-  (if warning
-    (wrap-value value :warning (assert-error-map warning))
-    value))
+  (wrap-error-maps value :warning warning))

test/com/walmartlabs/lacinia/resolver_errors_test.clj

@@ -40,12 +40,11 @@
             ;; We could add a serializer that converts this to :BLUE, but we haven't.
             Color/BLUE)
    :multiple-errors (fn [_ _ _]
-                      (reduce #(with-error %1 %2)
-                        "Value"
+                      (resolve-as "Value"
                         [{:message "1" :other-key 100}
-                                                {:message "2"}
-                                                {:message "3"}
-                                                {:message "4"}]))
+                         {:message "2"}
+                         {:message "3"}
+                         {:message "4"}]))
    :resolve-root (fn [_ _ _] {})})
 
 (def default-schema
@@ -113,8 +112,7 @@
            :message "4"
            :path [:root :multiple_errors_field]}]
          (->> (execute default-schema "{ root { multiple_errors_field }}")
-              :errors
-              (sort-by :message)))))
+              :errors))))
 
 (deftest extensions-are-merged
   (is (= {:data {:root {:with_extensions nil}}