Merge branch 'master' into docstring-string

Author: nojaf

.gitattributes

@@ -1,3 +1,5 @@
+* text=auto eol=lf
+
 *.ml linguist-language=OCaml
 *.mli linguist-language=OCaml
 *.res linguist-language=ReScript

.github/workflows/ci.yml

@@ -511,7 +511,6 @@ jobs:
         if: steps.diffcheck.outputs.clean == 'false'
         run: |
           npm ci 
-          npx rescript
           npm run build
 
       - name: Commit and push

CHANGELOG.md

@@ -14,20 +14,40 @@
 
 #### :boom: Breaking Change
 
-- Remove `String.getSymbol` from standard library.
-- Remove `String.getSymbolUnsafe` from standard library.
-- Remove `String.setSymbol` from standard library.
+- The legacy rescript cli can be called through rewatch via `rewatch legacy`. Arguments to rewatch need to be passed after the subcommand. Argument `--compiler-args` is now a subcommand `compiler-args`. https://github.com/rescript-lang/rescript/pull/7551
+- Remove `String.getSymbol` from standard library. https://github.com/rescript-lang/rescript/pull/7571
+- Remove `String.getSymbolUnsafe` from standard library. https://github.com/rescript-lang/rescript/pull/7571
+- Remove `String.setSymbol` from standard library. https://github.com/rescript-lang/rescript/pull/7571
+
+#### :rocket: New Feature
+
+- Add `OrThrow` aliases for `Belt` functions ending with `Exn`. https://github.com/rescript-lang/rescript/pull/7581, https://github.com/rescript-lang/rescript/pull/7590 The following aliases have been added:
+  - `Belt.Array.getOrThrow`
+  - `Belt.Array.setOrThrow`
+  - `Belt.Map.getOrThrow`
+  - `Belt.MutableMap.getOrThrow`
+  - `Belt.Set.getOrThrow`
+  - `Belt.MutableSet.getOrThrow`
+  - `Belt.List.getOrThrow`
+  - `Belt.List.tailOrThrow`
+  - `Belt.List.headOrThrow`
+  - `Belt.MutableQueue.peekOrThrow`
+  - `Belt.MutableQueue.popOrThrow`
+  - `Belt.Option.getOrThrow`
+  - `Belt.Result.getOrThrow`
 
 #### :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
+- Fix crash when `bs-g` is used with untagged variants. https://github.com/rescript-lang/rescript/pull/7575
 
 #### :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
+- Better error messages for object field missing and object field type mismatches. https://github.com/rescript-lang/rescript/pull/7580
 
 #### :house: Internal
 

analysis/reanalyze/src/ExnLib.ml

@@ -1,17 +1,38 @@
 let raisesLibTable : (Name.t, Exceptions.t) Hashtbl.t =
   let table = Hashtbl.create 15 in
   let open Exn in
-  let beltArray = [("getExn", [assertFailure]); ("setExn", [assertFailure])] in
+  let beltArray =
+    [
+      ("getExn", [assertFailure]);
+      ("getOrThrow", [assertFailure]);
+      ("setExn", [assertFailure]);
+      ("setOrThrow", [assertFailure]);
+    ]
+  in
   let beltList =
-    [("getExn", [notFound]); ("headExn", [notFound]); ("tailExn", [notFound])]
+    [
+      ("getExn", [notFound]);
+      ("getOrThrow", [notFound]);
+      ("headExn", [notFound]);
+      ("headOrThrow", [notFound]);
+      ("tailExn", [notFound]);
+      ("tailOrThrow", [notFound]);
+    ]
   in
-  let beltMap = [("getExn", [notFound])] in
+  let beltMap = [("getExn", [notFound]); ("getOrThrow", [notFound])] in
   let beltMutableMap = beltMap in
-  let beltMutableQueue = [("peekExn", [notFound]); ("popExn", [notFound])] in
-  let beltMutableSet = [("getExn", [notFound])] in
-  let beltOption = [("getExn", [notFound])] in
-  let beltResult = [("getExn", [notFound])] in
-  let beltSet = [("getExn", [notFound])] in
+  let beltMutableQueue =
+    [
+      ("peekExn", [notFound]);
+      ("peekOrThrow", [notFound]);
+      ("popExn", [notFound]);
+      ("popOrThrow", [notFound]);
+    ]
+  in
+  let beltSet = [("getExn", [notFound]); ("getOrThrow", [notFound])] in
+  let beltMutableSet = beltSet in
+  let beltOption = [("getExn", [notFound]); ("getOrThrow", [notFound])] in
+  let beltResult = [("getExn", [notFound]); ("getOrThrow", [notFound])] in
   let bsJson =
     (* bs-json *)
     [

biome.json

@@ -62,6 +62,7 @@
       "tests/tests/**/src/**",
       "tests/tools_tests/**/src/**",
       "analysis/examples/**/src/**",
+      "rewatch/**",
       "lib/es6/**",
       "lib/js/**",
       "ninja/**",

cli/rewatch.js

@@ -7,10 +7,37 @@ import { rewatch_exe, bsc_exe } from "./common/bins.js";
 
 const args = process.argv.slice(2);
 
+const firstPositionalArgIndex = args.findIndex((arg) => !arg.startsWith("-"));
+
 try {
-  child_process.execFileSync(rewatch_exe, [...args, "--bsc-path", bsc_exe], {
-    stdio: "inherit",
-  });
+  if (firstPositionalArgIndex !== -1) {
+    const subcommand = args[firstPositionalArgIndex];
+    const subcommandWithArgs = args.slice(firstPositionalArgIndex);
+
+    if (
+      subcommand === "build" ||
+      subcommand === "watch" ||
+      subcommand === "clean" ||
+      subcommand === "compiler-args"
+    ) {
+      child_process.execFileSync(
+        rewatch_exe,
+        [...subcommandWithArgs, "--bsc-path", bsc_exe],
+        {
+          stdio: "inherit",
+        }
+      );
+    } else {
+      child_process.execFileSync(rewatch_exe, [...args], {
+        stdio: "inherit",
+      });
+    }
+  } else {
+    // no subcommand means build subcommand
+    child_process.execFileSync(rewatch_exe, [...args, "--bsc-path", bsc_exe], {
+      stdio: "inherit",
+    });
+  }
 } catch (err) {
   if (err.status !== undefined) {
     process.exit(err.status); // Pass through the exit code

compiler/core/js_dump.ml

@@ -949,7 +949,8 @@ and expression_desc cxt ~(level : int) f x : cxt =
               | false, 1 -> Js_op.Lit Literals.tl
               | _ -> Js_op.Lit ("_" ^ string_of_int i)),
               e ))
