From 18fab96b16bb1e258b64d1b5dcf24886ab932db1 Mon Sep 17 00:00:00 2001 From: dergash Date: Tue, 1 Sep 2020 15:37:34 +0300 Subject: [PATCH] fix: check for `isNamedTupleMember` and `isIdentifierOrPrivateIdentifier` before calling to restore backward compatibility with typescript 3.7.5 and 3.9.7 respectively --- src/lib/converter/context.ts | 2 +- src/lib/converter/types/tuple.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts index 70f7917e2..b3eca2679 100644 --- a/src/lib/converter/context.ts +++ b/src/lib/converter/context.ts @@ -410,7 +410,7 @@ export class Context { function isNamedNode(node: ts.Node): node is ts.Node & { name: ts.Identifier | ts.PrivateIdentifier | ts.ComputedPropertyName } { return node['name'] && ( - ts.isIdentifierOrPrivateIdentifier(node['name']) || + ts.isIdentifierOrPrivateIdentifier && ts.isIdentifierOrPrivateIdentifier(node['name']) || ts.isComputedPropertyName(node['name']) ); } diff --git a/src/lib/converter/types/tuple.ts b/src/lib/converter/types/tuple.ts index 53ffd9514..2cb36817c 100644 --- a/src/lib/converter/types/tuple.ts +++ b/src/lib/converter/types/tuple.ts @@ -74,7 +74,7 @@ export class TupleConverter extends ConverterTypeComponent implements TypeConver @Component({ name: 'type:named-tuple-member' }) export class NamedTupleMemberConverter extends ConverterTypeComponent implements TypeNodeConverter { supportsNode(_context: Context, node: ts.Node) { - return ts.isNamedTupleMember(node); + return ts.isNamedTupleMember && ts.isNamedTupleMember(node); } convertNode(context: Context, node: ts.NamedTupleMember): NamedTupleMember | undefined {