fix #639 : better error message

Author: Hongbo Zhang

jscomp/common/bs_exception.ml

@@ -26,7 +26,8 @@
 type error =
   | Cmj_not_found of string
   | Bs_cyclic_depends of string  list
-  | Bs_duplicated_module of string * string         
+  | Bs_duplicated_module of string * string
+  | Bs_package_not_found of string                            
 exception Error of error
 
 let error err = raise (Error err)
@@ -42,7 +43,11 @@ let report_error ppf = function
       str
   | Bs_duplicated_module (a,b)
     ->
-    Format.fprintf ppf "The build system does not support two files with same names yet %s, %s" a b    
+    Format.fprintf ppf "The build system does not support two files with same names yet %s, %s" a b
+  | Bs_package_not_found package
+    ->
+    Format.fprintf ppf "Pacage %s not found or %s/lib/ocaml does not exist"
+      package package
 
 let () =
   Location.register_error_of_exn

jscomp/common/bs_exception.mli

@@ -25,5 +25,6 @@
 type error =
   | Cmj_not_found of string
   | Bs_cyclic_depends of string  list
-  | Bs_duplicated_module of string * string         
+  | Bs_duplicated_module of string * string
+  | Bs_package_not_found of string                                                        
 val error : error -> 'a 

jscomp/common/common.mllib

@@ -1,5 +1,4 @@
 js_config
-literals
 ext_log
 bs_loc
 bs_exception

jscomp/ext/ext.mllib

@@ -20,4 +20,5 @@ ext_io
 string_set
 string_map
 hash_set
-ident_set
+ident_set
+literals

jscomp/ext/ext_filename.ml

@@ -136,9 +136,6 @@ let relative_path file_or_dir_1 file_or_dir_2 =
 
 
 
-let node_modules = "node_modules"
-let node_modules_length = String.length "node_modules"
-let package_json = "package.json"
 
 
 
@@ -153,7 +150,7 @@ let package_json = "package.json"
  *)
 let node_relative_path (file1 : t) 
     (`File file2 as dep_file : [`File of string]) = 
-  let v = Ext_string.find  file2 ~sub:node_modules in 
+  let v = Ext_string.find  file2 ~sub:Literals.node_modules in 
   let len = String.length file2 in 
   if v >= 0 then 
     let rec skip  i =       
@@ -174,7 +171,7 @@ let node_relative_path (file1 : t)
         *)
     in 
     Ext_string.tail_from file2
-      (skip (v + node_modules_length)) 
+      (skip (v + Literals.node_modules_length)) 
   else 
     relative_path 
        (absolute_path dep_file)
@@ -184,43 +181,11 @@ let node_relative_path (file1 : t)
 
 
 
-(** [resolve cwd module_name], 
-    [cwd] is current working directory, absolute path
-    Trying to find paths to load [module_name]
-    it is sepcialized for option [-bs-package-include] which requires
-    [npm_package_name/lib/ocaml]
-*)
-let  resolve_bs_package ~cwd name = 
-  let sub_path = name // "lib" // "ocaml" in
-  let rec aux origin cwd name = 
-    let destdir =  cwd // node_modules // sub_path in 
-    if Ext_sys.is_directory_no_exn destdir then destdir
-    else 
-      let cwd' = Filename.dirname cwd in 
-      if String.length cwd' < String.length cwd then  
-        aux origin   cwd' name
-      else 
-        try 
-          let destdir = 
-            Sys.getenv "npm_config_prefix" 
-            // "lib" // node_modules // sub_path in
-          if Ext_sys.is_directory_no_exn destdir
-          then destdir
-          else
-            Ext_pervasives.failwithf
-              ~loc:__LOC__ " %s not found in %s" name origin 
-
-        with 
-          Not_found -> 
-          Ext_pervasives.failwithf
-            ~loc:__LOC__ " %s not found in %s" name origin 
-  in
-  aux cwd cwd name
 
 
 let find_package_json_dir cwd  = 
   let rec aux cwd  = 
