hammerkit 1.5.0-alpha.1 → 1.5.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');
-        }, 3000);
+        }, 10000);
         container
             .start()
             .then(() => {

package/dist/executer/execute.spec.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const get_test_suite_1 = require("../testing/get-test-suite");
 const expect_1 = require("../testing/expect");
 describe('execute', () => {
-    const suite = (0, get_test_suite_1.getTestSuite)('hello-world-node', ['build.yaml', 'package.json', 'index.js']);
+    const suite = (0, get_test_suite_1.getTestSuite)('hello-world-node', ['.hammerkit.yaml', 'package.json', 'index.js']);
     afterAll(() => suite.close());
     it('should restart watching task if once completed', async () => {
         const { cli, environment } = await suite.setup({ taskName: 'api' });

package/dist/executer/execution-steps.js

@@ -19,7 +19,16 @@ exports.pullImage = pullImage;
 async function prepareVolume(node, environment) {
     if ((0, work_node_1.isContainerWorkNode)(node) || (0, work_service_1.isContainerWorkService)(node)) {
         for (const volume of node.volumes) {
-            await (0, get_docker_executor_1.ensureVolumeExists)(environment, volume.name);
+            if (volume.resetOnChange && !volume.inherited) {
+                const scopedConsole = environment.status.from(node);
+                scopedConsole.write('debug', 'recreate volume');
+                await (0, get_docker_executor_1.recreateVolume)(environment, scopedConsole, volume.name);
+            }
+            else {
+                const scopedConsole = environment.status.from(node);
+                scopedConsole.write('debug', 'ensure volume exists');
+                await (0, get_docker_executor_1.ensureVolumeExists)(environment, scopedConsole, volume.name);
+            }
         }
     }
 }

package/dist/executer/get-docker-executor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureVolumeExists = exports.existsVolume = void 0;
+exports.recreateVolume = exports.removeVolume = exports.createVolume = exports.ensureVolumeExists = exports.existsVolume = void 0;
+const log_1 = require("../log");
 async function existsVolume(environment, volumeName) {
     try {
         const volume = await environment.docker.getVolume(volumeName);
@@ -11,15 +12,41 @@ async function existsVolume(environment, volumeName) {
     }
 }
 exports.existsVolume = existsVolume;
-async function ensureVolumeExists(environment, volumeName) {
+async function ensureVolumeExists(environment, scopedConsole, volumeName) {
     const volumeExists = await existsVolume(environment, volumeName);
     if (!volumeExists) {
-        await environment.docker.createVolume({
-            Name: volumeName,
-            Driver: 'local',
-            Labels: { app: 'hammerkit' },
-        });
+        await createVolume(environment, scopedConsole, volumeName);
+    }
+    else {
+        scopedConsole.write('debug', 'volume exists ' + volumeName);
     }
 }
 exports.ensureVolumeExists = ensureVolumeExists;
+async function createVolume(environment, scopedConsole, volumeName) {
+    scopedConsole.write('debug', 'create volume ' + volumeName);
+    await environment.docker.createVolume({
+        Name: volumeName,
+        Driver: 'local',
+        Labels: { app: 'hammerkit' },
+    });
+}
+exports.createVolume = createVolume;
+async function removeVolume(environment, scopedConsole, volumeName) {
+    try {
+        const volume = await environment.docker.getVolume(volumeName);
+        scopedConsole.write('debug', 'remove volume ' + volumeName);
+        await volume.remove({ force: true });
+        return true;
+    }
+    catch (e) {
+        scopedConsole.write('warn', `removing volume ${volumeName} failed: ${(0, log_1.getErrorMessage)(e)}`);
+        return false;
+    }
+}
+exports.removeVolume = removeVolume;
+async function recreateVolume(environment, scopedConsole, volumeName) {
+    await removeVolume(environment, scopedConsole, volumeName);
+    await createVolume(environment, scopedConsole, volumeName);
+}
+exports.recreateVolume = recreateVolume;
 //# sourceMappingURL=get-docker-executor.js.map

package/dist/executer/schedule.js

@@ -31,9 +31,8 @@ async function schedule(processManager, state, environment) {
                     type: 'task',
                     name: nodeState.node.name,
                     id: nodeState.node.id + '-cache',
-                }, async () => {
-                    // TODO abort improvement
-                    await (0, start_node_1.startNode)(nodeState, state, environment);
+                }, async (abort) => {
+                    await (0, start_node_1.startNode)(nodeState, state, environment, abort.signal);
                 });
             }
             else if (nodeState.type === 'ready') {
@@ -65,9 +64,8 @@ async function schedule(processManager, state, environment) {
                             type: 'service',
                             name: pendingNeed.service.name,
                             id: pendingNeed.service.id + '-cache',
-                        }, async () => {
-                            // TODO abort improvement
-                            await (0, start_node_1.startService)(pendingNeed.service, state, environment);
+                        }, async (abort) => {
+                            await (0, start_node_1.startService)(pendingNeed.service, state, environment, abort.signal);
                         });
                     }
                     continue;

package/dist/executer/start-node.js

@@ -5,9 +5,12 @@ const enqueue_next_1 = require("./scheduler/enqueue-next");
 const states_1 = require("./states");
 const work_service_1 = require("../planner/work-service");
 const get_work_node_cache_stats_1 = require("../optimizer/get-work-node-cache-stats");
-async function startNode(node, state, environment) {
+async function startNode(node, state, environment, abortSignal) {
     const cacheState = await (0, enqueue_next_1.checkCacheState)(node.node, state.current.cacheMethod, environment);
     const currentState = state.current.node[node.node.id];
+    if (abortSignal.aborted) {
+        return;
+    }
     if (!!currentState.stateKey && currentState.stateKey !== cacheState.stateKey) {
         const status = environment.status.task(node.node);
         status.write('debug', `cache check for ${node.node.name} no longer valid, skipping result`);
@@ -32,12 +35,17 @@ async function startNode(node, state, environment) {
     }
 }
 exports.startNode = startNode;
-async function startService(service, state, environment) {
+async function startService(service, state, environment, abortSignal) {
+    const currentStats = await (0, get_work_node_cache_stats_1.getServiceNodeCacheStats)(service, environment);
+    const stateKey = (0, get_work_node_cache_stats_1.getStateKey)(currentStats, state.current.cacheMethod);
+    if (abortSignal.aborted) {
+        return;
+    }
     if (!(0, work_service_1.isContainerWorkService)(service)) {
         state.patchService({
             type: 'ready',
             service,
-            stateKey: '', // TODO statekey from kube config
+            stateKey,
         });
         return;
     }

package/dist/executer/watch-node.js

@@ -26,7 +26,6 @@ function watchNode(node, state, processManager, environment) {
                 node,
                 stateKey: currentFileState.stateKey,
             });
-            // TODO set dependants as pending
         }, 100);
         const fileWatchers = [];
         const sources = [];

package/dist/index.js

@@ -6,6 +6,7 @@ const log_1 = require("./log");
 const get_file_context_1 = require("./file/get-file-context");
 const work_node_status_1 = require("./planner/work-node-status");
 const execute_docker_1 = require("./executer/execute-docker");
+const empty_writable_1 = require("./utils/empty-writable");
 const abortCtrl = new AbortController();
 process.on('SIGINT', function () {
     abortCtrl.abort();
@@ -15,9 +16,11 @@ process.on('SIGINT', function () {
     abortCtrl,
     processEnvs: process.env,
     file: (0, get_file_context_1.getFileContext)(process.cwd()),
-    console: (0, log_1.consoleContext)(),
-    status: (0, work_node_status_1.statusConsole)(),
+    console: (0, log_1.consoleContext)(process.stdout),
+    status: (0, work_node_status_1.statusConsole)((0, empty_writable_1.emptyWritable)()),
     docker: (0, execute_docker_1.getContainerCli)(),
+    stdout: process.stdout,
+    stdoutColumns: process.stdout.columns,
 }, process.argv).then(({ program, args }) => {
     return program.parseAsync(args);
 });

package/dist/log.js

@@ -40,24 +40,24 @@ function getErrorMessage(e) {
     }
 }
 exports.getErrorMessage = getErrorMessage;
-function consoleContext() {
+function consoleContext(stream) {
     return {
         debug(message) {
-            process.stdout.write(`${formatDate(new Date())} ${getType('cli')} ${getLogLevel('debug')}: ${message}\n`);
+            stream.write(`${formatDate(new Date())} ${getType('cli')} ${getLogLevel('debug')}: ${message}\n`);
         },
         error(message) {
-            process.stdout.write(`${formatDate(new Date())} ${getType('cli')} ${getLogLevel('error')}: ${message}\n`);
+            stream.write(`${formatDate(new Date())} ${getType('cli')} ${getLogLevel('error')}: ${message}\n`);
         },
         info(message) {
-            process.stdout.write(`${formatDate(new Date())} ${getType('cli')} ${getLogLevel('info')}: ${message}\n`);
+            stream.write(`${formatDate(new Date())} ${getType('cli')} ${getLogLevel('info')}: ${message}\n`);
         },
         warn(message) {
-            process.stdout.write(`${formatDate(new Date())} ${getType('cli')} ${getLogLevel('warn')}: ${message}\n`);
+            stream.write(`${formatDate(new Date())} ${getType('cli')} ${getLogLevel('warn')}: ${message}\n`);
         },
     };
 }
 exports.consoleContext = consoleContext;
-exports.isVerbose = process.argv.some((a) => a === '--verbose');
+exports.isVerbose = process.argv.some((a) => a === '--verbose') || process.env['VERBOSE'] === 'true';
 const typeLength = ['service', 'task', 'cli']
     .map((s) => s.length)
     .reduce((max, current) => (max > current ? max : current), 0);
@@ -69,14 +69,14 @@ async function printWorkTreeResult(schedulerState, env) {
     const maxNodeNameLength = getNodeNameLengthForSchedulerState(schedulerState);
     for (const log of env.status.read()) {
         if (exports.isVerbose || (log.type === 'status' && log.level === 'error')) {
-            process.stdout.write(`${formatDate(log.date)} ${getType(log.context.type)} ${getNodeName(log.context.name, maxNodeNameLength)} - ${colors_1.default.white(log.message)}\n`);
+            env.stdout.write(`${formatDate(log.date)} ${getType(log.context.type)} ${getNodeName(log.context.name, maxNodeNameLength)} - ${colors_1.default.white(log.message)}\n`);
         }
     }
     for (const state of (0, plan_work_nodes_1.iterateWorkServices)(schedulerState.service)) {
         if (state.type === 'end' && state.reason === 'crash') {
             const message = `${getType('service')} ${getNodeName(state.service.name, maxNodeNameLength)}`;
             for (const log of env.status.service(state.service).logs()) {
-                process.stdout.write(`${formatDate(log.date)} ${message} - ${log.console}: ${log.message}\n`);
+                env.stdout.write(`${formatDate(log.date)} ${message} - ${log.console}: ${log.message}\n`);
             }
         }
     }
@@ -84,7 +84,7 @@ async function printWorkTreeResult(schedulerState, env) {
         if (state.type === 'error' || state.type === 'crash') {
             const message = `${getType('task')} ${getNodeName(state.node.name, maxNodeNameLength)}`;
             for (const log of env.status.task(state.node).logs()) {
-                process.stdout.write(`${formatDate(log.date)} ${message} - ${log.console}: ${log.message}\n`);
+                env.stdout.write(`${formatDate(log.date)} ${message} - ${log.console}: ${log.message}\n`);
             }
         }
     }
@@ -94,7 +94,7 @@ async function printWorkTreeResult(schedulerState, env) {
             if (state.reason === 'crash') {
                 message += ` crashed`;
             }
-            process.stdout.write(`${message}\n`);
+            env.stdout.write(`${message}\n`);
         }
     }
     for (const state of (0, plan_work_nodes_1.iterateWorkNodes)(schedulerState.node)) {
@@ -111,7 +111,7 @@ async function printWorkTreeResult(schedulerState, env) {
         if (state.type === 'error') {
             message += ` with message ${state.errorMessage}`;
         }
-        process.stdout.write(`${message}\n`);
+        env.stdout.write(`${message}\n`);
     }
 }
 exports.printWorkTreeResult = printWorkTreeResult;
@@ -157,16 +157,16 @@ function getNodeNameLengthForSchedulerState(schedulerState) {
     return getNodeNameLength(Names);
 }
 exports.getNodeNameLengthForSchedulerState = getNodeNameLengthForSchedulerState;
-function printProperty(name, value) {
-    process.stdout.write(`   ${colors_1.default.grey(`${name}:`)} ${value}\n`);
+function printProperty(env, name, value) {
+    env.stdout.write(`   ${colors_1.default.grey(`${name}:`)} ${value}\n`);
 }
 exports.printProperty = printProperty;
-function printItem(item) {
-    process.stdout.write(`• ${item.name}${item.description ? `: ${colors_1.default.white(item.description)}` : ''}\n`);
+function printItem(env, item) {
+    env.stdout.write(`• ${item.name}${item.description ? `: ${colors_1.default.white(item.description)}` : ''}\n`);
 }
 exports.printItem = printItem;
-function printTitle(name) {
-    process.stdout.write(`${colors_1.default.bgWhite(name + ':\n')}`);
+function printTitle(env, name) {
+    env.stdout.write(`${colors_1.default.bgWhite(name + ':\n')}`);
 }
 exports.printTitle = printTitle;
 function getNodeNameLength(names) {
@@ -195,7 +195,7 @@ function getNodeName(name, maxNodeNameLength) {
     return colors_1.default.white(name) + ' '.repeat(Math.max(0, maxNodeNameLength - name.length));
 }
 exports.getNodeName = getNodeName;
-function writeNodeLogToConsole(log, maxNodeNameLength) {
+function writeNodeLogToConsole(env, log, maxNodeNameLength) {
     if (log.type === 'status') {
         if (log.level === 'debug' && !exports.isVerbose) {
             return;
@@ -206,7 +206,7 @@ function writeNodeLogToConsole(log, maxNodeNameLength) {
             ? colors_1.default.white(log.message)
             : colors_1.default.red(log.message)
         : `${getLogLevel(log.level)} - ${log.message}`;
-    process.stdout.write(`${formatDate(log.date)} ${colors_1.default.grey(log.context.type + ':')} ${getNodeName(log.context.name, maxNodeNameLength)} - ${log.date.toLocaleTimeString()} - ${content}\n`);
+    env.stdout.write(`${formatDate(log.date)} ${colors_1.default.grey(log.context.type + ':')} ${getNodeName(log.context.name, maxNodeNameLength)} - ${log.date.toLocaleTimeString()} - ${content}\n`);
 }
 exports.writeNodeLogToConsole = writeNodeLogToConsole;
 function formatDate(date) {
@@ -223,7 +223,7 @@ function formatDate(date) {
 }
 exports.formatDate = formatDate;
 function writeWorkTreeStatus(schedulerState, env, ticker) {
-    (0, readline_1.clearScreenDown)(process.stdout);
+    (0, readline_1.clearScreenDown)(env.stdout);
     const maxNodeNameLength = getNodeNameLengthForSchedulerState(schedulerState);
     let count = 0;
     for (const state of (0, plan_work_nodes_1.iterateWorkServices)(schedulerState.service)) {
@@ -232,7 +232,7 @@ function writeWorkTreeStatus(schedulerState, env, ticker) {
         if (currentMessage) {
             message += ` ${currentMessage.message}`;
         }
-        count += printWithTruncate(message);
+        count += printWithTruncate(env, message);
     }
     for (const state of (0, plan_work_nodes_1.iterateWorkNodes)(schedulerState.node)) {
         let message = `${getType('task')} ${getNodeName(state.node.name, maxNodeNameLength)} - ${getStateText(state)}`;
@@ -271,9 +271,9 @@ function writeWorkTreeStatus(schedulerState, env, ticker) {
         else if (state.type === 'error') {
             message += ` ${state.errorMessage}`;
         }
-        count += printWithTruncate(message);
+        count += printWithTruncate(env, message);
     }
-    (0, readline_1.moveCursor)(process.stdout, 0, -1 * count);
+    (0, readline_1.moveCursor)(env.stdout, 0, -1 * count);
 }
 exports.writeWorkTreeStatus = writeWorkTreeStatus;
 function countChar(message, char) {
@@ -285,24 +285,24 @@ function countChar(message, char) {
     }
     return result;
 }
-function printWithTruncate(message) {
+function printWithTruncate(env, message) {
     let lineCount = 0;
     let index = 0;
     do {
         const newLineCount = countChar(message, '\n');
-        process.stdout.write(`${message.substr(index, process.stdout.columns)}\n`);
-        index += process.stdout.columns;
+        env.stdout.write(`${message.substr(index, env.stdoutColumns)}\n`);
+        index += env.stdoutColumns;
         lineCount++;
         lineCount += newLineCount;
     } while (index < message.length);
     return lineCount;
 }
-function hideCursor() {
-    process.stdout.write('\x1B[?25l');
+function hideCursor(env) {
+    env.stdout.write('\x1B[?25l');
 }
 exports.hideCursor = hideCursor;
-function showCursor() {
-    process.stdout.write('\x1B[?25h');
+function showCursor(env) {
+    env.stdout.write('\x1B[?25h');
 }
 exports.showCursor = showCursor;
 //# sourceMappingURL=log.js.map

package/dist/logging/grouped-logger.js

@@ -15,7 +15,7 @@ function groupedLogger(state, env) {
             if (node.type === 'crash' || node.type === 'error' || node.type === 'completed') {
                 completedNodes.push(node.node.id);
                 for (const log of env.status.task(node.node).read()) {
-                    (0, log_1.writeNodeLogToConsole)(log, maxNodeNameLength);
+                    (0, log_1.writeNodeLogToConsole)(env, log, maxNodeNameLength);
                 }
             }
         }
@@ -26,7 +26,7 @@ function groupedLogger(state, env) {
             if (service.type === 'end') {
                 completedServices.push(service.service.id);
                 for (const log of env.status.service(service.service).read()) {
-                    (0, log_1.writeNodeLogToConsole)(log, maxNodeNameLength);
+                    (0, log_1.writeNodeLogToConsole)(env, log, maxNodeNameLength);
                 }
             }
         }

package/dist/logging/interactive-logger.js

@@ -16,7 +16,7 @@ function interactiveLogger(state, env) {
             setTimeout(tickerFn, 100);
         }
     };
-    (0, log_1.hideCursor)();
+    (0, log_1.hideCursor)(env);
     tickerFn();
     state.on((currentState) => {
         (0, log_1.writeWorkTreeStatus)(currentState, env, count);
@@ -24,9 +24,9 @@ function interactiveLogger(state, env) {
     return {
         async complete(evt, env) {
             running = false;
-            (0, readline_1.clearScreenDown)(process.stdout);
+            (0, readline_1.clearScreenDown)(env.stdout);
             await (0, log_1.printWorkTreeResult)(evt.state, env);
-            (0, log_1.showCursor)();
+            (0, log_1.showCursor)(env);
         },
     };
 }

package/dist/logging/live-logger.js

@@ -5,7 +5,7 @@ const log_1 = require("../log");
 function liveLogger(state, env) {
     const maxNodeNameLength = (0, log_1.getNodeNameLengthForWorkTree)(state.current.node, state.current.service);
     env.status.on((log) => {
-        (0, log_1.writeNodeLogToConsole)(log, maxNodeNameLength);
+        (0, log_1.writeNodeLogToConsole)(env, log, maxNodeNameLength);
     });
     return {
         async complete(evt, env) {

package/dist/optimizer/get-work-node-cache-stats.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStateKey = exports.getCacheState = exports.getWorkNodeCacheStats = exports.getServiceNodeCacheStats = void 0;
 const calculate_checksum_1 = require("./calculate-checksum");
 const path_1 = require("path");
+const work_service_1 = require("../planner/work-service");
 const crypto_1 = require("crypto");
 async function addWorkNodeCacheStats(result, cwd, path, matcher, context) {
     const exists = await context.file.exists(path);
@@ -47,8 +48,13 @@ async function getServiceNodeCacheStats(cache, environment) {
     const result = {
         files: {},
     };
-    for (const mount of cache.mounts) {
-        await addWorkServiceCacheStats(result, mount.localPath, environment);
+    if ((0, work_service_1.isContainerWorkService)(cache)) {
+        for (const mount of cache.mounts) {
+            await addWorkServiceCacheStats(result, mount.localPath, environment);
+        }
+    }
+    else {
+        await addWorkServiceCacheStats(result, cache.kubeconfig, environment);
     }
     return result;
 }

package/dist/optimizer/work-node-cache-description.js

@@ -7,7 +7,7 @@ function getWorkNodeCacheDescription(task) {
         shell: task.shell ?? undefined,
         image: task.image ?? undefined,
         platform: task.image ? 'container' : (0, os_1.platform)(),
-        generates: task.generates.sort() ?? undefined,
+        generates: task.generates.map((g) => g.path).sort() ?? undefined,
         src: task.src.map((s) => s.relativePath).sort() ?? undefined,
         deps: task.deps.map((d) => d.name).sort() ?? undefined,
         envs: Object.keys(task.envs)

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

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultBuildFilename = void 0;
+const path_1 = require("path");
+async function getDefaultBuildFilename(folder, env) {
+    const fileNames = ['.hammerkit.yaml', '.hammerkit.yml', 'build.yaml'];
+    const existingFiles = [];
+    for (const fileName of fileNames) {
+        if (await env.file.exists((0, path_1.join)(folder, fileName))) {
+            existingFiles.push(fileName);
+        }
+    }
+    if (existingFiles.length > 1) {
+        env.console.warn(`multiple hammerkit files ${existingFiles.join(', ')} in ${folder}`);
+    }
+    if (existingFiles.length > 0) {
+        return existingFiles[0];
+    }
+    return fileNames[0];
+}
+exports.getDefaultBuildFilename = getDefaultBuildFilename;
+//# sourceMappingURL=default-build-file.js.map

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseBuildFileReferences = void 0;
 const path_1 = require("path");
 const read_build_file_1 = require("./read-build-file");
+const default_build_file_1 = require("./default-build-file");
 async function parseBuildFileReferences(type, fileName, files, refs, context) {
     if (!refs) {
         return {};
@@ -14,9 +15,19 @@ async function parseBuildFileReferences(type, fileName, files, refs, context) {
     for (const [key, value] of Object.entries(refs || {})) {
         const referenceFileName = (0, path_1.join)((0, path_1.dirname)(fileName), value);
         if (!(await context.file.exists(referenceFileName))) {
-            throw new Error(`${fileName} ${type} ${key} not found`);
+            throw new Error(`${fileName} ${type} ${key} ${referenceFileName} not found`);
+        }
+        const stats = await context.file.stats(referenceFileName);
+        if (stats.type === 'directory') {
+            const defaultReferenceFileName = (0, path_1.join)(referenceFileName, await (0, default_build_file_1.getDefaultBuildFilename)(referenceFileName, context));
+            if (!(await context.file.exists(defaultReferenceFileName))) {
+                throw new Error(`${fileName} ${type} ${key} ${defaultReferenceFileName} not found in ${referenceFileName}`);
+            }
+            result[key] = await (0, read_build_file_1.readBuildFile)(defaultReferenceFileName, files, context);
+        }
+        else {
+            result[key] = await (0, read_build_file_1.readBuildFile)(referenceFileName, files, context);
         }
-        result[key] = await (0, read_build_file_1.readBuildFile)(referenceFileName, files, context);
     }
     return result;
 }

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

@@ -10,6 +10,7 @@ const parse_build_file_task_source_1 = require("./parse-build-file-task-source")
 const parse_build_file_task_command_1 = require("./parse-build-file-task-command");
 const parse_build_file_services_1 = require("./parse-build-file-services");
 const parse_string_map_1 = require("./parse-string-map");
+const parse_context_1 = require("./parse-context");
 const parse_string_1 = require("./parse-string");
 const parse_boolean_1 = require("./parse-boolean");
 const validTaskKeys = [
@@ -22,8 +23,8 @@ const validTaskKeys = [
     'description',
     'extend',
     'cmds',
-    'watch',
     'continuous',
+    'cache',
 ];
 const validDockerTaskKeys = ['image', 'mounts', 'ports', 'shell', ...validTaskKeys];
 async function parseBuildFile(fileName, files, input, context) {
@@ -74,7 +75,7 @@ async function parseBuildFile(fileName, files, input, context) {
             mounts: (0, parse_string_array_1.parseStringArray)(ctx, 'mounts', value.mounts),
             src: (0, parse_build_file_task_source_1.parseBuildFileTaskSource)(ctx, value.src, context),
             deps: (0, parse_string_array_1.parseStringArray)(ctx, 'deps', value.deps),
-            generates: (0, parse_string_array_1.parseStringArray)(ctx, 'generates', value.generates),
+            generates: parseGenerateArray(ctx, 'generates', value.generates),
             description: (0, parse_string_1.parseString)(ctx, 'description', value.description, true)?.trim() ?? null,
             labels: (0, parse_string_map_1.parseStringMap)(ctx, 'labels', value.labels),
             image: value.image || null,
@@ -91,7 +92,7 @@ async function parseBuildFile(fileName, files, input, context) {
                 return map;
             }, {}),
             platform: null,
-            cache: value.caching || null,
+            cache: value.cache || null,
         };
         if (Object.keys(result.tasks[key].unknownProps).length > 0) {
             context.console.warn(`unknown props ${Object.keys(result.tasks[key].unknownProps)} for ${key} in ${fileName}`);
@@ -100,4 +101,25 @@ async function parseBuildFile(fileName, files, input, context) {
     return result;
 }
 exports.parseBuildFile = parseBuildFile;
+function parseGenerateArray(ctx, valueName, value) {
+    if (!value) {
+        return null;
+    }
+    if (value instanceof Array) {
+        return value.map((v, i) => {
+            if (typeof v === 'string') {
+                return v;
+            }
+            else {
+                return {
+                    path: (0, parse_string_1.parseString)(ctx, `generate[${i}].path`, v.path, false),
+                    resetOnChange: (0, parse_boolean_1.parseBoolean)(ctx, `generate[${i}].resetOnChange`, v.resetOnChange, true) || false,
+                };
+            }
+        });
+    }
+    else {
+        throw new Error(`${(0, parse_context_1.parseContextDescription)(ctx)} ${valueName} needs to be a string array`);
+    }
+}
 //# sourceMappingURL=parse-build-file.js.map

package/dist/planner/utils/parse-work-service-volume.js

@@ -15,7 +15,9 @@ exports.parseWorkServiceVolume = parseWorkServiceVolume;
 function parseVolume(cwd, name, containerPath) {
     return {
         name,
+        resetOnChange: false,
         containerPath: (0, normalize_path_1.normalizePath)(cwd, cwd, containerPath),
+        inherited: false,
     };
 }
 //# sourceMappingURL=parse-work-service-volume.js.map

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

@@ -22,7 +22,10 @@ function planWorkDependency(deps, node) {
         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);
+                    node.volumes.push({
+                        ...volume,
+                        inherited: true,
+                    });
                 }
             }
         }