hammerkit 1.27.0-next.24 → 1.27.0-next.25

package/build.schema.json

@@ -459,6 +459,91 @@
                 },
                 "additionalProperties": false,
                 "description": "local task"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "deps": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/deps"
+                  },
+                  "needs": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/needs"
+                  },
+                  "description": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/description"
+                  },
+                  "extend": {
+                    "type": "string"
+                  },
+                  "reset": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/reset"
+                  },
+                  "envs": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/envs"
+                  },
+                  "labels": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/labels"
+                  },
+                  "cache": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/cache"
+                  },
+                  "cmds": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/cmds"
+                  },
+                  "src": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/src"
+                  },
+                  "generates": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/generates"
+                  },
+                  "shell": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/shell"
+                  },
+                  "continuous": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/continuous"
+                  },
+                  "timeout": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/timeout"
+                  },
+                  "secrets": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/secrets"
+                  },
+                  "account": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/account"
+                  },
+                  "resources": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/resources"
+                  },
+                  "network": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/network"
+                  },
+                  "args": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/args"
+                  },
+                  "runner": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/runner"
+                  },
+                  "publish": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/publish"
+                  },
+                  "image": {
+                    "type": "string"
+                  },
+                  "mounts": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/mounts"
+                  },
+                  "volumeSize": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/volumeSize"
+                  },
+                  "capAdd": {
+                    "$ref": "#/definitions/hammerkit/properties/tasks/additionalProperties/anyOf/0/properties/capAdd"
+                  }
+                },
+                "required": [
+                  "extend"
+                ],
+                "additionalProperties": false,
+                "description": "container task taking its image from the task it extends"
               }
             ]
           }

package/dist/planner/utils/append-work-service.js

@@ -143,7 +143,11 @@ function appendServiceInit(workTree, service, item, environment, context) {
         task.needs[selfNeed] = { name: task.needs[selfNeed].name, service: view };
     }
     else {
-        task.needs.push({ name: item.name, service: view });
+        const name = getInitNeedName(service);
+        if (task.needs.some((need) => need.name === name)) {
+            throw new Error(`${task.name} needs two services as ${name}, give one another name with name:`);
+        }
+        task.needs.push({ name, service: view });
     }
     removeRequirer(item, task.name);
     // explicit, so neither the default method nor `--cache` turns it back on
@@ -153,6 +157,18 @@ function appendServiceInit(workTree, service, item, environment, context) {
     }
     item.data.init = { task, state };
 }
+// The host name the init reaches its service by: the name its task declares the
+// need by, else the service's name in its own build file. Planning the task
+// skips that need (it is the init's), and the full name of a service of an
+// include, `services:db`, is no host name: Docker and DNS take no colon.
+function getInitNeedName(service) {
+    const declared = service.init?.task.needs.find((need) => need.service.relativeName === service.relativeName);
+    if (declared) {
+        return declared.relativeName;
+    }
+    const prefix = service.scope.namePrefix;
+    return prefix.length > 0 ? service.relativeName.slice(prefix.length + 1) : service.relativeName;
+}
 const initViews = new WeakMap();
 // The service itself for the view its init task needs, else the item.
 function getPlannedService(item) {

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildFileContainerTaskSchema = void 0;
+exports.CONTAINER_TASK_PROPERTIES = exports.buildFileExtendingContainerTaskSchema = exports.buildFileContainerTaskSchema = void 0;
 const build_file_base_task_schema_1 = require("./build-file-base-task-schema");
 const zod_1 = require("zod");
 const size_schema_1 = require("./size-schema");
@@ -17,4 +17,15 @@ exports.buildFileContainerTaskSchema = build_file_base_task_schema_1.buildFileBa
 })
     .strict()
     .describe('container task');
+// A task that extends another takes the image of its base, so it may set the
+// container properties without an image of its own; once extended, a task whose
+// base has no image either is refused them (applySchemaExtension).
+exports.buildFileExtendingContainerTaskSchema = exports.buildFileContainerTaskSchema
+    .extend({
+    image: (0, zod_1.string)().optional(),
+    extend: (0, zod_1.string)(),
+})
+    .strict()
+    .describe('container task taking its image from the task it extends');
+exports.CONTAINER_TASK_PROPERTIES = ['mounts', 'volumeSize', 'capAdd'];
 //# sourceMappingURL=build-file-container-task-schema.js.map

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

@@ -4,7 +4,11 @@ exports.isBuildFileLocalTaskSchema = exports.isBuildFileContainerTaskSchema = ex
 const zod_1 = require("zod");
 const build_file_container_task_schema_1 = require("./build-file-container-task-schema");
 const build_file_local_task_schema_1 = require("./build-file-local-task-schema");
-exports.buildFileTaskSchema = (0, zod_1.union)([build_file_container_task_schema_1.buildFileContainerTaskSchema, build_file_local_task_schema_1.buildFileLocalTaskSchema]);
+exports.buildFileTaskSchema = (0, zod_1.union)([
+    build_file_container_task_schema_1.buildFileContainerTaskSchema,
+    build_file_local_task_schema_1.buildFileLocalTaskSchema,
+    build_file_container_task_schema_1.buildFileExtendingContainerTaskSchema,
+]);
 const isBuildFileContainerTaskSchema = (val) => 'image' in val;
 exports.isBuildFileContainerTaskSchema = isBuildFileContainerTaskSchema;
 const isBuildFileLocalTaskSchema = (val) => !('image' in val);

package/dist/schema/reference-parser.js

@@ -7,6 +7,7 @@ const split_name_1 = require("../planner/utils/split-name");
 const read_env_file_1 = require("../parser/read-env-file");
 const label_values_1 = require("../executer/label-values");
 const merge_environment_variables_1 = require("../environment/merge-environment-variables");
+const build_file_container_task_schema_1 = require("./build-file-container-task-schema");
 const resolve_cache_1 = require("../cache/resolve-cache");
 const project_root_1 = require("../planner/project-root");
 const secret_catalog_1 = require("../secrets/secret-catalog");
@@ -222,6 +223,7 @@ function applySchemaExtension(reference, task) {
         if (!reset.has('mounts'))
             taskSchema.mounts = extendArray(taskSchema.mounts, extend.schema.mounts);
     }
+    rejectContainerPropertiesWithoutImage(task);
     // 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
@@ -236,6 +238,16 @@ function applySchemaExtension(reference, task) {
     }
     task.extension = 'applied';
 }
+function rejectContainerPropertiesWithoutImage(task) {
+    if ((0, build_file_task_schema_1.isBuildFileContainerTaskSchema)(task.schema)) {
+        return;
+    }
+    const schema = task.schema;
+    const property = build_file_container_task_schema_1.CONTAINER_TASK_PROPERTIES.find((key) => schema[key] !== undefined);
+    if (property) {
+        throw new Error(`task ${task.relativeName} sets ${property}, but neither it nor its base has an image`);
+    }
+}
 function extendArray(base, extend) {
     if (!extend) {
         return base;

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.27.0-next.24",
+  "version": "1.27.0-next.25",
   "keywords": [
     "build",
     "build-tool",