Update TypeClass.test to respect constraints

sanctuary-js · Apr 21, 2021 · b51561e · b51561e
1 parent 45153fb
commit b51561e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/index.js b/index.js
@@ -294,7 +294,7 @@
       (function() {
         var $seen = [];
         return function(x) {
-//        if ($seen.includes (x)) return true;
+          if ($seen.includes (x)) return true;
 
           $seen.push (x);
           try {
@@ -768,7 +768,7 @@
     return [];
   }
 
-  //  Array$prototype$equals :: Array a ~> Array a -> Boolean
+  //  Array$prototype$equals :: Setoid a => Array a ~> Array a -> Boolean
   function Array$prototype$equals(other) {
     if (other.length !== this.length) return false;
     for (var idx = 0; idx < this.length; idx += 1) {
@@ -777,7 +777,7 @@
     return true;
   }
 
-  //  Array$prototype$lte :: Array a ~> Array a -> Boolean
+  //  Array$prototype$lte :: Ord a => Array a ~> Array a -> Boolean
   function Array$prototype$lte(other) {
     for (var idx = 0; true; idx += 1) {
       if (idx === this.length) return true;
@@ -883,15 +883,15 @@
     return {};
   }
 
-  //  Object$prototype$equals :: StrMap a ~> StrMap a -> Boolean
+  //  Object$prototype$equals :: Setoid a => StrMap a ~> StrMap a -> Boolean
   function Object$prototype$equals(other) {
     var self = this;
     var keys = sortedKeys (this);
     return equals (keys, sortedKeys (other)) &&
            keys.every (function(k) { return equals (self[k], other[k]); });
   }
 
-  //  Object$prototype$lte :: StrMap a ~> StrMap a -> Boolean
+  //  Object$prototype$lte :: Ord a => StrMap a ~> StrMap a -> Boolean
   function Object$prototype$lte(other) {
     var theseKeys = sortedKeys (this);
     var otherKeys = sortedKeys (other);
@@ -1092,9 +1092,9 @@
       case 'String#fantasy-land/concat':
         return String$prototype$concat;
       case 'Array#fantasy-land/equals':
-        return Array$prototype$equals;
+        return value.every (Setoid.test) ? Array$prototype$equals : null;
       case 'Array#fantasy-land/lte':
-        return Array$prototype$lte;
+        return value.every (Ord.test) ? Array$prototype$lte : null;
       case 'Array#fantasy-land/concat':
         return Array$prototype$concat;
       case 'Array#fantasy-land/filter':
@@ -1120,9 +1120,13 @@
       case 'Error#fantasy-land/equals':
         return Error$prototype$equals;
       case 'Object#fantasy-land/equals':
-        return Object$prototype$equals;
+        return (Object.values (value)).every (Setoid.test) ?
+          Object$prototype$equals :
+          null;
       case 'Object#fantasy-land/lte':
-        return Object$prototype$lte;
+        return (Object.values (value)).every (Ord.test) ?
+          Object$prototype$lte :
+          null;
       case 'Object#fantasy-land/concat':
         return Object$prototype$concat;
       case 'Object#fantasy-land/filter':

diff --git a/test/index.js b/test/index.js
@@ -323,6 +323,8 @@ test ('Setoid', function() {
   eq (Z.Setoid.test ([]), true);
   eq (Z.Setoid.test ({}), true);
   eq (Z.Setoid.test (Useless), false);
+  eq (Z.Setoid.test ([Useless]), false);
+  eq (Z.Setoid.test ({foo: Useless}), false);
 });
 
 test ('Ord', function() {
@@ -334,6 +336,8 @@ test ('Ord', function() {
   eq (Z.Ord.test ([]), true);
   eq (Z.Ord.test ({}), true);
   eq (Z.Ord.test (Math.abs), false);
+  eq (Z.Ord.test ([Math.abs]), false);
+  eq (Z.Ord.test ({foo: Math.abs}), false);
 });
 
 test ('Semigroupoid', function() {