dotcom-tool-kit 5.0.0 → 5.0.1-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/lib/install.d.ts +2 -0
  2. package/lib/install.d.ts.map +1 -1
  3. package/lib/install.js +4 -5
  4. package/lib/plugin/reduce-installations.d.ts +1 -1
  5. package/lib/plugin/reduce-installations.d.ts.map +1 -1
  6. package/lib/plugin/reduce-installations.js +2 -2
  7. package/package.json +3 -4
package/lib/install.d.ts CHANGED
@@ -2,6 +2,8 @@ import type { Logger } from 'winston';
2
2
  import type { ValidConfig } from '@dotcom-tool-kit/config';
3
3
  import { Hook } from '@dotcom-tool-kit/base';
4
4
  import { Validated } from '@dotcom-tool-kit/validated';
5
+ import { HookModule } from './plugin/reduce-installations';
6
+ export declare const loadHookEntrypoints: (logger: Logger, config: ValidConfig) => Promise<Validated<Record<string, HookModule>>>;
5
7
  export declare const loadHookInstallations: (logger: Logger, config: ValidConfig) => Promise<Validated<Hook[]>>;
6
8
  export declare function checkInstall(logger: Logger, config: ValidConfig): Promise<void>;
7
9
  export default function installHooks(logger: Logger): Promise<ValidConfig>;
package/lib/install.d.ts.map CHANGED
@@ -1 +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,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"}
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;AACvF,OAAO,EAAE,UAAU,EAAiC,MAAM,+BAA+B,CAAA;AAuBzF,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,MAAM,EACd,QAAQ,WAAW,KAClB,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAa/C,CAAA;AAED,eAAO,MAAM,qBAAqB,GAChC,QAAQ,MAAM,EACd,QAAQ,WAAW,KAClB,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAkC3B,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 CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.loadHookInstallations = void 0;
3
+ exports.loadHookInstallations = exports.loadHookEntrypoints = void 0;
4
4
  exports.checkInstall = checkInstall;
5
5
  exports.default = installHooks;
6
6
  const tslib_1 = require("tslib");
@@ -38,11 +38,10 @@ const loadHookEntrypoints = async (logger, config) => {
38
38
  })));
39
39
  return hookResultEntries.map((hookEntries) => Object.fromEntries(hookEntries));
40
40
  };
41
+ exports.loadHookEntrypoints = loadHookEntrypoints;
41
42
  const loadHookInstallations = async (logger, config) => {
42
- const hookClassResults = await loadHookEntrypoints(logger, config);
43
- const installationResults = (await hookClassResults
44
- .map((hookClasses) => (0, reduce_installations_1.reducePluginHookInstallations)(logger, config, hookClasses, config.plugins['app root']))
45
- .awaitValue()).flatMap((installation) => installation);
43
+ const hookClassResults = await (0, exports.loadHookEntrypoints)(logger, config);
44
+ const installationResults = hookClassResults.flatMap((hookClasses) => (0, reduce_installations_1.reducePluginHookInstallations)(logger, config, hookClasses, config.plugins['app root']));
46
45
  const installationsWithoutConflicts = installationResults.flatMap((installations) => {
47
46
  const conflicts = (0, conflict_1.findConflicts)(installations);
48
47
  if (conflicts.length) {
package/lib/plugin/reduce-installations.d.ts CHANGED
@@ -9,5 +9,5 @@ export interface HookModule {
9
9
  hookClass: HookClass;
10
10
  schema?: z.ZodTypeAny;
11
11
  }
12
- export declare function reducePluginHookInstallations(logger: Logger, config: ValidConfig, hookModules: Record<string, HookModule>, plugin: Plugin): Promise<Validated<(HookInstallation | Conflict<HookInstallation>)[]>>;
12
+ export declare function reducePluginHookInstallations(logger: Logger, config: ValidConfig, hookModules: Record<string, HookModule>, plugin: Plugin): Validated<(HookInstallation | Conflict<HookInstallation>)[]>;
13
13
  //# sourceMappingURL=reduce-installations.d.ts.map
package/lib/plugin/reduce-installations.d.ts.map CHANGED
@@ -1 +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,CAsEvE"}
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,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EACvC,MAAM,EAAE,MAAM,GACb,SAAS,CAAC,CAAC,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAkE9D"}
package/lib/plugin/reduce-installations.js CHANGED
@@ -33,12 +33,12 @@ const extractForHook = (installation) => (0, conflict_1.isConflict)(installation
33
33
  // the resulting installations and/or conflicts from `a`, `b`, and `c`
34
34
  // - call `Hook.overrideChildInstallations` with the appropriate concrete Hook class, and
35
35
  // the resulting installations and/or conflicts from `Hook.mergeChildInstallations` and `p`
36
- async function reducePluginHookInstallations(logger, config, hookModules, plugin) {
36
+ function reducePluginHookInstallations(logger, config, hookModules, plugin) {
37
37
  if (!plugin.rcFile || config.resolutionTrackers.reducedInstallationPlugins.has(plugin.id)) {
38
38
  return (0, validated_1.valid)([]);
39
39
  }
40
40
  config.resolutionTrackers.reducedInstallationPlugins.add(plugin.id);
41
- const rawChildInstallations = (0, validated_1.reduceValidated)(await Promise.all((plugin.children ?? []).map((child) => reducePluginHookInstallations(logger, config, hookModules, child)))).map((installations) => installations.flat());
41
+ const rawChildInstallations = (0, validated_1.reduceValidated)((plugin.children ?? []).map((child) => reducePluginHookInstallations(logger, config, hookModules, child))).map((installations) => installations.flat());
42
42
  if (!rawChildInstallations.valid) {
43
43
  return rawChildInstallations;
44
44
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dotcom-tool-kit",
3
- "version": "5.0.0",
3
+ "version": "5.0.1-beta.1",
4
4
  "description": "modern, maintainable, modular developer tooling for FT.com projects",
5
5
  "author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
6
6
  "license": "MIT",
@@ -30,7 +30,7 @@
30
30
  "zod": "^3.24.4"
31
31
  },
32
32
  "dependencies": {
33
- "@dotcom-tool-kit/base": "^2.0.0",
33
+ "@dotcom-tool-kit/base": "^4.0.0-beta.1",
34
34
  "@dotcom-tool-kit/config": "^2.0.0",
35
35
  "@dotcom-tool-kit/conflict": "^2.0.0",
36
36
  "@dotcom-tool-kit/error": "^5.0.0",
@@ -39,7 +39,6 @@
39
39
  "@dotcom-tool-kit/schemas": "^1.9.0",
40
40
  "@dotcom-tool-kit/state": "^5.0.0",
41
41
  "@dotcom-tool-kit/validated": "^2.0.0",
42
- "@dotcom-tool-kit/wait-for-ok": "^5.0.0",
43
42
  "endent": "^2.1.0",
44
43
  "lodash": "^4.17.21",
45
44
  "minimist": "^1.2.8",
@@ -60,4 +59,4 @@
60
59
  "volta": {
61
60
  "extends": "../../package.json"
62
61
  }
63
- }
62
+ }