refactor: use jq proviso filter files

Author: blaggacao

src/actions.nix

@@ -13,29 +13,23 @@
         nix build ${contextFreeDrv target}
       '';
       targetDrv = target.drvPath;
-      proviso =
+      proviso = let
+        filter = ./build-filter.jq;
+      in
         l.toFile "build-proviso"
         # bash
         ''
-          # FIXME: merge upstream to avoid any need for runtime context
-          command nix build github:divnix/nix-uncached?ref=refs/pull/2/head
-
           local -a drvs
           eval "$(
-            command jq --raw-output '
-              "drvs=(\(map(.targetDrv|strings)|@sh))"
-            ' <<< "$1"
+            command jq --raw-output '"drvs=(\(map(.targetDrv|strings)|@sh))"' <<< "$1"
           )"
 
+          # FIXME: merge upstream to avoid any need for runtime context
+          command nix build github:divnix/nix-uncached?ref=refs/pull/2/head
+
           command jq --raw-output \
             --argjson checked "$(./result/bin/nix-uncached ''${drvs[@]})" \
-          ' (
-              $checked | with_entries(select(.value == [])) | keys
-            ) as $cached
-            | map(select(
-              [.targetDrv] | IN($cached) | not
-            ))
-          ' <<< "$1"
+            --from-file ${filter} <<< "$1"
 
           unset drvs
         '';

src/blocktypes/container-publish-filter.jq

@@ -0,0 +1,5 @@
+. as $inputs
+
+| $inputs | map( select(
+  .meta.images[0] | inside($available) | not
+))

src/blocktypes/containers.nix

@@ -70,34 +70,34 @@
           copy docker://${img}
         '';
         meta.images = map (tag: "${img}:${tag}") tags;
-        proviso = l.toFile "container-proviso" ''
-          function _scopeo_inspect() {
-            if command &>/dev/null skopeo inspect --insecure-policy "docker://$image"; then
-              echo "$image"
-            fi
-          }
-          export -f _scopeo_inspect
+        proviso = let
+          filter = ./container-publish-filter.jq;
+        in
+          l.toFile "container-proviso" ''
+            function _scopeo_inspect() {
+              if command &>/dev/null skopeo inspect --insecure-policy "docker://$image"; then
+                echo "$image"
+              fi
+            }
+            export -f _scopeo_inspect
 
-          function scopeo_inspect() {
-            echo "$@" | command xargs -n 1 -P 0 -I {} bash -c '_scopeo_inspect "$@"'
-          }
+            function scopeo_inspect() {
+              echo "$@" | command xargs -n 1 -P 0 -I {} bash -c '_scopeo_inspect "$@"'
+            }
 
-          declare -a images
-          eval "$(
-            command jq --raw-output '
-              "images=(\(map(.meta.images[0]|strings)|@sh))"
-            ' <<< "$1"
-          )"
+            declare -a images
+            eval "$(
+              command jq --raw-output '
+                "images=(\(map(.meta.images[0]|strings)|@sh))"
+              ' <<< "$1"
+            )"
 
-          command jq --raw-output \
-            --arg available "$(_scopeo_inspect ''${images[@]})" \
-          ' map(select(
-              .meta.images[0] | inside($available) | not
-            ))
-          ' <<< "$1"
+            command jq --raw-output \
+              --arg available "$(_scopeo_inspect ''${images[@]})" \
+              --from-file ${filter} <<< "$1"
 
-          unset images
-        '';
+            unset images
+          '';
       })
       (mkCommand currentSystem {
         name = "load";

src/build-filter.jq

@@ -0,0 +1,10 @@
+. as $inputs |
+
+( $checked
+  | with_entries(select(.value == []))
+  | keys
+) as $cached
+
+| $inputs | map( select(
+ [.targetDrv] | IN($cached) | not
+))