Clean up processing attribute @as in externals.

cristianoc · cristianoc · commit 6d294e5b2d4b · 2022-06-22T02:15:35.000+02:00
diff --git a/jscomp/core/js_dump.ml b/jscomp/core/js_dump.ml
@@ -595,8 +595,12 @@ and expression_desc cxt ~(level : int) f x : cxt =
       (*TODO --
          when utf8-> it will not escape '\\' which is definitely not we want
       *)
-      if delim <> None then P.string f ("\"" ^ txt ^ "\"")
-      else Js_dump_string.pp_string f txt;
+      if delim = Some "j" || delim = Some "*j" then
+        P.string f ("\"" ^ txt ^ "\"")
+      else if delim = Some "json" then
+        P.string f txt
+      else
+        Js_dump_string.pp_string f txt;
       cxt
   | Raw_js_code { code = s; code_info = info } -> (
       match info with
diff --git a/jscomp/core/lam_compile_const.ml b/jscomp/core/lam_compile_const.ml
@@ -101,5 +101,4 @@ and translate (x : Lam_constant.t) : J.expression =
 let translate_arg_cst (cst : External_arg_spec.cst) =
   match cst with
   | Arg_int_lit i -> E.int (Int32.of_int i)
-  | Arg_string_lit i -> E.str i ~delim:(Some "j")
-  | Arg_js_literal s -> E.raw_js_code (Exp (Js_literal { comment = None })) s
+  | Arg_string_lit (s, delim) -> E.str s ~delim
diff --git a/jscomp/frontend/ast_attributes.ml b/jscomp/frontend/ast_attributes.ml
@@ -271,7 +271,7 @@ let iter_process_bs_int_as (attrs : t) =
       | _ -> ());
   !st
 
-type as_const_payload = Int of int | Str of string | Js_literal_str of string
+type as_const_payload = Int of int | Str of string * string option
 
 let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
   let st = ref None in
@@ -292,7 +292,7 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
                                 pexp_desc =
                                   Pexp_constant
                                     (Pconst_string
-                                      (s, ((None | Some "json"| Some "*j") as dec)));
+                                      (s, ((None | Some "json"| Some "*j") as delim)));
                                 pexp_loc;
                                 _;
                               },
@@ -301,19 +301,20 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
                       };
                     ]
                      ->
-                    if dec = None || dec = Some "*j" then st := Some (Str s)
-                    else (
-                      (match
+                    st := Some (Str (s, delim));
+                    if delim = Some "json" then (
+                      (* check that it is a valid object literal *)
+                      match
                          Classify_function.classify
                            ~check:
-                             (pexp_loc, Bs_flow_ast_utils.flow_deli_offset dec)
+                             (pexp_loc, Bs_flow_ast_utils.flow_deli_offset delim)
                            s
                        with
                       | Js_literal _ -> ()
                       | _ ->
                           Location.raise_errorf ~loc:pexp_loc
-                            "an object literal expected");
-                      st := Some (Js_literal_str s))
+                            "an object literal expected"
+                    )
                 | _ -> Bs_syntaxerr.err loc (Expect_int_or_string_or_json_literal)
                 )
             | Some v -> st := Some (Int v))
diff --git a/jscomp/frontend/ast_attributes.mli b/jscomp/frontend/ast_attributes.mli
@@ -55,8 +55,7 @@ val has_bs_optional : t -> bool
 
 val iter_process_bs_int_as : t -> int option
 
-type as_const_payload = Int of int | Str of string | Js_literal_str of string
-
+type as_const_payload = Int of int | Str of string * string option
 val iter_process_bs_string_or_int_as : t -> as_const_payload option
 
 val process_derive_type : t -> derive_attr * t
diff --git a/jscomp/frontend/ast_external_process.ml b/jscomp/frontend/ast_external_process.ml
@@ -102,8 +102,7 @@ let refine_arg_type ~(nolabel : bool) (ptyp : Ast_core_type.t) :
         | Int i ->
             (* This type is used in obj only to construct obj type*)
             Arg_cst (External_arg_spec.cst_int i)
