cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #762 from azz/nullish-tests

Browse Source 
Add more tests for the nullish coalescing operator
This commit is contained in:
Henry Zhu 2017-10-16 18:32:26 -04:00 committed by GitHub
commit eaf054ba1f
25 changed files with 967 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ coverage
lib
node_modules
npm-debug.log
.vscode

3
ast/spec.md
View File

@ -791,7 +791,6 @@ enum BinaryOperator {
| "|" | "^" | "&" | "in"
| "instanceof"
| "|>"
| "??"
}
```
@ -839,7 +838,7 @@ A logical operator expression.
```js
enum LogicalOperator {
"||" | "&&"
"||" | "&&" | "??"
}
```

4
src/parser/expression.js
View File

@ -311,7 +311,9 @@ export default class ExpressionParser extends LValParser {
this.finishNode(
node,
op === tt.logicalOR || op === tt.logicalAND
op === tt.logicalOR ||
op === tt.logicalAND ||
op === tt.nullishCoalescing
? "LogicalExpression"
: "BinaryExpression",
);

1
test/fixtures/experimental/nullish-coalescing-operator/and-nullish/actual.js vendored Normal file
View File

@ -0,0 +1 @@
a && b ?? c;

132
test/fixtures/experimental/nullish-coalescing-operator/and-nullish/expected.json vendored Normal file
View File

@ -0,0 +1,132 @@
{
"type": "File",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"program": {
"type": "Program",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"sourceType": "script",
"body": [
{
"type": "ExpressionStatement",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"expression": {
"type": "LogicalExpression",
"start": 0,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 11
}
},
"left": {
"type": "LogicalExpression",
"start": 0,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 6
}
},
"left": {
"type": "Identifier",
"start": 0,
"end": 1,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 1
},
"identifierName": "a"
},
"name": "a"
},
"operator": "&&",
"right": {
"type": "Identifier",
"start": 5,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 6
},
"identifierName": "b"
},
"name": "b"
}
},
"operator": "??",
"right": {
"type": "Identifier",
"start": 10,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 11
},
"identifierName": "c"
},
"name": "c"
}
}
}
],
"directives": []
}
}

4
test/fixtures/experimental/nullish-coalescing-operator/and-nullish/options.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"plugins": ["nullishCoalescingOperator"]
}

1
test/fixtures/experimental/nullish-coalescing-operator/associativity/actual.js vendored Normal file
View File

@ -0,0 +1 @@
a ?? b ?? c;

132
test/fixtures/experimental/nullish-coalescing-operator/associativity/expected.json vendored Normal file
View File

@ -0,0 +1,132 @@
{
"type": "File",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"program": {
"type": "Program",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"sourceType": "script",
"body": [
{
"type": "ExpressionStatement",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"expression": {
"type": "LogicalExpression",
"start": 0,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 11
}
},
"left": {
"type": "LogicalExpression",
"start": 0,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 6
}
},
"left": {
"type": "Identifier",
"start": 0,
"end": 1,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 1
},
"identifierName": "a"
},
"name": "a"
},
"operator": "??",
"right": {
"type": "Identifier",
"start": 5,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 6
},
"identifierName": "b"
},
"name": "b"
}
},
"operator": "??",
"right": {
"type": "Identifier",
"start": 10,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 11
},
"identifierName": "c"
},
"name": "c"
}
}
}
],
"directives": []
}
}

4
test/fixtures/experimental/nullish-coalescing-operator/associativity/options.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"plugins": ["nullishCoalescingOperator"]
}

2
test/fixtures/experimental/nullish-coalescing-operator/expression/expected.json vendored
View File

@ -43,7 +43,7 @@
}
},
"expression": {
"type": "BinaryExpression",
"type": "LogicalExpression",
"start": 0,
"end": 8,
"loc": {

3
test/fixtures/experimental/nullish-coalescing-operator/multiline/actual.js vendored Normal file
View File

@ -0,0 +1,3 @@
a
?? b
?? c;

132
test/fixtures/experimental/nullish-coalescing-operator/multiline/expected.json vendored Normal file
View File

@ -0,0 +1,132 @@
{
"type": "File",
"start": 0,
"end": 17,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 7
}
},
"program": {
"type": "Program",
"start": 0,
"end": 17,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 7
}
},
"sourceType": "script",
"body": [
{
"type": "ExpressionStatement",
"start": 0,
"end": 17,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 7
}
},
"expression": {
"type": "LogicalExpression",
"start": 0,
"end": 16,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 6
}
},
"left": {
"type": "LogicalExpression",
"start": 0,
"end": 9,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 2,
"column": 6
}
},
"left": {
"type": "Identifier",
"start": 0,
"end": 1,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 1
},
"identifierName": "a"
},
"name": "a"
},
"operator": "??",
"right": {
"type": "Identifier",
"start": 8,
"end": 9,
"loc": {
"start": {
"line": 2,
"column": 5
},
"end": {
"line": 2,
"column": 6
},
"identifierName": "b"
},
"name": "b"
}
},
"operator": "??",
"right": {
"type": "Identifier",
"start": 15,
"end": 16,
"loc": {
"start": {
"line": 3,
"column": 5
},
"end": {
"line": 3,
"column": 6
},
"identifierName": "c"
},
"name": "c"
}
}
}
],
"directives": []
}
}

4
test/fixtures/experimental/nullish-coalescing-operator/multiline/options.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"plugins": ["nullishCoalescingOperator"]
}

1
test/fixtures/experimental/nullish-coalescing-operator/nullish-and/actual.js vendored Normal file
View File

@ -0,0 +1 @@
a ?? b && c;

132
test/fixtures/experimental/nullish-coalescing-operator/nullish-and/expected.json vendored Normal file
View File

@ -0,0 +1,132 @@
{
"type": "File",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"program": {
"type": "Program",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"sourceType": "script",
"body": [
{
"type": "ExpressionStatement",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"expression": {
"type": "LogicalExpression",
"start": 0,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 11
}
},
"left": {
"type": "Identifier",
"start": 0,
"end": 1,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 1
},
"identifierName": "a"
},
"name": "a"
},
"operator": "??",
"right": {
"type": "LogicalExpression",
"start": 5,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 11
}
},
"left": {
"type": "Identifier",
"start": 5,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 6
},
"identifierName": "b"
},
"name": "b"
},
"operator": "&&",
"right": {
"type": "Identifier",
"start": 10,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 11
},
"identifierName": "c"
},
"name": "c"
}
}
}
}
],
"directives": []
}
}

4
test/fixtures/experimental/nullish-coalescing-operator/nullish-and/options.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"plugins": ["nullishCoalescingOperator"]
}

1
test/fixtures/experimental/nullish-coalescing-operator/nullish-or/actual.js vendored Normal file
View File

@ -0,0 +1 @@
a ?? b || c;

132
test/fixtures/experimental/nullish-coalescing-operator/nullish-or/expected.json vendored Normal file
View File

@ -0,0 +1,132 @@
{
"type": "File",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"program": {
"type": "Program",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"sourceType": "script",
"body": [
{
"type": "ExpressionStatement",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"expression": {
"type": "LogicalExpression",
"start": 0,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 11
}
},
"left": {
"type": "LogicalExpression",
"start": 0,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 6
}
},
"left": {
"type": "Identifier",
"start": 0,
"end": 1,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 1
},
"identifierName": "a"
},
"name": "a"
},
"operator": "??",
"right": {
"type": "Identifier",
"start": 5,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 6
},
"identifierName": "b"
},
"name": "b"
}
},
"operator": "||",
"right": {
"type": "Identifier",
"start": 10,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 11
},
"identifierName": "c"
},
"name": "c"
}
}
}
],
"directives": []
}
}

4
test/fixtures/experimental/nullish-coalescing-operator/nullish-or/options.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"plugins": ["nullishCoalescingOperator"]
}

1
test/fixtures/experimental/nullish-coalescing-operator/or-nullish/actual.js vendored Normal file
View File

@ -0,0 +1 @@
a || b ?? c;

132
test/fixtures/experimental/nullish-coalescing-operator/or-nullish/expected.json vendored Normal file
View File

@ -0,0 +1,132 @@
{
"type": "File",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"program": {
"type": "Program",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"sourceType": "script",
"body": [
{
"type": "ExpressionStatement",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"expression": {
"type": "LogicalExpression",
"start": 0,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 11
}
},
"left": {
"type": "LogicalExpression",
"start": 0,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 6
}
},
"left": {
"type": "Identifier",
"start": 0,
"end": 1,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 1
},
"identifierName": "a"
},
"name": "a"
},
"operator": "||",
"right": {
"type": "Identifier",
"start": 5,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 6
},
"identifierName": "b"
},
"name": "b"
}
},
"operator": "??",
"right": {
"type": "Identifier",
"start": 10,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 11
},
"identifierName": "c"
},
"name": "c"
}
}
}
],
"directives": []
}
}

4
test/fixtures/experimental/nullish-coalescing-operator/or-nullish/options.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"plugins": ["nullishCoalescingOperator"]
}

1
test/fixtures/experimental/nullish-coalescing-operator/with-pipeline/actual.js vendored Normal file
View File

@ -0,0 +1 @@
a |> b ?? c;

132
test/fixtures/experimental/nullish-coalescing-operator/with-pipeline/expected.json vendored Normal file
View File

@ -0,0 +1,132 @@
{
"type": "File",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"program": {
"type": "Program",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"sourceType": "script",
"body": [
{
"type": "ExpressionStatement",
"start": 0,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 12
}
},
"expression": {
"type": "BinaryExpression",
"start": 0,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 11
}
},
"left": {
"type": "Identifier",
"start": 0,
"end": 1,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 1
},
"identifierName": "a"
},
"name": "a"
},
"operator": "|>",
"right": {
"type": "LogicalExpression",
"start": 5,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 11
}
},
"left": {
"type": "Identifier",
"start": 5,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 6
},
"identifierName": "b"
},
"name": "b"
},
"operator": "??",
"right": {
"type": "Identifier",
"start": 10,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 11
},
"identifierName": "c"
},
"name": "c"
}
}
}
}
],
"directives": []
}
}

4
test/fixtures/experimental/nullish-coalescing-operator/with-pipeline/options.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"plugins": ["nullishCoalescingOperator", "pipelineOperator"]
}