Merge branch 'master' into rewatch-cli-refactor

Author: Bushuo

.github/workflows/ci.yml

@@ -450,7 +450,7 @@ jobs:
         if: ${{ matrix.generate_api_docs }}
         uses: actions/upload-artifact@v4
         with:
-          name: api-docs
+          name: api
           path: scripts/res/apiDocs/
 
   pkg-pr-new:
@@ -495,11 +495,12 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           artifact-ids: ${{ needs.build-compiler.outputs.api-docs-artifact-id }}
-          path: data/api
+          path: data
 
       - name: Check if repo is clean
         id: diffcheck
         run: |
+          git status
           if [ -z "$(git status --porcelain)" ]; then
             echo "clean=true" >> $GITHUB_OUTPUT
           else

CHANGELOG.md

@@ -10,6 +10,23 @@
 > - :house: [Internal]
 > - :nail_care: [Polish]
 
+# 12.0.0-alpha.15 (Unreleased)
+
+#### :bug: Bug fix
+
+- Ignore inferred arity in functions inside `%raw` functions, leaving to `%ffi` the responsibility to check the arity since it gives an error in case of mismatch. https://github.com/rescript-lang/rescript/pull/7542
+- Pass the rewatch exit code through in wrapper script. https://github.com/rescript-lang/rescript/pull/7565
+- Prop punning when types don't match results in I/O error: _none_: No such file or directory. https://github.com/rescript-lang/rescript/pull/7533
+- Pass location to children prop in jsx ppx. https://github.com/rescript-lang/rescript/pull/7540
+
+#### :nail_care: Polish
+
+- Better error message for when trying to await something that is not a promise. https://github.com/rescript-lang/rescript/pull/7561
+
+#### :house: Internal
+
+- Remove `@return(undefined_to_opt)` and `%undefined_to_opt` primitive. https://github.com/rescript-lang/rescript/pull/7462
+
 # 12.0.0-alpha.14
 
 #### :boom: Breaking Change

CONTRIBUTING.md

@@ -14,7 +14,7 @@ Happy hacking!
 
 > Most of our contributors are working on Apple machines, so all our instructions are currently macOS / Linux centric. Contributions for Windows development welcome!
 