-          (if !Js_config.debug && not_is_cons then [(name_symbol, E.str p.name)]
+          (if !Js_config.debug && (not untagged) && not_is_cons then
+             [(name_symbol, E.str p.name)]
            else [])
       in
       if untagged || (not_is_cons = false && p.num_nonconst = 1) then tails

compiler/ml/printtyp.ml

@@ -1352,13 +1352,29 @@ let explanation unif t3 t4 ppf =
     fprintf ppf "@,Self type cannot be unified with a closed object type"
   | _, Tfield (lab, _, _, _) when lab = dummy_method ->
     fprintf ppf "@,Self type cannot be unified with a closed object type"
-  | Tfield (l, _, _, {desc = Tnil}), Tfield (l', _, _, {desc = Tnil})
+  | Tfield (l, _, f1, {desc = Tnil}), Tfield (l', _, f2, {desc = Tnil})
     when l = l' ->
-    fprintf ppf "@,Types for method %s are incompatible" l
-  | (Tnil | Tconstr _), Tfield (l, _, _, _) ->
-    fprintf ppf "@,@[The first object type has no field %s@]" l
-  | Tfield (l, _, _, _), (Tnil | Tconstr _) ->
-    fprintf ppf "@,@[The second object type has no field %s@]" l
+    fprintf ppf
+      "@,\
+       @,\
+       Types for field @{<info>\"%s\"@} are incompatible:@,\
+       Field @{<info>\"%s\"@} in the passed object has type @{<error>%a@}, but \
+       is expected to have type @{<info>%a@}."
+      l l type_expr f1 type_expr f2
+  | (Tnil | Tconstr _), Tfield (l, _, f1, _) ->
+    fprintf ppf
+      "@,\
+       @,\
+       @[The first object is expected to have a field @{<info>\"%s\"@} of type \
+       @{<info>%a@}, but it does not.@]"
+      l type_expr f1
+  | Tfield (l, _, f1, _), (Tnil | Tconstr _) ->
+    fprintf ppf
+      "@,\
+       @,\
+       @[The second object is expected to have a field @{<info>\"%s\"@} of \
+       type @{<info>%a@}, but it does not.@]"
+      l type_expr f1
   | Tnil, Tconstr _ | Tconstr _, Tnil ->
     fprintf ppf
       "@,@[The %s object type has an abstract row, it cannot be closed@]"

lib/es6/Belt_Array.js

@@ -10,7 +10,7 @@ function get(arr, i) {
 
 }
 
-function getExn(arr, i) {
+function getOrThrow(arr, i) {
   if (!(i >= 0 && i < arr.length)) {
     throw {
       RE_EXN_ID: "Assert_failure",
@@ -34,13 +34,13 @@ function set(arr, i, v) {
   }
 }
 
-function setExn(arr, i, v) {
+function setOrThrow(arr, i, v) {
   if (!(i >= 0 && i < arr.length)) {
     throw {
       RE_EXN_ID: "Assert_failure",
       _1: [
         "Belt_Array.res",
-        49,
+        51,
         2
       ],
       Error: new Error()
@@ -582,6 +582,10 @@ function init(n, f) {
   return v;
 }
 
+let getExn = getOrThrow;
+
+let setExn = setOrThrow;
+
 let makeByU = makeBy;
 
 let makeByAndShuffleU = makeByAndShuffle;
@@ -637,8 +641,10 @@ let initU = init;
 export {
   get,
   getExn,
+  getOrThrow,
   set,
   setExn,
+  setOrThrow,
   shuffleInPlace,
   shuffle,
   reverseInPlace,

lib/es6/Belt_List.js

@@ -11,7 +11,7 @@ function head(x) {
 
 }
 
-function headExn(x) {
+function headOrThrow(x) {
   if (x !== 0) {
     return x.hd;
   }
@@ -28,7 +28,7 @@ function tail(x) {
 
 }
 
-function tailExn(x) {
+function tailOrThrow(x) {
   if (x !== 0) {
     return x.tl;
   }
@@ -67,7 +67,7 @@ function get(x, n) {
   }
 }
 
-function getExn(x, n) {
+function getOrThrow(x, n) {
   if (n < 0) {
     throw {
       RE_EXN_ID: "Not_found",
@@ -1286,6 +1286,12 @@ function zip(l1, l2) {
 
 let size = length;
 
+let headExn = headOrThrow;
+
+let tailExn = tailOrThrow;
+
+let getExn = getOrThrow;
+
 let makeByU = makeBy;
 
 let mapU = map;
@@ -1357,11 +1363,14 @@ export {
   size,
   head,
   headExn,
+  headOrThrow,
   tail,
   tailExn,
+  tailOrThrow,
   add,
   get,
   getExn,
+  getOrThrow,
   make,
   makeByU,
   makeBy,