Really include only requested include files

Author: bergundy

Diff for: test/programs/user-symbols/main.ts

@@ -0,0 +1,3 @@
+export interface Context {
+  ip: string;
+}

Diff for: test/programs/user-symbols/schema.json

@@ -0,0 +1,17 @@
+{
+    "$schema": "http://json-schema.org/draft-06/schema#",
+    "definitions": {
+        "Context": {
+            "properties": {
+                "ip": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ip"
+            ],
+            "type": "object"
+        }
+    }
+}
+

Diff for: test/schema.test.ts

@@ -19,7 +19,8 @@ export function assertSchema(group: string, type: string, settings: TJS.PartialA
             settings.required = true;
         }
 
-        const actual = TJS.generateSchema(TJS.getProgramFromFiles([resolve(BASE + group + "/main.ts")], compilerOptions), type, settings);
+        const files = [resolve(BASE + group + "/main.ts")];
+        const actual = TJS.generateSchema(TJS.getProgramFromFiles(files, compilerOptions), type, settings, files);
 
         // writeFileSync(BASE + group + "/schema.json", stringify(actual, {space: 4}) + "\n\n");
 
@@ -275,6 +276,8 @@ describe("schema", () => {
         });
 
         assertSchema("builtin-names", "Ext.Foo");
+
+        assertSchema("user-symbols", "*");
     });
 });
 

Diff for: typescript-json-schema.ts

@@ -1009,7 +1009,7 @@ export function getProgramFromFiles(files: string[], jsonCompilerOptions: any =
     // use built-in default options
     const compilerOptions = ts.convertCompilerOptionsFromJson(jsonCompilerOptions, basePath).options;
     const options: ts.CompilerOptions = {
-        noEmit: true, emitDecoratorMetadata: true, experimentalDecorators: true, target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS
+        noEmit: true, emitDecoratorMetadata: true, experimentalDecorators: true, target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS, allowUnusedLabels: true,
     };
     for (const k in compilerOptions) {
         if (compilerOptions.hasOwnProperty(k)) {
@@ -1019,7 +1019,13 @@ export function getProgramFromFiles(files: string[], jsonCompilerOptions: any =
     return ts.createProgram(files, options);
 }
 
-export function buildGenerator(program: ts.Program, args: PartialArgs = {}): JsonSchemaGenerator|null {
+export function buildGenerator(program: ts.Program, args: PartialArgs = {}, onlyIncludeFiles?: string[]): JsonSchemaGenerator|null {
+    function isUserFile(file: ts.SourceFile): boolean {
+        if (onlyIncludeFiles === undefined) {
+            return !file.hasNoDefaultLib;
+        }
+        return onlyIncludeFiles.indexOf(file.fileName) >= 0;
+    }
     // Use defaults unles otherwise specified
     const settings = getDefaultArgs();
 
@@ -1058,10 +1064,11 @@ export function buildGenerator(program: ts.Program, args: PartialArgs = {}): Jso
                     const name = !args.uniqueNames ? typeName : `${typeName}.${(<any>symbol).id}`;
 
                     symbols.push({ name, typeName, fullyQualifiedName, symbol });
-                    allSymbols[name] = nodeType;
+                    if (!userSymbols[name]) {
+                        allSymbols[name] = nodeType;
+                    }
 
-                    // if (sourceFileIdx === 1) {
-                    if (!sourceFile.hasNoDefaultLib) {
+                    if (isUserFile(sourceFile)) {
                         userSymbols[name] = symbol;
                     }
 
@@ -1097,7 +1104,7 @@ export function buildGenerator(program: ts.Program, args: PartialArgs = {}): Jso
 }
 
 export function generateSchema(program: ts.Program, fullTypeName: string, args: PartialArgs = {}, onlyIncludeFiles?: string[]): Definition|null {
-    const generator = buildGenerator(program, args);
+    const generator = buildGenerator(program, args, onlyIncludeFiles);
 
     if (generator === null) {
         return null;