fix(binary operator precedences): 🐛

vivaxy · vivaxy · commit 9939d0afc58c · 2018-08-27T16:08:45.000+08:00
diff --git a/lib/__tests__/fixtures/parse/003/output.json b/lib/__tests__/fixtures/parse/003/output.json
@@ -57,7 +57,8 @@
                         "right": {
                           "type": "Literal",
                           "value": "100%"
-                        }
+                        },
+                        "paren": true
                       }
                     },
                     "right": {
@@ -91,7 +92,8 @@
                     "right": {
                       "type": "Literal",
                       "value": "100%"
-                    }
+                    },
+                    "paren": true
                   }
                 },
                 "right": {
@@ -125,7 +127,8 @@
                 "right": {
                   "type": "Literal",
                   "value": "0"
-                }
+                },
+                "paren": true
               }
             },
             "right": {
@@ -159,7 +162,8 @@
             "right": {
               "type": "Literal",
               "value": "0"
-            }
+            },
+            "paren": true
           }
         },
         "right": {
@@ -169,4 +173,4 @@
       }
     }
   ]
-}
+}
diff --git a/lib/__tests__/fixtures/parse/binary-expression-precedences-000/output.json b/lib/__tests__/fixtures/parse/binary-expression-precedences-000/output.json
@@ -33,13 +33,15 @@
                 "right": {
                   "type": "Literal",
                   "value": 3
-                }
+                },
+                "paren": true
               }
             },
             "right": {
               "type": "Literal",
               "value": 2
-            }
+            },
+            "paren": true
           }
         },
         "right": {
@@ -49,4 +51,4 @@
       }
     }
   ]
