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

Merge changes from 11.0_release into master

Author: cknitt

CHANGELOG.md

@@ -27,6 +27,27 @@
 
 - Make the `--help` arg be prioritized in the CLI, so correctly prints help message and skip other commands. https://github.com/rescript-lang/rescript-compiler/pull/6667
 
+# 11.1.0-rc.5
+
+#### :bug: Bug Fix
+
+- Fix misparsing in/after JSX. https://github.com/rescript-lang/rescript-compiler/pull/6686
+- Fix `@deriving(accessors)` outputting curried functions in uncurried mode. https://github.com/rescript-lang/rescript-compiler/pull/6687
+
+# 11.1.0-rc.4
+
+#### :bug: Bug Fix
+
+- Fix emitting static import instead of dynamic import. https://github.com/rescript-lang/rescript-compiler/pull/6664
+- Fix local type variables breaking react components. https://github.com/rescript-lang/rescript-compiler/pull/6665
+- Fix remove redundant branches in generated switch body. https://github.com/rescript-lang/rescript-compiler/pull/6672
+- Fix issue in partial application when the last named arg is provided. https://github.com/rescript-lang/rescript-compiler/pull/6681
+
+#### :nail-care: Polish
+
+- Omit `undefined` in external function calls for trailing optional arguments when not supplied. https://github.com/rescript-lang/rescript-compiler/pull/6653
+- Make pattern match suggestions to be easier to copy-paste. https://github.com/rescript-lang/rescript-compiler/pull/6656
+
 # 11.1.0-rc.3
 
 #### :nail_care: Polish

docs/docson/build-schema.json

