dotcom-tool-kit 4.5.0 → 4.7.0

package/lib/help.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../src/help.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AA6ErC,wBAA8B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAwCxF"}

package/lib/help.js

@@ -5,6 +5,7 @@ const config_1 = require("./config");
 const logger_1 = require("@dotcom-tool-kit/logger");
 const yaml_1 = tslib_1.__importDefault(require("yaml"));
 const endent_1 = tslib_1.__importDefault(require("endent"));
+const init_1 = require("./init");
 const toolKitIntro = logger_1.styles.box((0, endent_1.default) `
     Tool Kit is modern, maintainable & modular developer tooling for FT.com projects.
     ${logger_1.styles.URL('https://github.com/financial-times/dotcom-tool-kit')}
@@ -55,6 +56,7 @@ async function showHelp(logger, commands) {
     if (printAllCommands) {
         commands = Object.keys(config.commandTasks).sort();
     }
+    await (0, init_1.runInit)(logger, config);
     logger.info(toolKitIntro);
     const definedCommands = commands.filter((command) => config.commandTasks[command]);
     const missingCommands = commands.filter((command) => !config.commandTasks[command]);

package/lib/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAG1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAarC,wBAAsB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhF"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAG1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAarC,wBAAsB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAOhF"}

package/lib/init.js

@@ -11,6 +11,8 @@ const loadInitEntrypoints = async (logger, config) => {
 async function runInit(logger, config) {
     const initResults = await loadInitEntrypoints(logger, config);
     const inits = initResults.unwrap('plugin initialisation classes were invalid!');
-    await Promise.all(inits.map(async (init) => init.init()));
+    await Promise.all(inits.map(async (init) => init.init({
+        cwd: config.root
+    })));
 }
 exports.runInit = runInit;

package/lib/plugin/reduce-installations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reduce-installations.d.ts","sourceRoot":"","sources":["../../src/plugin/reduce-installations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AACrC,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAc,MAAM,2BAA2B,CAAA;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,SAAS,EAAmC,MAAM,4BAA4B,CAAA;AAIvF,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,CAAC,EAAE,CAAC,CAAC,UAAU,CAAA;CACtB;AA+BD,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EACvC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,SAAS,CAAC,CAAC,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAkEvE"}
+{"version":3,"file":"reduce-installations.d.ts","sourceRoot":"","sources":["../../src/plugin/reduce-installations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AACrC,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAc,MAAM,2BAA2B,CAAA;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,SAAS,EAAmC,MAAM,4BAA4B,CAAA;AAIvF,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,CAAC,EAAE,CAAC,CAAC,UAAU,CAAA;CACtB;AA+BD,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EACvC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,SAAS,CAAC,CAAC,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAsEvE"}

package/lib/plugin/reduce-installations.js

@@ -49,8 +49,8 @@ async function reducePluginHookInstallations(logger, config, hookModules, plugin
     if (plugin.rcFile.options.hooks.length === 0) {
         return (0, validated_1.valid)(childInstallations);
     }
-    const unusedHookOptions = plugin.rcFile.options.hooks
-        .flatMap(Object.keys)
+    const pluginHookIds = plugin.rcFile.options.hooks.flatMap(Object.keys);
+    const unusedHookOptions = pluginHookIds
         .filter((hookId) => !(hookId in hookModules))
         .map((hookId) => logger_1.styles.hook(hookId));
     if (unusedHookOptions.length > 0) {
@@ -71,6 +71,9 @@ async function reducePluginHookInstallations(logger, config, hookModules, plugin
         const childInstallationsForHook = childInstallations.filter((childInstallation) => id === extractForHook(childInstallation));
         return (0, validated_1.valid)(hookModule.hookClass.overrideChildInstallations(plugin, installation, childInstallationsForHook));
     }));
-    return (0, validated_1.reduceValidated)(validatedInstallations).map((installations) => installations.flat());
+    return (0, validated_1.reduceValidated)(validatedInstallations).map((installations) => [
+        ...installations.flat(),
+        ...childInstallations.filter((childInstallation) => !pluginHookIds.includes(extractForHook(childInstallation)))
+    ]);
 }
 exports.reducePluginHookInstallations = reducePluginHookInstallations;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotcom-tool-kit",
-  "version": "4.5.0",
+  "version": "4.7.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,7 +30,7 @@
     "zod": "^3.22.4"
   },
   "dependencies": {
-    "@dotcom-tool-kit/base": "^1.1.10",
+    "@dotcom-tool-kit/base": "^1.2.0",
     "@dotcom-tool-kit/config": "^1.1.0",
     "@dotcom-tool-kit/conflict": "^1.0.1",
     "@dotcom-tool-kit/error": "^4.1.0",