typescript es6 compliance

Author: knazeri

build/multiplex.d.ts

@@ -1,7 +1,8 @@
 module MxTests {
+    "use strict";
 
     import Collection = mx.Collection;
-
+    var Collection = mx.Collection;
 
 
     /* Factory methods

src/typescript/multiplex.d.ts

@@ -1,8 +1,11 @@
 module MxTests {
+    "use strict";
 
     import Dictionary = mx.Dictionary;
-    import KeyValuePair = mx.KeyValuePair;
-    import EqualityComparer = mx.EqualityComparer;
+
+    var Dictionary = mx.Dictionary,
+        KeyValuePair = mx.KeyValuePair,
+        EqualityComparer = mx.EqualityComparer;
 
 
 
@@ -124,7 +127,7 @@
     QUnit.test("set", function (assert) {
 
         var _dic = CreateDictionary();
-        
+
         _dic.set(1, "AA");
         assert.ok(_dic.get(1) === "AA", "dictionary set value!");
 
@@ -171,11 +174,8 @@
             _pair2 = new KeyValuePair(1, "A");
 
         assert.ok(_pair1.key === 1 && _pair1.value === "A", "KeyValuePair get key/value!");
-
-        _pair1.key = 2;
-        _pair1.value = "B";
-        assert.ok(_pair1.key === 1 && _pair1.value === "A", "KeyValuePair key/value immutable!");
-
+        assert.throws(() => _pair1.key = 2, "throws an error trysing to set KeyValuePair key!");
+        assert.throws(() => _pair1.value = "B", "throws an error trysing to set KeyValuePair value!");
         assert.ok(mx.hash(_pair1) === mx.hash(_pair2), "KeyValuePair get hash code!");
         assert.ok(mx.equals(_pair1, _pair2), "KeyValuePair equality check!");
     });

test/typescript/collection.ts

@@ -1,16 +1,18 @@
 module MxTests {
+    "use strict";
 
     import HashSet = mx.HashSet;
-    import EqualityComparer = mx.EqualityComparer;
 
+    var HashSet = mx.HashSet,
+        EqualityComparer = mx.EqualityComparer;
 
 
     /* Factory methods
     ---------------------------------------------------------------------- */
 
     interface SimpleObject {
         name: string;
-        val: number;
+        value: number;
     }
 
 
@@ -21,12 +23,12 @@
 
     function CreateObjectHashSet(): HashSet<SimpleObject> {
 
-        var _items: SimpleObject[] = [{ name: "A", val: 1 }, { name: "A", val: 2 }, { name: "B", val: 3 }, { name: "B", val: 4 }],
+        var _items: SimpleObject[] = [{ name: "A", value: 1 }, { name: "A", value: 2 }, { name: "B", value: 3 }, { name: "B", value: 4 }],
             _comparer = EqualityComparer.create<SimpleObject>(obj => mx.hash(obj.name), (a, b) => a.name === b.name);
 
         return new HashSet<SimpleObject>(_items, _comparer);
     }
-
+    
 
 
     /* Tests
@@ -51,8 +53,8 @@
 
         assert.ok(_hash1.add(6) === true, "add item to a HashSet of numbers!");
         assert.ok(_hash1.add(1) === false, "add existing item to a HashSet of numbers!");
-        assert.ok(_hash2.add({ name: "C", val: 5 }) === true, "add item to a HashSet of objects!");
-        assert.ok(_hash2.add({ name: "A", val: 5 }) === false, "add an existing item to a HashSet of objects!");
+        assert.ok(_hash2.add({ name: "C", value: 5 }) === true, "add item to a HashSet of objects!");
+        assert.ok(_hash2.add({ name: "A", value: 5 }) === false, "add an existing item to a HashSet of objects!");
     });
 
 
@@ -72,8 +74,8 @@
 
         assert.ok(_hash1.contains(1) === true, "HashSet of numbers contains an item!");
         assert.ok(_hash1.contains(6) === false, "HashSet of numbers does not contain an item!");
-        assert.ok(_hash2.contains({ name: "A", val: 5 }) === true, "HashSet of objects contains an item!");
-        assert.ok(_hash2.contains({ name: "C", val: 5 }) === false, "HashSet of objects does not contain an item!");
+        assert.ok(_hash2.contains({ name: "A", value: 5 }) === true, "HashSet of objects contains an item!");
+        assert.ok(_hash2.contains({ name: "C", value: 5 }) === false, "HashSet of objects does not contain an item!");
     });
 
 
@@ -95,7 +97,7 @@
             _hash2 = CreateObjectHashSet();
 
         assert.ok(_hash1.comparer() === mx.EqualityComparer.defaultComparer, "HashSet default comparer!");
-        assert.ok(_hash2.comparer().equals({ name: "A", val: 1 }, { name: "A", val: 2 }), "HashSet custom comparer!");
+        assert.ok(_hash2.comparer().equals({ name: "A", value: 1 }, { name: "A", value: 2 }), "HashSet custom comparer!");
     });
 
 
@@ -106,8 +108,8 @@
 
         assert.ok(_hash1.remove(1) === true, "HashSet of numbers remove an item!");
         assert.ok(_hash1.remove(1) === false, "HashSet of numbers remove non existing item!");
-        assert.ok(_hash2.remove({ name: "A", val: 1 }) === true, "HashSet of objects remove an item!");
-        assert.ok(_hash2.remove({ name: "A", val: 1 }) === false, "HashSet of objects remove non existing item!");
+        assert.ok(_hash2.remove({ name: "A", value: 1 }) === true, "HashSet of objects remove an item!");
+        assert.ok(_hash2.remove({ name: "A", value: 1 }) === false, "HashSet of objects remove non existing item!");
     });
 
 
@@ -120,8 +122,8 @@
         assert.ok(_hash1.removeWhere(t => t < 3) === 0, "HashSet of numbers remove with invalid predicate, get number of items removed!");
         assert.ok(_hash1.count() === 3, "HashSet of numbers remove with predicate, get count!");
 
-        assert.ok(_hash2.removeWhere(t => t.val < 3) === 1, "HashSet of objects remove with predicate, get number of items removed!");
-        assert.ok(_hash2.removeWhere(t => t.val < 3) === 0, "HashSet of objects remove with invalid predicate, get number of items removed!");
+        assert.ok(_hash2.removeWhere(t => t.value < 3) === 1, "HashSet of objects remove with predicate, get number of items removed!");
+        assert.ok(_hash2.removeWhere(t => t.value < 3) === 0, "HashSet of objects remove with invalid predicate, get number of items removed!");
         assert.ok(_hash2.count() === 1, "HashSet of objects remove with predicate, get count!");
     });
 
@@ -133,11 +135,11 @@
             _hash3 = CreateNumericHashSet();
 
         _hash1.exceptWith([1, 2, 3]);
-        _hash2.exceptWith([{ name: "A", val: 0 }]);
+        _hash2.exceptWith([{ name: "A", value: 0 }]);
         _hash3.exceptWith(CreateNumericHashSet());
 
         assert.ok(_hash1.count() === 2 && _hash1.contains(1) === false, "HashSet of numbers except a collection, get count!");
-        assert.ok(_hash2.count() === 1 && _hash2.contains({ name: "A", val: 0 }) === false, "HashSet of objects except a collection, get count!");
+        assert.ok(_hash2.count() === 1 && _hash2.contains({ name: "A", value: 0 }) === false, "HashSet of objects except a collection, get count!");
         assert.ok(_hash3.count() === 0, "HashSet of numbers except an equal set, get count!");
     });
 
@@ -149,11 +151,11 @@
             _hash3 = CreateNumericHashSet();
 
         _hash1.intersectWith([1, 2, 3]);
-        _hash2.intersectWith([{ name: "A", val: 0 }]);
+        _hash2.intersectWith([{ name: "A", value: 0 }]);
         _hash3.intersectWith(CreateNumericHashSet());
 
         assert.ok(_hash1.count() === 3 && _hash1.contains(1) === true, "HashSet of numbers intersect with a collection, get count!");
-        assert.ok(_hash2.count() === 1 && _hash2.contains({ name: "A", val: 0 }) === true, "HashSet of objects intersect with a collection, get count!");
+        assert.ok(_hash2.count() === 1 && _hash2.contains({ name: "A", value: 0 }) === true, "HashSet of objects intersect with a collection, get count!");
         assert.ok(_hash3.count() === 5, "HashSet of numbers intersect with an equal set, get count!");
     });
 
@@ -212,7 +214,7 @@
             _hash2 = CreateObjectHashSet();
 
         assert.ok(_hash1.overlaps([1, 2, 3]) === true, "HashSet of numbers overlaps with another collection!");
-        assert.ok(_hash2.overlaps([{ name: "A", val: 0 }]) === true, "HashSet of objects overlaps with another collection!");
+        assert.ok(_hash2.overlaps([{ name: "A", value: 0 }]) === true, "HashSet of objects overlaps with another collection!");
         assert.ok(new HashSet().overlaps([1, 2, 3]) === false, "an empty HashSet does not overlap with another collection!");
     });
 
@@ -236,13 +238,13 @@
             _hash3 = CreateNumericHashSet();
 
         _hash1.symmetricExceptWith([2, 3, 4]);
-        _hash2.symmetricExceptWith([{ name: "A", val: 0 }]);
+        _hash2.symmetricExceptWith([{ name: "A", value: 0 }]);
         _hash3.exceptWith(CreateNumericHashSet());
 
         assert.ok(_hash1.count() === 2, "HashSet of numbers symmetric except another collection, get count!");
         assert.ok(_hash1.contains(1) === true && _hash1.contains(5) === true, "HashSet of numbers symmetric except another collection, check contains!");
         assert.ok(_hash2.count() === 1, "HashSet of objects symmetric except another collection, get count!");
-        assert.ok(_hash2.contains({ name: "A", val: 0 }) === false && _hash2.contains({ name: "B", val: 0 }) === true, "HashSet of objects symmetric except another collection, check contains!");
+        assert.ok(_hash2.contains({ name: "A", value: 0 }) === false && _hash2.contains({ name: "B", value: 0 }) === true, "HashSet of objects symmetric except another collection, check contains!");
         assert.ok(_hash3.count() === 0, "HashSet of numbers symmetric except an equal set, get count!");
     });
 
@@ -254,13 +256,13 @@
             _hash3 = CreateNumericHashSet();
 
         _hash1.unionWith([5, 6, 7, 8]);
-        _hash2.unionWith([{ name: "A", val: 5 }, { name: "B", val: 6 }, { name: "C", val: 7 }, { name: "D", val: 8 }]);
+        _hash2.unionWith([{ name: "A", value: 5 }, { name: "B", value: 6 }, { name: "C", value: 7 }, { name: "D", value: 8 }]);
         _hash3.unionWith(CreateNumericHashSet());
 
         assert.ok(_hash1.count() === 8, "HashSet of numbers union with another collection, get count!");
         assert.ok(_hash1.contains(1) === true && _hash1.contains(8) === true, "HashSet of numbers union with another collection, check contains!");
         assert.ok(_hash2.count() === 4, "HashSet of objects union with another collection, get count!");
-        assert.ok(_hash2.contains({ name: "A", val: 0 }) === true && _hash2.contains({ name: "D", val: 0 }) === true, "HashSet of objects union with another collection, check contains!");
+        assert.ok(_hash2.contains({ name: "A", value: 0 }) === true && _hash2.contains({ name: "D", value: 0 }) === true, "HashSet of objects union with another collection, check contains!");
         assert.ok(_hash3.count() === 5, "HashSet of numbers union with an equal set, get count!");
     });
 
@@ -271,6 +273,6 @@
             _hash2 = CreateObjectHashSet();
 
         assert.deepEqual(_hash1.select(t => t * 2).where(t => t > 5).toArray(), [6, 8, 10], "select-where-toArray over a HashSet of numbers!");
-        assert.deepEqual(_hash2.select(t => t.val * 2).where(t => t > 5).toArray(), [6], "select-where-toArray over a HashSet of objects!");
+        assert.deepEqual(_hash2.select(t => t.value * 2).where(t => t > 5).toArray(), [6], "select-where-toArray over a HashSet of objects!");
     });
 }

test/typescript/dictionary.ts

@@ -1,8 +1,11 @@
 module MxTests {
+    "use strict";
 
-    import LinkedListNode = mx.LinkedListNode;
     import LinkedList = mx.LinkedList;
 
+    var LinkedList = mx.LinkedList,
+        LinkedListNode = mx.LinkedListNode;
+
 
 
     /* Factory methods

test/typescript/hashset.ts

@@ -1,4 +1,5 @@
 module MxTests {
+    "use strict";
 
 
     /* Classes
@@ -10,15 +11,15 @@
 
 
     // class overriding '__hash__' and '__equals__' methods.
-    class SimpleClassWithComparer {
+    class SimpleClassWithComparer implements mx.RuntimeComparer {
 
         constructor(val: number) {
             this.value = val;
             this.name = val.toString();
         }
 
-        public value: number;
         public name: string;
+        public value: number;
 
         __hash__(): number {
             return mx.hash(this.value, this.name);
@@ -34,9 +35,6 @@
     /* Factory methods
     ---------------------------------------------------------------------- */
 
-    var _time = new Date().getTime();
-
-
     function CreateObjectLiteralArray(): Object[] {
         return mx.range(0, 10).select(t => ({})).toArray();
     }
@@ -79,7 +77,7 @@
 
 
     function CreateDateArray(): Date[] {
-        return mx.range(0, 10).select(t => new Date(_time + t)).toArray();
+        return mx.range(0, 10).select(t => new Date(new Date().getTime() + t)).toArray();
     }
 
 

test/typescript/linkedlist.ts

@@ -1,7 +1,8 @@
 module MxTests {
-    
-    import List = mx.List;
+    "use strict";
 
+    import List = mx.List;
+    var List = mx.List;
 
 
     /* Factory methods
@@ -63,9 +64,6 @@
 
         assert.ok(_rlist.count() === 10, "readOnlyCollection count!");
         assert.ok(_rlist[0] === 0, "readOnlyCollection get!");
-
-        _rlist[0] = 100;
-        assert.ok(_rlist[0] === 0, "readOnlyCollection set!");
     });
 
 

test/typescript/linq.ts

@@ -1,10 +1,13 @@
 module MxTests {
+    "use strict";
+
+    import Lookup = mx.Lookup;
 
 
     /* Factory methods
     ---------------------------------------------------------------------- */
 
-    function CreateLookup(): mx.Lookup<number, number> {
+    function CreateLookup(): Lookup<number, number> {
         return mx([1, 1, 2, 3, 3, 4, 4, 4]).toLookup(t => t);
     }
 

test/typescript/list.ts

@@ -1,8 +1,11 @@
 module MxTests {
+    "use strict";
 
     import Enumerator = mx.Enumerator;
     import Enumerable = mx.Enumerable;
 
+    var Enumerator = mx.Enumerator,
+        Enumerable = mx.Enumerable;
 
 
     /* Factory methods