Merge pull request #52 from plaid/dc-nonexhaustive-env

remove the requirement that all types be in the environment

Author: davidchambers

README.md

@@ -389,7 +389,6 @@ counterpart).
 
 `$.env` is a list of [types](#types):
 
-  - [`$.Any`](#any)
   - [`$.Array`](#array)
   - [`$.Boolean`](#boolean)
   - [`$.Date`](#date)

index.js

@@ -43,14 +43,6 @@
   //  always :: a -> (-> a)
   var always = function(x) { return function() { return x; }; };
 
-  //  any :: ([a], (a -> Boolean)) -> Boolean
-  var any = function(xs, pred) {
-    for (var idx = 0; idx < xs.length; idx += 1) {
-      if (pred(xs[idx])) return true;
-    }
-    return false;
-  };
-
   //  chain :: ([a], (a -> [b])) -> [b]
   var chain = function(xs, f) {
     var result = [];
@@ -60,15 +52,6 @@
     return result;
   };
 
-  //  eqProps :: String -> Object -> Object -> Boolean
-  var eqProps = function(key) {
-    return function(o1) {
-      return function(o2) {
-        return o1[key] === o2[key];
-      };
-    };
-  };
-
   //  filter :: ([a], (a -> Boolean)) -> [a]
   var filter = function(xs, pred) {
     var result = [];
@@ -254,14 +237,6 @@
     };
   };
 
-  //  Any :: Type
-  var Any = {
-    '@@type': 'sanctuary-def/Type',
-    type: 'ANY',
-    test: K(true),
-    toString: always('Any')
-  };
-
   //  Unknown :: Type
   var Unknown = {
     '@@type': 'sanctuary-def/Type',
@@ -474,7 +449,6 @@
 
   //  $.env :: [Type]
   $.env = [
-    ($.Any        = Any),
     ($.Array      = type1('Array', id)),
     ($.Boolean    = type0('Boolean')),
     ($.Date       = type0('Date')),
@@ -489,6 +463,12 @@
     ($.Undefined  = type0('Undefined'))
   ];
 
+  //  Any :: Type
+  $.Any = NullaryType(
+    'sanctuary-def/Any',
+    K(true)
+  );
+
   //  ValidDate :: Type
   $.ValidDate = NullaryType(
     'sanctuary-def/ValidDate',
@@ -638,20 +618,6 @@
     }
   };
 
-  //  rejectAny :: Type -> [Type]
-  var rejectAny = function recur(t) {
-    switch (t.type) {
-      case 'ANY':
-        return [];
-      case 'UNARY':
-        return map(recur(t.$1), UnaryType.from(t));
-      case 'BINARY':
-        return BinaryType.xprod(t, recur(t.$1), recur(t.$2));
-      default:
-        return [t];
-    }
-  };
-
   //  unexpectedType :: Any -> TypeError
   var unexpectedType = /* istanbul ignore next */ function(x) {
     return new TypeError(
@@ -786,15 +752,6 @@
     );
   };
 
-  var typeNotInEnvironment = function(env, name, type) {
-    return new TypeError(trimTrailingSpaces(unlines([
-      'Definition of ' + LEFT_SINGLE_QUOTATION_MARK + name + RIGHT_SINGLE_QUOTATION_MARK +
-        ' references ' + type.name + ' which is not in the environment:',
-      '',
-      map(map(chain(env, rejectAny), showType), prefix('  - ')).join('\n')
-    ])));
-  };
-
   var invalidArgument = function(name, types, value, index) {
     return new TypeError(
       LEFT_SINGLE_QUOTATION_MARK + name + RIGHT_SINGLE_QUOTATION_MARK +
@@ -1051,30 +1008,9 @@
         x;
     });
 
-    //  assertExpectedTypesInEnvironment :: String -> [Type] -> Undefined
-    var assertExpectedTypesInEnvironment = function(name) {
-      return function recur(expTypes) {
-        for (var idx = 0; idx < expTypes.length; idx += 1) {
-          var expType = expTypes[idx];
-          if (expType.type !== 'VARIABLE') {
-            if (!any(env, eqProps('name')(expType))) {
-              throw typeNotInEnvironment(env, name, expType);
-            }
-            if (expType.type === 'UNARY') {
-              recur([expType.$1]);
-            } else if (expType.type === 'BINARY') {
-              recur([expType.$1, expType.$2]);
-            }
-          }
-        }
-      };
-    };
-
     //  _determineActualTypes :: (Boolean, [Object], [Any]) -> [Type]
     var _determineActualTypes = function recur(loose, $seen, values) {
       if (isEmpty(values)) return [Unknown];
-      //  consistentTypes :: [Type]
-      var consistentTypes = chain(env, rejectAny);
       //  typeses :: [[Type]]
       var typeses = map(values, function(value) {
         if (typeof value === 'object' && value != null ||
@@ -1084,7 +1020,7 @@
           if ($seen.indexOf(value) >= 0) return [];
           $seen.push(value);
         }
-        return chain(consistentTypes, function(t) {
+        return chain(env, function(t) {
           return (
             t.name === 'sanctuary-def/Nullable' || !test(t, value).valid ?
               [] :
@@ -1105,7 +1041,7 @@
       //  If none of the values is a member of a type in the environment,
       //  and all the values have the same type identifier, the values are
       //  members of a "foreign" type.
-      if (isEmpty(filterTypesByValues(consistentTypes, values)) &&
+      if (isEmpty(filterTypesByValues(env, values)) &&
           all(values.slice(1), $$typeEq($$type(values[0])))) {
         //  Create a nullary type for the foreign type.
         return [type0($$type(values[0]))];
@@ -1377,8 +1313,6 @@
         );
       }
 
-      if (checkTypes) assertExpectedTypesInEnvironment(name)(expTypes);
-
       return curry(name,
                    constraints,
                    expTypes,

test/index.js

@@ -788,28 +788,6 @@ describe('def', function() {
     var env = $.env.concat([Integer, $Pair, AnonMaybe]);
     var def = $.create(true, env);
 
-    var T = $.Array($Pair($.String, Maybe($.Number)));
-
-    throws(function() { def('id', {}, [T, T], R.identity); },
-           errorEq(TypeError,
-                   'Definition of ‘id’ references my-package/Maybe which is not in the environment:\n' +
-                   '\n' +
-                   '  - Array ???\n' +
-                   '  - Boolean\n' +
-                   '  - Date\n' +
-                   '  - Error\n' +
-                   '  - Function\n' +
-                   '  - Null\n' +
-                   '  - Number\n' +
-                   '  - Object\n' +
-                   '  - RegExp\n' +
-                   '  - StrMap ???\n' +
-                   '  - String\n' +
-                   '  - Undefined\n' +
-                   '  - Integer\n' +
-                   '  - Pair ??? ???\n' +
-                   '  - AnonMaybe ???\n'));
-
     //  even :: Integer -> Boolean
     var even = def('even', {}, [Integer, $.Boolean], function(x) {
       return x % 2 === 0;