Elgato_dark/angular
1
0
Fork 0
mirror of https://github.com/angular/angular synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor(compiler): reflect arrow function definition (#50084)

Browse source 
Adds some logic to reflect an arrow function to `ReflectionHost.getDefinitionOfFunction`. This will be useful for some upcoming work.

PR Close #50084
This commit is contained in:
Kristiyan Kostadinov 2023-04-28 13:20:56 +02:00 committed by Pawel Kozlowski
parent 2180a692b0
commit cb8cdadd3b
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/compiler-cli/src/ngtsc/reflection/src/host.ts
View file

@ -396,7 +396,8 @@ export interface FunctionDefinition {
/**
* A reference to the node which declares the function.
*/
node: ts.MethodDeclaration|ts.FunctionDeclaration|ts.FunctionExpression|ts.VariableDeclaration;
node: ts.MethodDeclaration|ts.FunctionDeclaration|ts.FunctionExpression|ts.VariableDeclaration|
ts.ArrowFunction;
/**
* Statements of the function body, if a body is present, or null if no body is present or the
@ -412,6 +413,11 @@ export interface FunctionDefinition {
* Metadata regarding the function's parameters, including possible default value expressions.
*/
parameters: Parameter[];
/**
* Generic type parameters of the function.
*/
typeParameters: ts.TypeParameterDeclaration[]|null;
}
/**
@ -432,6 +438,11 @@ export interface Parameter {
* Expression which represents the default value of the parameter, if any.
*/
initializer: ts.Expression|null;
/**
* Type of the parameter.
*/
type: ts.TypeNode|null;
}
/**

16
packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts
View file

@ -164,16 +164,26 @@ export class TypeScriptReflectionHost implements ReflectionHost {
getDefinitionOfFunction(node: ts.Node): FunctionDefinition|null {
if (!ts.isFunctionDeclaration(node) && !ts.isMethodDeclaration(node) &&
!ts.isFunctionExpression(node)) {
!ts.isFunctionExpression(node) && !ts.isArrowFunction(node)) {
return null;
}
let body: ts.Statement[]|null = null;
if (node.body !== undefined) {
// The body might be an expression if the node is an arrow function.
body = ts.isBlock(node.body) ? Array.from(node.body.statements) :
[ts.factory.createReturnStatement(node.body)];
}
return {
node,
body: node.body !== undefined ? Array.from(node.body.statements) : null,
body,
typeParameters: node.typeParameters === undefined ? null : Array.from(node.typeParameters),
parameters: node.parameters.map(param => {
const name = parameterName(param.name);
const initializer = param.initializer || null;
return {name, node: param, initializer};
return {name, node: param, initializer, type: param.type || null};
}),
};
}