From f824ac2ea3fa483a059249ce2d0aae0a70aef204 Mon Sep 17 00:00:00 2001
From: atagen <atagen@boss.co>
Date: Tue, 3 Dec 2024 14:18:09 +1100
Subject: [PATCH] clarify colour permutation behaviour

---
 lib/processing.ml | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/lib/processing.ml b/lib/processing.ml
index e30a37e..83a8d05 100644
--- a/lib/processing.ml
+++ b/lib/processing.ml
@@ -1,15 +1,30 @@
 open Types
+open Array
 
 let ansi_filter s =
   s |> function
   | Ansi a ->
       Types.Ansi
         (List.filter
-           (function Types.Fg _ | Types.Bg _ -> false | _ -> true)
+           (function Fg _ | Bg _ -> false | _ -> true)
            a)
   | n -> n
 
-let permute order a = Array.mapi (fun i _ -> a.(order.(i))) a
+let permute (order : int array) (colours : colour array) =
+  let olen = length order and clen = length colours in
+  match (olen, clen) with
+  (* nothing provided, take default 16 pal colours *)
+  | 0, 0 -> Seq.ints 0 |> Seq.take 16 |> Seq.map (fun i -> Simple i) |> of_seq
+  (* colours provided with no order, take them as is *)
+  | 0, _ -> colours
+  (* order provided with no colours, map to palette colours *)
+  | _, 0 -> order |> map (fun o -> Simple o)
+  (* order and colours provided, apply order to colours and sub palette where
+  order index exceeds colour array length *)
+  | _, _ ->
+      order
+      |> mapi (fun i o ->
+             if order.(i) < clen then colours.(order.(i)) else Simple o)
 
 (* TODO: implement this so cli can use a dsl to specify colourising patterns *)
 type culr = { colours : colour array; sz : int; mutable current : int }
@@ -21,17 +36,17 @@ module Culriser = struct
   let run_filters (f : filter) el =
     List.fold_left (fun res filt -> if not (filt el) then false else res) true f
 
-  let create s f c =
-    let ( @ ) = Array.append in
+  let create s f (c : colour array) =
+    let ( @ ) = append in
     let colours =
       c |> permute s |> fun c ->
       if List.length f > 0 then
-        Array.fold_left
+        fold_left
           (fun acc el -> if run_filters f el then acc @ [| el |] else acc)
           [||] c
       else c
     in
-    { colours; sz = Array.length colours; current = 0 }
+    { colours; sz = length colours; current = 0 }
 
   let next t =
     let ret = t.current and nv = t.current + 1 in