Minor cleanup

mrijk · Jun 2, 2017 · dc57665 · dc57665
1 parent 39572da
commit dc57665
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/lib/question.js b/lib/question.js
@@ -10,14 +10,13 @@ const {gen} = require('./gen');
 const describe = require('./util/describe');
 
 function question(spec) {
-    const predicate = getSpec(spec);
     return {
         op: 'question',
         conform: values => {
             if (values.length === 0) {
                 return null;
             } else if (values.length === 1) {
-                return conform(predicate, values[0]);
+                return conform(spec, values[0]);
             } else {
                 return invalidString;
             }

diff --git a/lib/unform.js b/lib/unform.js
@@ -1,14 +1,10 @@
 const _ = require('lodash');
 
-const {getSpec} = require('./def');
+const {spec: specize} = require('./def');
 
-function unform(spec, value) {    
-    if (_.isFunction(spec)) {
-        return value;
-    } else {        
-        const predicate = getSpec(spec).unform;
-        return predicate ? predicate(value) : value;
-    }
+function unform(pred, value) {
+    const predicate = specize(pred).unform;
+    return predicate ? predicate(value) : value;
 }
 
 module.exports = unform;