Upgrade ocamlformat

.ocamlformat

@@ -1,4 +1,4 @@
-version = 0.26.2
+version = 0.27.0
 profile = janestreet
 margin = 80
 parse-docstrings

js/dune

@@ -1,8 +1,10 @@
 (executable
  (name capsule_js)
  (modes js)
- (preprocess (pps js_of_ocaml-ppx))
- (js_of_ocaml (flags :standard))
+ (preprocess
+  (pps js_of_ocaml-ppx))
+ (js_of_ocaml
+  (flags :standard))
  (promote
   (until-clean)
   (into "../hell/_build")

lib/generator/action.ml

@@ -75,9 +75,9 @@ let process_misc_files (module R : Intf.RESOLVER) =
 ;;
 
 let layout_arrow
-  (type a)
-  (module A : Archetype.Types.ARCHETYPE with type t = a)
-  (module R : Intf.RESOLVER)
+      (type a)
+      (module A : Archetype.Types.ARCHETYPE with type t = a)
+      (module R : Intf.RESOLVER)
   =
   let open Yocaml.Task in
   Yocaml_jingoo.Pipeline.as_template
@@ -89,14 +89,14 @@ let layout_arrow
 ;;
 
 let page_arrow
-  (type a b)
-  (module A : Archetype.Types.ARCHETYPE with type t = a and type Input.t = b)
-  (module R : Intf.RESOLVER)
-  template
-  kind
-  config
-  source
-  target
+      (type a b)
+      (module A : Archetype.Types.ARCHETYPE with type t = a and type Input.t = b)
+      (module R : Intf.RESOLVER)
+      template
+      kind
+      config
+      source
+      target
   =
   let open Yocaml.Task in
   R.track_common_deps

lib/generator/archetype/address.ml

@@ -19,12 +19,12 @@ module Input = struct
     let* page = Raw.Input.validate obj in
     record
       (fun fields ->
-        let+ country = required fields "country" string
-        and+ city = required fields "city" string
-        and+ zipcode = required fields "zipcode" string
-        and+ address = required fields "address" string
-        and+ osm_image = optional fields "osm_image" Model.Url.validate in
-        { page; country; city; zipcode; address; osm_image })
+         let+ country = required fields "country" string
+         and+ city = required fields "city" string
+         and+ zipcode = required fields "zipcode" string
+         and+ address = required fields "address" string
+         and+ osm_image = optional fields "osm_image" Model.Url.validate in
+         { page; country; city; zipcode; address; osm_image })
       obj
   ;;
 end

lib/generator/archetype/config.ml

@@ -43,17 +43,17 @@ let validate =
 ;;
 
 let normalize
-  { title
-  ; repository
-  ; branch
-  ; software_license
-  ; content_license
-  ; owner
-  ; svg
-  ; main_url
-  ; default_cover
-  ; journal_entries_per_page
-  }
+      { title
+      ; repository
+      ; branch
+      ; software_license
+      ; content_license
+      ; owner
+      ; svg
+      ; main_url
+      ; default_cover
+      ; journal_entries_per_page
+      }
   =
   let open Yocaml.Data in
   record

lib/generator/archetype/gallery.ml

@@ -45,10 +45,10 @@ module Input = struct
     let* page = Raw.Input.validate obj in
     record
       (fun fields ->
-        let+ elements =
-          optional_or ~default:[] fields "elements" (list_of validate_elt)
-        in
-        { page; elements })
+         let+ elements =
+           optional_or ~default:[] fields "elements" (list_of validate_elt)
+         in
+         { page; elements })
       obj
   ;;
 end

lib/generator/archetype/journal.ml

@@ -48,14 +48,14 @@ let normalize { page; entries; length; index } =
 ;;
 
 let full_configure
