dotcom-tool-kit 4.7.3 → 4.8.0

package/lib/config/hash.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasConfigChanged = exports.updateHashes = exports.fileHash = void 0;
+exports.fileHash = fileHash;
+exports.updateHashes = updateHashes;
+exports.hasConfigChanged = hasConfigChanged;
 const state_1 = require("@dotcom-tool-kit/state");
 const node_crypto_1 = require("node:crypto");
 const promises_1 = require("node:fs/promises");
@@ -19,12 +21,10 @@ async function fileHash(path) {
         }
     }
 }
-exports.fileHash = fileHash;
 async function updateHashes(config) {
     const hashes = Object.fromEntries(await Promise.all(['.toolkitrc.yml', ...config.hookManagedFiles].map(async (path) => [path, await fileHash(path)])));
     (0, state_1.writeState)('install', hashes);
 }
-exports.updateHashes = updateHashes;
 async function hasConfigChanged(logger, config) {
     const hashes = (0, state_1.readState)('install');
     if (!hashes) {
@@ -40,4 +40,3 @@ async function hasConfigChanged(logger, config) {
     }
     return false;
 }
-exports.hasConfigChanged = hasConfigChanged;

package/lib/config/validate-plugins.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validatePlugins = void 0;
+exports.validatePlugins = validatePlugins;
 const validated_1 = require("@dotcom-tool-kit/validated");
 function validatePlugins(config) {
     const validatedPlugins = (0, validated_1.reduceValidated)(Object.entries(config.plugins).map(([id, plugin]) => plugin.map((p) => [id, p])));
     return validatedPlugins.map((plugins) => ({ ...config, plugins: Object.fromEntries(plugins) }));
 }
-exports.validatePlugins = validatePlugins;

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;AAgBpF,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,SAgB1C,CAAA;AAEF,wBAAgB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,CA4FtE;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"}
+{"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,GAAI,MAAM,MAAM,KAAG,SAgB1C,CAAA;AAEF,wBAAgB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,CA4FtE;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,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadConfig = exports.validateConfig = exports.createConfig = void 0;
+exports.createConfig = void 0;
+exports.validateConfig = validateConfig;
+exports.loadConfig = loadConfig;
 const plugin_1 = require("./plugin");
 const conflict_1 = require("@dotcom-tool-kit/conflict");
 const error_1 = require("@dotcom-tool-kit/error");
@@ -91,7 +93,6 @@ function validateConfig(config) {
     }
     return validConfig;
 }
-exports.validateConfig = validateConfig;
 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
@@ -113,4 +114,3 @@ async function loadConfig(logger, { validate = true, root }) {
     (0, plugin_1.resolvePlugin)(validRootPlugin, validPluginConfig, logger);
     return validate ? validateConfig(validPluginConfig) : config;
 }
-exports.loadConfig = loadConfig;

package/lib/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAA;AAI1E,eAAO,MAAM,wBAAwB,YAAa,WAAW,KAAG,OAK/D,CAAA"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAA;AAI1E,eAAO,MAAM,wBAAwB,GAAI,SAAS,WAAW,KAAG,OAK/D,CAAA"}

package/lib/help.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = showHelp;
 const tslib_1 = require("tslib");
 const config_1 = require("./config");
 const logger_1 = require("@dotcom-tool-kit/logger");
@@ -80,4 +81,3 @@ async function showHelp(logger, commands) {
     }
     logger.info('\n');
 }
-exports.default = showHelp;

package/lib/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printConfig = exports.listPlugins = exports.shouldDisableNativeFetch = exports.runTasks = void 0;
+exports.shouldDisableNativeFetch = exports.runTasks = void 0;
+exports.listPlugins = listPlugins;
+exports.printConfig = printConfig;
 const tslib_1 = require("tslib");
 const config_1 = require("./config");
 const util_1 = tslib_1.__importDefault(require("util"));
