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))