Fix implementation of directives.

The compiler's ppx is only run when parsing the source file.
For config settings such as directives, this is OK when `bsc` is invoked directly, but not when part of building a project. In the latter case, the ast is compiled separately, and the builtin ppx is not run again before emitting code.

Author: cristianoc

CHANGELOG.md

@@ -12,6 +12,9 @@
 
 # 10.1.4
 
+#### :bug: Bug Fix
+- Fix implementation of directives
+
 # 10.1.3
 
 #### :rocket: New Feature

jscomp/core/js_implementation.ml

@@ -127,7 +127,15 @@ let no_export (rest : Parsetree.structure) : Parsetree.structure =
         ]
   | _ -> rest
 
+let process_attributes items =
+  items |> List.iter(fun (item : Parsetree.structure_item) -> match item.pstr_desc with
+  | Pstr_attribute ({ txt = "directive" },
+     PStr [ { pstr_desc = Pstr_eval ({ pexp_desc = Pexp_constant (Pconst_string (d, _)) }, _) } ]) ->
+      Js_config.directives := !Js_config.directives @ [d]
+  | _ -> ())
+
 let after_parsing_impl ppf outputprefix (ast : Parsetree.structure) =
+  process_attributes ast;
   if !Clflags.only_parse = false then (
     Js_config.all_module_aliases :=
       !Clflags.assume_no_mli = Mli_non_exists && all_module_alias ast;

jscomp/frontend/bs_builtin_ppx.ml

@@ -475,10 +475,6 @@ let structure_item_mapper (self : mapper) (str : Parsetree.structure_item) :
                   [ { pvb_pat; pvb_expr; pvb_attributes; pvb_loc } ] );
           })
   | Pstr_attribute ({ txt = "bs.config" | "config" }, _) -> str
-  | Pstr_attribute ({ txt = "directive" },
-     PStr [ { pstr_desc = Pstr_eval ({ pexp_desc = Pexp_constant (Pconst_string (d, _)) }, _) } ]) ->
-      Js_config.directives := d :: !Js_config.directives;
-      str
   | _ -> default_mapper.structure_item self str
 
 let local_module_name =

lib/4.06.1/unstable/js_compiler.ml

@@ -273363,10 +273363,6 @@ let structure_item_mapper (self : mapper) (str : Parsetree.structure_item) :
                   [ { pvb_pat; pvb_expr; pvb_attributes; pvb_loc } ] );
           })
   | Pstr_attribute ({ txt = "bs.config" | "config" }, _) -> str
-  | Pstr_attribute ({ txt = "directive" },
-     PStr [ { pstr_desc = Pstr_eval ({ pexp_desc = Pexp_constant (Pconst_string (d, _)) }, _) } ]) ->
-      Js_config.directives := d :: !Js_config.directives;
-      str
   | _ -> default_mapper.structure_item self str
 
 let local_module_name =

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -273363,10 +273363,6 @@ let structure_item_mapper (self : mapper) (str : Parsetree.structure_item) :
                   [ { pvb_pat; pvb_expr; pvb_attributes; pvb_loc } ] );
           })
   | Pstr_attribute ({ txt = "bs.config" | "config" }, _) -> str
-  | Pstr_attribute ({ txt = "directive" },
-     PStr [ { pstr_desc = Pstr_eval ({ pexp_desc = Pexp_constant (Pconst_string (d, _)) }, _) } ]) ->
-      Js_config.directives := d :: !Js_config.directives;
-      str
   | _ -> default_mapper.structure_item self str
 
 let local_module_name =

lib/4.06.1/whole_compiler.ml

@@ -283760,10 +283760,6 @@ let structure_item_mapper (self : mapper) (str : Parsetree.structure_item) :
                   [ { pvb_pat; pvb_expr; pvb_attributes; pvb_loc } ] );
           })
   | Pstr_attribute ({ txt = "bs.config" | "config" }, _) -> str
-  | Pstr_attribute ({ txt = "directive" },
-     PStr [ { pstr_desc = Pstr_eval ({ pexp_desc = Pexp_constant (Pconst_string (d, _)) }, _) } ]) ->
-      Js_config.directives := d :: !Js_config.directives;
-      str
   | _ -> default_mapper.structure_item self str
 
 let local_module_name =
@@ -294305,7 +294301,15 @@ let no_export (rest : Parsetree.structure) : Parsetree.structure =
         ]
   | _ -> rest
 
+let process_attributes items =
+  items |> List.iter(fun (item : Parsetree.structure_item) -> match item.pstr_desc with
+  | Pstr_attribute ({ txt = "directive" },
+     PStr [ { pstr_desc = Pstr_eval ({ pexp_desc = Pexp_constant (Pconst_string (d, _)) }, _) } ]) ->
+      Js_config.directives := !Js_config.directives @ [d]
+  | _ -> ())
+
 let after_parsing_impl ppf outputprefix (ast : Parsetree.structure) =
+  process_attributes ast;
   if !Clflags.only_parse = false then (
     Js_config.all_module_aliases :=
       !Clflags.assume_no_mli = Mli_non_exists && all_module_alias ast;