Skip to content
This repository was archived by the owner on May 12, 2025. It is now read-only.

Implemented addition types support #161

Merged
merged 4 commits into from
Nov 29, 2024
Merged

Implemented addition types support #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78422d9
Implemented addition types support
Nov 27, 2024
bc58313
- introduced JS.TypePredicate, JS.LiteralType
Nov 28, 2024
df99153
- introduced JS.SatisfiesExpression
Nov 28, 2024
7941c98
- introduced JS.ImportType
Nov 29, 2024
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
172 changes: 161 additions & 11 deletions openrewrite/src/javascript/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,10 @@ export class JavaScriptParserVisitor {
return this.mapLiteral(node, null);
}

visitNeverKeyword(node: ts.Node) {
return this.mapIdentifier(node, 'never');
}

private mapLiteral(node: ts.LiteralExpression | ts.TrueLiteral | ts.FalseLiteral | ts.NullLiteral | ts.Identifier
| ts.TemplateHead | ts.TemplateMiddle | ts.TemplateTail, value: any): J.Literal {
return new J.Literal(
Expand Down Expand Up @@ -1029,7 +1033,7 @@ export class JavaScriptParserVisitor {

private mapTypeInfo(node: ts.MethodDeclaration | ts.PropertyDeclaration | ts.VariableDeclaration | ts.ParameterDeclaration
| ts.PropertySignature | ts.MethodSignature | ts.ArrowFunction | ts.CallSignatureDeclaration | ts.GetAccessorDeclaration
| ts.FunctionDeclaration | ts.ConstructSignatureDeclaration | ts.FunctionExpression) {
| ts.FunctionDeclaration | ts.ConstructSignatureDeclaration | ts.FunctionExpression | ts.NamedTupleMember) {
return node.type ? new JS.TypeInfo(randomId(), this.prefix(node.getChildAt(node.getChildren().indexOf(node.type) - 1)), Markers.EMPTY, this.visit(node.type)) : null;
}

Expand Down Expand Up @@ -1180,7 +1184,15 @@ export class JavaScriptParserVisitor {
}

visitTypePredicate(node: ts.TypePredicateNode) {
return this.visitUnknown(node);
return new JS.TypePredicate(
randomId(),
this.prefix(node),
Markers.EMPTY,
node.assertsModifier ? this.leftPadded(this.prefix(node.assertsModifier), true) : this.leftPadded(Space.EMPTY, false),
this.visit(node.parameterName),
node.type ? this.leftPadded(this.suffix(node.parameterName), this.convert(node.type)) : null,
this.mapType(node)
);
}

visitTypeReference(node: ts.TypeReferenceNode) {
Expand Down Expand Up @@ -1362,15 +1374,32 @@ export class JavaScriptParserVisitor {
}

visitInferType(node: ts.InferTypeNode) {
return this.visitUnknown(node);
return new JS.InferType(
randomId(),
this.prefix(node),
Markers.EMPTY,
this.leftPadded(Space.EMPTY, this.convert(node.typeParameter)),
this.mapType(node)
);
}

visitParenthesizedType(node: ts.ParenthesizedTypeNode) {
return this.visitUnknown(node);
return new J.ParenthesizedTypeTree(
randomId(),
Space.EMPTY,
Markers.EMPTY,
[],
new J.Parentheses(
randomId(),
this.prefix(node),
Markers.EMPTY,
this.rightPadded(this.convert(node.type), this.prefix(node.getLastToken()!))
)
);
}

visitThisType(node: ts.ThisTypeNode) {
return this.visitUnknown(node);
return this.mapIdentifier(node, 'this');
}

visitTypeOperator(node: ts.TypeOperatorNode) {
Expand All @@ -1393,19 +1422,113 @@ export class JavaScriptParserVisitor {
}

visitIndexedAccessType(node: ts.IndexedAccessTypeNode) {
return this.visitUnknown(node);
return new J.ArrayAccess(
randomId(),
this.prefix(node),
Markers.EMPTY,
this.convert(node.objectType),
new J.ArrayDimension(
randomId(),
this.prefix(this.findChildNode(node, ts.SyntaxKind.OpenBracketToken)!),
Markers.EMPTY,
this.rightPadded(this.convert(node.indexType), this.suffix(node.indexType))
),
this.mapType(node)
);
}

visitMappedType(node: ts.MappedTypeNode) {
return this.visitUnknown(node);
}

visitLiteralType(node: ts.LiteralTypeNode) {
return this.visit(node.literal);
return new JS.LiteralType(
randomId(),
this.prefix(node),
Markers.EMPTY,
this.visit(node.literal),
this.mapType(node)!
);
}

visitNamedTupleMember(node: ts.NamedTupleMember) {
return this.visitUnknown(node);
if (node.questionToken) {
return new JS.JSVariableDeclarations(
randomId(),
this.prefix(node),
Markers.EMPTY,
[],
[],
this.mapTypeInfo(node),
null,
[this.rightPadded(
new JS.JSVariableDeclarations.JSNamedVariable(
randomId(),
this.prefix(node.name),
Markers.EMPTY,
this.getOptionalUnary(node),
[],
null,
this.mapVariableType(node)
),
this.suffix(node.name)
)]
);
}

if (node.dotDotDotToken) {
return new JS.JSVariableDeclarations(
randomId(),
this.prefix(node),
Markers.EMPTY,
[],
[],
this.mapTypeInfo(node),
null,
[this.rightPadded(
new JS.JSVariableDeclarations.JSNamedVariable(
randomId(),
Space.EMPTY,
Markers.EMPTY,
new JS.Unary(
randomId(),
Space.EMPTY,
Markers.EMPTY,
this.leftPadded(Space.EMPTY, JS.Unary.Type.Spread),
this.visit(node.name),
this.mapType(node)
),
[],
null,
this.mapVariableType(node)
),
this.suffix(node.name)
)]
);
}

return new J.VariableDeclarations(
randomId(),
this.prefix(node),
Markers.EMPTY,
[],
[],
this.mapTypeInfo(node),
null,
[],
[this.rightPadded(
new J.VariableDeclarations.NamedVariable(
randomId(),
this.prefix(node.name),
Markers.EMPTY,
this.visit(node.name),
[],
null,
this.mapVariableType(node)
),
this.suffix(node.name)
)]
);
}

visitTemplateLiteralType(node: ts.TemplateLiteralTypeNode) {
Expand All @@ -1430,7 +1553,27 @@ export class JavaScriptParserVisitor {
}

visitImportType(node: ts.ImportTypeNode) {
return this.visitUnknown(node);
return new JS.ImportType(
randomId(),
this.prefix(node),
Markers.EMPTY,
node.isTypeOf ? this.rightPadded(true, this.suffix(this.findChildNode(node, ts.SyntaxKind.TypeOfKeyword)!)) : this.rightPadded(false, Space.EMPTY),
new J.ParenthesizedTypeTree(
randomId(),
this.suffix(this.findChildNode(node, ts.SyntaxKind.ImportKeyword)!),
Markers.EMPTY,
[],
new J.Parentheses(
randomId(),
Space.EMPTY,
Markers.EMPTY,
this.rightPadded(this.visit(node.argument), this.suffix(node.argument))
)
),
node.qualifier ? this.leftPadded(this.prefix(this.findChildNode(node, ts.SyntaxKind.DotToken)!), this.visit(node.qualifier)): null,
node.typeArguments ? this.mapTypeArguments(this.suffix(node.qualifier!), node.typeArguments) : null,
this.mapType(node)
);
}

visitObjectBindingPattern(node: ts.ObjectBindingPattern) {
Expand Down Expand Up @@ -2131,7 +2274,14 @@ export class JavaScriptParserVisitor {
}

visitSatisfiesExpression(node: ts.SatisfiesExpression) {
return this.visitUnknown(node);
return new JS.SatisfiesExpression(
randomId(),
this.prefix(node),
Markers.EMPTY,
this.visit(node.expression),
this.leftPadded(this.suffix(node.expression), this.visit(node.type)),
this.mapType(node)
);
}

visitTemplateSpan(node: ts.TemplateSpan) {
Expand Down Expand Up @@ -3367,7 +3517,7 @@ export class JavaScriptParserVisitor {
return new J.Empty(randomId(), prefix, markers ?? Markers.EMPTY);
}

private getOptionalUnary(node: ts.MethodSignature | ts.MethodDeclaration | ts.ParameterDeclaration | ts.PropertySignature | ts.PropertyDeclaration) {
private getOptionalUnary(node: ts.MethodSignature | ts.MethodDeclaration | ts.ParameterDeclaration | ts.PropertySignature | ts.PropertyDeclaration | ts.NamedTupleMember) {
return new JS.Unary(
randomId(),
Space.EMPTY,
Expand Down
Loading