refactor translators: introduce all

nix-community · Feb 25, 2022 · 5b39b72 · 5b39b72
1 parent 5004d7e
commit 5b39b72
Showing 1 changed file with 38 additions and 8 deletions.
diff --git a/src/lib/translators.nix b/src/lib/translators.nix
@@ -13,11 +13,28 @@ let
 
   # attrset of: subsystem -> translator-type -> (function subsystem translator-type)
   mkTranslatorsSet = function:
-    l.genAttrs (dlib.dirNames ../translators) (subsystem:
-      l.genAttrs
-        (l.filter (dir: builtins.pathExists (../translators + "/${subsystem}/${dir}")) translatorTypes)
-        (transType: function subsystem transType)
-    );
+    l.genAttrs
+      (dlib.dirNames ../translators)
+      (subsystem:
+        let
+          availableTypes =
+            l.filter
+              (type: l.pathExists (../translators + "/${subsystem}/${type}"))
+              translatorTypes;
+
+          translatorsForTypes =
+            l.genAttrs
+              availableTypes
+              (transType: function subsystem transType);
+
+        in
+          translatorsForTypes // {
+            all =
+              l.foldl'
+                (a: b: a // b)
+                {}
+                (l.attrValues translatorsForTypes);
+          });
 
   # flat list of all translators sorted by priority (pure translators first)
   translatorsList =
@@ -58,9 +75,22 @@ let
 
   # attrset of: subsystem -> translator-type -> translator
   translators = mkTranslatorsSet (subsystem: type:
-    l.genAttrs (dlib.dirNames (../translators + "/${subsystem}/${type}")) (translatorName:
-      callTranslator subsystem type translatorName (../translators + "/${subsystem}/${type}/${translatorName}") {}
-    )
+    let
+      translatorNames =
+        dlib.dirNames (../translators + "/${subsystem}/${type}");
+
+      translatorsLoaded =
+        l.genAttrs
+          translatorNames
+          (translatorName:
+            callTranslator
+              subsystem
+              type
+              translatorName
+              (../translators + "/${subsystem}/${type}/${translatorName}")
+              {});
+    in
+      translatorsLoaded
   );
 
   mapTranslators = f: