Merge branch 'master' into group-jsx-modules

Author: aspeddro

.github/workflows/ci.yml

@@ -45,6 +45,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+
       - name: Restore build cache
         id: build-cache
         uses: actions/cache@v4
@@ -123,11 +128,12 @@ jobs:
       DUNE_PROFILE: release
 
     steps:
-      - name: "Windows: Set git to use LF"
+      - name: "Windows: Set git config"
         if: runner.os == 'Windows'
         run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
+          git config --system core.autocrlf false
+          git config --system core.eol lf
+          git config --system core.longpaths true
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -152,7 +158,7 @@ jobs:
       # matrix.ocaml_compiler may contain commas
       - name: Get OPAM cache key
         shell: bash
-        run: echo "opam_cache_key=opam-env-v7-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
+        run: echo "opam_cache_key=opam-env-v7-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('*.opam') }}" | sed 's/,/-/g' >> $GITHUB_ENV
 
       - name: Restore OPAM environment
         id: cache-opam-env
@@ -249,7 +255,7 @@ jobs:
         id: compiler-build-state-key
         shell: bash
         run: |
-          echo "value=compiler-build-state-v1-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" \
+          echo "value=compiler-build-state-v1-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('*.opam') }}" \
             | sed 's/,/-/g' >> "$GITHUB_OUTPUT"
 
       - name: Restore compiler build state
@@ -368,51 +374,50 @@ jobs:
         if: matrix.benchmarks
         run: ./_build/install/default/bin/syntax_benchmarks | tee tests/benchmark-output.json
 
-      - name: Restore previous benchmark data
-        if: matrix.benchmarks
-        uses: actions/cache/restore@v4
-        with:
-          path: ./tests/benchmark-cache
-          key: syntax-benchmark-v1
-
-      - name: Create new benchmark data and comment on alert
-        # Do not run for PRs created from other repos as those won't be able to write to the pull request
-        if: ${{ matrix.benchmarks && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name) }}
-        uses: benchmark-action/github-action-benchmark@v1
-        with:
-          name: Syntax Benchmarks
-          tool: customSmallerIsBetter
-          output-file-path: tests/benchmark-output.json
-          external-data-json-path: ./tests/benchmark-cache/benchmark-data.json
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          alert-threshold: "105%"
-          comment-always: false
-          comment-on-alert: true
-
-      - name: Save benchmark data as new baseline
-        if: matrix.benchmarks && github.ref == 'refs/heads/master'
-        uses: actions/cache/save@v4
-        with:
-          path: ./tests/benchmark-cache
-          key: syntax-benchmark-v1
+      # Benchmarking is disabled for now because of inconsistent run times on different runners
+      #
+      # - name: Restore previous benchmark data
+      #   if: matrix.benchmarks
+      #   uses: actions/cache/restore@v4
+      #   with:
+      #     path: ./tests/benchmark-cache
+      #     key: syntax-benchmark-v1
+
+      # - name: Create new benchmark data and comment on alert
+      #   # Do not run for PRs created from other repos as those won't be able to write to the pull request
+      #   if: ${{ matrix.benchmarks && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name) }}
+      #   uses: benchmark-action/github-action-benchmark@v1
+      #   with:
+      #     name: Syntax Benchmarks
+      #     tool: customSmallerIsBetter
+      #     output-file-path: tests/benchmark-output.json
+      #     external-data-json-path: ./tests/benchmark-cache/benchmark-data.json
+      #     github-token: ${{ secrets.GITHUB_TOKEN }}
+      #     alert-threshold: "105%"
+      #     comment-always: false
+      #     comment-on-alert: true
+
+      # - name: Save benchmark data as new baseline
+      #   if: matrix.benchmarks && github.ref == 'refs/heads/master'
+      #   uses: actions/cache/save@v4
+      #   with:
+      #     path: ./tests/benchmark-cache
+      #     key: syntax-benchmark-v1
 
       - name: Build playground compiler
         if: matrix.build_playground
-        run: |
-          opam exec -- node packages/playground-bundling/scripts/generate_cmijs.js
-          opam exec -- dune build --profile browser
-          cp ./_build/default/compiler/jsoo/jsoo_playground_main.bc.js playground/compiler.js
+        run: opam exec -- make playground playground-cmijs
 
       - name: Test playground compiler
         if: matrix.build_playground
-        run: node playground/playground_test.js
+        run: yarn workspace playground test
 
       - name: Upload playground compiler to CDN
         if: ${{ matrix.build_playground && startsWith(github.ref, 'refs/tags/v') }}
         env:
           KEYCDN_USER: ${{ secrets.KEYCDN_USER }}
           KEYCDN_PASSWORD: ${{ secrets.KEYCDN_PASSWORD }}
