make j and js allowed names for tag functions

Author: tsnobip

CHANGELOG.md

@@ -21,6 +21,7 @@
 
 #### :boom: Breaking Change
 
+- Make `j` and `js` allowed names for tag functions. https://github.com/rescript-lang/rescript-compiler/pull/6817
 - `lazy` syntax is no longer supported. If you're using it, use `Lazy` module or `React.lazy_` instead. https://github.com/rescript-lang/rescript-compiler/pull/6342
 - Remove handling of attributes with `bs.` prefix (`@bs.as` -> `@as` etc.). https://github.com/rescript-lang/rescript-compiler/pull/6643
 - Remove obsolete `@bs.open` feature. https://github.com/rescript-lang/rescript-compiler/pull/6629

jscomp/build_tests/super_errors/expected/jinterp.res.expected

@@ -1,9 +1,9 @@
 
   We've found a bug for you!
-  /.../fixtures/jinterp.res:3:10-21
+  /.../fixtures/jinterp.res:3:9
 
   1 │ 
   2 │ let a = 11
-  3 │ let b = j`number $(a)`
+  3 │ let b = j`number $(a)`
 
-  The unsafe j`$(a)$(b)` interpolation was removed, use string template `${a}${b}` instead.
+  The value j can't be found

jscomp/frontend/ast_utf8_string_interp.ml

@@ -280,12 +280,8 @@ module Delim = struct
   type interpolation =
     | Js (* string interpolation *)
     | Unrecognized (* no interpolation: delimiter not recognized *)
-  let parse_unprocessed loc = function
+  let parse_unprocessed = function
     | "js" -> Js
-    | "j" ->
-      Location.raise_errorf ~loc
-        "The unsafe j`$(a)$(b)` interpolation was removed, use string template \
-         `${a}${b}` instead."
     | _ -> Unrecognized
 
   let escaped_j_delimiter = "*j" (* not user level syntax allowed *)
@@ -294,14 +290,14 @@ module Delim = struct
 end
 
 let transform_exp (e : Parsetree.expression) s delim : Parsetree.expression =
-  match Delim.parse_unprocessed e.pexp_loc delim with
+  match Delim.parse_unprocessed delim with
   | Js ->
     let js_str = Ast_utf8_string.transform e.pexp_loc s in
     {e with pexp_desc = Pexp_constant (Pconst_string (js_str, Delim.escaped))}
   | Unrecognized -> e
 
 let transform_pat (p : Parsetree.pattern) s delim : Parsetree.pattern =
-  match Delim.parse_unprocessed p.ppat_loc delim with
+  match Delim.parse_unprocessed delim with
   | Js ->
     let js_str = Ast_utf8_string.transform p.ppat_loc s in
     {p with ppat_desc = Ppat_constant (Pconst_string (js_str, Delim.escaped))}

jscomp/syntax/src/res_core.ml

@@ -2104,7 +2104,7 @@ and parse_primary_expr ~operand ?(no_call = false) p =
           ~end_pos:expr.pexp_loc.loc_end p
           (Diagnostics.message
              "Tagged template literals are currently restricted to names like: \
-              json`null`.");
+              myTagFunction`foo ${bar}`.");
         parse_template_expr p)
     | _ -> expr
   in
@@ -2279,11 +2279,10 @@ and parse_binary_expr ?(context = OrdinaryExpr) ?a p prec =
 
 and parse_template_expr ?prefix p =
   let part_prefix =
-    (* we could stop treating js and j prefix as something special
-       for json, we would first need to remove @as(json`true`) feature *)
+    (* we could stop treating json prefix as something special
+       but we would first need to remove @as(json`true`) feature *)
     match prefix with
-    | Some {txt = Longident.Lident (("js" | "j" | "json") as prefix); _} ->
-      Some prefix
+    | Some {txt = Longident.Lident ("json" as prefix); _} -> Some prefix
     | _ -> Some "js"
   in
 
@@ -2367,8 +2366,7 @@ and parse_template_expr ?prefix p =
   in
 
   match prefix with
