fix #4922

bobzhang · bobzhang · commit f83822ef0be4 · 2021-01-27T17:28:22.000+08:00
diff --git a/jscomp/common/js_config.ml b/jscomp/common/js_config.ml
@@ -86,7 +86,7 @@ let no_stdlib = ref false
 
 let no_export = ref false
 
-let record_as_js_object = ref false (* otherwise has an attribute *)
+
 
 let as_ppx = ref false
 
diff --git a/jscomp/common/js_config.mli b/jscomp/common/js_config.mli
@@ -96,7 +96,7 @@ val all_module_aliases : bool ref
 
 val no_stdlib: bool ref
 val no_export: bool ref
-val record_as_js_object : bool ref
+
 val as_ppx : bool ref 
 
 val mono_empty_array : bool ref
diff --git a/jscomp/others/node_path.ml b/jscomp/others/node_path.ml
@@ -35,14 +35,14 @@ external dirname : string -> string = "dirname" [@@bs.module "path"]
 external dirname_ext : string -> string -> string = "dirname" [@@bs.module "path"]
 
 type pathObject =
-  [%bs.obj: <
-         dir : string ;
-         root : string ;
-         base : string ;
-         name : string ;
-         ext : string          
-       >            
-  ]  
+  <
+    dir : string ;
+    root : string ;
+    base : string ;
+    name : string ;
+    ext : string          
+  >   Js.t         
+  
 external format : pathObject -> string = "format" [@@bs.module "path"]
 
 external isAbsolute : string -> bool = "isAbsolute" [@@bs.module "path"]
diff --git a/jscomp/syntax/ast_core_type_class_type.ml b/jscomp/syntax/ast_core_type_class_type.ml
@@ -128,16 +128,11 @@ let default_typ_mapper = Bs_ast_mapper.default_mapper.typ
   we can only use it locally
 *)
 
-let typ_mapper 
-    record_as_js_object
+let typ_mapper
     (self : Bs_ast_mapper.mapper)
     (ty : Parsetree.core_type) 
   = 
   match ty with
-  | {ptyp_desc = Ptyp_extension({txt = ("bs.obj"|"obj")}, PTyp ty)}
-    -> 
-    Ext_ref.non_exn_protect record_as_js_object true 
-      (fun _ -> self.typ self ty )
   | {ptyp_attributes ;
      ptyp_desc = Ptyp_arrow (label, args, body);
      (* let it go without regard label names, 
@@ -205,14 +200,10 @@ let typ_mapper
             Ast_compatible.object_field label attrs (self.typ self core_type) in
           process_getter_setter ~not_getter_setter ~get ~set
             loc label ptyp_attrs core_type acc
-        )in      
-    let inner_type =
-      { ty
-        with ptyp_desc = Ptyp_object(new_methods, closed_flag);
-      } in 
-    if !record_as_js_object then 
-      Ast_comb.to_js_type loc inner_type          
-    else inner_type
+        )in          
+    { ty
+      with ptyp_desc = Ptyp_object(new_methods, closed_flag);
+    } 
   | _ -> default_typ_mapper self ty
     
 let handle_class_type_fields self fields = 
diff --git a/jscomp/syntax/ast_core_type_class_type.mli b/jscomp/syntax/ast_core_type_class_type.mli
@@ -30,7 +30,6 @@ val handle_class_type_fields :
   Parsetree.class_type_field list 
 
 val typ_mapper :
-  bool ref ->
   Bs_ast_mapper.mapper ->
   Parsetree.core_type ->  
   Parsetree.core_type
diff --git a/jscomp/syntax/ast_exp_extension.ml b/jscomp/syntax/ast_exp_extension.ml
@@ -27,7 +27,7 @@ open Ast_helper
 
 
   
-let handle_extension record_as_js_object e (self : Bs_ast_mapper.mapper)
+let handle_extension  e (self : Bs_ast_mapper.mapper)
     (({txt ; loc}  , payload) : Parsetree.extension) = 
   begin match txt with
     | "bs.raw" | "raw" -> 
@@ -134,11 +134,15 @@ let handle_extension record_as_js_object e (self : Bs_ast_mapper.mapper)
       {e with pexp_desc = Ast_exp_handle_external.handle_debugger loc payload}
     | "bs.obj" | "obj" ->
       begin match payload with 
-        | PStr [{pstr_desc = Pstr_eval (e,_)}]
+        |PStr [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_record(label_exprs, None)} as e,_)}]
           -> 
