Fixes YousefED#72

Author: domoritz

test/programs/type-nullable/main.ts

@@ -16,11 +16,18 @@ type Ref = { foo: number };
 /** @nullable */
 type MyType5 = Ref;
 
+interface MyType6 {};
 
 interface MyObject {
     var1: MyType1;
     var2: MyType2;
     var3: MyType3;
     var4: MyType4;
     var5: MyType5;
+
+    /**
+     * @nullable
+     */
+    var6: MyType6;
+    var7: MyType6;
 }

test/programs/type-nullable/schema.json

@@ -1,5 +1,12 @@
 {
-    "type": "object",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "definitions": {
+        "MyType6": {
+            "properties": {
+            },
+            "type": "object"
+        }
+    },
     "properties": {
         "var1": {
             "type": [
@@ -17,10 +24,10 @@
         "var3": {
             "anyOf": [
                 {
-                    "type": "array",
                     "items": {
                         "type": "number"
-                    }
+                    },
+                    "type": "array"
                 },
                 {
                     "type": "string"
@@ -33,10 +40,10 @@
         "var4": {
             "anyOf": [
                 {
-                    "type": "array",
                     "items": {
                         "type": "number"
-                    }
+                    },
+                    "type": "array"
                 },
                 {
                     "type": "null"
@@ -46,28 +53,43 @@
         "var5": {
             "anyOf": [
                 {
-                    "type": "object",
                     "properties": {
                         "foo": {
                             "type": "number"
                         }
                     },
                     "required": [
                         "foo"
-                    ]
+                    ],
+                    "type": "object"
                 },
                 {
                     "type": "null"
                 }
             ]
+        },
+        "var6": {
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/MyType6"
+                },
+                {
+                    "type": "null"
+                }
+            ]
+        },
+        "var7": {
+            "$ref": "#/definitions/MyType6"
         }
     },
     "required": [
         "var1",
         "var2",
         "var3",
         "var4",
-        "var5"
+        "var5",
+        "var6",
+        "var7"
     ],
-    "$schema": "http://json-schema.org/draft-04/schema#"
-}
+    "type": "object"
+}

typescript-json-schema.ts

@@ -619,10 +619,10 @@ export class JsonSchemaGenerator {
             } else {
                 this.getClassDefinition(typ, tc, definition);
             }
+        }
 
-            if (otherAnnotations["nullable"]) {
-                this.makeNullable(definition);
-            }
+        if (otherAnnotations["nullable"]) {
+            this.makeNullable(returnedDefinition);
         }
 
         return returnedDefinition;