-        run: bash playground/upload_bundle.sh
+        run: yarn workspace playground upload-bundle
 
       - name: "Upload artifacts: binaries"
         if: matrix.upload_binaries
@@ -505,23 +510,36 @@ jobs:
         with:
           node-version-file: .nvmrc
 
+      - 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: Download artifacts
         uses: actions/download-artifact@v4
         with:
           name: npm-packages
-          path: packages/test
+          path: ${{ steps.tmp-dir.outputs.path }}
 
       - name: Install ReScript package
         run: |
           npm i --ignore-scripts --no-audit \
             rescript-${{ needs.package.outputs.rescript_version }}.tgz
         shell: bash
-        working-directory: packages/test
+        working-directory: ${{ steps.tmp-dir.outputs.path }}
 
       - name: Test installation
-        run: npx rescript -h && npx rescript build && cat src/Test.bs.js
+        run: npx rescript -h && npx rescript build && cat src/Test.res.js
         shell: bash
-        working-directory: packages/test
+        working-directory: ${{ steps.tmp-dir.outputs.path }}
 
   publish:
     needs: [package, installationTest]
@@ -556,5 +574,5 @@ jobs:
       - name: Update Website Playground
         env:
           NEXT_REVALIDATE_SECRET_TOKEN: ${{ secrets.NEXT_REVALIDATE_SECRET_TOKEN }}
-        run: ./playground/website_update_playground.sh
+        run: yarn workspace playground revalidate
         shell: bash

.github/workflows/get_artifact_dir_name.js

@@ -1,10 +1,10 @@
-const fs = require("fs");
-const os = require("os");
+import * as fs from "node:fs";
+import * as os from "node:os";
 
-const { dirName: artifactDirName } = require("../../cli/bin_path.js");
+import { platformName } from "#cli/bins";
 
 // Pass artifactDirName to subsequent GitHub actions
 fs.appendFileSync(
   process.env.GITHUB_ENV,
-  `artifact_dir_name=${artifactDirName}${os.EOL}`,
+  `artifact_dir_name=${platformName}${os.EOL}`,
 );

.github/workflows/prepare_package_upload.js

@@ -1,7 +1,10 @@
-const fs = require("fs");
-const os = require("os");
+import * as fs from "node:fs";
+import * as os from "node:os";
+
+const packageSpec = JSON.parse(
+  fs.readFileSync(new URL("../../package.json", import.meta.url), "utf-8")
+);
 
-const packageSpec = require("rescript/package.json");
 const { version } = packageSpec;
 
 const commitHash = process.argv[2] || process.env.GITHUB_SHA;

.gitignore

@@ -72,7 +72,7 @@ playground/stdlib/
 playground/*.cmj
 playground/*.cmi
 playground/.netrc
-playground/compiler.js
+playground/compiler.*js
 
 rewatch/target/
 rewatch/rewatch
@@ -88,3 +88,5 @@ tests/analysis_tests/**/*.bs.js
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+
+*.tsbuildinfo

.yarnrc.yml

@@ -3,3 +3,5 @@ yarnPath: .yarn/releases/yarn-4.7.0.cjs
 nodeLinker: node-modules
 
 nmMode: hardlinks-global
+
+defaultSemverRangePrefix: ""

CHANGELOG.md

@@ -10,23 +10,72 @@
 > - :house: [Internal]
 > - :nail_care: [Polish]
 