-- [Node.js](https://nodejs.org/) v20.x
+- [Node.js](https://nodejs.org/) v22.x
 - [Yarn CLI](https://yarnpkg.com/getting-started/install) (can be installed with `corepack`, Homebrew, etc)
 - C compiler toolchain (usually installed with `xcode` on Mac)
 - Python <= 3.11 (required to build ninja)

compiler/common/bs_version.ml

@@ -21,6 +21,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-let version = "12.0.0-alpha.14"
+let version = "12.0.0-alpha.15"
 let header = "// Generated by ReScript, PLEASE EDIT WITH CARE"
 let package_name = ref "rescript"

compiler/core/lam.ml

@@ -298,8 +298,8 @@ let rec apply ?(ap_transformed_jsx = false) fn args (ap_info : ap_info) : t =
           Lprim
             {
               primitive =
-                ( Pundefined_to_opt | Pnull_to_opt | Pnull_undefined_to_opt
-                | Pis_null | Pis_null_undefined | Ptypeof ) as wrap;
+                ( Pnull_to_opt | Pnull_undefined_to_opt | Pis_null
+                | Pis_null_undefined | Ptypeof ) as wrap;
               args =
                 [Lprim ({primitive = _; args = inner_args} as primitive_call)];
             };
@@ -442,11 +442,7 @@ let rec seq (a : t) b : t =
   match a with
   | Lprim {primitive = Pmakeblock _; args = x :: xs} ->
     seq (Ext_list.fold_left xs x seq) b
-  | Lprim
-      {
-        primitive = Pnull_to_opt | Pundefined_to_opt | Pnull_undefined_to_opt;
-        args = [a];
-      } ->
+  | Lprim {primitive = Pnull_to_opt | Pnull_undefined_to_opt; args = [a]} ->
     seq a b
   | _ -> Lsequence (a, b)
 
@@ -719,8 +715,6 @@ let result_wrap loc (result_type : External_ffi_types.return_wrapper) result =
   | Return_null_to_opt -> prim ~primitive:Pnull_to_opt ~args:[result] loc
   | Return_null_undefined_to_opt ->
     prim ~primitive:Pnull_undefined_to_opt ~args:[result] loc
-  | Return_undefined_to_opt ->
-    prim ~primitive:Pundefined_to_opt ~args:[result] loc
   | Return_unset | Return_identity -> result
 
 let handle_bs_non_obj_ffi ?(transformed_jsx = false)

compiler/core/lam_analysis.ml

@@ -46,8 +46,8 @@ let rec no_side_effects (lam : Lam.t) : bool =
       | _ -> false)
     | Pcreate_extension _ | Ptypeof | Pis_null | Pis_not_none | Psome
     | Psome_not_nest | Pis_undefined | Pis_null_undefined | Pnull_to_opt
-    | Pundefined_to_opt | Pnull_undefined_to_opt | Pjs_fn_make _
-    | Pjs_fn_make_unit | Pjs_object_create _ | Pimport
+    | Pnull_undefined_to_opt | Pjs_fn_make _ | Pjs_fn_make_unit
+    | Pjs_object_create _ | Pimport
     (* TODO: check *)
     | Pmakeblock _
     (* whether it's mutable or not *)

compiler/core/lam_arity_analysis.ml

@@ -69,8 +69,6 @@ let rec get_arity (meta : Lam_stats.t) (lam : Lam.t) : Lam_arity.t =
     with
     | Submodule subs -> subs.(m) (* TODO: shall we store it as array?*)
     | Single _ -> Lam_arity.na)
-  | Lprim {primitive = Praw_js_code {code_info = Exp (Js_function {arity})}} ->
-    Lam_arity.info [arity] false
   | Lprim {primitive = Praise; _} -> Lam_arity.raise_arity_info
   | Lglobal_module _ (* TODO: fix me never going to happen *) | Lprim _ ->
     Lam_arity.na (* CHECK*)

compiler/core/lam_compile_primitive.ml

@@ -95,13 +95,6 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
       | Var _ | Undefined _ | Null -> Js_of_lam_option.null_to_opt e
       | _ -> E.runtime_call Primitive_modules.option "fromNull" args)
     | _ -> assert false)
