@overkill-dev/run 0.0.41 → 0.0.42

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 (59) hide show
  1. package/engine/test-body-resource-attachment.d.ts +36 -0
  2. package/engine/test-body-resource-attachment.d.ts.map +1 -0
  3. package/engine/test-body-resource-attachment.js +81 -5
  4. package/engine/test-body-resource-attachment.js.map +1 -1
  5. package/engine/test-plan.d.ts +2 -0
  6. package/engine/test-plan.d.ts.map +1 -1
  7. package/engine/test-plan.js +9 -0
  8. package/engine/test-plan.js.map +1 -1
  9. package/package.json +1 -1
  10. package/packages/engine/engine.entry-point.js +1 -1
  11. package/packages/engine/engine.entry-point.js.map +1 -1
  12. package/packages/run/run.entry-point.d.ts +1 -1
  13. package/packages/run/run.entry-point.d.ts.map +1 -1
  14. package/readme.md +13 -7
  15. package/run/collected-run-plan.js +1 -0
  16. package/run/collected-run-plan.js.map +1 -1
  17. package/run/run-collected-resolution.js +18 -2
  18. package/run/run-collected-resolution.js.map +1 -1
  19. package/run/run-config-schema.d.ts +75 -0
  20. package/run/run-config-schema.d.ts.map +1 -1
  21. package/run/run-config-schema.js +26 -0
  22. package/run/run-config-schema.js.map +1 -1
  23. package/run/run-config.d.ts.map +1 -1
  24. package/run/run-config.js +15 -2
  25. package/run/run-config.js.map +1 -1
  26. package/run/run-facts.js +2 -0
  27. package/run/run-facts.js.map +1 -1
  28. package/run/run-if-main-facts.js +1 -0
  29. package/run/run-if-main-facts.js.map +1 -1
  30. package/run/run-local-resolution.js +3 -2
  31. package/run/run-local-resolution.js.map +1 -1
  32. package/run/run-orchestrator-dependencies.d.ts +1 -0
  33. package/run/run-orchestrator-dependencies.d.ts.map +1 -1
  34. package/run/run-orchestrator.d.ts +1 -2
  35. package/run/run-orchestrator.d.ts.map +1 -1
  36. package/run/run-orchestrator.js +2 -0
  37. package/run/run-orchestrator.js.map +1 -1
  38. package/run/run-selection.js +17 -10
  39. package/run/run-selection.js.map +1 -1
  40. package/run/run-support.js +20 -0
  41. package/run/run-support.js.map +1 -1
  42. package/run/run-types.d.ts +96 -0
  43. package/run/run-types.d.ts.map +1 -1
  44. package/run/run-types.js.map +1 -1
  45. package/run/work-distribution-config.js +81 -0
  46. package/run/work-distribution-config.js.map +1 -0
  47. package/run/work-unit-planning.js +212 -0
  48. package/run/work-unit-planning.js.map +1 -0
  49. package/run/worker-pool-execution.js +46 -26
  50. package/run/worker-pool-execution.js.map +1 -1
  51. package/run/worker-pool-run.js +3 -3
  52. package/run/worker-pool-run.js.map +1 -1
  53. package/run/worker-pool-runtime.js +9 -27
  54. package/run/worker-pool-runtime.js.map +1 -1
  55. package/run/worker-pool-worker-plan.js +5 -0
  56. package/run/worker-pool-worker-plan.js.map +1 -1
  57. package/run/worker-pool-worker.js +3 -3
  58. package/run/worker-pool-worker.js.map +1 -1
  59. package/sbom.cdx.json +4 -4
@@ -1,11 +1,8 @@
1
- import os from 'node:os';
2
- import { createCaseId } from "../engine/identity.js";
3
1
  import { createReporterDelivery, createReporterEventQueue } from "./supervised-run-runtime.js";
4
2
  import { createStoredRunValue } from "./supervised-run-state.js";
5
3
  import { loadTinypoolConstructor } from "./tinypool-node-compatibility.js";
6
4
  import { runTask as workerPoolWorkerEntryPoint } from "./worker-pool-worker.js";
