OCaml rewatch performance and immutable interfaces

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [master, 11.0_release]
+    branches: [master, 11.0_release, rewatch-ocaml-consolidated]
 
   pull_request:
     branches: [master, 11.0_release]
@@ -198,7 +198,7 @@ jobs:
 
       - name: Run analysis / tools tests
         if: runner.os != 'Windows' && runner.os != 'Linux'
-        run: opam exec -- make -C tests/analysis_tests test && make -C tests/tools_tests test
+        run: opam exec -- make test-analysis test-tools
 
       - name: Run gentype tests
         if: runner.os != 'Windows'
@@ -246,20 +246,41 @@ jobs:
         shell: bash
 
       - name: Run OCaml rewatch unit tests
+        id: rewatch-unit-tests
         timeout-minutes: 10
         run: |
           opam exec -- dune build tests/rewatch_ounit_tests/rewatch_ounit_tests_main.exe
           # Run the executable directly so a stuck test leaves live progress;
           # dune otherwise buffers the test output until the action exits.
-          opam exec -- ./_build/default/tests/rewatch_ounit_tests/rewatch_ounit_tests_main.exe -runner sequential
+          REWATCH_COMPILER_WORKER_EXECUTABLE="$PWD/_build/default/rewatch-ocaml/rescript_ocaml.exe" \
+            opam exec -- ./_build/default/tests/rewatch_ounit_tests/rewatch_ounit_tests_main.exe -runner sequential -verbose true
         shell: bash
 
+      - name: Upload OCaml rewatch unit test failure logs
+        if: failure() && steps.rewatch-unit-tests.outcome == 'failure'
+        uses: actions/upload-artifact@v7
+        with:
+          name: rewatch-unit-test-logs-${{ matrix.os }}-${{ matrix.ocaml_compiler }}
+          path: _build/oUnit-rewatch-*.log
+          if-no-files-found: warn
+
       - name: Run OCaml rewatch focused integration tests
         timeout-minutes: 30
         run: |
+          REWATCH_COMPILER_DOMAINS=1 sh rewatch-ocaml/tests/run.sh packages/@rescript/${{ matrix.node-target }}/bin/rescript.exe
+          REWATCH_COMPILER_DOMAINS=4 sh rewatch-ocaml/tests/run.sh packages/@rescript/${{ matrix.node-target }}/bin/rescript.exe
           sh rewatch-ocaml/tests/run.sh packages/@rescript/${{ matrix.node-target }}/bin/rescript.exe
         shell: bash
 
+      - name: Check frozen compiler and GenType parity
+        if: matrix.node-target == 'linux-arm64'
+        timeout-minutes: 15
+        run: |
+          opam exec -- dune build rewatch-ocaml/bench/cmt_compare.exe
+          python3 rewatch-ocaml/bench/frozen_gentype_parity.py "$RUNNER_TEMP/frozen-gentype-parity"
+          python3 rewatch-ocaml/bench/legacy_ppx_gate.py "$RUNNER_TEMP/legacy-ppx-gate" 5
+        shell: bash
+
       - name: Run OCaml rewatch canonical tests
         run: ./rewatch/tests/suite.sh packages/@rescript/${{ matrix.node-target }}/bin/rescript.exe
         shell: bash
@@ -372,7 +393,9 @@ jobs:
 
       - name: Generate API Docs
         if: ${{ matrix.generate_api_docs }}
-        run: yarn apidocs:generate
+        run: |
+          opam exec -- make annotated-tooling-deps
+          REWATCH_BIN_ANNOT=1 yarn apidocs:generate
 
       - name: "Upload artifacts: scripts/res/apiDocs"
         id: upload-api-docs

CHANGELOG.md

@@ -18,18 +18,25 @@
 
 #### :rocket: New Feature
 
+- Use the OCaml rewatch build system with parallel in-process compiler workers as the default `rescript` executable; keep the Rust implementation available as `rescript-rust`. https://github.com/rescript-lang/rescript/pull/8653
+
 #### :bug: Bug fix
 
 - Make rewatch compile independent modules after an unrelated failure and recompile blocked dependents when a changed interface survives a failed implementation, including across full watcher rebuilds. https://github.com/rescript-lang/rescript/pull/8667
+- Avoid a parser-artifact publication error when an OCaml rewatch compilation fails while its AST is being exported. https://github.com/rescript-lang/rescript/pull/8680
 
 #### :memo: Documentation
 
 #### :nail_care: Polish
 
+- Speed up OCaml rewatch builds with project-owned compiler caches, in-memory module results, and fewer compatibility copies. https://github.com/rescript-lang/rescript/pull/8680
+- Use frozen compiler imports in mixed GenType builds while preserving generated TypeScript and editor annotations. https://github.com/rescript-lang/rescript/pull/8680
 - Avoid running `rescript-schema-ppx` and `sury-ppx` on source files without an `@schema` annotation. https://github.com/rescript-lang/rescript/pull/8662
 
 #### :house: Internal
 
+- Share immutable compiled interfaces across OCaml rewatch compiler workers, with request-local type views. https://github.com/rescript-lang/rescript/pull/8680
+
 # 13.0.0-alpha.6
 
 #### :boom: Breaking Change

Makefile

@@ -162,8 +162,12 @@ bench: compiler
 test: lib
 	node scripts/test.js -all
 
-test-analysis: lib
-	make -C tests/analysis_tests clean test
+annotated-tooling-deps: lib
+	REWATCH_BIN_ANNOT=1 REWATCH_FROZEN_VALUES=0 $(RESCRIPT_EXE) build $(RUNTIME_DIR)
+	REWATCH_BIN_ANNOT=1 REWATCH_FROZEN_VALUES=0 $(RESCRIPT_EXE) build $(BELT_DIR)
+
+test-analysis: annotated-tooling-deps
+	REWATCH_BIN_ANNOT=1 REWATCH_FROZEN_VALUES=0 $(MAKE) -C tests/analysis_tests clean test
 
 test-reanalyze: lib
 	make -C tests/analysis_tests/tests-reanalyze/deadcode test
@@ -172,8 +176,8 @@ test-reanalyze: lib
 benchmark-reanalyze: lib
 	make -C tests/analysis_tests/tests-reanalyze/deadcode-benchmark benchmark COPIES=$(or $(COPIES),50)
 
-test-tools: lib
-	make -C tests/tools_tests clean test
+test-tools: annotated-tooling-deps
+	REWATCH_BIN_ANNOT=1 REWATCH_FROZEN_VALUES=0 $(MAKE) -C tests/tools_tests clean test
 
 test-syntax: compiler
 	./scripts/test_syntax.sh
@@ -374,4 +378,4 @@ dev-container:
 
 .DEFAULT_GOAL := build
 
-.PHONY: yarn-install build rewatch compiler lib artifacts bench test test-analysis test-reanalyze benchmark-reanalyze test-tools test-syntax test-syntax-roundtrip test-gentype test-rewatch test-all playground playground-compiler playground-test playground-cmijs playground-release format checkformat clean-rewatch clean-compiler clean-lib clean-gentype clean-tests clean dev-container
+.PHONY: yarn-install build rewatch compiler lib artifacts bench test annotated-tooling-deps test-analysis test-reanalyze benchmark-reanalyze test-tools test-syntax test-syntax-roundtrip test-gentype test-rewatch test-all playground playground-compiler playground-test playground-cmijs playground-release format checkformat clean-rewatch clean-compiler clean-lib clean-gentype clean-tests clean dev-container