dotcom-tool-kit 4.0.6 → 4.2.0

package/bin/run

@@ -9,7 +9,8 @@ const argv = require('minimist')(process.argv.slice(2), {
   '--': true
 })
 
-const { rootLogger, styles } = require('@dotcom-tool-kit/logger')
+const { rootLogger } = require('@dotcom-tool-kit/logger')
+const { formatError } = require('../lib/messages')
 
 async function main() {
   try {
@@ -41,15 +42,7 @@ async function main() {
       }
     }
   } catch (error) {
-    if (error.details) {
-      rootLogger.error('', { skipformat: true })
-      rootLogger.error(error.message)
-      rootLogger.error(styles.ruler() + '\n', { skipformat: true })
-      rootLogger.error(error.details, { skipformat: true })
-    } else {
-      rootLogger.error(error.stack)
-    }
-
+    rootLogger.error(formatError(error), { skipFormat: true })
     process.exitCode = error.exitCode || 1
   }
 }

package/lib/config.d.ts

@@ -1,11 +1,13 @@
 import type { Logger } from 'winston';
 import { RawConfig, ValidConfig, ValidPluginsConfig } from '@dotcom-tool-kit/config';
-export declare const createConfig: () => RawConfig;
+export declare const createConfig: (root: string) => RawConfig;
 export declare function validateConfig(config: ValidPluginsConfig): ValidConfig;
