Tweak %bs.obj vs %obj

Author: Iwan

src/res_comments_table.ml

@@ -879,7 +879,7 @@ let rec walkStructure s t comments =
         attach t.trailing expr2.pexp_loc trailing
       )
     | Pexp_extension (
-        {txt = "bs.obj"},
+        {txt = "bs.obj" | "obj"},
         PStr [{
           pstr_desc = Pstr_eval({pexp_desc = Pexp_record (rows, _)}, [])
         }]

src/res_core.ml

@@ -2919,7 +2919,7 @@ and parseRecordExprWithStringKeys ~startPos firstRow p =
     Ast_helper.Exp.record ~loc rows None
   ) in
   Ast_helper.Exp.extension ~loc
-    (Location.mkloc "bs.obj" loc, Parsetree.PStr [recordStrExpr])
+    (Location.mkloc "obj" loc, Parsetree.PStr [recordStrExpr])
 
 and parseRecordExpr ~startPos ?(spread=None) rows p =
   let exprs =

src/res_js_ffi.ml

@@ -39,7 +39,7 @@ let importDescr ~attrs ~scope ~importSpec ~loc = {
 }
 
 let toParsetree importDescr =
-  let bsVal = (Location.mknoloc "bs.val", Parsetree.PStr []) in
+  let bsVal = (Location.mknoloc "val", Parsetree.PStr []) in
   let attrs = match importDescr.jid_scope with
   | Global -> [bsVal]
   (* @genType.import("./MyMath"),
@@ -63,7 +63,7 @@ let toParsetree importDescr =
       Ast_helper.Str.eval expr
     in
     let bsScope = (
-      Location.mknoloc "bs.scope",
+      Location.mknoloc "scope",
       Parsetree. PStr [structureItem]
     ) in
     [bsVal; bsScope]
@@ -113,4 +113,4 @@ let toParsetree importDescr =
   let jsFfiAttr = (Location.mknoloc "ns.jsFfi", Parsetree.PStr []) in
   Ast_helper.Mod.structure ~loc:importDescr.jid_loc valueDescrs
   |> Ast_helper.Incl.mk ~attrs:[jsFfiAttr] ~loc:importDescr.jid_loc
-  |> Ast_helper.Str.include_ ~loc:importDescr.jid_loc
+  |> Ast_helper.Str.include_ ~loc:importDescr.jid_loc

src/res_parsetree_viewer.ml

@@ -193,7 +193,7 @@ let isHuggableExpression expr =
   | Pexp_tuple _
   | Pexp_constant (Pconst_string (_, Some _))
   | Pexp_construct ({txt = Longident.Lident ("::" | "[]")}, _)
-  | Pexp_extension ({txt = "bs.obj"}, _)
+  | Pexp_extension ({txt = "bs.obj" | "obj"}, _)
   | Pexp_record _ -> true
   | _ when isBlockExpr expr -> true
   | _ when isBracedExpr expr -> true
@@ -205,7 +205,7 @@ let isHuggableRhs expr =
   | Pexp_array _
   | Pexp_tuple _
   | Pexp_construct ({txt = Longident.Lident ("::" | "[]")}, _)
-  | Pexp_extension ({txt = "bs.obj"}, _)
+  | Pexp_extension ({txt = "bs.obj" | "obj"}, _)
   | Pexp_record _ -> true
   | _ when isBracedExpr expr -> true
   | _ -> false

src/res_printer.ml

@@ -2709,7 +2709,7 @@ and printExpression (e : Parsetree.expression) cmtTbl =
   | Pexp_extension extension ->
     begin match extension with
     | (
-        {txt = "bs.obj"},
+        {txt = "bs.obj" | "obj"},
         PStr [{
           pstr_loc = loc;
           pstr_desc = Pstr_eval({pexp_desc = Pexp_record (rows, _)}, [])

tests/conversion/reason/__snapshots__/render.spec.js.snap

@@ -1086,6 +1086,9 @@ exports[`jsObject.re 1`] = `
 "let component = props[\\"Component\\"]
 
 let element = props[\\"element\\"]
+
+let y = {\\"age\\": 30}
+let y = {\\"age\\": 30, \\"name\\": \\"steve\\"}
 "
 `;
 

tests/conversion/reason/jsObject.re

@@ -1,3 +1,6 @@
 let component = props##"Component"
 
 let element = props##element
+
+let y = {"age": 30}
+let y = {"age": 30, "name": "steve"}

tests/parsing/grammar/expressions/__snapshots__/parse.spec.js.snap

@@ -281,10 +281,10 @@ let x = ((let a = 1 in let b = 2 in a + b)[@ns.braces ])
 `;
 
 exports[`bsObject.js 1`] = `
-"let x = [%bs.obj { age = 30 }]
-let y = [%bs.obj { age = 30 }]
-let y = [%bs.obj { age = 30; name = \\"steve\\" }]
-let y = [%bs.obj { age = 30; name = \\"steve\\" }]
+"let x = [%obj { age = 30 }]
+let y = [%obj { age = 30 }]
+let y = [%obj { age = 30; name = \\"steve\\" }]
+let y = [%obj { age = 30; name = \\"steve\\" }]
 let x = ((\\"age\\")[@ns.braces ])
 let x = ((\\"age\\".(0))[@ns.braces ])
 let x = ((\\"age\\" |. Js.log)[@ns.braces ])

tests/parsing/grammar/structure/__snapshots__/parse.spec.js.snap

@@ -62,27 +62,25 @@ exports[`jsFfiSugar.js 1`] = `
 "include
   struct
     external setTimeout : (unit -> unit) -> unit -> float = \\"setTimeout\\"
-    [@@bs.val ]
+    [@@val ]
   end[@@ns.jsFfi ]
 include
   struct
-    external timeout : (unit -> unit) -> unit -> float = \\"setTimeout\\"
-    [@@bs.val ]
+    external timeout : (unit -> unit) -> unit -> float = \\"setTimeout\\"[@@val ]
   end[@@ns.jsFfi ]
 include
   struct
     external setTimeout : (unit -> unit) -> unit -> float = \\"setTimeout\\"
-    [@@bs.val ]
-    external clearTimeout : float -> unit = \\"clearTimeout\\"[@@bs.val ]
+    [@@val ]
+    external clearTimeout : float -> unit = \\"clearTimeout\\"[@@val ]
   end[@@ns.jsFfi ]
 include
   struct
-    external random : unit -> float = \\"random\\"[@@bs.val ][@@bs.scope \\"Math\\"]
+    external random : unit -> float = \\"random\\"[@@val ][@@scope \\"Math\\"]
   end[@@ns.jsFfi ]
 include
   struct
-    external href : string = \\"href\\"[@@bs.val ][@@bs.scope
-                                                (\\"window\\", \\"location\\")]
+    external href : string = \\"href\\"[@@val ][@@scope (\\"window\\", \\"location\\")]
   end[@@ns.jsFfi ]
 include
   struct

tests/printer/ffi/__snapshots__/render.spec.js.snap

@@ -36,7 +36,7 @@ include {
 
 @ns.jsFfi
 include {
-  @bs.val external document: Dom.document = \\"document\\"
+  @val external document: Dom.document = \\"document\\"
 }
 "
 `;