@@ -16,9 +18,7 @@ async function listPlugins(logger) {
         logger.info((0, messages_1.formatPluginTree)(rootPlugin.value).join('\n'));
     }
 }
-exports.listPlugins = listPlugins;
 async function printConfig(logger) {
     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/init.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runInit = void 0;
+exports.runInit = runInit;
 const base_1 = require("@dotcom-tool-kit/base");
 const validated_1 = require("@dotcom-tool-kit/validated");
 const entry_point_1 = require("./plugin/entry-point");
@@ -15,4 +15,3 @@ async function runInit(logger, config) {
         cwd: config.root
     })));
 }
-exports.runInit = runInit;

package/lib/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAIA,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;AA0CvF,eAAO,MAAM,qBAAqB,WACxB,MAAM,UACN,WAAW,KAClB,QAAQ,UAAU,IAAI,EAAE,CAAC,CAsC3B,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,CAiD/E"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAIA,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;AA0CvF,eAAO,MAAM,qBAAqB,GAChC,QAAQ,MAAM,EACd,QAAQ,WAAW,KAClB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAsC3B,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,CAiD/E"}

package/lib/install.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkInstall = exports.loadHookInstallations = void 0;
+exports.loadHookInstallations = void 0;
+exports.checkInstall = checkInstall;
+exports.default = installHooks;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const error_1 = require("@dotcom-tool-kit/error");
@@ -73,7 +75,6 @@ async function checkInstall(logger, config) {
     }
     await (0, hash_1.updateHashes)(config);
 }
-exports.checkInstall = checkInstall;
 async function installHooks(logger) {
     const config = await (0, config_1.loadConfig)(logger, { root: process.cwd() });
     await (0, init_1.runInit)(logger, config);
@@ -120,4 +121,3 @@ async function installHooks(logger) {
     await (0, hash_1.updateHashes)(config);
     return config;
 }
-exports.default = installHooks;

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;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,MAKrD,CAAA;AAEZ,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;AAMxF,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,UAiCvC"}
+{"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,GAAI,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,KAAG,MAKT,CAAA;AAOzE,eAAO,MAAM,mBAAmB,GAAI,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,KAAG,MAKT,CAAA;AAezE,eAAO,MAAM,0BAA0B,GAAI,WAAW,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAG,MAQ/E,CAAA;AAOD,eAAO,MAAM,2BAA2B,GAAI,WAAW,QAAQ,CAAC,gBAAgB,CAAC,EAAE,KAAG,MAUrF,CAAA;AAOD,eAAO,MAAM,yBAAyB,GAAI,WAAW,QAAQ,CAAC,cAAc,CAAC,EAAE,KAAG,MAUjF,CAAA;AAKD,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAA;AAEhD,eAAO,MAAM,mBAAmB,GAAI,aAAa,aAAa,KAAG,MAKrD,CAAA;AAEZ,eAAO,MAAM,0BAA0B,GACrC,gBAAgB,aAAa,EAAE,KAC9B,MAG2F,CAAA;AAE9F,eAAO,MAAM,yBAAyB,GACpC,eAAe,MAAM,EAAE,EACvB,gBAAgB,MAAM,EAAE,KACvB,MAaF,CAAA;AAED,eAAO,MAAM,uBAAuB,GAClC,eAAe,MAAM,EAAE,EACvB,cAAc,MAAM,EAAE,KACrB,MAaF,CAAA;AAED,eAAO,MAAM,uBAAuB,GAClC,eAAe,MAAM,EAAE,EACvB,cAAc,MAAM,EAAE,KACrB,MAaF,CAAA;AAED,eAAO,MAAM,sBAAsB,GACjC,kBAAkB,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,GAC7B,cAAc,OAAO,EAAE,EACvB,OAAO,MAAM,EAAE,KACd,MAOF,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAezD;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,KAAG,MAAwC,CAAA;AAMxF,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,UAiCvC"}

package/lib/messages.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.indentReasons = 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.formatPluginTree = formatPluginTree;
+exports.formatError = formatError;
 const tslib_1 = require("tslib");
 const logger_1 = require("@dotcom-tool-kit/logger");
 const zod_validation_error_1 = require("zod-validation-error");
@@ -133,7 +135,6 @@ function formatPluginTree(plugin) {
                 : `│ ${line}`))
     ];
 }