-export declare function loadConfig(logger: Logger, options?: {
+export declare function loadConfig(logger: Logger, options: {
     validate?: true;
+    root: string;
 }): Promise<ValidConfig>;
-export declare function loadConfig(logger: Logger, options?: {
+export declare function loadConfig(logger: Logger, options: {
     validate?: false;
+    root: string;
 }): Promise<RawConfig>;
 //# sourceMappingURL=config.d.ts.map

package/lib/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAUrC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAiBpF,eAAO,MAAM,YAAY,QAAO,SAgB9B,CAAA;AAEF,wBAAgB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,CA6FtE;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AAC/F,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAUrC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAgBpF,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,SAgB1C,CAAA;AAEF,wBAAgB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,CA6FtE;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,QAAQ,CAAC,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AAC5G,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA"}

package/lib/config.js

@@ -1,17 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadConfig = exports.validateConfig = exports.createConfig = void 0;
-const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
 const plugin_1 = require("./plugin");
 const conflict_1 = require("@dotcom-tool-kit/conflict");
 const error_1 = require("@dotcom-tool-kit/error");
 const messages_1 = require("./messages");
 const validate_plugins_1 = require("./config/validate-plugins");
 const options_1 = require("./plugin/options");
-const coreRoot = path_1.default.resolve(__dirname, '../');
-const createConfig = () => ({
-    root: coreRoot,
+const logger_1 = require("@dotcom-tool-kit/logger");
+const createConfig = (root) => ({
+    root,
     plugins: {},
     resolutionTrackers: {
         resolvedPluginOptions: new Set(),
@@ -64,14 +62,14 @@ function validateConfig(config) {
         }
     }
     const unusedPluginOptions = Object.entries(config.pluginOptions)
-        .filter(([, option]) => option && !(0, conflict_1.isConflict)(option) && !option.forPlugin && option.plugin.root === process.cwd())
+        .filter(([, option]) => option && !(0, conflict_1.isConflict)(option) && !option.forPlugin && option.plugin.root === config.root)
         .map(([id]) => id);
     if (unusedPluginOptions.length > 0) {
         shouldThrow = true;
         error.details += (0, messages_1.formatUnusedPluginOptions)(unusedPluginOptions, Object.keys(config.plugins));
     }
     const unusedTaskOptions = Object.entries(config.taskOptions)
-        .filter(([, option]) => option && !(0, conflict_1.isConflict)(option) && !option.task && option.plugin.root === process.cwd())
+        .filter(([, option]) => option && !(0, conflict_1.isConflict)(option) && !option.task && option.plugin.root === config.root)
         .map(([id]) => id);
     if (unusedTaskOptions.length > 0) {
         shouldThrow = true;
@@ -94,8 +92,8 @@ function validateConfig(config) {
     return validConfig;
 }
 exports.validateConfig = validateConfig;
-async function loadConfig(logger, { validate = true } = {}) {
-    const config = (0, exports.createConfig)();
+async function loadConfig(logger, { validate = true, root }) {
+    const config = (0, exports.createConfig)(root);
     // start loading config and child plugins, starting from the consumer app directory
     const rootPlugin = await (0, plugin_1.loadPlugin)('app root', config, logger);
     const validRootPlugin = rootPlugin.unwrap('root plugin was not valid!');
@@ -107,7 +105,7 @@ async function loadConfig(logger, { validate = true } = {}) {
     (0, plugin_1.resolvePluginOptions)(validRootPlugin, validPluginConfig);
     const invalidOptions = (0, options_1.validatePluginOptions)(logger, validPluginConfig);
     if (invalidOptions.length > 0 && validate) {
-        const error = new error_1.ToolKitError('There are problems with your plugin options.');
+        const error = new error_1.ToolKitError(`There are options in your ${logger_1.styles.filepath('.toolkitrc.yml')} that aren't what Tool Kit expected.`);
         error.details = (0, messages_1.formatInvalidPluginOptions)(invalidOptions);
         throw error;
     }

package/lib/fetch.d.ts

@@ -1,2 +1,3 @@
-export declare const shouldDisableNativeFetch: () => boolean;
+import { RootOptions } from '@dotcom-tool-kit/schemas/src/plugins/dotcom-tool-kit';
+export declare const shouldDisableNativeFetch: (options: RootOptions) => boolean;
 //# sourceMappingURL=fetch.d.ts.map

package/lib/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,wBAAwB,QAAO,OAY3C,CAAA"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAA;AAIlF,eAAO,MAAM,wBAAwB,YAAa,WAAW,KAAG,OAK/D,CAAA"}

package/lib/fetch.js

@@ -1,19 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shouldDisableNativeFetch = void 0;
-const options_1 = require("@dotcom-tool-kit/options");
 // function that plugins can check if they need to implement their own logic to
 // disable Node 18's native fetch
-const shouldDisableNativeFetch = () => {
+const shouldDisableNativeFetch = (options) => {
     // disable Node 18's native fetch if the Node runtime supports it (older
     // runtimes don't support the flag, implying they also don't use native
     // fetch) and the user hasn't opted out of the behaviour
-    return (
-    /* eslint-disable-next-line @typescript-eslint/no-non-null-assertion --
-     * the root plugin has default options and it always exists so is always
-     * defined
-     **/
-    !(0, options_1.getOptions)('app root').allowNativeFetch &&
-        process.allowedNodeEnvironmentFlags.has('--no-experimental-fetch'));
+    return !options.allowNativeFetch && process.allowedNodeEnvironmentFlags.has('--no-experimental-fetch');
 };
 exports.shouldDisableNativeFetch = shouldDisableNativeFetch;

package/lib/help.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../src/help.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AA4ErC,wBAA8B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA4CxF"}
+{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../src/help.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AA4ErC,wBAA8B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCxF"}

package/lib/help.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const config_1 = require("./config");
-const options_1 = require("@dotcom-tool-kit/options");
 const logger_1 = require("@dotcom-tool-kit/logger");
 const yaml_1 = tslib_1.__importDefault(require("yaml"));
 const endent_1 = tslib_1.__importDefault(require("endent"));
@@ -51,16 +50,11 @@ const formatHooks = (config) => logger_1.styles.box((0, endent_1.default) `
     .join('\n')}
 `, { title: logger_1.styles.title('🎣 installed hooks') });
 async function showHelp(logger, commands) {
-    const config = await (0, config_1.loadConfig)(logger);
+    const config = await (0, config_1.loadConfig)(logger, { root: process.cwd() });
     const printAllCommands = commands.length === 0;
     if (printAllCommands) {
         commands = Object.keys(config.commandTasks).sort();
     }
-    for (const pluginOptions of Object.values(config.pluginOptions)) {
-        if (pluginOptions.forPlugin) {
-            (0, options_1.setOptions)(pluginOptions.forPlugin.id, pluginOptions.options);
-        }
-    }
     logger.info(toolKitIntro);
     const definedCommands = commands.filter((command) => config.commandTasks[command]);
     const missingCommands = commands.filter((command) => !config.commandTasks[command]);

package/lib/index.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "runTasks", { enumerable: true, get: function ()
 var fetch_1 = require("./fetch");
 Object.defineProperty(exports, "shouldDisableNativeFetch", { enumerable: true, get: function () { return fetch_1.shouldDisableNativeFetch; } });
 async function listPlugins(logger) {
-    const config = await (0, config_1.loadConfig)(logger, { validate: false });
+    const config = await (0, config_1.loadConfig)(logger, { validate: false, root: process.cwd() });
     const rootPlugin = config.plugins['app root'];
     if (rootPlugin?.valid) {
         logger.info((0, messages_1.formatPluginTree)(rootPlugin.value).join('\n'));
@@ -18,7 +18,7 @@ async function listPlugins(logger) {
 }
 exports.listPlugins = listPlugins;
 async function printConfig(logger) {
-    const config = await (0, config_1.loadConfig)(logger, { validate: false });
+    const config = await (0, config_1.loadConfig)(logger, { validate: false, root: process.cwd() });
     logger.info(util_1.default.inspect(config, { depth: null, colors: true }));
 }
 exports.printConfig = printConfig;

package/lib/install.d.ts

@@ -1,9 +1,8 @@
-import type { z } from 'zod';
 import type { Logger } from 'winston';
 import type { ValidConfig } from '@dotcom-tool-kit/config';
 import { Hook } from '@dotcom-tool-kit/base';
 import { Validated } from '@dotcom-tool-kit/validated';
-export declare const loadHookInstallations: (logger: Logger, config: ValidConfig) => Promise<Validated<Hook<z.ZodType, unknown>[]>>;
+export declare const loadHookInstallations: (logger: Logger, config: ValidConfig) => Promise<Validated<Hook[]>>;
 export declare function checkInstall(logger: Logger, config: ValidConfig): Promise<void>;
 export default function installHooks(logger: Logger): Promise<ValidConfig>;
 //# sourceMappingURL=install.d.ts.map

package/lib/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAK5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAGrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,IAAI,EAAa,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,SAAS,EAAmC,MAAM,4BAA4B,CAAA;AAyCvF,eAAO,MAAM,qBAAqB,WACxB,MAAM,UACN,WAAW,KAClB,QAAQ,UAAU,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,CAqC/C,CAAA;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBrF;AAED,wBAA8B,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAyD/E"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAGrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,IAAI,EAAa,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,SAAS,EAAmC,MAAM,4BAA4B,CAAA;AAyCvF,eAAO,MAAM,qBAAqB,WACxB,MAAM,UACN,WAAW,KAClB,QAAQ,UAAU,IAAI,EAAE,CAAC,CAwC3B,CAAA;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBrF;AAED,wBAA8B,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAmD/E"}

package/lib/install.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const error_1 = require("@dotcom-tool-kit/error");
 const logger_1 = require("@dotcom-tool-kit/logger");
-const options_1 = require("@dotcom-tool-kit/options");
 const groupBy_1 = tslib_1.__importDefault(require("lodash/groupBy"));
 const config_1 = require("./config");
 const hash_1 = require("./config/hash");
@@ -52,7 +51,10 @@ const loadHookInstallations = async (logger, config) => {
         return (0, validated_1.valid)((0, conflict_1.withoutConflicts)(installations));
     });
     return installationsWithoutConflicts.map((installations) => {
-        return installations.map(({ hookConstructor, forHook, options }) => new hookConstructor(logger, forHook, options));
+        return installations.map(({ hookConstructor, forHook, options }) => {
+            const hookPlugin = config.hooks[forHook].plugin;
+            return new hookConstructor(logger, forHook, options, config.pluginOptions[hookPlugin.id]?.options);
+        });
     });
 };
 exports.loadHookInstallations = loadHookInstallations;
@@ -73,12 +75,7 @@ async function checkInstall(logger, config) {
 }
 exports.checkInstall = checkInstall;
 async function installHooks(logger) {
-    const config = await (0, config_1.loadConfig)(logger);
-    for (const pluginOptions of Object.values(config.pluginOptions)) {
-        if (pluginOptions.forPlugin) {
-            (0, options_1.setOptions)(pluginOptions.forPlugin.id, pluginOptions.options);
-        }
-    }
+    const config = await (0, config_1.loadConfig)(logger, { root: process.cwd() });
     await (0, init_1.runInit)(logger, config);
     const errors = [];
     const hooks = (await (0, exports.loadHookInstallations)(logger, config)).unwrap('hooks were found to be invalid when installing');

package/lib/messages.d.ts

@@ -13,7 +13,7 @@ export declare const formatInvalidPluginOptions: (invalidOptions: InvalidOption[
 export declare const formatUnusedPluginOptions: (unusedOptions: string[], definedPlugins: string[]) => string;
 export declare const formatUnusedTaskOptions: (unusedOptions: string[], definedTasks: string[]) => string;
 export declare const formatUnusedHookOptions: (unusedOptions: string[], definedHooks: string[]) => string;
-export declare const formatUninstalledHooks: (uninstalledHooks: Hook<z.ZodTypeAny, unknown>[]) => string;
+export declare const formatUninstalledHooks: (uninstalledHooks: Hook[]) => string;
 type Missing = {
     command: CommandTask;
     tasks: OptionsForTask[];
@@ -21,5 +21,6 @@ type Missing = {
 export declare const formatMissingTasks: (missingTasks: Missing[], tasks: string[]) => string;
 export declare function formatPluginTree(plugin: Plugin): string[];
 export declare const indentReasons: (reasons: string) => string;
+export declare function formatError(error: Error): string;
 export {};
 //# sourceMappingURL=messages.d.ts.map

package/lib/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,MAAM,EACN,gBAAgB,EAChB,cAAc,EACf,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAE5B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AAOzD,eAAO,MAAM,mBAAmB,cAAe,CAAC,MAAM,EAAE,SAAS,UAAU,CAAC,CAAC,EAAE,KAAG,MAKT,CAAA;AAOzE,eAAO,MAAM,mBAAmB,cAAe,CAAC,MAAM,EAAE,SAAS,UAAU,CAAC,CAAC,EAAE,KAAG,MAKT,CAAA;AAezE,eAAO,MAAM,0BAA0B,cAAe,SAAS,WAAW,CAAC,EAAE,KAAG,MAQ/E,CAAA;AAOD,eAAO,MAAM,2BAA2B,cAAe,SAAS,gBAAgB,CAAC,EAAE,KAAG,MAUrF,CAAA;AAOD,eAAO,MAAM,yBAAyB,cAAe,SAAS,cAAc,CAAC,EAAE,KAAG,MAUjF,CAAA;AAKD,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAA;AAEhD,eAAO,MAAM,mBAAmB,kCAAiC,MACI,CAAA;AAErE,eAAO,MAAM,0BAA0B,mBACrB,aAAa,EAAE,KAC9B,MAKF,CAAA;AAED,eAAO,MAAM,yBAAyB,kBACrB,MAAM,EAAE,kBACP,MAAM,EAAE,KACvB,MAaF,CAAA;AAED,eAAO,MAAM,uBAAuB,kBACnB,MAAM,EAAE,gBACT,MAAM,EAAE,KACrB,MAaF,CAAA;AAED,eAAO,MAAM,uBAAuB,kBACnB,MAAM,EAAE,gBACT,MAAM,EAAE,KACrB,MAaF,CAAA;AAED,eAAO,MAAM,sBAAsB,qBACf,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,KAC9C,MAKF,CAAA;AAED,KAAK,OAAO,GAAG;IAAE,OAAO,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,cAAc,EAAE,CAAA;CAAE,CAAA;AAOhE,eAAO,MAAM,kBAAkB,iBACf,OAAO,EAAE,SAChB,MAAM,EAAE,KACd,MAOF,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAezD;AAED,eAAO,MAAM,aAAa,YAAa,MAAM,KAAG,MAAwC,CAAA"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,MAAM,EACN,gBAAgB,EAChB,cAAc,EACf,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAE5B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AASzD,eAAO,MAAM,mBAAmB,cAAe,CAAC,MAAM,EAAE,SAAS,UAAU,CAAC,CAAC,EAAE,KAAG,MAKT,CAAA;AAOzE,eAAO,MAAM,mBAAmB,cAAe,CAAC,MAAM,EAAE,SAAS,UAAU,CAAC,CAAC,EAAE,KAAG,MAKT,CAAA;AAezE,eAAO,MAAM,0BAA0B,cAAe,SAAS,WAAW,CAAC,EAAE,KAAG,MAQ/E,CAAA;AAOD,eAAO,MAAM,2BAA2B,cAAe,SAAS,gBAAgB,CAAC,EAAE,KAAG,MAUrF,CAAA;AAOD,eAAO,MAAM,yBAAyB,cAAe,SAAS,cAAc,CAAC,EAAE,KAAG,MAUjF,CAAA;AAKD,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAA;AAEhD,eAAO,MAAM,mBAAmB,kCAAiC,MAC4G,CAAA;AAE7K,eAAO,MAAM,0BAA0B,mBACrB,aAAa,EAAE,KAC9B,MAG2F,CAAA;AAE9F,eAAO,MAAM,yBAAyB,kBACrB,MAAM,EAAE,kBACP,MAAM,EAAE,KACvB,MAaF,CAAA;AAED,eAAO,MAAM,uBAAuB,kBACnB,MAAM,EAAE,gBACT,MAAM,EAAE,KACrB,MAaF,CAAA;AAED,eAAO,MAAM,uBAAuB,kBACnB,MAAM,EAAE,gBACT,MAAM,EAAE,KACrB,MAaF,CAAA;AAED,eAAO,MAAM,sBAAsB,qBACf,IAAI,EAAE,KACvB,MAKF,CAAA;AAED,KAAK,OAAO,GAAG;IAAE,OAAO,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,cAAc,EAAE,CAAA;CAAE,CAAA;AAOhE,eAAO,MAAM,kBAAkB,iBACf,OAAO,EAAE,SAChB,MAAM,EAAE,KACd,MAOF,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAezD;AAED,eAAO,MAAM,aAAa,YAAa,MAAM,KAAG,MAAwC,CAAA;AAExF,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,UA4BvC"}

package/lib/messages.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.indentReasons = exports.formatPluginTree = exports.formatMissingTasks = exports.formatUninstalledHooks = exports.formatUnusedHookOptions = exports.formatUnusedTaskOptions = exports.formatUnusedPluginOptions = exports.formatInvalidPluginOptions = exports.formatInvalidOption = exports.formatTaskOptionConflicts = exports.formatPluginOptionConflicts = exports.formatCommandTaskConflicts = exports.formatHookConflicts = exports.formatTaskConflicts = void 0;
+exports.formatError = exports.indentReasons = exports.formatPluginTree = exports.formatMissingTasks = exports.formatUninstalledHooks = exports.formatUnusedHookOptions = exports.formatUnusedTaskOptions = exports.formatUnusedPluginOptions = exports.formatInvalidPluginOptions = exports.formatInvalidOption = exports.formatTaskOptionConflicts = exports.formatPluginOptionConflicts = exports.formatCommandTaskConflicts = exports.formatHookConflicts = exports.formatTaskConflicts = void 0;
+const tslib_1 = require("tslib");
 const logger_1 = require("@dotcom-tool-kit/logger");
 const zod_validation_error_1 = require("zod-validation-error");
+const pluralize_1 = tslib_1.__importDefault(require("pluralize"));
+const error_1 = require("@dotcom-tool-kit/error");
 const formatTaskConflict = ([key, conflict]) => `- ${logger_1.styles.task(key ?? 'unknown task')} ${logger_1.styles.dim('from plugins')} ${conflict.conflicting
     .map((entryPoint) => logger_1.styles.plugin(entryPoint.plugin.id ?? 'unknown plugin'))
     .join(logger_1.styles.dim(', '))}`;
@@ -51,14 +54,12 @@ You must resolve this conflict by providing options in your app's Tool Kit confi
 `;
 exports.formatTaskOptionConflicts = formatTaskOptionConflicts;
 const formatPlugin = (plugin) => plugin.id === 'app root' ? logger_1.styles.app('your app') : `plugin ${logger_1.styles.plugin(plugin.id)}`;
-const formatInvalidOption = ([id, error]) => (0, zod_validation_error_1.fromZodError)(error, { prefix: `- ${id} has the issue(s)` }).message;
+const formatInvalidOption = ([id, error]) => (0, zod_validation_error_1.fromZodError)(error, { prefix: `${logger_1.styles.warning((0, pluralize_1.default)('issue', error.issues.length, true))} in ${logger_1.styles.plugin(id)}`, prefixSeparator: ':\n- ', issueSeparator: '\n- ' }).message;
 exports.formatInvalidOption = formatInvalidOption;
-const formatInvalidPluginOptions = (invalidOptions) => `Options are defined in your Tool Kit configuration that are the wrong types:
-
+const formatInvalidPluginOptions = (invalidOptions) => `Please update the options so that they are the expected types.
 ${invalidOptions.map(([plugin, error]) => (0, exports.formatInvalidOption)([logger_1.styles.plugin(plugin), error])).join('\n')}
 
-Please update the options so that they are the expected types. You can refer to the README for the plugin for examples and descriptions of the options used.
-`;
+You can refer to the README for the plugin for examples and descriptions of the options used.`;
 exports.formatInvalidPluginOptions = formatInvalidPluginOptions;
 const formatUnusedPluginOptions = (unusedOptions, definedPlugins) => `Options are defined in your Tool Kit configuration for plugins that don't exist:
 
@@ -131,3 +132,26 @@ function formatPluginTree(plugin) {
 exports.formatPluginTree = formatPluginTree;
 const indentReasons = (reasons) => reasons.replace(/\n/g, '\n  ');
 exports.indentReasons = indentReasons;
+function formatError(error) {
+    let output = `${logger_1.styles.error(error.name)}: ${error.message}\n`;
+    if (error instanceof AggregateError) {
+        output += error.errors
+            .map(formatError)
+            .map((message, messageIndex) => {
+            const lines = message.split('\n');
+            // TODO:KB:20241125 refactor the tree formatter from this and formatPluginTree into a shared function
+            return lines.map((line, lineIndex) => (messageIndex === error.errors.length - 1 ? (lineIndex === 0 ? '╰─' : '  ') : lineIndex === 0 ? '├─' : '│ ') + line).join('\n');
+        })
+            .join('\n');
+    }
+    else if (error instanceof error_1.ToolKitError) {
+        if (error.details) {
+            output += logger_1.styles.info(error.details);
+        }
+    }
+    else if (error.stack) {
+        output += error.stack.split('\n').slice(1).join('\n');
+    }
+    return output + '\n';
+}
+exports.formatError = formatError;

package/lib/plugin/options.js

@@ -25,7 +25,7 @@ const validatePluginOptions = (logger, config) => {
                     id,
                     new zod_1.ZodError([
                         {
-                            message: `your ${logger_1.styles.filepath('.toolkitrc.yml')} has options for the ${logger_1.styles.plugin(id)} plugin, which are now task options. move these options to ${logger_1.styles.code(`options.tasks.${logger_1.styles.task(movedToTask)}`)}`,
+                            message: `options for the ${logger_1.styles.plugin(id)} plugin have moved to ${logger_1.styles.code(`options.tasks.${logger_1.styles.task(movedToTask)}`)}`,
                             code: zod_1.ZodIssueCode.custom,
                             path: []
                         }

package/lib/plugin/require-resolve.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" />
+export declare const resolve: NodeJS.RequireResolve;
+//# sourceMappingURL=require-resolve.d.ts.map

package/lib/plugin/require-resolve.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"require-resolve.d.ts","sourceRoot":"","sources":["../../src/plugin/require-resolve.ts"],"names":[],"mappings":";AAAA,eAAO,MAAM,OAAO,uBAAkB,CAAA"}

package/lib/plugin/require-resolve.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolve = void 0;
+exports.resolve = require.resolve;

package/lib/plugin/resolve-root.d.ts

@@ -0,0 +1,2 @@
+export declare function resolveRoot(id: string, root: string): string;
+//# sourceMappingURL=resolve-root.d.ts.map

package/lib/plugin/resolve-root.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-root.d.ts","sourceRoot":"","sources":["../../src/plugin/resolve-root.ts"],"names":[],"mappings":"AAKA,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAoB5D"}

package/lib/plugin/resolve-root.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveRoot = void 0;
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const require_resolve_1 = require("./require-resolve");
+const error_1 = require("@dotcom-tool-kit/error");
+const logger_1 = require("@dotcom-tool-kit/logger");
+function resolveRoot(id, root) {
+    const isRelative = id.startsWith('./');
+    // resolve the .toolkitrc.yml of a plugin as many plugins don't have valid
+    // entrypoints now that we're intending their tasks/hooks to be loaded via
+    // entrypoints defined in config
+    const pluginPath = path_1.default.join(id, '.toolkitrc.yml');
+    try {
+        const resolvedPath = (0, require_resolve_1.resolve)(isRelative ? './' + pluginPath : pluginPath, { paths: [root] });
+        return path_1.default.dirname(resolvedPath);
+    }
+    catch (error) {
+        if (error instanceof Error && 'code' in error && error.code === 'MODULE_NOT_FOUND') {
+            const error = new error_1.ToolKitError(`Couldn't resolve plugin ${logger_1.styles.plugin(id)} from directory ${logger_1.styles.filepath(root)}`);
+            error.details = `If this is a built-in Tool Kit plugin, check it's installed as a dependency. If it's a custom plugin, check it has a ${logger_1.styles.filepath('.toolkitrc.yml')}, and that the path is the correct relative path to the plugin from the ${logger_1.styles.filepath('.toolkitrc.yml')} it's being included from.`;
+            throw error;
+        }
+        throw error;
+    }
+}
+exports.resolveRoot = resolveRoot;

package/lib/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,KAAK,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAmC,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAEvF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAoBrC,wBAAsB,UAAU,CAC9B,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAqD5B;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAiBrF;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAqB9F"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,KAAK,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAmC,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACvF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAWrC,wBAAsB,UAAU,CAC9B,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAqD5B;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAiBrF;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAqB9F"}

package/lib/plugin.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePlugin = exports.resolvePluginOptions = exports.loadPlugin = void 0;
-const tslib_1 = require("tslib");
 const logger_1 = require("@dotcom-tool-kit/logger");
 const plugin_1 = require("@dotcom-tool-kit/plugin");
 const validated_1 = require("@dotcom-tool-kit/validated");
-const path = tslib_1.__importStar(require("path"));
 const rc_file_1 = require("./rc-file");
 const messages_1 = require("./messages");
 const merge_tasks_1 = require("./plugin/merge-tasks");
@@ -14,15 +12,7 @@ const merge_commands_1 = require("./plugin/merge-commands");
 const merge_plugin_options_1 = require("./plugin/merge-plugin-options");
 const merge_inits_1 = require("./plugin/merge-inits");
 const merge_task_options_1 = require("./plugin/merge-task-options");
-function resolveRoot(id, root) {
-    const isPath = id.startsWith('.') || id.startsWith('/');
-    // resolve the package.json of a plugin as many plugins don't have valid
-    // entrypoints now that we're intending their tasks/hooks to be loaded via
-    // entrypoints defined in config
-    const modulePath = isPath ? id : path.join(id, 'package.json');
-    const resolvedPath = require.resolve(modulePath, { paths: [root] });
-    return path.dirname(resolvedPath);
-}
+const resolve_root_1 = require("./plugin/resolve-root");
 async function loadPlugin(id, config, logger, parent) {
     // don't load duplicate plugins
     if (id in config.plugins) {
@@ -30,8 +20,8 @@ async function loadPlugin(id, config, logger, parent) {
     }
     const isAppRoot = id === 'app root';
     // load plugin relative to the parent plugin
-    const root = parent ? parent.root : process.cwd();
-    const pluginRoot = isAppRoot ? root : resolveRoot(id, root);
+    const root = parent ? parent.root : config.root;
+    const pluginRoot = isAppRoot ? root : (0, resolve_root_1.resolveRoot)(id, root);
     if (!pluginRoot) {
         return (0, validated_1.invalid)([`could not find path for name ${logger_1.styles.filepath(id)}`]);
     }

package/lib/tasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAG1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAuDrC,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAwEjI;AAED,wBAAsB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAIlG"}
+{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAG1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAuDrC,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,IAAI,CAAC,CA8Df;AAED,wBAAsB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAIlG"}

package/lib/tasks.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runTasks = exports.runTasksFromConfig = void 0;
+const tslib_1 = require("tslib");
 const base_1 = require("@dotcom-tool-kit/base");
 const validated_1 = require("@dotcom-tool-kit/validated");
 const entry_point_1 = require("./plugin/entry-point");
-const options_1 = require("@dotcom-tool-kit/options");
 const config_1 = require("./config");
 const error_1 = require("@dotcom-tool-kit/error");
 const install_1 = require("./install");
@@ -13,6 +13,7 @@ const fetch_1 = require("./fetch");
 const init_1 = require("./init");
 const messages_1 = require("./messages");
 const schemas_1 = require("@dotcom-tool-kit/schemas");
+const pluralize_1 = tslib_1.__importDefault(require("pluralize"));
 const loadTasks = async (logger, tasks, config) => {
     const taskResults = await Promise.all(tasks.map(async ({ task: taskId, options }) => {
         const entryPoint = config.tasks[taskId];
@@ -26,7 +27,7 @@ const loadTasks = async (logger, tasks, config) => {
                 data: mergedOptions
             };
             if (parsedOptions.success) {
-                const task = new Task(logger, taskId, (0, options_1.getOptions)(entryPoint.plugin.id) ?? {}, parsedOptions.data);
+                const task = new Task(logger, taskId, config.pluginOptions[entryPoint.plugin.id]?.options ?? {}, parsedOptions.data);
                 return (0, validated_1.valid)(task);
             }
             else {
@@ -37,14 +38,10 @@ const loadTasks = async (logger, tasks, config) => {
     return (0, validated_1.reduceValidated)(taskResults);
 };
 async function runTasksFromConfig(logger, config, commands, files) {
-    for (const pluginOptions of Object.values(config.pluginOptions)) {
-        if (pluginOptions.forPlugin) {
-            (0, options_1.setOptions)(pluginOptions.forPlugin.id, pluginOptions.options);
-        }
-    }
     await (0, init_1.runInit)(logger, config);
     await (0, install_1.checkInstall)(logger, config);
-    if ((0, fetch_1.shouldDisableNativeFetch)()) {
+    if ((0, fetch_1.shouldDisableNativeFetch)(config.pluginOptions['app root'].options) &&
+        !process.execArgv.includes('--no-experimental-fetch')) {
         process.execArgv.push('--no-experimental-fetch');
     }
     const commandTasks = (0, validated_1.reduceValidated)(await Promise.all(commands.map(async (command) => {
@@ -52,6 +49,9 @@ async function runTasksFromConfig(logger, config, commands, files) {
         const validatedTaskInstances = await loadTasks(logger, tasks, config);
         return validatedTaskInstances.map((taskInstances) => ({ command, tasks: taskInstances }));
     }))).unwrap('tasks are invalid!');
+    // at this point we no longer need to update the config, so freeze it before
+    // passing it into task run contexts so that plugins can't do crimes
+    Object.freeze(config);
     for (const { command, tasks } of commandTasks) {
         const errors = [];
         if (tasks.length === 0) {
@@ -60,7 +60,7 @@ async function runTasksFromConfig(logger, config, commands, files) {
         for (const task of tasks) {
             try {
                 logger.info(logger_1.styles.taskHeader(`running ${logger_1.styles.task(task.id)} task`));
-                await task.run({ files });
+                await task.run({ files, command, cwd: config.root, config });
             }
             catch (error) {
                 // if there's an exit code, that's a request from the task to exit early
@@ -76,24 +76,16 @@ async function runTasksFromConfig(logger, config, commands, files) {
             }
         }
         if (errors.length > 0) {
-            const error = new error_1.ToolKitError(`error running tasks for ${logger_1.styles.hook(command)}`);
-            error.details = errors
-                .map(({ task, error }) => `${logger_1.styles.heading(`${logger_1.styles.task(task)}:`)}
-
-${error.message}${error instanceof error_1.ToolKitError
-                ? `
-
-${error.details}`
-                : ''}`)
-                .join(`${logger_1.styles.dim(logger_1.styles.ruler())}\n`);
-            error.exitCode = errors.length + 1;
-            throw error;
+            throw new AggregateError(errors.map(({ task, error }) => {
+                error.name = `${logger_1.styles.task(task)} → ${error.name}`;
+                return error;
+            }), `${(0, pluralize_1.default)('error', errors.length, true)} running tasks for ${logger_1.styles.command(command)}`);
         }
     }
 }
 exports.runTasksFromConfig = runTasksFromConfig;
 async function runTasks(logger, commands, files) {
-    const config = await (0, config_1.loadConfig)(logger);
+    const config = await (0, config_1.loadConfig)(logger, { root: process.cwd() });
     return runTasksFromConfig(logger, config, commands, files);
 }
 exports.runTasks = runTasks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotcom-tool-kit",
-  "version": "4.0.6",
+  "version": "4.2.0",
   "description": "modern, maintainable, modular developer tooling for FT.com projects",
   "author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
   "license": "MIT",
@@ -23,6 +23,7 @@
     "@jest/globals": "^27.4.6",
     "@types/lodash": "^4.14.185",
     "@types/node": "^16.18.23",
+    "@types/pluralize": "^0.0.33",
     "chai": "^4.3.4",
     "globby": "^10.0.2",
     "ts-node": "^8.10.2",
@@ -30,19 +31,19 @@
     "zod": "^3.22.4"
   },
   "dependencies": {
-    "@dotcom-tool-kit/base": "^1.0.0",
-    "@dotcom-tool-kit/config": "^1.0.2",
+    "@dotcom-tool-kit/base": "^1.1.1",
+    "@dotcom-tool-kit/config": "^1.0.4",
     "@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.2",
+    "@dotcom-tool-kit/error": "^4.0.1",
+    "@dotcom-tool-kit/logger": "^4.0.1",
     "@dotcom-tool-kit/plugin": "^1.0.0",
     "@dotcom-tool-kit/state": "^4.0.0",
-    "@dotcom-tool-kit/validated": "^1.0.0",
+    "@dotcom-tool-kit/validated": "^1.0.1",
     "@dotcom-tool-kit/wait-for-ok": "^4.0.0",
     "endent": "^2.1.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.5",
+    "pluralize": "^8.0.0",
     "tslib": "^2.3.1",
     "yaml": "^2.4.1",
     "zod-validation-error": "^2.1.0"