Merge branch 'master' into docstrings-before-type-expansions

Author: mediremi

.github/workflows/ci.yml

@@ -476,6 +476,9 @@ jobs:
         run: .github/workflows/moveArtifacts.sh
         shell: bash
 
+      - name: Check artifact list
+        run: node ./scripts/npmPack.js
+
       - name: Publish packages to pkg.pr.new
         run: |
           yarn dlx pkg-pr-new publish "." "./packages/@rescript/*"
@@ -522,7 +525,7 @@ jobs:
           git commit -m "Update API docs for ${{ github.ref_name }}"
           git push
 
-  test-integration:
+  test-installation-npm:
     needs:
       - pkg-pr-new
     strategy:
@@ -573,6 +576,86 @@ jobs:
         shell: bash
         working-directory: ${{ steps.tmp-dir.outputs.path }}
 
+  test-installation-pnpm:
+    needs:
+      - pkg-pr-new
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos-13
+          - os: macos-14
+          - os: ubuntu-24.04
+          - os: ubuntu-24.04-arm
+          - os: windows-latest
+    runs-on: ${{ matrix.os }}
+    env:
+      RUST_BACKTRACE: "1"
+    steps:
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          # Run integration tests with the oldest supported node version.
+          node-version: 20
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Make test directory
+        id: tmp-dir
+        shell: bash
+        run: |
+          if [[ "$RUNNER_OS" == "Windows" ]]; then
+            dir=$(powershell -Command "[System.IO.Path]::GetTempPath() + [System.Guid]::NewGuid().ToString()" | tr -d '\r')
+            mkdir -p "$dir"
+          else
+            dir=$(mktemp -d)
+          fi
+          echo "path=$dir" >> "$GITHUB_OUTPUT"
+          cp -r tests/package_tests/installation_test/* "$dir"
+
+      - name: Install ReScript package
+        run: |
+          COMMIT_SHA="${{ github.event.pull_request.head.sha || github.sha }}"
+          pnpm i "https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA::7}"
+        shell: bash
+        working-directory: ${{ steps.tmp-dir.outputs.path }}
+
+      - name: Test installation
+        run: pnpm rescript -h && pnpm rescript legacy build && cat src/Test.res.js
+        shell: bash
+        working-directory: ${{ steps.tmp-dir.outputs.path }}
+
+  test-integration-rewatch:
+    needs:
+      - pkg-pr-new
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos-13
+          - os: macos-14
+          - os: ubuntu-24.04
+          - os: ubuntu-24.04-arm
+          - os: windows-latest
+    runs-on: ${{ matrix.os }}
+    env:
+      RUST_BACKTRACE: "1"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          # Run integration tests with the oldest supported node version.
+          node-version: 20
+
       - name: Install ReScript package in rewatch/testrepo
         run: |
           COMMIT_SHA="${{ github.event.pull_request.head.sha || github.sha }}"
@@ -586,7 +669,9 @@ jobs:
 
   publish:
     needs:
-      - test-integration
+      - test-installation-npm
+      - test-installation-pnpm
+      - test-integration-rewatch
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-24.04-arm
     steps:

CHANGELOG.md

@@ -7,23 +7,73 @@
 > - :rocket: [New Feature]
 > - :bug: [Bug Fix]
 > - :memo: [Documentation]
-> - :house: [Internal]
 > - :nail_care: [Polish]
+> - :house: [Internal]
 
-# 12.0.0-alpha.15 (Unreleased)
+# 12.0.0-beta.2 (Unreleased)
+
+#### :nail_care: Polish
+
+- Add missing backtick and spaces to `Belt.Map.map` doc comment. https://github.com/rescript-lang/rescript/pull/7632
+
+#### :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
+
+#### :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
+
+# 12.0.0-beta.1
+
+#### :rocket: New Feature
+
+- Add experimental command to `rescript-tools` for formatting all ReScript code blocks in markdown. Either in a markdown file directly, or inside of docstrings in ReScript code. https://github.com/rescript-lang/rescript/pull/7598
+- Add `String.getSymbolUnsafe` back to Stdlib. https://github.com/rescript-lang/rescript/pull/7626
+
+#### :nail_care: Polish
+
+- Add a warning if the name in package.json does not match the name in rescript.json. https://github.com/rescript-lang/rescript/pull/7604
+
+#### :house: Internal
+
+- Remove uncurried handling from rewatch. https://github.com/rescript-lang/rescript/pull/7625
+
+# 12.0.0-alpha.15
 
 #### :boom: Breaking Change
 
 - New `rewatch` based build system. https://github.com/rescript-lang/rescript/pull/7551 https://github.com/rescript-lang/rescript/pull/7593
   - The new `rewatch` based build system is now the default and is exposed through the `rescript` command. The `rewatch` command has been removed.
   - The previous Ninja-based build system is now available via the `rescript legacy` subcommand.
   - Argument `--compiler-args` is now a subcommand `compiler-args`.
-- 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
+- Remove `String.getSymbol`, `String.getSymbolUnsafe`, `String.setSymbol` from standard library. https://github.com/rescript-lang/rescript/pull/7571
 
-#### :rocket: New Feature
+#### :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
+- Fix issue with preserve mode where `jsx` is declared as an external without a `@module` attribute. https://github.com/rescript-lang/rescript/pull/7591
+- Rewatch: don't add deps to modules that are in packages that are not a dependency. https://github.com/rescript-lang/rescript/pull/7612
+- Rewatch: fix non-unicode stderr. https://github.com/rescript-lang/rescript/pull/7613
+- Fix rewatch considering warning configs of non-local dependencies. https://github.com/rescript-lang/rescript/pull/7614
+- Rewatch: fix panic if package.json name different from module name. https://github.com/rescript-lang/rescript/pull/7616
+- Fix finding the standard library for pnpm. https://github.com/rescript-lang/rescript/pull/7615
+
+#### :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
+- Better error messages for when polymorphic variants does not match for various reasons. https://github.com/rescript-lang/rescript/pull/7596
+- Improved completions for inline records. https://github.com/rescript-lang/rescript/pull/7601
 - 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`
@@ -39,25 +89,10 @@
   - `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
-- Fix issue with preserve mode where `jsx` is declared as an external without a `@module` attribute. https://github.com/rescript-lang/rescript/pull/7591
-
-#### :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
-- Better error messages for when polymorphic variants does not match for various reasons. https://github.com/rescript-lang/rescript/pull/7596
-- Improved completions for inline records. https://github.com/rescript-lang/rescript/pull/7601
-
 #### :house: Internal
 
 - Remove `@return(undefined_to_opt)` and `%undefined_to_opt` primitive. https://github.com/rescript-lang/rescript/pull/7462
+- Migrate rewatch to Rust 2024 edition. https://github.com/rescript-lang/rescript/pull/7602
 
 # 12.0.0-alpha.14
 

CREDITS.md

@@ -6,6 +6,7 @@ The major contributions from contributors include
 
 - `super_errors` from [Cheng](https://github.com/chenglou) and [Cristiano](https://github.com/cristianoc)
 - `react_jsx_ppx` from [Ricky](https://github.com/rickyvetter)
+- `rewatch` (the new ReScript build system) from [Roland](https://github.com/rolandpeelen) and [Jaap](https://github.com/jfrolich)
 
 Cristiano also contributed to several important patches in the upstream native compiler,
 in particular, the pattern match compilation.

analysis/examples/example-project/bsconfig.json

@@ -6,7 +6,6 @@
     "number": "-32-26-27-33"
   },
   "bs-dependencies": ["reason-react"],
-  "reason": { "react-jsx": 3 },
   "namespace": "my-namespace",
   "reanalyze": {
     "analysis": ["dce", "exception"]

analysis/examples/larger-project/bsconfig.json

@@ -6,7 +6,6 @@
   },
   "name": "sample-typescript-app",
   "bsc-flags": ["-bs-super-errors -w a"],
-  "reason": { "react-jsx": 3 },
   "bs-dependencies": ["@rescript/react", "@glennsl/bs-json"],
   "sources": [
     {

analysis/src/Commands.ml

@@ -282,17 +282,13 @@ let format ~path =
         ~filename:path
     in
     if List.length diagnostics > 0 then ""
-    else
-      Res_printer.print_implementation
-        ~width:Res_multi_printer.default_print_width ~comments structure
+    else Res_printer.print_implementation ~comments structure
   else if Filename.check_suffix path ".resi" then
     let {Res_driver.parsetree = signature; comments; diagnostics} =
       Res_driver.parsing_engine.parse_interface ~for_printer:true ~filename:path
     in
     if List.length diagnostics > 0 then ""
-    else
-      Res_printer.print_interface ~width:Res_multi_printer.default_print_width
-        ~comments signature
+    else Res_printer.print_interface ~comments signature
   else ""
 
 let diagnosticSyntax ~path =

analysis/src/CreateInterface.ml

@@ -102,7 +102,7 @@ let printSignature ~extractor ~signature =
   Printtyp.reset_names ();
   let sigItemToString (item : Outcometree.out_sig_item) =
     item |> Res_outcome_printer.print_out_sig_item_doc
-    |> Res_doc.to_string ~width:Res_multi_printer.default_print_width
+    |> Res_doc.to_string ~width:Res_printer.default_print_width
   in
 
   let genSigStrForInlineAttr lines attributes id vd =

analysis/src/Protocol.ml

@@ -137,6 +137,11 @@ let optWrapInQuotes s =
   | None -> None
   | Some s -> Some (wrapInQuotes s)
 
+let stringifyResult = function
+  | Ok r -> stringifyObject [("TAG", Some (wrapInQuotes "Ok")); ("_0", Some r)]
+  | Error e ->
+    stringifyObject [("TAG", Some (wrapInQuotes "Error")); ("_0", Some e)]
+
 let stringifyCompletionItem c =
   stringifyObject
     [

analysis/src/Shared.ml

@@ -5,18 +5,14 @@ let tryReadCmt cmt =
   else
     match Cmt_format.read_cmt cmt with
     | exception Cmi_format.Error err ->
-      Log.log
-        ("Failed to load " ^ cmt ^ " as a cmt w/ ocaml version " ^ "406"
-       ^ ", error: "
-        ^
-        (Cmi_format.report_error Format.str_formatter err;
-         Format.flush_str_formatter ()));
+      let error_message =
+        Cmi_format.report_error Format.str_formatter err;
+        Format.flush_str_formatter ()
+      in
+      Log.log ("Invalid cmt format " ^ cmt ^ ": " ^ error_message);
       None
     | exception err ->
-      Log.log
-        ("Invalid cmt format " ^ cmt
-       ^ " - probably wrong ocaml version, expected " ^ Config.version ^ " : "
-       ^ Printexc.to_string err);
+      Log.log ("Invalid cmt format " ^ cmt ^ ": " ^ Printexc.to_string err);
       None
     | x -> Some x
 

analysis/src/Xform.ml

@@ -855,7 +855,6 @@ let parseImplementation ~filename =
     let structure = [Ast_helper.Str.eval ~loc:expr.pexp_loc expr] in
     structure
     |> Res_printer.print_implementation
-         ~width:Res_multi_printer.default_print_width
          ~comments:(comments |> filterComments ~loc:expr.pexp_loc)
     |> Utils.indent range.start.character
   in
@@ -864,14 +863,12 @@ let parseImplementation ~filename =
     let structure = [item] in
     structure
     |> Res_printer.print_implementation
-         ~width:Res_multi_printer.default_print_width
          ~comments:(comments |> filterComments ~loc:item.pstr_loc)
     |> Utils.indent range.start.character
   in
   let printStandaloneStructure ~(loc : Location.t) structure =
     structure
     |> Res_printer.print_implementation
-         ~width:Res_multi_printer.default_print_width
          ~comments:(comments |> filterComments ~loc)
   in
   (structure, printExpr, printStructureItem, printStandaloneStructure)
@@ -891,7 +888,7 @@ let parseInterface ~filename =
       (item : Parsetree.signature_item) =
     let signature_item = [item] in
     signature_item
-    |> Res_printer.print_interface ~width:Res_multi_printer.default_print_width
+    |> Res_printer.print_interface
          ~comments:(comments |> filterComments ~loc:item.psig_loc)
     |> Utils.indent range.start.character
   in