misc fixes

Author: EmileTrotignon

src/model/root.ml

@@ -31,11 +31,12 @@ module Odoc_file = struct
 
   type page = { name : string; title : Comment.link_content option }
 
+
   type t =
     | Page of page
     | Compilation_unit of compilation_unit
     | Impl of string
-    | Asset
+    | Asset of string
 
   let create_unit ~force_hidden name =
     let hidden = force_hidden || Names.contains_double_underscore name in
@@ -46,14 +47,13 @@ module Odoc_file = struct
   let create_impl name = Impl name
 
   let name = function
-    | Page { name; _ } | Compilation_unit { name; _ } | Impl name -> name
-    | Asset -> failwith "todo"
+    | Page { name; _ } | Compilation_unit { name; _ } | Impl name | Asset name -> name
 
   let hidden = function
-    | Page _ | Impl _ | Asset -> false
+    | Page _ | Impl _ | Asset _ -> false
     | Compilation_unit m -> m.hidden
 
-  let asset = Asset
+  let asset name = Asset name
 end
 
 type t = {

src/model/root.mli

@@ -34,15 +34,15 @@ module Odoc_file : sig
     | Page of page
     | Compilation_unit of compilation_unit
     | Impl of string
-    | Asset
+    | Asset of string
 
   val create_unit : force_hidden:bool -> string -> t
 
   val create_page : string -> Comment.link_content option -> t
 
   val create_impl : string -> t
 
-  val asset : t
+  val asset : string -> t
 
   val name : t -> string
 

src/odoc/compile.ml

@@ -351,7 +351,12 @@ let compile_asset ~parent_id ~name ~output_dir =
   let output = Fs.File.create ~directory ~name in
   let digest = Digest.string name in
   let root =
-    Root.{ id = (id :> Paths.Identifier.OdocId.t); digest; file = Asset }
+    Root.
+      {
+        id = (id :> Paths.Identifier.OdocId.t);
+        digest;
+        file = Odoc_file.asset name;
+      }
   in
   let asset = Lang.Asset.{ name = id; root } in
   Odoc_file.save_asset output ~warnings:[] asset

src/odoc/rendering.ml

@@ -98,7 +98,7 @@ let documents_of_odocl ~warnings_options ~renderer ~extra ~source ~syntax input
   | Unit_content odoctree ->
       documents_of_unit ~warnings_options ~source ~syntax ~renderer ~extra
         ~filename odoctree
-  | Asset_content _ -> failwith "todo"
+  | Asset_content _ -> Ok []
 
 let documents_of_input ~renderer ~extra ~resolver ~warnings_options ~syntax
     input =

src/odoc/resolver.ml

@@ -638,6 +638,6 @@ let resolve_import t target_name =
             match root.Odoc_model.Root.file with
             | Compilation_unit _ -> Some root
             | Impl _ | Page _ -> loop tl
-            | Asset -> failwith "todo"))
+            | Asset _ -> failwith "todo"))
   in
   loop (Accessible_paths.find t.ap target_name)