Skip to content
This repository was archived by the owner on Jan 14, 2019. It is now read-only.

refactor: mark AsteriskAsteriskEquals as assignment operator #46

Merged
merged 2 commits into from
Dec 19, 2018
Merged

refactor: mark AsteriskAsteriskEquals as assignment operator #46

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
664f590
refactor: mark AsteriskAsteriskEquals as assignment operator
armano2 Dec 14, 2018
c923c9b
Merge branch 'master' into asterisk_asterisk_equals_token
JamesHenry Dec 19, 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
12 changes: 1 addition & 11 deletions src/convert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1758,7 +1758,7 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {

case SyntaxKind.PrefixUnaryExpression:
case SyntaxKind.PostfixUnaryExpression: {
const operator = nodeUtils.getTextForTokenKind(node.operator);
const operator = nodeUtils.getTextForTokenKind(node.operator) || '';
Object.assign(result, {
/**
* ESTree uses UpdateExpression for ++/--
Expand Down Expand Up @@ -1836,16 +1836,6 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
} else {
(result as any).expressions.push(right);
}
} else if (
node.operatorToken &&
node.operatorToken.kind === SyntaxKind.AsteriskAsteriskEqualsToken
) {
Object.assign(result, {
type: AST_NODE_TYPES.AssignmentExpression,
operator: nodeUtils.getTextForTokenKind(node.operatorToken.kind),
left: convertChild(node.left),
right: convertChild(node.right)
});
} else {
Object.assign(result, {
type: nodeUtils.getBinaryExpressionType(node.operatorToken),
Expand Down
137 changes: 70 additions & 67 deletions src/node-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@ import {
ESTreeToken
} from './temp-types-based-on-js-source';
import { TSNode } from './ts-nodes';
import { AST_NODE_TYPES } from './ast-node-types';

const SyntaxKind = ts.SyntaxKind;

const ASSIGNMENT_OPERATORS = [
const ASSIGNMENT_OPERATORS: ts.AssignmentOperator[] = [
SyntaxKind.EqualsToken,
SyntaxKind.PlusEqualsToken,
SyntaxKind.MinusEqualsToken,
SyntaxKind.AsteriskEqualsToken,
SyntaxKind.AsteriskAsteriskEqualsToken,
SyntaxKind.SlashEqualsToken,
SyntaxKind.PercentEqualsToken,
SyntaxKind.LessThanLessThanEqualsToken,
Expand All @@ -30,72 +32,73 @@ const ASSIGNMENT_OPERATORS = [
SyntaxKind.CaretEqualsToken
];

const LOGICAL_OPERATORS = [
const LOGICAL_OPERATORS: ts.LogicalOperator[] = [
SyntaxKind.BarBarToken,
SyntaxKind.AmpersandAmpersandToken
];

const TOKEN_TO_TEXT: { [key: number]: string } = {};
TOKEN_TO_TEXT[SyntaxKind.OpenBraceToken] = '{';
TOKEN_TO_TEXT[SyntaxKind.CloseBraceToken] = '}';
TOKEN_TO_TEXT[SyntaxKind.OpenParenToken] = '(';
TOKEN_TO_TEXT[SyntaxKind.CloseParenToken] = ')';
TOKEN_TO_TEXT[SyntaxKind.OpenBracketToken] = '[';
TOKEN_TO_TEXT[SyntaxKind.CloseBracketToken] = ']';
TOKEN_TO_TEXT[SyntaxKind.DotToken] = '.';
TOKEN_TO_TEXT[SyntaxKind.DotDotDotToken] = '...';
TOKEN_TO_TEXT[SyntaxKind.SemicolonToken] = ';';
TOKEN_TO_TEXT[SyntaxKind.CommaToken] = ',';
TOKEN_TO_TEXT[SyntaxKind.LessThanToken] = '<';
TOKEN_TO_TEXT[SyntaxKind.GreaterThanToken] = '>';
TOKEN_TO_TEXT[SyntaxKind.LessThanEqualsToken] = '<=';
TOKEN_TO_TEXT[SyntaxKind.GreaterThanEqualsToken] = '>=';
TOKEN_TO_TEXT[SyntaxKind.EqualsEqualsToken] = '==';
TOKEN_TO_TEXT[SyntaxKind.ExclamationEqualsToken] = '!=';
TOKEN_TO_TEXT[SyntaxKind.EqualsEqualsEqualsToken] = '===';
TOKEN_TO_TEXT[SyntaxKind.InstanceOfKeyword] = 'instanceof';
TOKEN_TO_TEXT[SyntaxKind.ExclamationEqualsEqualsToken] = '!==';
TOKEN_TO_TEXT[SyntaxKind.EqualsGreaterThanToken] = '=>';
TOKEN_TO_TEXT[SyntaxKind.PlusToken] = '+';
TOKEN_TO_TEXT[SyntaxKind.MinusToken] = '-';
TOKEN_TO_TEXT[SyntaxKind.AsteriskToken] = '*';
TOKEN_TO_TEXT[SyntaxKind.AsteriskAsteriskToken] = '**';
TOKEN_TO_TEXT[SyntaxKind.SlashToken] = '/';
TOKEN_TO_TEXT[SyntaxKind.PercentToken] = '%';
TOKEN_TO_TEXT[SyntaxKind.PlusPlusToken] = '++';
TOKEN_TO_TEXT[SyntaxKind.MinusMinusToken] = '--';
TOKEN_TO_TEXT[SyntaxKind.LessThanLessThanToken] = '<<';
TOKEN_TO_TEXT[SyntaxKind.LessThanSlashToken] = '</';
TOKEN_TO_TEXT[SyntaxKind.GreaterThanGreaterThanToken] = '>>';
TOKEN_TO_TEXT[SyntaxKind.GreaterThanGreaterThanGreaterThanToken] = '>>>';
TOKEN_TO_TEXT[SyntaxKind.AmpersandToken] = '&';
TOKEN_TO_TEXT[SyntaxKind.BarToken] = '|';
TOKEN_TO_TEXT[SyntaxKind.CaretToken] = '^';
TOKEN_TO_TEXT[SyntaxKind.ExclamationToken] = '!';
TOKEN_TO_TEXT[SyntaxKind.TildeToken] = '~';
TOKEN_TO_TEXT[SyntaxKind.AmpersandAmpersandToken] = '&&';
TOKEN_TO_TEXT[SyntaxKind.BarBarToken] = '||';
TOKEN_TO_TEXT[SyntaxKind.QuestionToken] = '?';
TOKEN_TO_TEXT[SyntaxKind.ColonToken] = ':';
TOKEN_TO_TEXT[SyntaxKind.EqualsToken] = '=';
TOKEN_TO_TEXT[SyntaxKind.PlusEqualsToken] = '+=';
TOKEN_TO_TEXT[SyntaxKind.MinusEqualsToken] = '-=';
TOKEN_TO_TEXT[SyntaxKind.AsteriskEqualsToken] = '*=';
TOKEN_TO_TEXT[SyntaxKind.AsteriskAsteriskEqualsToken] = '**=';
TOKEN_TO_TEXT[SyntaxKind.SlashEqualsToken] = '/=';
TOKEN_TO_TEXT[SyntaxKind.PercentEqualsToken] = '%=';
TOKEN_TO_TEXT[SyntaxKind.LessThanLessThanEqualsToken] = '<<=';
TOKEN_TO_TEXT[SyntaxKind.GreaterThanGreaterThanEqualsToken] = '>>=';
TOKEN_TO_TEXT[SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken] = '>>>=';
TOKEN_TO_TEXT[SyntaxKind.AmpersandEqualsToken] = '&=';
TOKEN_TO_TEXT[SyntaxKind.BarEqualsToken] = '|=';
TOKEN_TO_TEXT[SyntaxKind.CaretEqualsToken] = '^=';
TOKEN_TO_TEXT[SyntaxKind.AtToken] = '@';
TOKEN_TO_TEXT[SyntaxKind.InKeyword] = 'in';
TOKEN_TO_TEXT[SyntaxKind.UniqueKeyword] = 'unique';
TOKEN_TO_TEXT[SyntaxKind.KeyOfKeyword] = 'keyof';
TOKEN_TO_TEXT[SyntaxKind.NewKeyword] = 'new';
TOKEN_TO_TEXT[SyntaxKind.ImportKeyword] = 'import';
const TOKEN_TO_TEXT: { readonly [P in ts.SyntaxKind]?: string } = {
[SyntaxKind.OpenBraceToken]: '{',
[SyntaxKind.CloseBraceToken]: '}',
[SyntaxKind.OpenParenToken]: '(',
[SyntaxKind.CloseParenToken]: ')',
[SyntaxKind.OpenBracketToken]: '[',
[SyntaxKind.CloseBracketToken]: ']',
[SyntaxKind.DotToken]: '.',
[SyntaxKind.DotDotDotToken]: '...',
[SyntaxKind.SemicolonToken]: ',',
[SyntaxKind.CommaToken]: ',',
[SyntaxKind.LessThanToken]: '<',
[SyntaxKind.GreaterThanToken]: '>',
[SyntaxKind.LessThanEqualsToken]: '<=',
[SyntaxKind.GreaterThanEqualsToken]: '>=',
[SyntaxKind.EqualsEqualsToken]: '==',
[SyntaxKind.ExclamationEqualsToken]: '!=',
[SyntaxKind.EqualsEqualsEqualsToken]: '===',
[SyntaxKind.InstanceOfKeyword]: 'instanceof',
[SyntaxKind.ExclamationEqualsEqualsToken]: '!==',
[SyntaxKind.EqualsGreaterThanToken]: '=>',
[SyntaxKind.PlusToken]: '+',
[SyntaxKind.MinusToken]: '-',
[SyntaxKind.AsteriskToken]: '*',
[SyntaxKind.AsteriskAsteriskToken]: '**',
[SyntaxKind.SlashToken]: '/',
[SyntaxKind.PercentToken]: '%',
[SyntaxKind.PlusPlusToken]: '++',
[SyntaxKind.MinusMinusToken]: '--',
[SyntaxKind.LessThanLessThanToken]: '<<',
[SyntaxKind.LessThanSlashToken]: '</',
[SyntaxKind.GreaterThanGreaterThanToken]: '>>',
[SyntaxKind.GreaterThanGreaterThanGreaterThanToken]: '>>>',
[SyntaxKind.AmpersandToken]: '&',
[SyntaxKind.BarToken]: '|',
[SyntaxKind.CaretToken]: '^',
[SyntaxKind.ExclamationToken]: '!',
[SyntaxKind.TildeToken]: '~',
[SyntaxKind.AmpersandAmpersandToken]: '&&',
[SyntaxKind.BarBarToken]: '||',
[SyntaxKind.QuestionToken]: '?',
[SyntaxKind.ColonToken]: ':',
[SyntaxKind.EqualsToken]: '=',
[SyntaxKind.PlusEqualsToken]: '+=',
[SyntaxKind.MinusEqualsToken]: '-=',
[SyntaxKind.AsteriskEqualsToken]: '*=',
[SyntaxKind.AsteriskAsteriskEqualsToken]: '**=',
[SyntaxKind.SlashEqualsToken]: '/=',
[SyntaxKind.PercentEqualsToken]: '%=',
[SyntaxKind.LessThanLessThanEqualsToken]: '<<=',
[SyntaxKind.GreaterThanGreaterThanEqualsToken]: '>>=',
[SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken]: '>>>=',
[SyntaxKind.AmpersandEqualsToken]: '&=',
[SyntaxKind.BarEqualsToken]: '|=',
[SyntaxKind.CaretEqualsToken]: '^=',
[SyntaxKind.AtToken]: '@',
[SyntaxKind.InKeyword]: 'in',
[SyntaxKind.UniqueKeyword]: 'unique',
[SyntaxKind.KeyOfKeyword]: 'keyof',
[SyntaxKind.NewKeyword]: 'new',
[SyntaxKind.ImportKeyword]: 'import'
};

/**
* Find the first matching child based on the given sourceFile and predicate function.
Expand Down Expand Up @@ -188,7 +191,7 @@ function isLogicalOperator(operator: ts.Token<any>): boolean {
* @param {number} kind the token's SyntaxKind
* @returns {string} the token applicable token as a string
*/
function getTextForTokenKind(kind: number): string {
function getTextForTokenKind(kind: ts.SyntaxKind): string | undefined {
return TOKEN_TO_TEXT[kind];
}

Expand Down Expand Up @@ -252,11 +255,11 @@ function isJSDocComment(node: ts.Node): boolean {
*/
function getBinaryExpressionType(operator: ts.Token<any>): string {
if (isAssignmentOperator(operator)) {
return 'AssignmentExpression';
return AST_NODE_TYPES.AssignmentExpression;
} else if (isLogicalOperator(operator)) {
return 'LogicalExpression';
return AST_NODE_TYPES.LogicalExpression;
}
return 'BinaryExpression';
return AST_NODE_TYPES.BinaryExpression;
}

/**
Expand Down