-    if Sys.file_exists (cwd // package_json) then cwd
+    if Sys.file_exists (cwd // Literals.package_json) then cwd
     else 
       let cwd' = Filename.dirname cwd in 
       if String.length cwd' < String.length cwd then  

jscomp/ext/ext_filename.mli

@@ -55,7 +55,7 @@ val node_relative_path : t -> [`File of string] -> string
 val chop_extension : ?loc:string -> string -> string
 
 
-val resolve_bs_package : cwd:string -> string -> string
+
 
 
 

jscomp/common/literals.ml renamed to jscomp/ext/literals.ml

@@ -68,3 +68,10 @@ let js_fn_runmethod = "js_fn_runmethod"
 let bs_deriving = "bs.deriving"
 let bs_deriving_dot = "bs.deriving."
 let bs_type = "bs.type"
+
+
+(** nodejs *)
+let node_modules = "node_modules"
+let node_modules_length = String.length "node_modules"
+let package_json = "package.json"
+  

jscomp/common/literals.mli renamed to jscomp/ext/literals.mli

@@ -69,3 +69,9 @@ val js_fn_runmethod : string
 val bs_deriving : string
 val bs_deriving_dot : string
 val bs_type : string
+
+(** nodejs *)
+
+val node_modules : string
+val node_modules_length : int
+val package_json : string  

jscomp/js_main.ml

@@ -48,16 +48,43 @@ let set_main_entry name =
 
 
 
-
-
-let add_include_path s = 
+let (//) = Filename.concat
+(** [resolve cwd module_name], 
+    [cwd] is current working directory, absolute path
+    Trying to find paths to load [module_name]
+    it is sepcialized for option [-bs-package-include] which requires
+    [npm_package_name/lib/ocaml]
+*)
+let  resolve_bs_package ~cwd name = 
+  let sub_path = name // "lib" // "ocaml" in
+  let rec aux origin cwd name = 
+    let destdir =  cwd // Literals.node_modules // sub_path in 
+    if Ext_sys.is_directory_no_exn destdir then destdir
+    else 
+      let cwd' = Filename.dirname cwd in 
+      if String.length cwd' < String.length cwd then  
+        aux origin   cwd' name
+      else 
+        try 
+          let destdir = 
+            Sys.getenv "npm_config_prefix" 
+            // "lib" // Literals.node_modules // sub_path in
+          if Ext_sys.is_directory_no_exn destdir
+          then destdir
+          else
+            Bs_exception.error (Bs_package_not_found name)
+        with 
+          Not_found ->
+          Bs_exception.error (Bs_package_not_found name)          
+  in
+  aux cwd cwd name
+
+let add_package s = 
   let path = 
-    Ext_filename.resolve_bs_package
+    resolve_bs_package
       ~cwd:(Lazy.force Ext_filename.cwd) s   in 
-  if Ext_sys.is_directory_no_exn path then 
-    Clflags.include_dirs := path :: ! Clflags.include_dirs
-  else 
-    Ext_pervasives.failwithf ~loc:__LOC__ "%s is not a directory" s 
+  Clflags.include_dirs := path :: ! Clflags.include_dirs
+
 
 let set_noassert () = 
   Js_config.set_no_any_assert ();
@@ -79,7 +106,7 @@ let buckle_script_flags =
    " set npm-output-path: [opt_module]:path, for example: 'lib/cjs', 'amdjs:lib/amdjs' and 'goog:lib/gjs'")
   ::
   ("-bs-package-include", 
-   Arg.String add_include_path, 
+   Arg.String add_package, 
    " set package names, for example bs-platform "  )
   :: 
   ("-bs-no-builtin-ppx-ml", 

jscomp/test/.depend

@@ -15,6 +15,7 @@ infer_type_test.cmi : ../runtime/js.cmj
 inline_edge_cases.cmi :
 inline_map_test.cmi :
 js_dyn.cmi :
+literals.cmi :
 map_test.cmi :
 mt.cmi :
 mt_global.cmi : mt.cmi
@@ -184,12 +185,12 @@ ext_array.cmj : ../stdlib/list.cmi ../stdlib/array.cmi
 ext_array.cmx : ../stdlib/list.cmx ../stdlib/array.cmx
 ext_bytes.cmj : ../stdlib/bytes.cmi
 ext_bytes.cmx : ../stdlib/bytes.cmx
-ext_filename.cmj : ../stdlib/sys.cmi ../stdlib/string.cmi ../stdlib/list.cmi \
-    ../stdlib/lazy.cmi ../stdlib/filename.cmi ext_sys.cmi ext_string.cmj \
-    ext_pervasives.cmi
-ext_filename.cmx : ../stdlib/sys.cmx ../stdlib/string.cmx ../stdlib/list.cmx \
-    ../stdlib/lazy.cmx ../stdlib/filename.cmx ext_sys.cmx ext_string.cmx \
-    ext_pervasives.cmx
+ext_filename.cmj : ../stdlib/sys.cmi ../stdlib/string.cmi literals.cmi \
+    ../stdlib/list.cmi ../stdlib/lazy.cmi ../stdlib/filename.cmi \
+    ext_string.cmj ext_pervasives.cmi
+ext_filename.cmx : ../stdlib/sys.cmx ../stdlib/string.cmx literals.cmx \
+    ../stdlib/list.cmx ../stdlib/lazy.cmx ../stdlib/filename.cmx \
+    ext_string.cmx ext_pervasives.cmx
 ext_list.cmj : ../stdlib/list.cmi ../stdlib/array.cmi
 ext_list.cmx : ../stdlib/list.cmx ../stdlib/array.cmx
 ext_log.cmj : ../stdlib/format.cmi
@@ -362,6 +363,8 @@ list_test.cmj : ../stdlib/pervasives.cmi mt.cmi ../stdlib/list.cmi \
     ../stdlib/array.cmi
 list_test.cmx : ../stdlib/pervasives.cmx mt.cmx ../stdlib/list.cmx \
     ../stdlib/array.cmx
+literals.cmj : ../stdlib/string.cmi literals.cmi
+literals.cmx : ../stdlib/string.cmx literals.cmi
 local_class_type.cmj : ../runtime/js.cmj
 local_class_type.cmx : ../runtime/js.cmx
 local_exception_test.cmj :
@@ -944,12 +947,12 @@ ext_array.cmo : ../stdlib/list.cmi ../stdlib/array.cmi
 ext_array.cmj : ../stdlib/list.cmj ../stdlib/array.cmj
 ext_bytes.cmo : ../stdlib/bytes.cmi
 ext_bytes.cmj : ../stdlib/bytes.cmj
-ext_filename.cmo : ../stdlib/sys.cmi ../stdlib/string.cmi ../stdlib/list.cmi \
-    ../stdlib/lazy.cmi ../stdlib/filename.cmi ext_sys.cmi ext_string.cmo \
-    ext_pervasives.cmi
-ext_filename.cmj : ../stdlib/sys.cmj ../stdlib/string.cmj ../stdlib/list.cmj \
-    ../stdlib/lazy.cmj ../stdlib/filename.cmj ext_sys.cmj ext_string.cmj \
-    ext_pervasives.cmj
+ext_filename.cmo : ../stdlib/sys.cmi ../stdlib/string.cmi literals.cmi \
+    ../stdlib/list.cmi ../stdlib/lazy.cmi ../stdlib/filename.cmi \
+    ext_string.cmo ext_pervasives.cmi
+ext_filename.cmj : ../stdlib/sys.cmj ../stdlib/string.cmj literals.cmj \
+    ../stdlib/list.cmj ../stdlib/lazy.cmj ../stdlib/filename.cmj \
+    ext_string.cmj ext_pervasives.cmj
 ext_list.cmo : ../stdlib/list.cmi ../stdlib/array.cmi
 ext_list.cmj : ../stdlib/list.cmj ../stdlib/array.cmj
 ext_log.cmo : ../stdlib/format.cmi
@@ -1122,6 +1125,8 @@ list_test.cmo : ../stdlib/pervasives.cmi mt.cmi ../stdlib/list.cmi \
     ../stdlib/array.cmi
 list_test.cmj : ../stdlib/pervasives.cmj mt.cmj ../stdlib/list.cmj \
     ../stdlib/array.cmj
+literals.cmo : ../stdlib/string.cmi literals.cmi
+literals.cmj : ../stdlib/string.cmj literals.cmi
 local_class_type.cmo : ../runtime/js.cmo
 local_class_type.cmj : ../runtime/js.cmj
 local_exception_test.cmo :