dotcom-tool-kit 1.9.0 → 2.1.1

package/lib/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAGrC,OAAO,EAAE,MAAM,EAAiB,MAAM,UAAU,CAAA;AAKhD,OAAO,EAA2B,MAAM,EAAa,MAAM,wBAAwB,CAAA;AAEnF,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA6FtG;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAkFjB;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,EAAE,CAAC,CAEnB"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAGrC,OAAO,EAAE,MAAM,EAAiB,MAAM,UAAU,CAAA;AAKhD,OAAO,EAA2B,MAAM,EAAa,MAAM,wBAAwB,CAAA;AAYnF,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA2FtG;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAkFjB;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,EAAE,CAAC,CAEnB"}

package/lib/plugin.js

@@ -10,6 +10,17 @@ const rc_file_1 = require("./rc-file");
 const error_1 = require("@dotcom-tool-kit/error");
 const logger_1 = require("@dotcom-tool-kit/logger");
 const types_1 = require("@dotcom-tool-kit/types");
+function isDescendent(possibleAncestor, possibleDescendent) {
+    if (!possibleDescendent.parent) {
+        return false;
+    }
+    else if (possibleDescendent.parent === possibleAncestor) {
+        return true;
+    }
+    else {
+        return isDescendent(possibleAncestor, possibleDescendent.parent);
+    }
+}
 async function loadPluginConfig(logger, plugin, config) {
     const { plugins = [], hooks = {}, options = {} } = await (0, rc_file_1.loadToolKitRC)(plugin.root);
     // load any plugins requested by this plugin
@@ -28,11 +39,11 @@ async function loadPluginConfig(logger, plugin, config) {
         if (!existingHookTask) {
             return newHookTask;
         }
-        const existingFromSibling = existingHookTask.plugin.parent && existingHookTask.plugin.parent === plugin.parent;
-        // if the existing hook was from a sibling, that's a conflict
+        const existingFromDescendent = isDescendent(plugin, existingHookTask.plugin);
+        // plugins can only override hook tasks from their descendents, otherwise that's a conflict
         // return a conflict either listing this hook and the siblings,
         // or merging in a previously-generated hook
-        if (existingFromSibling) {
+        if (!existingFromDescendent) {
             const conflicting = (0, conflict_1.isConflict)(existingHookTask) ? existingHookTask.conflicting : [existingHookTask];
             const conflict = {
                 plugin,
@@ -56,11 +67,11 @@ async function loadPluginConfig(logger, plugin, config) {
         if (!existingOptions) {
             return pluginOptions;
         }
-        const existingFromSibling = existingOptions.plugin.parent && existingOptions.plugin.parent === plugin.parent;
-        // if the existing options were from a sibling, that's a conflict
+        const existingFromDescendent = isDescendent(plugin, existingOptions.plugin);
+        // plugins can only override options from their descendents, otherwise it's a conflict
         // return a conflict either listing these options and the sibling's,
         // or merging in previously-generated options
-        if (existingFromSibling) {
+        if (!existingFromDescendent) {
             const conflicting = (0, conflict_1.isConflict)(existingOptions) ? existingOptions.conflicting : [existingOptions];
             const conflict = {
                 plugin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotcom-tool-kit",
-  "version": "1.9.0",
+  "version": "2.1.1",
   "description": "modern, maintainable, modular developer tooling for FT.com projects",
   "author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
   "license": "MIT",
@@ -20,7 +20,6 @@
     "test": "cd ../../ ; npx jest --silent --projects core/cli"
   },
   "devDependencies": {
-    "@dotcom-tool-kit/circleci": "file:../../plugins/circleci",
     "@jest/globals": "^27.4.6",
     "@types/lodash.merge": "^4.6.6",
     "@types/lodash.mergewith": "^4.6.6",
@@ -31,12 +30,11 @@
     "winston": "^3.5.1"
   },
   "dependencies": {
-    "@dotcom-tool-kit/error": "^1.9.0",
-    "@dotcom-tool-kit/hook": "^1.9.0",
-    "@dotcom-tool-kit/logger": "^1.9.0",
-    "@dotcom-tool-kit/options": "^1.9.0",
-    "@dotcom-tool-kit/types": "^1.9.0",
-    "@dotcom-tool-kit/wait-for-ok": "^1.9.0",
+    "@dotcom-tool-kit/error": "^2.0.0",
+    "@dotcom-tool-kit/logger": "^2.0.0",
+    "@dotcom-tool-kit/options": "^2.0.1",
+    "@dotcom-tool-kit/types": "^2.1.0",
+    "@dotcom-tool-kit/wait-for-ok": "^2.0.0",
     "cosmiconfig": "^7.0.0",
     "import-from": "^3.0.0",
     "lodash.merge": "^4.6.2",
@@ -57,4 +55,4 @@
   "volta": {
     "extends": "../../package.json"
   }
-}
+}