Cleanup tuple as well

mrijk · Jul 3, 2017 · 996260d · 996260d
1 parent 25be434
commit 996260d
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/lib/tuple.js b/lib/tuple.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 
 const {invalidString} = require('./conform');
-const {explainData} = require('./explainData');
+const {explainData, firstProblem} = require('./explainData');
 const {gen} = require('./gen');
 const isValid = require('./isValid');
 
@@ -37,15 +37,7 @@ function* explainInvalid(values, predicates, via) {
     const index = _.findIndex(pairs, isInvalid);
     if (index !== -1) {
         const [spec, val] = pairs[index];
-
-        const {pred} = explainData(spec, val).problems[0];
-        yield {
-            path: [index],
-            pred,
-            val,
-            via,
-            'in': [index]
-        };
+        yield* firstProblem(spec, val, {path: [index], via, _in: [index]})
     }
 }