Merge branch 'glimpseio-master'

Author: YousefED

test/programs/class-single/schema.json

@@ -8,5 +8,6 @@
         "propB": {
             "type": "number"
         }
-    }
+    },
+    "required": [ "propA", "propB" ]
 }

test/programs/enums-string/schema.json

@@ -5,6 +5,7 @@
             "$ref": "#/definitions/Enum"
         }
     },
+    "required": [ "foo" ],
     "definitions": {
         "Enum": {
             "type": "string",
@@ -16,4 +17,4 @@
         }
     },
     "$schema": "http://json-schema.org/draft-04/schema#"
-}
+}

test/programs/interface-multi/schema.json

@@ -9,6 +9,7 @@
             "$ref": "#/definitions/MySubObject"
         }
     },
+    "required": [ "subA", "subB" ],
     "definitions": {
         "MySubObject": {
             "type": "object",
@@ -19,7 +20,8 @@
                 "propB": {
                     "type": "number"
                 }
-            }
+            },
+            "required": [ "propA", "propB" ]
         }
     }
 }

test/programs/interface-single/schema.json

@@ -8,5 +8,6 @@
         "propB": {
             "type": "number"
         }
-    }
+    },
+    "required": [ "propA", "propB" ]
 }

test/programs/module-interface-single/schema.json

@@ -8,5 +8,6 @@
             "type": "number"
         }
     },
+    "required": [ "propA", "propB" ],
     "$schema": "http://json-schema.org/draft-04/schema#"
 }

test/programs/optionals/main.ts

@@ -0,0 +1,4 @@
+interface MyObject {
+    required:number;
+    optional?:number;
+}

test/programs/optionals/schema.json

@@ -0,0 +1,13 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "required": [ "required" ],
+    "properties": {
+        "required": {
+            "type": "number"
+        },
+        "optional": {
+            "type": "number"
+        }
+    }
+}

test/schema.test.ts

@@ -7,7 +7,9 @@ const base = "test/programs/";
 
 export function assertSchema(group: string, name: string, type: string) {
     it(group + " should create correct schema", function() {
-        const actual = TJS.generateSchema(TJS.getProgramFromFiles([resolve(base + group + "/" + name)]), type);
+        let settings = TJS.defaultArgs;
+        settings.generateRequired = true;
+        const actual = TJS.generateSchema(TJS.getProgramFromFiles([resolve(base + group + "/" + name)]), type, settings);
 
         const file = readFileSync(base + group + "/schema.json", "utf8")
         const expected = JSON.parse(file);
@@ -36,5 +38,7 @@ describe("schema", function () {
     assertSchema("array-types", "main.ts", "MyArray");
     assertSchema("type-aliases", "main.ts", "MyString");
     assertSchema("type-aliases-fixed-size-array", "main.ts", "MyFixedSizeArray");
+
+    assertSchema("optionals", "main.ts", "MyObject");
 
 });