clean up api for external var dot

Author: bobzhang

jscomp/core/js_exp_make.ml

@@ -79,17 +79,15 @@ let runtime_var_vid  x  e1 : J.vident =
 let ml_var_dot ?comment ( id  : Ident.t) e : J.expression =     
   {expression_desc = Var (Qualified(id, Ml, Some e)); comment }
 
-let external_var_dot ?comment (id : Ident.t) name fn : t = 
-  {expression_desc = Var (Qualified(id, External name,  fn)); comment }
-
 (** 
   module as a value 
    {[
      var http = require("http")
    ]}
 *)
-let external_module_as_var ?comment (id : Ident.t) name : t = 
-  {expression_desc = Var (Qualified(id, External name, None)); comment }
+let external_var_dot ?comment  ~external_name:name ?dot (id : Ident.t) : t = 
+  {expression_desc = Var (Qualified(id, External name,  dot)); comment }
+
 
 let ml_var ?comment (id : Ident.t) : t  = 
   {expression_desc = Var (Qualified (id, Ml, None)); comment}

jscomp/core/js_exp_make.mli

@@ -79,7 +79,7 @@ val runtime_var_vid : string -> string -> J.vident
 
 val ml_var_dot : ?comment:string -> Ident.t -> string -> t
 
-val external_var_dot : ?comment:string -> Ident.t -> string -> string option -> t
+val external_var_dot : ?comment:string ->  external_name:string -> ?dot:string -> Ident.t -> t
 
 
 

jscomp/core/lam_compile_env.ml

@@ -239,7 +239,9 @@ let get_package_path_from_cmj module_system ( id : Lam_module_ident.t) =
 
 (* TODO: [env] is not hard dependency *)
 
-let get_requried_modules env (extras : module_id list ) (hard_dependencies 
+let get_requried_modules env
+    (extras : module_id list ) 
+    (hard_dependencies 
   : _ Hash_set_poly.t) : module_id list =  
 
   let mem (x : Lam_module_ident.t) = 

jscomp/core/lam_compile_external_call.ml

@@ -32,6 +32,7 @@ module E = Js_exp_make
 
 let handle_external 
     ({bundle ; bind_name} : Ast_external_attributes.external_module_name)
+    : Ident.t * string 
   =
   match bind_name with 
   | None -> 
@@ -42,7 +43,8 @@ let handle_external
     bundle
 
 let handle_external_opt 
-    (module_name : Ast_external_attributes.external_module_name option) = 
+    (module_name : Ast_external_attributes.external_module_name option) 
+    : (Ident.t * string) option = 
   match module_name with 
   | Some module_name -> Some (handle_external module_name) 
   | None -> None 
@@ -196,12 +198,12 @@ let translate_ffi call_loc (ffi : Ast_external_attributes.ffi ) prim_name
       end
     | Js_module_as_var module_name -> 
       let (id, name) =  handle_external  module_name  in
-      E.external_var_dot id name None
+      E.external_var_dot id ~external_name:name 
 
     | Js_module_as_fn {external_module_name = module_name; splice} ->
       let fn =
         let (id, name) = handle_external  module_name  in
-        E.external_var_dot id name None           
+        E.external_var_dot id ~external_name:name 
       in           
       let args, eff = assemble_args_splice   call_loc ffi splice arg_types args in 
         (* TODO: fix in rest calling convention *)          
@@ -215,7 +217,7 @@ let translate_ffi call_loc (ffi : Ast_external_attributes.ffi ) prim_name
     | Js_module_as_class module_name ->
       let fn =
         let (id,name) = handle_external  module_name in
-        E.external_var_dot id name None in           
+        E.external_var_dot id ~external_name:name  in           
       let args,eff = assemble_args arg_types args in 
         (* TODO: fix in rest calling convention *)   
       add_eff eff        
@@ -245,7 +247,7 @@ let translate_ffi call_loc (ffi : Ast_external_attributes.ffi ) prim_name
       let fn =  
         match handle_external_opt module_name with 
         | Some (id,name) ->  
-          E.external_var_dot id name (Some fn)
+          E.external_var_dot id ~external_name:name ~dot:fn
 
         | None -> 
           (** TODO: check, no [@@bs.module], 
@@ -279,7 +281,7 @@ let translate_ffi call_loc (ffi : Ast_external_attributes.ffi ) prim_name
         | "null", None -> E.nil 
         | "undefined", None -> E.undefined
         | _, Some(id,mod_name)
-          -> E.external_var_dot id mod_name (Some name)
+          -> E.external_var_dot id ~external_name:mod_name ~dot:name
         | _, None -> 
 
           E.var (Ext_ident.create_js name)
@@ -337,7 +339,8 @@ let translate_ffi call_loc (ffi : Ast_external_attributes.ffi ) prim_name
 let translate loc cxt 
     ({prim_name ;  prim_native_name} 
      : Primitive.description) args  = 
-  if Ast_external_attributes.is_bs_external_prefix prim_native_name then 
+  if Ast_external_attributes.is_bs_external_prefix prim_native_name
+   then 
     begin 
       match Ast_external_attributes.unsafe_from_string prim_native_name with 
       | Normal -> 

jscomp/core/lam_compile_group.ml

@@ -367,7 +367,7 @@ let lambda_as_module
   begin 
     Js_config.set_current_file filename ;  
 #if BS_DEBUG then    
-    Js_config.set_debug_file "gpr_977_test.ml";
+    Js_config.set_debug_file "gpr_1060_test.ml";
 #end    
     let lambda_output = compile ~filename output_prefix env sigs lam in
     let (//) = Filename.concat in 

jscomp/test/.depend

@@ -178,6 +178,7 @@ global_exception_regression_test.cmj : mt.cmj
 global_module_alias_test.cmj : mt.cmj ../stdlib/list.cmj
 google_closure_test.cmj : test_google_closure.cmj mt.cmj
 gpr496_test.cmj : ../stdlib/pervasives.cmj mt.cmj ../runtime/js.cmj
+gpr_1060_test.cmj :
 gpr_1063_test.cmj :
 gpr_405_test.cmj : ../stdlib/hashtbl.cmj gpr_405_test.cmi
 gpr_441.cmj :

jscomp/test/Makefile

@@ -78,7 +78,8 @@ OTHERS := literals a test_ari test_export2 test_internalOO test_obj_simple_ffi t
 	flattern_order_test\
 	minimal_test\
 	gpr_1063_test\
-	gpr_977_test
+	gpr_977_test\
+	gpr_1060_test
 
 
 

jscomp/test/gpr_1060_test.js

@@ -0,0 +1,20 @@
+'use strict';
+
+var Foo$dotreact = require("foo.react");
+var React        = require("react");
+var A            = require("react");
+var Foo          = require("foo.react");
+
+var v = A;
+
+var h = React.bool();
+
+var c = Foo;
+
+var d = Foo$dotreact.bar();
+
+exports.v = v;
+exports.h = h;
+exports.c = c;
+exports.d = d;
+/* v Not a pure module */

jscomp/test/gpr_1060_test.ml

@@ -0,0 +1,20 @@
+
+type u 
+
+external a : u = "react" [@@bs.module]
+
+external b : unit -> int = "bool" [@@bs.module "react"]
+
+let v = a
+let h = b ()
+
+type bla
+
+
+external foo : bla = "foo.react" [@@bs.module]
+
+external bar : unit -> bla  = "bar" [@@bs.val] [@@bs.module "foo.react"]
+
+let c = foo 
+
+let d = bar ()