CR

Author: hhugo

compiler/bin-js_of_ocaml/cmd_arg.ml

@@ -280,6 +280,7 @@ let options =
       input_file
       js_files
       keep_unit_names =
+    let inline_source_content = not sourcemap_don't_inline_content in
     let chop_extension s = try Filename.chop_extension s with Invalid_argument _ -> s in
     let runtime_files = js_files in
     let fs_external = fs_external || (toplevel && no_cmis) in
@@ -308,13 +309,9 @@ let options =
         in
         Some
           ( sm_output_file
-          , { Source_map.Standard.version = 3
-            ; file
+          , { (Source_map.Standard.empty ~inline_source_content) with
+              file
             ; sourceroot = sourcemap_root
-            ; sources = []
-            ; sources_content = (if sourcemap_don't_inline_content then None else Some [])
-            ; names = []
-            ; mappings = Source_map.Mappings.empty
             } )
       else None
     in
@@ -519,6 +516,7 @@ let options_runtime_only =
       target_env
       output_file
       js_files =
+    let inline_source_content = not sourcemap_don't_inline_content in
     let chop_extension s = try Filename.chop_extension s with Invalid_argument _ -> s in
     let runtime_files = js_files in
     let output_file =
@@ -537,13 +535,9 @@ let options_runtime_only =
         in
         Some
           ( sm_output_file
-          , { Source_map.Standard.version = 3
-            ; file
+          , { (Source_map.Standard.empty ~inline_source_content) with
+              file
             ; sourceroot = sourcemap_root
-            ; sources = []
-            ; sources_content = (if sourcemap_don't_inline_content then None else Some [])
-            ; names = []
-            ; mappings = Source_map.Mappings.empty
             } )
       else None
     in

compiler/bin-js_of_ocaml/compile.ml

@@ -85,10 +85,10 @@ let find_source file =
       else None
 
 let sourcemap_section_of_info
-    ~base:(sm : Source_map.Standard.t)
+    ~(base : Source_map.Standard.t)
     { Source_map.sources; names; mappings } =
   let sources_content =
-    match sm.sources_content with
+    match base.sources_content with
     | None -> None
     | Some _ -> Some (List.map ~f:find_source sources)
   in
@@ -100,19 +100,19 @@ let sourcemap_section_of_info
   in
   let offset, mappings = Source_map.Mappings.encode_with_offset mappings in
   let map =
-    { (sm : Source_map.Standard.t) with sources; sources_content; names; mappings }
+    { (base : Source_map.Standard.t) with sources; sources_content; names; mappings }
   in
   { Source_map.Index.offset; map }
 
 let sourcemap_of_infos ~base l =
   match base with
   | None -> None
-  | Some (sm : Source_map.Standard.t) ->
-      let sections = List.map l ~f:(sourcemap_section_of_info ~base:sm) in
+  | Some (base : Source_map.Standard.t) ->
+      let sections = List.map l ~f:(sourcemap_section_of_info ~base) in
       Some
         (Source_map.Index
-           { Source_map.Index.version = sm.Source_map.Standard.version
-           ; file = sm.file
+           { Source_map.Index.version = base.Source_map.Standard.version
+           ; file = base.file
            ; sections
            })
 

compiler/bin-js_of_ocaml/link.ml

@@ -102,13 +102,9 @@ let options =
         in
         Some
           ( sm_output_file
-          , { Source_map.Standard.version = 3
-            ; file
+          , { (Source_map.Standard.empty ~inline_source_content:true) with
+              file
             ; sourceroot = sourcemap_root
-            ; sources = []
-            ; sources_content = Some []
-            ; names = []
-            ; mappings = Source_map.Mappings.empty
             } )
       else None
     in

compiler/lib/source_map.ml

@@ -323,12 +323,12 @@ module Standard = struct
     ; mappings : Mappings.t
     }
 
-  let empty =
+  let empty ~inline_source_content =
     { version = 3
     ; file = None
     ; sourceroot = None
     ; sources = []
-    ; sources_content = None
+    ; sources_content = (if inline_source_content then Some [] else None)
     ; names = []
     ; mappings = Mappings.empty
     }
@@ -393,9 +393,16 @@ module Standard = struct
                     sources = List.rev_append sm.sources acc_rev.sources
                   ; names = List.rev_append sm.names acc_rev.names
                   ; sources_content =
-                      (match sm.sources_content, acc_rev.sources_content with
-                      | Some x, Some acc_rev -> Some (List.rev_append x acc_rev)
-                      | None, _ | _, None -> None)
+                      (match acc_rev.sources_content with
+                      | Some acc_rev -> (
+                          match sm.sources_content with
+                          | Some x -> Some (List.rev_append x acc_rev)
+                          | None _ ->
+                              Some
+                                (List.rev_append
+                                   (List.map sm.sources ~f:(fun _ -> None))
+                                   acc_rev)
+                          | None -> None))
                   ; mappings = Mappings.empty
                   }
                 , List.rev_append_map
@@ -411,12 +418,7 @@ module Standard = struct
                 rest
         in
         let acc_rev, mappings_rev =
-          loop
-            { empty with sources_content = Some [] }
-            []
-            ~sources_offset:0
-            ~names_offset:0
-            l
+          loop (empty ~inline_source_content:true) [] ~sources_offset:0 ~names_offset:0 l
         in
         Some
           { acc_rev with

compiler/lib/source_map.mli

@@ -109,7 +109,7 @@ module Standard : sig
   (** Merge two lists of debug mappings. The time cost of the merge is more than
     linear in function of the size of the input mappings. *)
 
-  val empty : t
+  val empty : inline_source_content:bool -> t
 end
 
 module Index : sig

compiler/tests-compiler/sourcemap.ml

@@ -135,15 +135,15 @@ let%expect_test _ =
       { gen_line; gen_col; ori_source = source; ori_line = line; ori_col = col }
   in
   let s1 : Source_map.Standard.t =
-    { Source_map.Standard.empty with
+    { (Source_map.Standard.empty ~inline_source_content:false) with
       names = [ "na"; "nb"; "nc" ]
     ; sources = [ "sa"; "sb" ]
     ; mappings =
         Source_map.Mappings.encode [ gen (1, 1) (10, 10) 0; gen (3, 3) (20, 20) 1 ]
     }
   in
   let s2 : Source_map.Standard.t =
-    { Source_map.Standard.empty with
+    { (Source_map.Standard.empty ~inline_source_content:false) with
       names = [ "na2"; "nb2" ]
     ; sources = [ "sa2" ]
     ; mappings = Source_map.Mappings.encode [ gen (3, 3) (5, 5) 0 ]