Make it explicit when we manipulate standard source maps

Author: vouillon

compiler/lib-wasm/link.ml

@@ -860,11 +860,12 @@ let rec get_source_map_files files src_index =
   if Zip.has_entry z ~name:"source_map.map"
   then
     let data = Zip.read_entry z ~name:"source_map.map" in
-    let sm = Source_map.of_string data in
+    let sm = Source_map.Standard.of_string data in
     if not (Wasm_source_map.is_empty sm)
     then (
       let l = ref [] in
-      Wasm_source_map.iter_sources sm (fun i j file -> l := source_name i j file :: !l);
+      Wasm_source_map.iter_sources (Standard sm) (fun i j file ->
+          l := source_name i j file :: !l);
       if not (List.is_empty !l)
       then z, Array.of_list (List.rev !l)
       else (

compiler/lib-wasm/wasm_link.ml

@@ -1497,7 +1497,7 @@ type t =
   { module_name : string
   ; file : string
   ; contents : Read.t
-  ; source_map_contents : Source_map.t option
+  ; source_map_contents : Source_map.Standard.t option
   }
 
 type import_status =
@@ -1877,8 +1877,8 @@ let f files ~output_file ~opt_output_sourcemap_file =
             Option.map
               ~f:(fun src ->
                 match src with
-                | `File file -> Source_map.of_file ~tmp_buf file
-                | `Data data -> Source_map.of_string ~tmp_buf data)
+                | `File file -> Source_map.Standard.of_file ~tmp_buf file
+                | `Data data -> Source_map.Standard.of_string ~tmp_buf data)
               opt_source_map
         })
       (Array.of_list files)

compiler/lib-wasm/wasm_source_map.ml

@@ -82,31 +82,21 @@ let resize_mappings (resize_data : resize_data) mappings =
       0;
     Buffer.contents buf
 
-let resize resize_data sm =
-  match sm with
-  | Source_map.Index _ -> assert false
-  | Standard sm ->
-      let mappings = Source_map.Mappings.to_string sm.mappings in
-      let mappings = resize_mappings resize_data mappings in
-      Source_map.Standard
-        { sm with mappings = Source_map.Mappings.of_string_unsafe mappings }
-
-let is_empty sm =
-  match sm with
-  | Source_map.Standard { mappings; _ } -> Source_map.Mappings.is_empty mappings
-  | _ -> assert false
+let resize resize_data (sm : Source_map.Standard.t) =
+  let mappings = Source_map.Mappings.to_string sm.mappings in
+  let mappings = resize_mappings resize_data mappings in
+  { sm with mappings = Source_map.Mappings.of_string_unsafe mappings }
+
+let is_empty { Source_map.Standard.mappings; _ } = Source_map.Mappings.is_empty mappings
 
 let concatenate l =
   Source_map.Index
     { version = 3
     ; file = None
     ; sections =
         List.map
-          ~f:(fun (ofs, sm) ->
-            match sm with
-            | Source_map.Index _ -> assert false
-            | Standard map ->
-                { Source_map.Index.offset = { gen_line = 0; gen_column = ofs }; map })
+          ~f:(fun (ofs, map) ->
+            { Source_map.Index.offset = { gen_line = 0; gen_column = ofs }; map })
           l
     }
 

compiler/lib-wasm/wasm_source_map.mli

@@ -1,16 +1,16 @@
 type t
 
-val is_empty : Source_map.t -> bool
+val is_empty : Source_map.Standard.t -> bool
 
 type resize_data =
   { mutable i : int
   ; mutable pos : int array
   ; mutable delta : int array
   }
 
-val resize : resize_data -> Source_map.t -> Source_map.t
+val resize : resize_data -> Source_map.Standard.t -> Source_map.Standard.t
 
-val concatenate : (int * Source_map.t) list -> Source_map.t
+val concatenate : (int * Source_map.Standard.t) list -> Source_map.t
 
 val iter_sources : Source_map.t -> (int option -> int option -> string -> unit) -> unit
 

compiler/lib/source_map.ml

@@ -564,6 +564,10 @@ module Standard = struct
         }
     | _ -> invalid ()
 
+  let of_string ?tmp_buf s = of_json ?tmp_buf (Yojson.Raw.from_string ?buf:tmp_buf s)
+
+  let of_file ?tmp_buf f = of_json ?tmp_buf (Yojson.Raw.from_file ?buf:tmp_buf f)
+
   let to_string m = Yojson.Raw.to_string (json m)
 
   let to_file m file = Yojson.Raw.to_file file (json m)

compiler/lib/source_map.mli

@@ -116,6 +116,10 @@ module Standard : sig
     linear in function of the size of the input mappings. *)
 
   val empty : inline_source_content:bool -> t
+
+  val of_string : ?tmp_buf:Buffer.t -> string -> t
+
+  val of_file : ?tmp_buf:Buffer.t -> string -> t
 end
 
 module Index : sig