-  | Pundefined_to_opt -> (
-    match args with
-    | [e] -> (
-      match e.expression_desc with
-      | Var _ | Undefined _ | Null -> Js_of_lam_option.undef_to_opt e
-      | _ -> E.runtime_call Primitive_modules.option "fromUndefined" args)
-    | _ -> assert false)
   | Pnull_undefined_to_opt -> (
     match args with
     | [e] -> (

compiler/core/lam_convert.ml

@@ -197,7 +197,6 @@ let lam_prim ~primitive:(p : Lambda.primitive) ~args loc : Lam.t =
   | Pisnullable -> prim ~primitive:Pis_null_undefined ~args loc
   | Pnull_to_opt -> prim ~primitive:Pnull_to_opt ~args loc
   | Pnullable_to_opt -> prim ~primitive:Pnull_undefined_to_opt ~args loc
-  | Pundefined_to_opt -> prim ~primitive:Pundefined_to_opt ~args loc
   | Pis_not_none -> prim ~primitive:Pis_not_none ~args loc
   | Pval_from_option -> prim ~primitive:Pval_from_option ~args loc
   | Pval_from_option_not_nest ->

compiler/core/lam_pass_collect.ml

@@ -64,17 +64,8 @@ let collect_info (meta : Lam_stats.t) (lam : Lam.t) =
     | Lprim {primitive = Psome | Psome_not_nest; args = [v]} ->
       Hash_ident.replace meta.ident_tbl ident (Normal_optional v);
       collect v
-    | Lprim
-        {
-          primitive = Praw_js_code {code_info = Exp (Js_function {arity})};
-          args = _;
-        } ->
-      Hash_ident.replace meta.ident_tbl ident
-        (FunctionId {arity = Lam_arity.info [arity] false; lambda = None})
     | Lprim {primitive = Pnull_to_opt; args = [(Lvar _ as l)]; _} ->
       Hash_ident.replace meta.ident_tbl ident (OptionalBlock (l, Null))
-    | Lprim {primitive = Pundefined_to_opt; args = [(Lvar _ as l)]; _} ->
-      Hash_ident.replace meta.ident_tbl ident (OptionalBlock (l, Undefined))
     | Lprim {primitive = Pnull_undefined_to_opt; args = [(Lvar _ as l)]} ->
       Hash_ident.replace meta.ident_tbl ident
         (OptionalBlock (l, Null_undefined))

compiler/core/lam_pass_deep_flatten.ml

@@ -123,8 +123,7 @@ let deep_flatten (lam : Lam.t) : Lam.t =
           id,
           (Lprim
              {
-               primitive =
-                 Pnull_to_opt | Pundefined_to_opt | Pnull_undefined_to_opt;
+               primitive = Pnull_to_opt | Pnull_undefined_to_opt;
                args = [Lvar _];
              } as arg),
           body ) ->
@@ -134,9 +133,7 @@ let deep_flatten (lam : Lam.t) : Lam.t =
           id,
           Lprim
             {
-              primitive =
-                (Pnull_to_opt | Pundefined_to_opt | Pnull_undefined_to_opt) as
-                primitive;
+              primitive = (Pnull_to_opt | Pnull_undefined_to_opt) as primitive;
               args = [arg];
             },
           body ) ->

compiler/core/lam_primitive.ml

@@ -161,7 +161,6 @@ type t =
      play safe first
   *)
   | Pjs_fn_method
-  | Pundefined_to_opt
   | Pnull_to_opt
   | Pnull_undefined_to_opt
   | Pis_null
@@ -224,12 +223,12 @@ let eq_primitive_approx (lhs : t) (rhs : t) =
   | Pawait
   (* etc *)
   | Pjs_apply | Pjs_runtime_apply | Pval_from_option | Pval_from_option_not_nest
