Fix format.sh to properly exit on errors and use opam exec

- Add 'set -e' to exit immediately on errors
- Use 'opam exec --' to match checkformat.sh behavior
- Now make format will fail visibly instead of silently continuing when formatting fails

Author: cristianoc

analysis.opam

@@ -7,7 +7,7 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/rescript-lang/rescript-compiler"
 bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
 depends: [
-  "ocaml" {>= "4.14"}
+  "ocaml" {>= "5.0.1"}
   "cppo" {= "1.8.0"}
   "dune" {>= "3.17"}
   "odoc" {with-doc}

analysis/reanalyze/src/Reanalyze.ml

@@ -245,7 +245,7 @@ let runAnalysis ~dce_config ~cmtRoot =
   in
   (* Analysis phase: merge data and solve *)
   let analysis_result =
-    if dce_config.DceConfig.run.dce then (
+    if dce_config.DceConfig.run.dce then
       (* Merging phase: combine all builders -> immutable data *)
       let annotations, decls, cross_file, refs, file_deps =
         Timing.time_phase `Merging (fun () ->
@@ -256,7 +256,8 @@ let runAnalysis ~dce_config ~cmtRoot =
             in
             let decls =
               Declarations.merge_all
-                (dce_data_list |> List.map (fun fd -> fd.DceFileProcessing.decls))
+                (dce_data_list
+                |> List.map (fun fd -> fd.DceFileProcessing.decls))
             in
             let cross_file =
               CrossFileItems.merge_all
@@ -271,11 +272,14 @@ let runAnalysis ~dce_config ~cmtRoot =
                    References.merge_into_builder ~from:fd.DceFileProcessing.refs
                      ~into:refs_builder;
                    FileDeps.merge_into_builder
-                     ~from:fd.DceFileProcessing.file_deps ~into:file_deps_builder);
+                     ~from:fd.DceFileProcessing.file_deps
+                     ~into:file_deps_builder);
             (* Compute type-label dependencies after merge *)
             DeadType.process_type_label_dependencies ~config:dce_config ~decls
               ~refs:refs_builder;
-            let find_exception = DeadException.find_exception_from_decls decls in
+            let find_exception =
+              DeadException.find_exception_from_decls decls
+            in
             (* Process cross-file exception refs *)
             CrossFileItems.process_exception_refs cross_file ~refs:refs_builder
               ~file_deps:file_deps_builder ~find_exception ~config:dce_config;
@@ -300,7 +304,8 @@ let runAnalysis ~dce_config ~cmtRoot =
             | None -> true
           in
           let optional_args_state =
-            CrossFileItems.compute_optional_args_state cross_file ~decls ~is_live
+            CrossFileItems.compute_optional_args_state cross_file ~decls
+              ~is_live
           in
           (* Collect optional args issues only for live declarations *)
           let optional_args_issues =
@@ -316,7 +321,8 @@ let runAnalysis ~dce_config ~cmtRoot =
               decls []
             |> List.rev
           in
-          Some (AnalysisResult.add_issues analysis_result_core optional_args_issues)))
+          Some
+            (AnalysisResult.add_issues analysis_result_core optional_args_issues))
     else None
   in
   (* Reporting phase *)

analysis/reanalyze/src/Timing.ml

@@ -13,13 +13,14 @@ type phase_times = {
   mutable reporting: float;
 }
 
-let times = {
-  file_loading = 0.0;
-  result_collection = 0.0;
-  merging = 0.0;
-  solving = 0.0;
-  reporting = 0.0;
-}
+let times =
+  {
+    file_loading = 0.0;
+    result_collection = 0.0;
+    merging = 0.0;
+    solving = 0.0;
+    reporting = 0.0;
+  }
 
 (* Mutex to protect timing updates from concurrent domains *)
 let timing_mutex = Mutex.create ()

rescript.opam

@@ -21,7 +21,7 @@ build: [
   ]
 ]
 depends: [
-  "ocaml" {>= "4.14"}
+  "ocaml" {>= "5.0.1"}
   "cppo" {= "1.8.0"}
   "dune" {>= "3.17"}
   "flow_parser" {= "0.267.0"}

scripts/format.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
 
+set -e
+
 shopt -s extglob
 
 echo Formatting OCaml code...
-dune build @fmt --auto-promote
+opam exec -- dune build @fmt --auto-promote
 
 echo Formatting ReScript code...
 files=$(find packages tests -type f \( -name "*.res" -o -name "*.resi" \) ! -name "syntaxErrors*" ! -name "generated_mocha_test.res" ! -path "tests/syntax_tests*" ! -path "tests/analysis_tests/tests*" ! -path "*/node_modules/*")

tools.opam

@@ -7,7 +7,7 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/rescript-lang/rescript-compiler"
 bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
 depends: [
-  "ocaml" {>= "4.14"}
+  "ocaml" {>= "5.0.1"}
   "cmarkit" {>= "0.3.0"}
   "cppo" {= "1.8.0"}
   "analysis"