Merge pull request #4729 from rescript-lang/no_77

bobzhang · web-flow · commit 5ccbd4e44f04 · 2020-09-29T10:02:24.000+08:00
enable -warn-as-eror refined control while still catpure warnings output
diff --git a/jscomp/bsb/bsb_templates.ml b/jscomp/bsb/bsb_templates.ml
@@ -14,14 +14,9 @@ let root = OCamlRes.Res.([
       \    \"dir\" : \"src\",\n\
       \    \"subdirs\" : true\n\
       \  },\n\
-      \  \"package-specs\": {\n\
-      \    \"module\": \"commonjs\",\n\
-      \    \"in-source\": true\n\
-      \  },\n\
-      \  \"suffix\": \".bs.js\",\n\
-      \  \"bs-dependencies\": [\n\
-      \  ],\n\
-      \  \"refmt\": 3\n\
+      \  \"warnings\": {\n\
+      \    \"error\" : \"+101\"\n\
+      \  }\n\
        }\n\
        ") ;
     File  ("package.json",
diff --git a/jscomp/bsb/bsb_warning.ml b/jscomp/bsb/bsb_warning.ml
@@ -23,10 +23,16 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
+type warning_error =
+  | Warn_error_false
+  (* default [false] to make our changes non-intrusive *)
+  | Warn_error_true
+  | Warn_error_number of string
 
 type t0 = {
-  number : string option; 
-} [@@ocaml.unboxed]
+  number : string option;
+  error : warning_error
+}
 
 type nonrec t = t0 option 
 
@@ -64,13 +70,27 @@ let to_merlin_string x =
    
 let from_map (m : Ext_json_types.t Map_string.t) =
   let number_opt = Map_string.find_opt m Bsb_build_schemas.number in
-  let number =
-    match number_opt with
-    | Some (Str { str = number}) -> Some number
-    | None -> None
-    | Some x -> Bsb_exception.config_error x "expect a string"
-  in
-  Some {number }
+  let error_opt = Map_string.find_opt m  Bsb_build_schemas.error in
+  match number_opt, error_opt  with
+  | None, None -> None
+  | _, _ ->
+    let error  =
+      match error_opt with
+      | Some (True _) -> Warn_error_true
+      | Some (False _) -> Warn_error_false
+      | Some (Str {str ; })
+        -> Warn_error_number str
+      | Some x -> Bsb_exception.config_error x "expect true/false or string"
+      | None -> Warn_error_false
+      (** To make it less intrusive : warning error has to be enabled*)
+    in
+    let number =
+      match number_opt with
+      | Some (Str { str = number}) -> Some number
+      | None -> None
+      | Some x -> Bsb_exception.config_error x "expect a string"
+    in
+    Some {number; error }
 
 
 let to_bsb_string ~toplevel warning =
@@ -83,6 +103,15 @@ let to_bsb_string ~toplevel warning =
          Ext_string.empty
        | Some x ->
          prepare_warning_concat ~beg:true x  
-      ) 
+      ) ^
+      (
+        match warning.error with
+        | Warn_error_true ->
+          " -warn-error A"
+        | Warn_error_number y ->
+          " -warn-error " ^ y
+        | Warn_error_false ->
+          Ext_string.empty
+      )
   else " -w a" 
   (* TODO: this is the current default behavior *)
diff --git a/jscomp/bsb/templates/basic/bsconfig.json b/jscomp/bsb/templates/basic/bsconfig.json
@@ -4,5 +4,8 @@
   "sources": {
     "dir" : "src",
     "subdirs" : true
+  },
+  "warnings": {
+    "error" : "+101"
   }
 }
diff --git a/jscomp/build_tests/case3/bsconfig.json b/jscomp/build_tests/case3/bsconfig.json
@@ -12,5 +12,6 @@
   "suffix": ".bs.js",
   "bs-dependencies": [
   ],
+  "warnings": {"error" : "+101"},
   "refmt": 3
 }
