bs.xx -> xx transition, no bs prefix needed

jscomp/core/js_call_info.ml

@@ -37,7 +37,7 @@ type call_info =
   | Call_ml (* called by plain ocaml expression *)
   | Call_builtin_runtime (* built-in externals *)
   | Call_na 
-  (* either from [@@bs.val] or not available, 
+  (* either from [@@val] or not available, 
      such calls does not follow such rules
      {[ fun x y -> (f x y) === f ]} when [f] is an atom     
 

jscomp/core/js_call_info.mli

@@ -40,7 +40,7 @@ type call_info =
   | Call_ml (* called by plain ocaml expression *)
   | Call_builtin_runtime (* built-in externals *)
   | Call_na 
-  (* either from [@@bs.val] or not available, 
+  (* either from [@@val] or not available, 
      such calls does not follow such rules
      {[ fun x y -> f x y === f ]} when [f] is an atom     
   *) 

jscomp/core/lam.ml

@@ -287,8 +287,8 @@ exception Not_simple_form
     where [wrap] used to be simple instructions
     Note that [external] functions are forced to do eta-conversion
     when combined with [|>] operator, we need to make sure beta-reduction
-    is applied though since `[@bs.splice]` needs such guarantee.
-    Since `[@bs.splice] is the tail position
+    is applied though since `[@variadic]` needs such guarantee.
+    Since `[@variadic] is the tail position
 *)
 let rec is_eta_conversion_exn
     params inner_args outer_args : t list =
@@ -819,7 +819,7 @@ let sequand l r = if_ l r false_
 (** only [handle_bs_non_obj_ffi] will be used outside *)
 (**
    [no_auto_uncurried_arg_types xs]
-   check if the FFI have [@@bs.uncurry] attribute.
+   check if the FFI have @uncurry attribute.
    if it does not we wrap it in a nomral way otherwise
 *)
 let rec no_auto_uncurried_arg_types

jscomp/core/lam_compile_external_call.ml

@@ -78,7 +78,7 @@ let append_list  x xs =
     unbox it in the first place.
 
     Note when optional value is not passed, the unboxed value would be 
-    [undefined], with the combination of `[@bs.int]` it would be still be 
+    [undefined], with the combination of `[@int]` it would be still be 
     [undefined], this by default is still correct..  
     {[
       (function () {
@@ -252,7 +252,7 @@ let translate_scoped_module_val
         Ext_list.fold_left (Ext_list.append rest  [fn]) start E.dot
     end
   | None ->  
-    (*  no [@@bs.module], assume it's global *)
+    (*  no [@@module], assume it's global *)
     begin match scopes with 
       | [] -> 
         E.js_global fn
@@ -309,7 +309,7 @@ let translate_ffi
   | Js_new { external_module_name = module_name; 
              name = fn;
              scopes
-           } -> (* handle [@@bs.new]*)
+           } -> (* handle [@@new]*)
     (* This has some side effect, it will 
        mark its identifier (If it has) as an object,
        ATTENTION: 
@@ -356,7 +356,7 @@ let translate_ffi
       begin match args  with
         | self :: args -> 
           (* PR2162 [self_type] more checks in syntax:
-             - should not be [bs.as] *)
+             - should not be [@as] *)
           let [@warning"-8"] ( _self_type::arg_types )
             = arg_types in
           if splice then   
@@ -382,7 +382,7 @@ let translate_ffi
 
     (* TODO #11
        1. check args -- error checking 
-       2. support [@@bs.scope "window"]
+       2. support [@@scope "window"]
        we need know whether we should call [add_js_module] or not 
     *)
       translate_scoped_module_val external_module_name name scopes

jscomp/core/lam_compile_external_call.mli

@@ -45,5 +45,5 @@ val translate_ffi :
 
 (** TODO: document supported attributes
     Attributes starting with `js` are reserved
-    examples: "bs.splice"
+    examples: "variadic"
  *)

jscomp/core/lam_convert.ml

@@ -904,15 +904,15 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : Lam.t * Lam_module_i
            ]}
               is also wrong.
 
-              It seems, we need handle [@bs.splice] earlier
+              It seems, we need handle [@variadic] earlier
 
               or
            {[
              (fun x y -> f x y) ([|1;2;3|]) -->
              let x0, x1, x2 =1,2,3 in
              (fun y -> f [|x0;x1;x2|] y)
            ]}
-              But this still need us to know [@bs.splice] in advance
+              But this still need us to know [@variadic] in advance
 
 
            we should not remove it immediately, since we have to be careful

jscomp/core/lam_eta_conversion.ml

@@ -119,7 +119,7 @@ let transform_under_supply n ap_info fn args =
     cautiously, since 
     [let u = f] and we are chaning the arity of [f] it will affect 
     the collection of [u]
-    A typical use case is to pass an OCaml function to JS side as a callback (i.e, [@bs.uncurry])
+    A typical use case is to pass an OCaml function to JS side as a callback (i.e, [@uncurry])
 *)
 let unsafe_adjust_to_arity loc ~(to_:int) ?(from : int option) (fn : Lam.t) : Lam.t = 
   let ap_info : Lam.ap_info = {ap_loc = loc; ap_inlined = Default_inline; ap_status = App_na } in

jscomp/core/record_attributes_check.ml

@@ -26,7 +26,7 @@ type label = Types.label_description
 
 let find_name (attr : Parsetree.attribute) =
   match attr with 
-  | {txt = "bs.as"}, PStr 
+  | {txt = "bs.as" | "as"}, PStr 
       [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string(s,_))},_ )}] -> 
     Some s 
   | _ -> None
