fix: tests

Author: deemp

tests/extra/commands.lib.nix

@@ -4,12 +4,14 @@ let inherit (pkgs) lib; in
   normalizeCommandsNested =
     let
       commands = (import ../../nix/commands/examples.nix { inherit pkgs; }).nested;
-      check = (import ../../nix/commands/lib.nix { inherit pkgs; }).normalizeCommandsNested commands == [
+      normalizedCommands = (import ../../nix/commands/lib.nix { inherit pkgs; }).normalizeCommandsNested commands;
+      check = normalizedCommands == [
         {
           category = "category 1";
           command = null;
           expose = false;
           help = "[package] jq description";
+          interpolate = null;
           name = "a.b.jq-1";
           package = pkgs.jq;
           prefix = "nix run .#";
@@ -19,6 +21,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = false;
           help = "[package] yq description";
+          interpolate = null;
           name = "a.b.yq-1";
           package = pkgs.yq-go;
           prefix = "nix run ../#";
@@ -28,6 +31,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = false;
           help = "Portable command-line YAML processor";
+          interpolate = null;
           name = "a.b.yq-2";
           package = pkgs.yq-go;
           prefix = "nix run .#";
@@ -37,6 +41,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = false;
           help = "a package manager for JavaScript";
+          interpolate = null;
           name = "npm";
           package = pkgs.nodePackages.npm;
           prefix = "nix run .#";
@@ -46,6 +51,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = true;
           help = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system";
+          interpolate = null;
           name = "a.b.findutils";
           package = pkgs.findutils;
           prefix = "";
@@ -55,6 +61,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = false;
           help = "Command-line benchmarking tool";
+          interpolate = null;
           name = "a.b.hyperfine";
           package = pkgs.hyperfine;
           prefix = "";
@@ -64,6 +71,7 @@ let inherit (pkgs) lib; in
           command = "${lib.getExe pkgs.gawk} $@";
           expose = true;
           help = "[command] run awk";
+          interpolate = null;
           name = "a.b.awk";
           package = null;
           prefix = "";
@@ -73,6 +81,7 @@ let inherit (pkgs) lib; in
           command = "${lib.getExe pkgs.jq} $@";
           expose = true;
           help = "[command] run jq";
+          interpolate = null;
           name = "a.b.jq-2";
           package = null;
           prefix = "";
@@ -82,6 +91,7 @@ let inherit (pkgs) lib; in
           command = ''printf "hello\n"'';
           expose = true;
           help = ''[command] print "hello"'';
+          interpolate = null;
           name = "command with spaces";
           package = null;
           prefix = "";
@@ -91,6 +101,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = true;
           help = null;
+          interpolate = null;
           name = pkgs.python3.name;
           package = pkgs.python3;
           prefix = "";
@@ -100,6 +111,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = true;
           help = "[package] vercel description";
+          interpolate = null;
           name = pkgs.nodePackages.vercel.name;
           package = pkgs.nodePackages.vercel;
           prefix = "";
@@ -109,6 +121,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = true;
           help = null;
+          interpolate = null;
           name = pkgs.nodePackages.yarn.name;
           package = pkgs.nodePackages.yarn;
           prefix = "";
@@ -118,6 +131,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = true;
           help = null;
+          interpolate = null;
           name = null;
           package = pkgs.gnugrep;
           prefix = "";
@@ -127,6 +141,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = true;
           help = "run hello";
+          interpolate = null;
           name = "run cowsay";
           package = pkgs.cowsay;
           prefix = "";
@@ -136,6 +151,7 @@ let inherit (pkgs) lib; in
           command = "${lib.getExe pkgs.perl} $@";
           expose = true;
           help = "run perl";
+          interpolate = null;
           name = "run perl";
           package = null;
           prefix = "";
@@ -145,6 +161,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = true;
           help = "format Nix files";
+          interpolate = null;
           name = "nix fmt";
           package = null;
           prefix = "";
@@ -154,6 +171,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = true;
           help = null;
+          interpolate = null;
           name = null;
           package = pkgs.go;
           prefix = "";
@@ -163,6 +181,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = true;
           help = "[package] run hello ";
+          interpolate = null;
           name = pkgs.hello.name;
           package = pkgs.hello;
           prefix = "";
@@ -172,6 +191,7 @@ let inherit (pkgs) lib; in
           command = null;
           expose = true;
           help = null;
+          interpolate = null;
           name = pkgs.nixpkgs-fmt.name;
           package = pkgs.nixpkgs-fmt;
           prefix = "";

tests/extra/devshell.menu.interpolate.nix

@@ -5,16 +5,16 @@
       shell = devshell.mkShell {
         devshell.menu.interpolate = true;
         commands = [
-          { package = "hello"; help = "hello from '$PRJ_ROOT'!"; }
-          { package = "jq"; help = ''jq from '\$PRJ_ROOT'!''; }
+          { prefix = "hello"; help = ''hello from "$PRJ_ROOT"!''; }
+          { prefix = "hola"; help = ''hola from '\$PRJ_ROOT'!''; }
         ];
       };
     in
     runTest "interpolate" { } ''
       # Check interpolation is enabled
-      cat ${shell}/bin/menu | grep '<<DEVSHELL_MENU'
+      eval ${shell}/bin/menu | grep "hello from \"$PRJ_ROOT\"!"
       
       # Check escaped variable
-      eval ${shell}/bin/menu | grep '\$PRJ_ROOT'
+      eval ${shell}/bin/menu | grep 'hola from '\'''$PRJ_ROOT'\'
     '';
 }