Skip to content

[estree] make function declaration id nullable #24854

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

Merged
RyanCavanaugh merged 3 commits into from
Apr 17, 2018
Merged

[estree] make function declaration id nullable #24854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66c56f6
[estree] make function declaration id nullable
stas-vilchik Apr 9, 2018
16f78a3
apply review feedback
stas-vilchik Apr 12, 2018
b1d6e26
[estree] make class declaration id nullable
stas-vilchik Apr 12, 2018
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
7 changes: 6 additions & 1 deletion types/estree/estree-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ boolean = memberExpression.computed;

// Declarations
var functionDeclaration: ESTree.FunctionDeclaration;
identifier = functionDeclaration.id;
var identifierOrNull: ESTree.Identifier | null = functionDeclaration.id;
Copy link
Copy Markdown
Member

@Jessidhia Jessidhia Apr 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

functionDeclaration.id = null would be a better test, as the identifierOrNull test wouldn't fail even without the change to the declaration.

Copy link
Copy Markdown
Contributor Author

@stas-vilchik stas-vilchik Apr 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'll keep both. In any case you can assign nullable functionDeclaration.id to a not nullable identifier.

functionDeclaration.id = null;
var params: Array<ESTree.Pattern> = functionDeclaration.params;
blockStatement = functionDeclaration.body;
booleanMaybe = functionDeclaration.generator;
Expand All @@ -237,6 +238,10 @@ var variableDeclarator: ESTree.VariableDeclarator;
pattern = variableDeclarator.id; // Pattern
expressionMaybe = variableDeclarator.init;

var classDeclaration: ESTree.ClassDeclaration;
identifierOrNull = classDeclaration.id;
classDeclaration.id = null;

// Clauses
// SwitchCase
string = switchCase.type;
Expand Down
6 changes: 4 additions & 2 deletions types/estree/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ interface BaseDeclaration extends BaseStatement { }

export interface FunctionDeclaration extends BaseFunction, BaseDeclaration {
type: "FunctionDeclaration";
id: Identifier;
/** It is null when a function declaration is a part of the `export default function` statement */
id: Identifier | null;
body: BlockStatement;
}

Expand Down Expand Up @@ -473,7 +474,8 @@ export interface MethodDefinition extends BaseNode {

export interface ClassDeclaration extends BaseClass, BaseDeclaration {
type: "ClassDeclaration";
id: Identifier;
/** It is null when a class declaration is a part of the `export default class` statement */
id: Identifier | null;
}

export interface ClassExpression extends BaseClass, BaseExpression {
Expand Down