@@ -439,7 +439,7 @@
       "properties": {
         "number": {
           "type": "string",
-          "description": "Default: -40+6+7+27+32..39+44+45 [Here](https://caml.inria.fr/pub/docs/manual-ocaml/comp.html#sec270) for the meanings of the warning flags"
+          "description": "Default: \"+a-4-9-20-40-41-42-50-61-102\". Go [here](https://rescript-lang.org/docs/manual/latest/warning-numbers) for the meanings of the warning flags"
         },
         "error": {
           "oneOf": [

jscomp/build_tests/super_errors/expected/warnings4.res.expected

@@ -10,4 +10,4 @@
   14 │ 
 
   You forgot to handle a possible case here, for example: 
-  #second(_) | #fourth | #third
+  | #second(_) | #fourth | #third

jscomp/build_tests/super_errors/expected/warnings5.res.expected

@@ -24,7 +24,7 @@ Either bind these labels explicitly or add ', _' to the pattern.
   15 │ switch y {
 
   You forgot to handle a possible case here, for example: 
-  {otherValue: true, _}
+  | {otherValue: true, _}
 
 
   Warning number 9
@@ -52,7 +52,7 @@ Either bind these labels explicitly or add ', _' to the pattern.
   19 │ let arr = [1]
 
   You forgot to handle a possible case here, for example: 
-  {typ: WithPayload(false), _}
+  | {typ: WithPayload(false), _}
 | {typ: Variant | One | Two | Three | Four | Five | Six | Seven(_), _}
 
 
@@ -68,7 +68,7 @@ Either bind these labels explicitly or add ', _' to the pattern.
   25 │ switch arr {
 
   You forgot to handle a possible case here, for example: 
-  [_]
+  | [_]
 
 
   Warning number 8
@@ -83,7 +83,7 @@ Either bind these labels explicitly or add ', _' to the pattern.
   29 │ switch arr {
 
   You forgot to handle a possible case here, for example: 
-  []
+  | []
 
 
   Warning number 8
@@ -98,7 +98,7 @@ Either bind these labels explicitly or add ', _' to the pattern.
   33 │ let lst = list{}
 
   You forgot to handle a possible case here, for example: 
-  [1, 0] | [0, _] | []
+  | [1, 0] | [0, _] | []
 
 
   Warning number 8
@@ -113,7 +113,7 @@ Either bind these labels explicitly or add ', _' to the pattern.
   39 │ switch lst {
 
   You forgot to handle a possible case here, for example: 
-  list{_, ..._}
+  | list{_, ..._}
 
 
   Warning number 8
@@ -128,7 +128,7 @@ Either bind these labels explicitly or add ', _' to the pattern.
   43 │ switch lst {
 
   You forgot to handle a possible case here, for example: 
-  list{1, 2, _, ..._} | list{1, 0, ..._} | list{1} | list{0, ..._} | list{}
+  | list{1, 2, _, ..._} | list{1, 0, ..._} | list{1} | list{0, ..._} | list{}
 
 
   Warning number 8
@@ -143,7 +143,7 @@ Either bind these labels explicitly or add ', _' to the pattern.
   47 │ switch "abc" {
 
   You forgot to handle a possible case here, for example: 
-  list{1, _, ..._} | list{0, ..._} | list{}
+  | list{1, _, ..._} | list{0, ..._} | list{}
 
 
   Warning number 8
@@ -158,7 +158,7 @@ Either bind these labels explicitly or add ', _' to the pattern.
   51 │ switch 0 {
 
   You forgot to handle a possible case here, for example: 
-  "*"
+  | "*"
 
 
   Warning number 8
@@ -173,7 +173,7 @@ Either bind these labels explicitly or add ', _' to the pattern.
   55 │ let tuple = (1, true)
 
   You forgot to handle a possible case here, for example: 
-  0
+  | 0
 
 
   Warning number 8
@@ -187,4 +187,4 @@ Either bind these labels explicitly or add ', _' to the pattern.
   60 │ 
 
   You forgot to handle a possible case here, for example: 
-  (_, true)
+  | (_, true)

jscomp/core/lam.ml

@@ -788,13 +788,13 @@ let rec transform_uncurried_arg_type loc (arg_types : External_arg_spec.params)
   | ([], [] | _ :: _, [] | [], _ :: _) as ok -> ok
 
 let handle_bs_non_obj_ffi (arg_types : External_arg_spec.params)
-    (result_type : External_ffi_types.return_wrapper) ffi args loc prim_name =
+    (result_type : External_ffi_types.return_wrapper) ffi args loc prim_name ~dynamic_import =
   if no_auto_uncurried_arg_types arg_types then
     result_wrap loc result_type
-      (prim ~primitive:(Pjs_call { prim_name; arg_types; ffi }) ~args loc)
+      (prim ~primitive:(Pjs_call { prim_name; arg_types; ffi; dynamic_import }) ~args loc)
   else
     let n_arg_types, n_args = transform_uncurried_arg_type loc arg_types args in
     result_wrap loc result_type
       (prim
-         ~primitive:(Pjs_call { prim_name; arg_types = n_arg_types; ffi })
+         ~primitive:(Pjs_call { prim_name; arg_types = n_arg_types; ffi; dynamic_import })
          ~args:n_args loc)

jscomp/core/lam.mli

@@ -91,6 +91,7 @@ val handle_bs_non_obj_ffi :
   t list ->
   Location.t ->
   string ->
+  dynamic_import: bool ->
   t
 
 (**************************************************************)

jscomp/core/lam_compile.ml

@@ -573,6 +573,11 @@ and compile_general_cases :
             break still should not be printed (it will be continuned)
            TOOD: disabled temporarily since it's not perfect yet *)
       morph_declare_to_assign cxt (fun cxt declaration ->
+          (* Exclude cases that are the same as the default if the default is defined *)
+          let cases = match default with
+            | Default lam -> List.filter (fun (_, lam1) -> not (Lam.eq_approx lam lam1)) cases
+            | _ -> cases
+          in
           let default =
             match default with
             | Complete -> None

jscomp/core/lam_compile_env.ml

@@ -60,7 +60,7 @@ let reset () =
     be escaped quite ugly
 *)
 let add_js_module ?import_attributes (hint_name : External_ffi_types.module_bind_name)
-    (module_name : string) default : Ident.t =
+    (module_name : string) default ~dynamic_import : Ident.t =
   let id =
     Ident.create
       (match hint_name with
@@ -71,7 +71,7 @@ let add_js_module ?import_attributes (hint_name : External_ffi_types.module_bind
       | Phint_nothing -> Ext_modulename.js_id_name_of_hint_name module_name)
   in
   let lam_module_ident : J.module_id =
-    { id; kind = External { name = module_name; default; import_attributes }; dynamic_import = false }
+    { id; kind = External { name = module_name; default; import_attributes }; dynamic_import }
   in
   match Lam_module_ident.Hash.find_key_opt cached_tbl lam_module_ident with
   | None ->

jscomp/core/lam_compile_env.mli

@@ -27,7 +27,7 @@
 val reset : unit -> unit
 
 val add_js_module :
-  ?import_attributes:External_ffi_types.import_attributes -> External_ffi_types.module_bind_name -> string -> bool -> Ident.t
+  ?import_attributes:External_ffi_types.import_attributes -> External_ffi_types.module_bind_name -> string -> bool -> dynamic_import:bool -> Ident.t
 (** 
    [add_js_module hint_name module_name]
    Given a js module name and hint name, assign an id to it

jscomp/core/lam_compile_external_call.ml

@@ -50,8 +50,8 @@ let splice_obj_apply obj name args =
    bundle *)
 
 let external_var
-   ({ bundle; module_bind_name; import_attributes } : External_ffi_types.external_module_name) =
-  let id = Lam_compile_env.add_js_module ?import_attributes module_bind_name bundle false in
+   ({ bundle; module_bind_name; import_attributes } : External_ffi_types.external_module_name) ~dynamic_import =
+  let id = Lam_compile_env.add_js_module ?import_attributes module_bind_name bundle false ~dynamic_import in
   E.external_var ?import_attributes ~external_name:bundle id
 
 (* let handle_external_opt
@@ -216,21 +216,22 @@ let assemble_args_has_splice (arg_types : specs) (args : exprs) :
 
 let translate_scoped_module_val
     (module_name : External_ffi_types.external_module_name option) (fn : string)
-    (scopes : string list) =
+    (scopes : string list)
+    ~dynamic_import =
   match module_name with
   | Some { bundle; module_bind_name; import_attributes } -> (
       match scopes with
       | [] ->
           let default = fn = "default" in
           let id =
-            Lam_compile_env.add_js_module ?import_attributes module_bind_name bundle default
+            Lam_compile_env.add_js_module ?import_attributes module_bind_name bundle default ~dynamic_import
           in
           E.external_var_field ?import_attributes ~external_name:bundle ~field:fn ~default id
       | x :: rest ->
           (* TODO: what happens when scope contains "default" ?*)
           let default = false in
           let id =
-            Lam_compile_env.add_js_module ?import_attributes module_bind_name bundle default
+            Lam_compile_env.add_js_module ?import_attributes module_bind_name bundle default ~dynamic_import
           in
           let start =
             E.external_var_field ?import_attributes ~external_name:bundle ~field:x ~default id
@@ -250,10 +251,10 @@ let translate_scoped_access scopes obj =
   | x :: xs -> Ext_list.fold_left xs (E.dot obj x) E.dot
 
 let translate_ffi (cxt : Lam_compile_context.t) arg_types
-    (ffi : External_ffi_types.external_spec) (args : J.expression list) =
+    (ffi : External_ffi_types.external_spec) (args : J.expression list) ~dynamic_import =
   match ffi with
   | Js_call { external_module_name; name; splice: _; scopes; tagged_template = true } -> 
-      let fn = translate_scoped_module_val external_module_name name scopes in 
+      let fn = translate_scoped_module_val external_module_name name scopes ~dynamic_import in 
       (match args with
       | [ {expression_desc = Array (strings, _); _}; {expression_desc = Array (values, _); _} ] -> 
         E.tagged_template fn strings values
@@ -262,18 +263,28 @@ let translate_ffi (cxt : Lam_compile_context.t) arg_types
           (if dynamic then splice_apply fn args
           else E.call ~info:{ arity = Full; call_info = Call_na } fn args))
   | 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
+      let fn = translate_scoped_module_val module_name fn scopes ~dynamic_import in
       if splice then
         let args, eff, dynamic = assemble_args_has_splice arg_types args in
         add_eff eff
           (if dynamic then splice_apply fn args
           else E.call ~info:{ arity = Full; call_info = Call_na } fn args)
       else
         let args, eff = assemble_args_no_splice arg_types args in
+        let rec keepNonUndefinedArgs argsList (argTypes : specs) =
+          match (argsList, argTypes) with
+          | ( {J.expression_desc = Undefined {isUnit = false}; _} :: rest,
+              {External_arg_spec.arg_label = Arg_optional; _} :: argTypes ) ->
+            keepNonUndefinedArgs rest argTypes
+          | _ -> argsList
+        in
+        let args =
+          keepNonUndefinedArgs (List.rev args) (List.rev arg_types) |> List.rev
+        in
         add_eff eff
         @@ E.call ~info:{ arity = Full; call_info = Call_na } fn args
   | Js_module_as_fn { external_module_name; splice } ->
-      let fn = external_var external_module_name in
+      let fn = external_var external_module_name ~dynamic_import in
       if splice then
         let args, eff, dynamic = assemble_args_has_splice arg_types args in
         (* TODO: fix in rest calling convention *)
@@ -303,14 +314,14 @@ let translate_ffi (cxt : Lam_compile_context.t) arg_types
       in
       if splice then
         let args, eff, dynamic = assemble_args_has_splice arg_types args in
-        let fn = translate_scoped_module_val module_name fn scopes in
+        let fn = translate_scoped_module_val module_name fn scopes ~dynamic_import in
         add_eff eff
           (mark ();
           if dynamic then splice_new_apply fn args
           else E.new_ fn args)
       else
         let args, eff = assemble_args_no_splice arg_types args in
-        let fn = translate_scoped_module_val module_name fn scopes in
+        let fn = translate_scoped_module_val module_name fn scopes ~dynamic_import in
         add_eff eff
           (mark (); E.new_ fn args)
   | Js_send { splice; name; js_send_scopes } -> (
@@ -336,16 +347,16 @@ let translate_ffi (cxt : Lam_compile_context.t) arg_types
                  ~info:{ arity = Full; call_info = Call_na }
                  (E.dot self name) args)
       | _ -> assert false)
-  | Js_module_as_var module_name -> external_var module_name
+  | Js_module_as_var module_name -> external_var module_name ~dynamic_import
   | Js_var { name; external_module_name; scopes } ->
       (* TODO #11
          1. check args -- error checking
          2. support [@@scope "window"]
          we need know whether we should call [add_js_module] or not
       *)
-      translate_scoped_module_val external_module_name name scopes
+      translate_scoped_module_val external_module_name name scopes ~dynamic_import
   | Js_module_as_class module_name ->
-      let fn = external_var module_name in
+      let fn = external_var module_name ~dynamic_import in
       let args, eff = assemble_args_no_splice arg_types args in
       (* TODO: fix in rest calling convention *)
       add_eff eff

jscomp/core/lam_compile_external_call.mli

@@ -34,6 +34,7 @@ val translate_ffi :
   External_arg_spec.params ->
   External_ffi_types.external_spec ->
   J.expression list ->
+  dynamic_import:bool ->
   J.expression
 
 (** TODO: document supported attributes

jscomp/core/lam_compile_primitive.ml

@@ -337,8 +337,8 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
   (* Lam_compile_external_call.translate loc cxt prim args *)
   (* Test if the argument is a block or an immediate integer *)
   | Pjs_object_create _ -> assert false
-  | Pjs_call { arg_types; ffi } ->
-      Lam_compile_external_call.translate_ffi cxt arg_types ffi args
+  | Pjs_call { arg_types; ffi; dynamic_import } ->
+      Lam_compile_external_call.translate_ffi cxt arg_types ffi args ~dynamic_import
   (* FIXME, this can be removed later *)
   | Pisint -> E.is_type_number (Ext_list.singleton_exn args)
   | Pis_poly_var_block -> E.is_type_object (Ext_list.singleton_exn args)

jscomp/core/lam_convert.ml

@@ -380,7 +380,7 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) :
   let may_depends = Lam_module_ident.Hash_set.create 0 in
 
   let rec convert_ccall (a_prim : Primitive.description)
-      (args : Lambda.lambda list) loc : Lam.t =
+      (args : Lambda.lambda list) loc ~dynamic_import : Lam.t =
     let prim_name = a_prim.prim_name in
     let prim_name_len = String.length prim_name in
     match External_ffi_types.from_string a_prim.prim_native_name with
@@ -400,7 +400,7 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) :
           | Param_number i -> Ext_list.init i (fun _ -> External_arg_spec.dummy)
         in
         let args = Ext_list.map args convert_aux in
-        Lam.handle_bs_non_obj_ffi arg_types result_type ffi args loc prim_name
+        Lam.handle_bs_non_obj_ffi arg_types result_type ffi args loc prim_name ~dynamic_import
     | Ffi_inline_const i -> Lam.const i
   and convert_js_primitive (p : Primitive.description)
       (args : Lambda.lambda list) loc : Lam.t =
@@ -542,7 +542,7 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) :
         convert_pipe f x outer_loc
     | Lprim (Prevapply, _, _) -> assert false
     | Lprim (Pdirapply, _, _) -> assert false
-    | Lprim (Pccall a, args, loc) -> convert_ccall a args loc
+    | Lprim (Pccall a, args, loc) -> convert_ccall a args loc ~dynamic_import
     | Lprim (Pgetglobal id, args, _) ->
         let args = Ext_list.map args convert_aux in
         if Ident.is_predef_exn id then

jscomp/core/lam_primitive.ml

@@ -48,6 +48,7 @@ type t =
       prim_name : string;
       arg_types : External_arg_spec.params;
       ffi : External_ffi_types.external_spec;
+      dynamic_import: bool;
     }
   | Pjs_object_create of External_arg_spec.obj_params
   (* Exceptions *)
@@ -249,11 +250,11 @@ let eq_primitive_approx (lhs : t) (rhs : t) =
           i0 = i1 && flag0 = flag1 && eq_tag_info info0 info1
       | _ -> false)
   | Pduprecord -> rhs = Pduprecord
-  | Pjs_call { prim_name; arg_types; ffi } -> (
+  | Pjs_call { prim_name; arg_types; ffi; dynamic_import } -> (
       match rhs with
       | Pjs_call rhs ->
           prim_name = rhs.prim_name && arg_types = rhs.arg_types
-          && ffi = rhs.ffi
+          && ffi = rhs.ffi && dynamic_import = rhs.dynamic_import
       | _ -> false)
   | Pjs_object_create obj_create -> (
       match rhs with

jscomp/core/lam_primitive.mli

@@ -43,6 +43,7 @@ type t =
       prim_name : string;
       arg_types : External_arg_spec.params;
       ffi : External_ffi_types.external_spec;
+      dynamic_import: bool;
     }
   | Pjs_object_create of External_arg_spec.obj_params
   | Praise