More cases of attributes not handled.

The module constraint can originate from `module M: MT = await N` or from `module M = await (N: MT)` and the attributes go to the module id in the first case, but on the constraint in the second.

Author: cristianoc

compiler/frontend/bs_builtin_ppx.ml

@@ -196,11 +196,13 @@ let expr_mapper ~async_context ~in_function_def (self : mapper)
         ({
            pmod_desc =
              Pmod_constraint
-               ({pmod_desc = Pmod_ident _}, {pmty_desc = Pmty_ident mtyp_lid});
-           pmod_attributes;
+               ( {pmod_desc = Pmod_ident _; pmod_attributes = attrs1},
+                 {pmty_desc = Pmty_ident mtyp_lid} );
+           pmod_attributes = attrs2;
          } as me),
         expr )
-    when Res_parsetree_viewer.has_await_attribute pmod_attributes ->
+    when Res_parsetree_viewer.has_await_attribute attrs1
+         || Res_parsetree_viewer.has_await_attribute attrs2 ->
     {
       e with
       pexp_desc =
@@ -224,14 +226,20 @@ let expr_mapper ~async_context ~in_function_def (self : mapper)
   in
   match e.pexp_desc with
   | Pexp_letmodule (_, {pmod_desc = Pmod_ident _; pmod_attributes}, _)
+    when Ast_attributes.has_await_payload pmod_attributes ->
+    check_await ();
+    result
   | Pexp_letmodule
       ( _,
         {
           pmod_desc =
-            Pmod_constraint ({pmod_desc = Pmod_ident _; pmod_attributes}, _);
+            Pmod_constraint
+              ({pmod_desc = Pmod_ident _; pmod_attributes = attrs1}, _);
+          pmod_attributes = attrs2;
         },
         _ )
-    when Ast_attributes.has_await_payload pmod_attributes ->
+    when Ast_attributes.has_await_payload attrs1
+         || Ast_attributes.has_await_payload attrs2 ->
     check_await ();
     result
   | _ when Ast_attributes.has_await_payload e.pexp_attributes ->

tests/tests/src/async_await.mjs

@@ -34,6 +34,14 @@ async function f(value) {
   return await Promise.resolve(1);
 }
 
+async function f0() {
+  return (await import("rescript/lib/es6/Belt_Option.js")).forEach;
+}
+
+async function f1() {
+  return (await import("rescript/lib/es6/Belt_Option.js")).forEach;
+}
+
 export {
   next,
   useNext,
@@ -43,5 +51,7 @@ export {
   toplevelAwait,
   toplevelAwait2,
   f,
+  f0,
+  f1,
 }
 /* toplevelAwait Not a pure module */

tests/tests/src/async_await.res

@@ -18,3 +18,15 @@ let toplevelAwait2 = arr[await topFoo()]
 let f = async (type input, value: input) => {
   await Js.Promise.resolve(1)
 }
+
+module type MT = module type of Belt.Option
+
+let f0 = async () => {
+  module O = await Belt.Option
+  O.forEach
+}
+
+let f1 = async () => {
+  module O: MT = await Belt.Option
+  O.forEach
+}