build-raptor 0.117.0 → 0.119.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.
Files changed (118) hide show
  1. package/dist/deps/build-raptor-core/breakdown.d.ts +2 -2
  2. package/dist/deps/build-raptor-core/breakdown.js +23 -9
  3. package/dist/deps/build-raptor-core/build-raptor-config.d.ts +1 -1
  4. package/dist/deps/build-raptor-core/default-asset-publisher.d.ts +0 -1
  5. package/dist/deps/build-raptor-core/engine-bootstrapper.d.ts +3 -1
  6. package/dist/deps/build-raptor-core/engine-bootstrapper.js +29 -11
  7. package/dist/deps/build-raptor-core/engine-event-scheme.d.ts +1 -1
  8. package/dist/deps/build-raptor-core/engine.js +23 -9
  9. package/dist/deps/build-raptor-core/execution-plan.js +1 -1
  10. package/dist/deps/build-raptor-core/execution-record.d.ts +1 -1
  11. package/dist/deps/build-raptor-core/execution-type.d.ts +2 -2
  12. package/dist/deps/build-raptor-core/find-repo-dir.js +2 -3
  13. package/dist/deps/build-raptor-core/fingerprint-ledger.js +23 -9
  14. package/dist/deps/build-raptor-core/fingerprint.d.ts +1 -1
  15. package/dist/deps/build-raptor-core/fingerprint.js +2 -3
  16. package/dist/deps/build-raptor-core/fingerprinter.d.ts +1 -1
  17. package/dist/deps/build-raptor-core/fingerprinter.js +23 -9
  18. package/dist/deps/build-raptor-core/hasher.d.ts +0 -1
  19. package/dist/deps/build-raptor-core/hasher.js +24 -10
  20. package/dist/deps/build-raptor-core/index.js +6 -2
  21. package/dist/deps/build-raptor-core/model.js +1 -1
  22. package/dist/deps/build-raptor-core/nop-asset-publisher.d.ts +0 -1
  23. package/dist/deps/build-raptor-core/phase.d.ts +1 -1
  24. package/dist/deps/build-raptor-core/planner.js +1 -1
  25. package/dist/deps/build-raptor-core/purger.js +23 -9
  26. package/dist/deps/build-raptor-core/slot-index.d.ts +1 -1
  27. package/dist/deps/build-raptor-core/slot-index.js +1 -1
  28. package/dist/deps/build-raptor-core/step-by-step-transmitter.d.ts +7 -5
  29. package/dist/deps/build-raptor-core/step-by-step-transmitter.js +48 -28
  30. package/dist/deps/build-raptor-core/tar-stream.d.ts +1 -2
  31. package/dist/deps/build-raptor-core/tar-stream.js +24 -10
  32. package/dist/deps/build-raptor-core/task-executor.js +23 -9
  33. package/dist/deps/build-raptor-core/task-store-cli.js +23 -9
  34. package/dist/deps/build-raptor-core/task-store-event.d.ts +1 -1
  35. package/dist/deps/build-raptor-core/task-store.d.ts +2 -2
  36. package/dist/deps/build-raptor-core/task-store.js +23 -9
  37. package/dist/deps/build-raptor-core/task-tracker.js +1 -1
  38. package/dist/deps/build-raptor-core/task.js +1 -1
  39. package/dist/deps/build-raptor-core/updatable-task-output-registry.js +23 -9
  40. package/dist/deps/build-raptor-core/validate-task-infos.js +2 -3
  41. package/dist/deps/build-raptor-core-testkit/build-raptor-core-testkit.js +6 -2
  42. package/dist/deps/build-raptor-core-testkit/driver.d.ts +0 -1
  43. package/dist/deps/build-raptor-core-testkit/driver.js +23 -9
  44. package/dist/deps/build-raptor-core-testkit/index.js +6 -2
  45. package/dist/deps/build-raptor-core-testkit/repo-protocol-testkit.d.ts +5 -5
  46. package/dist/deps/build-raptor-core-testkit/repo-protocol-testkit.js +23 -9
  47. package/dist/deps/build-raptor-core-testkit/simple-node-repo-protocol.js +23 -9
  48. package/dist/deps/core-types/core-types.d.ts +4 -4
  49. package/dist/deps/core-types/core-types.js +26 -13
  50. package/dist/deps/core-types/index.js +6 -2
  51. package/dist/deps/logger/index.js +6 -2
  52. package/dist/deps/logger/logger.d.ts +2 -3
  53. package/dist/deps/logger/logger.js +25 -12
  54. package/dist/deps/misc/arrays.js +5 -6
  55. package/dist/deps/misc/camelize-record.d.ts +2 -2
  56. package/dist/deps/misc/camelize-record.js +2 -3
  57. package/dist/deps/misc/clean-directory.js +24 -11
  58. package/dist/deps/misc/constructs.js +6 -7
  59. package/dist/deps/misc/directory-scanner.d.ts +3 -4
  60. package/dist/deps/misc/directory-scanner.js +23 -9
  61. package/dist/deps/misc/executor.js +1 -1
  62. package/dist/deps/misc/file-system-storage-client.d.ts +0 -1
  63. package/dist/deps/misc/file-system-storage-client.js +23 -9
  64. package/dist/deps/misc/folderify.d.ts +2 -2
  65. package/dist/deps/misc/folderify.js +25 -12
  66. package/dist/deps/misc/graph.d.ts +1 -1
  67. package/dist/deps/misc/graph.js +1 -1
  68. package/dist/deps/misc/in-memory-storage-client.d.ts +0 -1
  69. package/dist/deps/misc/in-memory-storage-client.js +1 -1
  70. package/dist/deps/misc/index.js +6 -2
  71. package/dist/deps/misc/int.d.ts +1 -1
  72. package/dist/deps/misc/int.js +2 -3
  73. package/dist/deps/misc/internal/graph-executor.js +1 -1
  74. package/dist/deps/misc/maps.js +4 -5
  75. package/dist/deps/misc/misc.d.ts +1 -2
  76. package/dist/deps/misc/misc.js +28 -14
  77. package/dist/deps/misc/object-map.d.ts +1 -1
  78. package/dist/deps/misc/promises.js +2 -3
  79. package/dist/deps/misc/records.js +4 -5
  80. package/dist/deps/misc/slurp-dir.js +2 -3
  81. package/dist/deps/misc/storage-client.d.ts +1 -2
  82. package/dist/deps/misc/stream-to-buffer.d.ts +0 -1
  83. package/dist/deps/misc/stream-to-buffer.js +2 -3
  84. package/dist/deps/misc/strings.js +6 -7
  85. package/dist/deps/misc/typed-publisher.d.ts +1 -1
  86. package/dist/deps/misc/typed-publisher.js +1 -1
  87. package/dist/deps/repo-protocol/index.js +6 -2
  88. package/dist/deps/repo-protocol/repo-protocol.d.ts +2 -3
  89. package/dist/deps/repo-protocol/task-info.d.ts +2 -2
  90. package/dist/deps/repo-protocol/test-run-summary.d.ts +1 -1
  91. package/dist/deps/repo-protocol-toolbox/generate-task-infos.js +2 -3
  92. package/dist/deps/repo-protocol-toolbox/index.js +6 -2
  93. package/dist/deps/repo-protocol-toolbox/repo-protocol-toolbox.js +1 -1
  94. package/dist/deps/repo-protocol-toolbox/task-definition.d.ts +2 -2
  95. package/dist/deps/s3-storage-client/get-s3-storage-client-factory.js +2 -3
  96. package/dist/deps/s3-storage-client/index.js +6 -2
  97. package/dist/deps/s3-storage-client/s3-storage-client.d.ts +0 -1
  98. package/dist/deps/s3-storage-client/s3-storage-client.js +23 -9
  99. package/dist/deps/task-name/index.js +6 -2
  100. package/dist/deps/task-name/task-name.d.ts +2 -2
  101. package/dist/deps/task-name/task-name.js +3 -3
  102. package/dist/deps/unit-metadata/index.js +6 -2
  103. package/dist/deps/unit-metadata/unit-metadata.d.ts +1 -1
  104. package/dist/deps/unit-metadata/unit-metadata.js +1 -1
  105. package/dist/deps/yarn-repo-protocol/build-task-record.d.ts +2 -2
  106. package/dist/deps/yarn-repo-protocol/generate-test-run-summary.js +2 -3
  107. package/dist/deps/yarn-repo-protocol/index.js +6 -2
  108. package/dist/deps/yarn-repo-protocol/rerun-list.d.ts +1 -1
  109. package/dist/deps/yarn-repo-protocol/yarn-repo-protocol-config.d.ts +1 -1
  110. package/dist/deps/yarn-repo-protocol/yarn-repo-protocol.d.ts +3 -1
  111. package/dist/deps/yarn-repo-protocol/yarn-repo-protocol.js +69 -16
  112. package/dist/src/build-raptor-cli.d.ts +4 -4
  113. package/dist/src/build-raptor-cli.js +102 -47
  114. package/dist/src/main.js +6 -2
  115. package/dist/src/register-asset-request.d.ts +3 -3
  116. package/dist/src/task-execution-visualizer.d.ts +9 -1
  117. package/dist/src/task-execution-visualizer.js +63 -4
  118. package/package.json +2 -2
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
@@ -11,19 +15,32 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
11
15
  }) : function(o, v) {
12
16
  o["default"] = v;
13
17
  });