-  | Pundefined_to_opt | Pnull_to_opt | Pnull_undefined_to_opt | Pis_null
-  | Pis_not_none | Psome | Psome_not_nest | Pis_undefined | Pis_null_undefined
-  | Pimport | Ptypeof | Pfn_arity | Pis_poly_var_block | Pdebugger | Pinit_mod
-  | Pupdate_mod | Pduprecord | Pmakearray | Parraylength | Parrayrefu
-  | Parraysetu | Parrayrefs | Parraysets | Pjs_fn_make_unit | Pjs_fn_method
-  | Phash | Phash_mixstring | Phash_mixint | Phash_finalmix ->
+  | Pnull_to_opt | Pnull_undefined_to_opt | Pis_null | Pis_not_none | Psome
+  | Psome_not_nest | Pis_undefined | Pis_null_undefined | Pimport | Ptypeof
+  | Pfn_arity | Pis_poly_var_block | Pdebugger | Pinit_mod | Pupdate_mod
+  | Pduprecord | Pmakearray | Parraylength | Parrayrefu | Parraysetu
+  | Parrayrefs | Parraysets | Pjs_fn_make_unit | Pjs_fn_method | Phash
+  | Phash_mixstring | Phash_mixint | Phash_finalmix ->
     rhs = lhs
   | Pcreate_extension a -> (
     match rhs with

compiler/core/lam_primitive.mli

@@ -152,7 +152,6 @@ type t =
   | Pjs_fn_make of int
   | Pjs_fn_make_unit
   | Pjs_fn_method
-  | Pundefined_to_opt
   | Pnull_to_opt
   | Pnull_undefined_to_opt
   | Pis_null

compiler/core/lam_print.ml

@@ -61,7 +61,6 @@ let primitive ppf (prim : Lam_primitive.t) =
   | Praw_js_code _ -> fprintf ppf "[raw]"
   | Ptypeof -> fprintf ppf "typeof"
   | Pnull_to_opt -> fprintf ppf "[null->opt]"
-  | Pundefined_to_opt -> fprintf ppf "[undefined->opt]"
   | Pnull_undefined_to_opt -> fprintf ppf "[null/undefined->opt]"
   | Pis_null -> fprintf ppf "[?null]"
   | Pis_not_none -> fprintf ppf "[?is-not-none]"

compiler/frontend/ast_attributes.ml

@@ -279,24 +279,6 @@ let set : attr = ({txt = "set"; loc = locg}, Ast_payload.empty)
 let internal_expansive : attr =
   ({txt = "internal.expansive"; loc = locg}, Ast_payload.empty)
 
-let bs_return_undefined : attr =
-  ( {txt = "return"; loc = locg},
-    PStr
-      [
-        {
-          pstr_desc =
-            Pstr_eval
-              ( {
-                  pexp_desc =
-                    Pexp_ident {txt = Lident "undefined_to_opt"; loc = locg};
-                  pexp_loc = locg;
-                  pexp_attributes = [];
-                },
-                [] );
-          pstr_loc = locg;
-        };
-      ] )
-
 let is_gentype (attr : attr) =
   match attr with
   | {Location.txt = "genType" | "gentype"; _}, _ -> true

compiler/frontend/ast_attributes.mli

@@ -59,8 +59,6 @@ val get_index : attr
 
 val set : attr
 
-val bs_return_undefined : attr
-
 val internal_expansive : attr
 (* val deprecated : string -> attr *)
 

compiler/frontend/ast_derive_abstract.ml

@@ -54,8 +54,7 @@ let is_abstract (xs : Ast_payload.action list) =
 (** For this attributes, its type was wrapped as an option,
     so we can still reuse existing frame work
 *)
-let get_optional_attrs =
-  [Ast_attributes.get; Ast_attributes.bs_return_undefined]
+let get_optional_attrs = [Ast_attributes.get]
 
 let get_attrs = []
 

compiler/frontend/ast_external_process.ml

@@ -190,7 +190,6 @@ let init_st =
 
 let return_wrapper loc (txt : string) : External_ffi_types.return_wrapper =
   match txt with
-  | "undefined_to_opt" -> Return_undefined_to_opt
   | "null_to_opt" -> Return_null_to_opt
   | "nullable" | "null_undefined_to_opt" -> Return_null_undefined_to_opt
   | "identity" -> Return_identity
@@ -395,8 +394,7 @@ let check_return_wrapper loc (wrapper : External_ffi_types.return_wrapper)
   | Return_unset ->
     if Ast_core_type.is_unit result_type then Return_replaced_with_unit
     else wrapper
-  | Return_undefined_to_opt | Return_null_to_opt | Return_null_undefined_to_opt
-    ->
+  | Return_null_to_opt | Return_null_undefined_to_opt ->
     if Ast_core_type.is_user_option result_type then wrapper
     else Bs_syntaxerr.err loc Expect_opt_in_bs_return_to_opt
   | Return_replaced_with_unit -> assert false

compiler/frontend/external_ffi_types.ml

@@ -98,7 +98,6 @@ type external_spec =
 type return_wrapper =
   | Return_unset
   | Return_identity
-  | Return_undefined_to_opt
   | Return_null_to_opt
   | Return_null_undefined_to_opt
   | Return_replaced_with_unit

compiler/frontend/external_ffi_types.mli

@@ -74,7 +74,6 @@ type external_spec =
 type return_wrapper =
   | Return_unset
   | Return_identity
-  | Return_undefined_to_opt
   | Return_null_to_opt
   | Return_null_undefined_to_opt
   | Return_replaced_with_unit

compiler/ml/ast_await.ml

@@ -9,6 +9,25 @@ let create_await_expression (e : Parsetree.expression) =
   in
   Ast_helper.Exp.apply ~loc unsafe_await [(Nolabel, e)]
 
+let is_await_expr (e : Parsetree.expression) =
+  match e with
+  | {
+   pexp_loc = {loc_ghost = true};
+   pexp_desc =
+     Pexp_apply
+       {
+         funct =
+           {
+             pexp_loc = {loc_ghost = true};
+             pexp_desc = Pexp_ident {txt = Ldot (Lident ident, "unsafe_await")};
+           };
+         args = [(Nolabel, _)];
+       };
+  }
+    when ident = Primitive_modules.promise ->
+    true
+  | _ -> false
+
 (* Transform `@res.await M` to unpack(@res.await Js.import(module(M: __M0__))) *)
 let create_await_module_expression ~module_type_lid (e : Parsetree.module_expr)
     =

compiler/ml/error_message_utils.ml

@@ -102,6 +102,7 @@ type type_clash_context =
   | FunctionArgument of {optional: bool; name: string option}
   | Statement of type_clash_statement
   | ForLoopCondition
+  | Await
 
 let context_to_string = function
   | Some WhileCondition -> "WhileCondition"
@@ -120,6 +121,7 @@ let context_to_string = function
   | Some (FunctionArgument _) -> "FunctionArgument"
   | Some ComparisonOperator -> "ComparisonOperator"
   | Some IfReturn -> "IfReturn"
+  | Some Await -> "Await"
   | None -> "None"
 
 let fprintf = Format.fprintf
@@ -185,6 +187,10 @@ let error_expected_type_text ppf type_clash_context =
       "But it's being used with the @{<info>%s@} operator, which works on:"
       operator
   | Some StringConcat -> fprintf ppf "But string concatenation is expecting:"
+  | Some Await ->
+    fprintf ppf
+      "But you're using @{<info>await@} on this expression, so it is expected \
+       to be of type:"
   | Some MaybeUnwrapOption | None ->
     fprintf ppf "But it's expected to have type:"
 
@@ -282,6 +288,14 @@ let print_extra_type_clash_help ~extract_concrete_typedecl ~env loc ppf
       "\n\n\
       \  To fix this, change the highlighted code so it evaluates to a \
        @{<info>bool@}."
+  | Some Await, _ ->
+    fprintf ppf
+      "\n\n\
+      \  You're trying to await something that is not a promise.\n\n\
+       Possible solutions:\n\
+      \  - Remove the @{<info>await@} if this is not expected to be a promise\n\
+      \  - Wrap the expression in @{<info>Promise.resolve@} to convert the \
+       expression to a promise"
   | Some IfReturn, _ ->
     fprintf ppf
       "\n\n\
@@ -533,7 +547,7 @@ let type_clash_context_from_function sexp sfunct =
     Some (MathOperator {for_float = true; operator; is_constant})
   | Pexp_ident {txt = Lident (("/" | "*" | "+" | "-") as operator)} ->
     Some (MathOperator {for_float = false; operator; is_constant})
-  | _ -> None
+  | _ -> if Ast_await.is_await_expr sexp then Some Await else None
 
 let type_clash_context_for_function_argument ~label type_clash_context sarg0 =
   match type_clash_context with

compiler/ml/lambda.ml

@@ -295,7 +295,6 @@ type primitive =
   (* js *)
   | Pcurry_apply of int
   | Pjscomp of comparison
-  | Pundefined_to_opt
   | Pnull_to_opt
   | Pnullable_to_opt
   | Pis_not_none

compiler/ml/lambda.mli

@@ -264,7 +264,6 @@ type primitive =
   (* js *)
   | Pcurry_apply of int
   | Pjscomp of comparison
-  | Pundefined_to_opt
   | Pnull_to_opt
   | Pnullable_to_opt
   | Pis_not_none