refactor: run registry resolution in mkDenoDir

nekowinston · Dec 18, 2023 · 2611e2d · 2611e2d
1 parent 088124e
commit 2611e2d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/nix/hooks/deno-cache-restore-hook.sh b/nix/hooks/deno-cache-restore-hook.sh
@@ -9,17 +9,6 @@ denoRestoreCacheHook() {
   cp -Lr --reflink=auto -- "$DENO_PREFETCH_DIR" "$DENO_DIR"
   chmod -R +644 -- "$DENO_DIR"
 
-  if [ -d "$DENO_DIR/npm" ]; then
-    echo "Resolving NPM registry.json files"
-    shopt -s globstar
-    for registryJson in "$DENO_DIR"/npm/*/**/registry/*.json; do
-      dir="$(dirname "$registryJson")"
-      echo "> resolving $dir"
-      jq -s 'reduce .[] as $x ({}; . * $x)' "$dir"/*.json >"$dir/../registry.json"
-    done
-    echo "Finished resolving NPM registry.json files"
-  fi
-
   echo "Finished denoRestoreCacheHook"
 }
 

diff --git a/nix/mkDenoDir.nix b/nix/mkDenoDir.nix
@@ -1,9 +1,11 @@
 {
+  fetchurl,
+  jq,
   lib,
   linkFarm,
-  writeText,
-  fetchurl,
   runCommand,
+  symlinkJoin,
+  writeText,
 }: {
   lockFile,
   npmRegistryUrl ? "https://registry.npmjs.org",
@@ -89,4 +91,23 @@
     ) (denoLock.packages.npm or {})
   );
 in
-  linkFarm "deno_prefetch" (npmDeps // remoteDeps)
+  symlinkJoin {
+    name = "deno_dir";
+    paths = [(linkFarm "deno_prefetch" (npmDeps // remoteDeps))];
+    propagatedBuildInputs = [jq];
+    postBuild = ''
+      if [ -d "$out/npm" ]; then
+        echo "deno_dir: Resolving NPM registry.json files"
+        shopt -s globstar
+
+        for registryJson in "$out/npm"/*/**/registry/*.json; do
+          dir="$(dirname "$registryJson")"
+          echo "> resolving $dir"
+          jq -s 'reduce .[] as $x ({}; . * $x)' "$dir"/*.json >"$dir/../registry.json"
+        done
+        rm -rf "$out/npm"/*/**/registry
+
+        echo "deno_dir: Finished resolving NPM registry.json files"
+      fi
+    '';
+  }