hammerkit 1.5.0-alpha.0 → 1.5.0-alpha.1

package/dist/executer/execute-docker.js

@@ -21,7 +21,7 @@ async function startContainer(status, container) {
     return new Promise((resolve, reject) => {
         const handle = setTimeout(() => {
             status.write('warn', 'start of container is potentially stuck on start');
-        }, 1000);
+        }, 3000);
         container
             .start()
             .then(() => {

package/dist/log.js

@@ -196,6 +196,11 @@ function getNodeName(name, maxNodeNameLength) {
 }
 exports.getNodeName = getNodeName;
 function writeNodeLogToConsole(log, maxNodeNameLength) {
+    if (log.type === 'status') {
+        if (log.level === 'debug' && !exports.isVerbose) {
+            return;
+        }
+    }
     const content = log.type === 'console'
         ? log.console === 'stdout'
             ? colors_1.default.white(log.message)

package/dist/parser/parse-build-file.js

@@ -12,7 +12,19 @@ const parse_build_file_services_1 = require("./parse-build-file-services");
 const parse_string_map_1 = require("./parse-string-map");
 const parse_string_1 = require("./parse-string");
 const parse_boolean_1 = require("./parse-boolean");
-const validTaskKeys = ['envs', 'src', 'needs', 'deps', 'generates', 'labels', 'description', 'extend', 'cmds', 'watch'];
+const validTaskKeys = [
+    'envs',
+    'src',
+    'needs',
+    'deps',
+    'generates',
+    'labels',
+    'description',
+    'extend',
+    'cmds',
+    'watch',
+    'continuous',
+];
 const validDockerTaskKeys = ['image', 'mounts', 'ports', 'shell', ...validTaskKeys];
 async function parseBuildFile(fileName, files, input, context) {
     const result = {

package/dist/planner/utils/plan-work-dependency.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.planWorkDependency = void 0;
 const work_node_1 = require("../work-node");
-const plan_work_volume_1 = require("./plan-work-volume");
 function planWorkDependency(deps, node) {
     for (const depNode of deps) {
         if (node.deps.some((d) => d.id === depNode.id)) {
@@ -20,15 +19,10 @@ function planWorkDependency(deps, node) {
                 }
             }
         }
-        for (const generate of depNode.generates) {
-            if (!node.generates.some((g) => g.path === generate.path)) {
-                node.generates.push({ path: generate.path, inherited: true });
-                if ((0, work_node_1.isContainerWorkNode)(node)) {
-                    const name = (0, plan_work_volume_1.getVolumeName)(generate.path);
-                    node.volumes.push({
-                        name,
-                        containerPath: generate.path,
-                    });
+        if ((0, work_node_1.isContainerWorkNode)(depNode) && (0, work_node_1.isContainerWorkNode)(node)) {
+            for (const volume of depNode.volumes) {
+                if (!node.volumes.some((v) => v.name === volume.name)) {
+                    node.volumes.push(volume);
                 }
             }
         }

package/dist/planner/utils/plan-work-node.js

@@ -147,16 +147,16 @@ function parseWorkNode(id, task, context) {
         caching: task.cache ?? null,
     };
     if (task.image) {
-        const mounts = parseContainerWorkNodeMount(task, context, task.envs);
+        const mounts = (0, get_container_mounts_1.getContainerMounts)(baseWorkNode, parseContainerWorkNodeMount(task, context, task.envs));
         return {
             ...baseWorkNode,
             type: 'container',
             user: getContainerUser(),
             image: (0, template_value_1.templateValue)(task.image, task.envs),
             shell: (0, template_value_1.templateValue)(task.shell, task.envs) || '/bin/sh',
-            mounts: (0, get_container_mounts_1.getContainerMounts)(baseWorkNode, mounts),
+            mounts,
             ports: parseContainerWorkNodePorts(task, context, task.envs),
-            volumes: (0, plan_work_volume_1.getContainerVolumes)(baseWorkNode),
+            volumes: (0, plan_work_volume_1.getContainerVolumes)(baseWorkNode, mounts),
         };
     }
     else {
@@ -189,7 +189,7 @@ function parseLocalWorkNodeSource(task, context, envs) {
 function getContainerUser() {
     return (0, os_1.platform)() === 'linux' || (0, os_1.platform)() === 'freebsd' || (0, os_1.platform)() === 'openbsd' || (0, os_1.platform)() === 'sunos'
         ? `${process.getuid()}:${process.getgid()}`
-        : null;
+        : `0:0`;
 }
 function parseWorkNodeNeeds(needs, context) {
     const result = [];

package/dist/planner/utils/plan-work-volume.js

@@ -10,9 +10,13 @@ function getVolumeName(generate) {
     return `hammerkit-${generateId(generate)}`;
 }
 exports.getVolumeName = getVolumeName;
-function getContainerVolumes(task) {
+function getContainerVolumes(task, mounts) {
     const volumes = [];
     for (const generate of task.generates) {
+        const hasMount = mounts.some((m) => m.containerPath === generate.path);
+        if (hasMount) {
+            continue;
+        }
         const name = getVolumeName(generate.path);
         volumes.push({
             name,

package/dist/testing/expect.js

@@ -24,6 +24,11 @@ async function expectSuccessfulResult(result, env) {
             }
         }
     }
+    const status = Array.from(env.status.read());
+    const errorStatus = status
+        .filter((s) => s.level === 'warn' || s.level === 'error')
+        .map((s) => `${s.context.type}:${s.context.name} - ${s.level} ${s.message}`);
+    expect(errorStatus).toEqual([]);
 }
 exports.expectSuccessfulResult = expectSuccessfulResult;
 function getNodeState(state, name) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hammerkit",
   "description": "build stuff and things",
-  "version": "1.5.0-alpha.0",
+  "version": "1.5.0-alpha.1",
   "bin": "dist/index.js",
   "bugs": {
     "url": "https://github.com/no0dles/hammerkit"