Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions checkmate/modules/tests/aspect_merge_duplication.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{ lib, targetLib, ... }:
let
flake-aspects-lib = import targetLib lib;
in
{
# Test demonstrating duplication issue when merging aspect structures
# from multiple sources using lib.mkMerge at the module level.
#
# The problem: when lib.mkMerge combines pre-evaluated aspect structures,
# the recursive resolution in resolve.nix processes includes multiple times,
# causing multiplicative duplication.
#
# This reproduces the issue seen in den's namespace.nix where:
# config.den.ful.${name} = lib.mkMerge denfuls;
# causes 64x duplication when merging multiple input flakes.

flake.tests."test mkMerge aspect duplication" =
let
# Create two separate pre-evaluated aspect scopes
inputA = lib.evalModules {
modules = [
(flake-aspects-lib.new-scope "ns")
{ ns.aspects.foo.nixos.vals = [ "A" ]; }
];
};

inputB = lib.evalModules {
modules = [
(flake-aspects-lib.new-scope "ns")
{ ns.aspects.bar.nixos.vals = [ "B" ]; }
];
};

# Merge using lib.mkMerge - reproduces den namespace.nix pattern
merged = lib.evalModules {
modules = [
(flake-aspects-lib.new-scope "ns")
{
ns = lib.mkMerge [
inputA.config.ns
inputB.config.ns
];
}
{
ns.aspects.combined.nixos.vals = [ "C" ];
ns.aspects.combined.includes = [
merged.config.ns.aspects.foo
merged.config.ns.aspects.bar
];
}
];
};

# Resolve
resolved = merged.config.ns.aspects.combined.modules.nixos;
result = lib.evalModules {
modules = [
resolved
{ options.vals = lib.mkOption { type = lib.types.listOf lib.types.str; }; }
];
};

allVals = result.config.vals;
sortedVals = lib.sort lib.lessThan allVals;

in
{
expr = sortedVals;
expected = [
"A"
"B"
"C"
];
};
}
53 changes: 53 additions & 0 deletions checkmate/modules/tests/aspect_provides_merge.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{ lib, targetLib, ... }:
{
flake.tests.test-aspects-merged-provides =
let
flake-aspects-lib = import targetLib lib;

first = lib.evalModules {
modules = [
(flake-aspects-lib.new-scope "foo")
(flake-aspects-lib.new-scope "bar")
(flake-aspects-lib.new-scope "baz")
{
foo.aspects.a.provides.b.nixos.x = [ "b" ];
}
{
bar.aspects.a.provides.c.nixos.x = [ "c" ];
}
(
{ config, ... }:
{
bar = config.foo;
}
)
(
{ config, ... }:
{
baz.aspects.all.nixos = { };
baz.aspects.all.includes = [
config.bar.aspects.a._.b
config.bar.aspects.a._.c
];
}
)
];
};

second = lib.evalModules {
modules = [
first.config.baz.aspects.all.modules.nixos
{ options.x = lib.mkOption { type = lib.types.listOf lib.types.str; }; }
];
};

expr = lib.sort (a: b: a < b) (lib.unique second.config.x);
expected = [
"b"
"c"
];
in
{
inherit expr expected;
};
}