Merge branch 'master' into result-get-or-throw-message

Author: mediremi

.github/workflows/ci.yml

@@ -134,7 +134,7 @@ jobs:
       - name: Run rewatch unit tests
         if: steps.rewatch-build-cache.outputs.cache-hit != 'true'
         run: |
-          cargo test --manifest-path rewatch/Cargo.toml
+          cargo test --manifest-path rewatch/Cargo.toml --release
 
       - name: Copy rewatch binary
         run: |
@@ -360,6 +360,14 @@ jobs:
         if: runner.os != 'Windows'
         run: make -C tests/gentype_tests/typescript-react-example clean test
 
+      # On Windows, after running setup-ocaml (if it wasn't cached yet or the cache couldn't be restored),
+      # Cygwin bash is used instead of Git Bash for Windows, breaking the rewatch tests.
+      # So we need to adjust the path to bring back Git Bash for Windows.
+      - name: Rewatch tests need Git Bash for Windows
+        if: ${{ runner.os == 'Windows' }}
+        run: echo "C:\Program Files\Git\bin" >> $GITHUB_PATH
+        shell: bash
+
       - name: Run rewatch tests
         run: ./rewatch/tests/suite-ci.sh
         shell: bash

CHANGELOG.md

@@ -10,40 +10,55 @@
 > - :nail_care: [Polish]
 > - :house: [Internal]
 
-# 12.0.0-beta.2 (Unreleased)
+# 12.0.0-beta.3 (Unreleased)
 
 #### :boom: Breaking Change
 
 - `Result.getOrThrow` now throws a JS error instead of a `Not_found` ReScript exception. https://github.com/rescript-lang/rescript/pull/7630
-- Rust implementation of the `rescript format` command. Command line options changed from `-all`, `-check` and `-stdin` to `--all`, `--check` and `--stdin` compared to the legacy implementation. https://github.com/rescript-lang/rescript/pull/7603
+
+#### :rocket: New Feature
+
+- Add optional `message` argument to `Result.getOrThrow` and improve default error message. https://github.com/rescript-lang/rescript/pull/7630
 
 #### :nail_care: Polish
 
-- Add missing backtick and spaces to `Belt.Map.map` doc comment. https://github.com/rescript-lang/rescript/pull/7632
+- Configuration fields `bs-dependencies`, `bs-dev-dependencies` and `bsc-flags` are now deprecated in favor of `dependencies`, `dev-dependencies` and `compiler-flags`. https://github.com/rescript-lang/rescript/pull/7658
 
-#### :house: Internal
+# 12.0.0-beta.2
 
-- Remove internal/unused `-bs-v` flag. https://github.com/rescript-lang/rescript/pull/7627
-- Remove unused `-bs-D` and `-bs-list-conditionals` flags. https://github.com/rescript-lang/rescript/pull/7631
-- Remove obsolete jsx options. https://github.com/rescript-lang/rescript/pull/7633
-- Remove obsolete option `-bs-unsafe-empty-array`. https://github.com/rescript-lang/rescript/pull/7635
-- Clean up `config.ml`. https://github.com/rescript-lang/rescript/pull/7636
-- Rewatch: simplify getting bsc path. https://github.com/rescript-lang/rescript/pull/7634
-- Rewatch: only get `"type": "dev"` source files for local packages. https://github.com/rescript-lang/rescript/pull/7646
-- Rewatch: add support for `rescript -w` for compatibility. https://github.com/rescript-lang/rescript/pull/7649
+#### :boom: Breaking Change
+
+- Rust implementation of the `rescript format` command. Command line options changed from `-all`, `-check` and `-stdin` to `--all`, `--check` and `--stdin` compared to the legacy implementation. https://github.com/rescript-lang/rescript/pull/7603
 
 #### :rocket: New Feature
 
 - Add experimental command to `rescript-tools` for extracting all ReScript code blocks from markdown, either a md-file directly, or inside of docstrings in ReScript code. https://github.com/rescript-lang/rescript/pull/7623
