@serenity-js/mocha 3.41.2 → 3.42.0

package/src/SerenityReporterForMocha.ts

@@ -1,5 +1,5 @@
 import type { Serenity } from '@serenity-js/core';
-import type { DomainEvent } from '@serenity-js/core/lib/events';
+import type { DomainEvent } from '@serenity-js/core/events';
 import {
     RetryableSceneDetected,
     SceneFinished,
@@ -12,8 +12,8 @@ import {
     TestRunStarts,
     TestSuiteFinished,
     TestSuiteStarts,
-} from '@serenity-js/core/lib/events';
-import { FileSystemLocation, Path, type RequirementsHierarchy } from '@serenity-js/core/lib/io';
+} from '@serenity-js/core/events';
+import { FileSystemLocation, Path, type RequirementsHierarchy } from '@serenity-js/core/io';
 import {
     ArbitraryTag,
     CorrelationId,
@@ -22,12 +22,12 @@ import {
     ExecutionSuccessful,
     Name,
     TestSuiteDetails
-} from '@serenity-js/core/lib/model';
+} from '@serenity-js/core/model';
 import type { MochaOptions, Runnable, Suite, Test } from 'mocha';
 import { reporters, Runner } from 'mocha';
 
-import { MochaOutcomeMapper, MochaTestMapper } from './mappers';
-import { OutcomeRecorder } from './OutcomeRecorder';
+import { MochaOutcomeMapper, MochaTestMapper } from './mappers/index.js';
+import { OutcomeRecorder } from './OutcomeRecorder.js';
 
 /**
  * @package

package/src/adapter/MochaAdapter.ts

@@ -2,13 +2,14 @@ import fs from 'node:fs';
 import path from 'node:path';
 
 import { LogicError } from '@serenity-js/core';
-import type { TestRunnerAdapter } from '@serenity-js/core/lib/adapter';
-import type { ModuleLoader } from '@serenity-js/core/lib/io';
-import type { Outcome } from '@serenity-js/core/lib/model';
-import { ExecutionIgnored, ImplementationPending } from '@serenity-js/core/lib/model';
+import type { TestRunnerAdapter } from '@serenity-js/core/adapter';
+import type { ModuleLoader } from '@serenity-js/core/io';
+import type { Outcome } from '@serenity-js/core/model';
+import { ExecutionIgnored, ImplementationPending } from '@serenity-js/core/model';
+import type Mocha from 'mocha';
 
-import type { MochaConfig } from './MochaConfig';
-import type Mocha = require('mocha');
+import reporter from '../index.js';
+import type { MochaConfig } from './MochaConfig.js';
 
 /**
  * Allows for programmatic execution of Mocha test scenarios,
@@ -49,7 +50,7 @@ export class MochaAdapter implements TestRunnerAdapter {
 
         this.mocha = new _Mocha({
             ...this.config,
-            reporter: require.resolve('../index'),
+            reporter: reporter,
         });
 
         this.mocha.fullTrace();
@@ -113,7 +114,7 @@ export class MochaAdapter implements TestRunnerAdapter {
                 ? path.resolve(fileOrModule)    // local file
                 : fileOrModule;                 // module
 
-            require(required);
+            this.loader.require(required);
         });
     }
 }

package/src/adapter/index.ts

@@ -1,2 +1,2 @@
-export * from './MochaAdapter';
-export * from './MochaConfig';
+export * from './MochaAdapter.js';
+export * from './MochaConfig.js';

package/src/index.ts

@@ -1,8 +1,8 @@
 import { serenity } from '@serenity-js/core';
-import { FileSystem, Path, RequirementsHierarchy } from '@serenity-js/core/lib/io';
+import { FileSystem, Path, RequirementsHierarchy } from '@serenity-js/core/io';
 import type { MochaOptions, Runner } from 'mocha';
 
-import { SerenityReporterForMocha } from './SerenityReporterForMocha';
+import { SerenityReporterForMocha } from './SerenityReporterForMocha.js';
 
 /**
  * Registers a Mocha reporter that emits [Serenity/JS domain events](https://serenity-js.org/api/core-events/class/DomainEvent/)
@@ -18,4 +18,11 @@ function bootstrap(runner: Runner, options?: MochaOptions): SerenityReporterForM
     return new SerenityReporterForMocha(serenity, requirementsHierarchy, runner, options);
 }
 
-export = bootstrap;
+export default bootstrap;
+
+// CommonJS compatibility - assign to module.exports for Mocha reporter loading
+// This is needed because Mocha expects module.exports to be the reporter function
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = bootstrap;
+    module.exports.default = bootstrap;
+}

package/src/mappers/MochaOutcomeMapper.ts

@@ -1,6 +1,6 @@
 import { AssertionError, ImplementationPendingError, TestCompromisedError } from '@serenity-js/core';
 import type {
-    Outcome} from '@serenity-js/core/lib/model';
+    Outcome} from '@serenity-js/core/model';
 import {
     ExecutionCompromised,
     ExecutionFailedWithAssertionError,
@@ -9,7 +9,7 @@ import {
     ExecutionSkipped,
     ExecutionSuccessful,
     ImplementationPending
-} from '@serenity-js/core/lib/model';
+} from '@serenity-js/core/model';
 import type { Test } from 'mocha';
 
 /**

package/src/mappers/MochaTestMapper.ts

@@ -1,5 +1,5 @@
-import { FileSystemLocation, Path } from '@serenity-js/core/lib/io';
-import { Category, Name, ScenarioDetails, type Tag, Tags } from '@serenity-js/core/lib/model';
+import { FileSystemLocation, Path } from '@serenity-js/core/io';
+import { Category, Name, ScenarioDetails, type Tag, Tags } from '@serenity-js/core/model';
 import type { Suite, Test } from 'mocha';
 
 /**

package/src/mappers/index.ts

@@ -1,2 +1,2 @@
-export * from './MochaOutcomeMapper';
-export * from './MochaTestMapper';
+export * from './MochaOutcomeMapper.js';
+export * from './MochaTestMapper.js';

package/tsconfig-cjs.build.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "compilerOptions": {
+    "module": "CommonJS",
+    "moduleResolution": "Node",
+    "outDir": "lib",
+    "rootDir": "src",
+    "target": "es2022",
+    "lib": [
+      "es2022",
+      "dom"
+    ],
+    "skipLibCheck": true
+  },
+  "include": [
+    "src/**/*.ts"
+  ]
+}

package/tsconfig-esm.build.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../tsconfig-esm.options.json",
+  "compilerOptions": {
+    "module": "Node20",
+    "moduleResolution": "Node16",
+    "outDir": "esm",
+    "rootDir": "src",
+    "target": "es2022",
+    "lib": [
+      "es2022",
+      "dom"
+    ],
+    "skipLibCheck": true
+  },
+  "include": [
+    "src/**/*.ts"
+  ]
+}