fix(just): fixes improper formatting of tasks

nix-community · May 27, 2022 · c64ad25 · c64ad25
1 parent aa68983
commit c64ad25
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/flake.nix b/flake.nix
@@ -40,8 +40,11 @@
         # Create justfile
         justConfig = {
           tasks = {
-            fmt = [
-              "@${tools.nixpkgs-fmt.exe} $(git ls-files **/*.nix)"
+            "check" = [
+              "@nix flake check"
+            ];
+            "fmt flags=''" = [
+              "@${tools.nixpkgs-fmt.exe} {{ flags }} flake.nix $(git ls-files '**/*.nix')"
             ];
           };
         };

diff --git a/plugins/just/make.nix b/plugins/just/make.nix
@@ -6,6 +6,7 @@ let
     files = [ ./template.cue ];
     output = ".justfile";
     postBuild = ''
+      cat $out
       ${pkgs.just}/bin/just --unstable --fmt -f $out
     '';
     flags = {

diff --git a/plugins/just/template.cue b/plugins/just/template.cue
@@ -1,5 +1,6 @@
 package just
 
+import "strings"
 import "text/template"
 
 #Config: {
@@ -9,15 +10,22 @@ import "text/template"
 
 data: #Config
 
+_final: {
+    head: data.head
+    tasks: {
+        for task, steps in data.tasks {
+            "\(task)": strings.Join(steps, "\n    ")
+        }
+    }
+}
+
 tmpl:
 """
 {{ .head -}}
-{{ range $name, $tasks := .tasks -}}
-    {{ $name -}}:
-    {{ range $tasks -}}
-        {{ . }}
-    {{ end }}
+{{ range $name, $steps := .tasks }}
+{{ $name }}:
+    {{ $steps }}
 {{- end }}
 """
 
-rendered: template.Execute(tmpl, data)
+rendered: template.Execute(tmpl, _final)