@d-es-ign/stryker-js-core 9.6.2 → 9.6.3

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/dist/src/fs/project-reader.d.ts +1 -0
  2. package/dist/src/fs/project-reader.d.ts.map +1 -1
  3. package/dist/src/fs/project-reader.js +21 -2
  4. package/dist/src/fs/project-reader.js.map +1 -1
  5. package/dist/src/logging/provide-logging.d.ts +3 -3
  6. package/package.json +5 -5
  7. package/src/fs/project-reader.ts +32 -1
package/dist/src/fs/project-reader.d.ts CHANGED
@@ -47,5 +47,6 @@ export declare class ProjectReader {
47
47
  private filterMutatePattern;
48
48
  private resolveInputFileNames;
49
49
  private readIncrementalReport;
50
+ private rebaseIncrementalReport;
50
51
  }
51
52
  //# sourceMappingURL=project-reader.d.ts.map
package/dist/src/fs/project-reader.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"project-reader.d.ts","sourceRoot":"","sources":["../../../src/fs/project-reader.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EAKf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D,OAAO,EAEL,CAAC,EAGF,MAAM,2BAA2B,CAAC;AAQnC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAY9C,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAC5C;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,QACa,CAAC;AAE/C,qBAAa,aAAa;IActB,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdtB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IACrD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IAEzC,OAAc,MAAM,8BAIlB;gBAEiB,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,EACjB,GAAG,EAAE,MAAM,EAC5B,EACE,MAAM,EACN,WAAW,EACX,cAAc,EACd,WAAW,EACX,eAAe,EACf,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,SAAS,GACV,EAAE,cAAc;IAiBN,IAAI,CACf,oBAAoB,EAAE,MAAM,EAAE,GAAG,SAAS,GACzC,OAAO,CAAC,OAAO,CAAC;IAuBnB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAqBxB;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IA+E/B,OAAO,CAAC,qBAAqB;IAgB7B,OAAO,CAAC,yBAAyB;IA4CjC;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;YAwCb,qBAAqB;YA6ErB,qBAAqB;CAwDpC"}
1
+ {"version":3,"file":"project-reader.d.ts","sourceRoot":"","sources":["../../../src/fs/project-reader.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EAKf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D,OAAO,EAEL,CAAC,EAIF,MAAM,2BAA2B,CAAC;AAQnC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAY9C,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAC5C;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,QACa,CAAC;AAE/C,qBAAa,aAAa;IActB,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdtB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IACrD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IAEzC,OAAc,MAAM,8BAIlB;gBAEiB,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,EACjB,GAAG,EAAE,MAAM,EAC5B,EACE,MAAM,EACN,WAAW,EACX,cAAc,EACd,WAAW,EACX,eAAe,EACf,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,SAAS,GACV,EAAE,cAAc;IAiBN,IAAI,CACf,oBAAoB,EAAE,MAAM,EAAE,GAAG,SAAS,GACzC,OAAO,CAAC,OAAO,CAAC;IAuBnB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAqBxB;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IA+E/B,OAAO,CAAC,qBAAqB;IAgB7B,OAAO,CAAC,yBAAyB;IA4CjC;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;YAwCb,qBAAqB;YA6ErB,qBAAqB;IAyDnC,OAAO,CAAC,uBAAuB;CA6BhC"}
package/dist/src/fs/project-reader.js CHANGED
@@ -2,7 +2,7 @@ import path from 'path';
2
2
  import { isDeepStrictEqual } from 'util';
3
3
  import { Minimatch } from 'minimatch';
4
4
  import { commonTokens, tokens } from '@d-es-ign/stryker-js-api/plugin';
5
- import { ERROR_CODES, isErrnoException, notEmpty, } from '@d-es-ign/stryker-js-util';
5
+ import { ERROR_CODES, isErrnoException, normalizeFileName, notEmpty, } from '@d-es-ign/stryker-js-util';
6
6
  import { defaultOptions, FileMatcher } from '../config/index.js';
7
7
  import { coreTokens } from '../di/index.js';
8
8
  import { Project } from './project.js';
@@ -275,7 +275,7 @@ export class ProjectReader {
275
275
  try {
276
276
  // TODO: Validate against the schema or stryker version?
277
277
  const contents = await this.fs.readFile(this.incrementalFile, 'utf-8');
278
- const result = JSON.parse(contents);
278
+ const result = this.rebaseIncrementalReport(JSON.parse(contents));
279
279
  return {
280
280
  ...result,
281
281
  files: Object.fromEntries(Object.entries(result.files).map(([fileName, file]) => [
@@ -312,6 +312,25 @@ export class ProjectReader {
312
312
  throw err;
313
313
  }
314
314
  }
315
+ rebaseIncrementalReport(report) {
316
+ const reportProjectRoot = report.projectRoot;
317
+ if (!reportProjectRoot || reportProjectRoot === process.cwd()) {
318
+ return report;
319
+ }
320
+ const toCurrentWorkingDir = (fileName) => normalizeFileName(path.relative(process.cwd(), path.resolve(reportProjectRoot, fileName)));
321
+ return {
322
+ ...report,
323
+ files: Object.fromEntries(Object.entries(report.files).map(([fileName, fileResult]) => [
324
+ toCurrentWorkingDir(fileName),
325
+ fileResult,
326
+ ])),
327
+ testFiles: report.testFiles &&
328
+ Object.fromEntries(Object.entries(report.testFiles).map(([fileName, testFile]) => [
329
+ toCurrentWorkingDir(fileName),
330
+ testFile,
331
+ ])),
332
+ };
333
+ }
315
334
  }
316
335
  function reportOpenEndLocationToStrykerLocation({ start, end, }) {
317
336
  return {
package/dist/src/fs/project-reader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"project-reader.js","sourceRoot":"","sources":["../../../src/fs/project-reader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"project-reader.js","sourceRoot":"","sources":["../../../src/fs/project-reader.ts"],"names":[],"mappings":"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"}
package/dist/src/logging/provide-logging.d.ts CHANGED
@@ -8,14 +8,14 @@ import { LoggingClient } from './logging-client.js';
8
8
  import { LogLevel } from '@d-es-ign/stryker-js-api/core';
9
9
  export declare function provideLogging<T extends {
10
10
  [coreTokens.loggingSink]: LoggingSink;
11
- }>(injector: Injector<T>): Injector<{ [K_1 in "getLogger" | "logger" | "loggingServer" | keyof T]: K_1 extends "loggingServer" ? LoggingServer : K_1 extends "getLogger" | "logger" | keyof T ? ({ [K_4 in "getLogger" | "logger" | keyof T]: K_4 extends "logger" ? Logger : K_4 extends "getLogger" | keyof T ? ({ [K_6 in "getLogger" | keyof T]: K_6 extends "getLogger" ? (categoryName?: string) => Logger : K_6 extends keyof T ? T[K_6] : never; } extends infer T_3 ? { [K_5 in keyof T_3]: T_3[K_5]; } : never)[K_4] : never; } extends infer T_2 ? { [K_3 in keyof T_2]: T_2[K_3]; } : never)[K_1] : never; } extends infer T_1 ? { [K in keyof T_1]: T_1[K]; } : never>;
11
+ }>(injector: Injector<T>): Injector<{ [K_1 in "getLogger" | "logger" | keyof T | "loggingServer"]: K_1 extends "loggingServer" ? LoggingServer : K_1 extends "getLogger" | "logger" | keyof T ? ({ [K_4 in "getLogger" | "logger" | keyof T]: K_4 extends "logger" ? Logger : K_4 extends "getLogger" | keyof T ? ({ [K_6 in "getLogger" | keyof T]: K_6 extends "getLogger" ? (categoryName?: string) => Logger : K_6 extends keyof T ? T[K_6] : never; } extends infer T_3 ? { [K_5 in keyof T_3]: T_3[K_5]; } : never)[K_4] : never; } extends infer T_2 ? { [K_3 in keyof T_2]: T_2[K_3]; } : never)[K_1] : never; } extends infer T_1 ? { [K in keyof T_1]: T_1[K]; } : never>;
12
12
  export declare namespace provideLogging {
13
13
  var inject: readonly ["loggingSink", "$injector"];
14
14
  }
15
15
  export declare function provideLoggingBackend(injector: Injector, loggerConsoleOut: NodeJS.WriteStream): Promise<Injector<{
16
+ loggerConsoleOut: NodeJS.WriteStream;
16
17
  loggingSink: LoggingBackend;
17
18
  loggingServerAddress: LoggingServerAddress;
18
- loggerConsoleOut: NodeJS.WriteStream;
19
19
  loggingServer: LoggingServer;
20
20
  }>>;
21
21
  export declare namespace provideLoggingBackend {
@@ -24,7 +24,7 @@ export declare namespace provideLoggingBackend {
24
24
  export type LoggingProvider = ReturnType<typeof provideLogging>;
25
25
  export declare function provideLoggingClient(injector: Injector, loggingServerAddress: LoggingServerAddress, activeLogLevel: LogLevel): Promise<Injector<{
26
26
  loggingSink: LoggingClient;
27
- loggingServerAddress: LoggingServerAddress;
28
27
  loggerActiveLevel: LogLevel;
28
+ loggingServerAddress: LoggingServerAddress;
29
29
  }>>;
30
30
  //# sourceMappingURL=provide-logging.d.ts.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@d-es-ign/stryker-js-core",
3
- "version": "9.6.2",
3
+ "version": "9.6.3",
4
4
  "description": "The extendable JavaScript mutation testing framework",
5
5
  "type": "module",
6
6
  "files": [
@@ -81,9 +81,9 @@
81
81
  "tslib": "2.8.1",
82
82
  "typed-inject": "~5.0.0",
83
83
  "typed-rest-client": "~2.2.0",
84
- "@d-es-ign/stryker-js-api": "9.6.2",
85
- "@d-es-ign/stryker-js-instrumenter": "9.6.2",
86
- "@d-es-ign/stryker-js-util": "9.6.2"
84
+ "@d-es-ign/stryker-js-util": "9.6.3",
85
+ "@d-es-ign/stryker-js-instrumenter": "9.6.3",
86
+ "@d-es-ign/stryker-js-api": "9.6.3"
87
87
  },
88
88
  "devDependencies": {
89
89
  "@types/diff-match-patch": "1.0.36",
@@ -93,7 +93,7 @@
93
93
  "@types/progress": "2.0.7",
94
94
  "@types/semver": "7.7.1",
95
95
  "glob": "13.0.6",
96
- "@d-es-ign/stryker-js-test-helpers": "9.6.2"
96
+ "@d-es-ign/stryker-js-test-helpers": "9.6.3"
97
97
  },
98
98
  "scripts": {
99
99
  "start": "tsc -w",
package/src/fs/project-reader.ts CHANGED
@@ -15,6 +15,7 @@ import {
15
15
  ERROR_CODES,
16
16
  I,
17
17
  isErrnoException,
18
+ normalizeFileName,
18
19
  notEmpty,
19
20
  } from '@d-es-ign/stryker-js-util';
20
21
  import type { MutationTestResult } from 'mutation-testing-report-schema/api';
@@ -418,7 +419,7 @@ export class ProjectReader {
418
419
  try {
419
420
  // TODO: Validate against the schema or stryker version?
420
421
  const contents = await this.fs.readFile(this.incrementalFile, 'utf-8');
421
- const result: MutationTestResult = JSON.parse(contents);
422
+ const result = this.rebaseIncrementalReport(JSON.parse(contents));
422
423
  return {
423
424
  ...result,
424
425
  files: Object.fromEntries(
@@ -465,6 +466,36 @@ export class ProjectReader {
465
466
  throw err;
466
467
  }
467
468
  }
469
+
470
+ private rebaseIncrementalReport(
471
+ report: MutationTestResult,
472
+ ): MutationTestResult {
473
+ const reportProjectRoot = report.projectRoot;
474
+ if (!reportProjectRoot || reportProjectRoot === process.cwd()) {
475
+ return report;
476
+ }
477
+ const toCurrentWorkingDir = (fileName: string): string =>
478
+ normalizeFileName(
479
+ path.relative(process.cwd(), path.resolve(reportProjectRoot, fileName)),
480
+ );
481
+ return {
482
+ ...report,
483
+ files: Object.fromEntries(
484
+ Object.entries(report.files).map(([fileName, fileResult]) => [
485
+ toCurrentWorkingDir(fileName),
486
+ fileResult,
487
+ ]),
488
+ ),
489
+ testFiles:
490
+ report.testFiles &&
491
+ Object.fromEntries(
492
+ Object.entries(report.testFiles).map(([fileName, testFile]) => [
493
+ toCurrentWorkingDir(fileName),
494
+ testFile,
495
+ ]),
496
+ ),
497
+ };
498
+ }
468
499
  }
469
500
 
470
501
  function reportOpenEndLocationToStrykerLocation({