hammerkit 1.21.1 → 1.22.0

package/dist/executer/await-completed-dependencies.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.awaitRunningNeeds = exports.awaitRunningNeed = exports.awaitCompleted = exports.awaitCompletedDependencies = exports.awaitNoRequirements = exports.awaitDependentNeed = exports.awaitRequirement = void 0;
+exports.awaitRunningNeeds = exports.awaitRunningNeed = exports.awaitCompleted = exports.awaitCompletedDependencies = exports.transitiveDeps = exports.awaitNoRequirements = exports.awaitDependentNeed = exports.awaitRequirement = void 0;
 const work_item_1 = require("../planner/work-item");
 const state_resolver_1 = require("./state-resolver");
 // Resolve true once any requirer is `ready` (about to run). With
@@ -42,8 +42,26 @@ async function awaitNoRequirements(svc, abort) {
     }));
 }
 exports.awaitNoRequirements = awaitNoRequirements;
+// The dependencies and, recursively, theirs, each once.
+function transitiveDeps(deps) {
+    const seen = new Set();
+    const visit = (items) => {
+        for (const item of items) {
+            if (!seen.has(item)) {
+                seen.add(item);
+                visit(item.deps);
+            }
+        }
+    };
+    visit(deps);
+    return [...seen];
+}
+exports.transitiveDeps = transitiveDeps;
+// Waits for the whole dependency closure, not only the direct dependencies: a
+// cached direct dependency completes at once, while the dependencies it
+// skipped past are still being restored for the item about to run.
 async function awaitCompletedDependencies(work, deps, abort) {
-    for (const dep of deps) {
+    for (const dep of transitiveDeps(deps)) {
         work.status.write('debug', `await completion of ${dep.name} with state ${dep.state.current.type}`);
         await awaitCompleted(work, dep, abort);
     }

package/dist/executer/execute-work-tree.js

@@ -5,6 +5,7 @@ const plan_work_tasks_1 = require("../planner/utils/plan-work-tasks");
 const execute_work_service_1 = require("./execute-work-service");
 const execute_work_task_1 = require("./execute-work-task");
 const execute_init_task_1 = require("./execute-init-task");
+const await_completed_dependencies_1 = require("./await-completed-dependencies");
 async function executeWorkTree(work, environment, options) {
     const itemPromises = [];
     const dependents = skippableDependents(work, options);
@@ -67,9 +68,13 @@ function skippableDependents(work, options) {
             result.set(task.name, []);
         }
     }
+    // A dependent also needs everything its dependencies need: a cached `build`
+    // does not restore the `install` a re-running `test` uses at run time. So a
+    // task is a dependent of its whole dependency closure, requested tasks
+    // included in the walk (they are cached or run on their own).
     const items = [...(0, plan_work_tasks_1.iterateWorkTasks)(work), ...(0, plan_work_tasks_1.iterateWorkServices)(work)];
     for (const item of items) {
-        for (const dep of item.deps) {
+        for (const dep of (0, await_completed_dependencies_1.transitiveDeps)(item.deps)) {
             if (work.requested.includes(dep.name)) {
                 continue;
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hammerkit",
   "description": "Containerized build tool with incremental caching that runs the same build file locally, in Docker and on Kubernetes.",
-  "version": "1.21.1",
+  "version": "1.22.0",
   "keywords": [
     "build",
     "build-tool",