-  ~config
-  ~source
-  ~target
-  ~kind
-  ~on_synopsis
-  ~length
-  ~entries
-  ~index
+      ~config
+      ~source
+      ~target
+      ~kind
+      ~on_synopsis
+      ~length
+      ~entries
+      ~index
   =
   Yocaml.Task.Static.on_metadata
     (Yocaml.Task.lift

lib/generator/feed.ml

@@ -13,33 +13,33 @@ type t =
 [@@ocaml.warning "-69"]
 
 let from_source
-  (type a)
-  (module P : Yocaml.Required.DATA_PROVIDER)
-  (module D : Yocaml.Required.DATA_READABLE with type t = a)
-  ?(on = `Source)
-  ~where
-  ~to_entry
-  ~compute_link
-  path
+      (type a)
+      (module P : Yocaml.Required.DATA_PROVIDER)
+      (module D : Yocaml.Required.DATA_READABLE with type t = a)
+      ?(on = `Source)
+      ~where
+      ~to_entry
+      ~compute_link
+      path
   =
   let open Yocaml.Eff in
   let* files = read_directory ~on ~only:`Files ~where path in
   let+ elements =
     List.traverse
       (fun file ->
-        let url = compute_link file in
-        let+ metadata, _content =
-          read_file_with_metadata (module P) (module D) ~on file
-        in
-        to_entry ~file ~url metadata)
+         let url = compute_link file in
+         let+ metadata, _content =
+           read_file_with_metadata (module P) (module D) ~on file
+         in
+         to_entry ~file ~url metadata)
       files
   in
   elements
 ;;
 
 let journal_entries
-  (module P : Yocaml.Required.DATA_PROVIDER)
-  (module R : Intf.RESOLVER)
+      (module P : Yocaml.Required.DATA_PROVIDER)
+      (module R : Intf.RESOLVER)
   =
   let open Yocaml.Eff in
   let* files =
@@ -52,19 +52,19 @@ let journal_entries
   let+ elements =
     List.traverse
       (fun file ->
-        let url = R.Target.as_journal_entry file in
-        let+ metadata, content =
-          read_file_with_metadata
-            (module P)
-            (module Archetype.Journal_entry.Input)
-            ~on:`Source
-            file
-        in
-        let metadata =
-          Archetype.Journal_entry.replace_datetime ~file metadata
-        in
-        ( (metadata, content, file)
-        , Archetype.Journal_entry.Input.to_entry ~file ~url metadata ))
+         let url = R.Target.as_journal_entry file in
+         let+ metadata, content =
+           read_file_with_metadata
+             (module P)
+             (module Archetype.Journal_entry.Input)
+             ~on:`Source
+             file
+         in
+         let metadata =
+           Archetype.Journal_entry.replace_datetime ~file metadata
+         in
+         ( (metadata, content, file)
+         , Archetype.Journal_entry.Input.to_entry ~file ~url metadata ))
       files
   in
   elements |> Stdlib.List.split
@@ -73,16 +73,16 @@ let journal_entries
 let compute_map_from_tags source m =
   List.fold_left
     (fun m entry ->
-      List.fold_left
-        (fun m tag ->
-          M.update
-            tag
-            (function
-              | None -> Some [ entry ]
-              | Some xs -> Some (entry :: xs))
-            m)
-        m
-        (Model.Entry.tags_of entry))
+       List.fold_left
+         (fun m tag ->
+            M.update
+              tag
+              (function
+                | None -> Some [ entry ]
+                | Some xs -> Some (entry :: xs))
+              m)
+         m
+         (Model.Entry.tags_of entry))
     m
     source
 ;;
@@ -143,12 +143,12 @@ let make (module P : Yocaml.Required.DATA_PROVIDER) (module R : Intf.RESOLVER) =
 ;;
 
 let create_journal_feed
-  (module P : Yocaml.Required.DATA_PROVIDER)
-  (module R : Intf.RESOLVER)
-  on_synopsis
-  config
-  { journal_meta; _ }
-  cache
+      (module P : Yocaml.Required.DATA_PROVIDER)
+      (module R : Intf.RESOLVER)
+      on_synopsis
+      config
+      { journal_meta; _ }
+      cache
   =
   let by_page = Archetype.Config.journal_entries_per_page config in
   let entries = Std.List.split_by_size by_page journal_meta in
@@ -159,43 +159,43 @@ let create_journal_feed
       ~state:0
       entries
       (fun entries state cache ->
-        let index = state in
-        let deps = Archetype.Journal.deps_of entries in
-        let target = R.Target.as_journal_feed_page index in
-        let source = R.Source.journal_feed in
-        let length = len in
-        let+ cache =
-          Yocaml.Action.Static.write_file_with_metadata
-            (R.Target.promote target)
-            (let open Yocaml.Task in
-             R.track_common_deps
-             >>> Yocaml.Pipeline.track_files deps
-             >>> Yocaml.Pipeline.read_file_as_metadata
-                   (module P)
-                   (module Archetype.Journal.Input)
-                   source
-             >>> Yocaml.Task.empty_body ()
-             >>> Archetype.Journal.full_configure
-                   ~config
-                   ~source
-                   ~target
-                   ~kind:Model.Types.Article
-                   ~on_synopsis
-                   ~length
-                   ~entries
-                   ~index
-             >>> Yocaml_jingoo.Pipeline.as_template
-                   (module Archetype.Journal)
-                   (R.Source.template "journal-feed.html")
-             >>> Yocaml_jingoo.Pipeline.as_template
-                   (module Archetype.Journal)
-                   (R.Source.template "page-header.html")
-             >>> Yocaml_jingoo.Pipeline.as_template
-                   (module Archetype.Journal)
-                   (R.Source.template "layout.html"))
-            cache
-        in
-        cache, succ index)
+         let index = state in
+         let deps = Archetype.Journal.deps_of entries in
+         let target = R.Target.as_journal_feed_page index in
+         let source = R.Source.journal_feed in
+         let length = len in
+         let+ cache =
+           Yocaml.Action.Static.write_file_with_metadata
+             (R.Target.promote target)
+             (let open Yocaml.Task in
+              R.track_common_deps
+              >>> Yocaml.Pipeline.track_files deps
+              >>> Yocaml.Pipeline.read_file_as_metadata
+                    (module P)
+                    (module Archetype.Journal.Input)
+                    source
+              >>> Yocaml.Task.empty_body ()
+              >>> Archetype.Journal.full_configure
+                    ~config
+                    ~source
+                    ~target
+                    ~kind:Model.Types.Article
+                    ~on_synopsis
+                    ~length
+                    ~entries
+                    ~index
+              >>> Yocaml_jingoo.Pipeline.as_template
+                    (module Archetype.Journal)
+                    (R.Source.template "journal-feed.html")
+              >>> Yocaml_jingoo.Pipeline.as_template
+                    (module Archetype.Journal)
+                    (R.Source.template "page-header.html")
+              >>> Yocaml_jingoo.Pipeline.as_template
+                    (module Archetype.Journal)
+                    (R.Source.template "layout.html"))
+             cache
+         in
+         cache, succ index)
       cache
   in
   cache

lib/generator/model/identity.ml

@@ -65,18 +65,18 @@ let validate =
 ;;
 
 let normalize
-  { display_name
-  ; first_name
-  ; last_name
-  ; avatar
-  ; website
-  ; custom_attributes
-  ; more_links
-  ; x_account
-  ; mastodon_account
-  ; github_account
-  ; more_accounts
-  }
+      { display_name
+      ; first_name
+      ; last_name
+      ; avatar
+      ; website
+      ; custom_attributes
+      ; more_links
+      ; x_account
+      ; mastodon_account
+      ; github_account
+      ; more_accounts
+      }
   =
   let open Yocaml.Data in
   let m_instance = Option.map fst mastodon_account

lib/generator/model/index.ml

@@ -16,8 +16,8 @@ let sort_by links = function
       | "link-title" | "link-name" | "name" | "title" ->
         List.sort
           (fun a b ->
-            let f = if rev then -1 else 1 in
-            f * Link.compare_title a b)
+             let f = if rev then -1 else 1 in
+             f * Link.compare_title a b)
           links
       | _ -> if rev then List.rev links else links
     in