[Babel 8] Remove extra.shorthand (#16521)

babel · Jun 3, 2024 · 17a5502 · 17a5502
1 parent 77aeb15
commit 17a5502
Show file tree

Hide file tree

Showing 170 changed files with 37 additions and 642 deletions.
diff --git a/packages/babel-parser/src/parser/expression.ts b/packages/babel-parser/src/parser/expression.ts
@@ -2093,9 +2093,11 @@ export default abstract class ExpressionParser extends LValParser {
         this.raise(Errors.InvalidRecordProperty, prop);
       }
 
-      // @ts-expect-error shorthand may not index prop
-      if (prop.shorthand) {
-        this.addExtra(prop, "shorthand", true);
+      if (!process.env.BABEL_8_BREAKING) {
+        // @ts-expect-error shorthand may not index prop
+        if (prop.shorthand) {
+          this.addExtra(prop, "shorthand", true);
+        }
       }
 
       // @ts-expect-error Fixme: refine typings

diff --git a/...bel-parser/test/fixtures/annex-b/disabled/3.4-var-redeclaration-catch-binding/output.json b/...bel-parser/test/fixtures/annex-b/disabled/3.4-var-redeclaration-catch-binding/output.json
@@ -86,9 +86,6 @@
                   "type": "Identifier",
                   "start":44,"end":45,"loc":{"start":{"line":2,"column":16,"index":44},"end":{"line":2,"column":17,"index":45},"identifierName":"f"},
                   "name": "f"
-                },
-                "extra": {
-                  "shorthand": true
                 }
               }
             ]

diff --git a/...abel-parser/test/fixtures/annex-b/enabled/3.4-var-redeclaration-catch-binding/output.json b/...abel-parser/test/fixtures/annex-b/enabled/3.4-var-redeclaration-catch-binding/output.json
@@ -85,9 +85,6 @@
                   "type": "Identifier",
                   "start":44,"end":45,"loc":{"start":{"line":2,"column":16,"index":44},"end":{"line":2,"column":17,"index":45},"identifierName":"f"},
                   "name": "f"
-                },
-                "extra": {
-                  "shorthand": true
                 }
               }
             ]

diff --git a/.../test/fixtures/comments/basic/call-expression-trailing-comma-object-shorthand/output.json b/.../test/fixtures/comments/basic/call-expression-trailing-comma-object-shorthand/output.json
@@ -46,9 +46,6 @@
                     "type": "Identifier",
                     "start":8,"end":9,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":1,"column":9,"index":9},"identifierName":"b"},
                     "name": "b"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ],

diff --git a/...es/babel-parser/test/fixtures/comments/basic/object-expression-trailing-comma/output.json b/...es/babel-parser/test/fixtures/comments/basic/object-expression-trailing-comma/output.json
@@ -34,9 +34,6 @@
                     "start":22,"end":23,"loc":{"start":{"line":3,"column":2,"index":22},"end":{"line":3,"column":3,"index":23},"identifierName":"x"},
                     "name": "x"
                   },
-                  "extra": {
-                    "shorthand": true
-                  },
                   "trailingComments": [
                     {
                       "type": "CommentBlock",

diff --git a/...ser/test/fixtures/comments/interpreter-directive/interpreter-directive-object/output.json b/...ser/test/fixtures/comments/interpreter-directive/interpreter-directive-object/output.json
@@ -37,9 +37,6 @@
                     "type": "Identifier",
                     "start":33,"end":38,"loc":{"start":{"line":3,"column":6,"index":33},"end":{"line":3,"column":11,"index":38},"identifierName":"spawn"},
                     "name": "spawn"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/...ore/create-parenthesized-expressions/invalid-parenthesized-assignment-pattern/output.json b/...ore/create-parenthesized-expressions/invalid-parenthesized-assignment-pattern/output.json
@@ -39,9 +39,6 @@
                     "type": "Identifier",
                     "start":2,"end":3,"loc":{"start":{"line":1,"column":2,"index":2},"end":{"line":1,"column":3,"index":3},"identifierName":"x"},
                     "name": "x"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/packages/babel-parser/test/fixtures/core/escape-keyword/invalid/output.json b/packages/babel-parser/test/fixtures/core/escape-keyword/invalid/output.json
@@ -41,9 +41,6 @@
                     "type": "Identifier",
                     "start":12,"end":22,"loc":{"start":{"line":2,"column":2,"index":12},"end":{"line":2,"column":12,"index":22},"identifierName":"break"},
                     "name": "break"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/...rser/test/fixtures/core/object/member-expression-after-property-initializer-1/output.json b/...rser/test/fixtures/core/object/member-expression-after-property-initializer-1/output.json
@@ -46,9 +46,6 @@
                     },
                     "value": 42
                   }
-                },
-                "extra": {
-                  "shorthand": true
                 }
               },
               {

diff --git a/...rser/test/fixtures/core/object/member-expression-after-property-initializer-2/output.json b/...rser/test/fixtures/core/object/member-expression-after-property-initializer-2/output.json
@@ -46,9 +46,6 @@
                     },
                     "value": 42
                   }
-                },
-                "extra": {
-                  "shorthand": true
                 }
               },
               {

diff --git a/packages/babel-parser/test/fixtures/core/object/valid-property-initializer/output.json b/packages/babel-parser/test/fixtures/core/object/valid-property-initializer/output.json
@@ -55,9 +55,6 @@
                         },
                         "value": 123
                       }
-                    },
-                    "extra": {
-                      "shorthand": true
                     }
                   },
                   {

diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-obj-destr/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-obj-destr/output.json
@@ -41,9 +41,6 @@
                   "type": "Identifier",
                   "start":17,"end":20,"loc":{"start":{"line":2,"column":11,"index":17},"end":{"line":2,"column":14,"index":20},"identifierName":"foo"},
                   "name": "foo"
-                },
-                "extra": {
-                  "shorthand": true
                 }
               }
             ]

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/544/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/544/output.json
@@ -36,9 +36,6 @@
                     "type": "Identifier",
                     "start":22,"end":28,"loc":{"start":{"line":2,"column":8,"index":22},"end":{"line":2,"column":14,"index":28},"identifierName":"public"},
                     "name": "public"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/545/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/545/output.json
@@ -36,9 +36,6 @@
                     "type": "Identifier",
                     "start":8,"end":14,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":1,"column":14,"index":14},"identifierName":"public"},
                     "name": "public"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/546/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/546/output.json
@@ -33,9 +33,6 @@
                     "type": "Identifier",
                     "start":8,"end":14,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":1,"column":14,"index":14},"identifierName":"public"},
                     "name": "public"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/549/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/549/output.json
@@ -33,9 +33,6 @@
                     "type": "Identifier",
                     "start":8,"end":17,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":1,"column":17,"index":17},"identifierName":"arguments"},
                     "name": "arguments"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/packages/babel-parser/test/fixtures/es2015/array-rest-spread/with-object/output.json b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/with-object/output.json
@@ -40,9 +40,6 @@
                           "type": "Identifier",
                           "start":9,"end":15,"loc":{"start":{"line":1,"column":9,"index":9},"end":{"line":1,"column":15,"index":15},"identifierName":"length"},
                           "name": "length"
-                        },
-                        "extra": {
-                          "shorthand": true
                         }
                       }
                     ]

diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/object-rest-spread/output.json b/packages/babel-parser/test/fixtures/es2015/arrow-functions/object-rest-spread/output.json
@@ -45,9 +45,6 @@
                         "type": "Identifier",
                         "start":14,"end":19,"loc":{"start":{"line":1,"column":14,"index":14},"end":{"line":1,"column":19,"index":19},"identifierName":"title"},
                         "name": "title"
-                      },
-                      "extra": {
-                        "shorthand": true
                       }
                     },
                     {

diff --git a/...ages/babel-parser/test/fixtures/es2015/destructuring/binding-arguments-module/output.json b/...ages/babel-parser/test/fixtures/es2015/destructuring/binding-arguments-module/output.json
@@ -36,9 +36,6 @@
                     "type": "Identifier",
                     "start":8,"end":17,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":1,"column":17,"index":17},"identifierName":"arguments"},
                     "name": "arguments"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/...ages/babel-parser/test/fixtures/es2015/destructuring/binding-arguments-strict/output.json b/...ages/babel-parser/test/fixtures/es2015/destructuring/binding-arguments-strict/output.json
@@ -36,9 +36,6 @@
                     "type": "Identifier",
                     "start":22,"end":31,"loc":{"start":{"line":2,"column":8,"index":22},"end":{"line":2,"column":17,"index":31},"identifierName":"arguments"},
                     "name": "arguments"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/packages/babel-parser/test/fixtures/es2015/destructuring/binding-eval/output.json b/packages/babel-parser/test/fixtures/es2015/destructuring/binding-eval/output.json
@@ -45,9 +45,6 @@
                     "start":23,"end":31,"loc":{"start":{"line":1,"column":23,"index":23},"end":{"line":1,"column":31,"index":31},"identifierName":"defValue"},
                     "name": "defValue"
                   }
