Merge pull request #128 from sanctuary-js/davidchambers/type-idents

[email protected]

Author: davidchambers

bower.json

@@ -19,7 +19,7 @@
     "types"
   ],
   "dependencies": {
-    "sanctuary-type-identifiers": "2.0.1"
+    "sanctuary-type-identifiers": "3.0.0"
   },
   "ignore": [
     "/.circleci/",

index.js

@@ -223,7 +223,7 @@
     };
   }
 
-  TypeClass['@@type'] = 'sanctuary-type-classes/TypeClass@1';
+  TypeClass.prototype['@@type'] = 'sanctuary-type-classes/TypeClass@1';
 
   //  data Location = Constructor | Value
 

package.json

@@ -15,7 +15,7 @@
     "test": "npm run lint && sanctuary-test && npm run doctest"
   },
   "dependencies": {
-    "sanctuary-type-identifiers": "2.0.1"
+    "sanctuary-type-identifiers": "3.0.0"
   },
   "devDependencies": {
     "fantasy-land": "4.0.1",

test/Lazy.js

@@ -11,12 +11,12 @@ function Lazy(f) {
   this.run = f;
 }
 
-Lazy['@@type'] = 'sanctuary-type-classes/Lazy@1';
-
 Lazy[FL.of] = function(a) {
   return Lazy (function() { return a; });
 };
 
+Lazy.prototype['@@type'] = 'sanctuary-type-classes/Lazy@1';
+
 Lazy.prototype[FL.map] = function(f) {
   return Z.ap (Z.of (Lazy, f), this);
 };

test/List.js

@@ -22,8 +22,6 @@ function _List(tag, head, tail) {
   }
 }
 
-List['@@type'] = 'sanctuary-type-classes/List@1';
-
 //  Nil :: List a
 var Nil = List.Nil = new _List ('Nil');
 
@@ -39,6 +37,8 @@ List[FL.of] = function(x) { return Cons (x, Nil); };
 
 List[FL.zero] = List[FL.empty];
 
+List.prototype['@@type'] = 'sanctuary-type-classes/List@1';
+
 List.prototype[FL.equals] = function(other) {
   return this.isNil ?
     other.isNil :

test/Sum.js

@@ -12,10 +12,10 @@ function Sum(value) {
   this.value = value;
 }
 
-Sum['@@type'] = 'sanctuary-type-classes/Sum@1';
-
 Sum[FL.empty] = function() { return Sum (0); };
 
+Sum.prototype['@@type'] = 'sanctuary-type-classes/Sum@1';
+
 Sum.prototype[FL.equals] = function(other) {
   return Z.equals (this.value, other.value);
 };

test/index.js

@@ -319,7 +319,7 @@ test ('Setoid', function() {
   eq (Z.Setoid.test (''), true);
   eq (Z.Setoid.test ([]), true);
   eq (Z.Setoid.test ({}), true);
-  eq (Z.Setoid.test ({'@@type': 'my-package/Quux@1'}), true);
+  eq (Z.Setoid.test ({'@@type': 'my-package/Quux@1'}), false);
 });
 
 test ('Ord', function() {
@@ -668,8 +668,9 @@ test ('equals', function() {
   eq (Z.equals (Math.sin, Math.cos), false);
   eq (Z.equals (Identity (Identity (Identity (0))), Identity (Identity (Identity (0)))), true);
   eq (Z.equals (Identity (Identity (Identity (0))), Identity (Identity (Identity (1)))), false);
-  eq (Z.equals ({'@@type': 'my-package/Quux@1'}, {'@@type': 'my-package/Quux@1'}), true);
+  eq (Z.equals ({'@@type': 'my-package/Quux@1'}, {'@@type': 'my-package/Quux@1'}), false);
   eq (Z.equals (Array.prototype, Array.prototype), true);
+  delete Maybe['@@type'];
   eq (Z.equals (Nothing.constructor, Maybe), true);
   eq (Z.equals ((Just (0)).constructor, Maybe), true);
   eq (Z.equals (Lazy$of (0), Lazy$of (0)), false);