Merge pull request YousefED#76 from YousefED/dom/ts-2.1

Typescript 2.1

Author: domoritz

Diff for: .travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
-  - "4.1"
-  - "4.0"
+  - "4"
+  - "7"
 script:
   - npm run lint
   - npm run test

Diff for: package.json

@@ -32,22 +32,21 @@
   "dependencies": {
     "glob": "~7.1.1",
     "json-stable-stringify": "^1.0.1",
-    "typescript": "~2.0.10",
-    "yargs": "^6.4.0"
+    "typescript": "~2.1.4",
+    "yargs": "^6.6.0"
   },
   "devDependencies": {
-    "@types/ajv": "0.0.4",
     "@types/assertion-error": "^1.0.30",
     "@types/chai": "^3.4.34",
     "@types/glob": "^5.0.30",
     "@types/json-stable-stringify": "^1.0.29",
-    "@types/mocha": "^2.2.33",
-    "@types/node": "^6.0.51",
-    "ajv": "^4.9.0",
+    "@types/mocha": "^2.2.37",
+    "@types/node": "^7.0.0",
+    "ajv": "^4.10.4",
     "chai": "^3.5.0",
-    "mocha": "^3.1.2",
-    "source-map-support": "^0.4.6",
-    "tslint": "^4.0.2"
+    "mocha": "^3.2.0",
+    "source-map-support": "^0.4.8",
+    "tslint": "^4.3.1"
   },
   "scripts": {
     "test": "npm run build && mocha -t 5000 --require source-map-support/register test",

Diff for: test/programs/string-literals-inline/main.ts

@@ -1,3 +1,4 @@
 class MyObject {
     foo: "ok" | "fail" | "abort";
+    bar: "ok" | "fail" | "abort" | string;
 }

Diff for: test/programs/string-literals-inline/schema.json

@@ -8,10 +8,14 @@
                 "fail",
                 "ok"
             ]
+        },
+        "bar": {
+            "type": "string"
         }
     },
     "required": [
-        "foo"
+        "foo",
+        "bar"
     ],
     "$schema": "http://json-schema.org/draft-04/schema#"
 }

Diff for: test/programs/string-literals/main.ts

@@ -2,4 +2,5 @@ type result = "ok" | "fail" | "abort";
 
 class MyObject {
     foo: result;
+    bar: result | string;
 }

Diff for: test/programs/string-literals/schema.json

@@ -3,10 +3,14 @@
     "properties": {
         "foo": {
             "$ref": "#/definitions/result"
+        },
+        "bar": {
+            "type": "string"
         }
     },
     "required": [
-        "foo"
+        "foo",
+        "bar"
     ],
     "definitions": {
         "result": {

Diff for: test/programs/type-primitives/main.ts

@@ -7,7 +7,7 @@ class MyObject {
 
     number1: number       = 1;
 
-    /** @type integer */
+    /** @TJS-type integer */
     integer1: number      = 1;
     integer2: integer     = 1;
 

Diff for: tslint.json

@@ -8,14 +8,11 @@
     "curly": true,
     "forin": true,
     "label-position": true,
-    "label-undefined": true,
     "no-arg": true,
     "no-any": false,
     "jsdoc-format": true,
     "semicolon": [true, "always"],
-    "no-duplicate-key": true,
     "no-duplicate-variable": true,
-    "no-unreachable": true,
     "no-consecutive-blank-lines": false,
     "no-console": [
       true,
@@ -32,7 +29,6 @@
     "no-string-literal": false,
     "no-trailing-whitespace": true,
     "no-unused-expression": true,
-    "no-unused-variable": true,
     "no-use-before-declare": true,
     "one-line": [
       true,