Merge branch 'master' into rewatch-lsp

Author: nojaf

.github/workflows/branch_cleanup.yml

@@ -17,5 +17,5 @@ jobs:
           # ignore-branches: ""
           ignored-prefixes: "maintenance/"
           last-commit-age-days: 90
-          dry-run: true
+          dry-run: false
           rate-limit: true

.github/workflows/ci.yml

@@ -419,6 +419,8 @@ jobs:
   pkg-pr-new:
     needs:
       - build-compiler
+    outputs:
+      commit_sha: ${{ steps.publish.outputs.sha }}
     runs-on: ubuntu-24.04-arm
     steps:
       - name: Checkout
@@ -445,6 +447,7 @@ jobs:
           git diff --exit-code packages/artifacts.json
 
       - name: Publish packages to pkg.pr.new
+        id: publish
         run: |
           yarn dlx pkg-pr-new publish "." "./packages/@rescript/*"
 
@@ -546,9 +549,9 @@ jobs:
 
       - name: Install ReScript package
         run: |
-          COMMIT_SHA="${{ github.event.pull_request.head.sha || github.sha }}"
+          COMMIT_SHA="${{ needs.pkg-pr-new.outputs.commit_sha }}"
           npm i --no-audit \
-            "https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA::7}"
+            "https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA}"
         shell: bash
         working-directory: ${{ steps.tmp-dir.outputs.path }}
 
@@ -600,8 +603,8 @@ jobs:
 
       - 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}"
+          COMMIT_SHA="${{ needs.pkg-pr-new.outputs.commit_sha }}"
+          pnpm i "https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA}"
         shell: bash
         working-directory: ${{ steps.tmp-dir.outputs.path }}
 
@@ -638,8 +641,8 @@ jobs:
 
       - name: Install ReScript package in test fixture
         run: |
-          COMMIT_SHA="${{ github.event.pull_request.head.sha || github.sha }}"
-          yarn add "rescript@https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA::7}"
+          COMMIT_SHA="${{ needs.pkg-pr-new.outputs.commit_sha }}"
+          yarn add "rescript@https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA}"
         shell: bash
         working-directory: tests/rewatch_tests/fixture
 

CHANGELOG.md

@@ -10,7 +10,7 @@
 > - :nail_care: [Polish]
 > - :house: [Internal]
 
-# 13.0.0-alpha.2 (Unreleased)
+# 13.0.0-alpha.3 (Unreleased)
 
 #### :boom: Breaking Change
 
@@ -20,17 +20,28 @@
 
 #### :bug: Bug fix
 
+- Reanalyze server: invalidate cache and recompute results when config changes in `rescript.json`. https://github.com/rescript-lang/rescript/pull/8262
+
 #### :memo: Documentation
 
 #### :nail_care: Polish
 
+#### :house: Internal
+
+# 13.0.0-alpha.2
+
+#### :bug: Bug fix
+
+- Fix compiler crash (`Fatal error: Parmatch.all_record_args`) when matching empty dict/record patterns. https://github.com/rescript-lang/rescript/pull/8246
+- Fix `null` falling into the object branch instead of the wildcard when pattern matching on untagged variants with both `Object` and `null` cases. https://github.com/rescript-lang/rescript/pull/8253
+
+#### :nail_care: Polish
+
 - Build system: Watch only source folders from build state instead of the entire project directory, and report missing configured source folders. https://github.com/rescript-lang/rescript/pull/8219
-- Build system: Add OpenTelemetry tracing support for cli commands. https://github.com/rescript-lang/rescript/pull/8241
 
 #### :house: Internal
 
-- speed up dev container test by installing ocaml in docker image instead of in `postCreate.sh`. https://github.com/rescript-lang/rescript/pull/8230
-- Migrate rewatch integration tests from bash scripts to Vitest and remove old test infrastructure. https://github.com/rescript-lang/rescript/pull/8241
+- Speed up dev container test by installing OCaml in docker image instead of in `postCreate.sh`. https://github.com/rescript-lang/rescript/pull/8230
 
 # 13.0.0-alpha.1
 
