Fix YousefED#341 (YousefED#342)

* Add failing test case for YousefED#341

* Fix user defined schema overrides for type aliases

Closes YousefED#341

Author: remcohaszing

test/programs/type-alias-schema-override/main.ts

@@ -0,0 +1,7 @@
+interface All {}
+
+type Some = Partial<All>;
+
+interface MyObject {
+  some?: Some;
+}

test/programs/type-alias-schema-override/schema.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+      "Some": {
+          "type": "string"
+      }
+  },
+  "properties": {
+      "some": {
+          "$ref": "#/definitions/Some"
+      }
+  },
+  "type": "object"
+}

test/schema.test.ts

@@ -108,6 +108,32 @@ describe("interfaces", () => {
             assert.deepEqual(schema.definitions!["MySubObject"], schemaOverride);
         }
     });
+    it("should ignore type aliases that have schema overrides", () => {
+        const program = TJS.getProgramFromFiles([resolve(BASE + "type-alias-schema-override/main.ts")]);
+        const generator = TJS.buildGenerator(program);
+        assert(generator !== null);
+        if (generator !== null) {
+            const schemaOverride: TJS.Definition = { type: "string" };
+
+            generator.setSchemaOverride("Some", schemaOverride);
+            const schema = generator.getSchemaForSymbol("MyObject");
+
+            assert.deepEqual(schema, {
+                $schema: "http://json-schema.org/draft-07/schema#",
+                definitions: {
+                    Some: {
+                        type: "string"
+                    }
+                },
+                properties: {
+                    some: {
+                        $ref: "#/definitions/Some"
+                    }
+                },
+                type: "object"
+            });
+        }
+    });
 });
 
 describe("schema", () => {

typescript-json-schema.ts

@@ -358,8 +358,18 @@ export class JsonSchemaGenerator {
      */
     private inheritingTypes: { [baseName: string]: string[] };
 
+    /**
+     * This map holds references to all reffed definition., including schema
+     * overrides and generateddefinitions.
+     */
     private reffedDefinitions: { [key: string]: Definition } = {};
 
+    /**
+     * This map only holds explicit schema overrides. This helps differentiate between
+     * user defined schema overrides and generated definitions.
+     */
+    private schemaOverrides = new Map<string, Definition>();
+
     /**
      * This is a set of all the user-defined validation keywords.
      */
@@ -1007,6 +1017,8 @@ export class JsonSchemaGenerator {
                 const sourceFile = getSourceFile(sym);
                 const relativePath = path.relative(process.cwd(), sourceFile.fileName);
                 fullTypeName = `${this.getTypeName(typ)}.${generateHashOfNode(getCanonicalDeclaration(sym), relativePath)}`;
+            } else if (reffedType && this.schemaOverrides.has(reffedType.escapedName as string)) {
+                fullTypeName = reffedType.escapedName as string;
             } else {
                 fullTypeName = this.getTypeName(typ);
             }
@@ -1096,6 +1108,7 @@ export class JsonSchemaGenerator {
 
     public setSchemaOverride(symbolName: string, schema: Definition) {
         this.reffedDefinitions[symbolName] = schema;
+        this.schemaOverrides.set(symbolName, schema);
     }
 
     public getSchemaForSymbol(symbolName: string, includeReffedDefinitions: boolean = true): Definition {