@bs.get/set -> @get/set

Author: cknitt

jscomp/frontend/ast_attributes.ml

@@ -31,7 +31,7 @@ let process_method_attributes_rev (attrs : t) =
     ({get = None; set = None}, [])
     (fun (st, acc) (({txt; loc}, payload) as attr) ->
       match txt with
-      | "bs.get" | "get" (* @bs.get{null; undefined}*) ->
+      | "get" (* @get{null; undefined}*) ->
         let result =
           Ext_list.fold_left (Ast_payload.ident_or_record_as_config loc payload)
             (false, false) (fun (null, undefined) ({txt; loc}, opt_expr) ->
@@ -56,7 +56,7 @@ let process_method_attributes_rev (attrs : t) =
         in
 
         ({st with get = Some result}, acc)
-      | "bs.set" | "set" ->
+      | "set" ->
         let result =
           Ext_list.fold_left (Ast_payload.ident_or_record_as_config loc payload)
             `Get (fun _st ({txt; loc}, opt_expr) ->
@@ -330,9 +330,9 @@ let is_bs (attr : attr) =
 
 let res_uapp : attr = ({txt = "res.uapp"; loc = locg}, Ast_payload.empty)
 
-let bs_get : attr = ({txt = "bs.get"; loc = locg}, Ast_payload.empty)
+let get : attr = ({txt = "get"; loc = locg}, Ast_payload.empty)
 
-let bs_get_index : attr = ({txt = "bs.get_index"; loc = locg}, Ast_payload.empty)
+let get_index : attr = ({txt = "get_index"; loc = locg}, Ast_payload.empty)
 
 let bs_get_arity : attr =
   ( {txt = "internal.arity"; loc = locg},
@@ -344,7 +344,7 @@ let bs_get_arity : attr =
         };
       ] )
 
-let bs_set : attr = ({txt = "bs.set"; loc = locg}, Ast_payload.empty)
+let set : attr = ({txt = "set"; loc = locg}, Ast_payload.empty)
 
 let internal_expansive : attr =
   ({txt = "internal.expansive"; loc = locg}, Ast_payload.empty)

jscomp/frontend/ast_attributes.mli

@@ -72,13 +72,13 @@ val is_bs : attr -> bool
 (* Attribute for uncurried application coming from the ReScript parser *)
 val res_uapp : attr
 
-val bs_get : attr
+val get : attr
 
-val bs_get_index : attr
+val get_index : attr
 
 val bs_get_arity : attr
 
-val bs_set : attr
+val set : attr
 
 val bs_return_undefined : attr
 

jscomp/frontend/ast_derive_abstract.ml

@@ -55,11 +55,11 @@ let isAbstract (xs : Ast_payload.action list) =
     so we can still reuse existing frame work
 *)
 let get_optional_attrs =
-  [Ast_attributes.bs_get; Ast_attributes.bs_return_undefined]
+  [Ast_attributes.get; Ast_attributes.bs_return_undefined]
 
 let get_attrs = [Ast_attributes.bs_get_arity]
 
-let set_attrs = [Ast_attributes.bs_set]
+let set_attrs = [Ast_attributes.set]
 
 let handleTdcl light (tdcl : Parsetree.type_declaration) :
     Parsetree.type_declaration * Parsetree.value_description list =

jscomp/frontend/ast_derive_js_mapper.ml

@@ -75,7 +75,7 @@ let unsafeIndexGet =
   Str.primitive
     (Val.mk ~prim:[""]
        {loc = noloc; txt = unsafeIndex}
-       ~attrs:[Ast_attributes.bs_get_index]
+       ~attrs:[Ast_attributes.get_index]
        (Ast_compatible.arrow any (Ast_compatible.arrow any any)))
 
 let unsafeIndexGetExp = Exp.ident {loc = noloc; txt = Lident unsafeIndex}

jscomp/frontend/ast_external_process.ml

@@ -387,19 +387,19 @@ let parse_external_attributes (no_arguments : bool) (prim_name_check : string)
           | "bs.splice" | "bs.variadic" | "variadic" -> {st with splice = true}
           | "bs.send" | "send" ->
             {st with val_send = Some (name_from_payload_or_prim ~loc payload)}
-          | "bs.set" | "set" ->
+          | "set" ->
             {st with set_name = Some (name_from_payload_or_prim ~loc payload)}
-          | "bs.get" | "get" ->
+          | "get" ->
             {st with get_name = Some (name_from_payload_or_prim ~loc payload)}
           | "bs.new" | "new" ->
             {st with new_name = Some (name_from_payload_or_prim ~loc payload)}
-          | "bs.set_index" | "set_index" ->
+          | "set_index" ->
             if String.length prim_name_check <> 0 then
               Location.raise_errorf ~loc
                 "%@set_index this particular external's name needs to be a \
                  placeholder empty string";
             {st with set_index = true}
-          | "bs.get_index" | "get_index" ->
+          | "get_index" ->
             if String.length prim_name_check <> 0 then
               Location.raise_errorf ~loc
                 "%@get_index this particular external's name needs to be a \
@@ -946,9 +946,9 @@ let external_desc_of_non_obj (loc : Location.t) (st : external_desc)
       Js_get {js_get_name = name; js_get_scopes = scopes}
     else
       Location.raise_errorf ~loc
-        "Ill defined attribute %@bs.get (only one argument)"
+        "Ill defined attribute %@get (only one argument)"
   | {get_name = Some _; _} ->
-    Location.raise_errorf ~loc "Attribute found that conflicts with %@bs.get"
+    Location.raise_errorf ~loc "Attribute found that conflicts with %@get"
 
 (** Note that the passed [type_annotation] is already processed by visitor pattern before*)
 let handle_attributes (loc : Bs_loc.t) (type_annotation : Parsetree.core_type)

jscomp/gentype/Runtime.ml

@@ -28,7 +28,7 @@ let isMutableObjectField name =
   String.length name >= 2
   && (String.sub name (String.length name - 2) 2 [@doesNotRaise]) = "#="
 
-(** Mutable fields, i.e. fields annotated "[@bs.set]"
+(** Mutable fields, i.e. fields annotated "[@set]"
    are represented as extra fields called "fieldName#="
    preceding the normal field. *)
 let checkMutableObjectField ~previousName ~name = previousName = name ^ "#="

jscomp/gentype/TranslateTypeExprFromTypes.ml

@@ -30,7 +30,7 @@ let translateObjType closedFlag fieldsTranslations =
     match fields with
     | (previousName, {type_ = _}) :: (name, {type_}) :: rest
       when Runtime.checkMutableObjectField ~previousName ~name ->
-      (* The field was annotated "@bs.set" *)
+      (* The field was annotated "@set" *)
       rest |> checkMutableField ~acc:((name, type_, Mutable) :: acc)
     | (name, {type_}) :: rest ->
       rest |> checkMutableField ~acc:((name, type_, Immutable) :: acc)

jscomp/others/jsxEventC.res

@@ -230,7 +230,7 @@ module Pointer = {
   /* Should return Dom.eventTarget */
 
   /* PointerEvent */
-  /* external pointerId : t -> Dom.eventPointerId = "pointerId" [@@bs.get] */
+  /* external pointerId : t -> Dom.eventPointerId = "pointerId" [@@get] */
   @get external width: t => float = "width"
   @get external height: t => float = "height"
   @get external pressure: t => float = "pressure"
@@ -285,7 +285,7 @@ module UI = {
   })
 
   @get external detail: t => int = "detail"
-  /* external view : t -> Dom.window = "view" [@@bs.get] */
+  /* external view : t -> Dom.window = "view" [@@get] */
   /* Should return DOMAbstractView/WindowProxy */
 }
 

jscomp/others/jsxEventU.res

@@ -232,7 +232,7 @@ module Pointer = {
   /* Should return Dom.eventTarget */
 
   /* PointerEvent */
-  /* external pointerId : t -> Dom.eventPointerId = "pointerId" [@@bs.get] */
+  /* external pointerId : t -> Dom.eventPointerId = "pointerId" [@@get] */
   @get external width: t => float = "width"
   @get external height: t => float = "height"
   @get external pressure: t => float = "pressure"
@@ -287,7 +287,7 @@ module UI = {
   })
 
   @get external detail: t => int = "detail"
-  /* external view : t -> Dom.window = "view" [@@bs.get] */
+  /* external view : t -> Dom.window = "view" [@@get] */
   /* Should return DOMAbstractView/WindowProxy */
 }
 

jscomp/ounit_tests/ounit_cmd_tests.ml

@@ -73,7 +73,7 @@ let suites =
       let should_err = bsc_check_eval {|
 external ff :
     resp -> (_ [@as "x"]) -> int -> unit =
-    "x" [@@bs.set]
+    "x" [@@set]
       |} in
       OUnit.assert_bool __LOC__
         (Ext_string.contain_substring should_err.stderr

jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Canvas/Webapi__Canvas__Canvas2d.res

@@ -120,7 +120,7 @@ external setTransform: (
 
 /* in re unused warnings
    awaiting release of https://github.com/rescript-lang/rescript-compiler/issues/1656
-   to just use [@@bs.set] directly with an ignored (style a) */
+   to just use [@@set] directly with an ignored (style a) */
 let setStrokeStyle = (type a, ctx: t, _: style<a>, v: a) => setStrokeStyle(ctx, v)
 
 let setFillStyle = (type a, ctx: t, _: style<a>, v: a) => setFillStyle(ctx, v)

jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlElement.res

@@ -61,7 +61,7 @@ module Impl = (
   external offsetParent: t_htmlElement => option<Dom.element> = "" /* experimental */
   @get external offsetTop: t_htmlElement => int = "" /* experimental, but widely supported */
   @get external offsetWidth: t_htmlElement => int = "" /* experimental */
-  /* external properties : r => HTMLPropertiesCollection.t = "properties" [@@bs.get]; /* experimental */ */
+  /* external properties : r => HTMLPropertiesCollection.t = "properties" [@@get]; /* experimental */ */
   @get external spellcheck: t_htmlElement => bool = ""
   @set external setSpellcheck: (t_htmlElement, bool) => unit = "spellcheck"
   /* let setSpellcheck : t_htmlElement => bool => unit = fun self value => setSpellcheck self (Js.Boolean.to_js_boolean value); */ /* temproarily removed to reduce codegen size */

jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Node.res

@@ -20,8 +20,8 @@ module Impl = (
   @set external setNodeValue: (T.t, Js.null<string>) => unit = "nodeValue"
   /* let setNodeValue : T.t => option string => unit = fun self value => setNodeValue self (Js.Null.fromOption value); */ /* temporarily removed to reduce codegen size */
   /* Not supported yet
-  external setNodeValue : T.t => string => unit = "nodeValue" [@@bs.set];
-  external clearNodeValue : T.t => _ [@as {json|null|json}] => unit = "nodeValue" [@@bs.set];
+  external setNodeValue : T.t => string => unit = "nodeValue" [@@set];
+  external clearNodeValue : T.t => _ [@as {json|null|json}] => unit = "nodeValue" [@@set];
  */
   /* outerText */
   @get external ownerDocument: T.t => Dom.document = ""

jscomp/syntax/tests/idempotency/genType/src/Runtime.res

@@ -105,7 +105,7 @@ let emitJSVariantWithPayload = (~label, x) =>
 let isMutableObjectField = name =>
   String.length(name) >= 2 && String.sub(name, String.length(name) - 2, 2) == "#="
 
-/* Mutable fields, i.e. fields annotated "[@bs.set]"
+/* Mutable fields, i.e. fields annotated "[@set]"
    are represented as extra fields called "fieldName#="
    preceding the normal field. */
 let checkMutableObjectField = (~previousName, ~name) => previousName == name ++ "#="

jscomp/syntax/tests/idempotency/genType/src/TranslateTypeExprFromTypes.res

@@ -321,7 +321,7 @@ let translateConstr = (
       switch fields {
       | list{(previousName, {type_: _}), (name, {type_}), ...rest}
         if Runtime.checkMutableObjectField(~previousName, ~name) =>
-        /* The field was annotated "@bs.set" */
+        /* The field was annotated "@set" */
         rest |> checkMutableField(~acc=list{(name, type_, Mutable), ...acc})
       | list{(name, {type_}), ...rest} =>
         rest |> checkMutableField(~acc=list{(name, type_, Immutable), ...acc})

jscomp/syntax/tests/parsing/errors/typexpr/bsObjSugar.res

@@ -30,7 +30,7 @@ type state = {
 }
 
 type state = {
-  @bs.set "age": ,
+  @set "age": ,
   "name": string
 }
 

jscomp/syntax/tests/parsing/errors/typexpr/expected/bsObjSugar.res.txt

@@ -75,11 +75,11 @@
 
 
   Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:33:18
+  tests/parsing/errors/typexpr/bsObjSugar.res:33:15
 
   31 │ 
   32 │ type state = {
-  33 │   @bs.set "age": ,
+  33 │   @set "age": ,
   34 │   "name": string
   35 │ }
 
@@ -143,8 +143,7 @@ type nonrec state =
 type nonrec state = < url: string  ;protocols: [%rescript.typehole ]   > 
 type nonrec state = < send: string -> [%rescript.typehole ] [@bs.meth ]  > 
 type nonrec state = < age: [%rescript.typehole ]  ;name: string   > 
-type nonrec state =
-  < age: [%rescript.typehole ] [@bs.set ] ;name: string   > 
+type nonrec state = < age: [%rescript.typehole ] [@set ] ;name: string   > 
 type nonrec state = < age: [%rescript.typehole ]   ;.. > 
 type nonrec state = < age: [%rescript.typehole ]  ;name: string   ;.. > 
 type nonrec websocket =

jscomp/test/bs_qualified.res

@@ -35,7 +35,7 @@ external makeBuffer3: int => buffer = "makeBuffer3"
 type t
 @scope("mat4") @module("gl-matrix") external create: unit => t = "create"
 
-/* external scope_f : t -> int = "" [@@bs.get] [@@bs.scope "hi"] */
+/* external scope_f : t -> int = "" [@@get] [@@bs.scope "hi"] */
 
 @get_index @scope("a0") external getMockFn1: (t, int) => string = ""
 

jscomp/test/ffi_test.res

@@ -15,7 +15,7 @@ module Textarea = {
 }
 
 /*
-external never_used : Textarea.t ->  int -> int  = "minHeight" [@@bs.get]
+external never_used : Textarea.t ->  int -> int  = "minHeight" [@@get]
 
 let v = never_used (Textarea.create ()) 3 
 */

jscomp/test/gpr_1484.res

@@ -4,6 +4,6 @@ type t
 /* TODO: more test cases */
 /* external clearNodeValue2 : */
 /* t -> (_ [@as {json|null|json}]) -> int -> unit = */
-/* "nodeValue" [@@bs.set] */
+/* "nodeValue" [@@set] */
 
 let test = x => clearNodeValue(x)

jscomp/test/gpr_658.res

@@ -2,4 +2,4 @@
 
 @obj external mk: (~hi: int, unit) => {"hi": int} = ""
 
-/* external set_name : < > ->  string -> unit = "1name" [@@bs.set] */
+/* external set_name : < > ->  string -> unit = "1name" [@@set] */