-          Ext_ref.non_exn_protect record_as_js_object true
-            (fun () -> self.expr self e ) 
-        | _ -> Location.raise_errorf ~loc "Expect an expression here"
+          {e 
+            with 
+            pexp_desc = 
+              Ast_util.record_as_js_object e.pexp_loc self label_exprs
+          }
+        
+        | _ -> Location.raise_errorf ~loc "Expect a record expression here"
       end
     | _ ->
         e (* For an unknown extension, we don't really need to process further*)
diff --git a/jscomp/syntax/ast_exp_extension.mli b/jscomp/syntax/ast_exp_extension.mli
@@ -24,7 +24,6 @@
 
 
 val handle_extension :
-  bool ref ->
   Parsetree.expression ->
   Bs_ast_mapper.mapper ->
   Parsetree.extension ->
diff --git a/jscomp/syntax/bs_builtin_ppx.ml b/jscomp/syntax/bs_builtin_ppx.ml
@@ -75,7 +75,7 @@ let expr_mapper  (self : mapper) (e : Parsetree.expression) =
         match e.pexp_desc with
         (** Its output should not be rewritten anymore *)
         | Pexp_extension extension ->
-          Ast_exp_extension.handle_extension Js_config.record_as_js_object e self extension
+          Ast_exp_extension.handle_extension e self extension
         | Pexp_constant (
             Pconst_string
             (s, (Some delim)))
@@ -134,26 +134,6 @@ let expr_mapper  (self : mapper) (e : Parsetree.expression) =
           end
         | Pexp_apply (fn, args  ) ->
           Ast_exp_apply.app_exp_mapper e self fn args
-        | Pexp_record (label_exprs, opt_exp)  ->
-           (* could be supported using `Object.assign`?
-               type
-               {[
-                 external update : 'a Js.t -> 'b Js.t -> 'a Js.t = ""
-                 constraint 'b :> 'a
-               ]}
-            *)
-          if !Js_config.record_as_js_object then
-            (match opt_exp with
-             | None ->
-               { e with
-                 pexp_desc =
-                   Ast_util.record_as_js_object e.pexp_loc self label_exprs;
-               }
-             | Some e ->
-               Location.raise_errorf
-                 ~loc:e.pexp_loc "`with` construct is not supported in js obj ")
-          else
-            default_expr_mapper self e
         | Pexp_object {pcstr_self;  pcstr_fields} ->
             (match Ast_attributes.process_bs e.pexp_attributes with
             | true, pexp_attributes
@@ -204,7 +184,7 @@ let expr_mapper  (self : mapper) (e : Parsetree.expression) =
 
 
 let typ_mapper (self : mapper) (typ : Parsetree.core_type) = 
-  Ast_core_type_class_type.typ_mapper Js_config.record_as_js_object self typ
+  Ast_core_type_class_type.typ_mapper self typ
 
 let class_type_mapper (self : mapper) ({pcty_attributes; pcty_loc} as ctd : Parsetree.class_type) = 
   match Ast_attributes.process_bs pcty_attributes with
diff --git a/jscomp/test/bs_unwrap_test.ml b/jscomp/test/bs_unwrap_test.ml
@@ -70,7 +70,7 @@ let _ = dyn_log3 ~req:(`Int 8) ~opt:(`Bool true) ()
 
 external log4 :
   ([ `String of string
-   | `Options of [%bs.obj: < foo : int > ]
+   | `Options of  < foo : int > Js.t
    ] [@bs.unwrap])
   -> unit = "console.log" [@@bs.val]
 
diff --git a/jscomp/test/chain_code_test.ml b/jscomp/test/chain_code_test.ml
@@ -25,6 +25,6 @@ let f4 h x y =
 (*   ##(draw (x,y)) *)
 (*   ##(draw(x,y)) *)
 let () = 
-  eq __LOC__ 32  [%bs.obj f2 { x = {y = {z = 32}}} ]
+  eq __LOC__ 32  ( f2 [%obj{ x = [%obj{y = [%obj{z = 32}]}]}] )
 
 let () = Mt.from_pair_suites __MODULE__ !suites
diff --git a/jscomp/test/config2_test.ml b/jscomp/test/config2_test.ml
@@ -11,15 +11,15 @@ class type v2 = object
 end [@bs]
 
 type vv = 
-  [%obj: < 
+   < 
     hey : int -> int -> int [@bs]
-  >   ]
+  > Js.t
 
 
 type vv2 = 
-  [%obj: < 
+  < 
     hey : int ->  int -> int [@bs]
-  > ] 
+  > Js.t
 
 
 let hh (x : v) : v2 = x 
diff --git a/jscomp/test/config2_test.mli b/jscomp/test/config2_test.mli
@@ -9,14 +9,14 @@ class type v2 = object
 end [@bs]
 
 type vv = 
-  [%bs.obj: < 
+   < 
     hey : int -> int -> int [@bs]
-  >  ]
+  >  Js.t
 
 type vv2 = 
-  [%bs.obj: < 
+   < 
     hey : int -> int -> int [@bs]
-  > ]
+  > Js.t
 
 
 val test_v : v Js.t -> int
diff --git a/jscomp/test/demo.ml b/jscomp/test/demo.ml
@@ -74,7 +74,7 @@ let ui_layout
     stackPanel##addChild grid;
     stackPanel##addChild inputCode;
     stackPanel##addChild button;
-    let mk_titleRow text = [%bs.obj {label =  {text }  } ] in
+    let mk_titleRow text = [%obj {label =  [%obj{text }]  } ] in
     let u =  [%bs.obj {width =  200} ]  in
     grid##minHeight #= 300;
     grid##titleRows #=
diff --git a/jscomp/test/demo_binding.ml b/jscomp/test/demo_binding.ml
@@ -80,11 +80,11 @@ class type grid  =
   object
     inherit widget
     inherit measure
-    method columns : [%bs.obj: <width : int; .. >  ]  array [@@bs.set]
+    method columns :  <width : int; .. >  Js.t  array [@@bs.set]
     method titleRows : 
-      [%bs.obj: <label : <text : string; .. >   ; ..> ]   array [@@bs.set]
+       <label : <text : string; .. > Js.t   ; ..> Js.t   array [@@bs.set]
     method dataSource :
-      [%bs.obj: <label : <text : string; .. >   ; ..>  ]  array array [@@bs.set]
+       <label : <text : string; .. >  Js.t ; ..>  Js.t  array array [@@bs.set]
   end[@bs]
 
 
diff --git a/jscomp/test/js_obj_test.ml b/jscomp/test/js_obj_test.ml
@@ -16,7 +16,7 @@ let suites = Mt.[
   "js_obj", (fun _ ->
     Eq(34, f_js [%obj{ say = fun [@bs]  x -> x + 2 } ]));
   "js_obj2", (fun _ ->
-    Eq(34,  [%obj { say = fun [@bs]  x -> x + 2 } #@say 32 ]));
+    Eq(34,  [%obj { say = fun [@bs]  x -> x + 2 }] #@say 32 ));
   "empty", (fun _ ->
     Eq(0, empty () |> keys |> Array.length));
   "assign", (fun _ ->
diff --git a/jscomp/test/module_as_function.ml b/jscomp/test/module_as_function.ml
@@ -1,3 +1,3 @@
-external nightmare : [%bs.obj: < show : bool > ]  ->  int  = "nightmare" [@@bs.module]
+external nightmare :  < show : bool > Js.t  ->  int  = "nightmare" [@@bs.module]
 
 let v = nightmare [%bs.obj {show = true}]
diff --git a/jscomp/test/mutable_obj_test.ml b/jscomp/test/mutable_obj_test.ml
@@ -18,7 +18,7 @@ let f ( x : < height : int [@bs.set{no_get}] > Js.t) =
 
 
 type v =
- [%bs.obj:  < dec : int -> < x : int ; y : float >  [@bs] [@bs.set]  >  ]
+   < dec : int -> < x : int ; y : float > Js.t [@bs] [@bs.set]  >  Js.t
 
 let f (x : v ) =
   x##dec#= (fun [@bs] x -> [%bs.obj {x ; y = float_of_int x }])   
diff --git a/jscomp/test/nested_obj_literal.ml b/jscomp/test/nested_obj_literal.ml
@@ -1,7 +1,7 @@
 
 
 let structural_obj = 
-  [%bs.obj { x = { y = { z = 3 }}} ]
+  [%bs.obj { x = [%obj{ y = [%obj{ z = 3 }]}]} ]
 (* compiler inferred type :
   val structural_obj : < x : < y : < z : int >  >  > [@bs.obj] *)
 
diff --git a/jscomp/test/nested_obj_test.ml b/jscomp/test/nested_obj_test.ml
@@ -1,7 +1,7 @@
 
 
-type f_obj = [%bs.obj:< x : < y : < z : int > > > ]
-let f : f_obj = [%bs.obj { x = { y = { z = 3 }}}]
+type f_obj = < x : < y : < z : int > Js.t > Js.t > Js.t
+let f : f_obj = [%obj{ x = [%obj{ y = [%obj{ z = 3 }]}]}]
 
 type 'a x = {x : 'a }
 type 'a y = {y : 'a}
@@ -11,27 +11,27 @@ let f_record   =  { x = { y = { z = 3 }}}
 
 
 
-let f : f_obj = [%bs.obj { x = { y = ({ z = 3 }) }}]
+let f : f_obj = [%bs.obj { x = [%obj{ y = ([%obj{ z = 3 }]) }]}]
 
 
-let f2 : [%bs.obj: 
-  < x : < y : < z : int > > >  list  * < x : < y : < z : int > > > array
-] = 
-  [%bs.obj 
+let f2 : 
+  < x : < y : < z : int > Js.t > Js.t > Js.t  list  * < x : < y : < z : int > Js.t > Js.t > Js.t array
+ = 
+  
     [ 
-      { x = { y = { z = 3 }}} ;
-      { x = { y = { z = 31 }}} ;
+      [%obj{ x = [%obj{ y = [%obj{ z = 3 }]}]}] ;
+      [%obj{ x = [%obj{ y = [%obj{ z = 31 }]}]}] ;
     ] , 
     [| 
-      { x = { y = { z = 3 }}} ;
-      { x = { y = { z = 31 }}} ;
+      [%obj{ x = [%obj{ y = [%obj{ z = 3 }]}]}] ;
+      [%obj{ x = [%obj{ y = [%obj{ z = 31 }]}]}] ;
     |]
-  ]
+  
 
 let f3 = 
-  [%bs.obj
-    ({x = {y = {z = 3 }}} : < x : < y : < z : int > > >  )
-  ]
+  
+    ([%obj{x = [%obj{y = [%obj{z = 3 }]}]}] : < x : < y : < z : int > Js.t > Js.t > Js.t )
+  
 (* how about 
 let f x = [%bs.obj (x : < x : int > ) ] 
 *)
diff --git a/jscomp/test/obj_type_test.ml b/jscomp/test/obj_type_test.ml
@@ -3,14 +3,10 @@
 
 
 
-type u = [%bs.obj: < 
-x : int ; 
-y : 'self -> int 
-> as 'self ]
 
 type x = (
   (< x : int ; y : 'self -> int > Js.t)
   as 'self
 )
 
-let f (u : x) : u = u
+let f (u : x) : x = u
diff --git a/jscomp/test/pipe_send_readline.ml b/jscomp/test/pipe_send_readline.ml
@@ -17,7 +17,7 @@ let u rl =
 
 
 
-external send : string -> 'self   = "send" [@@bs.send.pipe: [%bs.obj: < hi : int > ] as 'self]
+external send : string -> 'self   = "send" [@@bs.send.pipe: < hi : int > Js.t as 'self]
 
 
 let xx h : int  =
diff --git a/jscomp/test/test_bs_this.ml b/jscomp/test/test_bs_this.ml
@@ -1,6 +1,6 @@
 
 
-let uux_this :[%bs.obj: < length : int > ] -> int -> int -> int [@bs.this] 
+let uux_this : < length : int > Js.t -> int -> int -> int [@bs.this] 
   =
   fun[@bs.this] o x y -> o##length + x + y
 
diff --git a/jscomp/test/test_index.ml b/jscomp/test/test_index.ml
@@ -25,16 +25,16 @@ let ff (x : int case  Js.t)
 type 'a return = int -> 'a [@bs]
 
 let h (x : 
-         [%bs.obj:< cse : int -> 'a return [@bs] ; .. >   ]) = 
+         < cse : int -> 'a return [@bs] ; .. >   Js.t) = 
    (x#@cse 3) 2 [@bs]
 
 
 
 type x_obj =  
-  [%bs.obj: < 
+   < 
     cse : int ->  int [@bs] ; 
     cse__st : int -> int -> unit [@bs];
-  >   ]
+  > Js.t
 
 let f_ext 
     (x : x_obj)
@@ -44,9 +44,9 @@ let f_ext
 
 
 type 'a h_obj = 
-  [%bs.obj: < 
+  < 
     cse : int ->  'a return [@bs]
-  >  ]
+  > Js.t
 
 let h_ext  (x : 'a h_obj) = 
    (x #@cse 3) 2 [@bs]
diff --git a/jscomp/test/unsafe_this.ml b/jscomp/test/unsafe_this.ml
diff --git a/jscomp/test/unsafe_this.mli b/jscomp/test/unsafe_this.mli
diff --git a/lib/4.06.1/unstable/bspack.ml b/lib/4.06.1/unstable/bspack.ml
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
diff --git a/lib/4.06.1/unstable/js_compiler.ml.d b/lib/4.06.1/unstable/js_compiler.ml.d
diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml
diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml.d b/lib/4.06.1/unstable/js_refmt_compiler.ml.d
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