-- Add optional `message` argument to `Result.getOrThrow` and improve default error message. https://github.com/rescript-lang/rescript/pull/7630
 
 #### :bug: Bug fix
 
 - Fix `typeof` parens on functions. https://github.com/rescript-lang/rescript/pull/7643
-- Rewatch: Add --dev flag to clean command. https://github.com/rescript-lang/rescript/pull/7622
+- Rewatch: Add `--dev` flag to clean command. https://github.com/rescript-lang/rescript/pull/7622
 - Rewatch: Use root package suffix in clean log messages. https://github.com/rescript-lang/rescript/pull/7648
 - Fix inside comment printing for empty dict. https://github.com/rescript-lang/rescript/pull/7654
 - Fix I/O error message when trying to extract extra info from non-existing file. https://github.com/rescript-lang/rescript/pull/7656
+- Fix fatal error when JSX expression used without configuring JSX in `rescript.json`. https://github.com/rescript-lang/rescript/pull/7656
+- Rewatch: Only allow access to `"bs-dev-dependencies"` from `"type": "dev"` source files. https://github.com/rescript-lang/rescript/pull/7650
+
+#### :nail_care: Polish
+
+- Add missing backtick and spaces to `Belt.Map.map` doc comment. https://github.com/rescript-lang/rescript/pull/7632
+- AST: store the attributes directly on function arguments. https://github.com/rescript-lang/rescript/pull/7660
+
+#### :house: Internal
+
+- Remove internal/unused `-bs-v` flag. https://github.com/rescript-lang/rescript/pull/7627
+- Remove unused `-bs-D` and `-bs-list-conditionals` flags. https://github.com/rescript-lang/rescript/pull/7631
+- Remove obsolete jsx options. https://github.com/rescript-lang/rescript/pull/7633
+- Remove obsolete option `-bs-unsafe-empty-array`. https://github.com/rescript-lang/rescript/pull/7635
+- Clean up `config.ml`. https://github.com/rescript-lang/rescript/pull/7636
+- Rewatch: simplify getting bsc path. https://github.com/rescript-lang/rescript/pull/7634
+- Rewatch: only get `"type": "dev"` source files for local packages. https://github.com/rescript-lang/rescript/pull/7646
+- Rewatch: add support for `rescript -w` for compatibility. https://github.com/rescript-lang/rescript/pull/7649
 
 # 12.0.0-beta.1
 

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-beta.2"
+let version = "12.0.0-beta.3"
 let header = "// Generated by ReScript, PLEASE EDIT WITH CARE"
 let package_name = ref "rescript"

compiler/frontend/ast_core_type.ml

@@ -95,7 +95,7 @@ let from_labels ~loc arity labels : t =
   in
   let args =
     Ext_list.map2 labels tyvars (fun label tyvar ->
-        {Parsetree.lbl = Asttypes.Labelled label; typ = tyvar})
+        {Parsetree.attrs = []; lbl = Asttypes.Labelled label; typ = tyvar})
   in
   Typ.arrows ~loc args result_type
 
@@ -131,39 +131,22 @@ let get_curry_arity (ty : t) =
 
 let is_arity_one ty = get_curry_arity ty = 1
 
-type param_type = {
-  label: Asttypes.arg_label;
-  ty: Parsetree.core_type;
-  attr: Parsetree.attributes;
-  loc: loc;
-}
-
-let mk_fn_type (new_arg_types_ty : param_type list) (result : t) : t =
+let mk_fn_type ~loc (new_arg_types_ty : Parsetree.arg list) (result : t) : t =
   let t =
-    Ext_list.fold_right new_arg_types_ty result
-      (fun {label; ty; attr; loc} acc ->
-        Ast_helper.Typ.arrow ~loc ~attrs:attr ~arity:None
-          {lbl = label; typ = ty} acc)
+    Ext_list.fold_right new_arg_types_ty result (fun {lbl; typ; attrs} acc ->
+        Ast_helper.Typ.arrow ~loc ~attrs ~arity:None {attrs = []; lbl; typ} acc)
   in
   match t.ptyp_desc with
   | Ptyp_arrow arr ->
     let arity = List.length new_arg_types_ty in
     {t with ptyp_desc = Ptyp_arrow {arr with arity = Some arity}}
   | _ -> t
 
