(fix convert) Allow nullableToValidation to receive a fallback value

origamitower · Mar 23, 2017 · da6c2e3 · da6c2e3
1 parent 0b82321
commit da6c2e3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/src/data/conversions/nullable-to-validation.js b/src/data/conversions/nullable-to-validation.js
@@ -16,12 +16,12 @@ const { Success, Failure } = require('folktale/data/validation/validation');
  *   - "@boris-marinov"
  * 
  * type: |
- *   forall a:
- *     (a or None) => Validation None a
+ *   forall a, b:
+ *     (a or None, b) => Validation b a
  */
-const nullableToValidation = (a) =>
+const nullableToValidation = (a, fallbackValue) =>
   a != null ? Success(a)
-  :/*else*/   Failure(a);
+  :/*else*/   Failure(fallbackValue);
 
 
 module.exports = nullableToValidation;
diff --git a/src/data/validation/index.js b/src/data/validation/index.js
@@ -7,20 +7,29 @@
 //
 //----------------------------------------------------------------------
 
+const Validation = require('./validation');
+const { typeSymbol } = require('folktale/core/adt/data');
+
+
 /*~ 
  * stability: unstable
  * name: module folktale/data/validation
  */
 module.exports = {
-  ...require('./validation'),
+  Success: Validation.Success,
+  Failure: Validation.Failure,
+  hasInstance: Validation.hasInstance,
+  of: Validation.of,
+  fromJSON: Validation.fromJSON,
+  [typeSymbol]: Validation[typeSymbol],
   collect: require('./collect'),
 
   /*~
    * type: |
-   *   forall a: (a or None) => Validation None a
+   *   forall a, b: (a or None, b) => Validation b a
    */
-  fromNullable(aNullable) {
-    return require('folktale/data/conversions/nullable-to-validation')(aNullable);
+  fromNullable(aNullable, fallbackValue) {
+    return require('folktale/data/conversions/nullable-to-validation')(aNullable, fallbackValue);
   },
 
   /*~

diff --git a/test/specs-src/data.validation.js b/test/specs-src/data.validation.js
@@ -138,13 +138,13 @@ describe('Data.Validation', () => {
     });
   });
   describe('Conversions', () => {
-    property('Failure#fromNullable', () => {
-        return _.fromNullable(null).equals(_.Failure(null))
-        &&     _.fromNullable(undefined).equals(_.Failure(undefined));
+    property('Failure#fromNullable', 'string', (a) => {
+        return _.fromNullable(null, a).equals(_.Failure(a))
+        &&     _.fromNullable(undefined, a).equals(_.Failure(a));
     });
 
-    property('Success#fromNullable', 'number | string | bool | dict nat | array nat', (a) => {
-        return _.fromNullable(a).equals(_.Success(a))
+    property('Success#fromNullable', 'number | string | bool | dict nat | array nat', 'string', (a, b) => {
+        return _.fromNullable(a, b).equals(_.Success(a))
     }); 
     property('Validation#fromResult', 'json', (a) => {
       return _.fromResult(_.Success(a).toResult()).equals(_.Success(a));