Merge branch 'master' into group-jsx-modules

Author: aspeddro

CHANGELOG.md

@@ -15,20 +15,36 @@
 #### :boom: Breaking Change
 
 - Rename `JsError` to `JsExn` and error modules cleanup. https://github.com/rescript-lang/rescript/pull/7408
+- Make `BigInt.fromFloat` return an option rather than throwing an error in case it's passed a value with a decimal value. https://github.com/rescript-lang/rescript/pull/7419
 
 #### :rocket: New Feature
 
 - Add shift (`<<`, `>>`, `>>>`) operators for `int` and `bigint`. https://github.com/rescript-lang/rescript/pull/7183
+- Add bitwise AND (`&`) operator for `int` and `bigint`. https://github.com/rescript-lang/rescript/pull/7415
+- Add bitwise NOT (`~`) operator for `int` and `bigint`. https://github.com/rescript-lang/rescript/pull/7418
 - Significantly reduced the download size by splitting binaries into optional platform-specific dependencies (e.g, `@rescript/linux-x64`). https://github.com/rescript-lang/rescript/pull/7395
+- JSX: do not error on ref as prop anymore (which is allowed in React 19). https://github.com/rescript-lang/rescript/pull/7420
 
 #### :bug: Bug fix
 
 - Fix broken `bstracing` CLI location. https://github.com/rescript-lang/rescript/pull/7398
+- Fix field flattening optimization to avoid creating unnecessary copies of allocating constants. https://github.com/rescript-lang/rescript-compiler/pull/7421
+- Fix leading comments removed when braces inside JSX contains `let` assignment. https://github.com/rescript-lang/rescript/pull/7424
+- Fix JSON escaping in code editor analysis: JSON was not always escaped properly, which prevented code actions from being available in certain situations https://github.com/rescript-lang/rescript/pull/7435
+- Fix regression in pattern matching for optional fields containing variants. https://github.com/rescript-lang/rescript/pull/7440
+- Fix missing checks for duplicate literals in variants with payloads. https://github.com/rescript-lang/rescript/pull/7441
+- Fix printer removing private for empty record. https://github.com/rescript-lang/rescript/pull/7448
 
 #### :house: Internal
 
 - AST: Add bar location to `case`. https://github.com/rescript-lang/rescript/pull/7407
 
+#### :nail_care: Polish
+
+- In type errors, recommend stdlib over Belt functions for converting between float/int/string. https://github.com/rescript-lang/rescript/pull/7453
+- Make `Jsx.element` a private empty record to avoid unnecessary `Primitive_option.some`. https://github.com/rescript-lang/rescript/pull/7450
+- Remove unused type `Jsx.ref`. https://github.com/rescript-lang/rescript/pull/7459
+
 # 12.0.0-alpha.12
 
 #### :bug: Bug fix
@@ -41,6 +57,7 @@
 #### :house: Internal
 
 - Better representation of JSX in AST. https://github.com/rescript-lang/rescript/pull/7286
+- Clean up default warnings. https://github.com/rescript-lang/rescript/pull/7413
 
 #### :nail_care: Polish
 

analysis/reanalyze/src/Paths.ml

@@ -81,7 +81,7 @@ module Config = struct
     | Some False -> RunConfig.transitive false
     | _ -> ()
 
-  (* Read the config from rescript.json/bsconfig.json and apply it to runConfig and suppress and unsuppress *)
+  (* Read the config from rescript.json and apply it to runConfig and suppress and unsuppress *)
   let processBsconfig () =
     Lazy.force setReScriptProjectRoot;
     let rescriptFile = Filename.concat runConfig.projectRoot rescriptJson in

analysis/reanalyze/src/Reanalyze.ml

@@ -139,9 +139,7 @@ let cli () =
         "root_path Run all the analyses for all the .cmt files under the root \
          path" );
       ("-ci", Unit (fun () -> Cli.ci := true), "Internal flag for use in CI");
-      ( "-config",
-        Unit setConfig,
-        "Read the analysis mode from rescript.json/bsconfig.json" );
+      ("-config", Unit setConfig, "Read the analysis mode from rescript.json");
       ("-dce", Unit (fun () -> setDCE None), "Eperimental DCE");
       ("-debug", Unit (fun () -> Cli.debug := true), "Print debug information");
       ( "-dce-cmt",

analysis/src/CompletionDecorators.ml

@@ -164,7 +164,7 @@ Example `@raises(Exn)` or `@raises([E1, E2, E3])` for multiple exceptions.
 
 You will need this decorator whenever you want to use a ReScript / React component in ReScript JSX expressions.
 
-Note: The `@react.component` decorator requires the `jsx` config to be set in your `rescript.json`/`bsconfig.json` to enable the required React transformations.
+Note: The `@react.component` decorator requires the `jsx` config to be set in your `rescript.json` to enable the required React transformations.
 
 [Read more and see examples in the documentation](https://rescript-lang.org/syntax-lookup#react-component-decorator).|};
       ] );

analysis/src/CompletionFrontEnd.ml

@@ -267,33 +267,35 @@ let rec exprToContextPathInner ~(inJsxContext : bool) (e : Parsetree.expression)
           };
         args =
           [(_, lhs); (_, {pexp_desc = Pexp_apply {funct = d; args; partial}})];
