Fix merge

Author: domoritz

test/programs/annotation-ref/schema.json

@@ -1,21 +1,22 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "type": "object",
-  "definitions": {
-    "MySubObject": {
-      "type": "object"
-    }
-  },
-  "properties": {
-    "externalRef": {
-      "$ref": "http://my-schema.org"
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "definitions": {
+        "MySubObject": {
+            "type": "object"
+        }
     },
-    "externalRefOverride": {
-      "$ref": "http://my-schema.org"
-    }
-  },
-  "required": [
-    "externalRef",
-    "externalRefOverride"
-  ]
-}
+    "properties": {
+        "externalRef": {
+            "$ref": "http://my-schema.org"
+        },
+        "externalRefOverride": {
+            "$ref": "http://my-schema.org"
+        }
+    },
+    "required": [
+        "externalRef",
+        "externalRefOverride"
+    ],
+    "type": "object"
+}
+

test/programs/annotation-tjs/schema.json

@@ -1,53 +1,54 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "properties": {
-    "dateTime": {
-      "format": "date-time",
-      "type": "string"
-    },
-    "email": {
-      "format": "email",
-      "type": "string"
-    },
-    "hostname": {
-      "format": "hostname",
-      "type": "string"
-    },
-    "ipv4": {
-      "format": "ipv4",
-      "type": "string"
-    },
-    "ipv6": {
-      "format": "ipv6",
-      "type": "string"
-    },
-    "jsonPointer": {
-      "format": "json-pointer",
-      "type": "string"
-    },
-    "uri": {
-      "format": "uri",
-      "type": "string"
-    },
-    "uriReference": {
-      "format": "uri-reference",
-      "type": "string"
-    },
-    "uriTemplate": {
-      "format": "uri-template",
-      "type": "string"
-    }
-  },
-  "required": [
-    "dateTime",
-    "email",
-    "hostname",
-    "ipv4",
-    "ipv6",
-    "jsonPointer",
-    "uri",
-    "uriReference",
-    "uriTemplate"
-  ],
-  "type": "object"
-}
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "properties": {
+        "dateTime": {
+            "format": "date-time",
+            "type": "string"
+        },
+        "email": {
+            "format": "email",
+            "type": "string"
+        },
+        "hostname": {
+            "format": "hostname",
+            "type": "string"
+        },
+        "ipv4": {
+            "format": "ipv4",
+            "type": "string"
+        },
+        "ipv6": {
+            "format": "ipv6",
+            "type": "string"
+        },
+        "jsonPointer": {
+            "format": "json-pointer",
+            "type": "string"
+        },
+        "uri": {
+            "format": "uri",
+            "type": "string"
+        },
+        "uriReference": {
+            "format": "uri-reference",
+            "type": "string"
+        },
+        "uriTemplate": {
+            "format": "uri-template",
+            "type": "string"
+        }
+    },
+    "required": [
+        "dateTime",
+        "email",
+        "hostname",
+        "ipv4",
+        "ipv6",
+        "jsonPointer",
+        "uri",
+        "uriReference",
+        "uriTemplate"
+    ],
+    "type": "object"
+}
+

test/programs/enums-value-in-interface/schema.json

@@ -18,3 +18,4 @@
     ],
     "type": "object"
 }
+

test/programs/ignored-required/main.ts

@@ -8,7 +8,7 @@ interface MyObject {
      * @ignore
      */
     ignoredOptional?: boolean;
-    
+
     required: boolean;
     optional?: boolean;
 }

test/schema.test.ts

@@ -21,7 +21,7 @@ export function assertSchema(group: string, type: string, settings: TJS.PartialA
 
         const actual = TJS.generateSchema(TJS.getProgramFromFiles([resolve(BASE + group + "/main.ts")], compilerOptions), type, settings);
 
-        writeFileSync(BASE + group + "/schema.json", stringify(actual, {space: 4}) + "\n\n");
+        // writeFileSync(BASE + group + "/schema.json", stringify(actual, {space: 4}) + "\n\n");
 
         const file = readFileSync(BASE + group + "/schema.json", "utf8");
         const expected = JSON.parse(file);
@@ -186,7 +186,7 @@ describe("schema", () => {
 
         assertSchema("module-interface-single", "MyObject");
 
-        assertSchema("ignored-required", "main.ts", "MyObject");
+        assertSchema("ignored-required", "MyObject");
 
         // not supported yet #116
         // assertSchema("interface-extra-props", "MyObject");
@@ -217,7 +217,7 @@ describe("schema", () => {
         assertSchema("array-and-description", "MyObject");
 
         assertSchema("optionals", "MyObject");
-        assertSchema("optionals-derived", "main.ts", "MyDerived");
+        assertSchema("optionals-derived", "MyDerived");
 
         assertSchema("strict-null-checks", "MyObject", undefined, {
             strictNullChecks: true