Add tslint and fix linting errors

domoritz · domoritz · commit 41414325c5c2 · 2016-11-02T18:43:23.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,3 +2,6 @@ language: node_js
 node_js:
   - "4.1"
   - "4.0"
+script:
+  - npm run lint
+  - npm run test
diff --git a/package.json b/package.json
@@ -16,10 +16,12 @@
     "type": "git",
     "url": "git@github.com:YousefED/typescript-json-schema.git"
   },
-  "licenses": [{
-    "type": "Apache",
-    "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
-  }],
+  "licenses": [
+    {
+      "type": "Apache",
+      "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  ],
   "optionalDependencies": {},
   "keywords": [
     "typescript",
@@ -36,10 +38,12 @@
   "devDependencies": {
     "chai": "^3.5.0",
     "mocha": "^2.4.5",
-    "source-map-support": "^0.4.0"
+    "source-map-support": "^0.4.0",
+    "tslint": "^3.15.1"
   },
   "scripts": {
     "test": "npm run build && mocha -t 5000 --require source-map-support/register test",
-    "build": "tsc -p ."
+    "build": "tsc -p .",
+    "lint": "tslint -c tslint.json 'typescript-json-schema.ts' 'test/**/*.ts' --exclude '**/*.d.ts'"
   }
 }
diff --git a/test/programs/array-and-description/main.ts b/test/programs/array-and-description/main.ts
@@ -5,4 +5,4 @@ export interface MyObject {
   name?: string;
   description?: string;
   test: any[];
-}
+}
diff --git a/test/programs/array-types/main.ts b/test/programs/array-types/main.ts
@@ -1,3 +1,3 @@
 interface MyArray {
     [index: number]: string | number;
-}
+}
diff --git a/test/programs/comments-override/main.ts b/test/programs/comments-override/main.ts
@@ -4,17 +4,17 @@
  * @additionalProperties true
  */
 export interface MySubObject {
-    value : string;
+    value: string;
 }
 
 export interface MyObject {
-    list : MySubObject[];
-    
-    sub1 : MySubObject;
+    list: MySubObject[];
+
+    sub1: MySubObject;
 
     /**
      * Property-level description
      * @additionalProperties false
      */
-    sub2 : MySubObject;
-}
+    sub2: MySubObject;
+}
diff --git a/test/programs/comments/main.ts b/test/programs/comments/main.ts
@@ -23,13 +23,13 @@ interface MyObject {
      * @minimum 0
      * @maximum 100
      */
-    opacity : number;
-    
+    opacity: number;
+
     /**
      * Description of field position, of aliased type Vector3D, which should inherit its annotations
      */
-    position : Vector3D;
-    
+    position: Vector3D;
+
     /**
      * Description of rotation, a field with an anonymous type
      */
@@ -40,7 +40,5 @@ interface MyObject {
          * @maximum 90
          */
         yaw: number;
-    }
-    
+    };
 }
-
diff --git a/test/programs/enums-mixed/main.ts b/test/programs/enums-mixed/main.ts
@@ -1,11 +1,11 @@
 enum Enum {
     A, // = 0
-		B = 1,
-		C = true as any,
-  	D = 'str' as any,
+    B = 1,
+    C = true as any,
+    D = "str" as any,
     E = null
 }
 
 interface MyObject {
-	foo: Enum
+  foo: Enum;
 }
diff --git a/test/programs/enums-number/main.ts b/test/programs/enums-number/main.ts
@@ -4,5 +4,5 @@ enum Enum {
 }
 
 interface MyObject {
-  foo: Enum
+  foo: Enum;
 }
diff --git a/test/programs/enums-string/main.ts b/test/programs/enums-string/main.ts
@@ -1,8 +1,8 @@
 enum Enum {
-    X = 'x' as any,
-  	Y = 'y' as any
+    X = "x" as any,
+    Y = "y" as any
 }
 
 interface MyObject {
-	foo: Enum
+    foo: Enum;
 }
diff --git a/test/programs/map-types/main.ts b/test/programs/map-types/main.ts
@@ -2,18 +2,18 @@
 interface MyType {}
 
 interface MyMap1 {
-    [id : string] : MyType;
+    [id: string]: MyType;
 }
 
 /**
  * The additionalProperties annotation should be ignored
  * @additionalProperties false
  */
 interface MyMap2 {
-    [id : string] : (string | number);
+    [id: string]: (string | number);
 }
 
 interface MyObject {
-    map1 : MyMap1;
-    map2 : MyMap2;
-}
+    map1: MyMap1;
+    map2: MyMap2;
+}
diff --git a/test/programs/namespace/main.ts b/test/programs/namespace/main.ts
@@ -1,6 +1,6 @@
 export namespace Types {
-  export const X: 'x' = 'x';
-  export const Y: 'y' = 'y';
+  export const X: "x" = "x";
+  export const Y: "y" = "y";
 }
 
 export type Type = typeof Types.X | typeof Types.Y;
diff --git a/test/programs/strict-null-checks/main.ts b/test/programs/strict-null-checks/main.ts
@@ -1,11 +1,11 @@
- 
+
 class MyObject {
      val: number;
-     val_nullable: number | null;
-     val_undef: number | undefined;
-     val_opt?: number;
+     valNullable: number | null;
+     valUndef: number | undefined;
+     valOpt?: number;
 
-     val_true_opt?: true;
-     val_true_or_null: true|null;
-     val_true: true|true; // twice to check that it will appear only once
+     valTrueOpt?: true;
+     valTrueOrNull: true|null;
+     valTrue: true|true; // twice to check that it will appear only once
 }
diff --git a/test/programs/strict-null-checks/schema.json b/test/programs/strict-null-checks/schema.json
@@ -4,27 +4,27 @@
         "val": {
             "type": "number"
         },