-let list_of_arrow (ty : t) : t * param_type list =
+let list_of_arrow (ty : t) : t * Parsetree.arg list =
   let rec aux (ty : t) acc =
     match ty.ptyp_desc with
     | Ptyp_arrow {arg; ret; arity} when arity = None || acc = [] ->
-      aux ret
-        (({
-            label = arg.lbl;
-            ty = arg.typ;
-            attr = ty.ptyp_attributes;
-            loc = ty.ptyp_loc;
-          }
-           : param_type)
-        :: acc)
+      aux ret (arg :: acc)
     | Ptyp_poly (_, ty) ->
       (* should not happen? *)
       Bs_syntaxerr.err ty.ptyp_loc Unhandled_poly_type
@@ -173,6 +156,6 @@ let list_of_arrow (ty : t) : t * param_type list =
 
 let add_last_obj (ty : t) (obj : t) =
   let result, params = list_of_arrow ty in
-  mk_fn_type
-    (params @ [{label = Nolabel; ty = obj; attr = []; loc = obj.ptyp_loc}])
+  mk_fn_type ~loc:obj.ptyp_loc
+    (params @ [{lbl = Nolabel; typ = obj; attrs = []}])
     result

compiler/frontend/ast_core_type.mli

@@ -47,16 +47,9 @@ val get_uncurry_arity : t -> int option
    None -- means not a function
 *)
 
-type param_type = {
-  label: Asttypes.arg_label;
-  ty: t;
-  attr: Parsetree.attributes;
-  loc: Location.t;
-}
+val mk_fn_type : loc:Location.t -> Parsetree.arg list -> t -> t
 
-val mk_fn_type : param_type list -> t -> t
-
-val list_of_arrow : t -> t * param_type list
+val list_of_arrow : t -> t * Parsetree.arg list
 (** fails when Ptyp_poly *)
 
 val add_last_obj : t -> t -> t

compiler/frontend/ast_derive_abstract.ml

@@ -84,7 +84,7 @@ let handle_tdcl light (tdcl : Parsetree.type_declaration) :
         ( [],
           (if has_optional_field then
              Ast_helper.Typ.arrow ~loc ~arity:None
-               {lbl = Nolabel; typ = Ast_literal.type_unit ()}
+               {attrs = []; lbl = Nolabel; typ = Ast_literal.type_unit ()}
                core_type
            else core_type),
           [] )
@@ -116,19 +116,19 @@ let handle_tdcl light (tdcl : Parsetree.type_declaration) :
             if is_optional then
               let optional_type = Ast_core_type.lift_option_type pld_type in
               ( Ast_helper.Typ.arrow ~loc:pld_loc ~arity
-                  {lbl = Asttypes.Optional pld_name; typ = pld_type}
+                  {attrs = []; lbl = Asttypes.Optional pld_name; typ = pld_type}
                   maker,
                 Val.mk ~loc:pld_loc
                   (if light then pld_name
                    else {pld_name with txt = pld_name.txt ^ "Get"})
                   ~attrs:get_optional_attrs ~prim
                   (Ast_helper.Typ.arrow ~loc ~arity:(Some 1)
-                     {lbl = Nolabel; typ = core_type}
+                     {attrs = []; lbl = Nolabel; typ = core_type}
                      optional_type)
                 :: acc )
             else
               ( Ast_helper.Typ.arrow ~loc:pld_loc ~arity
-                  {lbl = Asttypes.Labelled pld_name; typ = pld_type}
+                  {attrs = []; lbl = Asttypes.Labelled pld_name; typ = pld_type}
                   maker,
                 Val.mk ~loc:pld_loc
                   (if light then pld_name
@@ -140,7 +140,7 @@ let handle_tdcl light (tdcl : Parsetree.type_declaration) :
                        [External_arg_spec.dummy] Return_identity
                        (Js_get {js_get_name = prim_as_name; js_get_scopes = []}))
                   (Ast_helper.Typ.arrow ~loc ~arity:(Some 1)
-                     {lbl = Nolabel; typ = core_type}
+                     {attrs = []; lbl = Nolabel; typ = core_type}
                      pld_type)
                 :: acc )
           in
