refactor(types): extract fixed-size RON array type into separate func…

…tion Create ronArrayOf type constructor to handle fixed-size array validation and description generation, reducing code duplication in array type handling.
HeitorAugustoLN · Dec 31, 2024 · 5bd2add · 5bd2add
1 parent ed3482d
commit 5bd2add
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/lib/types.nix b/lib/types.nix
@@ -72,6 +72,16 @@
     name = "rawRon";
   };
 
+  ronArrayOf =
+    elemType: size:
+    with lib.types;
+    addCheck (listOf elemType) (x: builtins.length x == size)
+    // {
+      description = "list of ${
+        optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType
+      } with a fixed-size of ${toString size} elements";
+    };
+
   ronChar = lib.mkOptionType {
     check =
       value:

diff --git a/lib/utils.nix b/lib/utils.nix
@@ -52,13 +52,7 @@
               size = if matches != null then builtins.elemAt matches 1 else null;
             in
             if matches != null then
-              with lib.types;
-              (addCheck (listOf (rustToNixType' innerType)) (x: builtins.length x == (builtins.fromJSON size)))
-              // {
-                description = "list of ${
-                  optionDescriptionPhrase (class: class == "noun" || class == "composite") (rustToNixType' innerType)
-                } with a fixed-size of ${size} elements";
-              }
+              lib.types.ronArrayOf (rustToNixType' innerType) (builtins.fromJSON size)
             else
               null;
           handleTuple =