-  | Some {txt = Longident.Lident ("js" | "j" | "json"); _} | None ->
-    gen_interpolated_string ()
+  | Some {txt = Longident.Lident "json"; _} | None -> gen_interpolated_string ()
   | Some lident_loc -> gen_tagged_template_call lident_loc
 
 (* Overparse: let f = a : int => a + 1, is it (a : int) => or (a): int =>

jscomp/syntax/tests/conversion/reason/expected/string.res.txt

@@ -11,14 +11,14 @@ let y = "\n"
 (<> {"\n"->React.string} </>)
 
 // The `//` should not result into an extra comment
-let x = j`https://www.apple.com`
+let x = `https://www.apple.com`
 let x = `https://www.apple.com`
 let x = `https://www.apple.com`
 let x = `https://www.apple.com`
 let x = sql`https://www.apple.com`
 
 // /* */ should not result in an extra comments
-let x = j`/* https://www.apple.com */`
+let x = `/* https://www.apple.com */`
 let x = `/* https://www.apple.com*/`
 let x = `/*https://www.apple.com*/`
 let x = `/*https://www.apple.com*/`

jscomp/syntax/tests/conversion/reason/string.res

@@ -11,14 +11,14 @@ let y = "\n"
 (<> {"\n"->React.string} </>)
 
 // The `//` should not result into an extra comment
-let x = j`https://www.apple.com`
+let x = `https://www.apple.com`
 let x = `https://www.apple.com`
 let x = `https://www.apple.com`
 let x = `https://www.apple.com`
 let x = sql`https://www.apple.com`
 
 // /* */ should not result in an extra comments
-let x = j`/* https://www.apple.com */`
+let x = `/* https://www.apple.com */`
 let x = `/* https://www.apple.com*/`
 let x = `/*https://www.apple.com*/`
 let x = `/*https://www.apple.com*/`

jscomp/syntax/tests/idempotency/bs-css/Css_AtomicTypes.res

@@ -1802,7 +1802,7 @@ module Content = {
     | #noOpenQuote => "no-open-quote"
     | #noCloseQuote => "no-close-quote"
     | #attr(name) => "attr(" ++ (name ++ ")")
-    | #text(string) => j`"$string"`
+    | #text(string) => `"$string"`
     }
 }
 

jscomp/syntax/tests/idempotency/bs-css/Css_Js_Core.res

@@ -1690,8 +1690,8 @@ let fontFace = (~fontFamily, ~src, ~fontStyle=?, ~fontWeight=?, ~fontDisplay=?,
     src
     ->Belt.Array.map(x =>
       switch x {
-      | #localUrl(value) => j`local("$(value)")`
-      | #url(value) => j`url("$(value)")`
+      | #localUrl(value) => `local("$(value)")`
+      | #url(value) => `url("$(value)")`
       }
     )
     ->join(", ")
@@ -1710,7 +1710,7 @@ let fontFace = (~fontFamily, ~src, ~fontStyle=?, ~fontWeight=?, ~fontDisplay=?,
     "font-display: " ++ (FontDisplay.toString(f) ++ ";")
   )
 
-  j`@font-face {
+  `@font-face {
      font-family: $fontFamily;
      src: $src;
      $(fontStyle)

jscomp/syntax/tests/idempotency/bs-css/Css_Legacy_Core.res

@@ -1701,8 +1701,8 @@ let fontFace = (~fontFamily, ~src, ~fontStyle=?, ~fontWeight=?, ~fontDisplay=?,
     src
     |> List.map(x =>
       switch x {
-      | #localUrl(value) => j`local("$(value)")`
-      | #url(value) => j`url("$(value)")`
+      | #localUrl(value) => `local("$(value)")`
+      | #url(value) => `url("$(value)")`
       }
     )
     |> String.concat(", ")
@@ -1721,7 +1721,7 @@ let fontFace = (~fontFamily, ~src, ~fontStyle=?, ~fontWeight=?, ~fontDisplay=?,
     "font-display: " ++ (FontDisplay.toString(f) ++ ";")
   )
 
-  j`@font-face {
+  `@font-face {
      font-family: $fontFamily;
      src: $src;
      $(fontStyle)

jscomp/syntax/tests/idempotency/covid-19charts.com/src/UseQueryParam.res

@@ -28,7 +28,7 @@ let hook = (makeInitial, ~queryFragment, ~coder) => {
 
       {
         open Window
-        window.history.replaceState(. state, "", j`$protocol//$host$pathname$search`)
+        window.history.replaceState(. state, "", `$protocol//$host$pathname$search`)
       }
 
       None