@@ -149,9 +149,9 @@ let handle_tdcl light (tdcl : Parsetree.type_declaration) :
             if is_current_field_mutable then
               let setter_type =
                 Ast_helper.Typ.arrow ~arity:(Some 2)
-                  {lbl = Nolabel; typ = core_type}
+                  {attrs = []; lbl = Nolabel; typ = core_type}
                   (Ast_helper.Typ.arrow ~arity:None
-                     {lbl = Nolabel; typ = pld_type} (* setter *)
+                     {attrs = []; lbl = Nolabel; typ = pld_type} (* setter *)
                      (Ast_literal.type_unit ()))
               in
               Val.mk ~loc:pld_loc

compiler/frontend/ast_derive_js_mapper.ml

@@ -69,7 +69,9 @@ let erase_type_str =
   Str.primitive
     (Val.mk ~prim:["%identity"]
        {loc = noloc; txt = erase_type_lit}
-       (Ast_helper.Typ.arrow ~arity:(Some 1) {lbl = Nolabel; typ = any} any))
+       (Ast_helper.Typ.arrow ~arity:(Some 1)
+          {attrs = []; lbl = Nolabel; typ = any}
+          any))
 
 let unsafe_index = "_index"
 
@@ -79,8 +81,11 @@ let unsafe_index_get =
     (Val.mk ~prim:[""]
        {loc = noloc; txt = unsafe_index}
        ~attrs:[Ast_attributes.get_index]
-       (Ast_helper.Typ.arrow ~arity:None {lbl = Nolabel; typ = any}
-          (Ast_helper.Typ.arrow ~arity:None {lbl = Nolabel; typ = any} any)))
+       (Ast_helper.Typ.arrow ~arity:None
+          {attrs = []; lbl = Nolabel; typ = any}
+          (Ast_helper.Typ.arrow ~arity:None
+             {attrs = []; lbl = Nolabel; typ = any}
+             any)))
 
 let unsafe_index_get_exp = Exp.ident {loc = noloc; txt = Lident unsafe_index}
 
@@ -132,7 +137,7 @@ let app1 = Ast_compatible.app1
 let app2 = Ast_compatible.app2
 
 let ( ->~ ) a b =
-  Ast_helper.Typ.arrow ~arity:(Some 1) {lbl = Nolabel; typ = a} b
+  Ast_helper.Typ.arrow ~arity:(Some 1) {attrs = []; lbl = Nolabel; typ = a} b
 
 let raise_when_not_found_ident =
   Longident.Ldot (Lident Primitive_modules.util, "raiseWhenNotFound")
@@ -305,7 +310,7 @@ let init () =
               let to_js_type result =
                 Ast_comb.single_non_rec_val pat_to_js
                   (Ast_helper.Typ.arrow ~arity:(Some 1)
-                     {lbl = Nolabel; typ = core_type}
+                     {attrs = []; lbl = Nolabel; typ = core_type}
                      result)
               in
               let new_type, new_tdcl =

compiler/frontend/ast_derive_projector.ml

@@ -137,7 +137,7 @@ let init () =
                 Ext_list.map label_declarations (fun {pld_name; pld_type} ->
                     Ast_comb.single_non_rec_val ?attrs:gentype_attrs pld_name
                       (Ast_helper.Typ.arrow ~arity:(Some 1)
-                         {lbl = Nolabel; typ = core_type}
+                         {attrs = []; lbl = Nolabel; typ = core_type}
                          pld_type
                          (*arity will alwys be 1 since these are single param functions*)))
               | Ptype_variant constructor_declarations ->
@@ -170,7 +170,8 @@ let init () =
                       {loc; txt = Ext_string.uncapitalize_ascii con_name}
                       (Ext_list.fold_right pcd_args annotate_type (fun x acc ->
                            Ast_helper.Typ.arrow ~arity:None
-                             {lbl = Nolabel; typ = x} acc)
+                             {attrs = []; lbl = Nolabel; typ = x}
+                             acc)
                       |> add_arity ~arity))
               | Ptype_open | Ptype_abstract ->
                 Ast_derive_util.not_applicable tdcl.ptype_loc deriving_name;