7
5
  const Tinypool = loadTinypoolConstructor();
8
- const maximumWorkerCount = 8;
9
6
  function workerPoolEntryPointHref(entryPoint) {
10
7
  const entryPointWorkerName = entryPoint.worker.name;
11
8
  const workerPoolEntryPointUrl = new URL('./worker-pool-worker.ts', import.meta.url);
@@ -19,12 +16,6 @@ export function runStartTimeFromMilliseconds(milliseconds) {
19
16
  const startedAt = new Date(milliseconds);
20
17
  return startedAt.toISOString();
21
18
  }
22
- function defaultWorkerCount(unitCount) {
23
- if (unitCount === 0) {
24
- return 0;
25
- }
26
- return Math.min(Math.max(os.availableParallelism() - 1, 1), maximumWorkerCount, unitCount);
27
- }
28
19
  function isolateWorkers(options) {
29
20
  return options.workerLifecycle === 'fresh-worker-per-unit';
30
21
  }
@@ -50,21 +41,6 @@ export function workerPoolCollectedPlan(resolvedRun) {
50
41
  }
51
42
  return resolvedRun.plan.collectedPlan;
52
43
  }
53
- function collectFileCaseIds(file) {
54
- return file.cases.map(function toCaseId(testCase) {
55
- return createCaseId(file.file, testCase.suitePath.map(function toSuiteTitle(entry) {
56
- return entry.title;
57
- }), testCase.title, testCase.params);
58
- });
59
- }
60
- export function fileUnits(collectedPlan) {
61
- return collectedPlan.files.map(function toFileUnit(file) {
62
- return {
63
- assignedCases: collectFileCaseIds(file),
64
- file: file.file
65
- };
66
- });
67
- }
68
44
  function createPoolResourceUsageTracker(resolvedRun, dependencies) {
69
45
  if (!resolvedRun.facts.execution.resourceUsagePolicy.measure) {
70
46
  return null;
@@ -79,9 +55,15 @@ function workerPoolExecutionFacts(resolvedRun) {
79
55
  }
80
56
  return resolvedRun.facts.execution;
81
57
  }
58
+ export function workerPoolPlacementPlan(resolvedRun) {
59
+ const { placementPlan } = workerPoolExecutionFacts(resolvedRun);
60
+ if (placementPlan === null) {
61
+ throw new Error('Worker-pool execution requires a placement plan.');
62
+ }
63
+ return placementPlan;
64
+ }
82
65
  export async function createWorkerPoolRuntime(resolvedRun, dependencies, collectionRunnerErrors, runState) {
83
- const units = fileUnits(workerPoolCollectedPlan(resolvedRun));
84
- const workerCount = defaultWorkerCount(units.length);
66
+ const placementPlan = workerPoolPlacementPlan(resolvedRun);
85
67
  const execution = workerPoolExecutionFacts(resolvedRun);
86
68
  const taskResults = [];
87
69
  return {
@@ -90,7 +72,7 @@ export async function createWorkerPoolRuntime(resolvedRun, dependencies, collect
90
72
  collectionRunnerErrors,
91
73
  dependencies,
92
74
  pool: dependencies.createWorkerPool({
93
- workerCount,
75
+ workerCount: placementPlan.lanes.length,
94
76
  workerLifecycle: execution.workerLifecycle
95
77
  }),
96
78
  poolResourceUsageTracker: createPoolResourceUsageTracker(resolvedRun, dependencies),
@@ -1 +1 @@
1
- {"version":3,"file":"worker-pool-runtime.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-runtime.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"worker-pool-runtime.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-runtime.ts"],"names":[],"mappings":"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"}
@@ -42,6 +42,11 @@ export function selectedAssignedCases(testPlan, assignedCases) {
42
42
  cases: [firstCase, ...cases.slice(1)]
43
43
  };
44
44
  }
45
+ export function selectedAssignedWork(testPlan, assignedWork) {
46
+ return selectedAssignedCases(testPlan, assignedWork.map(function toCaseId(work) {
47
+ return work.case;
48
+ }));
49
+ }
45
50
  export function createEmptyAssignmentResult(testPlan, wallClock, startedAtMilliseconds) {
46
51
  return {
47
52
  result: createRunResultFromCollectedPlan(collectedRunPlanFromTestPlan(testPlan), [], [], {
@@ -1 +1 @@
1
- {"version":3,"file":"worker-pool-worker-plan.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-worker-plan.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAC;AAGrE,OAAO,EACH,4BAA4B,EAC5B,gCAAgC,EACnC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACH,mBAAmB,EACnB,kBAAkB,EAClB,YAAY,EACf,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAYvD,KAAK,UAAU,cAAc,CAAC,OAA0B;IACpD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;AAC3G,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,OAA0B;IAC9D,OAAO,MAAM,iBAAiB,CAAC;QAC3B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;QAC/C,MAAM,EAAE,MAAM,cAAc,CAAC,OAAO,CAAC;QACrC,kBAAkB;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,UAAU,EAAE,OAAO,CAAC,UAAU;KACjC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAA0B;IAC5D,OAAO;QACH,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,MAAM,wBAAwB,CAAC,OAAO,CAAC;KACpD,CAAC;AACN,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,aAA0C;IACxE,OAAO;QACH,aAAa,EAAE,4BAA4B,CAAC,aAAa,CAAC,QAAQ,CAAC;QACnE,YAAY,EAAE,aAAa,CAAC,YAAY;KAC3C,CAAC;AACN,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,QAAkB,EAAE,aAAgC;IACtF,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,YAAY,CAAC,QAAQ;QAC9D,OAAO,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAE3B,IAAI,SAAS,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACrF,CAAC;IAED,OAAO;QACH,GAAG,QAAQ;QACX,KAAK,EAAE,CAAE,SAAS,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE;KAC1C,CAAC;AACN,CAAC;AAED,MAAM,UAAU,2BAA2B,CACvC,QAAkB,EAClB,SAA6C,EAC7C,qBAA6B;IAE7B,OAAO;QACH,MAAM,EAAE,gCAAgC,CACpC,4BAA4B,CAAC,QAAQ,CAAC,EACtC,EAAE,EACF,EAAE,EACF;YACI,aAAa,EAAE,IAAI;YACnB,WAAW,EAAE,qBAAqB;YAClC,SAAS;SACZ,CACJ;KACJ,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"worker-pool-worker-plan.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-worker-plan.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAC;AAGrE,OAAO,EACH,4BAA4B,EAC5B,gCAAgC,EACnC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACH,mBAAmB,EACnB,kBAAkB,EAClB,YAAY,EACf,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAgBvD,KAAK,UAAU,cAAc,CAAC,OAA0B;IACpD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;AAC3G,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,OAA0B;IAC9D,OAAO,MAAM,iBAAiB,CAAC;QAC3B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;QAC/C,MAAM,EAAE,MAAM,cAAc,CAAC,OAAO,CAAC;QACrC,kBAAkB;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,UAAU,EAAE,OAAO,CAAC,UAAU;KACjC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAA0B;IAC5D,OAAO;QACH,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,MAAM,wBAAwB,CAAC,OAAO,CAAC;KACpD,CAAC;AACN,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,aAA0C;IACxE,OAAO;QACH,aAAa,EAAE,4BAA4B,CAAC,aAAa,CAAC,QAAQ,CAAC;QACnE,YAAY,EAAE,aAAa,CAAC,YAAY;KAC3C,CAAC;AACN,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,QAAkB,EAAE,aAAgC;IACtF,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,YAAY,CAAC,QAAQ;QAC9D,OAAO,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAE3B,IAAI,SAAS,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACrF,CAAC;IAED,OAAO;QACH,GAAG,QAAQ;QACX,KAAK,EAAE,CAAE,SAAS,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE;KAC1C,CAAC;AACN,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAkB,EAAE,YAA0B;IAC/E,OAAO,qBAAqB,CACxB,QAAQ,EACR,YAAY,CAAC,GAAG,CAAC,SAAS,QAAQ,CAAC,IAAI;QACnC,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,MAAM,UAAU,2BAA2B,CACvC,QAAkB,EAClB,SAA6C,EAC7C,qBAA6B;IAE7B,OAAO;QACH,MAAM,EAAE,gCAAgC,CACpC,4BAA4B,CAAC,QAAQ,CAAC,EACtC,EAAE,EACF,EAAE,EACF;YACI,aAAa,EAAE,IAAI;YACnB,WAAW,EAAE,qBAAqB;YAClC,SAAS;SACZ,CACJ;KACJ,CAAC;AACN,CAAC"}
@@ -4,7 +4,7 @@ import { createReporterDispatcher } from "../engine/reporter-dispatcher.js";
4
4
  import { createPlainOutputRenderer } from "../packages/engine/engine.entry-point.js";
5
5
  import { createNodeResourceUsageTracker } from "./resource-usage.js";
6
6
  import { captureOutput, createWorkerPoolReporter, silentOutputSinks, suppressOutput } from "./worker-pool-output.js";
7
- import { collectTestPlan, createEmptyAssignmentResult, selectedAssignedCases, sendCollectedPlan } from "./worker-pool-worker-plan.js";
7
+ import { collectTestPlan, createEmptyAssignmentResult, selectedAssignedWork, sendCollectedPlan } from "./worker-pool-worker-plan.js";
8
8
  function executionMode(command) {
9
9
  return command.scheduling === 'concurrent' ? 'concurrent-in-process' : 'serial-in-process';
10
10
  }
@@ -39,7 +39,7 @@ async function collectAssignmentTestPlan(task) {
39
39
  }
40
40
  async function runAssignment(task, wallClock) {
41
41
  const collectedPlan = await collectAssignmentTestPlan(task);
42
- if (task.assignedCases.length === 0) {
42
+ if (task.assignedWork.length === 0) {
43
43
  return createEmptyAssignmentResult(collectedPlan.testPlan, wallClock, task.startedAtMilliseconds);
44
44
  }
45
45
  const outputCapture = captureOutput(task, wallClock);
@@ -53,7 +53,7 @@ async function runAssignment(task, wallClock) {
53
53
  wallClock
54
54
  });
55
55
  try {
56
- const result = await execute(selectedAssignedCases(collectedPlan.testPlan, task.assignedCases), {
56
+ const result = await execute(selectedAssignedWork(collectedPlan.testPlan, task.assignedWork), {
57
57
  execution: { mode: executionMode(task.command) },
58
58
  outputRenderer: createPlainOutputRenderer(),
59
59
  reporters: [createWorkerPoolReporter(task)],
@@ -1 +1 @@
1
- {"version":3,"file":"worker-pool-worker.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-worker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"worker-pool-worker.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-worker.ts"],"names":[],"mappings":"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"}
package/sbom.cdx.json CHANGED
@@ -16,9 +16,9 @@
16
16
  "component": {
17
17
  "type": "library",
18
18
  "name": "@overkill-dev/run",
19
- "version": "0.0.41",
20
- "bom-ref": "pkg:npm/@overkill-dev/run@0.0.41",
21
- "purl": "pkg:npm/@overkill-dev/run@0.0.41"
19
+ "version": "0.0.42",
20
+ "bom-ref": "pkg:npm/@overkill-dev/run@0.0.42",
21
+ "purl": "pkg:npm/@overkill-dev/run@0.0.42"
22
22
  }
23
23
  },
24
24
  "components": [
@@ -158,7 +158,7 @@
158
158
  "ref": "pkg:npm/@enormora/wall-clock@0.0.3"
159
159
  },
160
160
  {
161
- "ref": "pkg:npm/@overkill-dev/run@0.0.41",
161
+ "ref": "pkg:npm/@overkill-dev/run@0.0.42",
162
162
  "dependsOn": [
163
163
  "pkg:npm/@enormora/wall-clock@0.0.3",
164
164
  "pkg:npm/@schema-hub/zod-error-formatter@0.0.16",