Remove more "bs." (rescript-lang#6635)

* @bs.obj -> @obj * @bs.optional -> @optional * @bs.return -> @return * @bs.send -> @send * @bs.scope -> @scope * @bs.splice, @bs.variadic -> variadic

Author: cknitt

jscomp/core/design.md

@@ -134,11 +134,11 @@ Lalias-bound variables are never assigned, so it can only
 appear in `Lvar`, then it is easy to eliminate it 
 
 
-# interaction between `bs.splice` and `|>`
+# interaction between `variadic` and `|>`
 
 Note in general, it is fine whether we do beta reduction or not, it is just optimization. 
 
-However, since we introduced `bs.splice` which does require the `spliced argument` to be captured
+However, since we introduced `variadic` which does require the `spliced argument` to be captured
 
 ```ocaml
 spliced_external a0 a1 [|b0;b1|]
@@ -157,7 +157,7 @@ spliced_external a0 a1 [|b0;b1|] x
 ```
 
 So our optimizer needs to handle this case to make sure `spliced_external` not escaped, 
-also becaues the interaction of `[@bs.splice]` and `[@bs.send]`, the spliced argument
+also becaues the interaction of `[@variadic]` and `[@send]`, the spliced argument
 is no longer in tail position, so that people can write such code
 
 ```ocaml
@@ -171,15 +171,15 @@ Internally in lambda layer it would be
 
 We can simply do inlining, it may have side efffect in `b0`, `b1`, our optimizer also need handle such case.
 
-Maybe in the future, we should lift the restriction about `bs.splice` (delegate to `slow` mode when we can not resolve it statically, my personal expereince is that people will complain about why it fails to compile more than why it is slow in some corner cases)
+Maybe in the future, we should lift the restriction about `variadic` (delegate to `slow` mode when we can not resolve it statically, my personal expereince is that people will complain about why it fails to compile more than why it is slow in some corner cases)
 
 Note this also interacts with `[@bs.uncurry]`
 
 for example
 
 ```ocaml
 external filter : 'a array -> ('a -> bool [@bs.uncurry]) -> 'a array = "filter"
-[@@bs.send]
+[@@send]
 
 let f xs =
  xs |. filter (fun x -> x > 2)

jscomp/frontend/ast_attributes.ml

@@ -199,7 +199,7 @@ let process_send_pipe (attrs : t) : (Parsetree.core_type * t) option =
  "This attribute is deprecated, use @send instead.");
 
  ty := Some (Ast_payload.as_core_type loc payload);
- ({Asttypes.txt = "bs.send"; loc}, Parsetree.PStr []) :: acc
+ ({Asttypes.txt = "send"; loc}, Parsetree.PStr []) :: acc
  | Some _ -> Location.raise_errorf ~loc "Duplicated bs.send.pipe")
  | _ -> attr :: acc)
  in
@@ -247,7 +247,7 @@ let iter_process_bs_string_as (attrs : t) : string option =
 let has_bs_optional (attrs : t) : bool =
  Ext_list.exists attrs (fun (({txt}, _) as attr) ->
  match txt with
- | "bs.optional" | "optional" ->
+ | "optional" ->
  Bs_ast_invariant.mark_used_bs_attribute attr;
  true
  | _ -> false)
@@ -349,7 +349,7 @@ let internal_expansive : attr =
  ({txt = "internal.expansive"; loc = locg}, Ast_payload.empty)
 
 let bs_return_undefined : attr =