-}
+}
diff --git a/lib/__tests__/fixtures/parse/binary-expression-precedences-001/input.js b/lib/__tests__/fixtures/parse/binary-expression-precedences-001/input.js
@@ -0,0 +1 @@
+a || d && e ^ f & g === h < i << j + k % l ** !m++ ? b : c
diff --git a/lib/__tests__/fixtures/parse/binary-expression-precedences-001/output.json b/lib/__tests__/fixtures/parse/binary-expression-precedences-001/output.json
@@ -0,0 +1,109 @@
+{
+  "type": "Program",
+  "body": [
+    {
+      "type": "ConditionalExpression",
+      "test": {
+        "type": "LogicalExpression",
+        "operator": "||",
+        "left": {
+          "type": "Identifier",
+          "name": "a"
+        },
+        "right": {
+          "type": "LogicalExpression",
+          "operator": "&&",
+          "left": {
+            "type": "Identifier",
+            "name": "d"
+          },
+          "right": {
+            "type": "BinaryExpression",
+            "operator": "^",
+            "left": {
+              "type": "Identifier",
+              "name": "e"
+            },
+            "right": {
+              "type": "BinaryExpression",
+              "operator": "&",
+              "left": {
+                "type": "Identifier",
+                "name": "f"
+              },
+              "right": {
+                "type": "BinaryExpression",
+                "operator": "===",
+                "left": {
+                  "type": "Identifier",
+                  "name": "g"
+                },
+                "right": {
+                  "type": "BinaryExpression",
+                  "operator": "<",
+                  "left": {
+                    "type": "Identifier",
+                    "name": "h"
+                  },
+                  "right": {
+                    "type": "BinaryExpression",
+                    "operator": "<<",
+                    "left": {
+                      "type": "Identifier",
+                      "name": "i"
+                    },
+                    "right": {
+                      "type": "BinaryExpression",
+                      "operator": "+",
+                      "left": {
+                        "type": "Identifier",
+                        "name": "j"
+                      },
+                      "right": {
+                        "type": "BinaryExpression",
+                        "operator": "%",
+                        "left": {
+                          "type": "Identifier",
+                          "name": "k"
+                        },
+                        "right": {
+                          "type": "BinaryExpression",
+                          "operator": "**",
+                          "left": {
+                            "type": "Identifier",
+                            "name": "l"
+                          },
+                          "right": {
+                            "type": "UnaryExpression",
+                            "operator": "!",
+                            "argument": {
+                              "type": "UpdateExpression",
+                              "operator": "++",
+                              "argument": {
+                                "type": "Identifier",
+                                "name": "m"
+                              },
+                              "prefix": false
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "consequent": {
+        "type": "Identifier",
+        "name": "b"
+      },
+      "alternate": {
+        "type": "Identifier",
+        "name": "c"
+      }
+    }
+  ]
+}
diff --git a/lib/__tests__/fixtures/parse/binary-expression-precedences-002/input.js b/lib/__tests__/fixtures/parse/binary-expression-precedences-002/input.js
@@ -0,0 +1 @@
+a && b ** c
diff --git a/lib/__tests__/fixtures/parse/binary-expression-precedences-002/output.json b/lib/__tests__/fixtures/parse/binary-expression-precedences-002/output.json
@@ -0,0 +1,28 @@
+{
+  "type": "Program",
+  "body": [
+    {
+      "type": "ExpressionStatement",
+      "expression": {
+        "type": "LogicalExpression",
+        "operator": "&&",
+        "left": {
+          "type": "Identifier",
+          "name": "a"
+        },
+        "right": {
+          "type": "BinaryExpression",
+          "operator": "**",
+          "left": {
+            "type": "Identifier",
+            "name": "b"
+          },
+          "right": {
+            "type": "Identifier",
+            "name": "c"
+          }
+        }
+      }
+    }
+  ]
+}
diff --git a/lib/__tests__/fixtures/parse/binary-expression-precedences-003/input.js b/lib/__tests__/fixtures/parse/binary-expression-precedences-003/input.js
@@ -0,0 +1 @@
+1 + 2 + 3 + 4
diff --git a/lib/__tests__/fixtures/parse/binary-expression-precedences-003/output.json b/lib/__tests__/fixtures/parse/binary-expression-precedences-003/output.json
@@ -0,0 +1,36 @@
+{
+  "type": "Program",
+  "body": [
+    {
+      "type": "ExpressionStatement",
+      "expression": {
+        "type": "BinaryExpression",
+        "operator": "+",
+        "left": {
+          "type": "BinaryExpression",
+          "operator": "+",
+          "left": {
+            "type": "BinaryExpression",
+            "operator": "+",
+            "left": {
+              "type": "Literal",
+              "value": 1
+            },
+            "right": {
+              "type": "Literal",
+              "value": 2
+            }
+          },
+          "right": {
+            "type": "Literal",
+            "value": 3
+          }
+        },
+        "right": {
+          "type": "Literal",
+          "value": 4
+        }
+      }
+    }
+  ]
+}
diff --git a/lib/__tests__/fixtures/parse/unary-expression-002/actual.json b/lib/__tests__/fixtures/parse/unary-expression-002/actual.json
@@ -0,0 +1,21 @@
+{
+  "type": "Program",
+  "body": [
+    {
+      "type": "ExpressionStatement",
+      "expression": {
+        "type": "UnaryExpression",
+        "operator": "!",
+        "argument": {
+          "type": "UpdateExpression",
+          "operator": "++",
+          "argument": {
+            "type": "Identifier",
+            "name": "a"
+          },
+          "prefix": false
+        }
+      }
+    }
+  ]
+}
diff --git a/lib/__tests__/fixtures/parse/unary-expression-002/input.js b/lib/__tests__/fixtures/parse/unary-expression-002/input.js
@@ -0,0 +1 @@
+!a++
diff --git a/lib/__tests__/fixtures/parse/unary-expression-002/output.json b/lib/__tests__/fixtures/parse/unary-expression-002/output.json
@@ -0,0 +1,21 @@
+{
+  "type": "Program",
+  "body": [
+    {
+      "type": "ExpressionStatement",
+      "expression": {
+        "type": "UnaryExpression",
+        "operator": "!",
+        "argument": {
+          "type": "UpdateExpression",
+          "operator": "++",
+          "argument": {
+            "type": "Identifier",
+            "name": "a"
+          },
+          "prefix": false
+        }
+      }
+    }
+  ]
+}
diff --git a/lib/__tests__/fixtures/serialize/binary-expression-precedences-001/input.js b/lib/__tests__/fixtures/serialize/binary-expression-precedences-001/input.js
@@ -0,0 +1 @@
+a || d && e ^ f & g === h < i << j + k % l ** !m++ ? b : c
diff --git a/lib/__tests__/fixtures/serialize/binary-expression-precedences-001/output.js b/lib/__tests__/fixtures/serialize/binary-expression-precedences-001/output.js
@@ -0,0 +1 @@
+a || d && e ^ f & g === h < i << j + k % l ** !m++ ? b : c
diff --git a/lib/__tests__/parse.js b/lib/__tests__/parse.js
@@ -17,7 +17,7 @@ test('parse', async (t) => {
     onlyDirectories: true,
   })).filter((x) => {
     return true;
-    return x === 'number-000';
+    return x === 'binary-expression-precedences-003';
   });
 
   const tested = [];
@@ -45,7 +45,11 @@ test('parse', async (t) => {
           path.join(testRootDir, 'actual.json'),
           JSON.stringify(ans, null, 2)
         );
-        t.fail('Test case error: ' + testCases[i]);
+        t.deepEqual(
+          JSON.parse(JSON.stringify(ans)),
+          output,
+          'Test case error: ' + testCases[i]
+        );
       }
     } catch (e) {
       t.fail('Test case error: ' + testCases[i] + '\n error: ' + e.stack);
diff --git a/lib/__tests__/serialize.js b/lib/__tests__/serialize.js
@@ -11,9 +11,15 @@ const glob = require('fast-glob');
 const parse = require('../parse.js');
 const serialize = require('../serialize.js');
 
-test.only('serialize', async (t) => {
+test('serialize', async (t) => {
   const baseDir = path.join(__dirname, 'fixtures', 'serialize');
-  const testCases = await glob('*', { cwd: baseDir, onlyDirectories: true });
+  const testCases = (await glob('*', {
+    cwd: baseDir,
+    onlyDirectories: true,
+  })).filter((x) => {
+    return true;
+    return x === 'binary-expression-precedences-001';
+  });
 
   const tested = [];
   for (let i = 0; i < testCases.length; i++) {
diff --git a/lib/parse.js b/lib/parse.js
diff --git a/lib/serialize.js b/lib/serialize.js
diff --git a/types/ast-types.js b/types/ast-types.js

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,15 @@`
`33`	`33`	`"right": {`
`34`	`34`	`"type": "Literal",`
`35`	`35`	`"value": 3`
`36`		`- }`
	`36`	`+ },`
	`37`	`+ "paren": true`
`37`	`38`	`}`
`38`	`39`	`},`
`39`	`40`	`"right": {`
`40`	`41`	`"type": "Literal",`
`41`	`42`	`"value": 2`
`42`		`- }`
	`43`	`+ },`
	`44`	`+ "paren": true`
`43`	`45`	`}`
`44`	`46`	`},`
`45`	`47`	`"right": {`
`@@ -49,4 +51,4 @@`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`	`]`
`52`		`-}`
	`54`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+a \|\| d && e ^ f & g === h < i << j + k % l ** !m++ ? b : c`