Fixed map/set constructors

Perryvw · Perryvw · commit cb5390c65524 · 2018-07-20T11:50:08.000+02:00
diff --git a/src/lualib/Map.ts b/src/lualib/Map.ts
@@ -3,14 +3,19 @@ class Map<TKey, TValue> {
 
     private items: {[key: string]: TValue}; // Type of key is actually TKey
 
-    constructor(other: any) {
+    constructor(other: Map<TKey, TValue> | Array<[TKey, TValue]>) {
         this.items = {};
         this.size = 0;
 
-        if (other) {
+        if (other instanceof Map) {
             this.size = other.size;
             for (const [key, value] of other.entries()) {
-                this.items[key] = value;
+                this.items[key as any] = value;
+            }
+        } else if (other !== undefined) {
+            this.size = other.length;
+            for (const [key, value] of other) {
+                this.items[key as any] = value;
             }
         }
     }
diff --git a/src/lualib/Set.ts b/src/lualib/Set.ts
@@ -3,14 +3,19 @@ class Set<TValue> {
 
     private items: {[key: string]: boolean}; // Key type is actually TValue
 
-    constructor(other: any) {
+    constructor(other: Set<TValue> | TValue[]) {
         this.items = {};
         this.size = 0;
 
-        if (other) {
+        if (other instanceof Set) {
             this.size = other.size;
             for (const value of other.values()) {
-                this.items[value] = true;
+                this.items[value as any] = true as any;
+            }
+        } else if (other !== undefined) {
+            this.size = other.length;
+            for (const value of other) {
+                this.items[value as any] = true as any;
             }
         }
     }
diff --git a/test/unit/lualib/set.spec.ts b/test/unit/lualib/set.spec.ts
@@ -1,7 +1,6 @@
-import { Expect, Test, TestCase, FocusTests } from "alsatian";
+import { Expect, Test, TestCase } from "alsatian";
 import * as util from "../../src/util";
 
-@FocusTests
 export class SetTests {
     @Test("set constructor")
     public setConstructor() {