-        "val_nullable": {
+        "valNullable": {
             "type": [
                 "null",
                 "number"
             ]
         },
-        "val_undef": {
+        "valUndef": {
             "type": "number"
         },
-        "val_opt": {
+        "valOpt": {
             "type": "number"
         },
-        "val_true": {
+        "valTrue": {
             "enum": [ true ],
             "type": "boolean"
         },
-        "val_true_opt": {
+        "valTrueOpt": {
             "enum": [ true ],
             "type": "boolean"
         },
-        "val_true_or_null": {
+        "valTrueOrNull": {
             "anyOf": [
                 { "enum": [ true ], "type": "boolean" },
                 { "type": "null"  }
@@ -33,9 +33,9 @@
     },
     "required": [
         "val",
-        "val_nullable",
-        "val_true_or_null",
-        "val_true"
+        "valNullable",
+        "valTrueOrNull",
+        "valTrue"
     ],
     "$schema": "http://json-schema.org/draft-04/schema#"
 }
diff --git a/test/programs/string-literals-inline/main.ts b/test/programs/string-literals-inline/main.ts
@@ -1,3 +1,3 @@
 class MyObject {
-	foo: "ok" | "fail" | "abort"
-}
+    foo: "ok" | "fail" | "abort";
+}
diff --git a/test/programs/string-literals/main.ts b/test/programs/string-literals/main.ts
@@ -1,5 +1,5 @@
 type result = "ok" | "fail" | "abort";
 
 class MyObject {
-	foo: result
-}
+    foo: result;
+}
diff --git a/test/programs/type-aliases-multitype-array/main.ts b/test/programs/type-aliases-multitype-array/main.ts
@@ -1,8 +1,7 @@
 
 type BasicArray = (string | number)[];
 
-interface MyObject
-{
+interface MyObject {
     array: BasicArray;
 }
 
diff --git a/test/programs/type-aliases/main.ts b/test/programs/type-aliases/main.ts
@@ -1 +1 @@
-type MyString = string;   
+type MyString = string;
diff --git a/test/programs/type-anonymous/main.ts b/test/programs/type-anonymous/main.ts
@@ -2,8 +2,8 @@
     FieldWithAnonType: {
         SubfieldA: number;
         SubfieldB: (string | number);
-        SubfieldC : {
+        SubfieldC: {
             SubsubfieldA: number[];
         }
-    }
-}
+    };
+}
diff --git a/test/programs/type-intersection/main.ts b/test/programs/type-intersection/main.ts
@@ -5,7 +5,6 @@ interface Type2 {
     value2: number;
 }
 
-interface MyObject
-{
+interface MyObject {
     value: Type1 & Type2;
-}
+}
diff --git a/test/programs/type-nullable/main.ts b/test/programs/type-nullable/main.ts
@@ -17,11 +17,10 @@ type Ref = { foo: number };
 type MyType5 = Ref;
 
 
-interface MyObject
-{
-    var1 : MyType1;
-    var2 : MyType2;
-    var3 : MyType3;
-    var4 : MyType4;
-    var5 : MyType5;
+interface MyObject {
+    var1: MyType1;
+    var2: MyType2;
+    var3: MyType3;
+    var4: MyType4;
+    var5: MyType5;
 }
diff --git a/test/programs/type-primitives/main.ts b/test/programs/type-primitives/main.ts
@@ -1,23 +1,22 @@
- 
- // Special type, should not appear in the schema
- type integer = number;
- 
- class MyObject {
-
-     boolean1: boolean     = true;
-     
-     number1: number       = 1;
-
-     /** @type integer */
-     integer1: number      = 1;
-     integer2: integer     = 1;
-     
-     string1: string       = "defaultValue";
-     
-     array1: Array<any>    = null;
-     array2: Array<number> = null;
-     
-     object1: any          = null;
-     object2: {}           = null;
-
-}
+// Special type, should not appear in the schema
+type integer = number;
+
+class MyObject {
+
+    boolean1: boolean     = true;
+
+    number1: number       = 1;
+
+    /** @type integer */
+    integer1: number      = 1;
+    integer2: integer     = 1;
+
+    string1: string       = "defaultValue";
+
+    array1: Array<any>    = null;
+    array2: Array<number> = null;
+
+    object1: any          = null;
+    object2: {}           = null;
+
+}
diff --git a/test/programs/type-union/main.ts b/test/programs/type-union/main.ts
@@ -5,8 +5,7 @@ type MyType1 = string | number;
 // Non-simple union (generates a "oneOf"/"anyOf")
 type MyType2 = string | number[];
 
-interface MyObject
-{
-    var1 : MyType1;
-    var2 : MyType2;
+interface MyObject {
+    var1: MyType1;
+    var2: MyType2;
 }
diff --git a/test/schema.test.ts b/test/schema.test.ts
diff --git a/tslint.json b/tslint.json
diff --git a/typescript-json-schema.d.ts b/typescript-json-schema.d.ts
diff --git a/typescript-json-schema.js b/typescript-json-schema.js
diff --git a/typescript-json-schema.js.map b/typescript-json-schema.js.map
diff --git a/typescript-json-schema.ts b/typescript-json-schema.ts

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 interface MyArray {
     [index: number]: string | number;
 -}
 +}
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ enum Enum {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`interface MyObject {`
`7`		`- foo: Enum`
	`7`	`+ foo: Enum;`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`enum Enum {`
`2`		`- X = 'x' as any,`
`3`		`- Y = 'y' as any`
	`2`	`+ X = "x" as any,`
	`3`	`+ Y = "y" as any`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`interface MyObject {`
`7`		`- foo: Enum`
	`7`	`+ foo: Enum;`
`8`	`8`	`}`