Make transitive reports configurable.

Author: cristianoc

analysis/reanalyze/examples/deadcode/bsconfig.json

@@ -2,7 +2,8 @@
   "reanalyze": {
     "analysis": ["dce"],
     "suppress": [],
-    "unsuppress": []
+    "unsuppress": [],
+    "transitive": false
   },
   "name": "sample-typescript-app",
   "bsc-flags": ["-bs-super-errors -w a"],

analysis/reanalyze/src/DeadCommon.ml

@@ -13,7 +13,6 @@ module Config = struct
   let analyzeTypes = ref true
   let analyzeExternals = ref false
   let reportUnderscore = false
-  let reportTransitive = false
   let reportTypesDeadOnlyInInterface = false
   let recursiveDebug = false
   let warnOnCircularDependencies = false
@@ -406,10 +405,9 @@ let emitWarning ~decl ~message deadWarning =
       WriteDeadAnnotations.addLineAnnotation ~decl
     else None
   in
-  if Config.reportTransitive then
-    decl.path
-    |> Path.toModuleName ~isType:(decl.declKind |> DeclKind.isType)
-    |> DeadModules.checkModuleDead ~fileName:decl.pos.pos_fname;
+  decl.path
+  |> Path.toModuleName ~isType:(decl.declKind |> DeclKind.isType)
+  |> DeadModules.checkModuleDead ~fileName:decl.pos.pos_fname;
   Log_.warning ~loc
     (DeadWarning
        {
@@ -553,13 +551,12 @@ module Decl = struct
         && (match decl.path with
            | name :: _ when name |> Name.isUnderscore -> Config.reportUnderscore
            | _ -> true)
-        && (Config.reportTransitive || not (hasRefBelow ()))
+        && (runConfig.transitive || not (hasRefBelow ()))
       in
       if shouldEmitWarning then (
-        if Config.reportTransitive then
-          decl.path
-          |> Path.toModuleName ~isType:(decl.declKind |> DeclKind.isType)
-          |> DeadModules.checkModuleDead ~fileName:decl.pos.pos_fname;
+        decl.path
+        |> Path.toModuleName ~isType:(decl.declKind |> DeclKind.isType)
+        |> DeadModules.checkModuleDead ~fileName:decl.pos.pos_fname;
         emitWarning ~decl ~message name)
 end
 

analysis/reanalyze/src/DeadModules.ml

@@ -1,4 +1,4 @@
-let active () = true
+let active () = RunConfig.runConfig.transitive
 let table = Hashtbl.create 1
 
 let markDead ~isType ~loc path =

analysis/reanalyze/src/Paths.ml

@@ -73,6 +73,12 @@ module Config = struct
       (* if no "analysis" specified, default to dce *)
       RunConfig.dce ()
 
+  let readTransitive conf =
+    match Json.get "transitive" conf with
+    | Some True -> RunConfig.transitive true
+    | Some False -> RunConfig.transitive false
+    | _ -> ()
+
   (* Read the config from bsconfig.json and apply it to runConfig and suppress and unsuppress *)
   let processBsconfig () =
     Lazy.force setReScriptProjectRoot;
@@ -87,7 +93,8 @@ module Config = struct
         | Some conf ->
           readSuppress conf;
           readUnsuppress conf;
-          readAnalysis conf
+          readAnalysis conf;
+          readTransitive conf
         | None ->
           (* if no "analysis" specified, default to dce *)
           RunConfig.dce ()))

analysis/reanalyze/src/RunConfig.ml

@@ -5,6 +5,7 @@ type t = {
   mutable projectRoot: string;
   mutable suppress: string list;
   mutable termination: bool;
+  mutable transitive: bool;
   mutable unsuppress: string list;
 }
 
@@ -16,6 +17,7 @@ let runConfig =
     projectRoot = "";
     suppress = [];
     termination = false;
+    transitive = true;
     unsuppress = [];
   }
 
@@ -27,3 +29,5 @@ let all () =
 let dce () = runConfig.dce <- true
 let exception_ () = runConfig.exception_ <- true
 let termination () = runConfig.termination <- true
+
+let transitive b = runConfig.transitive <- b

analysis/tests/src/expected/Dce.res.txt

@@ -1,3 +1,3 @@
 DCE src/Dce.res
-issues:0
+issues:2