hammerkit 1.14.0 → 1.15.0

package/build.schema.json

@@ -59,6 +59,22 @@
                   "extend": {
                     "type": "string"
                   },
+                  "reset": {
+                    "type": "array",
+                    "items": {
+                      "type": "string",
+                      "enum": [
+                        "deps",
+                        "needs",
+                        "src",
+                        "generates",
+                        "cmds",
+                        "mounts",
+                        "envs",
+                        "labels"
+                      ]
+                    }
+                  },
                   "envs": {
                     "$ref": "#/definitions/hammerkit/properties/envs",
                     "description": "Environment values for the current build task\nhttps://hammerkit.dev/docs/build-file/environment-variables"
@@ -270,6 +286,9 @@
                   "extend": {
                     "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/extend"
                   },
+                  "reset": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/reset"
+                  },
                   "envs": {
                     "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/envs"
                   },

package/dist/schema/build-file-base-task-schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildFileBaseTaskSchema = void 0;
+exports.buildFileBaseTaskSchema = exports.RESET_PROPERTIES = void 0;
 const zod_1 = require("zod");
 const build_file_need_schema_1 = require("./build-file-need-schema");
 const envs_schema_1 = require("./envs-schema");
@@ -11,11 +11,15 @@ const build_file_volume_schema_1 = require("./build-file-volume-schema");
 const duration_schema_1 = require("./duration-schema");
 const build_file_secret_schema_1 = require("./build-file-secret-schema");
 const resources_schema_1 = require("./resources-schema");
+// what `extend` adds to (the rest, e.g. `image` or `shell`, the task just overrides)
+exports.RESET_PROPERTIES = ['deps', 'needs', 'src', 'generates', 'cmds', 'mounts', 'envs', 'labels'];
 exports.buildFileBaseTaskSchema = (0, zod_1.object)({
     deps: (0, zod_1.array)((0, zod_1.string)()).optional(),
     needs: (0, zod_1.array)(build_file_need_schema_1.buildFileNeedSchema).optional(),
     description: (0, zod_1.string)().optional(),
     extend: (0, zod_1.string)().optional(),
+    // properties of the `extend` base this task does not inherit
+    reset: (0, zod_1.array)((0, zod_1.enum)(exports.RESET_PROPERTIES)).optional(),
     envs: envs_schema_1.envsSchema.optional(),
     labels: labels_schema_1.labelsSchema.optional(),
     cache: cache_schema_1.cacheSchema.optional(),

package/dist/schema/reference-parser.js

@@ -94,7 +94,23 @@ async function parseReferences(ctx, mainScope, environment) {
 }
 exports.parseReferences = parseReferences;
 function applySchemaExtension(reference, task) {
+    // a base is reached once per task extending it; applying it again would add
+    // its own base's lists a second time
+    if (task.extension === 'applied') {
+        return;
+    }
+    if (task.extension === 'applying') {
+        throw new Error(`task ${task.relativeName} extends itself`);
+    }
+    task.extension = 'applying';
+    task.depBases = [];
+    task.needBases = [];
+    const reset = new Set(task.schema.reset ?? []);
     if (!task.schema.extend) {
+        if (reset.size > 0) {
+            throw new Error(`task ${task.relativeName} sets reset without extend`);
+        }
+        task.extension = 'applied';
         return;
     }
     const extend = findTask(reference, task.scope, task.schema.extend, null).task;
@@ -102,18 +118,37 @@ function applySchemaExtension(reference, task) {
     task.schema.shell = task.schema.shell ?? extend.schema.shell;
     task.schema.cache = task.schema.cache ?? extend.schema.cache;
     task.schema.timeout = task.schema.timeout ?? extend.schema.timeout;
-    task.schema.cmds = extendArray(task.schema.cmds, extend.schema.cmds);
-    task.schema.src = extendArray(task.schema.src, extend.schema.src);
-    task.schema.generates = extendArray(task.schema.generates, extend.schema.generates);
-    task.schema.labels = extendObject(task.schema.labels, extend.schema.labels);
-    task.envs = (0, merge_environment_variables_1.mergeEnvironmentVariables)(task.envs, extend.schema.envs);
+    if (!reset.has('cmds'))
+        task.schema.cmds = extendArray(task.schema.cmds, extend.schema.cmds);
+    if (!reset.has('src'))
+        task.schema.src = extendArray(task.schema.src, extend.schema.src);
+    if (!reset.has('generates'))
+        task.schema.generates = extendArray(task.schema.generates, extend.schema.generates);
+    if (!reset.has('labels'))
+        task.schema.labels = extendObject(task.schema.labels, extend.schema.labels);
+    // the base's resolved envs: its own plus the top-level envs of its build file
+    // (and the inputs an include passed), which carry the defaults it relies on
+    if (!reset.has('envs'))
+        task.envs = (0, merge_environment_variables_1.mergeEnvironmentVariables)(task.envs, extend.envs);
     if ((0, build_file_task_schema_1.isBuildFileContainerTaskSchema)(extend.schema)) {
         const taskSchema = task.schema;
         taskSchema.image = taskSchema.image ?? extend.schema.image;
-        taskSchema.mounts = extendArray(taskSchema.mounts, extend.schema.mounts);
+        if (!reset.has('mounts'))
+            taskSchema.mounts = extendArray(taskSchema.mounts, extend.schema.mounts);
+    }
+    // deps and needs resolve in the file that declares them, so every base up the
+    // chain contributes its own, not only the nearest; what a task resets is not
+    // passed on to the tasks extending it either
+    const base = { scope: extend.scope, schema: extend.schema };
+    task.needBases = reset.has('needs') ? [] : [...(extend.needBases ?? []), base];
+    task.depBases = reset.has('deps') ? [] : [...(extend.depBases ?? []), base];
+    for (const needBase of task.needBases) {
+        resolveNeeds(reference, task, needBase.scope, needBase.schema);
+    }
+    for (const depBase of task.depBases) {
+        resolveDeps(reference, task, depBase.scope, depBase.schema);
     }
-    resolveNeeds(reference, task, extend.scope, extend.schema);
-    resolveDeps(reference, task, extend.scope, extend.schema);
+    task.extension = 'applied';
 }
 function extendArray(base, extend) {
     if (!extend) {

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.14.0",
+  "version": "1.15.0",
   "keywords": [
     "build",
     "build-tool",