Skip to content

Commit e8a60d2

Browse files
rpetrichdomoritz
authored andcommitted
Basic TypeScript 3.0 support
1 parent 0ab4894 commit e8a60d2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"dependencies": {
4949
"glob": "~7.1.2",
5050
"json-stable-stringify": "^1.0.1",
51-
"typescript": "~2.9.2",
51+
"typescript": "^3.0.0",
5252
"yargs": "^11.0.0"
5353
},
5454
"devDependencies": {

typescript-json-schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ export class JsonSchemaGenerator {
882882
if (!asRef || !this.reffedDefinitions[fullTypeName]) {
883883
if (asRef) { // must be here to prevent recursivity problems
884884
let reffedDefinition: Definition;
885-
if (asTypeAliasRef && reffedType!.getFlags() & (ts.TypeFlags.IndexedAccess | ts.TypeFlags.Index) && symbol) {
885+
if (asTypeAliasRef && reffedType!.getFlags() & (ts.TypeFlags.IndexedAccess | ts.TypeFlags.Index | ts.TypeFlags.Intersection) && symbol) {
886886
reffedDefinition = this.getTypeDefinition(typ, true, undefined, symbol, symbol);
887887
} else {
888888
reffedDefinition = definition;

0 commit comments

Comments
 (0)