@@ -53,6 +64,7 @@
 #### :rocket: New Feature
 
 - Reanalyze: add scoped `@@live`/`@@dead` annotations for marking module/file sections as live or dead. https://github.com/rescript-lang/rescript/pull/8197
+- Stdlib: Added Array.zip, Array.unzip, Array.zipBy, and Array.partition. https://github.com/rescript-lang/rescript/pull/8244
 
 #### :bug: Bug fix
 

LICENSE

@@ -1,24 +1,11 @@
-Copyright (C) 2015-2016 Bloomberg Finance L.P.
-Copyright (C) 2017- Hongbo Zhang, Authors of ReScript
+This repository contains code under multiple licenses.
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+- compiler/: LGPL-3.0-or-later
+- compiler/syntax/: MIT
+- packages/@rescript/runtime/: MIT
+- rewatch/: MIT
 
-In addition to the permissions granted to you by the LGPL, you may combine
-or link a "work that uses the Library" with a publicly distributed version
-of this file to produce a combined library or application, then distribute
-that combined work under the terms of your choosing, with no requirement
-to comply with the obligations normally placed on you by section 4 of the
-LGPL version 3 (or the corresponding section of a later version of the LGPL
-should you choose to use a later version).
+See full license texts:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- LGPL-3.0-or-later: COPYING.LESSER (and COPYING where applicable)
+- MIT: LICENSE.MIT

compiler/syntax/LICENSE LICENSE.MITcompiler/syntax/LICENSE renamed to LICENSE.MIT

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2020 - Authors of ReScript
+Copyright (c) 2015-2016 Bloomberg Finance L.P.
+Copyright (c) 2017- Hongbo Zhang, Authors of ReScript
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -11,7 +11,7 @@
 <p align="center">
   <a href="https://www.npmjs.org/package/rescript"><img src="https://img.shields.io/npm/v/rescript?color=brightgreen&label=npm%20package" alt="Current npm package version." /></a>
   <a href="https://github.com/rescript-lang/rescript/actions"><img src="https://github.com//rescript-lang/rescript/workflows/CI/badge.svg" alt="Current Github Actions workflow status." /></a>
-  <a href="https://github.com/rescript-lang/rescript/blob/HEAD/LICENSE"><img src="https://img.shields.io/badge/License-LGPL%20v3-blue.svg" alt="ReScript is released under the LGPL license." /></a>
+  <a href="https://github.com/rescript-lang/rescript/blob/HEAD/LICENSE"><img src="https://img.shields.io/badge/License-LGPL%20%2B%20MIT-blue.svg" alt="ReScript uses both LGPL and MIT licenses." /></a>
   <a href="https://x.com/intent/follow?screen_name=rescriptlang"><img src="https://img.shields.io/badge/X-000000?style=flat&logo=x&logoColor=white" alt="Follow @rescriptlang on X" /></a>
   <a href="https://bsky.app/profile/rescript-lang.org"><img src="https://img.shields.io/badge/Bluesky-0285FF?logo=bluesky&logoColor=fff&style=flat" alt="Follow @rescriptlang on Bluesky" /></a>
 </p>