+        transformed_jsx;
       } ->
     (* Transform away pipe with apply call *)
     exprToContextPath ~inJsxContext
       {
         pexp_desc =
-          Pexp_apply {funct = d; args = (Nolabel, lhs) :: args; partial};
+          Pexp_apply
+            {funct = d; args = (Nolabel, lhs) :: args; partial; transformed_jsx};
         pexp_loc;
         pexp_attributes;
       }
   | Pexp_apply
-      {
-        funct = {pexp_desc = Pexp_ident {txt = Lident "->"}};
-        args =
-          [
-            (_, lhs); (_, {pexp_desc = Pexp_ident id; pexp_loc; pexp_attributes});
-          ];
-        partial;
-      } ->
+      ({
+         funct = {pexp_desc = Pexp_ident {txt = Lident "->"}};
+         args =
+           [
+             (_, lhs);
+             (_, {pexp_desc = Pexp_ident id; pexp_loc; pexp_attributes});
+           ];
+       } as app) ->
     (* Transform away pipe with identifier *)
     exprToContextPath ~inJsxContext
       {
         pexp_desc =
           Pexp_apply
             {
+              app with
               funct = {pexp_desc = Pexp_ident id; pexp_loc; pexp_attributes};
               args = [(Nolabel, lhs)];
-              partial;
             };
         pexp_loc;
         pexp_attributes;

analysis/vendor/json/Json.ml

@@ -141,7 +141,10 @@ let escape text =
       | '\b' -> Buffer.add_string buf "\\b"
       | '\r' -> Buffer.add_string buf "\\r"
       | '\t' -> Buffer.add_string buf "\\t"
-      | c -> Buffer.add_char buf c);
+      | c ->
+        let code = Char.code c in
+        if code < 0x20 then Printf.bprintf buf "\\u%04x" code
+        else Buffer.add_char buf c);
       loop (i + 1))
   in
   loop 0;

compiler/bsb/bsb_build_util.ml

@@ -172,7 +172,7 @@ let rec walk_all_deps_aux (visited : string Hash_string.t) (paths : string list)
               "package name is expected to be %s but got %s" s str);
         str
       | Some _ | None ->
-        Bsb_exception.errorf ~loc "package name missing in %s/bsconfig.json" dir
+        Bsb_exception.errorf ~loc "package name missing in %s/rescript.json" dir
     in
     if Ext_list.mem_string paths cur_package_name then (
       Bsb_log.error "@{<error>Cyclic dependencies in package stack@}@.";

compiler/bsb/bsb_build_util.mli

@@ -57,7 +57,7 @@ val include_dirs_by : 'a list -> ('a -> string) -> string
 val mkp : string -> unit
 
 (* The path of [bsc] and [bsdep] is normalized so that the invokation of [./compiler/bin/bsb.exe]
-   and [bsb.exe] (combined with a dirty bsconfig.json) will not trigger unnecessary rebuild.
+   and [bsb.exe] (combined with a dirty rescript.json) will not trigger unnecessary rebuild.
 
    The location of [bsc] and [bsdep] is configured by the combination of [Sys.executable_name]
    and [cwd].

compiler/bsb/bsb_exception.ml

@@ -49,14 +49,14 @@ let print (fmt : Format.formatter) (x : error) =
     let name = Bsb_pkg_types.to_string name in
     if Ext_string.equal name !Bs_version.package_name then
       Format.fprintf fmt
-        "File \"bsconfig.json\", line 1\n\
+        "File \"rescript.json\", line 1\n\
          @{<error>Error:@} package @{<error>%s@} is not found\n\
          It's the basic, required package. If you have it installed globally,\n\
          Please run `npm link rescript` to make it available"
         name
     else
       Format.fprintf fmt
-        "File \"bsconfig.json\", line 1\n\
+        "File \"rescript.json\", line 1\n\
          @{<error>Error:@} package @{<error>%s@} not found or built\n\
          - Did you install it?"
         name
@@ -68,7 +68,7 @@ let print (fmt : Format.formatter) (x : error) =
        https://rescript-lang.org/docs/manual/latest/build-configuration-schema"
       pos.pos_fname pos.pos_lnum s
   | Invalid_spec s ->
-    Format.fprintf fmt "@{<error>Error: Invalid bsconfig.json %s@}" s
+    Format.fprintf fmt "@{<error>Error: Invalid rescript.json: %s@}" s
 
 let conflict_module modname dir1 dir2 =
   Error (Conflict_module (modname, dir1, dir2))

compiler/bsb/bsb_ninja_rule.mli

@@ -56,12 +56,12 @@ type builtin = {
 (** rules are generally composed of built-in rules and customized rules, there are two design choices:
     1. respect custom rules with the same name, then we need adjust our built-in 
     rules dynamically in case the conflict.
-    2. respect our built-in rules, then we only need re-load custom rules for each bsconfig.json
+    2. respect our built-in rules, then we only need re-load custom rules for each rescript.json
 *)
 
 type command = string
 
-(* Since now we generate ninja files per bsconfig.json in a single process,
+(* Since now we generate ninja files per rescript.json in a single process,
     we must make sure it is re-entrant
 *)
 val make_custom_rules :