From 2d0ce6252c94cf23477478b35b39466aa120b7cc Mon Sep 17 00:00:00 2001
From: Estevan Castilho <tevo@riajuu.net>
Date: Sat, 12 Sep 2026 01:20:42 +0000
Subject: Directory and registry ergonomics

---
 lib/kernel/Path.ml  | 27 +++++++++++++++++++++++++++
 lib/kernel/Path.mli |  3 +++
 2 files changed, 30 insertions(+)

(limited to 'lib')

diff --git a/lib/kernel/Path.ml b/lib/kernel/Path.ml
index 803d8cf..936704d 100644
--- a/lib/kernel/Path.ml
+++ b/lib/kernel/Path.ml
@@ -3,6 +3,23 @@ type t = string list
 let this = []
 let (@/) x y = x::y
 
+let to_string path =
+  path
+  |> List.map (fun x ->
+         let str = BatString.replace ~str:x ~sub:"^" ~by:"^^" |> snd in
+         BatString.replace ~str ~sub:"/" ~by:"^/" |> snd)
+  |> BatIO.to_string (BatList.print ~first:"/" ~last:"" ~sep:"/" BatString.print)
+
+module Error = struct
+  open Concepts.Condition
+
+  let path_not_found path = condition "path-not-found" "A given path was not found under the specified object"
+                              ("path" |=| Concepts.Value.String (to_string path))
+
+  let not_a_registry path = condition "not-a-registry" "The specified path did not point to a registry"
+                               ("path" |=| Concepts.Value.String (to_string path))
+end
+
 let rec lookup handle = function
   | [] -> Ok (Some handle)
   | x::xs ->
@@ -15,3 +32,13 @@ let rec lookup handle = function
         match elem with
         | None -> Ok None
         | Some elem -> lookup elem xs
+
+let lookup' handle path = lookup handle path
+                          |> Result.map (Option.to_result ~none:(Error.path_not_found path))
+                          |> Result.join
+
+let update handle path key reference value =
+  let open Utilities.Result in
+  let* handle = lookup' handle path in
+  let* registry = Protocols.Registry.from handle |> Option.to_result ~none:(Error.not_a_registry path) in
+  Protocols.Registry.update registry key reference value
diff --git a/lib/kernel/Path.mli b/lib/kernel/Path.mli
index 85d0ca9..e3eac9c 100644
--- a/lib/kernel/Path.mli
+++ b/lib/kernel/Path.mli
@@ -4,3 +4,6 @@ val this : t
 val (@/) : string -> t -> t
 
 val lookup : Protocols.Handle.t -> t -> (Protocols.Handle.t option, Concepts.Condition.condition) result
+val lookup' : Protocols.Handle.t -> t -> (Protocols.Handle.t, Concepts.Condition.condition) result
+
+val update : Protocols.Handle.t -> t -> string -> Protocols.Handle.t option -> Protocols.Handle.t option -> (bool, Concepts.Condition.condition) result
-- 
cgit v1.2.3


From 2ec420d1542ea64978bdd4666a51ec4959f648b7 Mon Sep 17 00:00:00 2001
From: Estevan Castilho <tevo@riajuu.net>
Date: Thu, 17 Sep 2026 01:39:06 +0000
Subject: Forsake `lookup'`

---
 lib/kernel/Path.ml  | 36 +++++++++++++++++++-----------------
 lib/kernel/Path.mli |  3 +--
 2 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'lib')

diff --git a/lib/kernel/Path.ml b/lib/kernel/Path.ml
index 936704d..629a527 100644
--- a/lib/kernel/Path.ml
+++ b/lib/kernel/Path.ml
@@ -17,28 +17,30 @@ module Error = struct
                               ("path" |=| Concepts.Value.String (to_string path))
 
   let not_a_registry path = condition "not-a-registry" "The specified path did not point to a registry"
+                              ("path" |=| Concepts.Value.String (to_string path))
+
+  let not_a_directory path = condition "not-a-directory" "The specified path did not point to a directory"
                                ("path" |=| Concepts.Value.String (to_string path))
 end
 
-let rec lookup handle = function
-  | [] -> Ok (Some handle)
-  | x::xs ->
-     let open Utilities.Result in
-     let open Protocols in
-     match Protocols.Directory.from handle with
-     | None -> Ok None
-     | Some dir ->
-        let* elem = Directory.find dir x in
-        match elem with
-        | None -> Ok None
-        | Some elem -> lookup elem xs
-
-let lookup' handle path = lookup handle path
-                          |> Result.map (Option.to_result ~none:(Error.path_not_found path))
-                          |> Result.join
+let lookup handle path =
+  let rec walk handle = function
+    | [] -> Ok handle
+    | x::xs ->
+       let open Utilities.Result in
+       let open Protocols in
+       match Directory.from handle with
+       | None -> Error (Error.path_not_found path)
+       | Some dir ->
+          let* elem = Directory.find dir x in
+          match elem with
+          | None -> Error (Error.not_a_directory path)
+          | Some elem -> walk elem xs
+  in
+  walk handle path
 
 let update handle path key reference value =
   let open Utilities.Result in
-  let* handle = lookup' handle path in
+  let* handle = lookup handle path in
   let* registry = Protocols.Registry.from handle |> Option.to_result ~none:(Error.not_a_registry path) in
   Protocols.Registry.update registry key reference value
diff --git a/lib/kernel/Path.mli b/lib/kernel/Path.mli
index e3eac9c..6a74350 100644
--- a/lib/kernel/Path.mli
+++ b/lib/kernel/Path.mli
@@ -3,7 +3,6 @@ type t
 val this : t
 val (@/) : string -> t -> t
 
-val lookup : Protocols.Handle.t -> t -> (Protocols.Handle.t option, Concepts.Condition.condition) result
-val lookup' : Protocols.Handle.t -> t -> (Protocols.Handle.t, Concepts.Condition.condition) result
+val lookup : Protocols.Handle.t -> t -> (Protocols.Handle.t, Concepts.Condition.condition) result
 
 val update : Protocols.Handle.t -> t -> string -> Protocols.Handle.t option -> Protocols.Handle.t option -> (bool, Concepts.Condition.condition) result
-- 
cgit v1.2.3