-exports.formatPluginTree = formatPluginTree;
 const indentReasons = (reasons) => reasons.replace(/\n/g, '\n  ');
 exports.indentReasons = indentReasons;
 // instanceof is unreliable across packages because of version mismatches so also use a heuristic to guess if it's a ToolKitError so we always log the details field if present
@@ -168,4 +169,3 @@ function formatError(error) {
     }
     return output + '\n';
 }
-exports.formatError = formatError;

package/lib/plugin/entry-point.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.importEntryPoint = exports.importSchemaEntryPoint = void 0;
+exports.importSchemaEntryPoint = importSchemaEntryPoint;
+exports.importEntryPoint = importEntryPoint;
 const logger_1 = require("@dotcom-tool-kit/logger");
 const validated_1 = require("@dotcom-tool-kit/validated");
 const tslib_1 = require("tslib");
@@ -43,7 +44,6 @@ async function importSchemaEntryPoint(entryPoint, exportName) {
             ]);
     });
 }
-exports.importSchemaEntryPoint = importSchemaEntryPoint;
 // the subclasses of Base have different constructor signatures so we need to omit
 // the constructor from the type bound here so you can actually pass in a subclass
 async function importEntryPoint(type, entryPoint) {
@@ -73,4 +73,3 @@ async function importEntryPoint(type, entryPoint) {
         ]);
     });
 }
-exports.importEntryPoint = importEntryPoint;

