Merge pull request #8232 from rescript-lang/version-12.2.0-rc.1

Version 12.2.0-rc.1

Author: cknitt

.github/workflows/ci.yml

@@ -2,14 +2,14 @@ name: CI
 
 on:
   push:
-    branches: [master, 11.0_release]
+    branches: [master, maintenance/*]
     # See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"
       - "v[0-9]+.[0-9]+.[0-9]+-*"
 
   pull_request:
-    branches: [master, 11.0_release]
+    branches: [master, maintenance/*]
 
 concurrency:
   group: ci-${{ github.ref }}-1

CHANGELOG.md

@@ -10,6 +10,32 @@
 > - :nail_care: [Polish]
 > - :house: [Internal]
 
+# 12.2.0-rc.1
+
+#### :boom: Breaking Change
+
+- `js-post-build` now passes the correct output file path based on `in-source` configuration: when `in-source: true`, the path next to the source file is passed; when `in-source: false`, the path in the `lib/<module>/` directory is passed. Additionally, stdout and stderr from the post-build command are now logged. https://github.com/rescript-lang/rescript/pull/8190
+- `js-post-build` command now runs in the directory containing the `rescript.json` where it is defined, instead of the unpredictable build invocation directory. This provides consistent behavior in monorepos. https://github.com/rescript-lang/rescript/pull/8195
+
+#### :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
+
+#### :bug: Bug fix
+
+- Reanalyze: fix reactive/server stale results when cross-file references change without changing dead declarations (non-transitive mode). https://github.com/rescript-lang/rescript/pull/8173
+- Reanalyze: link record/variant label liveness across type re-exports (`type y = x = {...}`). https://github.com/rescript-lang/rescript/pull/8217
+- Add duplicate package detection to rewatch. https://github.com/rescript-lang/rescript/pull/8180
+- Rewatch: do not warn about "reanalyze" config field. https://github.com/rescript-lang/rescript/pull/8181
+- Fix error when importing CommonJS runtime modules with `require()`. https://github.com/rescript-lang/rescript/pull/8194
+- Rewatch: fix warnings from non-recompiled modules being lost during incremental builds in watch mode. https://github.com/rescript-lang/rescript/pull/8216
+
+#### :nail_care: Polish
+
+- Formatter no longer writes files when contents are already correctly formatted. https://github.com/rescript-lang/rescript/pull/8209
+- Build system: Only log verbose "Generating AST for module" when actually parsing. https://github.com/rescript-lang/rescript/pull/8210
+- 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
+
 # 12.1.0
 
 #### :rocket: New Feature

analysis/reanalyze/README.md

@@ -60,6 +60,8 @@ rescript-tools reanalyze -config -reactive -timing -runs 3
 | `-churn n` | Remove/re-add n random files between runs (incremental correctness/perf testing) |
 | `-timing` | Report timing of analysis phases |
 | `-mermaid` | Output Mermaid diagram of reactive pipeline (to stderr) |
+| `-transitive` | Force transitive reporting (overrides rescript.json) |
+| `-no-transitive` | Disable transitive reporting (overrides rescript.json) |
 | `-debug` | Print debug information |
 | `-json` | Output in JSON format |
 | `-ci` | Internal flag for CI mode |
@@ -68,6 +70,18 @@ rescript-tools reanalyze -config -reactive -timing -runs 3
 
 See [ARCHITECTURE.md](ARCHITECTURE.md) for details on the analysis pipeline.
 
+### Regenerating the checked-in reactive pipeline diagram
+
+`analysis/reanalyze/diagrams/reactive-pipeline-full.mmd` is generated from the live reactive graph printer (`Reactive.to_mermaid()`), and **we check in the non-transitive (`-no-transitive`) variant** because that is where cross-file `hasRefBelow` suppression is relevant (and where reactive invalidation bugs are easiest to spot).
+
+To regenerate it:
+
+```bash
+# Run from any ReScript project (so -config works), then capture stderr:
+rescript-tools reanalyze -config -reactive -no-transitive -mermaid \
+  >/dev/null 2> analysis/reanalyze/diagrams/reactive-pipeline-full.mmd
+```
+
 The DCE analysis is structured as a pure pipeline:
 
 1. **MAP** - Process each `.cmt` file independently → per-file data

analysis/reanalyze/diagrams/reactive-pipeline-full.mmd

@@ -25,7 +25,6 @@ graph TD
     solver.live_decls[solver.live_decls]
     type_deps.impl_decls[type_deps.impl_decls]
     liveness.all_roots[liveness.all_roots]
-    solver.dead_modules[solver.dead_modules]
     liveness.external_type_refs[liveness.external_type_refs]
     decl_refs.combined[decl_refs.combined]
     type_refs_from[type_refs_from]
@@ -34,20 +33,20 @@ graph TD
     liveness.external_value_refs[liveness.external_value_refs]
     liveness.value_refs_from[liveness.value_refs_from]
     value_refs_from[value_refs_from]
-    solver.modules_with_dead[solver.modules_with_dead]
     solver.dead_decls[solver.dead_decls]
     exception_refs_collection[exception_refs_collection]
     type_deps.intf_decls[type_deps.intf_decls]
     file_data_collection[file_data_collection]
     solver.dead_module_issues[solver.dead_module_issues]
     decl_refs.with_type_refs[decl_refs.with_type_refs]
-    solver.modules_with_live[solver.modules_with_live]
     decl_refs.type_decl_refs[decl_refs.type_decl_refs]
     files[files]
     solver.modules_with_reported[solver.modules_with_reported]
     liveness.externally_referenced[liveness.externally_referenced]
     liveness.edges[liveness.edges]
+    solver.refs_token[solver.refs_token]
     liveness.live[liveness.live]
+    solver.dead_modules_empty[solver.dead_modules_empty]
     decls[decls]
     type_deps.intf_to_impl_refs_join{join}
     liveness.external_value_refs_join{join}
@@ -57,7 +56,6 @@ graph TD
     exc_refs.resolved_refs_join{join}
     type_deps.combined_refs_to_union{union}
     liveness.externally_referenced_union{union}
-    solver.dead_modules_join{join}
     liveness.all_roots_union{union}
     solver.dead_module_issues_join{join}
     solver.dead_decls_join{join}
@@ -68,6 +66,7 @@ graph TD
     decl_refs.with_value_refs_join{join}
     liveness.type_refs_from_union{union}
     type_deps.impl_needing_path2_join{join}
+    solver.issues_by_file_join{join}
     liveness.external_type_refs_join{join}
     liveness.live_fp{fixpoint}
     decl_refs.type_decl_refs_join{join}
@@ -103,24 +102,22 @@ graph TD
     type_deps.decl_by_path -->|flatMap| type_deps.same_path_refs
     type_deps.u2 --> type_deps.combined_refs_to_union
     solver.live_decls --> solver.incorrect_dead_decls_join
-    solver.live_decls -->|flatMap| solver.modules_with_live
     type_deps.impl_decls --> type_deps.impl_needing_path2_join
     type_deps.impl_decls --> type_deps.impl_to_intf_refs_join
     liveness.all_roots --> liveness.live_fp
-    solver.dead_modules --> solver.dead_module_issues_join
     liveness.external_type_refs --> liveness.externally_referenced_union
     decl_refs.combined -->|flatMap| liveness.edges
     type_refs_from --> liveness.type_refs_from_union
     liveness.type_refs_from --> liveness.external_type_refs_join
     liveness.type_refs_from --> decl_refs.type_decl_refs_join
-    solver.dead_decls_by_file -->|flatMap| solver.issues_by_file
+    solver.dead_decls_by_file --> solver.issues_by_file_join
     liveness.external_value_refs --> liveness.externally_referenced_union
     liveness.value_refs_from --> liveness.external_value_refs_join
     liveness.value_refs_from --> decl_refs.value_decl_refs_join
+    value_refs_from -->|flatMap| solver.refs_token
     value_refs_from --> liveness.value_refs_from_union
-    solver.modules_with_dead --> solver.dead_modules_join
     solver.dead_decls -->|flatMap| solver.dead_decls_by_file
-    solver.dead_decls -->|flatMap| solver.modules_with_dead
+    solver.dead_decls -->|flatMap| solver.dead_modules_empty
     exception_refs_collection --> exc_refs.resolved_refs_join
     type_deps.intf_decls --> type_deps.intf_to_impl_refs_join
     file_data_collection -->|flatMap| files
@@ -131,13 +128,14 @@ graph TD
     file_data_collection -->|flatMap| annotations
     file_data_collection -->|flatMap| decls
     decl_refs.with_type_refs --> decl_refs.combined_join
-    solver.modules_with_live --> solver.dead_modules_join
     decl_refs.type_decl_refs --> decl_refs.with_type_refs_join
     solver.modules_with_reported --> solver.dead_module_issues_join
     liveness.externally_referenced --> liveness.all_roots_union
     liveness.edges --> liveness.live_fp
+    solver.refs_token --> solver.issues_by_file_join
     liveness.live --> solver.live_decls_join
     liveness.live --> solver.dead_decls_join
+    solver.dead_modules_empty --> solver.dead_module_issues_join
     decls --> solver.live_decls_join
     decls --> solver.dead_decls_join
     decls --> liveness.annotated_roots_join
@@ -158,7 +156,6 @@ graph TD
     exc_refs.resolved_refs_join --> exc_refs.resolved_refs
     type_deps.combined_refs_to_union --> type_deps.combined_refs_to
     liveness.externally_referenced_union --> liveness.externally_referenced
-    solver.dead_modules_join --> solver.dead_modules
     liveness.all_roots_union --> liveness.all_roots
     solver.dead_module_issues_join --> solver.dead_module_issues
     solver.dead_decls_join --> solver.dead_decls
@@ -169,6 +166,7 @@ graph TD
     decl_refs.with_value_refs_join --> decl_refs.with_value_refs
     liveness.type_refs_from_union --> liveness.type_refs_from
     type_deps.impl_needing_path2_join --> type_deps.impl_needing_path2
+    solver.issues_by_file_join --> solver.issues_by_file
     liveness.external_type_refs_join --> liveness.external_type_refs
     liveness.live_fp --> liveness.live
     decl_refs.type_decl_refs_join --> decl_refs.type_decl_refs
@@ -180,7 +178,7 @@ graph TD
     classDef joinClass fill:#e6f3ff,stroke:#0066cc
     classDef unionClass fill:#fff0e6,stroke:#cc6600
     classDef fixpointClass fill:#e6ffe6,stroke:#006600
-    class decl_refs.with_type_refs_join,decl_refs.combined_join,decl_refs.type_decl_refs_join,liveness.external_type_refs_join,type_deps.impl_needing_path2_join,decl_refs.with_value_refs_join,solver.live_decls_join,type_deps.impl_to_intf_refs_join,decl_refs.value_decl_refs_join,liveness.annotated_roots_join,solver.dead_decls_join,solver.dead_module_issues_join,solver.dead_modules_join,exc_refs.resolved_refs_join,solver.incorrect_dead_decls_join,type_deps.impl_to_intf_refs_path2_join,liveness.external_value_refs_join,type_deps.intf_to_impl_refs_join joinClass
+    class decl_refs.with_type_refs_join,decl_refs.combined_join,decl_refs.type_decl_refs_join,liveness.external_type_refs_join,solver.issues_by_file_join,type_deps.impl_needing_path2_join,decl_refs.with_value_refs_join,solver.live_decls_join,type_deps.impl_to_intf_refs_join,decl_refs.value_decl_refs_join,liveness.annotated_roots_join,solver.dead_decls_join,solver.dead_module_issues_join,exc_refs.resolved_refs_join,solver.incorrect_dead_decls_join,type_deps.impl_to_intf_refs_path2_join,liveness.external_value_refs_join,type_deps.intf_to_impl_refs_join joinClass
     class type_deps.u1_union,type_deps.u2_union,liveness.type_refs_from_union,liveness.all_roots_union,liveness.externally_referenced_union,type_deps.combined_refs_to_union,liveness.value_refs_from_union unionClass
     class liveness.live_fp fixpointClass
 

analysis/reanalyze/src/CollectAnnotations.ml

@@ -5,7 +5,15 @@
 
 open DeadCommon
 
-let processAttributes ~state ~config ~doGenType ~name ~pos attributes =
+type scope_default = FileAnnotations.annotated_as option
+
+let processAttributes ~(scope_default : scope_default) ~state ~config ~doGenType
+    ~name ~pos attributes =
+  (match scope_default with
+  | Some FileAnnotations.Live -> FileAnnotations.annotate_live state pos
+  | Some FileAnnotations.Dead -> FileAnnotations.annotate_dead state pos
+  | Some FileAnnotations.GenType -> FileAnnotations.annotate_gentype state pos
+  | None -> ());
   let getPayloadFun f = attributes |> Annotation.getAttributePayload f in
   let getPayload (x : string) =
     attributes |> Annotation.getAttributePayload (( = ) x)
@@ -39,15 +47,29 @@ let processAttributes ~state ~config ~doGenType ~name ~pos attributes =
 let collectExportLocations ~state ~config ~doGenType =
   let super = Tast_mapper.default in
   let currentlyDisableWarnings = ref false in
+  let currentScopeDefault : scope_default ref = ref None in
+
+  let scopeDefaultFromToplevelAttribute (attribute : Parsetree.attribute) :
+      scope_default =
+    let attrs = [attribute] in
+    let getPayload (x : string) =
+      attrs |> Annotation.getAttributePayload (( = ) x)
+    in
+    if getPayload "dead" <> None then Some FileAnnotations.Dead
+    else if getPayload "live" <> None then Some FileAnnotations.Live
+    else if getPayload "genType" <> None then Some FileAnnotations.GenType
+    else None
+  in
+
   let value_binding self
       ({vb_attributes; vb_pat} as value_binding : Typedtree.value_binding) =
     (match vb_pat.pat_desc with
     | Tpat_var (id, {loc = {loc_start = pos}})
     | Tpat_alias ({pat_desc = Tpat_any}, id, {loc = {loc_start = pos}}) ->
       if !currentlyDisableWarnings then FileAnnotations.annotate_live state pos;
       vb_attributes
-      |> processAttributes ~state ~config ~doGenType ~name:(id |> Ident.name)
-           ~pos
+      |> processAttributes ~scope_default:!currentScopeDefault ~state ~config
+           ~doGenType ~name:(id |> Ident.name) ~pos
     | _ -> ());
     super.value_binding self value_binding
   in
@@ -58,8 +80,8 @@ let collectExportLocations ~state ~config ~doGenType =
       |> List.iter
            (fun ({ld_attributes; ld_loc} : Typedtree.label_declaration) ->
              toplevelAttrs @ ld_attributes
-             |> processAttributes ~state ~config ~doGenType:false ~name:""
-                  ~pos:ld_loc.loc_start)
+             |> processAttributes ~scope_default:!currentScopeDefault ~state
+                  ~config ~doGenType:false ~name:"" ~pos:ld_loc.loc_start)
     | Ttype_variant constructorDeclarations ->
       constructorDeclarations
       |> List.iter
@@ -74,14 +96,15 @@ let collectExportLocations ~state ~config ~doGenType =
                    (fun ({ld_attributes; ld_loc} : Typedtree.label_declaration)
                       ->
                      toplevelAttrs @ cd_attributes @ ld_attributes
-                     |> processAttributes ~state ~config ~doGenType:false
-                          ~name:"" ~pos:ld_loc.loc_start)
+                     |> processAttributes ~scope_default:!currentScopeDefault
+                          ~state ~config ~doGenType:false ~name:""
+                          ~pos:ld_loc.loc_start)
                    flds
                | Cstr_tuple _ -> ()
              in
              toplevelAttrs @ cd_attributes
-             |> processAttributes ~state ~config ~doGenType:false ~name:""
-                  ~pos:cd_loc.loc_start)
+             |> processAttributes ~scope_default:!currentScopeDefault ~state
+                  ~config ~doGenType:false ~name:"" ~pos:cd_loc.loc_start)
     | _ -> ());
     super.type_kind self typeKind
   in
@@ -96,36 +119,46 @@ let collectExportLocations ~state ~config ~doGenType =
         Typedtree.value_description) =
     if !currentlyDisableWarnings then FileAnnotations.annotate_live state pos;
     val_attributes
-    |> processAttributes ~state ~config ~doGenType ~name:(val_id |> Ident.name)
-         ~pos;
+    |> processAttributes ~scope_default:!currentScopeDefault ~state ~config
+         ~doGenType ~name:(val_id |> Ident.name) ~pos;
     super.value_description self value_description
   in
   let structure_item self (item : Typedtree.structure_item) =
     (match item.str_desc with
-    | Tstr_attribute attribute
-      when [attribute] |> Annotation.isOcamlSuppressDeadWarning ->
-      currentlyDisableWarnings := true
+    | Tstr_attribute attribute -> (
+      match scopeDefaultFromToplevelAttribute attribute with
+      | Some _ as newDefault -> currentScopeDefault := newDefault
+      | None ->
+        if [attribute] |> Annotation.isOcamlSuppressDeadWarning then
+          currentlyDisableWarnings := true)
     | _ -> ());
     super.structure_item self item
   in
   let structure self (structure : Typedtree.structure) =
     let oldDisableWarnings = !currentlyDisableWarnings in
+    let oldScopeDefault = !currentScopeDefault in
     super.structure self structure |> ignore;
     currentlyDisableWarnings := oldDisableWarnings;
+    currentScopeDefault := oldScopeDefault;
     structure
   in
   let signature_item self (item : Typedtree.signature_item) =
     (match item.sig_desc with
-    | Tsig_attribute attribute
-      when [attribute] |> Annotation.isOcamlSuppressDeadWarning ->
-      currentlyDisableWarnings := true
+    | Tsig_attribute attribute -> (
+      match scopeDefaultFromToplevelAttribute attribute with
+      | Some _ as newDefault -> currentScopeDefault := newDefault
+      | None ->
+        if [attribute] |> Annotation.isOcamlSuppressDeadWarning then
+          currentlyDisableWarnings := true)
     | _ -> ());
     super.signature_item self item
   in
   let signature self (signature : Typedtree.signature) =
     let oldDisableWarnings = !currentlyDisableWarnings in
+    let oldScopeDefault = !currentScopeDefault in
     super.signature self signature |> ignore;
     currentlyDisableWarnings := oldDisableWarnings;
+    currentScopeDefault := oldScopeDefault;
     signature
   in
   {

analysis/reanalyze/src/DeadCommon.ml

@@ -4,6 +4,8 @@ module FileContext = struct
   (** Get module name as Name.t tagged with interface/implementation info *)
   let module_name_tagged file =
     file.module_name |> Name.create ~isInterface:file.is_interface
+
+  let isInterface (file : t) = file.is_interface
 end
 
 (* Adapted from https://github.com/LexiFi/dead_code_analyzer *)
@@ -82,7 +84,7 @@ let addValueReference ~config ~refs ~file_deps ~(binding : Location.t)
 
 let addDeclaration_ ~config ~decls ~(file : FileContext.t) ?posEnd ?posStart
     ~declKind ~path ~(loc : Location.t) ?(posAdjustment = Decl.Nothing)
-    ~moduleLoc (name : Name.t) =
+    ?manifestTypePath ~moduleLoc (name : Name.t) =
   let pos = loc.loc_start in
   let posStart =
     match posStart with
@@ -110,6 +112,7 @@ let addDeclaration_ ~config ~decls ~(file : FileContext.t) ?posEnd ?posStart
         moduleLoc;
         posAdjustment;
         path = name :: path;
+        manifestTypePath;
         pos;
         posEnd;
         posStart;
@@ -182,6 +185,16 @@ let reportDeclaration ~config ~hasRefBelow ?checkModuleDead ?shouldReport
     | Some f -> f decl
     | None -> decl.report
   in
+  (* For type re-exports (type y = x = {...}), the re-exported record/variant
+     labels are restated but not independently actionable. Avoid duplicate/noisy
+     warnings by suppressing reporting for the re-exported copy. *)
+  let should_report =
+    should_report
+    &&
+    match (decl.declKind, decl.manifestTypePath) with
+    | (RecordLabel | VariantCase), Some _ -> false
+    | _ -> true
+  in
   if not should_report then []
   else
     let deadWarning, message =