@@ -92,9 +92,14 @@ For discussions on ongoing development, see the [Development](https://forum.resc
 
 ## 📄 License
 
-ReScript is licensed under LGPL version 3, with relaxed rules about creating and distributing combined work. See the [LICENSE](LICENSE) file for details.
+ReScript uses multiple licenses in this monorepo:
 
-The ReScript parser (subdirectory `compiler/syntax`) is licensed under the [MIT License](compiler/syntax/LICENSE).
+- `compiler/`: LGPL-3.0-or-later
+- `compiler/syntax/`: MIT
+- `packages/@rescript/runtime/`: MIT
+- `rewatch/`: MIT
+
+See the repository license index in [`LICENSE`](LICENSE) and full license texts in [`COPYING.LESSER`](COPYING.LESSER) and [`LICENSE.MIT`](LICENSE.MIT).
 
 ## 🏅 Acknowledgments
 

analysis/reanalyze/src/ReanalyzeServer.ml

@@ -96,6 +96,14 @@ module Server = struct
     let s = Gc.quick_stat () in
     mb_of_words s.live_words
 
+  type reactive_pipeline = {
+    dce_config: DceConfig.t;
+    reactive_collection: ReactiveAnalysis.t;
+    reactive_merge: ReactiveMerge.t;
+    reactive_liveness: ReactiveLiveness.t;
+    reactive_solver: ReactiveSolver.t;
+  }
+
   type server_state = {
     parse_argv: string array -> string option;
     run_analysis:
@@ -111,12 +119,9 @@ module Server = struct
       unit;
     config: server_config;
     cmtRoot: string option;
-    dce_config: DceConfig.t;
-    reactive_collection: ReactiveAnalysis.t;
-    reactive_merge: ReactiveMerge.t;
-    reactive_liveness: ReactiveLiveness.t;
-    reactive_solver: ReactiveSolver.t;
+    mutable pipeline: reactive_pipeline;
     stats: server_stats;
+    mutable config_snapshot: RunConfig.snapshot;
   }
 
   type request_info = {
@@ -261,6 +266,32 @@ Examples:
         unlink_if_exists stderr_path)
       run
 
+  let create_reactive_pipeline () : reactive_pipeline =
+    let dce_config = DceConfig.current () in
+    let reactive_collection = ReactiveAnalysis.create ~config:dce_config in
+    let file_data_collection =
+      ReactiveAnalysis.to_file_data_collection reactive_collection
+    in
+    let reactive_merge = ReactiveMerge.create file_data_collection in
+    let reactive_liveness = ReactiveLiveness.create ~merged:reactive_merge in
+    let value_refs_from =
+      if dce_config.DceConfig.run.transitive then None
+      else Some reactive_merge.ReactiveMerge.value_refs_from
+    in
+    let reactive_solver =
+      ReactiveSolver.create ~decls:reactive_merge.ReactiveMerge.decls
+        ~live:reactive_liveness.ReactiveLiveness.live
+        ~annotations:reactive_merge.ReactiveMerge.annotations ~value_refs_from
+        ~config:dce_config
+    in
+    {
+      dce_config;
+      reactive_collection;
+      reactive_merge;
+      reactive_liveness;
+      reactive_solver;
+    }
+
   let init_state ~(parse_argv : string array -> string option)
       ~(run_analysis :
          dce_config:DceConfig.t ->
@@ -291,39 +322,16 @@ Examples:
              server with editor-like args only."
             !Cli.churn
         else
-          let dce_config = DceConfig.current () in
-          let reactive_collection =
-            ReactiveAnalysis.create ~config:dce_config
-          in
-          let file_data_collection =
-            ReactiveAnalysis.to_file_data_collection reactive_collection
-          in
-          let reactive_merge = ReactiveMerge.create file_data_collection in
-          let reactive_liveness =
-            ReactiveLiveness.create ~merged:reactive_merge
-          in
-          let value_refs_from =
-            if dce_config.DceConfig.run.transitive then None
-            else Some reactive_merge.ReactiveMerge.value_refs_from
-          in
-          let reactive_solver =
-            ReactiveSolver.create ~decls:reactive_merge.ReactiveMerge.decls
-              ~live:reactive_liveness.ReactiveLiveness.live
-              ~annotations:reactive_merge.ReactiveMerge.annotations
-              ~value_refs_from ~config:dce_config
-          in
+          let pipeline = create_reactive_pipeline () in
           Ok
             {
               parse_argv;
               run_analysis;
               config;
               cmtRoot;
-              dce_config;
-              reactive_collection;
-              reactive_merge;
-              reactive_liveness;
-              reactive_solver;
+              pipeline;
               stats = {request_count = 0};
+              config_snapshot = RunConfig.snapshot ();
             })
 
   let run_one_request (state : server_state) (_req : request) :
@@ -347,6 +355,17 @@ Examples:
         (* Always run from the server's project root; client cwd is not stable in VS Code. *)
         state.config.cwd (fun () ->
           capture_stdout_stderr (fun () ->
+              (* Re-read config from rescript.json to detect changes.
+                 If changed, recreate the entire reactive pipeline from scratch. *)
+              RunConfig.reset ();
+              Paths.Config.processConfig ();
+              let new_snapshot = RunConfig.snapshot () in
+              if
+                not
+                  (RunConfig.equal_snapshot state.config_snapshot new_snapshot)
+              then (
+                state.pipeline <- create_reactive_pipeline ();
+                state.config_snapshot <- new_snapshot);
               Log_.Color.setup ();
               Timing.enabled := !Cli.timing;
               Reactive.set_debug !Cli.timing;
@@ -357,18 +376,18 @@ Examples:
               (* Match direct CLI output (a leading newline before the JSON array). *)
               Printf.printf "\n";
               EmitJson.start ();
-              state.run_analysis ~dce_config:state.dce_config
-                ~cmtRoot:state.cmtRoot
-                ~reactive_collection:(Some state.reactive_collection)
-                ~reactive_merge:(Some state.reactive_merge)
-                ~reactive_liveness:(Some state.reactive_liveness)
-                ~reactive_solver:(Some state.reactive_solver) ~skip_file:None
+              let p = state.pipeline in
+              state.run_analysis ~dce_config:p.dce_config ~cmtRoot:state.cmtRoot
+                ~reactive_collection:(Some p.reactive_collection)
+                ~reactive_merge:(Some p.reactive_merge)
+                ~reactive_liveness:(Some p.reactive_liveness)
+                ~reactive_solver:(Some p.reactive_solver) ~skip_file:None
                 ~file_stats ();
               issue_count := Log_.Stats.get_issue_count ();
-              let d, l = ReactiveSolver.stats ~t:state.reactive_solver in
+              let d, l = ReactiveSolver.stats ~t:p.reactive_solver in
               dead_count := d;
               live_count := l;
-              Log_.Stats.report ~config:state.dce_config;
+              Log_.Stats.report ~config:p.dce_config;
               Log_.Stats.clear ();
               EmitJson.finish ())
           |> response_of_result)

analysis/reanalyze/src/RunConfig.ml

@@ -21,6 +21,14 @@ let runConfig =
     unsuppress = [];
   }
 
+let reset () =
+  runConfig.dce <- false;
+  runConfig.exception_ <- false;
+  runConfig.suppress <- [];
+  runConfig.termination <- false;
+  runConfig.transitive <- false;
+  runConfig.unsuppress <- []
+
 let all () =
   runConfig.dce <- true;
   runConfig.exception_ <- true;
@@ -31,3 +39,24 @@ let exception_ () = runConfig.exception_ <- true
 let termination () = runConfig.termination <- true
 
 let transitive b = runConfig.transitive <- b
+
+type snapshot = {
+  dce: bool;
+  exception_: bool;
+  suppress: string list;
+  termination: bool;
+  transitive: bool;
+  unsuppress: string list;
+}
+
+let snapshot () =
+  {
+    dce = runConfig.dce;
+    exception_ = runConfig.exception_;
+    suppress = runConfig.suppress;
+    termination = runConfig.termination;
+    transitive = runConfig.transitive;
+    unsuppress = runConfig.unsuppress;
+  }
+
+let equal_snapshot (a : snapshot) (b : snapshot) = a = b

compiler/common/bs_version.ml

@@ -21,5 +21,5 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-let version = "13.0.0-alpha.2"
+let version = "13.0.0-alpha.3"
 let header = "// Generated by ReScript, PLEASE EDIT WITH CARE"