Asset: fix marshalling to a file

The previous saving to file did not include the root first, making the loading
fail. This commits also includes proper testing and completes lang_desc

Signed-off-by: Paul-Elliot <[email protected]>

Author: panglesd

src/model_desc/lang_desc.ml

@@ -719,3 +719,11 @@ and source_tree_page_t =
       F ("digest", (fun t -> t.digest), Digest.t);
       F ("source_children", (fun t -> t.source_children), List identifier);
     ]
+
+and asset_t =
+  let open Lang.Asset in
+  Record
+    [
+      F ("name", (fun t -> t.name), identifier);
+      F ("root", (fun t -> t.root), root);
+    ]

src/odoc/odoc_file.ml

@@ -73,6 +73,16 @@ let save_impl file ~warnings impl =
   save_unit file impl.Lang.Implementation.root
     { content = Impl_content impl; warnings }
 
+let save_asset file ~warnings asset =
+  let dir = Fs.File.dirname file in
+  let base = Fs.File.(to_string @@ basename file) in
+  let file =
+    if Astring.String.is_prefix ~affix:"asset-" base then file
+    else Fs.File.create ~directory:dir ~name:("asset-" ^ base)
+  in
+  let t = { content = Asset_content asset; warnings } in
+  save_unit file asset.root t
+
 let save_unit file ~warnings m =
   save_unit file m.Lang.Compilation_unit.root
     { content = Unit_content m; warnings }
@@ -117,13 +127,3 @@ let load_root file =
 let save_index dst idx = save_ dst (fun oc -> Marshal.to_channel oc idx [])
 
 let load_index file = load_ file (fun ic -> Ok (Marshal.from_channel ic))
-
-let save_asset file ~warnings impl =
-  let dir = Fs.File.dirname file in
-  let base = Fs.File.(to_string @@ basename file) in
-  let file =
-    if Astring.String.is_prefix ~affix:"asset-" base then file
-    else Fs.File.create ~directory:dir ~name:("asset-" ^ base)
-  in
-  let t = { content = Asset_content impl; warnings } in
-  save_ file (fun oc -> Marshal.to_channel oc t [])

test/odoc_print/odoc_print.ml

@@ -252,7 +252,9 @@ let run inp short long_paths show_canonical show_expansions
       | false, None, _ ->
           print_json_desc Lang_desc.compilation_unit_t u;
           Ok ())
-  | Asset_content _ -> failwith "todo"
+  | Asset_content a ->
+      print_json_desc Lang_desc.asset_t a;
+      Ok ()
 
 open Compatcmdliner
 

test/pages/new_assets.t/run.t

@@ -1,4 +1,12 @@
   $ odoc compile-asset --name img.png --parent-id root/test --output-dir odoc
 
-  $ ls odoc/root/test
-  asset-img.png.odoc
+  $ odoc_print odoc/root/test/asset-img.png.odoc
+  {
+    "name": {
+      "`AssetFile": [
+        { "`Page": [ { "Some": { "`Page": [ "None", "root" ] } }, "test" ] },
+        "img.png"
+      ]
+    },
+    "root": "<root>"
+  }