build-raptor 0.117.0 → 0.118.0

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.
@@ -5,6 +5,7 @@ import { RepoProtocol } from 'repo-protocol';
5
5
  import { Breakdown } from './breakdown';
6
6
  import { EngineOptions } from './engine';
7
7
  import { EngineEventScheme } from './engine-event-scheme';
8
+ import { StepByStepTransmitter } from './step-by-step-transmitter';
8
9
  export interface TaskSelector {
9
10
  /**
10
11
  * units the units whose tasks are to be built. An empty array means "all units".
@@ -22,6 +23,7 @@ export declare class EngineBootstrapper {
22
23
  readonly storageClient: StorageClient;
23
24
  readonly repoProtocol: RepoProtocol;
24
25
  private readonly eventPublisher;
26
+ readonly transmitter: StepByStepTransmitter;
25
27
  readonly rootDir: {
26
28
  resolve: (pathInRepo?: PathInRepo | undefined) => string;
27
29
  unresolve: (absolutePath: string) => PathInRepo;
@@ -43,6 +43,7 @@ class EngineBootstrapper {
43
43
  this.repoProtocol = repoProtocol;
44
44
  this.eventPublisher = new misc_1.TypedPublisher();
45
45
  this.rootDir = (0, core_types_1.RepoRoot)(rootDir);
46
+ this.transmitter = new step_by_step_transmitter_1.StepByStepTransmitter(logger);
46
47
  }
47
48
  async makeEngine(selector, configFile, optionsSansConfig) {
48
49
  const taskOutputDir = (await Tmp.dir()).path;
@@ -54,8 +55,11 @@ class EngineBootstrapper {
54
55
  };
55
56
  const taskStore = new task_store_1.TaskStore(this.rootDir, this.storageClient, this.logger, this.eventPublisher);
56
57
  const stepByStepFile = path.join(options.buildRaptorDir, 'step-by-step.json');
57
- const transmitter = await step_by_step_transmitter_1.StepByStepTransmitter.create(stepByStepFile, options.stepByStepProcessorModuleName, this.logger);
58
- const engine = new engine_1.Engine(this.logger, this.rootDir, this.repoProtocol, taskStore, taskOutputDir, selector, this.eventPublisher, transmitter, options);
58
+ this.transmitter.setOutputFile(stepByStepFile);
59
+ if (options.stepByStepProcessorModuleName) {
60
+ this.transmitter.dynamicallyLoadProcessor(options.stepByStepProcessorModuleName);
61
+ }
62
+ const engine = new engine_1.Engine(this.logger, this.rootDir, this.repoProtocol, taskStore, taskOutputDir, selector, this.eventPublisher, this.transmitter, options);
59
63
  return engine;
60
64
  }
61
65
  readConfigFile(pathToConfigFile) {
@@ -148,4 +152,4 @@ function summarizeTask(t) {
148
152
  rootCause: t.record.rootCause,
149
153
  };
150
154
  }
151
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5naW5lLWJvb3RzdHJhcHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbmdpbmUtYm9vdHN0cmFwcGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwyREFBcUQ7QUFDckQsK0NBQXlDO0FBQ3pDLDJDQUFpRDtBQUNqRCx1Q0FBd0I7QUFDeEIsbUNBQWlFO0FBQ2pFLCtCQUF1RjtBQUN2RiwyQ0FBNEI7QUFFNUIsaURBQWtDO0FBQ2xDLDJDQUE0QjtBQUM1QiwyQ0FBNEI7QUFFNUIsMkNBQXVDO0FBQ3ZDLCtEQUF5RDtBQUN6RCxxQ0FBZ0Q7QUFFaEQseUVBQWtFO0FBRWxFLDZDQUF3QztBQWV4QyxNQUFhLGtCQUFrQjtJQUc3QixZQUNFLE9BQWUsRUFDTixFQUFVLEVBQ1YsTUFBYyxFQUNkLGFBQTRCLEVBQzVCLFlBQTBCO1FBSDFCLE9BQUUsR0FBRixFQUFFLENBQVE7UUFDVixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2Qsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFDNUIsaUJBQVksR0FBWixZQUFZLENBQWM7UUFQcEIsbUJBQWMsR0FBRyxJQUFJLHFCQUFjLEVBQXFCLENBQUE7UUFTdkUsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFBLHFCQUFRLEVBQUMsT0FBTyxDQUFDLENBQUE7SUFDbEMsQ0FBQztJQUVPLEtBQUssQ0FBQyxVQUFVLENBQ3RCLFFBQXNCLEVBQ3RCLFVBQThCLEVBQzlCLGlCQUFnRDtRQUVoRCxNQUFNLGFBQWEsR0FBRyxDQUFDLE1BQU0sR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFBO1FBQzVDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUE7UUFDOUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsaUVBQWlFLGFBQWEsRUFBRSxDQUFDLENBQUE7UUFF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
155
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5naW5lLWJvb3RzdHJhcHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbmdpbmUtYm9vdHN0cmFwcGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwyREFBcUQ7QUFDckQsK0NBQXlDO0FBQ3pDLDJDQUFpRDtBQUNqRCx1Q0FBd0I7QUFDeEIsbUNBQWlFO0FBQ2pFLCtCQUF1RjtBQUN2RiwyQ0FBNEI7QUFFNUIsaURBQWtDO0FBQ2xDLDJDQUE0QjtBQUM1QiwyQ0FBNEI7QUFFNUIsMkNBQXVDO0FBQ3ZDLCtEQUF5RDtBQUN6RCxxQ0FBZ0Q7QUFFaEQseUVBQWtFO0FBRWxFLDZDQUF3QztBQWV4QyxNQUFhLGtCQUFrQjtJQUs3QixZQUNFLE9BQWUsRUFDTixFQUFVLEVBQ1YsTUFBYyxFQUNkLGFBQTRCLEVBQzVCLFlBQTBCO1FBSDFCLE9BQUUsR0FBRixFQUFFLENBQVE7UUFDVixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2Qsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFDNUIsaUJBQVksR0FBWixZQUFZLENBQWM7UUFUcEIsbUJBQWMsR0FBRyxJQUFJLHFCQUFjLEVBQXFCLENBQUE7UUFXdkUsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFBLHFCQUFRLEVBQUMsT0FBTyxDQUFDLENBQUE7UUFDaEMsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLGdEQUFxQixDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ3RELENBQUM7SUFFTyxLQUFLLENBQUMsVUFBVSxDQUN0QixRQUFzQixFQUN0QixVQUE4QixFQUM5QixpQkFBZ0Q7UUFFaEQsTUFBTSxhQUFhLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQTtRQUM1QyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFBO1FBQzlDLElB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
@@ -1,13 +1,15 @@
1
- import { Step } from 'build-raptor-api';
1
+ import { Step, StepByStepProcessor } from 'build-raptor-api';
2
2
  import { Logger } from 'logger';
3
3
  export declare class StepByStepTransmitter {
4
- private readonly stepByStepFile;
5
- private readonly stepByStepProcessor;
6
4
  private readonly logger;
7
5
  private readonly steps;
8
6
  private readonly promises;
9
- private constructor();
7
+ private readonly stepByStepProcessors;
8
+ private stepByStepFile;
9
+ constructor(logger: Logger);
10
+ setOutputFile(f: string): void;
11
+ addProcessor(p: StepByStepProcessor): void;
10
12
  transmit(step: Step): void;
11
13
  close(): Promise<void>;
12
- static create(stepByStepFile: string, stepByStepProcessorModuleName: string | undefined, logger: Logger, lookFor?: string): Promise<StepByStepTransmitter>;
14
+ dynamicallyLoadProcessor(stepByStepProcessorModuleName: string, lookFor?: string): Promise<void>;
13
15
  }
@@ -25,42 +25,48 @@ const build_raptor_dynamic_loader_1 = require("build-raptor-dynamic-loader");
25
25
  const fs = __importStar(require("fs"));
26
26
  const util = __importStar(require("util"));
27
27
  class StepByStepTransmitter {
28
- constructor(stepByStepFile, stepByStepProcessor, logger) {
29
- this.stepByStepFile = stepByStepFile;
30
- this.stepByStepProcessor = stepByStepProcessor;
28
+ constructor(logger) {
31
29
  this.logger = logger;
32
30
  this.steps = [];
33
31
  this.promises = [];
32
+ this.stepByStepProcessors = [];
33
+ this.stepByStepFile = undefined;
34
+ }
35
+ setOutputFile(f) {
36
+ this.stepByStepFile = f;
37
+ }
38
+ addProcessor(p) {
39
+ this.stepByStepProcessors.push(p);
34
40
  }
35
41
  transmit(step) {
36
42
  const parsed = build_raptor_api_1.Step.parse(step);
37
43
  this.steps.push(parsed);
38
- if (this.stepByStepProcessor) {
39
- this.promises.push(Promise.resolve(this.stepByStepProcessor(parsed)));
44
+ for (const p of this.stepByStepProcessors) {
45
+ this.promises.push(Promise.resolve(p(parsed)));
40
46
  }
41
47
  }
42
48
  async close() {
43
49
  await Promise.all(this.promises);
50
+ if (!this.stepByStepFile) {
51
+ return;
52
+ }
44
53
  const parsed = build_raptor_api_1.StepByStep.parse(this.steps);
45
54
  fs.writeFileSync(this.stepByStepFile, JSON.stringify(parsed));
46
55
  this.logger.info(`step by step written to ${this.stepByStepFile}`);
47
56
  }
48
- static async create(stepByStepFile, stepByStepProcessorModuleName, logger, lookFor = 'processor') {
49
- let processor;
50
- if (stepByStepProcessorModuleName) {
51
- // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
52
- const imported = (0, build_raptor_dynamic_loader_1.loadDynamically)(stepByStepProcessorModuleName);
53
- const temp = Object.entries(imported)
54
- .flatMap(([k, v]) => (k === lookFor ? [v] : []))
55
- .find(Boolean);
56
- if (!temp) {
57
- throw new Error(`could not find ${lookFor} in module ${stepByStepProcessorModuleName} which exports ${util.inspect(imported)}`);
58
- }
59
- processor = temp; // eslint-disable-line @typescript-eslint/consistent-type-assertions
57
+ async dynamicallyLoadProcessor(stepByStepProcessorModuleName, lookFor = 'processor') {
58
+ // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
59
+ const imported = (0, build_raptor_dynamic_loader_1.loadDynamically)(stepByStepProcessorModuleName);
60
+ const temp = Object.entries(imported)
61
+ .flatMap(([k, v]) => (k === lookFor ? [v] : []))
62
+ .find(Boolean);
63
+ if (!temp) {
64
+ throw new Error(`could not find ${lookFor} in module ${stepByStepProcessorModuleName} which exports ${util.inspect(imported)}`);
60
65
  }
61
- logger.info(`processor=${util.inspect(processor)}`);
62
- return new StepByStepTransmitter(stepByStepFile, processor, logger);
66
+ const processor = temp; // eslint-disable-line @typescript-eslint/consistent-type-assertions
67
+ this.logger.info(`processor=${util.inspect(processor)}`);
68
+ this.addProcessor(processor);
63
69
  }
64
70
  }
65
71
  exports.StepByStepTransmitter = StepByStepTransmitter;
66
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RlcC1ieS1zdGVwLXRyYW5zbWl0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0ZXAtYnktc3RlcC10cmFuc21pdHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQXdFO0FBQ3hFLDZFQUE2RDtBQUM3RCx1Q0FBd0I7QUFFeEIsMkNBQTRCO0FBRTVCLE1BQWEscUJBQXFCO0lBSWhDLFlBQ21CLGNBQXNCLEVBQ3RCLG1CQUFvRCxFQUNwRCxNQUFjO1FBRmQsbUJBQWMsR0FBZCxjQUFjLENBQVE7UUFDdEIsd0JBQW1CLEdBQW5CLG1CQUFtQixDQUFpQztRQUNwRCxXQUFNLEdBQU4sTUFBTSxDQUFRO1FBTmhCLFVBQUssR0FBVyxFQUFFLENBQUE7UUFDbEIsYUFBUSxHQUFvQixFQUFFLENBQUE7SUFNNUMsQ0FBQztJQUVKLFFBQVEsQ0FBQyxJQUFVO1FBQ2pCLE1BQU0sTUFBTSxHQUFHLHVCQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQy9CLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBRXZCLElBQUksSUFBSSxDQUFDLG1CQUFtQixFQUFFO1lBQzVCLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQTtTQUN0RTtJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSztRQUNULE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDaEMsTUFBTSxNQUFNLEdBQUcsNkJBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzNDLEVBQUUsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUE7UUFDN0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsMkJBQTJCLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQyxDQUFBO0lBQ3BFLENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FDakIsY0FBc0IsRUFDdEIsNkJBQWlELEVBQ2pELE1BQWMsRUFDZCxPQUFPLEdBQUcsV0FBVztRQUVyQixJQUFJLFNBQVMsQ0FBQTtRQUNiLElBQUksNkJBQTZCLEVBQUU7WUFDakMseUVBQXlFO1lBQ3pFLE1BQU0sUUFBUSxHQUFHLElBQUEsNkNBQWUsRUFBQyw2QkFBNkIsQ0FBVyxDQUFBO1lBQ3pFLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDO2lCQUNsQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQztpQkFDL0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1lBQ2hCLElBQUksQ0FBQyxJQUFJLEVBQUU7Z0JBQ1QsTUFBTSxJQUFJLEtBQUssQ0FDYixrQkFBa0IsT0FBTyxjQUFjLDZCQUE2QixrQkFBa0IsSUFBSSxDQUFDLE9BQU8sQ0FDaEcsUUFBUSxDQUNULEVBQUUsQ0FDSixDQUFBO2FBQ0Y7WUFDRCxTQUFTLEdBQUcsSUFBMkIsQ0FBQSxDQUFDLG9FQUFvRTtTQUM3RztRQUVELE1BQU0sQ0FBQyxJQUFJLENBQUMsYUFBYSxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUNuRCxPQUFPLElBQUkscUJBQXFCLENBQUMsY0FBYyxFQUFFLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUNyRSxDQUFDO0NBQ0Y7QUFwREQsc0RBb0RDIn0=
72
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RlcC1ieS1zdGVwLXRyYW5zbWl0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0ZXAtYnktc3RlcC10cmFuc21pdHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQXdFO0FBQ3hFLDZFQUE2RDtBQUM3RCx1Q0FBd0I7QUFFeEIsMkNBQTRCO0FBRTVCLE1BQWEscUJBQXFCO0lBTWhDLFlBQTZCLE1BQWM7UUFBZCxXQUFNLEdBQU4sTUFBTSxDQUFRO1FBTDFCLFVBQUssR0FBVyxFQUFFLENBQUE7UUFDbEIsYUFBUSxHQUFvQixFQUFFLENBQUE7UUFDOUIseUJBQW9CLEdBQTBCLEVBQUUsQ0FBQTtRQUN6RCxtQkFBYyxHQUF1QixTQUFTLENBQUE7SUFFUixDQUFDO0lBRS9DLGFBQWEsQ0FBQyxDQUFTO1FBQ3JCLElBQUksQ0FBQyxjQUFjLEdBQUcsQ0FBQyxDQUFBO0lBQ3pCLENBQUM7SUFFRCxZQUFZLENBQUMsQ0FBc0I7UUFDakMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNuQyxDQUFDO0lBRUQsUUFBUSxDQUFDLElBQVU7UUFDakIsTUFBTSxNQUFNLEdBQUcsdUJBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDL0IsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7UUFFdkIsS0FBSyxNQUFNLENBQUMsSUFBSSxJQUFJLENBQUMsb0JBQW9CLEVBQUU7WUFDekMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFBO1NBQy9DO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxLQUFLO1FBQ1QsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUNoQyxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRTtZQUN4QixPQUFNO1NBQ1A7UUFDRCxNQUFNLE1BQU0sR0FBRyw2QkFBVSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDM0MsRUFBRSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsY0FBYyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQTtRQUM3RCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQywyQkFBMkIsSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDLENBQUE7SUFDcEUsQ0FBQztJQUVELEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyw2QkFBcUMsRUFBRSxPQUFPLEdBQUcsV0FBVztRQUN6Rix5RUFBeUU7UUFDekUsTUFBTSxRQUFRLEdBQUcsSUFBQSw2Q0FBZSxFQUFDLDZCQUE2QixDQUFXLENBQUE7UUFDekUsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUM7YUFDbEMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUM7YUFDL0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ2hCLElBQUksQ0FBQyxJQUFJLEVBQUU7WUFDVCxNQUFNLElBQUksS0FBSyxDQUNiLGtCQUFrQixPQUFPLGNBQWMsNkJBQTZCLGtCQUFrQixJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQy9HLENBQUE7U0FDRjtRQUNELE1BQU0sU0FBUyxHQUFHLElBQTJCLENBQUEsQ0FBQyxvRUFBb0U7UUFFbEgsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsYUFBYSxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUN4RCxJQUFJLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQzlCLENBQUM7Q0FDRjtBQW5ERCxzREFtREMifQ==
@@ -1,5 +1,5 @@
1
1
  import { Criticality } from 'logger';
2
- declare type TestReporting = 'just-failing' | 'tree' | 'tree-just-failing';
2
+ declare type TestReporting = 'tree-all' | 'tree-just-failing';
3
3
  interface Options {
4
4
  units: string[];
5
5
  goals: string[];
@@ -24,6 +24,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
24
24
  Object.defineProperty(exports, "__esModule", { value: true });
25
25
  exports.main = exports.run = exports.getEnv = void 0;
26
26
  const build_raptor_core_1 = require("build-raptor-core");
27
+ const fs_1 = __importDefault(require("fs"));
27
28
  const fse = __importStar(require("fs-extra"));
28
29
  const logger_1 = require("logger");
29
30
  const misc_1 = require("misc");
@@ -82,26 +83,63 @@ async function run(options) {
82
83
  const repoProtocol = new yarn_repo_protocol_1.YarnRepoProtocol(logger, assetPublisher);
83
84
  const bootstrapper = await build_raptor_core_1.EngineBootstrapper.create(rootDir, storageClient, repoProtocol, t0, options.criticality, '', logger);
84
85
  const testOutput = new Map();
85
- const visualizer = new task_execution_visualizer_1.TaskExecutionVisualizer();
86
+ const visualizer = options.taskProgressOutput ? new task_execution_visualizer_1.TaskExecutionVisualizer() : undefined;
87
+ // TODO(imaman): use a writable stream?
88
+ const allTestsFile = path.join(buildRaptorDir, 'all-tests');
89
+ // Wipe out the file
90
+ fs_1.default.writeFileSync(allTestsFile, '');
91
+ let atLeastOneTest = false;
92
+ bootstrapper.transmitter.addProcessor(s => {
93
+ if (s.step === 'ASSET_PUBLISHED' ||
94
+ s.step === 'BUILD_RUN_STARTED' ||
95
+ s.step === 'PUBLIC_FILES' ||
96
+ s.step === 'TASK_STORE_GET' ||
97
+ s.step === 'TASK_STORE_PUT') {
98
+ return;
99
+ }
100
+ if (s.step === 'TEST_ENDED') {
101
+ atLeastOneTest = true;
102
+ return;
103
+ }
104
+ if (s.step === 'PLAN_PREPARED') {
105
+ visualizer?.addTasks(s.taskNames);
106
+ return;
107
+ }
108
+ if (s.step === 'TASK_ENDED') {
109
+ if (visualizer) {
110
+ const line = visualizer.ended(s.taskName, s.verdict, s.executionType);
111
+ if (line) {
112
+ logger.print(line);
113
+ }
114
+ }
115
+ return;
116
+ }
117
+ if (s.step === 'BUILD_RUN_ENDED') {
118
+ // If there are no tests, don't print the message asbout the location of the all-test-logs file.
119
+ // If there is no summary message, do not print it.
120
+ // If one of them is printed, add a prefix of three blank lines
121
+ const line = visualizer?.summary(Date.now() - t0) ?? '';
122
+ const whereIsTheLogMessage = atLeastOneTest ? `All test logs were written to ${allTestsFile}\n\n` : ``;
123
+ if (whereIsTheLogMessage || line) {
124
+ // The logger does .trim() on the message so we use "." instead of a "pure" blank line
125
+ logger.print(`.\n.\n.\n${whereIsTheLogMessage}${line}`);
126
+ }
127
+ return;
128
+ }
129
+ (0, misc_1.shouldNeverHappen)(s);
130
+ });
86
131
  bootstrapper.subscribable.on('testEnded', arg => {
87
132
  (0, misc_1.assigningGet)(testOutput, arg.taskName, () => []).push(arg);
88
133
  });
89
134
  bootstrapper.subscribable.on('executionStarted', arg => {
90
- if (options.taskProgressOutput) {
91
- logger.print(visualizer.begin(arg));
135
+ if (visualizer) {
136
+ visualizer.begin(arg);
92
137
  }
93
138
  else {
94
139
  logger.print(`=============================== ${arg} =================================`);
95
140
  }
96
141
  });
97
142
  bootstrapper.subscribable.on('executionEnded', async (arg) => {
98
- if (options.taskProgressOutput) {
99
- logger.print(visualizer.ended(arg.taskName, (0, misc_1.switchOn)(arg.status, {
100
- OK: () => '🏁',
101
- FAIL: () => '🏁',
102
- CRASH: () => '🏁',
103
- })));
104
- }
105
143
  // TODO(imaman): cover (output is indeed written in file structure)
106
144
  await fse.ensureDir(buildRaptorDirTasks);
107
145
  const fileName = path.join(buildRaptorDirTasks, (0, misc_1.toReasonableFileName)(arg.taskName));
@@ -116,19 +154,19 @@ async function run(options) {
116
154
  finally {
117
155
  stream.end();
118
156
  }
119
- reportTests(logger, testOutput.get(arg.taskName) ?? [], options.testReporting ?? 'tree');
120
- const doPrint = options.printPassing ||
157
+ reportTests(logger, testOutput.get(arg.taskName) ?? [], options.testReporting ?? 'tree-all', allTestsFile);
158
+ const dumpTaskOutputToTerminal = options.printPassing ||
121
159
  (0, misc_1.switchOn)(arg.status, {
122
160
  CRASH: () => false,
123
161
  OK: () => false,
124
162
  FAIL: () => true,
125
163
  });
126
- if (!doPrint) {
127
- return;
164
+ if (dumpTaskOutputToTerminal) {
165
+ await (0, misc_1.dumpFile)(arg.outputFile, process.stdout);
166
+ logger.print(`\n\n`);
128
167
  }
129
- await (0, misc_1.dumpFile)(arg.outputFile, process.stdout);
168
+ fs_1.default.appendFileSync(allTestsFile, fs_1.default.readFileSync(arg.outputFile) + '\n');
130
169
  logger.info(`output of ${arg.taskName} dumped`);
131
- logger.print(`\n\n`);
132
170
  });
133
171
  bootstrapper.subscribable.on('executionSkipped', tn => {
134
172
  logger.print(`Task ${tn} succeeded earlier. Skipping.\n`, 'low');
@@ -159,16 +197,13 @@ async function run(options) {
159
197
  process.exitCode = exitCode;
160
198
  }
161
199
  exports.run = run;
162
- function reportTests(logger, arr, tr) {
163
- if (tr === 'just-failing') {
164
- return;
165
- }
166
- let printPassing;
167
- if (tr === 'tree') {
168
- printPassing = true;
200
+ function reportTests(logger, arr, tr, allTasksFile) {
201
+ let renderPassingTests;
202
+ if (tr === 'tree-all') {
203
+ renderPassingTests = true;
169
204
  }
170
205
  else if (tr === 'tree-just-failing') {
171
- printPassing = false;
206
+ renderPassingTests = false;
172
207
  }
173
208
  else {
174
209
  (0, misc_1.shouldNeverHappen)(tr);
@@ -209,19 +244,25 @@ function reportTests(logger, arr, tr) {
209
244
  TEST_TIMEDOUT: () => '⏲️ [timedout]',
210
245
  });
211
246
  const duration = at.durationMillis === undefined ? '' : ` (${at.durationMillis} ms)`;
212
- logger.print(`${spaces}${v} ${at.testPath.at(-1)}${duration}`, 'high');
247
+ const message = `${spaces}${v} ${at.testPath.at(-1)}${duration}`;
248
+ // TODO(imaman): create a dedicate logger that write to the allTasksFile
249
+ logger.print(message, 'high');
250
+ fs_1.default.appendFileSync(allTasksFile, message + '\n');
213
251
  prev = k;
214
252
  }
215
253
  }
216
254
  const list = Object.entries((0, misc_1.groupBy)(arr, at => at.fileName)).map(([fileName, tests]) => ({ fileName, tests }));
217
255
  const sorted = (0, misc_1.sortBy)(list, at => at.fileName);
218
256
  const passing = sorted.filter(at => isPassing(at.tests));
219
- if (printPassing) {
220
- for (const at of passing) {
221
- logger.print(`✅ PASSED ${at.fileName}`, 'high');
257
+ for (const at of passing) {
258
+ const message = `✅ PASSED ${at.fileName}`;
259
+ fs_1.default.appendFileSync(allTasksFile, message + '\n');
260
+ if (renderPassingTests) {
261
+ logger.print(message, 'high');
222
262
  }
223
263
  }
224
264
  for (const at of sorted.filter(at => !isPassing(at.tests))) {
265
+ fs_1.default.appendFileSync(allTasksFile, at.fileName + '\n');
225
266
  logger.print(at.fileName, 'high');
226
267
  printTests(at.tests);
227
268
  }
@@ -253,7 +294,7 @@ function main() {
253
294
  default: [],
254
295
  })
255
296
  .option('print-passing', {
256
- describe: 'whether to print the output of passing tasks to the terminal.',
297
+ describe: 'whether to dump the output of passing tasks to the terminal.',
257
298
  type: 'boolean',
258
299
  default: false,
259
300
  })
@@ -263,6 +304,7 @@ function main() {
263
304
  demandOption: false,
264
305
  default: 8,
265
306
  })
307
+ // TODO(imaman): seems like --compact, --loudness can be replaced by --task-progress-output
266
308
  .options('compact', {
267
309
  describe: 'whether to list only executing tasks (i.e., do not print skipped tasks)',
268
310
  type: 'boolean',
@@ -286,9 +328,9 @@ function main() {
286
328
  demandOption: false,
287
329
  })
288
330
  .option('test-reporting', {
289
- choices: ['just-failing', 'tree', 'tree-just-failing'],
331
+ choices: ['tree-all', 'tree-just-failing'],
290
332
  describe: 'test reporing policy',
291
- default: 'tree',
333
+ default: 'tree-just-failing',
292
334
  })
293
335
  .option('test-caching', {
294
336
  describe: 'whether to skip running tests that have already passed',
@@ -296,7 +338,7 @@ function main() {
296
338
  default: true,
297
339
  })
298
340
  .option('task-progress-output', {
299
- describe: 'whether to print number of tasks ended/started',
341
+ describe: 'whether to print a line indicating verdict/execution-type for each task',
300
342
  type: 'boolean',
301
343
  default: false,
302
344
  })
@@ -327,7 +369,7 @@ function main() {
327
369
  compact: argv.compact,
328
370
  criticality: stringToLoudness(argv.loudness),
329
371
  testCaching: argv.testCaching,
330
- testReporting: tr === 'just-failing' || tr === 'tree' || tr === 'tree-just-failing' || tr === undefined
372
+ testReporting: tr === 'tree-all' || tr === 'tree-just-failing' || tr === undefined
331
373
  ? tr
332
374
  : (0, misc_1.failMe)(`unsupported value: ${tr}`),
333
375
  stepByStepProcessor: argv.stepByStepProcessor,
@@ -363,7 +405,7 @@ function main() {
363
405
  compact: argv.compact,
364
406
  criticality: stringToLoudness(argv.loudness),
365
407
  testCaching: argv.testCaching,
366
- testReporting: tr === 'just-failing' || tr === 'tree' || tr === 'tree-just-failing' || tr === undefined
408
+ testReporting: tr === 'tree-all' || tr === 'tree-just-failing' || tr === undefined
367
409
  ? tr
368
410
  : (0, misc_1.failMe)(`unsupported value: ${tr}`),
369
411
  stepByStepProcessor: argv.stepByStepProcessor,
@@ -409,4 +451,4 @@ function stringToLoudness(s) {
409
451
  }
410
452
  throw new Error(`illegal loudness value: "${s}"`);
411
453
  }
412
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"build-raptor-cli.js","sourceRoot":"","sources":["../../src/build-raptor-cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAwG;AACxG,8CAA+B;AAC/B,mCAAiE;AACjE,+BAYa;AACb,uCAAwB;AACxB,2CAA4B;AAE5B,yDAA6D;AAE7D,kDAAyB;AACzB,2CAAuC;AACvC,2DAAqD;AAErD,2EAAqE;AAyBrE,SAAgB,MAAM,CAAC,UAAsB;IAC3C,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA,CAAC,qCAAqC;AACtE,CAAC;AAFD,wBAEC;AAED,MAAM,EAAE,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA;AAC7B,KAAK,UAAU,mBAAmB;IAChC,OAAO,MAAM,8BAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,uBAAuB,CAAC,EAAE;QAC5F,+BAA+B,EAAE,CAAC,GAAG,EAAE;KACxC,CAAC,CAAA;AACJ,CAAC;AAEM,KAAK,UAAU,GAAG,CAAC,OAAgB;IACxC,OAAO,CAAC,GAAG,CAAC,4CAA4C,GAAG,GAAG,CAAA,CAAC,qCAAqC;IACpG,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE;QACjC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAA;KAC3D;IACD,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAErB,8DAA8D;IAC9D,MAAM,oBAAoB,GAAG,IAAA,6CAAyB,GAAE,IAAI,mBAAmB,CAAA;IAE/E,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAC7B,MAAM,OAAO,GAAG,IAAA,+BAAW,EAAC,OAAO,CAAC,CAAA;IACpC,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CACb,iHAAiH,OAAO,EAAE,CAC3H,CAAA;KACF;IACD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;IAC1D,MAAM,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;IACnC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;IACrD,MAAM,MAAM,GAAG,IAAA,4BAAmB,EAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAEhE,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IACjC,MAAM,CAAC,KAAK,CAAC,cAAc,OAAO,EAAE,CAAC,CAAA;IACrC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,MAAM,CAAA;IAEpC,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;IACvC,IAAI,UAAU,EAAE;QACd,MAAM,QAAQ,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA;QAC5C,MAAM,QAAQ,GAAG,MAAM,CAAC,cAAc,CAAC,CAAA;QAEvC,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;SAC5E;KACF;IAED,IAAI,IAAI,EAAE;QACR,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;KACjH;IAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;IAC9D,MAAM,GAAG,CAAC,EAAE,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAEnE,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC,CAAA;IACxD,MAAM,cAAc,GAAG,IAAI,yCAAqB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IACvE,MAAM,YAAY,GAAG,IAAI,qCAAgB,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IACjE,MAAM,YAAY,GAAG,MAAM,sCAAkB,CAAC,MAAM,CAClD,OAAO,EACP,aAAa,EACb,YAAY,EACZ,EAAE,EACF,OAAO,CAAC,WAAW,EACnB,EAAE,EACF,MAAM,CACP,CAAA;IAED,MAAM,UAAU,GAAG,IAAI,GAAG,EAA8B,CAAA;IACxD,MAAM,UAAU,GAAG,IAAI,mDAAuB,EAAE,CAAA;IAChD,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE;QAC9C,IAAA,mBAAY,EAAC,UAAU,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC5D,CAAC,CAAC,CAAA;IAEF,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC,kBAAkB,EAAE,GAAG,CAAC,EAAE;QACrD,IAAI,OAAO,CAAC,kBAAkB,EAAE;YAC9B,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;SACpC;aAAM;YACL,MAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,oCAAoC,CAAC,CAAA;SACzF;IACH,CAAC,CAAC,CAAA;IAEF,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC,gBAAgB,EAAE,KAAK,EAAC,GAAG,EAAC,EAAE;QACzD,IAAI,OAAO,CAAC,kBAAkB,EAAE;YAC9B,MAAM,CAAC,KAAK,CACV,UAAU,CAAC,KAAK,CACd,GAAG,CAAC,QAAQ,EACZ,IAAA,eAAQ,EAAC,GAAG,CAAC,MAAM,EAAE;gBACnB,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI;gBACd,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI;gBAChB,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI;aAClB,CAAC,CACH,CACF,CAAA;SACF;QAED,mEAAmE;QACnE,MAAM,GAAG,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAA,2BAAoB,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;QACnF,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;QAC9C,IAAI;YACF,MAAM,IAAA,eAAQ,EAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;YACtC,MAAM,CAAC,IAAI,CAAC,mBAAmB,GAAG,CAAC,QAAQ,OAAO,QAAQ,EAAE,CAAC,CAAA;SAC9D;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,UAAU,0BAA0B,CAAC,CAAA;SAClG;gBAAS;YACR,MAAM,CAAC,GAAG,EAAE,CAAA;SACb;QAED,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,aAAa,IAAI,MAAM,CAAC,CAAA;QAExF,MAAM,OAAO,GACX,OAAO,CAAC,YAAY;YACpB,IAAA,eAAQ,EAAC,GAAG,CAAC,MAAM,EAAE;gBACnB,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK;gBAClB,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK;gBACf,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI;aACjB,CAAC,CAAA;QACJ,IAAI,CAAC,OAAO,EAAE;YACZ,OAAM;SACP;QAED,MAAM,IAAA,eAAQ,EAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;QAC9C,MAAM,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,QAAQ,SAAS,CAAC,CAAA;QAC/C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC,kBAAkB,EAAE,EAAE,CAAC,EAAE;QACpD,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,iCAAiC,EAAE,KAAK,CAAC,CAAA;IAClE,CAAC,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAiB;QAC7B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAA;IAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,qBAAqB,EAAE;QACpF,6BAA6B,EAAE,OAAO,CAAC,mBAAmB;QAC1D,WAAW,EAAE,IAAA,UAAG,EAAC,OAAO,CAAC,WAAW,CAAC;QACrC,cAAc;QACd,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI;QACxC,UAAU;QACV,OAAO;QACP,GAAG,CAAC,OAAO,CAAC,OAAO;YACjB,CAAC,CAAC;gBACE,KAAK,EAAE;oBACL,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,IAAI,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE;iBAChC;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAA;IACF,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,EAAE,CAAA;IACnC,kDAAkD;IAClD,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAA;AAC7B,CAAC;AAhJD,kBAgJC;AAED,SAAS,WAAW,CAAC,MAAc,EAAE,GAAqB,EAAE,EAAiB;IAC3E,IAAI,EAAE,KAAK,cAAc,EAAE;QACzB,OAAM;KACP;IAED,IAAI,YAAY,CAAA;IAChB,IAAI,EAAE,KAAK,MAAM,EAAE;QACjB,YAAY,GAAG,IAAI,CAAA;KACpB;SAAM,IAAI,EAAE,KAAK,mBAAmB,EAAE;QACrC,YAAY,GAAG,KAAK,CAAA;KACrB;SAAM;QACL,IAAA,wBAAiB,EAAC,EAAE,CAAC,CAAA;KACtB;IAED,SAAS,MAAM,CAAC,OAAiB,EAAE,GAAa;QAC9C,IAAI,MAAM,GAAG,OAAO,CAAA;QACpB,IAAI,CAAC,GAAG,CAAC,CAAA;QACT,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE;YACzB,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE;gBACzB,MAAK;aACN;YACD,MAAM,IAAI,IAAI,CAAA;YACd,EAAE,CAAC,CAAA;SACJ;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;YACnC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;YAC1C,MAAM,IAAI,IAAI,CAAA;SACf;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,SAAS,SAAS,CAAC,KAAuB;QACxC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CACtB,IAAA,eAAQ,EAAC,EAAE,CAAC,OAAO,EAAE;YACnB,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK;YACzB,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK;YACxB,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;YACvB,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;SAC3B,CAAC,CACH,CAAA;IACH,CAAC;IAED,SAAS,UAAU,CAAC,KAAuB;QACzC,IAAI,IAAI,GAAa,EAAE,CAAA;QACvB,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE;YACtB,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YAClC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;YAC9B,MAAM,CAAC,GAAG,IAAA,eAAQ,EAAC,EAAE,CAAC,OAAO,EAAE;gBAC7B,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG;gBACvB,WAAW,EAAE,GAAG,EAAE,CAAC,GAAG;gBACtB,WAAW,EAAE,GAAG,EAAE,CAAC,GAAG;gBACtB,aAAa,EAAE,GAAG,EAAE,CAAC,eAAe;aACrC,CAAC,CAAA;YAEF,MAAM,QAAQ,GAAG,EAAE,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,cAAc,MAAM,CAAA;YACpF,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAA;YAEtE,IAAI,GAAG,CAAC,CAAA;SACT;IACH,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAA,cAAO,EAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IAC9G,MAAM,MAAM,GAAG,IAAA,aAAM,EAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAA;IAC9C,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IACxD,IAAI,YAAY,EAAE;QAChB,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE;YACxB,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAA;SAChD;KACF;IACD,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE;QAC1D,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QACjC,UAAU,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;KACrB;AACH,CAAC;AAED,SAAgB,IAAI;IAClB,OAAO,CACL,IAAA,eAAK,EAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACzB,MAAM,CAAC,OAAO,EAAE;QACf,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,wBAAwB;QAClC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,EAAE;KACZ,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,8BAA8B;QACxC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,EAAE;KACZ,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,wBAAwB;QAClC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,EAAE;KACZ,CAAC;SACD,MAAM,CAAC,eAAe,EAAE;QACvB,QAAQ,EAAE,+DAA+D;QACzE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;SACD,MAAM,CAAC,aAAa,EAAE;QACrB,QAAQ,EAAE,oDAAoD;QAC9D,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,CAAC;KACX,CAAC;SACD,OAAO,CAAC,SAAS,EAAE;QAClB,QAAQ,EAAE,yEAAyE;QACnF,IAAI,EAAE,SAAS;KAChB,CAAC;SACD,OAAO,CAAC,UAAU,EAAE;QACnB,QAAQ,EAAE;;;gEAG8C;QACxD,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACxB,OAAO,EAAE,GAAG;KACb,CAAC;SACD,OAAO,CAAC,wBAAwB,EAAE;QACjC,QAAQ,EAAE,mFAAmF;QAC7F,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,KAAK;KACpB,CAAC;SACD,OAAO,CAAC,aAAa,EAAE;QACtB,QAAQ,EAAE,qFAAqF;QAC/F,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,KAAK;KACpB,CAAC;SACD,MAAM,CAAC,gBAAgB,EAAE;QACxB,OAAO,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,mBAAmB,CAAC;QACtD,QAAQ,EAAE,sBAAsB;QAChC,OAAO,EAAE,MAAM;KAChB,CAAC;SACD,MAAM,CAAC,cAAc,EAAE;QACtB,QAAQ,EAAE,wDAAwD;QAClE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;KACd,CAAC;SACD,MAAM,CAAC,sBAAsB,EAAE;QAC9B,QAAQ,EAAE,gDAAgD;QAC1D,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;SACD,OAAO,CACN,OAAO,EACP,gBAAgB,EAChB,KAAK,CAAC,EAAE,CAAC,KAAK,EACd,KAAK,EAAC,OAAO,EAAC,EAAE;QACd,MAAM,IAAI,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAA;QACpC,MAAM,GAAG,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;YACjC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC5C,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,qBAAqB,EAAE,IAAI,CAAC,UAAU;YACtC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC5C,CAAC,CAAA;IACJ,CAAC,CACF;SACA,OAAO,CACN,MAAM,EACN,WAAW,EACX,KAAK,CAAC,EAAE,CAAC,KAAK,EACd,KAAK,EAAC,OAAO,EAAC,EAAE;QACd,MAAM,IAAI,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAA;QACpC,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAA;QAC7B,MAAM,GAAG,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;YAChC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC5C,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,aAAa,EACX,EAAE,KAAK,cAAc,IAAI,EAAE,KAAK,MAAM,IAAI,EAAE,KAAK,mBAAmB,IAAI,EAAE,KAAK,SAAS;gBACtF,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,IAAA,aAAM,EAAC,sBAAsB,EAAE,EAAE,CAAC;YACxC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,qBAAqB,EAAE,IAAI,CAAC,UAAU;YACtC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC5C,CAAC,CAAA;IACJ,CAAC,CACF;SACA,OAAO,CACN,MAAM,EACN,6BAA6B,EAC7B,KAAK,CAAC,EAAE,CAAC,KAAK,EACd,KAAK,EAAC,OAAO,EAAC,EAAE;QACd,MAAM,IAAI,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAA;QACpC,MAAM,GAAG,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;YAChC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC5C,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,qBAAqB,EAAE,IAAI,CAAC,UAAU;YACtC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC5C,CAAC,CAAA;IACJ,CAAC,CACF;QACD,kGAAkG;SACjG,OAAO,CACN,gBAAgB,EAChB,wEAAwE,EACxE,KAAK,CAAC,EAAE,CAAC,KAAK,EACd,KAAK,EAAC,OAAO,EAAC,EAAE;QACd,MAAM,IAAI,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAA;QACpC,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAA;QAC7B,MAAM,GAAG,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;YAClD,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC5C,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,aAAa,EACX,EAAE,KAAK,cAAc,IAAI,EAAE,KAAK,MAAM,IAAI,EAAE,KAAK,mBAAmB,IAAI,EAAE,KAAK,SAAS;gBACtF,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,IAAA,aAAM,EAAC,sBAAsB,EAAE,EAAE,CAAC;YACxC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,qBAAqB,EAAE,IAAI,CAAC,UAAU;YACtC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC5C,CAAC,CAAA;IACJ,CAAC,CACF;SACA,OAAO,CACN,eAAe,EACf,6IAA6I,EAC7I,KAAK,CAAC,EAAE,CACN,KAAK,CAAC,UAAU,CAAC,SAAS,EAAE;QAC1B,QAAQ,EAAE,yDAAyD;QACnE,IAAI,EAAE,QAAQ;KACf,CAAC,EACJ,KAAK,EAAC,OAAO,EAAC,EAAE;QACd,MAAM,IAAI,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAA;QACpC,MAAM,GAAG,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;YAC/B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,8DAA8D;YAC9D,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACrD,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC5C,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,qBAAqB,EAAE,IAAI,CAAC,UAAU;YACtC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC5C,CAAC,CAAA;IACJ,CAAC,CACF;SACA,aAAa,CAAC,CAAC,CAAC;SAChB,KAAK,EAAE,CACX,CAAA;AACH,CAAC;AAvMD,oBAuMC;AAED,SAAS,gBAAgB,CAAC,CAAS;IACjC,IAAI,CAAC,KAAK,GAAG,EAAE;QACb,OAAO,MAAM,CAAA;KACd;IAED,IAAI,CAAC,KAAK,GAAG,EAAE;QACb,OAAO,UAAU,CAAA;KAClB;IAED,IAAI,CAAC,KAAK,GAAG,EAAE;QACb,OAAO,KAAK,CAAA;KACb;IAED,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAA;AACnD,CAAC"}
454
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"build-raptor-cli.js","sourceRoot":"","sources":["../../src/build-raptor-cli.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,15 @@
1
1
  export declare class TaskExecutionVisualizer {
2
2
  private numStarted;
3
3
  private numEnded;
4
+ private numBlocked;
5
+ private numFailed;
6
+ private numSucceeded;
7
+ private numExectuted;
8
+ private numCached;
9
+ private all;
10
+ addTasks(names: string[]): void;
4
11
  private getLine;
5
12
  begin(taskName: string): string;
6
- ended(taskName: string, verdict: string): string;
13
+ ended(taskName: string, verdict: 'OK' | 'FAIL' | 'UNKNOWN' | 'CRASH', executionType: 'EXECUTED' | 'CACHED' | 'UNKNOWN' | 'CANNOT_START'): string | undefined;
14
+ summary(durationInMillis: number): string;
7
15
  }
@@ -1,10 +1,20 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.TaskExecutionVisualizer = void 0;
4
+ const misc_1 = require("misc");
4
5
  class TaskExecutionVisualizer {
5
6
  constructor() {
6
7
  this.numStarted = 0;
7
8
  this.numEnded = 0;
9
+ this.numBlocked = 0;
10
+ this.numFailed = 0;
11
+ this.numSucceeded = 0;
12
+ this.numExectuted = 0;
13
+ this.numCached = 0;
14
+ this.all = 0;
15
+ }
16
+ addTasks(names) {
17
+ this.all += names.length;
8
18
  }
9
19
  getLine(taskName, text) {
10
20
  if (text === undefined) {
@@ -16,11 +26,60 @@ class TaskExecutionVisualizer {
16
26
  ++this.numStarted;
17
27
  return this.getLine(taskName);
18
28
  }
19
- ended(taskName, verdict) {
29
+ ended(taskName, verdict, executionType) {
30
+ if (executionType === 'CANNOT_START' || executionType === 'UNKNOWN') {
31
+ // It looks like UNKNOWN cannot really happen once the task is started, so we ignore it.
32
+ // CANNOT_START can happen but it clutters the output: after a (single) task that failed to build, there can be
33
+ // long chain of dependent tasks that will be CANNOT_START. printing these tasks will distract the user.
34
+ ++this.numBlocked;
35
+ return undefined;
36
+ }
20
37
  ++this.numEnded;
21
- const ret = this.getLine(taskName, verdict);
22
- return ret;
38
+ const cacheIndicator = (0, misc_1.switchOn)(executionType, {
39
+ CACHED: () => {
40
+ ++this.numCached;
41
+ return '🗃️ ';
42
+ },
43
+ EXECUTED: () => {
44
+ ++this.numExectuted;
45
+ return '󠀠✨';
46
+ },
47
+ });
48
+ const verdictIndicator = (0, misc_1.switchOn)(verdict, {
49
+ CRASH: () => {
50
+ ++this.numFailed;
51
+ return '❌';
52
+ },
53
+ FAIL: () => {
54
+ ++this.numFailed;
55
+ return '❌';
56
+ },
57
+ OK: () => {
58
+ ++this.numSucceeded;
59
+ return '✅';
60
+ },
61
+ UNKNOWN: () => '',
62
+ });
63
+ const full = `[${this.all}/${this.all}]`.length;
64
+ const progress = `[${this.numEnded}/${this.all}]`;
65
+ return `${progress.padStart(full, '.')} ${verdictIndicator} ${cacheIndicator} ${taskName}`;
66
+ }
67
+ summary(durationInMillis) {
68
+ const tried = this.numExectuted + this.numCached;
69
+ const width = this.all.toString().length;
70
+ return [
71
+ `Build Summary (${(durationInMillis / 1000).toFixed(1)}s):`,
72
+ `✅ Succeeded: ${this.numSucceeded.toString().padStart(width)}/${this.all}`,
73
+ this.numFailed > 0 ? `❌ Failed: ${this.numFailed.toString().padStart(width)}/${this.all}` : undefined,
74
+ this.numBlocked > 0 ? `⛔ Could not start: ${this.numBlocked.toString().padStart(width)}/${this.all}` : undefined,
75
+ ``,
76
+ `✨ Executed: ${this.numExectuted.toString().padStart(width)}/${tried}`,
77
+ `🗃️ Cache hit: ${this.numCached.toString().padStart(width)}/${tried} (${((100 * this.numCached) /
78
+ tried).toFixed(1)}%)`,
79
+ ]
80
+ .filter(at => at !== undefined)
81
+ .join('\n');
23
82
  }
24
83
  }
25
84
  exports.TaskExecutionVisualizer = TaskExecutionVisualizer;
26
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFzay1leGVjdXRpb24tdmlzdWFsaXplci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YXNrLWV4ZWN1dGlvbi12aXN1YWxpemVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLE1BQWEsdUJBQXVCO0lBQXBDO1FBQ1UsZUFBVSxHQUFHLENBQUMsQ0FBQTtRQUNkLGFBQVEsR0FBRyxDQUFDLENBQUE7SUFvQnRCLENBQUM7SUFsQlMsT0FBTyxDQUFDLFFBQWdCLEVBQUUsSUFBYTtRQUM3QyxJQUFJLElBQUksS0FBSyxTQUFTLEVBQUU7WUFDdEIsT0FBTyxJQUFJLElBQUksQ0FBQyxRQUFRLElBQUksSUFBSSxDQUFDLFVBQVUsU0FBUyxRQUFRLEVBQUUsQ0FBQTtTQUMvRDtRQUVELE9BQU8sSUFBSSxJQUFJLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxVQUFVLFNBQVMsUUFBUSxFQUFFLENBQUE7SUFDaEUsQ0FBQztJQUVELEtBQUssQ0FBQyxRQUFnQjtRQUNwQixFQUFFLElBQUksQ0FBQyxVQUFVLENBQUE7UUFDakIsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQy9CLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBZ0IsRUFBRSxPQUFlO1FBQ3JDLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQTtRQUNmLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBQzNDLE9BQU8sR0FBRyxDQUFBO0lBQ1osQ0FBQztDQUNGO0FBdEJELDBEQXNCQyJ9
85
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFzay1leGVjdXRpb24tdmlzdWFsaXplci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YXNrLWV4ZWN1dGlvbi12aXN1YWxpemVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLCtCQUErQjtBQUUvQixNQUFhLHVCQUF1QjtJQUFwQztRQUNVLGVBQVUsR0FBRyxDQUFDLENBQUE7UUFDZCxhQUFRLEdBQUcsQ0FBQyxDQUFBO1FBQ1osZUFBVSxHQUFHLENBQUMsQ0FBQTtRQUNkLGNBQVMsR0FBRyxDQUFDLENBQUE7UUFDYixpQkFBWSxHQUFHLENBQUMsQ0FBQTtRQUNoQixpQkFBWSxHQUFHLENBQUMsQ0FBQTtRQUNoQixjQUFTLEdBQUcsQ0FBQyxDQUFBO1FBQ2IsUUFBRyxHQUFHLENBQUMsQ0FBQTtJQW9GakIsQ0FBQztJQWxGQyxRQUFRLENBQUMsS0FBZTtRQUN0QixJQUFJLENBQUMsR0FBRyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUE7SUFDMUIsQ0FBQztJQUVPLE9BQU8sQ0FBQyxRQUFnQixFQUFFLElBQWE7UUFDN0MsSUFBSSxJQUFJLEtBQUssU0FBUyxFQUFFO1lBQ3RCLE9BQU8sSUFBSSxJQUFJLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxVQUFVLFNBQVMsUUFBUSxFQUFFLENBQUE7U0FDL0Q7UUFFRCxPQUFPLElBQUksSUFBSSxDQUFDLFFBQVEsSUFBSSxJQUFJLENBQUMsVUFBVSxTQUFTLFFBQVEsRUFBRSxDQUFBO0lBQ2hFLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBZ0I7UUFDcEIsRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFBO1FBQ2pCLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUMvQixDQUFDO0lBRUQsS0FBSyxDQUNILFFBQWdCLEVBQ2hCLE9BQTRDLEVBQzVDLGFBQWlFO1FBRWpFLElBQUksYUFBYSxLQUFLLGNBQWMsSUFBSSxhQUFhLEtBQUssU0FBUyxFQUFF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
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "build-raptor",
3
- "version": "0.117.0",
3
+ "version": "0.118.0",
4
4
  "description": "CLI for super-fast monorepo builds",
5
5
  "keywords": [],
6
6
  "license": "MIT",
@@ -18,7 +18,7 @@
18
18
  "@aws-sdk/client-s3": "^3.623.0",
19
19
  "aws-sdk": "^2.1667.0",
20
20
  "build-raptor-dynamic-loader": "^0.62.0",
21
- "build-raptor-jest-reporter": "0.117.0",
21
+ "build-raptor-jest-reporter": "0.118.0",
22
22
  "escape-string-regexp": "^4.0.0",
23
23
  "execa": "^5.0.0",
24
24
  "fs-extra": "^9.0.0",