Skip to content

Fix #343: Support type params in CallExpression, NewExpression (TS) #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+38 −3
Open

Fix #343: Support type params in CallExpression, NewExpression (TS) #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63d9b98
Support type params in CallExpression, NewExpression (TS)
jgoz Aug 19, 2019
62bf7e5
Use TSHasOptionalTypeParameterInstantiation base for call/new
jgoz Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions def/typescript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,4 +484,10 @@ export default function (fork: Fork) {
def("TSDeclareMethod"),
TSTypeMember
)]);

def("CallExpression")
.bases("TSHasOptionalTypeParameterInstantiation");

def("NewExpression")
.bases("TSHasOptionalTypeParameterInstantiation");
};
9 changes: 6 additions & 3 deletions gen/builders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,8 @@ export interface NewExpressionBuilder {
callee: K.ExpressionKind,
comments?: K.CommentKind[] | null,
loc?: K.SourceLocationKind | null,
typeArguments?: null | K.TypeParameterInstantiationKind
typeArguments?: null | K.TypeParameterInstantiationKind,
typeParameters?: null | K.TSTypeParameterInstantiationKind
}
): namedTypes.NewExpression;
}
Expand All @@ -601,7 +602,8 @@ export interface CallExpressionBuilder {
comments?: K.CommentKind[] | null,
loc?: K.SourceLocationKind | null,
optional?: boolean,
typeArguments?: null | K.TypeParameterInstantiationKind
typeArguments?: null | K.TypeParameterInstantiationKind,
typeParameters?: null | K.TSTypeParameterInstantiationKind
}
): namedTypes.CallExpression;
}
Expand Down Expand Up @@ -1192,7 +1194,8 @@ export interface OptionalCallExpressionBuilder {
comments?: K.CommentKind[] | null,
loc?: K.SourceLocationKind | null,
optional?: boolean,
typeArguments?: null | K.TypeParameterInstantiationKind
typeArguments?: null | K.TypeParameterInstantiationKind,
typeParameters?: null | K.TSTypeParameterInstantiationKind
}
): namedTypes.OptionalCallExpression;
}
Expand Down
2 changes: 2 additions & 0 deletions gen/namedTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,13 +303,15 @@ export namespace namedTypes {
callee: K.ExpressionKind;
arguments: (K.ExpressionKind | K.SpreadElementKind)[];
typeArguments?: null | K.TypeParameterInstantiationKind;
typeParameters?: null | K.TSTypeParameterInstantiationKind;
}

export interface CallExpression extends Omit<Expression, "type">, Omit<ChainElement, "type"> {
type: "CallExpression";
callee: K.ExpressionKind;
arguments: (K.ExpressionKind | K.SpreadElementKind)[];
typeArguments?: null | K.TypeParameterInstantiationKind;
typeParameters?: null | K.TSTypeParameterInstantiationKind;
}

export interface RestElement extends Omit<Pattern, "type"> {
Expand Down
24 changes: 24 additions & 0 deletions test/typescript.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,30 @@ glob("**/*.ts", {
});
});
});
});

describe('typescript types', () => {
it('Explicit type arguments', function () {
const program = babelParse([
'test<A>();',
'test<B, C>();',
'new test<D>();',
'new test<E, F>();',
].join("\n"), {
plugins: ['typescript']
});

const typeParamNames: any[] = []

visit(program, {
visitTSTypeReference(path: any) {
typeParamNames.push(path.node.typeName.name);
this.traverse(path);
}
});

assert.deepEqual(typeParamNames, ["A", "B", "C", "D", "E", "F"]);
});

describe('scope', () => {
const scope = [
Expand Down