diff --git a/jscomp/build_tests/custom_namespace/bsconfig.json b/jscomp/build_tests/custom_namespace/bsconfig.json
@@ -13,7 +13,8 @@
   "bsc-flags" : ["-bs-no-version-header"],
   "bs-dependencies": [],
   "warnings": {
-    "number" : "-40+6+7"
+    "number" : "-40+6+7",
+    "error" : true
   },
   "suffix": ".bs.js"
 }
diff --git a/jscomp/build_tests/customize_namespace/bsconfig.json b/jscomp/build_tests/customize_namespace/bsconfig.json
@@ -14,5 +14,6 @@
       "depa",
       "depb"
   ],
+  "warnings": {"error" : "+101"},
   "refmt": 3
 }
diff --git a/jscomp/build_tests/cycle/bsconfig.json b/jscomp/build_tests/cycle/bsconfig.json
@@ -12,5 +12,6 @@
   "suffix": ".bs.js",
   "bs-dependencies": [
   ],
+  "warnings": {"error" : "+101"},
   "refmt": 3
 }
diff --git a/jscomp/build_tests/devdeps/bsconfig.json b/jscomp/build_tests/devdeps/bsconfig.json
@@ -18,5 +18,6 @@
   "bs-dependencies": [
   ],
   "bs-dev-dependencies": ["weird"],
+  "warnings": {"error":"+101"},
   "refmt": 3
 }
diff --git a/jscomp/build_tests/devonly/bsconfig.json b/jscomp/build_tests/devonly/bsconfig.json
@@ -16,5 +16,6 @@
   "suffix": ".bs.js",
   "bs-dependencies": [
   ],
+  "warnings": {"error" : "+101"},
   "refmt": 3
 }
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/a/bsconfig.json b/jscomp/build_tests/duplicated_symlinked_packages/a/bsconfig.json
@@ -14,6 +14,7 @@
     "c",
     "z"
   ],
+  "warnings": {"error" : "+101"},
   "namespace": true,
   "refmt": 3
 }
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/b/bsconfig.json b/jscomp/build_tests/duplicated_symlinked_packages/b/bsconfig.json
@@ -13,6 +13,7 @@
   "bs-dependencies": [
     "c"
   ],
+  "warnings": {"error" : "+101"},
   "namespace": true,
   "refmt": 3
 }
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/c/bsconfig.json b/jscomp/build_tests/duplicated_symlinked_packages/c/bsconfig.json
@@ -13,6 +13,7 @@
   "bs-dependencies": [
 
   ],
+  "warnings": {"error" : "+101"},
   "namespace": true,
   "refmt": 3
 }
diff --git a/jscomp/build_tests/install/bsconfig.json b/jscomp/build_tests/install/bsconfig.json
@@ -12,6 +12,7 @@
     "suffix": ".bs.js",
     "bs-dependencies": [
     ],
+    "warnings": {"error" : "+101"},
     "refmt": 3
   }
   
diff --git a/jscomp/build_tests/namespace/bsconfig.json b/jscomp/build_tests/namespace/bsconfig.json
@@ -16,7 +16,8 @@
     "libb"
   ],
   "warnings": {
-    "number" : "-40+6+7"
+    "number" : "-40+6+7",
+    "error" : true
   },
   "suffix": ".bs.js"
 }
diff --git a/jscomp/build_tests/namespace/src/demo.bs.js b/jscomp/build_tests/namespace/src/demo.bs.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var Demo$Liba = require("liba/src/demo.bs.js");
-var Demo$Libb = require("libb/src/demo.js");
+var Demo$Libb = require("libb/src/demo.bs.js");
 
 var v = Demo$Liba.v + Demo$Libb.v | 0;
 
diff --git a/jscomp/build_tests/nested/bsconfig.json b/jscomp/build_tests/nested/bsconfig.json
@@ -9,5 +9,6 @@
   "package-specs" : {
     "module": "commonjs",
     "in-source": true
-  }
+  },
+  "warnings": {"error" : true}
 }
diff --git a/jscomp/build_tests/nnest/bsconfig.json b/jscomp/build_tests/nnest/bsconfig.json
@@ -10,5 +10,6 @@
     "module": "commonjs",
     "in-source": true
   },
-  "namespace": true
+  "namespace": true,
+  "warnings": {"error": true}
 }