compiler/frontend/ast_exp_handle_external.ml

@@ -43,7 +43,7 @@ let handle_external loc (x : string) : Parsetree.expression =
         Ast_external_mk.local_external_apply loc ~pval_prim:["#raw_expr"]
           ~pval_type:
             (Ast_helper.Typ.arrow ~arity:(Some 1)
-               {lbl = Nolabel; typ = Ast_helper.Typ.any ()}
+               {attrs = []; lbl = Nolabel; typ = Ast_helper.Typ.any ()}
                (Ast_helper.Typ.any ()))
           [str_exp];
     }
@@ -72,7 +72,7 @@ let handle_debugger loc (payload : Ast_payload.t) =
     Ast_external_mk.local_external_apply loc ~pval_prim:["%debugger"]
       ~pval_type:
         (Ast_helper.Typ.arrow ~arity:(Some 1)
-           {lbl = Nolabel; typ = Ast_helper.Typ.any ()}
+           {attrs = []; lbl = Nolabel; typ = Ast_helper.Typ.any ()}
            (Ast_literal.type_unit ()))
       [Ast_literal.val_unit ~loc ()]
   | _ ->
@@ -99,7 +99,7 @@ let handle_raw ~kind loc payload =
         Ast_external_mk.local_external_apply loc ~pval_prim:["#raw_expr"]
           ~pval_type:
             (Ast_helper.Typ.arrow ~arity:(Some 1)
-               {lbl = Nolabel; typ = Ast_helper.Typ.any ()}
+               {attrs = []; lbl = Nolabel; typ = Ast_helper.Typ.any ()}
                (Ast_helper.Typ.any ()))
           [exp];
       pexp_attributes =
@@ -128,11 +128,16 @@ let handle_ffi ~loc ~payload =
       let unit = Ast_literal.type_unit ~loc () in
       let rec arrow ~arity =
         if arity = 0 then
-          Ast_helper.Typ.arrow ~arity:None ~loc {lbl = Nolabel; typ = unit} any
+          Ast_helper.Typ.arrow ~arity:None ~loc
+            {attrs = []; lbl = Nolabel; typ = unit}
+            any
         else if arity = 1 then
-          Ast_helper.Typ.arrow ~arity:None ~loc {lbl = Nolabel; typ = any} any
+          Ast_helper.Typ.arrow ~arity:None ~loc
+            {attrs = []; lbl = Nolabel; typ = any}
+            any
         else
-          Ast_helper.Typ.arrow ~loc ~arity:None {lbl = Nolabel; typ = any}
+          Ast_helper.Typ.arrow ~loc ~arity:None
+            {attrs = []; lbl = Nolabel; typ = any}
             (arrow ~arity:(arity - 1))
       in
       match !is_function with
@@ -152,7 +157,7 @@ let handle_ffi ~loc ~payload =
           Ast_external_mk.local_external_apply loc ~pval_prim:["#raw_expr"]
             ~pval_type:
               (Ast_helper.Typ.arrow ~arity:(Some 1)
-                 {lbl = Nolabel; typ = Ast_helper.Typ.any ()}
+                 {attrs = []; lbl = Nolabel; typ = Ast_helper.Typ.any ()}
                  (Ast_helper.Typ.any ()))
             [exp];
         pexp_attributes =
@@ -171,7 +176,7 @@ let handle_raw_structure loc payload =
           Ast_external_mk.local_external_apply loc ~pval_prim:["#raw_stmt"]
             ~pval_type:
               (Ast_helper.Typ.arrow ~arity:(Some 1)
-                 {lbl = Nolabel; typ = Ast_helper.Typ.any ()}
+                 {attrs = []; lbl = Nolabel; typ = Ast_helper.Typ.any ()}
                  (Ast_helper.Typ.any ()))
             [exp];
       }