package/lib/plugin/is-descendent.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDescendent = void 0;
+exports.isDescendent = isDescendent;
 function isDescendent(possibleAncestor, possibleDescendent) {
     if (!possibleDescendent.parent) {
         return false;
@@ -12,4 +12,3 @@ function isDescendent(possibleAncestor, possibleDescendent) {
         return isDescendent(possibleAncestor, possibleDescendent.parent);
     }
 }
-exports.isDescendent = isDescendent;

package/lib/plugin/merge-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-commands.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAIhC,eAAO,MAAM,aAAa,WAAY,kBAAkB,UAAU,MAAM,UAAU,MAAM,SA4DvF,CAAA"}
+{"version":3,"file":"merge-commands.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAIhC,eAAO,MAAM,aAAa,GAAI,QAAQ,kBAAkB,EAAE,QAAQ,MAAM,EAAE,QAAQ,MAAM,SA4DvF,CAAA"}

package/lib/plugin/merge-hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-hooks.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,eAAO,MAAM,UAAU,WAAY,kBAAkB,UAAU,MAAM,SAwBpE,CAAA"}
+{"version":3,"file":"merge-hooks.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,eAAO,MAAM,UAAU,GAAI,QAAQ,kBAAkB,EAAE,QAAQ,MAAM,SAwBpE,CAAA"}

package/lib/plugin/merge-inits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-inits.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-inits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAEjE,eAAO,MAAM,UAAU,WAAY,kBAAkB,UAAU,MAAM,SAUpE,CAAA"}
+{"version":3,"file":"merge-inits.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-inits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAEjE,eAAO,MAAM,UAAU,GAAI,QAAQ,kBAAkB,EAAE,QAAQ,MAAM,SAUpE,CAAA"}

package/lib/plugin/merge-plugin-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-plugin-options.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-plugin-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAoB,MAAM,yBAAyB,CAAA;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAMjE,eAAO,MAAM,kBAAkB,WAAY,kBAAkB,UAAU,MAAM,SAwC5E,CAAA"}
+{"version":3,"file":"merge-plugin-options.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-plugin-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAoB,MAAM,yBAAyB,CAAA;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAMjE,eAAO,MAAM,kBAAkB,GAAI,QAAQ,kBAAkB,EAAE,QAAQ,MAAM,SAwC5E,CAAA"}

package/lib/plugin/merge-task-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-task-options.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-task-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAkB,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAOjE,eAAO,MAAM,gBAAgB,WAAY,kBAAkB,UAAU,MAAM,SAqC1E,CAAA"}
+{"version":3,"file":"merge-task-options.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-task-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAkB,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAOjE,eAAO,MAAM,gBAAgB,GAAI,QAAQ,kBAAkB,EAAE,QAAQ,MAAM,SAqC1E,CAAA"}

package/lib/plugin/merge-tasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-tasks.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-tasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAIjE,eAAO,MAAM,UAAU,WAAY,kBAAkB,UAAU,MAAM,SAqBpE,CAAA"}
+{"version":3,"file":"merge-tasks.d.ts","sourceRoot":"","sources":["../../src/plugin/merge-tasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAIjE,eAAO,MAAM,UAAU,GAAI,QAAQ,kBAAkB,EAAE,QAAQ,MAAM,SAqBpE,CAAA"}

package/lib/plugin/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/plugin/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,OAAO,EAA4B,KAAK,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAQ/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAKrC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAG3C,eAAO,MAAM,qBAAqB,WACxB,MAAM,UACN,kBAAkB,KACzB,QAAQ,aAAa,EAAE,CAkEzB,CAAA;AAED,eAAO,MAAM,oBAAoB,WAAY,MAAM,UAAU,kBAAkB,KAAG,IAgHjF,CAAA"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/plugin/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,OAAO,EAA4B,KAAK,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAQ/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAKrC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAG3C,eAAO,MAAM,qBAAqB,GAChC,QAAQ,MAAM,EACd,QAAQ,kBAAkB,KACzB,OAAO,CAAC,aAAa,EAAE,CA2EzB,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,QAAQ,MAAM,EAAE,QAAQ,kBAAkB,KAAG,IA+GjF,CAAA"}

package/lib/plugin/options.js

@@ -25,7 +25,16 @@ const validatePluginOptions = async (logger, config) => {
         if (schemaEntrypoint) {
             const schema = await (0, entry_point_1.importSchemaEntryPoint)({ plugin, modulePath: schemaEntrypoint });
             if (!schema.valid) {
-                invalidOptions.push([id, new z.ZodError([])]);
+                invalidOptions.push([
+                    id,
+                    new z.ZodError([
+                        {
+                            message: schema.reasons.join('\n'),
+                            code: z.ZodIssueCode.custom,
+                            path: []
+                        }
+                    ])
+                ]);
                 continue;
             }
             pluginSchema = schema.value;
@@ -101,8 +110,9 @@ const substituteOptionTags = (plugin, config) => {
             const substituted = [];
             for (const entry of entries) {
                 const subbedEntry = (0, validated_1.reduceValidated)(
-                // allow both keys and (string) values to be substituted by options
-                entry.map((val) => {
+                // allow both keys and values to be substituted by options
+                entry.map((val, i) => {
+                    const isKey = i === 0;
                     if (typeof val === 'string' && val.startsWith(rc_file_1.toolKitOptionIdent)) {
                         // check the tag path each time so that we can have a separate
                         // error for each incorrect use of the tag
@@ -115,14 +125,14 @@ const substituteOptionTags = (plugin, config) => {
                             // identifier
                             const optionPath = val.slice(rc_file_1.toolKitOptionIdent.length);
                             const resolvedOption = resolveOptionPath(optionPath);
-                            if (typeof resolvedOption === 'string') {
-                                return (0, validated_1.valid)(resolvedOption);
-                            }
-                            else {
+                            if (isKey && typeof resolvedOption !== 'string') {
                                 return (0, validated_1.invalid)([
-                                    `Option '${optionPath}' referenced at path '${path.join('.')}' does not resolve to a string (resolved to ${resolvedOption})`
+                                    `Option '${optionPath}' for the key at path '${path.join('.')}' does not resolve to a string (resolved to ${resolvedOption})`
                                 ]);
                             }
+                            else {
+                                return (0, validated_1.valid)(resolvedOption);
+                            }
                         }
                     }
                     else {
@@ -130,9 +140,6 @@ const substituteOptionTags = (plugin, config) => {
                     }
                 }));
                 if (!subbedEntry.valid) {
-                    /* eslint-disable-next-line @typescript-eslint/no-explicit-any --
-                     * Invalid objects don't need to match the inner type
-                     **/
                     substituted.push(subbedEntry);
                     continue;
                 }
@@ -155,9 +162,8 @@ const substituteOptionTags = (plugin, config) => {
                             substituted.push(...Object.entries(subbedValues.value).map((v) => (0, validated_1.valid)(v)));
                         }
                         else {
-                            /* eslint-disable-next-line @typescript-eslint/no-explicit-any --
-                             * Invalid objects don't need to match the inner type
-                             **/
+                            // safe to cast as invalid objects don't need to match the inner
+                            // type
                             substituted.push(subbedValues);
                         }
                     }
@@ -183,7 +189,7 @@ const substituteOptionTags = (plugin, config) => {
         }
     }
     if (plugin.rcFile) {
-        plugin.rcFile = deeplySubstitute(plugin.rcFile, []).unwrap('cannot reference plugin options when specifying options');
+        plugin.rcFile = deeplySubstitute(plugin.rcFile, []).unwrap(`error when subsituting options (i.e., resolving ${logger_1.styles.code('!toolkit/option')} and ${logger_1.styles.code('!toolkit/if-defined')} tags)`);
     }
     config.resolutionTrackers.substitutedPlugins.add(plugin.id);
 };

package/lib/plugin/reduce-installations.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reducePluginHookInstallations = void 0;
+exports.reducePluginHookInstallations = reducePluginHookInstallations;
 const lodash_1 = require("lodash");
 const conflict_1 = require("@dotcom-tool-kit/conflict");
 const logger_1 = require("@dotcom-tool-kit/logger");
@@ -76,4 +76,3 @@ async function reducePluginHookInstallations(logger, config, hookModules, plugin
         ...childInstallations.filter((childInstallation) => !pluginHookIds.includes(extractForHook(childInstallation)))
     ]);
 }
-exports.reducePluginHookInstallations = reducePluginHookInstallations;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"require-resolve.d.ts","sourceRoot":"","sources":["../../src/plugin/require-resolve.ts"],"names":[],"mappings":";AAAA,eAAO,MAAM,OAAO,uBAAkB,CAAA"}
+{"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/resolve-root.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveRoot = void 0;
+exports.resolveRoot = resolveRoot;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const require_resolve_1 = require("./require-resolve");
@@ -25,4 +25,3 @@ function resolveRoot(id, root) {
         throw error;
     }
 }
-exports.resolveRoot = resolveRoot;

package/lib/plugin.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePlugin = exports.resolvePluginOptions = exports.loadPlugin = void 0;
+exports.loadPlugin = loadPlugin;
+exports.resolvePluginOptions = resolvePluginOptions;
+exports.resolvePlugin = resolvePlugin;
 const logger_1 = require("@dotcom-tool-kit/logger");
 const plugin_1 = require("@dotcom-tool-kit/plugin");
 const validated_1 = require("@dotcom-tool-kit/validated");
@@ -52,7 +54,6 @@ async function loadPlugin(id, config, logger, parent) {
         return plugin;
     });
 }
-exports.loadPlugin = loadPlugin;
 function resolvePluginOptions(plugin, config) {
     // don't resolve plugins that have already been resolved to prevent self-conflicts
     // between plugins included at multiple points in the tree
@@ -68,7 +69,6 @@ function resolvePluginOptions(plugin, config) {
     (0, merge_plugin_options_1.mergePluginOptions)(config, plugin);
     config.resolutionTrackers.resolvedPluginOptions.add(plugin.id);
 }
-exports.resolvePluginOptions = resolvePluginOptions;
 function resolvePlugin(plugin, config, logger) {
     // don't resolve plugins that have already been resolved to prevent self-conflicts
     // between plugins included at multiple points in the tree
@@ -88,4 +88,3 @@ function resolvePlugin(plugin, config, logger) {
     (0, merge_inits_1.mergeInits)(config, plugin);
     config.resolutionTrackers.resolvedPlugins.add(plugin.id);
 }
-exports.resolvePlugin = resolvePlugin;

package/lib/rc-file.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadToolKitRC = exports.toolKitIfDefinedIdent = exports.toolKitOptionIdent = void 0;
+exports.toolKitIfDefinedIdent = exports.toolKitOptionIdent = void 0;
+exports.loadToolKitRC = loadToolKitRC;
 const tslib_1 = require("tslib");
 const promises_1 = tslib_1.__importDefault(require("node:fs/promises"));
 const logger_1 = require("@dotcom-tool-kit/logger");
@@ -92,4 +93,3 @@ async function loadToolKitRC(logger, root) {
         init: config.init ?? []
     };
 }
-exports.loadToolKitRC = loadToolKitRC;

package/lib/tasks.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runTasks = exports.runTasksFromConfig = void 0;
+exports.runTasksFromConfig = runTasksFromConfig;
+exports.runTasks = runTasks;
 const tslib_1 = require("tslib");
 const base_1 = require("@dotcom-tool-kit/base");
 const validated_1 = require("@dotcom-tool-kit/validated");
@@ -82,9 +83,7 @@ async function runTasksFromConfig(logger, config, commands, files) {
         }
     }
 }
