Merge pull request #6596 from cknitt/11-to-master

Sync latest v11 changes to master

Author: cknitt

.github/workflows/ci.yml

@@ -2,14 +2,14 @@ name: CI
 
 on:
   push:
-    branches: [master]
+    branches: [master, 11.0_release]
     # See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"
       - "v[0-9]+.[0-9]+.[0-9]+-*"
 
   pull_request:
-    branches: [master]
+    branches: [master, 11.0_release]
 
 concurrency:
   group: ci-${{ github.ref }}-1
@@ -109,7 +109,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest, macos-arm]
+        os: [
+            macos-13, # x64
+            macos-14, # ARM
+            ubuntu-latest,
+            windows-latest,
+          ]
         ocaml_compiler: [4.14.0]
 
     runs-on: ${{matrix.os}}
@@ -230,24 +235,24 @@ jobs:
         if: runner.os == 'Windows'
         run: node scripts/ciTest.js -mocha -theme -format
 
-      # Build the playground compiler on our fastest runner (macOS ARM)
+      # Build the playground compiler on the fastest runner (ubuntu-latest)
       - name: Install JSOO
-        if: matrix.os == 'macos-arm'
+        if: matrix.os == 'ubuntu-latest'
         run: opam install js_of_ocaml.4.0.0
 
       - name: Build playground compiler
-        if: matrix.os == 'macos-arm'
+        if: matrix.os == 'ubuntu-latest'
         run: |
           opam exec -- node packages/playground-bundling/scripts/generate_cmijs.js
           opam exec -- dune build --profile browser
           cp ./_build/default/jscomp/jsoo/jsoo_playground_main.bc.js playground/compiler.js
 
       - name: Test playground compiler
-        if: matrix.os == 'macos-arm'
+        if: matrix.os == 'ubuntu-latest'
         run: node playground/playground_test.js
 
       - name: Upload playground compiler to CDN
-        if: ${{ matrix.os == 'macos-arm' && startsWith(github.ref, 'refs/tags/v') }}
+        if: ${{ matrix.os == 'ubuntu-latest' && startsWith(github.ref, 'refs/tags/v') }}
         env:
           KEYCDN_USER: ${{ secrets.KEYCDN_USER }}
           KEYCDN_PASSWORD: ${{ secrets.KEYCDN_PASSWORD }}