-        | Str i -> Arg_cst (External_arg_spec.cst_string i)
-        | Js_literal_str s -> Arg_cst (External_arg_spec.cst_obj_literal s))
+        | Str (i, delim) -> Arg_cst (External_arg_spec.cst_string i delim))
   else (* ([`a|`b] [@string]) *)
     spec_of_ptyp nolabel ptyp
 
@@ -123,12 +122,9 @@ let refine_obj_arg_type ~(nolabel : bool) (ptyp : Ast_core_type.t) :
         (* @as(24) *)
         (* This type is used in obj only to construct obj type *)
         Arg_cst (External_arg_spec.cst_int i)
-    | Some (Str i) ->
+    | Some (Str (s, delim)) ->
         (* @as("foo") *)
-        Arg_cst (External_arg_spec.cst_string i)
-    | Some (Js_literal_str s) ->
-        (* @as(json`true`) *)
-        Arg_cst (External_arg_spec.cst_obj_literal s))
+        Arg_cst (External_arg_spec.cst_string s delim))
   else (* ([`a|`b] [@string]) *)
     spec_of_ptyp nolabel ptyp
 
diff --git a/jscomp/frontend/external_arg_spec.ml b/jscomp/frontend/external_arg_spec.ml
@@ -26,8 +26,7 @@
 
 type cst =
   | Arg_int_lit of int
-  | Arg_string_lit of string
-  | Arg_js_literal of string
+  | Arg_string_lit of string * string option
 
 type label_noname = Arg_label | Arg_empty | Arg_optional
 
@@ -70,11 +69,9 @@ type obj_params = obj_param list
 
 type params = param list
 
-let cst_obj_literal s = Arg_js_literal s
-
 let cst_int i = Arg_int_lit i
 
-let cst_string s = Arg_string_lit s
+let cst_string s delim = Arg_string_lit (s, delim)
 
 let empty_label = Obj_empty
 
diff --git a/jscomp/frontend/external_arg_spec.mli b/jscomp/frontend/external_arg_spec.mli
@@ -24,8 +24,7 @@
 
 type cst = private
   | Arg_int_lit of int
-  | Arg_string_lit of string
-  | Arg_js_literal of string
+  | Arg_string_lit of string * string option
 
 type attr =
   | Poly_var_string of { descr : (string * string) list }
@@ -55,11 +54,9 @@ type obj_params = obj_param list
 
 type params = param list
 
-val cst_obj_literal : string -> cst
-
 val cst_int : int -> cst
 
-val cst_string : string -> cst
+val cst_string : string -> string option -> cst
 
 val empty_label : label
 
diff --git a/jscomp/main/builtin_cmi_datasets.ml b/jscomp/main/builtin_cmi_datasets.ml
diff --git a/jscomp/test/prepend_data_ffi.js b/jscomp/test/prepend_data_ffi.js
@@ -42,7 +42,7 @@ function f(x) {
       ]);
   x.xx(116, 3, "xxx", 1, 2, 3);
   x.xx(117, 3, "xxx", 0, "b", 1, 2, 3, 4, 5);
-  x.xx(118, 3, true, false, "你好", ["你好",1,2,3], [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}], [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}], "xxx", 0, "yyy", "b", 1, 2, 3, 4, 5);
+  x.xx(118, 3, true, false, "你好",  ["你好",1,2,3] ,  [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}] ,  [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}] , "xxx", 0, "yyy", "b", 1, 2, 3, 4, 5);
 }
 
 process.on("exit", (function (exit_code) {
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_playground_compiler.ml b/lib/4.06.1/unstable/js_playground_compiler.ml
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ function f(x) {`
`42`	`42`	`]);`
`43`	`43`	`x.xx(116, 3, "xxx", 1, 2, 3);`
`44`	`44`	`x.xx(117, 3, "xxx", 0, "b", 1, 2, 3, 4, 5);`
`45`		`- x.xx(118, 3, true, false, "你好", ["你好",1,2,3], [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}], [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}], "xxx", 0, "yyy", "b", 1, 2, 3, 4, 5);`
	`45`	`+ x.xx(118, 3, true, false, "你好", ["你好",1,2,3] , [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}] , [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}] , "xxx", 0, "yyy", "b", 1, 2, 3, 4, 5);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`process.on("exit", (function (exit_code) {`