- ( {txt = "bs.return"; loc = locg},
+ ( {txt = "return"; loc = locg},
  PStr
  [
  {

jscomp/frontend/ast_derive_js_mapper.ml

@@ -181,7 +181,7 @@ let init () =
  let exp =
  coerceResultToNewType
  (Exp.extension
- ( {Asttypes.loc; txt = "bs.obj"},
+ ( {Asttypes.loc; txt = "obj"},
  PStr
  [
  Str.eval

jscomp/frontend/ast_exp_extension.ml

@@ -71,7 +71,7 @@ let handle_extension e (self : Bs_ast_mapper.mapper)
  Location.raise_errorf ~loc "expect a boolean expression in the payload")
  | "bs.debugger" | "debugger" ->
  {e with pexp_desc = Ast_exp_handle_external.handle_debugger loc payload}
- | "bs.obj" | "obj" -> (
+ | "obj" -> (
  match payload with
  | PStr
  [

jscomp/frontend/ast_external_process.ml

@@ -376,16 +376,16 @@ let parse_external_attributes (no_arguments : bool) (prim_name_check : string)
  };
  }
  | _ -> Bs_syntaxerr.err loc Illegal_attribute))
- | "bs.scope" | "scope" -> (
+ | "scope" -> (
  match Ast_payload.assert_strings loc payload with
  | [] -> Bs_syntaxerr.err loc Illegal_attribute
  (* We need err on empty scope, so we can tell the difference
  between unset/set
  *)
  | scopes -> {st with scopes})
  | "taggedTemplate" -> {st with splice = true; tagged_template = true}
- | "bs.splice" | "bs.variadic" | "variadic" -> {st with splice = true}
- | "bs.send" | "send" ->
+ | "variadic" -> {st with splice = true}
+ | "send" ->
  {st with val_send = Some (name_from_payload_or_prim ~loc payload)}
  | "set" ->
  {st with set_name = Some (name_from_payload_or_prim ~loc payload)}
@@ -405,8 +405,8 @@ let parse_external_attributes (no_arguments : bool) (prim_name_check : string)
  "%@get_index this particular external's name needs to be a \
  placeholder empty string";
  {st with get_index = true}
- | "bs.obj" | "obj" -> {st with mk_obj = true}
- | "bs.return" | "return" -> (
+ | "obj" -> {st with mk_obj = true}
+ | "return" -> (
  let actions = Ast_payload.ident_or_record_as_config loc payload in
  match actions with
  | [({txt; _}, None)] ->

jscomp/ml/oprint.ml

@@ -562,7 +562,7 @@ and print_out_sig_item ppf =
  fprintf ppf "@ = \"%s\"" s;
  List.iter (fun s ->
 (* TODO: in general, we should print bs attributes, some attributes like
- bs.splice does need it *) 
+  variadic do need it *) 
  fprintf ppf "@ \"%s\"" (!map_primitive_name s)
  ) sl
  in

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" |] }]
+[@@@bs.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
@@ -82,29 +82,23 @@ module Internal = struct
  external opaqueFullApply : 'a -> 'a = "%uncurried_apply"
 
  (* Use opaque instead of [._n] to prevent some optimizations happening *)
- external run : (unit -> 'a [@bs]) -> 'a = "#run"
+ external run : ((unit -> 'a)[@bs]) -> 'a = "#run"
  external opaque : 'a -> 'a = "%opaque"
 end
 
 (**/**)
 
-type +'a null =
- | Value of 'a
- | Null [@as null]
-[@@unboxed]
 (**
  Nullable value of this type can be either null or 'a. This type is equivalent to Js.Null.t.
 *)
+type +'a null = Value of 'a | Null [@as null] [@@unboxed]
 
 type +'a undefined
 (**
  A value of this type can be either undefined or 'a. This type is equivalent to Js.Undefined.t.
 *)
 
-type +'a nullable =
- | Value of 'a
- | Null [@as null]
- | Undefined [@as undefined]
+type +'a nullable = Value of 'a | Null [@as null] | Undefined [@as undefined]
 [@@unboxed]
 
 (**
@@ -144,17 +138,17 @@ external typeof : 'a -> string = "#typeof"
 *)
 
 external log : 'a -> unit = "log"
- [@@val] [@@scope "console"]
+[@@val] [@@scope "console"]
 (** Equivalent to console.log any value. *)
 
-external log2 : 'a -> 'b -> unit = "log" [@@bs.val] [@@bs.scope "console"]
-external log3 : 'a -> 'b -> 'c -> unit = "log" [@@bs.val] [@@bs.scope "console"]
+external log2 : 'a -> 'b -> unit = "log" [@@bs.val] [@@scope "console"]
+external log3 : 'a -> 'b -> 'c -> unit = "log" [@@bs.val] [@@scope "console"]
 
 external log4 : 'a -> 'b -> 'c -> 'd -> unit = "log"
- [@@bs.val] [@@bs.scope "console"]
+[@@bs.val] [@@scope "console"]
 
 external logMany : 'a array -> unit = "log"
- [@@bs.val] [@@bs.scope "console"] [@@bs.splice]
+[@@bs.val] [@@scope "console"] [@@variadic]
 (** A convenience function to console.log more than 4 arguments *)
 
 external eqNull : 'a -> 'a null -> bool = "%bs_equal_null"
@@ -199,8 +193,9 @@ module Undefined = Js_undefined
 module Nullable = Js_null_undefined
 (** Provide utilities for `Js.null_undefined` *)
 
-module Null_undefined = Js_null_undefined
-[@deprecated "Please use `Js.Nullable`"]
+module Null_undefined =
+ Js_null_undefined
+ [@deprecated "Please use `Js.Nullable`"]
 
 module Exn = Js_exn
 (** Provide utilities for dealing with Js exceptions *)

jscomp/others/js_array2.res

@@ -720,7 +720,7 @@ external toLocaleString: t<'a> => string = "toLocaleString"
 /* Iteration functions
  */
 /* commented out until bs has a plan for iterators
- external entries : 'a t -> (int * 'a) array_iter = "" [@@bs.send] (* ES2015 *)
+ external entries : 'a t -> (int * 'a) array_iter = "" [@@send] (* ES2015 *)
 */
 
 @send
@@ -925,7 +925,7 @@ Js.Array2.forEachi(["a", "b", "c"], (item, index) => Js.log2(index + 1, item)) =
 external forEachi: (t<'a>, @uncurry ('a, int) => unit) => unit = "forEach"
 
 /* commented out until bs has a plan for iterators
- external keys : 'a t -> int array_iter = "" [@@bs.send] (* ES2015 *)
+ external keys : 'a t -> int array_iter = "" [@@send] (* ES2015 *)
 */
 
 @send
@@ -1142,7 +1142,7 @@ Js.Array2.somei(["a", "bc", "def", "gh"], sameLength) == false
 external somei: (t<'a>, @uncurry ('a, int) => bool) => bool = "some"
 
 /* commented out until bs has a plan for iterators
- external values : 'a t -> 'a array_iter = "" [@@bs.send] (* ES2015 *)
+ external values : 'a t -> 'a array_iter = "" [@@send] (* ES2015 *)
 */
 
 /**

jscomp/others/js_json.res

@@ -131,7 +131,7 @@ let decodeNull = (json): option<Js.null<_>> =>
  }
 
 /* external parse : string -> t = "parse"
- [@@bs.val][@@bs.scope "JSON"] */
+ [@@bs.val][@@scope "JSON"] */
 
 @val @scope("JSON") external parseExn: string => t = "parse"