@bs.config -> @config

cknitt · cknitt · commit 359cc8cc5065 · 2024-02-18T17:11:04.000+01:00
diff --git a/jscomp/bsc/rescript_compiler_main.ml b/jscomp/bsc/rescript_compiler_main.ml
@@ -457,7 +457,7 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
 
 
 
-(** parse flags in bs.config *)
+(** parse flags in config *)
 let file_level_flags_handler (e : Parsetree.expression option) = 
   match e with 
   | None -> ()
diff --git a/jscomp/build_tests/react_ppx/src/recursive_component_test.res b/jscomp/build_tests/react_ppx/src/recursive_component_test.res
@@ -1,7 +1,7 @@
 @@warning("-39")
 // https://github.com/rescript-lang/rescript-compiler/issues/4511
 /*
-[@bs.config {
+[@config {
   flags : [|"-dsource"|]
 }];
 */
diff --git a/jscomp/frontend/ast_config.ml b/jscomp/frontend/ast_config.ml
@@ -57,11 +57,8 @@ let process_directives str =
 let rec iter_on_bs_config_str (x : Parsetree.structure) =
   match x with
   | [] -> ()
-  | {
-      pstr_desc =
-        Pstr_attribute (({txt = "bs.config" | "config"; loc}, payload) as attr);
-    }
-    :: _ ->
+  | {pstr_desc = Pstr_attribute (({txt = "config"; loc}, payload) as attr)} :: _
+    ->
     Bs_ast_invariant.mark_used_bs_attribute attr;
     Ext_list.iter
       (Ast_payload.ident_or_record_as_config loc payload)
@@ -76,11 +73,8 @@ let process_str str =
 let rec iter_on_bs_config_sig (x : Parsetree.signature) =
   match x with
   | [] -> ()
-  | {
-      psig_desc =
-        Psig_attribute (({txt = "bs.config" | "config"; loc}, payload) as attr);
-    }
-    :: _ ->
+  | {psig_desc = Psig_attribute (({txt = "config"; loc}, payload) as attr)} :: _
+    ->
     Bs_ast_invariant.mark_used_bs_attribute attr;
     Ext_list.iter
       (Ast_payload.ident_or_record_as_config loc payload)
diff --git a/jscomp/frontend/bs_builtin_ppx.ml b/jscomp/frontend/bs_builtin_ppx.ml
@@ -467,7 +467,7 @@ let structure_item_mapper (self : mapper) (str : Parsetree.structure_item) :
           Pstr_value
             (Nonrecursive, [{pvb_pat; pvb_expr; pvb_attributes; pvb_loc}]);
       })
-  | Pstr_attribute ({txt = "bs.config" | "config"}, _) -> str
+  | Pstr_attribute ({txt = "config"}, _) -> str
   | _ -> default_mapper.structure_item self str
 
 let local_module_name =
