feat: modules: refactor to flat structure

src/lib/translators.nix

@@ -24,15 +24,4 @@
 in {
   inherit translators mapTranslators;
   callTranslator = modules.callModule;
-
-  # pupulates a translators special args with defaults
-  getextraArgsDefaults = extraArgsDef:
-    l.mapAttrs
-    (
-      name: def:
-        if def.type == "flag"
-        then false
-        else def.default or null
-    )
-    extraArgsDef;
 }

src/modules/functions.subsystem-loading/implementation.nix

@@ -14,7 +14,7 @@ modules:
 }: let
   lib = config.lib;
   t = lib.types;
-  subsystemsDir = lib.toString ../../../subsystems;
+  subsystemsDir = lib.toString ../../subsystems;
   subsystems = dlib.dirNames subsystemsDir;
 
   /*

src/modules/functions.translators/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./implementation.nix
+    ./interface.nix
+  ];
+}

src/modules/functions.translators/implementation.nix

@@ -0,0 +1,20 @@
+{config, ...}: let
+  lib = config.lib;
+
+  # pupulates a translators special args with defaults
+  makeTranslatorDefaultArgs = extraArgsDef:
+    lib.mapAttrs
+    (
+      name: def:
+        if def.type == "flag"
+        then false
+        else def.default or null
+    )
+    extraArgsDef;
+in {
+  functions.translators = {
+    inherit
+      makeTranslatorDefaultArgs
+      ;
+  };
+}

src/modules/functions.translators/interface.nix

@@ -0,0 +1,8 @@
+{config, ...}: let
+  lib = config.lib;
+  t = lib.types;
+in {
+  options.functions.translators = {
+    makeTranslatorDefaultArgs = lib.mkOption {type = t.functionTo t.anything;};
+  };
+}

src/modules/functions/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./subsystem-loading
-  ];
-}

src/modules/top-level.nix

@@ -6,7 +6,8 @@
   t = lib.types;
 in {
   imports = [
-    ./functions
+    ./functions.subsystem-loading
+    ./functions.translators
     ./translators
   ];
   options = {

src/modules/translators/interface.nix

@@ -12,7 +12,7 @@ in {
         Translator module definitions
       '';
     };
-    translators = lib.mkOption {
+    translatorInstances = lib.mkOption {
       type = t.attrsOf t.anything;
     };
     translatorsBySubsystem = lib.mkOption {

src/subsystems/translators.nix

@@ -86,7 +86,7 @@
           args:
             translateOriginal
             (
-              (dlib.translators.getextraArgsDefaults
+              (framework.functions.translators.makeTranslatorDefaultArgs
                 (translatorModule.extraArgs or {}))
               // args
               // (args.project.subsystemInfo or {})

src/utils/default.nix

@@ -22,6 +22,7 @@
   subsystems,
   config,
   configFile,
+  framework,
   ...
 }: let
   b = builtins;
@@ -197,7 +198,7 @@ in
             project = l.removeAttrs args.project ["dreamLock"];
             outputFile = project.dreamLockPath;
           }
-          // (dlib.translators.getextraArgsDefaults translator.extraArgs or {})
+          // (framework.functions.translators.makeTranslatorDefaultArgs translator.extraArgs or {})
           // args.project.subsystemInfo or {}
         ));
       script =