diff --git a/jscomp/build_tests/top/bsconfig.json b/jscomp/build_tests/top/bsconfig.json
@@ -20,5 +20,6 @@
   "suffix": ".bs.js",
   "bs-dependencies": [
   ],
+  "warnings": {"error" : "+101"},
   "refmt": 3
 }
diff --git a/jscomp/build_tests/white space/bsconfig.json b/jscomp/build_tests/white space/bsconfig.json
@@ -9,6 +9,7 @@
         ,"in-source": true
     }],
     "warnings": {
-        "number": "A"
+        "number": "A",
+        "error" : true
     }
 }
diff --git a/jscomp/core/bs_conditional_initial.ml b/jscomp/core/bs_conditional_initial.ml
@@ -35,6 +35,7 @@ let setup_env () =
   Matching.call_switcher_variant_constr := Polyvar_pattern_match.call_switcher_variant_constr;
   Clflags.no_std_include := true;
   Warnings.parse_options false Bsc_warnings.defaults_w;
+  Warnings.parse_options true Bsc_warnings.defaults_warn_error;
   Clflags.dump_location := false;  
   Clflags.compile_only := true;
   Config.bs_only := true;  
diff --git a/jscomp/core/lam_compile_main.ml b/jscomp/core/lam_compile_main.ml
@@ -260,6 +260,7 @@ let compile
                Ext_string.compare (Lam_module_ident.name id1) (Lam_module_ident.name id2)
             ) 
       in
+      Warnings.check_fatal();
       let effect = 
         Lam_stats_export.get_dependent_module_effect
         maybe_pure external_module_ids in 
@@ -286,11 +287,7 @@ let lambda_as_module
      : unit = 
   let package_info = Js_packages_state.get_packages_info () in 
   if Js_packages_info.is_empty package_info && !Js_config.js_stdout then begin    
-    Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout;
-    if !Warnings.nerrors > 0 then begin 
-      Warnings.nerrors := 0;
-      exit 77
-    end  
+    Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout
   end else
     Js_packages_info.iter package_info (fun {module_system; path; suffix} -> 
         let output_chan chan  = 
@@ -313,15 +310,11 @@ let lambda_as_module
         (if not !Clflags.dont_write_files then 
           Ext_pervasives.with_file_as_chan
             target_file output_chan );
-        if !Warnings.nerrors > 0 then begin 
-          Warnings.nerrors := 0 ;
+        if !Warnings.has_warnings  then begin 
+          Warnings.has_warnings := false ;
           if Sys.file_exists target_file then begin 
             Bs_hash_stubs.set_as_old_file target_file
-          end;
-          exit 77
-          (* don't write js file, we need remove js files 
-             otherwise the js files are out-of-date
-             exit 177 *)
+          end          
         end             
         )
   
diff --git a/jscomp/ext/bsc_warnings.ml b/jscomp/ext/bsc_warnings.ml
@@ -73,4 +73,5 @@
   - 102 Bs_polymorphic_comparison
 *)
 let defaults_w = "+a-4-9-20-40-41-42-50-61-102"
+let defaults_warn_error = "-a+5+6+101";;
 (*TODO: add +10*)
diff --git a/jscomp/main/js_main.ml b/jscomp/main/js_main.ml
@@ -498,8 +498,10 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     "*internal* keep the compatibility with RLS";
     "-c", Unit_dummy,
     "*internal* keep the compatibility with RLS";
-    "-warn-error", string_call (fun _ -> ()),
-    "Deprecated: warnings are errors";
+    "-warn-error", string_call (Warnings.parse_options true),
+    "<list>  Enable or disable error status for warnings according\n\
+         to <list>.  See option -w for the syntax of <list>.\n\
+         Default setting is " ^ Bsc_warnings.defaults_warn_error;    
   
   |]
 
diff --git a/jscomp/others/release.ninja b/jscomp/others/release.ninja
@@ -1,5 +1,5 @@
 
-bsc_flags = -no-keep-locs -absname -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6   -nopervasives  -unsafe  -w +50  -open Bs_stdlib_mini -I ./runtime
+bsc_flags = -no-keep-locs -absname -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6   -nopervasives  -unsafe  -w +50 -warn-error A  -open Bs_stdlib_mini -I ./runtime
 
 rule cc
     command = $bsc -bs-cmi -bs-cmj $bsc_flags   -I others  $in
diff --git a/jscomp/runtime/release.ninja b/jscomp/runtime/release.ninja
@@ -1,5 +1,5 @@
 
-bsc_no_open_flags =  -no-keep-locs -absname -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6  -nopervasives  -unsafe -w +50  
+bsc_no_open_flags =  -no-keep-locs -absname -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6  -nopervasives  -unsafe -w +50 -warn-error A
 bsc_flags = $bsc_no_open_flags -open Bs_stdlib_mini
 
 rule cc
diff --git a/jscomp/stdlib-406/release.ninja b/jscomp/stdlib-406/release.ninja
@@ -1,5 +1,5 @@
 
-bsc_flags = -no-keep-locs -absname -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6   -w -9-3-106  -I runtime  -I others
+bsc_flags = -no-keep-locs -absname -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6   -w -9-3-106 -warn-error A  -I runtime  -I others
 
 rule cc
     command = $bsc -bs-cmi -bs-cmj $bsc_flags   -I stdlib-406  $in
diff --git a/jscomp/test/build.ninja b/jscomp/test/build.ninja
@@ -1,5 +1,5 @@
 
-bsc_flags = -absname -bs-no-version-header  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:jscomp/test  -w -3-6-26-27-29-30-32..40-44-45-52-60-9-106+104  -I runtime -I $stdlib -I others
+bsc_flags = -absname -bs-no-version-header  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:jscomp/test  -w -3-6-26-27-29-30-32..40-44-45-52-60-9-106+104 -warn-error A  -I runtime -I $stdlib -I others
 
 rule cc
     command = $bsc -bs-cmi -bs-cmj $bsc_flags   -I test  $in
diff --git a/jscomp/test/recursive_react_component.re b/jscomp/test/recursive_react_component.re
@@ -1,7 +1,8 @@
 
 [@bs.config {
   flags : [|"-bs-jsx","3", "-dsource",
-    // "-w","A"
+     // "-w","A", 
+     // "-warn-error", "a"
     |]
 }];
 
diff --git a/lib/4.06.1/bsb.ml b/lib/4.06.1/bsb.ml
diff --git a/lib/4.06.1/unstable/bspack.ml b/lib/4.06.1/unstable/bspack.ml
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
diff --git a/ocaml b/ocaml
diff --git a/scripts/ninja.js b/scripts/ninja.js

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,8 @@`
`4`	`4`	`"sources": {`
`5`	`5`	`"dir" : "src",`
`6`	`6`	`"subdirs" : true`
	`7`	`+ },`
	`8`	`+ "warnings": {`
	`9`	`+ "error" : "+101"`
`7`	`10`	`}`
`8`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@`
`12`	`12`	`"suffix": ".bs.js",`
`13`	`13`	`"bs-dependencies": [`
`14`	`14`	`],`
	`15`	`+ "warnings": {"error" : "+101"},`
`15`	`16`	`"refmt": 3`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,6 @@`
`14`	`14`	`"depa",`
`15`	`15`	`"depb"`
`16`	`16`	`],`
	`17`	`+ "warnings": {"error" : "+101"},`
`17`	`18`	`"refmt": 3`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,6 @@`
`18`	`18`	`"bs-dependencies": [`
`19`	`19`	`],`
`20`	`20`	`"bs-dev-dependencies": ["weird"],`
	`21`	`+ "warnings": {"error":"+101"},`
`21`	`22`	`"refmt": 3`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,6 @@`
`16`	`16`	`"suffix": ".bs.js",`
`17`	`17`	`"bs-dependencies": [`
`18`	`18`	`],`
	`19`	`+ "warnings": {"error" : "+101"},`
`19`	`20`	`"refmt": 3`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`"c",`
`15`	`15`	`"z"`
`16`	`16`	`],`
	`17`	`+ "warnings": {"error" : "+101"},`
`17`	`18`	`"namespace": true,`
`18`	`19`	`"refmt": 3`
`19`	`20`	`}`