dotcom-tool-kit 4.0.0-beta.5 → 4.0.0

package/lib/tasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAuDrC,wBAAsB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA+DlG"}
+{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAuDrC,wBAAsB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA0ElG"}

package/lib/tasks.js

@@ -27,14 +27,14 @@ const loadTasks = async (logger, tasks, config) => {
             };
             if (parsedOptions.success) {
                 const task = new Task(logger, taskId, (0, options_1.getOptions)(entryPoint.plugin.id) ?? {}, parsedOptions.data);
-                return (0, validated_1.valid)([taskId, task]);
+                return (0, validated_1.valid)(task);
             }
             else {
                 return (0, validated_1.invalid)([(0, messages_1.formatInvalidOption)([logger_1.styles.task(taskId), parsedOptions.error])]);
             }
         });
     }));
-    return (0, validated_1.reduceValidated)(taskResults).map(Object.fromEntries);
+    return (0, validated_1.reduceValidated)(taskResults);
 };
 async function runTasks(logger, commands, files) {
     const config = await (0, config_1.loadConfig)(logger);
@@ -48,24 +48,30 @@ async function runTasks(logger, commands, files) {
     if ((0, fetch_1.shouldDisableNativeFetch)()) {
         process.execArgv.push('--no-experimental-fetch');
     }
-    const commandTasks = commands.flatMap((command) => config.commandTasks[command]?.tasks ?? []);
-    const tasks = (await loadTasks(logger, commandTasks, config)).unwrap('tasks are invalid');
-    for (const command of commands) {
+    const commandTasks = (0, validated_1.reduceValidated)(await Promise.all(commands.map(async (command) => {
+        const tasks = config.commandTasks[command]?.tasks ?? [];
+        const validatedTaskInstances = await loadTasks(logger, tasks, config);
+        return validatedTaskInstances.map((taskInstances) => ({ command, tasks: taskInstances }));
+    }))).unwrap('tasks are invalid!');
+    for (const { command, tasks } of commandTasks) {
         const errors = [];
-        if (!config.commandTasks[command]) {
+        if (tasks.length === 0) {
             logger.warn(`no task configured for ${command}: skipping assignment...`);
-            continue;
         }
-        for (const { task: taskId } of config.commandTasks[command].tasks) {
+        for (const task of tasks) {
             try {
-                logger.info(logger_1.styles.taskHeader(`running ${logger_1.styles.task(taskId)} task`));
-                await tasks[taskId].run(files);
+                logger.info(logger_1.styles.taskHeader(`running ${logger_1.styles.task(task.id)} task`));
+                await task.run({ files });
             }
             catch (error) {
+                // if there's an exit code, that's a request from the task to exit early
+                if (error instanceof error_1.ToolKitError && error.exitCode) {
+                    throw error;
+                }
+                // if not, we allow subsequent hook tasks to run on error
                 // TODO use validated for this
-                // allow subsequent command tasks to run on error
                 errors.push({
-                    task: taskId,
+                    task: task.id,
                     error: error
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotcom-tool-kit",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0",
   "description": "modern, maintainable, modular developer tooling for FT.com projects",
   "author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
   "license": "MIT",
@@ -30,15 +30,15 @@
     "zod": "^3.22.4"
   },
   "dependencies": {
-    "@dotcom-tool-kit/base": "4.0.0-beta.0",
-    "@dotcom-tool-kit/config": "2.0.0-beta.0",
-    "@dotcom-tool-kit/conflict": "2.0.0-beta.0",
-    "@dotcom-tool-kit/error": "4.0.0-beta.0",
-    "@dotcom-tool-kit/logger": "4.0.0-beta.0",
-    "@dotcom-tool-kit/options": "4.0.0-beta.0",
-    "@dotcom-tool-kit/plugin": "2.0.0-beta.0",
-    "@dotcom-tool-kit/validated": "2.0.0-beta.0",
-    "@dotcom-tool-kit/wait-for-ok": "4.0.0-beta.0",
+    "@dotcom-tool-kit/base": "^1.0.0",
+    "@dotcom-tool-kit/config": "^1.0.0",
+    "@dotcom-tool-kit/conflict": "^1.0.0",
+    "@dotcom-tool-kit/error": "^4.0.0",
+    "@dotcom-tool-kit/logger": "^4.0.0",
+    "@dotcom-tool-kit/options": "^4.0.0",
+    "@dotcom-tool-kit/plugin": "^1.0.0",
+    "@dotcom-tool-kit/validated": "^1.0.0",
+    "@dotcom-tool-kit/wait-for-ok": "^4.0.0",
     "endent": "^2.1.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.5",