@@ -35,7 +35,7 @@ let find_name (attr : Parsetree.attribute) =
 let find_name_with_loc (attr : Parsetree.attribute) : 
   string Asttypes.loc option =
   match attr with 
-  | {txt = "bs.as";loc}, PStr 
+  | {txt = "bs.as" | "as";loc}, PStr 
       [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string(s,_))},_ )}] -> 
     Some {txt = s; loc} 
   | _ -> None
@@ -79,7 +79,7 @@ let rec check_duplicated_labels_aux
           | Some ({txt = s;} as l) -> 
             if Set_string.mem coll s  
               (*use coll to make check a bit looser
-                allow cases like [ x : int [@bs.as "x"]]
+                allow cases like [ x : int [@as "x"]]
                *) then  
               Some l
             else 

jscomp/ext/ext_array.ml

@@ -207,7 +207,7 @@ let find_and_split arr cmp v : _ split =
 
 (** TODO: available since 4.03, use {!Array.exists} *)
 
-let exists p a =
+let exists a p =
   let n = Array.length a in
   let rec loop i =
     if i = n then false

jscomp/ext/ext_array.mli

@@ -75,7 +75,10 @@ val find_and_split :
   ('a -> 'b -> bool) ->
   'b -> 'a split
 
-val exists : ('a -> bool) -> 'a array -> bool 
+val exists : 
+  'a array -> 
+  ('a -> bool) ->  
+  bool 
 
 val is_empty : 'a array -> bool 
 

jscomp/ounit_tests/ounit_cmd_tests.ml

@@ -50,7 +50,7 @@ let suites =
       = ""
       [@@bs.send.pipe:int]
       [@@bs.splice]|}|] in  
-      OUnit.assert_bool __LOC__ (Ext_string.contain_substring v_output.stderr "bs.splice")
+      OUnit.assert_bool __LOC__ (Ext_string.contain_substring v_output.stderr "variadic")
     end;
         __LOC__ >:: begin fun _ -> 
     let v_output = perform_bsc [|"-bs-eval"; {|external
@@ -59,7 +59,7 @@ let suites =
   = ""
   [@@bs.send.pipe:int]
   [@@bs.splice]  |}|] in  
-      OUnit.assert_bool __LOC__ (Ext_string.contain_substring v_output.stderr "bs.splice")
+      OUnit.assert_bool __LOC__ (Ext_string.contain_substring v_output.stderr "variadic")
     end;
 
     __LOC__ >:: begin fun _ ->
@@ -115,7 +115,7 @@ external ff :
       (* Ounit_cmd_util.debug_output should_err ; *)
       OUnit.assert_bool __LOC__
         (Ext_string.contain_substring
-           should_err.stderr "bs.uncurry")
+           should_err.stderr "uncurry")
     end ;
 
     __LOC__ >:: begin fun _ ->

jscomp/ounit_tests/ounit_ffi_error_debug_test.ml

@@ -58,7 +58,7 @@ let output = bsc_eval {|
             |}
           in
           OUnit.assert_bool __LOC__
-            (Ext_string.contain_substring output.stderr "bs.unwrap")
+            (Ext_string.contain_substring output.stderr "unwrap")
         end;
 
         __LOC__ >:: begin fun _ ->

jscomp/outcome_printer/tweaked_reason_oprint.cppo.ml

@@ -316,14 +316,14 @@ and print_simple_out_type ppf =
     let res =
       if name = "arity0" then Otyp_arrow ("", Otyp_constr (Oide_ident "unit", []),ty)
       else ty in   
-    fprintf ppf "@[<0>(%a)@ [@bs.meth]@]" (print_out_type_1 ~uncurried:false) res
+    fprintf ppf "@[<0>(%a)@ [%@meth]@]" (print_out_type_1 ~uncurried:false) res
 
   | Otyp_constr (
       Oide_dot (Oide_dot (
           Oide_ident "Js_OO", "Callback" ), _),
       [res]
     ) ->
-    fprintf ppf "@[<0>(%a)@ [@bs.this]@]" (print_out_type_1 ~uncurried:false) res
+    fprintf ppf "@[<0>(%a)@ [%@this]@]" (print_out_type_1 ~uncurried:false) res
 
   (* also BuckleScript-specific. Turns Js.t({. foo: bar}) into {. "foo": bar} *)
   | Otyp_constr (

jscomp/reserved_attributs.md

@@ -4,43 +4,47 @@ This is a list of reserved attributes, we may use such information
 to detect unused attributes in the future
 
 
-get
-set
-this
-meth
+
+
+
+scope
+val -- done
+module -- done
+obj -- done
+variadic -- done
+send -- done
+return -- done
+new -- done
+get_index -- done
+set_index -- done
+get -- done
+set -- done
+optional -- done
+uncurry -- done
+    note [@uncurry 3] is okay but rarely used
+    maybe we should remove it
+unwrap -- done
+string -- done
+int -- done
+ignore -- done
+as  -- done
+meth -- done
+this -- done
+send.pipe -- deprecated, no short-cut
+splice -- deprecated, use variadic
+config -- done
 open -- not decided
-inline -- 
+inline -- done
     this would conflict exist one or not?
     invalid payload in bs.inline
     seems that we need loose the check
-deriving
-string
-int
-ignore
-unwrap
-uncurry
-as
-optional
-get_index
-return
-config
-obj
+deriving -- done
 raw -- not needed
 re -- not needed
 external -- not needed
 time   -- not needed
 node   -- not needed
 debugger -- not needed
-val
-module
-scope
-splice -- deprecated, use variadic
-variadic
-send
-send.pipe -- deprecated, no short-cut
-new
-set_index
-
 debugger.chrome -- deprecated
 
 keywords is okay `[@open]` is a valid syntax