diff --git a/jscomp/ml/ast_payload.mli b/jscomp/ml/ast_payload.mli
@@ -63,11 +63,11 @@ val assert_strings : Location.t -> t -> string list
 (** as a record or empty 
     it will accept 
 
-    {[ [@@@bs.config ]]}
+    {[ [@@@config ]]}
     or 
-    {[ [@@@bs.config no_export ] ]}
+    {[ [@@@config no_export ] ]}
     or 
-    {[ [@@@bs.config { property  .. } ]]}    
+    {[ [@@@config { property  .. } ]]}    
     Note that we only 
     {[
       { flat_property}
diff --git a/jscomp/others/belt_List.res b/jscomp/others/belt_List.res
@@ -59,7 +59,7 @@
   ```
 */
 
-@@bs.config({flags: ["-bs-noassertfalse"]})
+@@config({flags: ["-bs-noassertfalse"]})
 
 type t<'a> = list<'a>
 
diff --git a/jscomp/others/belt_internalAVLset.res b/jscomp/others/belt_internalAVLset.res
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-@@bs.config({flags: ["-bs-noassertfalse"]})
+@@config({flags: ["-bs-noassertfalse"]})
 type rec node<'value> = {
   @as("v") mutable value: 'value,
   @as("h") mutable height: int,
diff --git a/jscomp/others/belt_internalAVLtree.res b/jscomp/others/belt_internalAVLtree.res
@@ -13,7 +13,7 @@
 
 /* Almost rewritten  by authors of ReScript */
 
-@@bs.config({flags: ["-bs-noassertfalse"]})
+@@config({flags: ["-bs-noassertfalse"]})
 type rec node<'k, 'v> = {
   @as("k") mutable key: 'k,
   @as("v") mutable value: 'v,
diff --git a/jscomp/others/belt_internalMapInt.res b/jscomp/others/belt_internalMapInt.res
@@ -1,4 +1,4 @@
-@@bs.config({flags: ["-bs-noassertfalse"]})
+@@config({flags: ["-bs-noassertfalse"]})
 
 type key = int
 
diff --git a/jscomp/others/belt_internalMapString.res b/jscomp/others/belt_internalMapString.res
@@ -1,4 +1,4 @@
-@@bs.config({flags: ["-bs-noassertfalse"]})
+@@config({flags: ["-bs-noassertfalse"]})
 
 type key = string
 
diff --git a/jscomp/others/internal_map.cppo.res b/jscomp/others/internal_map.cppo.res
@@ -1,4 +1,4 @@
-@@bs.config({flags: ["-bs-noassertfalse"]})
+@@config({flags: ["-bs-noassertfalse"]})
 
 #ifdef TYPE_STRING
 type key = string
diff --git a/jscomp/others/js.ml b/jscomp/others/js.ml
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-[@@@bs.config {flags = [|"-unboxed-types"; "-w"; "-49"|]}]
+[@@@config {flags = [|"-unboxed-types"; "-w"; "-49"|]}]
 (* DESIGN:
    - It does not have any code, all its code will be inlined so that
        there will never be
diff --git a/jscomp/others/js_OO.res b/jscomp/others/js_OO.res
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
-@@bs.config({flags: ["-unboxed-types"]})
+@@config({flags: ["-unboxed-types"]})
 
 external unsafe_to_method: 'a => 'a = "#fn_method"
 
diff --git a/jscomp/runtime/caml_hash.res b/jscomp/runtime/caml_hash.res
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-@@bs.config({flags: ["-bs-noassertfalse"]})
+@@config({flags: ["-bs-noassertfalse"]})
 type rec cell<'a> = {
   content: 'a,
   mutable next: option<cell<'a>>,
diff --git a/jscomp/runtime/js.ml b/jscomp/runtime/js.ml
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-[@@@bs.config {flags = [|"-unboxed-types"; "-w"; "-49"|]}]
+[@@@config {flags = [|"-unboxed-types"; "-w"; "-49"|]}]
 (* DESIGN:
    - It does not have any code, all its code will be inlined so that
        there will never be
diff --git a/jscomp/stdlib-406/callback.res b/jscomp/stdlib-406/callback.res
@@ -12,7 +12,7 @@
 /* special exception on linking described in the file LICENSE. */
 /*  */
 /* ************************************************************************ */
-@@bs.config({flags: ["-bs-no-cross-module-opt"]})
+@@config({flags: ["-bs-no-cross-module-opt"]})
 /* Registering OCaml values with the C runtime for later callbacks */
 
 let register = (_, _) => ()
diff --git a/jscomp/stdlib-406/camlinternalLazy.res b/jscomp/stdlib-406/camlinternalLazy.res
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
-@@bs.config({flags: ["-bs-no-cross-module-opt"]})
+@@config({flags: ["-bs-no-cross-module-opt"]})
 
 /* Internals of forcing lazy values. */
 type t<'a> = {
diff --git a/jscomp/stdlib-406/sys.res b/jscomp/stdlib-406/sys.res
@@ -1,4 +1,4 @@
-@@bs.config({flags: ["-bs-no-cross-module-opt"]})
+@@config({flags: ["-bs-no-cross-module-opt"]})
 /* ************************************************************************ */
 /*  */
 /* OCaml */
diff --git a/jscomp/syntax/tests/idempotency/mareo/Main.res b/jscomp/syntax/tests/idempotency/mareo/Main.res
@@ -1,4 +1,4 @@
-@@bs.config({no_export: no_export})
+@@config({no_export: no_export})
 
 open Belt
 
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__SubmissionBuilder.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__SubmissionBuilder.res
@@ -1,4 +1,4 @@
-@@bs.config({jsx: 3})
+@@config({jsx: 3})
 
 open CoursesCurriculum__Types
 
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/SubmissionChecklistItemShow.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/SubmissionChecklistItemShow.res
@@ -1,4 +1,4 @@
-@@bs.config({jsx: 3})
+@@config({jsx: 3})
 
 module ChecklistItem = SubmissionChecklistItem
 
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetChecklistItemEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetChecklistItemEditor.res
@@ -1,4 +1,4 @@
-@@bs.config({jsx: 3})
+@@config({jsx: 3})
 
 open CurriculumEditor__Types
 
diff --git a/jscomp/syntax/tests/idempotency/reductive/reductiveContext.res b/jscomp/syntax/tests/idempotency/reductive/reductiveContext.res
@@ -1,4 +1,4 @@
-@@bs.config({jsx: 3})
+@@config({jsx: 3})
 module type Config = {
   type state
   type action
diff --git a/jscomp/syntax/tests/idempotency/reductive/subscription.res b/jscomp/syntax/tests/idempotency/reductive/subscription.res
@@ -1,4 +1,4 @@
-@@bs.config({jsx: 3})
+@@config({jsx: 3})
 
 @deriving({jsConverter: newType})
 type source<'a> = {
diff --git a/jscomp/test/alias_default_value_test.res b/jscomp/test/alias_default_value_test.res
@@ -1,4 +1,4 @@
-@@bs.config({
+@@config({
   flags: ["-bs-jsx", "4"],
 })
 
diff --git a/jscomp/test/bs_MapInt_test.res b/jscomp/test/bs_MapInt_test.res
@@ -1,4 +1,4 @@
-@@bs.config({flags: ["-bs-no-cross-module-opt"]})
+@@config({flags: ["-bs-no-cross-module-opt"]})
 let should = b =>
   if !b {
     Js.Exn.raiseError("IMPOSSIBLE")
diff --git a/jscomp/test/config1_test.res b/jscomp/test/config1_test.res
@@ -1,3 +1,3 @@
-@@bs.config(no_export)
+@@config(no_export)
 
 let a = 3
diff --git a/jscomp/test/debug_mode_value.res b/jscomp/test/debug_mode_value.res
@@ -1,4 +1,4 @@
-@@bs.config({
+@@config({
   flags: [
     /* "-drawlambda"; */
     /* "-dlambda"; */
diff --git a/jscomp/test/gpr_1698_test.res b/jscomp/test/gpr_1698_test.res
@@ -1,4 +1,4 @@
-@@bs.config({no_export: true})
+@@config({no_export: true})
 type value =
   | Natural(int)
   | Symbol(string)
diff --git a/jscomp/test/gpr_2682_test.res b/jscomp/test/gpr_2682_test.res
@@ -1,5 +1,5 @@
 @@warning("-22")
-/* [@@@bs.config no_export] */
+/* [@@@config no_export] */
 /* let for_each n =
   ([%raw{|
 	for (var key in n){
diff --git a/jscomp/test/gpr_4280_test.res b/jscomp/test/gpr_4280_test.res
@@ -1,4 +1,4 @@
-@@bs.config({flags: [/* "-bs-diagnose" */]})
+@@config({flags: [/* "-bs-diagnose" */]})
 let suites: ref<Mt.pair_suites> = ref(list{})
 let test_id = ref(0)
 let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
diff --git a/jscomp/test/gpr_459_test.res b/jscomp/test/gpr_459_test.res
@@ -1,4 +1,4 @@
-@@bs.config({no_export: no_export})
+@@config({no_export: no_export})
 
 let suites: ref<Mt.pair_suites> = ref(list{})
 let test_id = ref(0)
diff --git a/jscomp/test/include_side_effect.res b/jscomp/test/include_side_effect.res
@@ -1,2 +1,2 @@
-@@bs.config({no_export: no_export})
+@@config({no_export: no_export})
 include Side_effect
diff --git a/jscomp/test/include_side_effect_free.res b/jscomp/test/include_side_effect_free.res
@@ -1,4 +1,4 @@
-@@bs.config(no_export)
+@@config(no_export)
 /* since it is side effect free , this should generate a dummy file
  */
 include Side_effect_free
diff --git a/jscomp/test/inline_string_test.res b/jscomp/test/inline_string_test.res
@@ -1,4 +1,4 @@
-@@bs.config({no_export: no_export})
+@@config({no_export: no_export})
 type t =
   | A_list
   | A_hashtable
diff --git a/jscomp/test/jsxv4_newtype.res b/jscomp/test/jsxv4_newtype.res
@@ -1,4 +1,4 @@
-@@bs.config({
+@@config({
    flags: ["-bs-jsx", "4"],
  })
 
diff --git a/jscomp/test/key_word_property.res b/jscomp/test/key_word_property.res
@@ -1,4 +1,4 @@
-/* [@@@bs.config {flags = [|
+/* [@@@config {flags = [|
   "-bs-package-output"; "es6:jscomp/test"
 |]}] 
 */
diff --git a/jscomp/test/mario_game.res b/jscomp/test/mario_game.res
@@ -1,4 +1,4 @@
-@@bs.config({flags: ["-w", "a", "-bs-no-bin-annot"]})
+@@config({flags: ["-w", "a", "-bs-no-bin-annot"]})
 
 module Actors: {
   type dir_1d = Left | Right
diff --git a/jscomp/test/mutable_uncurry_test.res b/jscomp/test/mutable_uncurry_test.res
@@ -1,4 +1,4 @@
-@@bs.config({
+@@config({
   flags: [
     /* "-bs-diagnose" */
   ],
diff --git a/jscomp/test/obj_magic_test.res b/jscomp/test/obj_magic_test.res
@@ -1,4 +1,4 @@
-@@bs.config({
+@@config({
   flags: [
     /* "-drawlambda" */
   ],
diff --git a/jscomp/test/ocaml_re_test.res b/jscomp/test/ocaml_re_test.res
@@ -1,4 +1,4 @@
-@@bs.config({flags: ["-w", "a", "-bs-no-bin-annot"], no_export})
+@@config({flags: ["-w", "a", "-bs-no-bin-annot"], no_export})
 let suites: ref<Mt.pair_suites> = ref(list{})
 let test_id = ref(0)
 let eq = (loc, x, y) => {
diff --git a/jscomp/test/poly_empty_array.res b/jscomp/test/poly_empty_array.res
@@ -1,2 +1,2 @@
-@@bs.config({flags: ["-bs-unsafe-empty-array"]})
+@@config({flags: ["-bs-unsafe-empty-array"]})
 let a = []
diff --git a/jscomp/test/polyvar_test.res b/jscomp/test/polyvar_test.res
@@ -1,4 +1,4 @@
-@@bs.config(no_export)
+@@config(no_export)
 
 let f = x =>
   switch x {
diff --git a/jscomp/test/rec_module_opt.res b/jscomp/test/rec_module_opt.res
@@ -1,4 +1,4 @@
-@@bs.config({
+@@config({
   flags: [
     /* "-drawlambda"; */
     /* "-dlambda"; */
diff --git a/jscomp/test/record_debug_test.res b/jscomp/test/record_debug_test.res
@@ -1,4 +1,4 @@
-/* [@@@bs.config {flags = [|"-dsource"|]}] */
+/* [@@@config {flags = [|"-dsource"|]}] */
 let suites: ref<Mt.pair_suites> = ref(list{})
 let test_id = ref(0)
 let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
diff --git a/jscomp/test/recursive_react_component.res b/jscomp/test/recursive_react_component.res
@@ -1,4 +1,4 @@
-@@bs.config({
+@@config({
   flags: [
     "-bs-jsx",
     "3", // "-dsource",
diff --git a/jscomp/test/string_get_set_test.res b/jscomp/test/string_get_set_test.res
@@ -1,4 +1,4 @@
-@@bs.config({no_export: no_export})
+@@config({no_export: no_export})
 let \".%()" = (s: string, i) => String.get(s, i)
 
 Mt.from_pair_suites(__FILE__, list{(__LOC__, _ => Eq(\".%()"("h", 0), 'h'))})
diff --git a/jscomp/test/tramp_fib.res b/jscomp/test/tramp_fib.res
@@ -1,4 +1,4 @@
-@@bs.config({flags: ["-w", "a", "-bs-noassertfalse"]})
+@@config({flags: ["-w", "a", "-bs-noassertfalse"]})
 
 let suites: ref<Mt.pair_suites> = ref(list{})
 let test_id = ref(0)
diff --git a/jscomp/test/unit_undefined_test.res b/jscomp/test/unit_undefined_test.res
@@ -1,4 +1,4 @@
-@@bs.config({
+@@config({
   flags: [
     /* "-bs-diagnose" */
     /* ; "-drawlambda" */

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@@bs.config({flags: ["-bs-noassertfalse"]})`
	`1`	`+@@config({flags: ["-bs-noassertfalse"]})`
`2`	`2`
`3`	`3`	`type key = int`
`4`	`4`