-# 12.0.0-alpha.10 (Unreleased)
+# 12.0.0-alpha.13 (Unreleased)
+
+#### :rocket: New Feature
+
+- Add shift (`<<`, `>>`, `>>>`) operators for `int` and `bigint`. https://github.com/rescript-lang/rescript/pull/7183
+
+#### :bug: Bug fix
+
+- Fix broken `bstracing` CLI location. https://github.com/rescript-lang/rescript/pull/7398
+
+# 12.0.0-alpha.12
+
+#### :bug: Bug fix
+
+- Fix node.js `ExperimentalWarning`. https://github.com/rescript-lang/rescript/pull/7379
+- Fix issue with gentype and stdlib json. https://github.com/rescript-lang/rescript/pull/7378
+- Fix type of `RegExp.Result.matches`. https://github.com/rescript-lang/rescript/pull/7393
+- Add optional `flags` argument to `RegExp.fromString` and deprecate `RegExp.fromStringWithFlags`. https://github.com/rescript-lang/rescript/pull/7393
+
+#### :house: Internal
+
+- Better representation of JSX in AST. https://github.com/rescript-lang/rescript/pull/7286
+
+#### :nail_care: Polish
+
+- Improve error message for missing value when the identifier is also the name of a module in scope. https://github.com/rescript-lang/rescript/pull/7384
+- Upgrade Flow parser to 0.267.0. https://github.com/rescript-lang/rescript/pull/7390
+
+# 12.0.0-alpha.11
+
+#### :bug: Bug fix
+
+- Fix `Error.fromException`. https://github.com/rescript-lang/rescript/pull/7364
+- Fix signature of `throw`. https://github.com/rescript-lang/rescript/pull/7365
+- Fix formatter adds superfluous parens in pipe chain. https://github.com/rescript-lang/rescript/pull/7370
+
+#### :house: Internal
+
+- Remove `Stdlib_Char` module for now. https://github.com/rescript-lang/rescript/pull/7367
+- Convert internal JavaScript codebase into ESM, ReScript package itself is now ESM (`"type": "module"`). https://github.com/rescript-lang/rescript/pull/6899
+- Add built-in support for the JavaScript `in` operator. https://github.com/rescript-lang/rescript/pull/7342
+- AST cleanup: add `Pexp_await` ast node instead of `res.await` attribute. (The attribute is still used for await on modules currently). https://github.com/rescript-lang/rescript/pull/7368
+
+#### :nail_care: Polish
+
+- More deprecations in `Pervasives`; add `Stdlib.Pair` and `Stdlib.Int.Ref`. https://github.com/rescript-lang/rescript/pull/7371
+
+# 12.0.0-alpha.10
 
 #### :rocket: New Feature
 
 - Add `Dict.has` and double `Dict.forEachWithKey`/`Dict.mapValues` performance. https://github.com/rescript-lang/rescript/pull/7316
-- Add popover attributes to JsxDOM.domProps. https://github.com/rescript-lang/rescript/pull/7317
+- Add popover attributes to `JsxDOM.domProps`. https://github.com/rescript-lang/rescript/pull/7317
 - Add `Array.removeInPlace` helper based on `splice`. https://github.com/rescript-lang/rescript/pull/7321
 - Add `inert` attribute to `JsxDOM.domProps`. https://github.com/rescript-lang/rescript/pull/7326
 - Make reanalyze exception tracking work with the new stdlib. https://github.com/rescript-lang/rescript/pull/7328
-- Fix Pervasive.max using boolean comparison for floats. https://github.com/rescript-lang/rescript/pull/7333
+- Fix `Pervasive.max` using boolean comparison for floats. https://github.com/rescript-lang/rescript/pull/7333
 - Experimental: Support nested/inline record types - records defined inside of other records, without needing explicit separate type definitions. https://github.com/rescript-lang/rescript/pull/7241
 - Add unified exponentiation (`**`) operator for numeric types using ES7 `**`. https://github.com/rescript-lang/rescript-compiler/pull/7153
 - Rename `raise` to `throw` to align with JavaScript vocabulary. `raise` has been deprecated. https://github.com/rescript-lang/rescript/pull/7346
+- Add unified bitwise (`^`) operator. https://github.com/rescript-lang/rescript/pull/7216
+- Stdlib: rename binary operations to match JavaScript terms. https://github.com/rescript-lang/rescript/pull/7353
 
 #### :boom: Breaking Change
 
-- Replace ~date with ~day in Date.make\*. https://github.com/rescript-lang/rescript/pull/7324
+- Replace `~date` with `~day` in `Date.make`. https://github.com/rescript-lang/rescript/pull/7324
 - Remove `-bs-jsx-mode`. https://github.com/rescript-lang/rescript/pull/7327
 - Drop Node.js version <20 support, as it is reaching End-of-Life. https://github.com/rescript-lang/rescript-compiler/pull/7354
 - Treat `int` multiplication as a normal int32 operation instead of using `Math.imul`. https://github.com/rescript-lang/rescript/pull/7358
@@ -38,16 +87,16 @@
 
 #### :nail_care: Polish
 
-- Deprecate JSON.Classify.classify. https://github.com/rescript-lang/rescript/pull/7315
+- Deprecate `JSON.Classify.classify`. https://github.com/rescript-lang/rescript/pull/7315
 - Hide stdlib modules in output. https://github.com/rescript-lang/rescript/pull/7305
 - Deprecate unsafe host-specific bindings from stdlib. https://github.com/rescript-lang/rescript/pull/7334