-exports.runTasksFromConfig = runTasksFromConfig;
 async function runTasks(logger, commands, files) {
     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.7.3",
+  "version": "4.8.0",
   "description": "modern, maintainable, modular developer tooling for FT.com projects",
   "author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
   "license": "MIT",
@@ -20,25 +20,25 @@
     "test": "cd ../../ ; npx jest --silent --projects core/cli"
   },
   "devDependencies": {
-    "@jest/globals": "^27.4.6",
-    "@types/lodash": "^4.14.185",
+    "@jest/globals": "^29.7.0",
+    "@relmify/jest-serializer-strip-ansi": "1.0.2",
+    "@types/lodash": "^4.17.16",
     "@types/pluralize": "^0.0.33",
     "globby": "^10.0.2",
-    "ts-node": "^8.10.2",
-    "winston": "^3.5.1",
-    "zod": "^3.24.3"
+    "winston": "^3.17.0",
+    "zod": "^3.24.4"
   },
   "dependencies": {
-    "@dotcom-tool-kit/base": "^1.2.2",
+    "@dotcom-tool-kit/base": "^1.2.3",
     "@dotcom-tool-kit/config": "^1.1.1",
     "@dotcom-tool-kit/conflict": "^1.0.1",
     "@dotcom-tool-kit/error": "^4.1.1",
-    "@dotcom-tool-kit/logger": "^4.2.1",
+    "@dotcom-tool-kit/logger": "^4.2.2",
     "@dotcom-tool-kit/plugin": "^1.1.0",
     "@dotcom-tool-kit/schemas": "^1.9.0",
     "@dotcom-tool-kit/state": "^4.3.2",
     "@dotcom-tool-kit/validated": "^1.0.3",
-    "@dotcom-tool-kit/wait-for-ok": "^4.1.1",
+    "@dotcom-tool-kit/wait-for-ok": "^4.1.2",
     "endent": "^2.1.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.8",