14
- var __importStar = (this && this.__importStar) || function (mod) {
15
- if (mod && mod.__esModule) return mod;
16
- var result = {};
17
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
- __setModuleDefault(result, mod);
19
- return result;
20
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
21
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
22
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
23
37
  };
24
38
  Object.defineProperty(exports, "__esModule", { value: true });
25
- exports.main = exports.run = exports.getEnv = void 0;
39
+ exports.getEnv = getEnv;
40
+ exports.run = run;
41
+ exports.main = main;
26
42
  const build_raptor_core_1 = require("build-raptor-core");
43
+ const fs_1 = __importDefault(require("fs"));
27
44
  const fse = __importStar(require("fs-extra"));
28
45
  const logger_1 = require("logger");
29
46
  const misc_1 = require("misc");
@@ -37,7 +54,6 @@ const task_execution_visualizer_1 = require("./task-execution-visualizer");
37
54
  function getEnv(envVarName) {
38
55
  return process.env[envVarName]; // eslint-disable-line no-process-env
39
56
  }
40
- exports.getEnv = getEnv;
41
57
  const GB = 1024 * 1024 * 1024;
42
58
  async function createStorageClient() {
43
59
  return await misc_1.FilesystemStorageClient.create(path.join(os.homedir(), '.build-raptor/storage'), {
@@ -82,26 +98,63 @@ async function run(options) {
82
98
  const repoProtocol = new yarn_repo_protocol_1.YarnRepoProtocol(logger, assetPublisher);
83
99
  const bootstrapper = await build_raptor_core_1.EngineBootstrapper.create(rootDir, storageClient, repoProtocol, t0, options.criticality, '', logger);
84
100
  const testOutput = new Map();
85
- const visualizer = new task_execution_visualizer_1.TaskExecutionVisualizer();
101
+ const visualizer = options.taskProgressOutput ? new task_execution_visualizer_1.TaskExecutionVisualizer() : undefined;
102
+ // TODO(imaman): use a writable stream?
103
+ const allTestsFile = path.join(buildRaptorDir, 'all-tests');
104
+ // Wipe out the file
105
+ fs_1.default.writeFileSync(allTestsFile, '');
106
+ let atLeastOneTest = false;
107
+ bootstrapper.transmitter.addProcessor(s => {
108
+ if (s.step === 'ASSET_PUBLISHED' ||
109
+ s.step === 'BUILD_RUN_STARTED' ||
110
+ s.step === 'PUBLIC_FILES' ||
111
+ s.step === 'TASK_STORE_GET' ||
112
+ s.step === 'TASK_STORE_PUT') {
113
+ return;
114
+ }
115
+ if (s.step === 'TEST_ENDED') {
116
+ atLeastOneTest = true;
117
+ return;
118
+ }
119
+ if (s.step === 'PLAN_PREPARED') {
120
+ visualizer?.addTasks(s.taskNames);
121
+ return;
122
+ }
123
+ if (s.step === 'TASK_ENDED') {
124
+ if (visualizer) {
125
+ const line = visualizer.ended(s.taskName, s.verdict, s.executionType);
126
+ if (line) {
127
+ logger.print(line);
128
+ }
129
+ }
130
+ return;
131
+ }
132
+ if (s.step === 'BUILD_RUN_ENDED') {
133
+ // If there are no tests, don't print the message asbout the location of the all-test-logs file.
134
+ // If there is no summary message, do not print it.
135
+ // If one of them is printed, add a prefix of three blank lines
136
+ const line = visualizer?.summary(Date.now() - t0) ?? '';
137
+ const whereIsTheLogMessage = atLeastOneTest ? `All test logs were written to ${allTestsFile}\n\n` : ``;
138
+ if (whereIsTheLogMessage || line) {
139
+ // The logger does .trim() on the message so we use "." instead of a "pure" blank line
140
+ logger.print(`.\n.\n.\n${whereIsTheLogMessage}${line}`);
141
+ }
142
+ return;
143
+ }
144
+ (0, misc_1.shouldNeverHappen)(s);
145
+ });
86
146
  bootstrapper.subscribable.on('testEnded', arg => {
87
147
  (0, misc_1.assigningGet)(testOutput, arg.taskName, () => []).push(arg);
88
148
  });
89
149
  bootstrapper.subscribable.on('executionStarted', arg => {
90
- if (options.taskProgressOutput) {
91
- logger.print(visualizer.begin(arg));
150
+ if (visualizer) {
151
+ visualizer.begin(arg);
92
152
  }
93
153
  else {
94
154
  logger.print(`=============================== ${arg} =================================`);
95
155
  }
96
156
  });
97
157
  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
158
  // TODO(imaman): cover (output is indeed written in file structure)
106
159
  await fse.ensureDir(buildRaptorDirTasks);
107
160
  const fileName = path.join(buildRaptorDirTasks, (0, misc_1.toReasonableFileName)(arg.taskName));
@@ -116,19 +169,19 @@ async function run(options) {
116
169
  finally {
117
170
  stream.end();
118
171
  }
119
- reportTests(logger, testOutput.get(arg.taskName) ?? [], options.testReporting ?? 'tree');
120
- const doPrint = options.printPassing ||
172
+ reportTests(logger, testOutput.get(arg.taskName) ?? [], options.testReporting ?? 'tree-all', allTestsFile);
173
+ const dumpTaskOutputToTerminal = options.printPassing ||
121
174
  (0, misc_1.switchOn)(arg.status, {
122
175
  CRASH: () => false,
123
176
  OK: () => false,
124
177
  FAIL: () => true,
125
178
  });
126
- if (!doPrint) {
127
- return;
179
+ if (dumpTaskOutputToTerminal) {
180
+ await (0, misc_1.dumpFile)(arg.outputFile, process.stdout);
181
+ logger.print(`\n\n`);
128
182
  }
129
- await (0, misc_1.dumpFile)(arg.outputFile, process.stdout);
183
+ fs_1.default.appendFileSync(allTestsFile, fs_1.default.readFileSync(arg.outputFile) + '\n');
130
184
  logger.info(`output of ${arg.taskName} dumped`);
131
- logger.print(`\n\n`);
132
185
  });
133
186
  bootstrapper.subscribable.on('executionSkipped', tn => {
134
187
  logger.print(`Task ${tn} succeeded earlier. Skipping.\n`, 'low');
@@ -158,17 +211,13 @@ async function run(options) {
158
211
  // eslint-disable-next-line require-atomic-updates
159
212
  process.exitCode = exitCode;
160
213
  }
161
- 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;
214
+ function reportTests(logger, arr, tr, allTasksFile) {
215
+ let renderPassingTests;
216
+ if (tr === 'tree-all') {
217
+ renderPassingTests = true;
169
218
  }
170
219
  else if (tr === 'tree-just-failing') {
171
- printPassing = false;
220
+ renderPassingTests = false;
172
221
  }
173
222
  else {
174
223
  (0, misc_1.shouldNeverHappen)(tr);
@@ -209,19 +258,25 @@ function reportTests(logger, arr, tr) {
209
258
  TEST_TIMEDOUT: () => '⏲️ [timedout]',
210
259
  });
211
260
  const duration = at.durationMillis === undefined ? '' : ` (${at.durationMillis} ms)`;
212
- logger.print(`${spaces}${v} ${at.testPath.at(-1)}${duration}`, 'high');
261
+ const message = `${spaces}${v} ${at.testPath.at(-1)}${duration}`;
262
+ // TODO(imaman): create a dedicate logger that write to the allTasksFile
263
+ logger.print(message, 'high');
264
+ fs_1.default.appendFileSync(allTasksFile, message + '\n');
213
265
  prev = k;
214
266
  }
215
267
  }
216
268
  const list = Object.entries((0, misc_1.groupBy)(arr, at => at.fileName)).map(([fileName, tests]) => ({ fileName, tests }));
217
269
  const sorted = (0, misc_1.sortBy)(list, at => at.fileName);
218
270
  const passing = sorted.filter(at => isPassing(at.tests));
219
- if (printPassing) {
220
- for (const at of passing) {
221
- logger.print(`✅ PASSED ${at.fileName}`, 'high');
271
+ for (const at of passing) {
272
+ const message = `✅ PASSED ${at.fileName}`;
273
+ fs_1.default.appendFileSync(allTasksFile, message + '\n');
274
+ if (renderPassingTests) {
275
+ logger.print(message, 'high');
222
276
  }
223
277
  }
224
278
  for (const at of sorted.filter(at => !isPassing(at.tests))) {
279
+ fs_1.default.appendFileSync(allTasksFile, at.fileName + '\n');
225
280
  logger.print(at.fileName, 'high');
226
281
  printTests(at.tests);
227
282
  }
@@ -253,7 +308,7 @@ function main() {
253
308
  default: [],
254
309
  })
255
310
  .option('print-passing', {
256
- describe: 'whether to print the output of passing tasks to the terminal.',
311
+ describe: 'whether to dump the output of passing tasks to the terminal.',
257
312
  type: 'boolean',
258
313
  default: false,
259
314
  })
@@ -263,6 +318,7 @@ function main() {
263
318
  demandOption: false,
264
319
  default: 8,
265
320
  })
321
+ // TODO(imaman): seems like --compact, --loudness can be replaced by --task-progress-output
266
322
  .options('compact', {
267
323
  describe: 'whether to list only executing tasks (i.e., do not print skipped tasks)',
268
324
  type: 'boolean',
@@ -286,9 +342,9 @@ function main() {
286
342
  demandOption: false,
287
343
  })
288
344
  .option('test-reporting', {
289
- choices: ['just-failing', 'tree', 'tree-just-failing'],
345
+ choices: ['tree-all', 'tree-just-failing'],
290
346
  describe: 'test reporing policy',
291
- default: 'tree',
347
+ default: 'tree-just-failing',
292
348
  })
293
349
  .option('test-caching', {
294
350
  describe: 'whether to skip running tests that have already passed',
@@ -296,7 +352,7 @@ function main() {
296
352
  default: true,
297
353
  })
298
354
  .option('task-progress-output', {
299
- describe: 'whether to print number of tasks ended/started',
355
+ describe: 'whether to print a line indicating verdict/execution-type for each task',
300
356
  type: 'boolean',
301
357
  default: false,
302
358
  })
@@ -327,7 +383,7 @@ function main() {
327
383
  compact: argv.compact,
328
384
  criticality: stringToLoudness(argv.loudness),
329
385
  testCaching: argv.testCaching,
330
- testReporting: tr === 'just-failing' || tr === 'tree' || tr === 'tree-just-failing' || tr === undefined
386
+ testReporting: tr === 'tree-all' || tr === 'tree-just-failing' || tr === undefined
331
387
  ? tr
332
388
  : (0, misc_1.failMe)(`unsupported value: ${tr}`),
333
389
  stepByStepProcessor: argv.stepByStepProcessor,
@@ -363,7 +419,7 @@ function main() {
363
419
  compact: argv.compact,
364
420
  criticality: stringToLoudness(argv.loudness),
365
421
  testCaching: argv.testCaching,
366
- testReporting: tr === 'just-failing' || tr === 'tree' || tr === 'tree-just-failing' || tr === undefined
422
+ testReporting: tr === 'tree-all' || tr === 'tree-just-failing' || tr === undefined
367
423
  ? tr
368
424
  : (0, misc_1.failMe)(`unsupported value: ${tr}`),
369
425
  stepByStepProcessor: argv.stepByStepProcessor,
@@ -396,7 +452,6 @@ function main() {
396
452
  .demandCommand(1)
397
453
  .parse());
398
454
  }
399
- exports.main = main;
400
455
  function stringToLoudness(s) {
401
456
  if (s === 's') {
402
457
  return 'high';
@@ -409,4 +464,4 @@ function stringToLoudness(s) {
409
464
  }
410
465
  throw new Error(`illegal loudness value: "${s}"`);
411
466
  }
412
- //# 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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"}
467
+ //# 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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"}
package/dist/src/main.js CHANGED
@@ -2,7 +2,11 @@
2
2
  "use strict";
3
3
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
4
4
  if (k2 === undefined) k2 = k;
5
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ var desc = Object.getOwnPropertyDescriptor(m, k);
6
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
7
+ desc = { enumerable: true, get: function() { return m[k]; } };
8
+ }
9
+ Object.defineProperty(o, k2, desc);
6
10
  }) : (function(o, m, k, k2) {
7
11
  if (k2 === undefined) k2 = k;
8
12
  o[k2] = m[k];
@@ -16,4 +20,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
16
20
  __exportStar(require("./index"), exports);
17
21
  const build_raptor_cli_1 = require("./build-raptor-cli");
18
22
  (0, build_raptor_cli_1.main)();
19
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYWluLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7QUFFQSw0RUFBNEU7QUFDNUUsdUVBQXVFO0FBQ3ZFLDBDQUF1QjtBQUV2Qix5REFBeUM7QUFFekMsSUFBQSx1QkFBSSxHQUFFLENBQUEifQ==
23
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYWluLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRUEsNEVBQTRFO0FBQzVFLHVFQUF1RTtBQUN2RSwwQ0FBdUI7QUFFdkIseURBQXlDO0FBRXpDLElBQUEsdUJBQUksR0FBRSxDQUFBIn0=
@@ -5,14 +5,14 @@ export declare const RegisterAssetRequest: z.ZodObject<{
5
5
  prNumber: z.ZodOptional<z.ZodNumber>;
6
6
  casReference: z.ZodString;
7
7
  }, "strip", z.ZodTypeAny, {
8
- packageName: string;
9
8
  commitHash: string;
9
+ packageName: string;
10
10
  casReference: string;
11
11
  prNumber?: number | undefined;
12
12
  }, {
13
- packageName: string;
14
13
  commitHash: string;
14
+ packageName: string;
15
15
  casReference: string;
16
16
  prNumber?: number | undefined;
17
17
  }>;
18
- export declare type RegisterAssetRequest = z.infer<typeof RegisterAssetRequest>;
18
+ export type RegisterAssetRequest = z.infer<typeof RegisterAssetRequest>;
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFzay1leGVjdXRpb24tdmlzdWFsaXplci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YXNrLWV4ZWN1dGlvbi12aXN1YWxpemVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLCtCQUErQjtBQUUvQixNQUFhLHVCQUF1QjtJQUFwQztRQUNVLGVBQVUsR0FBRyxDQUFDLENBQUE7UUFDZCxhQUFRLEdBQUcsQ0FBQyxDQUFBO1FBQ1osZUFBVSxHQUFHLENBQUMsQ0FBQTtRQUNkLGNBQVMsR0FBRyxDQUFDLENBQUE7UUFDYixpQkFBWSxHQUFHLENBQUMsQ0FBQTtRQUNoQixpQkFBWSxHQUFHLENBQUMsQ0FBQTtRQUNoQixjQUFTLEdBQUcsQ0FBQyxDQUFBO1FBQ2IsUUFBRyxHQUFHLENBQUMsQ0FBQTtJQW9GakIsQ0FBQztJQWxGQyxRQUFRLENBQUMsS0FBZTtRQUN0QixJQUFJLENBQUMsR0FBRyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUE7SUFDMUIsQ0FBQztJQUVPLE9BQU8sQ0FBQyxRQUFnQixFQUFFLElBQWE7UUFDN0MsSUFBSSxJQUFJLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDdkIsT0FBTyxJQUFJLElBQUksQ0FBQyxRQUFRLElBQUksSUFBSSxDQUFDLFVBQVUsU0FBUyxRQUFRLEVBQUUsQ0FBQTtRQUNoRSxDQUFDO1FBRUQsT0FBTyxJQUFJLElBQUksQ0FBQyxRQUFRLElBQUksSUFBSSxDQUFDLFVBQVUsU0FBUyxRQUFRLEVBQUUsQ0FBQTtJQUNoRSxDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQWdCO1FBQ3BCLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQTtRQUNqQixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDL0IsQ0FBQztJQUVELEtBQUssQ0FDSCxRQUFnQixFQUNoQixPQUE0QyxFQUM1QyxhQUFpRTtRQUVqRSxJQUFJLGFBQWEsS0FBSyxjQUFjLElBQUksYUFBYSxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQ3BFLHdGQUF3RjtZQUN4RiwrR0FBK0c7WUFDL0csd0dBQXdHO1lBQ3hHLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQTtZQUNqQixPQUFPLFNBQVMsQ0FBQTtRQUNsQixDQUFDO1FBRUQsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFBO1FBQ2YsTUFBTSxjQUFjLEdBQUcsSUFBQSxlQUFRLEVBQUMsYUFBYSxFQUFFO1lBQzdDLE1BQU0sRUFBRSxHQUFHLEVBQUU7Z0JBQ1gsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFBO2dCQUNoQixPQUFPLE1BQU0sQ0FBQTtZQUNmLENBQUM7WUFDRCxRQUFRLEVBQUUsR0FBRyxFQUFFO2dCQUNiLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQTtnQkFDbkIsT0FBTyxLQUFLLENBQUE7WUFDZCxDQUFDO1NBQ0YsQ0FBQyxDQUFBO1FBRUYsTUFBTSxnQkFBZ0IsR0FBRyxJQUFBLGVBQVEsRUFBQyxPQUFPLEVBQUU7WUFDekMsS0FBSyxFQUFFLEdBQUcsRUFBRTtnQkFDVixFQUFFLElBQUksQ0FBQyxTQUFTLENBQUE7Z0JBQ2hCLE9BQU8sR0FBRyxDQUFBO1lBQ1osQ0FBQztZQUNELElBQUksRUFBRSxHQUFHLEVBQUU7Z0JBQ1QsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFBO2dCQUNoQixPQUFPLEdBQUcsQ0FBQTtZQUNaLENBQUM7WUFDRCxFQUFFLEVBQUUsR0FBRyxFQUFFO2dCQUNQLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQTtnQkFDbkIsT0FBTyxHQUFHLENBQUE7WUFDWixDQUFDO1lBQ0QsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDLEVBQUU7U0FDbEIsQ0FBQyxDQUFBO1FBRUYsTUFBTSxJQUFJLEdBQUcsSUFBSSxJQUFJLENBQUMsR0FBRyxJQUFJLElBQUksQ0FBQyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUE7UUFDL0MsTUFBTSxRQUFRLEdBQUcsSUFBSSxJQUFJLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxHQUFHLEdBQUcsQ0FBQTtRQUNqRCxPQUFPLEdBQUcsUUFBUSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLElBQUksZ0JBQWdCLElBQUksY0FBYyxJQUFJLFFBQVEsRUFBRSxDQUFBO0lBQzVGLENBQUM7SUFFRCxPQUFPLENBQUMsZ0JBQXdCO1FBQzlCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQTtRQUNoRCxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU0sQ0FBQTtRQUV4QyxPQUFPO1lBQ0wsa0JBQWtCLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLO1lBQzNELHNCQUFzQixJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsSUFBSSxJQUFJLENBQUMsR0FBRyxFQUFFO1lBQ2hGLElBQUksQ0FBQyxTQUFTLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxzQkFBc0IsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTO1lBQzlHLElBQUksQ0FBQyxVQUFVLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxzQkFBc0IsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTO1lBQ2hILEVBQUU7WUFDRixzQkFBc0IsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksS0FBSyxFQUFFO1lBQzdFLHlCQUF5QixJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLEtBQUssQ0FDOUUsQ0FBQyxHQUFHLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQztnQkFDdEIsS0FBSyxDQUNOLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFJO1NBQ2pCO2FBQ0UsTUFBTSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxLQUFLLFNBQVMsQ0FBQzthQUM5QixJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDZixDQUFDO0NBQ0Y7QUE1RkQsMERBNEZDIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "build-raptor",
3
- "version": "0.117.0",
3
+ "version": "0.119.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.119.0",
22
22
  "escape-string-regexp": "^4.0.0",
23
23
  "execa": "^5.0.0",
24
24
  "fs-extra": "^9.0.0",