Merge pull request 'lib/jsonschema: remove unused arguments' (#5176) from lib-1 into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5176

lib/jsonschema/default.nix

@@ -6,7 +6,6 @@
     "functionTo"
     "package"
   ],
-  includeDefaults ? true,
   filterSchema ?
     schema: lib.filterAttrsRecursive (name: _value: name != "$exportedModuleInfo") schema,
   header ? {
@@ -61,7 +60,7 @@ rec {
         inherit specialArgs;
       };
     in
-    (_parseOptions evaled.options { });
+    filterSchema (_parseOptions evaled.options { });
 
   # get default value from option
 
@@ -70,9 +69,7 @@ rec {
   # - Value is "<thunk>" (string literal) if the option has a defaultText attribute. This means we cannot evaluate default safely
   getDefaultFrom =
     opt:
-    if !includeDefaults then
+    if opt ? defaultText then
-      { }
-    else if opt ? defaultText then
       {
         # dont add default to jsonschema. It seems to alter the type
         # default = "<thunk>";

lib/jsonschema/test_parseOptions.nix

@@ -4,13 +4,9 @@
   lib ? (import <nixpkgs> { }).lib,
   slib ? (import ./. { inherit lib; } { }),
 }:
-let
-  filterSchema =
-    schema: lib.filterAttrsRecursive (name: _value: name != "$exportedModuleInfo") schema;
-in
 {
   testParseOptions = {
-    expr = filterSchema (slib.parseModule ./example-interface.nix);
+    expr = (slib.parseModule ./example-interface.nix);
     expected = builtins.fromJSON (builtins.readFile ./example-schema.json);
   };
 
@@ -31,7 +27,7 @@ in
       };
     in
     {
-      expr = filterSchema (slib.parseOptions evaled.options { });
+      expr = (slib.parseOptions evaled.options { });
       expected = {
         "$schema" = "http://json-schema.org/draft-07/schema#";
         additionalProperties = false;
@@ -64,7 +60,7 @@ in
       };
     in
     {
-      expr = filterSchema (
+      expr = (
         slib.parseOptions
           (lib.evalModules {
             modules = [

lib/modules/inventory/distributed-service/api-feature.nix

@@ -4,7 +4,6 @@
 { clanLib, prefix }:
 let
   converter = clanLib.jsonschema {
-    includeDefaults = true;
   };
 in
 { lib, config, ... }:

lib/modules/inventory/schemas/default.nix

@@ -6,8 +6,7 @@
   ...
 }:
 let
-  jsonLib = self.clanLib.jsonschema { inherit includeDefaults; };
+  jsonLib = self.clanLib.jsonschema { };
-  includeDefaults = true;
 
   opts = (flakeOptions.flake.type.getSubOptions [ "flake" ]);
   clanOpts = opts.clan.type.getSubOptions [ "clan" ];