Update babel/parser to v7.12.17 (prettier#10345)

package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@angular/compiler": "11.2.1",
     "@babel/code-frame": "7.12.13",
-    "@babel/parser": "7.12.11",
+    "@babel/parser": "7.12.17",
     "@glimmer/syntax": "0.77.1",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.15.1",

src/language-js/clean.js

@@ -197,12 +197,6 @@ function clean(ast, newObj, parent) {
   if (ast.type === "InterpreterDirective") {
     newObj.value = newObj.value.trimEnd();
   }
-
-  // TODO: Remove this when fixing #9760
-  if (ast.type === "ClassMethod") {
-    delete newObj.declare;
-    delete newObj.readonly;
-  }
 }
 
 clean.ignoredProperties = ignoredProperties;

src/language-js/parser-babel.js

@@ -172,6 +172,8 @@ const messagesShouldThrow = new Set([
   "Invalid Unicode escape",
   // ErrorMessages.MissingUnicodeEscape
   "Expecting Unicode escape sequence \\uXXXX",
+  // ErrorMessages.MissingSemicolon
+  "Missing semicolon",
 ]);
 
 function shouldRethrowRecoveredError(error) {

src/language-js/print/class.js

@@ -160,6 +160,15 @@ function printClassMethod(path, options, print) {
   if (n.accessibility) {
     parts.push(n.accessibility + " ");
   }
+  // "readonly" and "declare" are supported by only "babel-ts"
+  // https://github.com/prettier/prettier/issues/9760
+  if (n.readonly) {
+    parts.push("readonly ");
+  }
+  if (n.declare) {
+    parts.push("declare ");
+  }
+
   if (n.static) {
     parts.push("static ");
   }

src/language-js/print/typescript.js

@@ -358,6 +358,10 @@ function printTypescript(path, options, print) {
         n.export ? "export " : "",
         n.static ? "static " : "",
         n.readonly ? "readonly " : "",
+        // "abstract" and "declare" are supported by only "babel-ts"
+        // https://github.com/prettier/prettier/issues/9760
+        n.abstract ? "abstract " : "",
+        n.declare ? "declare " : "",
         n.computed ? "[" : "",
         path.call(print, "key"),
         n.computed ? "]" : "",

tests/flow/await/__snapshots__/jsfmt.spec.js.snap

@@ -0,0 +1,85 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`await-keywords.js format 1`] = `
+====================================options=====================================
+parsers: ["flow"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+export class C1 {
+  p = await (0);
+}
+
+await (0);
+
+async function foo() {
+  function bar(x = await (2)) {}
+}
+
+async (x = await (2)) => {};
+
+export class C2 {
+  p = await 0;
+}
+
+function foo(promise) { await (promise); }
+
+function a() {
+  return await (1)
+}
+
+() => { await (x) };
+
+function foo() {
+  await
+  (foo);
+}
+
+export class C {
+  p = await (0);
+}
+
+await (0);
+
+=====================================output=====================================
+export class C1 {
+  p = await(0);
+}
+
+await(0);
+
+async function foo() {
+  function bar(x = await(2)) {}
+}
+
+async (x = await(2)) => {};
+
+export class C2 {
+  p = await;
+  0;
+}
+
+function foo(promise) {
+  await(promise);
+}
+
+function a() {
+  return await(1);
+}
+
+() => {
+  await(x);
+};
+
+function foo() {
+  await(foo);
+}
+
+export class C {
+  p = await(0);
+}
+
+await(0);
+
+================================================================================
+`;

tests/flow/await/await-keywords.js

@@ -0,0 +1,34 @@
+export class C1 {
+  p = await (0);
+}
+
+await (0);
+
+async function foo() {
+  function bar(x = await (2)) {}
+}
+
+async (x = await (2)) => {};
+
+export class C2 {
+  p = await 0;
+}
+
+function foo(promise) { await (promise); }
+
+function a() {
+  return await (1)
+}
+
+() => { await (x) };
+
+function foo() {
+  await
+  (foo);
+}
+
+export class C {
+  p = await (0);
+}
+
+await (0);

tests/flow/await/jsfmt.spec.js

@@ -0,0 +1 @@
+run_spec(__dirname, ["flow"]);

tests/flow/declare-function/__snapshots__/jsfmt.spec.js.snap

@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`export.js format 1`] = `
+====================================options=====================================
+parsers: ["flow", "babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+declare function foo(): void;
+export { foo };
+
+=====================================output=====================================
+declare function foo(): void;
+export { foo };
+
+================================================================================
+`;

tests/flow/declare-function/export.js

@@ -0,0 +1,2 @@
+declare function foo(): void;
+export { foo };

tests/flow/declare-function/jsfmt.spec.js

@@ -0,0 +1 @@
+run_spec(__dirname, ["flow", "babel"]);

tests/js/async/__snapshots__/jsfmt.spec.js.snap

@@ -51,6 +51,70 @@ printWidth: 80
 ================================================================================
 `;
 
+exports[`await-keyword.js [espree] format 1`] = `
+"Cannot use keyword 'await' outside an async function (2:20)
+  1 | async function foo() {
+> 2 |   function bar(x = await 2) {}
+    |                    ^
+  3 | }
+  4 |
+  5 | async (x = await 2) => {};"
+`;
+
+exports[`await-keyword.js [flow] format 1`] = `
+"Unexpected number, expected the token \`,\` (2:26)
+  1 | async function foo() {
+> 2 |   function bar(x = await 2) {}
+    |                          ^
+  3 | }
+  4 |
+  5 | async (x = await 2) => {};"
+`;
+
+exports[`await-keyword.js [meriyah] format 1`] = `
+"[2:24]: 'Await' may not be used as an identifier in this context (2:24)
+  1 | async function foo() {
+> 2 |   function bar(x = await 2) {}
+    |                        ^
+  3 | }
+  4 |
+  5 | async (x = await 2) => {};"
+`;
+
+exports[`await-keyword.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+async function foo() {
+  function bar(x = await 2) {}
+}
+
+async (x = await 2) => {};
+
+async function foo() {
+  function bar(x = await (2)) {}
+}
+
+async (x = await (2)) => {};
+
+=====================================output=====================================
+async function foo() {
+  function bar(x = await 2) {}
+}
+
+async (x = await 2) => {};
+
+async function foo() {
+  function bar(x = await(2)) {}
+}
+
+async (x = await 2) => {};
+
+================================================================================
+`;
+
 exports[`await-parse.js format 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]

tests/js/async/await-keyword.js

@@ -0,0 +1,11 @@
+async function foo() {
+  function bar(x = await 2) {}
+}
+
+async (x = await 2) => {};
+
+async function foo() {
+  function bar(x = await (2)) {}
+}
+
+async (x = await (2)) => {};

tests/js/async/jsfmt.spec.js

@@ -1 +1,7 @@
-run_spec(__dirname, ["babel", "flow", "typescript"]);
+run_spec(__dirname, ["babel", "flow", "typescript"], {
+  errors: {
+    flow: ["await-keyword.js"],
+    espree: ["await-keyword.js"],
+    meriyah: ["await-keyword.js"],
+  },
+});

tests/js/await-with-parens/__snapshots__/jsfmt.spec.js.snap

@@ -0,0 +1,70 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`await-with-parens.js [espree] format 1`] = `
+"Cannot use keyword 'await' outside an async function (1:25)
+> 1 | function foo(promise) { await (promise); }
+    |                         ^
+  2 |
+  3 | function a() {
+  4 |   return await (1)"
+`;
+
+exports[`await-with-parens.js [meriyah] format 1`] = `
+"[1:29]: 'Await' may not be used as an identifier in this context (1:29)
+> 1 | function foo(promise) { await (promise); }
+    |                             ^
+  2 |
+  3 | function a() {
+  4 |   return await (1)"
+`;
+
+exports[`await-with-parens.js format 1`] = `
+====================================options=====================================
+parsers: ["babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+function foo(promise) { await (promise); }
+
+function a() {
+  return await (1)
+}
+
+() => { await (x) };
+
+function foo() {
+  await
+  (foo);
+}
+
+export class C {
+  p = await (0);
+}
+
+await (0);
+
+=====================================output=====================================
+function foo(promise) {
+  await(promise);
+}
+
+function a() {
+  return await(1);
+}
+
+() => {
+  await(x);
+};
+
+function foo() {
+  await(foo);
+}
+
+export class C {
+  p = await 0;
+}
+
+await 0;
+
+================================================================================
+`;

tests/js/await-with-parens/await-with-parens.js

@@ -0,0 +1,18 @@
+function foo(promise) { await (promise); }
+
+function a() {
+  return await (1)
+}
+
+() => { await (x) };
+
+function foo() {
+  await
+  (foo);
+}
+
+export class C {
+  p = await (0);
+}
+
+await (0);

tests/js/await-with-parens/jsfmt.spec.js

@@ -0,0 +1,6 @@
+run_spec(__dirname, ["babel"], {
+  errors: {
+    espree: true,
+    meriyah: true,
+  },
+});