-- Make unsafe function names consistent in Stdlib.String. https://github.com/rescript-lang/rescript/pull/7337
+- Make unsafe function names consistent in `Stdlib.String`. https://github.com/rescript-lang/rescript/pull/7337
 - `rescript` package does not trigger `postinstall` script anymore. https://github.com/rescript-lang/rescript/pull/7350
-- Add Stdlib Bool and Char modules and improve Pervasives deprecation messages. https://github.com/rescript-lang/rescript/pull/7361
+- Add Stdlib `Bool` and `Char` modules and improve Pervasives deprecation messages. https://github.com/rescript-lang/rescript/pull/7361
 
 #### :bug: Bug fix
 
-- Fix recursive untagged variant type checking by delaying well-formedness checks until environment construction completes. [#7320](https://github.com/rescript-lang/rescript/pull/7320)
+- Fix recursive untagged variant type checking by delaying well-formedness checks until environment construction completes. https://github.com/rescript-lang/rescript/pull/7320
 - Fix incorrect expansion of polymorphic return types in uncurried function applications. https://github.com/rescript-lang/rescript/pull/7338
 
 # 12.0.0-alpha.9

CONTRIBUTING.md

@@ -123,19 +123,19 @@ After adding a new file to the repository that should go into the npm package -
 
 ```sh
 make lib # Build compiler and standard library
-./cli/bsc myTestFile.res
+./cli/bsc.js myTestFile.res
 ```
 
 To view the untyped tree of the file run:
 
 ```sh
-./cli/bsc -dparsetree myTestFile.res
+./cli/bsc.js -dparsetree myTestFile.res
 ```
 
 To view the typed tree of the file run:
 
 ```sh
-./cli/bsc -dtypedtree myTestFile.res
+./cli/bsc.js -dtypedtree myTestFile.res
 ```
 
 ### Project
@@ -241,39 +241,39 @@ make playground
 make playground-cmijs
 ```
 
-Note that building the cmijs is based on the dependencies defined in `packages/playground-bundling/package.json`. In case you want to build some different version of e.g. `@rescript/react` or just want to add a new package, change the definition within the `package.json` file and run `make playground-cmijs` again.
+Note that building the cmijs is based on the dependencies defined in `packages/playground/package.json`. In case you want to build some different version of e.g. `@rescript/react` or just want to add a new package, change the definition within the `package.json` file and run `yarn workspace playground build` again.
 
 After a successful compilation, you will find following files in your project:
 
 - `playground/compiler.js` -> This is the ReScript compiler, which binds the ReScript API to the `window` object.
-- `playground/packages` -> Contains third party deps with cmij.js files (as defined in `packages/playground-bundling/bsconfig.json`)
-- `playground/compilerCmij.js` -> The compiler base cmij containing all the relevant core modules (`Js`, `Belt`, `Pervasives`, etc.)
+- `playground/packages/compiler-builtins` -> The compiler base cmij containing all the relevant core modules (`Js`, `Belt`, `Pervasives`, etc.)
+- `playground/packages/*` -> Contains third party deps with cmij.js files (as defined in `packages/playground/rescript.json`)
 
 You can now use the `compiler.js` file either directly by using a `<script src="/path/to/compiler.js"/>` and `<script src="/path/to/packages/compilerCmij.js"/>` inside a html file, use a browser bundler infrastructure to optimize it, or use `nodejs` to run it on a command line:
 
 ```
 $ node
-> require("./compiler.js");
-> require("./packages/compilerCmij.js")
-> let compiler = rescript_compiler.make()
-> let result = compiler.rescript.compile(`Js.log(Sys.ocaml_version)`);
+> let { rescript_compiler } = require("./compiler.js");
+> require("./packages/compiler-builtins/cmij.js")
+> let { rescript } = rescript_compiler.make()
+> let result = rescript.compile(`Console.log(${rescript.version})`);
 > eval(result.js_code);
-4.06.2+BS
 ```
 
 ### Testing the Playground bundle
 
-Run `node playground/playground_test.js` for a quick sanity check to see if all the build artifacts are working together correctly. When releasing the playground bundle, the test will always be executed before publishing to catch regressions.
+Run `yarn workspace playground test` for a quick sanity check to see if all the build artifacts are working together correctly. When releasing the playground bundle, the test will always be executed before publishing to catch regressions.
 
 ### Working on the Playground JS API
 
 Whenever you are modifying any files in the ReScript compiler, or in the `jsoo_playground_main.ml` file, you'll need to rebuild the source and recreate the JS bundle.
 
 ```
 make playground
+yarn workspace playground build
 
 # optionally run your test / arbitrary node script to verify your changes
-node playground/playground_test.js
+yarn workspace playground test
 ```
 
 ### Publishing the Playground Bundle on our KeyCDN