@@ -324,10 +329,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          [
-            macos-latest,
-            macos-arm,
+        os: [
+            macos-13, # x64
+            macos-14, # ARM
             ubuntu-latest,
             buildjet-2vcpu-ubuntu-2204-arm,
             windows-latest,

CHANGELOG.md

@@ -12,6 +12,18 @@
 
 # 12.0.0-alpha.1 (Unreleased)
 
+# 11.1.0-rc.1
+
+#### :rocket: New Feature
+
+- Experimental support of tagged template literals, e.g. ```sql`select * from ${table}```. https://github.com/rescript-lang/rescript-compiler/pull/6250
+- Experimental support for generic/custom JSX transforms. https://github.com/rescript-lang/rescript-compiler/pull/6565
+- `dict` is now a builtin type. https://github.com/rescript-lang/rescript-compiler/pull/6590
+
+#### :bug: Bug Fix
+
+- GenType: distinguish inline records from unary variant cases of object type. https://github.com/rescript-lang/rescript-compiler/pull/6586
+
 # 11.0.1
 
 #### :bug: Bug Fix

jscomp/bsb/bsb_jsx.ml

@@ -1,5 +1,5 @@
 type version = Jsx_v3 | Jsx_v4
-type module_ = React
+type module_ = React | Generic of {moduleName: string}
 type mode = Classic | Automatic
 type dependencies = string list
 
@@ -15,7 +15,7 @@ let encode_no_nl jsx =
   | None -> ""
   | Some Jsx_v3 -> "3"
   | Some Jsx_v4 -> "4")
-  ^ (match jsx.module_ with None -> "" | Some React -> "React")
+  ^ (match jsx.module_ with None -> "" | Some React -> "React" | Some Generic {moduleName} -> moduleName)
   ^
   match jsx.mode with
   | None -> ""
@@ -55,10 +55,10 @@ let from_map map =
        `Obj
          (fun m ->
            match m.?(Bsb_build_schemas.jsx_module) with
-           | Some (Str { loc; str }) -> (
+           | Some (Str { str }) -> (
                match str with
                | "react" -> module_ := Some React
-               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx module %s" str)
+               | moduleName -> module_ := Some (Generic {moduleName}))
            | Some x ->
                Bsb_exception.config_error x
                  "Unexpected input (jsx module name) for jsx module"

jscomp/bsb/bsb_ninja_rule.ml

@@ -169,7 +169,8 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
     | None, None -> ());
     (match jsx.module_ with
     | None -> ()
-    | Some React -> Ext_buffer.add_string buf " -bs-jsx-module react");
+    | Some React -> Ext_buffer.add_string buf " -bs-jsx-module react"
+    | Some Generic {moduleName} -> Ext_buffer.add_string buf (" -bs-jsx-module " ^ moduleName));
     (match jsx.mode with
     | None -> ()
     | Some Classic -> Ext_buffer.add_string buf " -bs-jsx-mode classic"

jscomp/bsc/rescript_compiler_main.ml

@@ -251,7 +251,6 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     "*internal* Set jsx version";
 
     "-bs-jsx-module", string_call (fun i ->
-      (if i <> "react" then Bsc_args.bad_arg (" Not supported jsx-module : " ^ i));
       Js_config.jsx_module := Js_config.jsx_module_of_string i),
     "*internal* Set jsx module";
 

jscomp/common/js_config.ml

@@ -25,7 +25,7 @@
 (** Browser is not set via command line only for internal use *)
 
 type jsx_version = Jsx_v3 | Jsx_v4
-type jsx_module = React
+type jsx_module = React | Generic of {moduleName: string}
 type jsx_mode = Classic | Automatic
 
 let no_version_header = ref false
@@ -64,6 +64,7 @@ let int_of_jsx_version = function
 
 let string_of_jsx_module = function
 | React -> "react"
+| Generic {moduleName} -> moduleName
 
 let string_of_jsx_mode = function
 | Classic -> "classic"
@@ -76,7 +77,7 @@ let jsx_version_of_int = function
 
 let jsx_module_of_string = function
 | "react" -> React
-| _ -> React
+| moduleName -> Generic {moduleName}
 
 let jsx_mode_of_string = function
 | "classic" -> Classic

jscomp/common/js_config.mli

@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 type jsx_version = Jsx_v3 | Jsx_v4
-type jsx_module = React
+type jsx_module = React | Generic of {moduleName: string}
 type jsx_mode = Classic | Automatic
 
 (* val get_packages_info :

jscomp/core/j.ml

@@ -115,6 +115,7 @@ and expression_desc =
      This can be constructed either in a static way [E.array_index_by_int] or a dynamic way
      [E.array_index]
   *)
+  | Tagged_template of expression * expression list * expression list
   | Static_index of expression * string * int32 option
   (* The third argument bool indicates whether we should
      print it as

jscomp/core/js_analyzer.ml

@@ -103,6 +103,8 @@ let rec no_side_effect_expression_desc (x : J.expression_desc) =
   | String_append (a, b) | Seq (a, b) -> no_side_effect a && no_side_effect b
   | Length (e, _) | Caml_block_tag (e, _) | Typeof e -> no_side_effect e
   | Bin (op, a, b) -> op <> Eq && no_side_effect a && no_side_effect b
+  | Tagged_template (call_expr, strings, values) -> no_side_effect call_expr &&
+      Ext_list.for_all strings no_side_effect && Ext_list.for_all values no_side_effect
   | Js_not _ | Cond _ | FlatCall _ | Call _ | New _ | Raw_js_code _
   (* actually true? *) ->
       false
@@ -204,7 +206,7 @@ let rec eq_expression ({ expression_desc = x0 } : J.expression)
       | _ -> false)
   | Length _ | Is_null_or_undefined _ | String_append _ | Typeof _ | Js_not _
   | Cond _ | FlatCall _ | New _ | Fun _ | Raw_js_code _ | Array _
-  | Caml_block_tag _ | Object _
+  | Caml_block_tag _ | Object _ | Tagged_template _
   | Number (Uint _) ->
       false
   | Await _ -> false

jscomp/core/js_dump.ml

@@ -165,6 +165,7 @@ let exp_need_paren (e : J.expression) =
   | Js_not _ | Bool _ | New _ ->
       false
   | Await _ -> false
+  | Tagged_template _ -> false
 
 let comma_idents (cxt : cxt) f ls = iter_lst cxt f ls Ext_pp_scope.ident comma
 
@@ -596,6 +597,24 @@ and expression_desc cxt ~(level : int) f x : cxt =
               P.string f L.null;
               comma_sp f;
               expression ~level:1 cxt f el))
+  | Tagged_template (callExpr, stringArgs, valueArgs) ->
+    let cxt = expression cxt ~level f callExpr in
+    P.string f "`";
+    let rec aux cxt xs ys = match xs, ys with
+    | [], [] -> ()
+    | [{J.expression_desc = Str { txt; _ }}], [] ->  
+        P.string f txt
+    | {J.expression_desc = Str { txt; _ }} :: x_rest, y :: y_rest ->
+        P.string f txt;
+        P.string f "${";
+        let cxt = expression cxt ~level f y in
+        P.string f "}";
+        aux cxt x_rest y_rest
+    | _ -> assert false
+    in
+    aux cxt stringArgs valueArgs;
+    P.string f "`";
+    cxt
   | String_index (a, b) ->
       P.group f 1 (fun _ ->
           let cxt = expression ~level:15 cxt f a in

jscomp/core/js_exp_make.ml

@@ -72,6 +72,9 @@ let call ?comment ~info e0 args : t =
 let flat_call ?comment e0 es : t =
   { expression_desc = FlatCall (e0, es); comment }
 
+let tagged_template ?comment callExpr stringArgs valueArgs : t =
+  { expression_desc = Tagged_template (callExpr, stringArgs, valueArgs); comment }
+
 let runtime_var_dot ?comment (x : string) (e1 : string) : J.expression =
   {
     expression_desc =

jscomp/core/js_exp_make.mli

@@ -279,6 +279,8 @@ val call : ?comment:string -> info:Js_call_info.t -> t -> t list -> t
 
 val flat_call : ?comment:string -> t -> t -> t
 
+val tagged_template : ?comment:string -> t -> t list -> t list -> t
+
 val new_ : ?comment:string -> J.expression -> J.expression list -> t
 
 val array : ?comment:string -> J.mutable_flag -> J.expression list -> t

jscomp/core/js_fold.ml

@@ -124,6 +124,11 @@ class fold =
           let _self = _self#expression _x0 in
           let _self = list (fun _self -> _self#expression) _self _x1 in
           _self
+      | Tagged_template (_x0, _x1, _x2) ->
+          let _self = _self#expression _x0 in
+          let _self = list (fun _self -> _self#expression) _self _x1 in
+          let _self = list (fun _self -> _self#expression) _self _x2 in
+          _self
       | String_index (_x0, _x1) ->
           let _self = _self#expression _x0 in
           let _self = _self#expression _x1 in

jscomp/core/js_record_fold.ml

@@ -130,6 +130,11 @@ let expression_desc : 'a. ('a, expression_desc) fn =
       let st = _self.expression _self st _x0 in
       let st = list _self.expression _self st _x1 in
       st
+  | Tagged_template (_xo, _x1, _x2) -> 
+    let st = _self.expression _self st _xo in 
+    let st = list _self.expression _self st _x1 in 
+    let st = list _self.expression _self st _x2 in
+    st
   | String_index (_x0, _x1) ->
       let st = _self.expression _self st _x0 in
       let st = _self.expression _self st _x1 in

jscomp/core/js_record_iter.ml

@@ -107,6 +107,10 @@ let expression_desc : expression_desc fn =
   | Call (_x0, _x1, _x2) ->
       _self.expression _self _x0;
       list _self.expression _self _x1
+  | Tagged_template (_x0, _x1, _x2) ->
+    _self.expression _self _x0;
+    list _self.expression _self _x1;
+    list _self.expression _self _x2
   | String_index (_x0, _x1) ->
       _self.expression _self _x0;
       _self.expression _self _x1

jscomp/core/js_record_map.ml

@@ -130,6 +130,11 @@ let expression_desc : expression_desc fn =
       let _x0 = _self.expression _self _x0 in
       let _x1 = list _self.expression _self _x1 in
       Call (_x0, _x1, _x2)
+  | Tagged_template (_x0, _x1, _x2) -> 
+      let _x0 = _self.expression _self _x0 in
+      let _x1 = list _self.expression _self _x1 in
+      let _x2 = list _self.expression _self _x2 in
+      Tagged_template (_x0, _x1, _x2)
   | String_index (_x0, _x1) ->
       let _x0 = _self.expression _self _x0 in
       let _x1 = _self.expression _self _x1 in

jscomp/core/lam_compile_external_call.ml

@@ -252,7 +252,17 @@ let translate_scoped_access scopes obj =
 let translate_ffi (cxt : Lam_compile_context.t) arg_types
     (ffi : External_ffi_types.external_spec) (args : J.expression list) =
   match ffi with
-  | Js_call { external_module_name = module_name; name = fn; splice; scopes } ->
+  | Js_call { external_module_name; name; splice; scopes; tagged_template = true } -> 
+      let fn = translate_scoped_module_val external_module_name name scopes in 
+      (match args with
+      | [ stringArgs; valueArgs ] -> (
+          match (stringArgs, valueArgs) with
+          | ({expression_desc = Array (strings, _); _}, {expression_desc = Array (values, _); _}) ->
+              E.tagged_template fn strings values
+          | _ -> assert false
+          )
+      | _ -> assert false)
+  | Js_call { external_module_name = module_name; name = fn; splice; scopes; tagged_template = false } ->
       let fn = translate_scoped_module_val module_name fn scopes in
       if splice then
         let args, eff, dynamic = assemble_args_has_splice arg_types args in