-                },
-                "extra": {
-                  "shorthand": true
                 }
               }
             ]

diff --git a/packages/babel-parser/test/fixtures/es2015/destructuring/binding-this/output.json b/packages/babel-parser/test/fixtures/es2015/destructuring/binding-this/output.json
@@ -36,9 +36,6 @@
                     "type": "Identifier",
                     "start":6,"end":10,"loc":{"start":{"line":1,"column":6,"index":6},"end":{"line":1,"column":10,"index":10},"identifierName":"this"},
                     "name": "this"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/...ages/babel-parser/test/fixtures/es2015/destructuring/parenthesized-lhs-object/output.json b/...ages/babel-parser/test/fixtures/es2015/destructuring/parenthesized-lhs-object/output.json
@@ -36,9 +36,6 @@
                   "type": "Identifier",
                   "start":2,"end":3,"loc":{"start":{"line":1,"column":2,"index":2},"end":{"line":1,"column":3,"index":3},"identifierName":"a"},
                   "name": "a"
-                },
-                "extra": {
-                  "shorthand": true
                 }
               }
             ],

diff --git a/...babel-parser/test/fixtures/es2015/for-in/var-objectbindingpattern-initializer/output.json b/...babel-parser/test/fixtures/es2015/for-in/var-objectbindingpattern-initializer/output.json
@@ -39,9 +39,6 @@
                       "type": "Identifier",
                       "start":10,"end":11,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":11,"index":11},"identifierName":"a"},
                       "name": "a"
-                    },
-                    "extra": {
-                      "shorthand": true
                     }
                   }
                 ]

diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/brackets-const/output.json b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-const/output.json
@@ -37,9 +37,6 @@
                       "type": "Identifier",
                       "start":12,"end":13,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":13,"index":13},"identifierName":"a"},
                       "name": "a"
-                    },
-                    "extra": {
-                      "shorthand": true
                     }
                   }
                 ]

diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/brackets-let/output.json b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-let/output.json
@@ -37,9 +37,6 @@
                       "type": "Identifier",
                       "start":10,"end":11,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":11,"index":11},"identifierName":"a"},
                       "name": "a"
-                    },
-                    "extra": {
-                      "shorthand": true
                     }
                   }
                 ]

diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/brackets-var/output.json b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-var/output.json
@@ -37,9 +37,6 @@
                       "type": "Identifier",
                       "start":10,"end":11,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":11,"index":11},"identifierName":"a"},
                       "name": "a"
-                    },
-                    "extra": {
-                      "shorthand": true
                     }
                   }
                 ]

diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-1/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-1/output.json
@@ -36,9 +36,6 @@
                     "type": "Identifier",
                     "start":6,"end":9,"loc":{"start":{"line":1,"column":6,"index":6},"end":{"line":1,"column":9,"index":9},"identifierName":"let"},
                     "name": "let"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-2/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-2/output.json
@@ -36,9 +36,6 @@
                     "type": "Identifier",
                     "start":8,"end":11,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":1,"column":11,"index":11},"identifierName":"let"},
                     "name": "let"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-7/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-7/output.json
@@ -49,9 +49,6 @@
                       },
                       "value": 10
                     }
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-8/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-8/output.json
@@ -49,9 +49,6 @@
                       },
                       "value": 10
                     }
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-obj-dstrk/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-obj-dstrk/output.json
@@ -33,9 +33,6 @@
                     "type": "Identifier",
                     "start":10,"end":11,"loc":{"start":{"line":2,"column":6,"index":10},"end":{"line":2,"column":7,"index":11},"identifierName":"a"},
                     "name": "a"
-                  },
-                  "extra": {
-                    "shorthand": true
                   }
                 }
               ]

diff --git a/.../test/fixtures/es2015/modules/duplicate-named-export-destructuring-assignment/output.json b/.../test/fixtures/es2015/modules/duplicate-named-export-destructuring-assignment/output.json
@@ -76,9 +76,6 @@
                         },
                         "value": 1
                       }
-                    },
-                    "extra": {
-                      "shorthand": true
                     }
                   }
                 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,9 +46,6 @@ @@
                         },
                         "value": 42
                       }
-                    },
-                    "extra": {
-                      "shorthand": true
                     }
                   },
                   {
@@ Expand Down @@