refactor

Author: zth

jscomp/core/j.ml

@@ -51,7 +51,7 @@ and ident = Ident.t
     currently we always use quote
 *)
 
-and module_id = { id : ident; kind : Js_op.kind ; dynamic_import : bool ; import_attributes : External_ffi_types.import_attributes option }
+and module_id = { id : ident; kind : Js_op.kind ; dynamic_import : bool }
 
 and required_modules = module_id list
 and vident = Id of ident | Qualified of module_id * string option

jscomp/core/js_dump_program.ml

@@ -95,7 +95,7 @@ let es6_program ~output_dir fmt f (x : J.deps_program) =
            Some ( x.id,
              Js_name_of_module_id.string_of_module_id x ~output_dir fmt,
              is_default x.kind,
-             x.import_attributes )))
+             (match x.kind with | External {import_attributes} -> import_attributes | _ -> None) )))
   in
   let () = P.at_least_two_lines f in
   let cxt = Js_dump.statements true cxt f x.program.block in

jscomp/core/js_exp_make.ml

@@ -79,12 +79,12 @@ let runtime_var_dot ?comment (x : string) (e1 : string) : J.expression =
   {
     expression_desc =
       Var
-        (Qualified ({ id = Ident.create_persistent x; kind = Runtime; dynamic_import = false; import_attributes = None }, Some e1));
+        (Qualified ({ id = Ident.create_persistent x; kind = Runtime; dynamic_import = false }, Some e1));
     comment;
   }
 
 let ml_var_dot ?comment ?(dynamic_import = false) (id : Ident.t) e : J.expression =
-  { expression_desc = Var (Qualified ({ id; kind = Ml; dynamic_import; import_attributes = None }, Some e)); comment }
+  { expression_desc = Var (Qualified ({ id; kind = Ml; dynamic_import }, Some e)); comment }
 
 (** 
    module as a value 
@@ -96,7 +96,7 @@ let external_var_field ?import_attributes ?comment ~external_name:name (id : Ide
     ~default : t =
   {
     expression_desc =
-      Var (Qualified ({ id; kind = External { name; default }; dynamic_import = false; import_attributes }, Some field));
+      Var (Qualified ({ id; kind = External { name; default; import_attributes }; dynamic_import = false }, Some field));
     comment;
   }
 
@@ -105,13 +105,13 @@ let external_var ?import_attributes ?comment ~external_name (id : Ident.t) : t =
     expression_desc =
       Var
         (Qualified
-           ( { id; kind = External { name = external_name; default = false }; dynamic_import = false; import_attributes },
+           ( { id; kind = External { name = external_name; default = false; import_attributes }; dynamic_import = false },
              None ));
     comment;
   }
 
 let ml_module_as_var ?comment ?(dynamic_import = false) (id : Ident.t) : t =
-  { expression_desc = Var (Qualified ({ id; kind = Ml; dynamic_import; import_attributes = None }, None)); comment }
+  { expression_desc = Var (Qualified ({ id; kind = Ml; dynamic_import }, None)); comment }
 
 (* Static_index .....................**)
 let runtime_call module_name fn_name args =

jscomp/core/js_op.ml

@@ -114,7 +114,7 @@ type int_op =
 *)
 type level = Log | Info | Warn | Error
 
-type kind = Ml | Runtime | External of { name : string; default : bool (* TODO(import-attributes) add here instead? *) }
+type kind = Ml | Runtime | External of { name : string; default : bool; import_attributes : External_ffi_types.import_attributes option }
 
 type property = Lam_compat.let_kind = Strict | Alias | StrictOpt | Variable
 

jscomp/core/js_record_map.ml

@@ -56,9 +56,9 @@ let label : label fn = unknown
 let ident : ident fn = unknown
 
 let module_id : module_id fn =
- fun _self { id = _x0; kind = _x1; dynamic_import = _x2; import_attributes = _x3 } ->
+ fun _self { id = _x0; kind = _x1; dynamic_import = _x2 } ->
   let _x0 = _self.ident _self _x0 in
-  { id = _x0; kind = _x1; dynamic_import = _x2; import_attributes = _x3 }
+  { id = _x0; kind = _x1; dynamic_import = _x2 }
 
 let required_modules : required_modules fn =
  fun _self arg -> list _self.module_id _self arg

jscomp/core/lam_compile_env.ml

@@ -71,7 +71,7 @@ let add_js_module ?import_attributes (hint_name : External_ffi_types.module_bind
       | Phint_nothing -> Ext_modulename.js_id_name_of_hint_name module_name)
   in
   let lam_module_ident : J.module_id =
-    { id; kind = External { name = module_name; default }; dynamic_import = false ; import_attributes }
+    { id; kind = External { name = module_name; default; import_attributes }; dynamic_import = false }
   in
   match Lam_module_ident.Hash.find_key_opt cached_tbl lam_module_ident with
   | None ->

jscomp/core/lam_module_ident.ml

@@ -31,16 +31,16 @@
 
 
 type t = J.module_id = 
-  { id : Ident.t ; kind : Js_op.kind ; dynamic_import : bool ; import_attributes : External_ffi_types.import_attributes option }
+  { id : Ident.t ; kind : Js_op.kind ; dynamic_import : bool}
 
 
 
 let id x = x.id 
 
-let of_ml ?(dynamic_import = false) id = { id ; kind =  Ml ; dynamic_import ; import_attributes = None }
+let of_ml ?(dynamic_import = false) id = { id ; kind =  Ml ; dynamic_import }
 
 
-let of_runtime id = { id ; kind = Runtime ; dynamic_import = false ; import_attributes = None }
+let of_runtime id = { id ; kind = Runtime ; dynamic_import = false }
 
 let name  (x : t) : string  = 
   match x.kind  with 
@@ -52,9 +52,9 @@ module Cmp = struct
   type nonrec t = t
   let equal (x : t) y = 
     match x.kind with 
-    | External {name = x_kind; default = x_default}-> 
+    | External {name = x_kind; default = x_default; _} -> 
       begin match y.kind with 
-        | External {name = y_kind; default = y_default} -> 
+        | External {name = y_kind; default = y_default; _} -> 
           x_kind = (y_kind : string) && x_default = y_default
         | _ -> false 
       end

jscomp/core/lam_module_ident.mli

@@ -41,7 +41,6 @@ type t = J.module_id =
   id : Ident.t ; 
   kind : Js_op.kind ;
   dynamic_import : bool ;
-  import_attributes : External_ffi_types.import_attributes option;
 }