Clarify some more types

Author: domoritz

tsconfig.json

@@ -9,6 +9,7 @@
         "declaration": true,
         "noImplicitAny": true,
         "suppressImplicitAnyIndexErrors": true,
+        "strictNullChecks": false,
         "removeComments": true,
         "noLib": false,
         "preserveConstEnums": true,

typescript-json-schema.d.ts

@@ -9,7 +9,7 @@ export declare function getDefaultArgs(): {
     usePropertyOrder: boolean;
     generateRequired: boolean;
     strictNullChecks: boolean;
-    out: any;
+    out: string;
 };
 export declare class JsonSchemaGenerator {
     private args;
@@ -33,7 +33,7 @@ export declare class JsonSchemaGenerator {
         usePropertyOrder: boolean;
         generateRequired: boolean;
         strictNullChecks: boolean;
-        out: any;
+        out: string;
     });
     readonly ReffedDefinitions: {
         [key: string]: any;
@@ -69,7 +69,7 @@ export declare function generateSchema(program: ts.Program, fullTypeName: string
     usePropertyOrder: boolean;
     generateRequired: boolean;
     strictNullChecks: boolean;
-    out: any;
+    out: string;
 }): any;
 export declare function programFromConfig(configFileName: string): ts.Program;
 export declare function exec(filePattern: string, fullTypeName: string, args?: {
@@ -82,6 +82,6 @@ export declare function exec(filePattern: string, fullTypeName: string, args?: {
     usePropertyOrder: boolean;
     generateRequired: boolean;
     strictNullChecks: boolean;
-    out: any;
+    out: string;
 }): void;
 export declare function run(): void;

typescript-json-schema.ts

@@ -17,7 +17,7 @@ export function getDefaultArgs() {
         usePropertyOrder: false,
         generateRequired: false,
         strictNullChecks: false,
-        out: undefined as string
+        out: ""
     };
 }
 
@@ -472,15 +472,15 @@ export class JsonSchemaGenerator {
             if (this.args.usePropertyOrder) {
                 // propertyOrder is non-standard, but useful:
                 // https://github.com/json-schema/json-schema/issues/87
-                const propertyOrder = props.reduce((order, prop) => {
+                const propertyOrder = props.reduce((order: string[], prop: ts.Symbol) => {
                     order.push(prop.getName());
                     return order;
                 }, []);
 
                 definition.propertyOrder = propertyOrder;
             }
             if (this.args.generateRequired) {
-                const requiredProps = props.reduce((required, prop) => {
+                const requiredProps = props.reduce((required: string[], prop: ts.Symbol) => {
                     if (!(prop.flags & ts.SymbolFlags.Optional) && !(<any>prop).mayBeUndefined) {
                         required.push(prop.getName());
                     }