wdio-rerun-service 1.7.3 → 2.0.0

package/.editorconfig

@@ -0,0 +1,20 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+max_line_length = 0
+trim_trailing_whitespace = false
+
+[{*.json,*.yml}]
+indent_size = 2

package/.eslintignore

@@ -0,0 +1,3 @@
+build/
+results/
+coverage/

package/.github/workflows/release.yml

@@ -0,0 +1,68 @@
+name: Manual NPM Publish
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseType:
+        description: "Release type - major, minor or patch"
+        required: true
+        type: choice
+        default: "patch"
+        options:
+          - patch
+          - minor
+          - major
+      distTag:
+        description: 'NPM tag (e.g. use "next --preRelease=alpha --github.preRelease" to release a test version)'
+        required: true
+        default: 'latest'
+      preRelease:
+        description: If latest release was a pre-release (e.g. X.X.X-alpha.0) and you want to push another one, pick "yes"
+        required: true
+        type: choice
+        default: "no"
+        options:
+          - "yes"
+          - "no"
+
+env:
+  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: main
+          fetch-depth: 0
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+      - name: NPM Setup
+        run: |
+          npm set registry "https://registry.npmjs.org/"
+          npm set //registry.npmjs.org/:_authToken $NPM_TOKEN
+          npm whoami
+      - name: Git Setup
+        run: |
+          git config --global user.email "bot@webdriver.io"
+          git config --global user.name "WebdriverIO Release Bot"
+      - name: Install Dependencies
+        run: npm ci --ignore-scripts
+      - name: Build Project
+        run: npm run build --if-present
+        env:
+          NODE_ENV: production
+      - name: Release
+        run: npx release-it ${{github.event.inputs.releaseType}} --github.release --ci --npm.skipChecks --no-git.requireCleanWorkingDir --npm.tag=${{github.event.inputs.distTag}}
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ github.event.inputs.preRelease == 'no' }}
+      - name: Pre-Release
+        run: npx release-it ${{github.event.inputs.releaseType}} --github.release --ci --npm.skipChecks --no-git.requireCleanWorkingDir --preRelease=alpha --github.preRelease --npm.tag=next
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ github.event.inputs.preRelease == 'yes' }}

package/.github/workflows/{node.js.yml → test.yml}

@@ -1,45 +1,50 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: wdio-rerun-service CI
+name: Test
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [main]
   pull_request:
-    branches: [ master, main ]
+    branches: [main]
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 13.x, 14.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+        node-version: [16.x, 18.x]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm ci
-    - run: npm install -g eslint
+    - run: npm i -g npm@latest
+    - run: npm ci --ignore-scripts
     - run: npm run build --if-present
-    - run: npm run test
-    
+    - run: npm test
+      env:
+        CI: true
+
   build-windows:
     runs-on: windows-latest
     strategy:
       matrix:
-        node-version: [12.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+        node-version: [16.x]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm ci
-    - run: npm install -g eslint
+    - run: npm i -g npm@latest
+    - run: npm ci --ignore-scripts
     - run: npm run build --if-present
-    - run: npm run test
+    - run: npm test
+      env:
+        CI: true

package/.github/workflows/update.yml

@@ -0,0 +1,30 @@
+# this workflow merges requests from Dependabot if tests are passing
+name: Merge me!
+
+on:
+  workflow_run:
+    workflows:
+      - Test
+    types:
+      - completed
+
+jobs:
+  merge-me:
+    name: Merge me!
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge me!
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
+        uses: ridedott/merge-me-action@v2
+        with:
+          # Depending on branch prodtection rules, a manually populated
+          # `GITHUB_TOKEN_WORKAROUND` secret with permissions to push to
+          # a protected branch must be used.
+          #
+          # When using a custom token, it is recommended to leave the following
+          # comment for other developers to be aware of the reasoning behind it:
+          #
+          # This must be used as GitHub Actions token does not support pushing
+          # to protected branches.
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PRESET: DEPENDABOT_MINOR

package/.nvmrc

@@ -0,0 +1 @@
+v18.12.1

package/CHANGELOG.md

@@ -12,13 +12,20 @@
 _Note: Gaps between patch versions are faulty, broken or test releases._
 
 ---
+## v1.7.6 (2022-09-13)
+#### :bug: Bug Fix
+* [[#41]](https://github.com/webdriverio-community/wdio-rerun-service/pull/41) Update to work with newer versions of @wdio/cucumber-framework ([@mikesavia](https://github.com/mikesavia))
+
+#### Committers: 1
+- [@mikesalvia](https://github.com/mikesalvia)
+
 ## v1.7.3 (2022-04-19)
 #### :bug: Bug Fix
-* [[#31]](https://github.com/jwplayer/wdio-rerun-service/pull/31) Fixing WDIO v7 status code usage ([@ccristobal-skillz](https://github.com/ccristobal-skillz))
-* [[#26]](https://github.com/jwplayer/wdio-rerun-service/pull/26) Ensure element contains scenario inside filter function ([@yopasa94](https://github.com/yopasa94))
+* [[#31]](https://github.com/webdriverio-community/wdio-rerun-service/pull/31) Fixing WDIO v7 status code usage ([@ccristobal-skillz](https://github.com/ccristobal-skillz))
+* [[#26]](https://github.com/webdriverio-community/wdio-rerun-service/pull/26) Ensure element contains scenario inside filter function ([@yopasa94](https://github.com/yopasa94))
 
 #### :nail_care: Polish
-* [[#32]](https://github.com/jwplayer/wdio-rerun-service/pull/32) Update dependencies, move to fixed static versions ([@esaari](https://github.com/esaari))
+* [[#32]](https://github.com/webdriverio-community/wdio-rerun-service/pull/32) Update dependencies, move to fixed static versions ([@esaari](https://github.com/esaari))
 
 #### Committers: 3
 - [@ccristobal-skillz](https://github.com/ccristobal-skillz)
@@ -37,9 +44,9 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
 ## v1.7.1 (2021-06-24)
 
 #### :nail_care: Polish
-* [[#20]](https://github.com/jwplayer/wdio-rerun-service/pull/20) Use lockfileVersion:2 ([@esaari](https://github.com/esaari))
-* [[#20]](https://github.com/jwplayer/wdio-rerun-service/pull/20) Update `package.json` URLs to reflect webdriverio-community location ([@esaari](https://github.com/esaari))
-* [[#20]](https://github.com/jwplayer/wdio-rerun-service/pull/20) Dependency bumps ([@esaari](https://github.com/esaari))
+* [[#20]](https://github.com/webdriverio-community/wdio-rerun-service/pull/20) Use lockfileVersion:2 ([@esaari](https://github.com/esaari))
+* [[#20]](https://github.com/webdriverio-community/wdio-rerun-service/pull/20) Update `package.json` URLs to reflect webdriverio-community location ([@esaari](https://github.com/esaari))
+* [[#20]](https://github.com/webdriverio-community/wdio-rerun-service/pull/20) Dependency bumps ([@esaari](https://github.com/esaari))
 
 #### Committers: 1
 - [@esaari](https://github.com/esaari)
@@ -47,11 +54,11 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
 ## v1.7.0 (2021-03-01)
 
 #### :bug: Bug Fix
-* [[#9]](https://github.com/jwplayer/wdio-rerun-service/pull/9) Fix Cucumber hooks, so we're now compatible with WDIO v7 ([@esaari](https://github.com/esaari))
+* [[#9]](https://github.com/webdriverio-community/wdio-rerun-service/pull/9) Fix Cucumber hooks, so we're now compatible with WDIO v7 ([@esaari](https://github.com/esaari))
 #### :memo: Documentation
-* [[#9]](https://github.com/jwplayer/wdio-rerun-service/pull/9) Readme updates for clarity ([@esaari](https://github.com/esaari))
+* [[#9]](https://github.com/webdriverio-community/wdio-rerun-service/pull/9) Readme updates for clarity ([@esaari](https://github.com/esaari))
 #### ::nail_care:: Polish
-* [[#9]](https://github.com/jwplayer/wdio-rerun-service/pull/9) Filter `skipped` Cucumber scenarios from being included in rerun ([@esaari](https://github.com/esaari))
+* [[#9]](https://github.com/webdriverio-community/wdio-rerun-service/pull/9) Filter `skipped` Cucumber scenarios from being included in rerun ([@esaari](https://github.com/esaari))
 
 #### Committers: 1
 - [@esaari](https://github.com/esaari)
@@ -59,9 +66,9 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
 ## v1.6.0 (2021-02-26)
 
 #### :rocket: New Feature
-* [[#11]](https://github.com/jwplayer/wdio-rerun-service/pull/11) Fix issue with Windows-style separators, add CHANGELOG.md ([@mikesalvia](https://github.com/mikesalvia))*
+* [[#11]](https://github.com/webdriverio-community/wdio-rerun-service/pull/11) Fix issue with Windows-style separators, add CHANGELOG.md ([@mikesalvia](https://github.com/mikesalvia))*
 #### :bug: Bug Fix
-* [[#10]](https://github.com/jwplayer/wdio-rerun-service/pull/10) Ensure failure locations are unique so there are no duplicates created in re-run.sh ([@mikesalvia](https://github.com/mikesalvia))
+* [[#10]](https://github.com/webdriverio-community/wdio-rerun-service/pull/10) Ensure failure locations are unique so there are no duplicates created in re-run.sh ([@mikesalvia](https://github.com/mikesalvia))
 #### :memo: Documentation
 #### :house: Internal
 

package/README.md

@@ -8,7 +8,7 @@ WebdriverIO Re-run Service
 
 This service tracks failing Mocha or Jasmine tests and Cucumber scenarios executed within the [WebdriverIO](https://webdriver.io) test framework. It will allow failing or unstable tests or scenarios to be re-run.
 
-_NOTE_: Cucumber Framework users running WebdriverIO versions `5.x` and `6.x` should use version `1.6.x`. If you are on the latest major version of `7.x`, use the latest `1.7.x` version of this service.
+_NOTE_: Cucumber Framework users running WebdriverIO versions `5.x.x` and `6.x.x` should use version `1.6.x`. If you are on `7.x.x`, use version `1.7.x` version of this service. If you are on the latest major version of `8.x.x`, use the latest `2.x.x` version of this service.
 
 ## Re-run vs. Retry
 
@@ -27,28 +27,24 @@ It is recommended to take some time to evaluate the options available. A hybrid
 
 ## Installation
 
-The easiest way is to add `wdio-rerun-service` to `devDependencies` in your `package.json`.
+Using `npm`:
 
-```json
-{
-    "devDependencies": {
-        "wdio-rerun-service": "^1.7.3"
-    }
-}
+```bash
+npm install wdio-rerun-service
 ```
 
-It can be installed by using `npm`:
+or using `yarn`:
 
 ```bash
-npm install wdio-rerun-service
+yarn add wdio-rerun-service
 ```
 
 After package installation is complete, add it to `services` array in `wdio.conf.js`:
 
 ```js
 // wdio.conf.js
-const RerunService = require('wdio-rerun-service');
-export.config = {
+import RerunService from 'wdio-rerun-service';
+export const config = {
     // ...
     services: [RerunService, {
         // ...
@@ -64,8 +60,8 @@ The following options may be added to the wdio.conf.js file. To define options f
 
 ```js
 // wdio.conf.js
-const RerunService = require('wdio-rerun-service');
-export.config = {
+import RerunService from 'wdio-rerun-service';
+export const config = {
     // ...
     services: [
         [RerunService, {
@@ -85,8 +81,8 @@ Default: `./results/rerun`
 
 Example:
 ```js
-const RerunService = require('wdio-rerun-service');
-export.config = {
+import RerunService from 'wdio-rerun-service';
+export const config = {
     // ...
     services: [
         [RerunService, {
@@ -106,8 +102,8 @@ Default: `./rerun.sh`
 
 Example:
 ```js
-const RerunService = require('wdio-rerun-service');
-export.config = {
+import RerunService from 'wdio-rerun-service';
+export const config = {
     // ...
     services: [
         [RerunService, {
@@ -127,8 +123,8 @@ Default: `[]`
 
 Example:
 ```js
-const RerunService = require('wdio-rerun-service');
-export.config = {
+import RerunService from 'wdio-rerun-service';
+export const config = {
     // ...
     services: [
         [RerunService, {
@@ -148,8 +144,8 @@ Default: `''`
 
 Example:
 ```js
-const RerunService = require('wdio-rerun-service');
-export.config = {
+import RerunService from 'wdio-rerun-service';
+export const config = {
     // ...
     services: [
         [RerunService, {
@@ -159,4 +155,26 @@ export.config = {
     // ...
 }
 ```
+
+### customParameters
+Parameters which will be added to the re-run command that is generated.
+Can be used with `commandPrefix`.
+
+Type: `String`
+
+Default: `''`
+
+Example:
+```js
+import RerunService from 'wdio-rerun-service';
+export const config = {
+    // ...
+    services: [
+        [RerunService, {
+            customParameters: "--foobar"
+        }]
+    ],
+    // ...
+}
+```
 ----

package/build/cjs/index.d.ts

@@ -0,0 +1,33 @@
+import type { Capabilities, Frameworks, Services } from '@wdio/types';
+type AfterScenario = NonNullable<WebdriverIO.HookFunctionExtension['afterScenario']>;
+type AfterScenarioParameters = Parameters<AfterScenario>;
+type World = AfterScenarioParameters[0];
+interface NonPassingItem {
+    location: string;
+    failure?: string | undefined;
+}
+interface RerunServiceOptions {
+    ignoredTags?: string[];
+    rerunDataDir?: string;
+    rerunScriptPath?: string;
+    commandPrefix?: string;
+    customParameters?: string;
+}
+export default class RerunService implements Services.ServiceInstance {
+    nonPassingItems: NonPassingItem[];
+    serviceWorkerId: string;
+    ignoredTags: string[];
+    rerunDataDir: string;
+    rerunScriptPath: string;
+    commandPrefix: string;
+    customParameters: string;
+    specFile: string;
+    disabled: boolean;
+    constructor(options?: RerunServiceOptions);
+    before(_capabilities: Capabilities.RemoteCapability, specs: string[]): Promise<void>;
+    afterTest(_test: Frameworks.Test, _context: any, results: Frameworks.TestResult): void;
+    afterScenario(world: World): void;
+    after(): Promise<void>;
+    onComplete(): Promise<void>;
+}
+export {};

package/build/cjs/index.js

@@ -0,0 +1,126 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const minimist_1 = __importDefault(require("minimist"));
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const node_process_1 = require("node:process");
+const uuid_1 = require("uuid");
+class RerunService {
+    constructor(options = {}) {
+        const { ignoredTags, rerunDataDir, rerunScriptPath, commandPrefix, customParameters, } = options;
+        this.nonPassingItems = [];
+        this.serviceWorkerId = '';
+        this.ignoredTags = ignoredTags ?? [];
+        this.rerunDataDir = rerunDataDir ?? './results/rerun';
+        this.rerunScriptPath =
+            rerunScriptPath ?? (node_process_1.platform === 'win32' ? 'rerun.bat' : 'rerun.sh');
+        this.commandPrefix = commandPrefix ?? '';
+        this.customParameters = customParameters ?? '';
+        this.specFile = '';
+        this.disabled = node_process_1.env['DISABLE_RERUN'] === 'true';
+    }
+    async before(_capabilities, specs) {
+        if (this.disabled) {
+            return;
+        }
+        this.specFile = specs[0] ?? '';
+        // console.log(`Re-run service is activated. Data directory: ${this.rerunDataDir}`);
+        await (0, promises_1.mkdir)(this.rerunDataDir, { recursive: true });
+        this.serviceWorkerId = (0, uuid_1.v5)(String(Date.now()), uuid_1.v5.DNS);
+    }
+    afterTest(_test, _context, results) {
+        if (this.disabled) {
+            return;
+        }
+        const { passed } = results;
+        const config = browser.config;
+        if (passed || config.framework === 'cucumber') {
+            return;
+        }
+        // console.log(`Re-run service is inspecting non-passing test.`);
+        // console.log(`Test location: ${this.specFile}`);
+        const error = results.error;
+        if (error?.message) {
+            this.nonPassingItems.push({
+                location: this.specFile,
+                failure: error.message,
+            });
+        }
+        else {
+            // console.log("The non-passing test did not contain any error message, it could not be added for re-run.")
+        }
+    }
+    // Executed after a Cucumber scenario ends.
+    afterScenario(world) {
+        if (this.disabled) {
+            return;
+        }
+        const config = browser.config;
+        const status = world.result?.status;
+        if (config.framework !== 'cucumber' ||
+            status === 'PASSED' ||
+            status === 'SKIPPED') {
+            return;
+        }
+        const scenarioLineNumber = world.gherkinDocument.feature?.children.filter((child) => child.scenario
+            ? world.pickle.astNodeIds.includes(child.scenario.id.toString())
+            : false)?.[0]?.scenario?.location.line ?? 0;
+        const scenarioLocation = `${world.pickle.uri}:${scenarioLineNumber}`;
+        const tagsList = world.pickle.tags.map((tag) => tag.name);
+        if (!Array.isArray(this.ignoredTags) ||
+            !tagsList.some((ignoredTag) => this.ignoredTags.includes(ignoredTag))) {
+            this.nonPassingItems.push({
+                location: scenarioLocation,
+                failure: world.result?.message,
+            });
+        }
+    }
+    async after() {
+        if (this.disabled) {
+            return;
+        }
+        if (this.nonPassingItems.length === 0) {
+            return; // console.log('Re-run service did not detect any non-passing scenarios or tests.');
+        }
+        await (0, promises_1.writeFile)((0, node_path_1.join)(this.rerunDataDir, `rerun-${this.serviceWorkerId}.json`), JSON.stringify(this.nonPassingItems));
+    }
+    async onComplete() {
+        if (this.disabled) {
+            return;
+        }
+        try {
+            const files = await (0, promises_1.readdir)(this.rerunDataDir);
+            const rerunFiles = files.filter((file) => file.endsWith('.json'));
+            if (rerunFiles.length === 0) {
+                return;
+            }
+            const parsedArgs = (0, minimist_1.default)(node_process_1.argv.slice(2));
+            const args = parsedArgs._[0] ? parsedArgs._[0] + ' ' : '';
+            const prefix = this.commandPrefix ? this.commandPrefix + ' ' : '';
+            const disableRerun = node_process_1.platform === 'win32'
+                ? 'set DISABLE_RERUN=true &&'
+                : 'DISABLE_RERUN=true';
+            let rerunCommand = `${prefix}${disableRerun} npx wdio ${args}${this.customParameters}`;
+            const failureLocations = new Set();
+            for (const file of rerunFiles) {
+                const json = JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(this.rerunDataDir, file), 'utf8'));
+                json.forEach((failure) => {
+                    failureLocations.add(failure.location.replace(/\\/g, '/'));
+                });
+            }
+            failureLocations.forEach((failureLocation) => {
+                rerunCommand += ` --spec=${failureLocation}`;
+            });
+            await (0, promises_1.writeFile)(this.rerunScriptPath, rerunCommand, { mode: 0o755 });
+            // console.log(`Re-run script has been generated @ ${this.rerunScriptPath}`);
+        }
+        catch (err) {
+            // console.log(`Re-run service failed to generate re-run script: ${err}`);
+        }
+    }
+}
+exports.default = RerunService;
+//# sourceMappingURL=index.js.map

package/build/cjs/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/build/cjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

package/build/esm/index.d.ts

@@ -0,0 +1,33 @@
+import type { Capabilities, Frameworks, Services } from '@wdio/types';
+type AfterScenario = NonNullable<WebdriverIO.HookFunctionExtension['afterScenario']>;
+type AfterScenarioParameters = Parameters<AfterScenario>;
+type World = AfterScenarioParameters[0];
+interface NonPassingItem {
+    location: string;
+    failure?: string | undefined;
+}
+interface RerunServiceOptions {
+    ignoredTags?: string[];
+    rerunDataDir?: string;
+    rerunScriptPath?: string;
+    commandPrefix?: string;
+    customParameters?: string;
+}
+export default class RerunService implements Services.ServiceInstance {
+    nonPassingItems: NonPassingItem[];
+    serviceWorkerId: string;
+    ignoredTags: string[];
+    rerunDataDir: string;
+    rerunScriptPath: string;
+    commandPrefix: string;
+    customParameters: string;
+    specFile: string;
+    disabled: boolean;
+    constructor(options?: RerunServiceOptions);
+    before(_capabilities: Capabilities.RemoteCapability, specs: string[]): Promise<void>;
+    afterTest(_test: Frameworks.Test, _context: any, results: Frameworks.TestResult): void;
+    afterScenario(world: World): void;
+    after(): Promise<void>;
+    onComplete(): Promise<void>;
+}
+export {};

package/build/esm/index.js

@@ -0,0 +1,129 @@
+import minimist from 'minimist';
+import { mkdir, readdir, readFile, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { argv, env, platform } from 'node:process';
+import { v5 as uuidv5 } from 'uuid';
+export default class RerunService {
+    nonPassingItems;
+    serviceWorkerId;
+    ignoredTags;
+    rerunDataDir;
+    rerunScriptPath;
+    commandPrefix;
+    customParameters;
+    specFile;
+    disabled;
+    constructor(options = {}) {
+        const { ignoredTags, rerunDataDir, rerunScriptPath, commandPrefix, customParameters, } = options;
+        this.nonPassingItems = [];
+        this.serviceWorkerId = '';
+        this.ignoredTags = ignoredTags ?? [];
+        this.rerunDataDir = rerunDataDir ?? './results/rerun';
+        this.rerunScriptPath =
+            rerunScriptPath ?? (platform === 'win32' ? 'rerun.bat' : 'rerun.sh');
+        this.commandPrefix = commandPrefix ?? '';
+        this.customParameters = customParameters ?? '';
+        this.specFile = '';
+        this.disabled = env['DISABLE_RERUN'] === 'true';
+    }
+    async before(_capabilities, specs) {
+        if (this.disabled) {
+            return;
+        }
+        this.specFile = specs[0] ?? '';
+        // console.log(`Re-run service is activated. Data directory: ${this.rerunDataDir}`);
+        await mkdir(this.rerunDataDir, { recursive: true });
+        this.serviceWorkerId = uuidv5(String(Date.now()), uuidv5.DNS);
+    }
+    afterTest(_test, _context, results) {
+        if (this.disabled) {
+            return;
+        }
+        const { passed } = results;
+        const config = browser.config;
+        if (passed || config.framework === 'cucumber') {
+            return;
+        }
+        // console.log(`Re-run service is inspecting non-passing test.`);
+        // console.log(`Test location: ${this.specFile}`);
+        const error = results.error;
+        if (error?.message) {
+            this.nonPassingItems.push({
+                location: this.specFile,
+                failure: error.message,
+            });
+        }
+        else {
+            // console.log("The non-passing test did not contain any error message, it could not be added for re-run.")
+        }
+    }
+    // Executed after a Cucumber scenario ends.
+    afterScenario(world) {
+        if (this.disabled) {
+            return;
+        }
+        const config = browser.config;
+        const status = world.result?.status;
+        if (config.framework !== 'cucumber' ||
+            status === 'PASSED' ||
+            status === 'SKIPPED') {
+            return;
+        }
+        const scenarioLineNumber = world.gherkinDocument.feature?.children.filter((child) => child.scenario
+            ? world.pickle.astNodeIds.includes(child.scenario.id.toString())
+            : false)?.[0]?.scenario?.location.line ?? 0;
+        const scenarioLocation = `${world.pickle.uri}:${scenarioLineNumber}`;
+        const tagsList = world.pickle.tags.map((tag) => tag.name);
+        if (!Array.isArray(this.ignoredTags) ||
+            !tagsList.some((ignoredTag) => this.ignoredTags.includes(ignoredTag))) {
+            this.nonPassingItems.push({
+                location: scenarioLocation,
+                failure: world.result?.message,
+            });
+        }
+    }
+    async after() {
+        if (this.disabled) {
+            return;
+        }
+        if (this.nonPassingItems.length === 0) {
+            return; // console.log('Re-run service did not detect any non-passing scenarios or tests.');
+        }
+        await writeFile(join(this.rerunDataDir, `rerun-${this.serviceWorkerId}.json`), JSON.stringify(this.nonPassingItems));
+    }
+    async onComplete() {
+        if (this.disabled) {
+            return;
+        }
+        try {
+            const files = await readdir(this.rerunDataDir);
+            const rerunFiles = files.filter((file) => file.endsWith('.json'));
+            if (rerunFiles.length === 0) {
+                return;
+            }
+            const parsedArgs = minimist(argv.slice(2));
+            const args = parsedArgs._[0] ? parsedArgs._[0] + ' ' : '';
+            const prefix = this.commandPrefix ? this.commandPrefix + ' ' : '';
+            const disableRerun = platform === 'win32'
+                ? 'set DISABLE_RERUN=true &&'
+                : 'DISABLE_RERUN=true';
+            let rerunCommand = `${prefix}${disableRerun} npx wdio ${args}${this.customParameters}`;
+            const failureLocations = new Set();
+            for (const file of rerunFiles) {
+                const json = JSON.parse(await readFile(join(this.rerunDataDir, file), 'utf8'));
+                json.forEach((failure) => {
+                    failureLocations.add(failure.location.replace(/\\/g, '/'));
+                });
+            }
+            failureLocations.forEach((failureLocation) => {
+                rerunCommand += ` --spec=${failureLocation}`;
+            });
+            await writeFile(this.rerunScriptPath, rerunCommand, { mode: 0o755 });
+            // console.log(`Re-run script has been generated @ ${this.rerunScriptPath}`);
+        }
+        catch (err) {
+            // console.log(`Re-run service failed to generate re-run script: ${err}`);
+        }
+    }
+}
+//# sourceMappingURL=index.js.map

package/build/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,26 +1,49 @@
 {
   "name": "wdio-rerun-service",
-  "version": "1.7.3",
+  "version": "2.0.0",
   "description": "A WebdriverIO service to track and prepare for re-running failing or flaky Jasmine/Mocha tests or Cucumber Scenarios.",
   "author": "Mike Salvia <msalvia@jwplayer.com>",
   "homepage": "https://github.com/webdriverio-community/wdio-rerun-service",
   "license": "MIT",
-  "main": "./build/index",
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "module",
+  "main": "./build/cjs/index.js",
+  "types": "./build/cjs/index.d.ts",
+  "module": "./build/esm/index.js",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./build/esm/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/cjs/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=16.0.0"
   },
   "scripts": {
     "build": "run-s clean compile",
     "clean": "rimraf ./build",
-    "compile": "babel src/ -d build/ --config-file ./babel.config.js",
-    "watch": "npm-watch",
+    "compile": "run-s compile:esm compile:cjs generate:cjs:package",
+    "compile:cjs": "tsc -p tsconfig.cjs.json",
+    "compile:esm": "tsc -p tsconfig.esm.json",
+    "generate:cjs:package": "shx echo \"{\\\"type\\\":\\\"commonjs\\\"}\" > ./build/cjs/package.json",
+    "prepare": "npm run build",
     "test": "run-s test:*",
-    "test:clean": "rimraf ./results ./coverage rerun.sh",
+    "test:clean": "rimraf ./results ./coverage rerun.sh rerun.bat",
     "test:eslint": "eslint src tests",
-    "test:unit": "jest --collectCoverageFrom='[\"src/**/*.{js,jsx,ts,tsx}\"]' --coverage --collectCoverage=true --forceExit --detectOpenHandles tests/.*test.*"
+    "test:tsc": "tsc -p tsconfig.json --noEmit",
+    "test:unit": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage",
+    "watch": "npm-watch"
   },
   "watch": {
-    "build": "{src,tests}/*.js"
+    "build": "{src,tests}/*.ts"
   },
   "repository": {
     "type": "git",
@@ -50,36 +73,45 @@
     "url": "https://github.com/webdriverio-community/wdio-rerun-service/issues"
   },
   "dependencies": {
-    "@wdio/logger": "7.19.0",
-    "minimist": "1.2.6",
-    "npm-watch": "0.11.0",
-    "uuid": "8.3.2"
-  },
-  "peerDependencies": {},
-  "publishConfig": {
-    "access": "public"
+    "@wdio/types": "^8.0.11",
+    "minimist": "^1.2.7",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.17.6",
-    "@babel/core": "7.17.9",
-    "@babel/node": "7.16.8",
-    "@babel/plugin-proposal-class-properties": "7.16.7",
-    "@babel/plugin-proposal-function-bind": "7.16.7",
-    "@babel/plugin-proposal-optional-catch-binding": "7.16.7",
-    "@babel/plugin-syntax-export-default-from": "7.16.7",
-    "@babel/preset-env": "7.16.11",
-    "@babel/register": "7.17.7",
-    "@typescript-eslint/eslint-plugin": "5.20.0",
-    "@typescript-eslint/parser": "5.20.0",
-    "babel-cli": "6.26.0",
-    "babel-core": "6.26.3",
-    "babel-eslint": "10.1.0",
-    "babel-jest": "27.5.1",
-    "babel-plugin-source-map-support": "2.1.3",
-    "eslint": "8.13.0",
-    "jest": "27.5.1",
+    "@jest/globals": "^29.3.1",
+    "@tsconfig/node16": "^1.0.3",
+    "@tsconfig/node18-strictest-esm": "^1.0.1",
+    "@types/minimist": "^1.2.2",
+    "@types/node": "^18.11.16",
+    "@types/uuid": "^9.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/parser": "^5.46.1",
+    "@wdio/cucumber-framework": "^8.0.13",
+    "@wdio/globals": "^8.0.13",
+    "cross-env": "^7.0.3",
+    "eslint": "^8.30.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "jest": "^29.3.1",
     "npm-run-all": "4.1.5",
-    "rimraf": "3.0.2",
-    "typescript": "4.6.3"
+    "npm-watch": "0.11.0",
+    "prettier": "^2.8.1",
+    "prettier-plugin-organize-imports": "^3.2.1",
+    "release-it": "^15.5.1",
+    "rimraf": "^3.0.2",
+    "shx": "^0.3.4",
+    "ts-jest": "^29.0.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.4"
+  },
+  "jest": {
+    "preset": "ts-jest/presets/default-esm",
+    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
+    "moduleNameMapper": {
+      "^(\\.{1,2}/.*)\\.js$": "$1"
+    },
+    "collectCoverageFrom": [
+      "src/index.ts"
+    ]
   }
 }

package/tsconfig.cjs.json

@@ -0,0 +1,10 @@
+{
+    "extends": "@tsconfig/node16/tsconfig.json",
+    "compilerOptions": {
+        "outDir": "build/cjs",
+        "declaration": true,
+        "sourceMap": true,
+        "types": ["node", "@wdio/globals/types", "@wdio/cucumber-framework"]
+    },
+    "files": ["src/index.ts"]
+}

package/tsconfig.esm.json

@@ -0,0 +1,11 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "outDir": "build/esm",
+        "noEmit": false,
+        "declaration": true,
+        "sourceMap": true
+    },
+    "include": [],
+    "files": ["src/index.ts"]
+}

package/.eslintrc.js

@@ -1,16 +0,0 @@
-module.exports = {
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": 12,
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-    }
-};

package/babel.config.js

@@ -1,21 +0,0 @@
-module.exports = {
-    presets: [
-        [
-            '@babel/preset-env',
-            {targets: {node: 'current'}},
-            "@babel/preset-typescript"
-        ]
-    ],
-    plugins: [
-        '@babel/plugin-proposal-function-bind',
-        '@babel/plugin-proposal-class-properties',
-        '@babel/plugin-proposal-optional-catch-binding'
-    ],
-    env: {
-        development: {
-            sourceMaps: 'inline',
-            plugins: ['source-map-support']
-        }
-    },
-    comments: false
-}

package/build/index.js

@@ -1,117 +0,0 @@
-"use strict";
-
-require("source-map-support/register");
-
-const fs = require('fs');
-
-const path = require('path');
-
-const {
-  v5: uuidv5
-} = require('uuid');
-
-const argv = require('minimist')(process.argv.slice(2));
-
-class RerunService {
-  constructor({
-    ignoredTags,
-    rerunDataDir,
-    rerunScriptPath,
-    commandPrefix
-  } = {}) {
-    this.nonPassingItems = [];
-    this.serviceWorkerId;
-    this.ignoredTags = ignoredTags ? ignoredTags : [];
-    this.rerunDataDir = rerunDataDir ? rerunDataDir : "./results/rerun";
-    this.rerunScriptPath = rerunScriptPath ? rerunScriptPath : "./rerun.sh";
-    this.commandPrefix = commandPrefix ? commandPrefix : "";
-    this.specFile = "";
-  }
-
-  before(capabilities, specs) {
-    this.specFile = specs[0];
-    fs.mkdirSync(this.rerunDataDir, {
-      recursive: true
-    });
-    this.serviceWorkerId = uuidv5(`${Date.now()}`, '6ba7b810-9dad-11d1-80b4-00c04fd430c8');
-  }
-
-  afterTest(test, context, {
-    error,
-    result,
-    duration,
-    passed,
-    retries
-  }) {
-    if (browser.config.framework !== 'cucumber' && !passed) {
-      if (error && error.message) {
-        this.nonPassingItems.push({
-          location: this.specFile,
-          failure: error.message
-        });
-      } else {}
-    }
-  }
-
-  afterScenario(world) {
-    const status = world.result.status;
-    const scenarioLineNumber = world.gherkinDocument.feature.children.filter(child => {
-      if (child.scenario) {
-        return child.scenario && world.pickle.astNodeIds.includes(child.scenario.id.toString());
-      }
-    })[0].scenario.location.line;
-
-    if (browser.config.framework === 'cucumber' && status !== 'PASSED' && status !== 'SKIPPED') {
-      const scenarioLocation = `${world.pickle.uri}:${scenarioLineNumber}`;
-      const tagsList = world.pickle.tags.map(tag => tag.name);
-      const service = this;
-
-      if (this.ignoredTags && tagsList.some(ignoredTag => service.ignoredTags.includes(ignoredTag))) {} else {
-        this.nonPassingItems.push({
-          location: scenarioLocation,
-          failure: world.result.message
-        });
-      }
-    }
-  }
-
-  after(result, capabilities, specs) {
-    if (this.nonPassingItems.length > 0) {
-      fs.writeFileSync(`${this.rerunDataDir}/rerun-${this.serviceWorkerId}.json`, JSON.stringify(this.nonPassingItems));
-    } else {}
-  }
-
-  onComplete(exitCode, config, capabilities, results) {
-    const directoryPath = path.join(process.cwd(), `${this.rerunDataDir}`);
-
-    if (fs.existsSync(directoryPath)) {
-      const rerunFiles = fs.readdirSync(directoryPath);
-
-      if (rerunFiles.length > 0) {
-        let rerunCommand = `DISABLE_RERUN=true node_modules/.bin/wdio ${argv._[0]} `;
-
-        if (this.commandPrefix) {
-          rerunCommand = `${this.commandPrefix} ${rerunCommand}`;
-        }
-
-        let failureLocations = [];
-        rerunFiles.forEach(file => {
-          const json = JSON.parse(fs.readFileSync(`${this.rerunDataDir}/${file}`));
-          json.forEach(failure => {
-            failureLocations.push(failure.location.replace(/\\/g, "/"));
-          });
-        });
-        const failureLocationsUnique = [...new Set(failureLocations)];
-        failureLocationsUnique.forEach(failureLocation => {
-          rerunCommand += ` --spec=${failureLocation}`;
-        });
-        fs.writeFileSync(this.rerunScriptPath, rerunCommand);
-      }
-    }
-  }
-
-}
-
-;
-module.exports = RerunService;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/index.js"],"names":["fs","require","path","v5","uuidv5","argv","process","slice","RerunService","constructor","ignoredTags","rerunDataDir","rerunScriptPath","commandPrefix","nonPassingItems","serviceWorkerId","specFile","before","capabilities","specs","mkdirSync","recursive","Date","now","afterTest","test","context","error","result","duration","passed","retries","browser","config","framework","message","push","location","failure","afterScenario","world","status","scenarioLineNumber","gherkinDocument","feature","children","filter","child","scenario","pickle","astNodeIds","includes","id","toString","line","scenarioLocation","uri","tagsList","tags","map","tag","name","service","some","ignoredTag","after","length","writeFileSync","JSON","stringify","onComplete","exitCode","results","directoryPath","join","cwd","existsSync","rerunFiles","readdirSync","rerunCommand","_","failureLocations","forEach","file","json","parse","readFileSync","replace","failureLocationsUnique","Set","failureLocation","module","exports"],"mappings":"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","sourcesContent":["const fs = require('fs');\nconst path = require('path');\nconst { v5: uuidv5 } = require('uuid');\n\nconst argv = require('minimist')(process.argv.slice(2));\n\nclass RerunService {\n\n    constructor({ ignoredTags, rerunDataDir, rerunScriptPath, commandPrefix } = {}) {\n        this.nonPassingItems = [];\n        this.serviceWorkerId;\n        this.ignoredTags = ignoredTags ? ignoredTags : [];\n        this.rerunDataDir = rerunDataDir ? rerunDataDir : \"./results/rerun\";\n        this.rerunScriptPath = rerunScriptPath ? rerunScriptPath : \"./rerun.sh\";\n        this.commandPrefix = commandPrefix ? commandPrefix : \"\";\n        this.specFile = \"\";\n    }\n\n    before(capabilities, specs) {\n        this.specFile = specs[0];\n        // console.log(`Re-run service is activated. Data directory: ${this.rerunDataDir}`);\n        fs.mkdirSync(this.rerunDataDir, { recursive: true });\n        // INFO: `namespace` below copied from: https://github.com/kelektiv/node-uuid/blob/master//lib/v35.js#L54:16\n        this.serviceWorkerId = uuidv5(`${Date.now()}`, '6ba7b810-9dad-11d1-80b4-00c04fd430c8');\n    }\n\n    afterTest(test, context, { error, result, duration, passed, retries }) {\n        if (browser.config.framework !== 'cucumber' && !passed) {\n            // console.log(`Re-run service is inspecting non-passing test.`);\n            // console.log(`Test location: ${this.specFile}`);\n            if (error && error.message) {\n                this.nonPassingItems.push({ location: this.specFile, failure: error.message });\n            } else {\n                // console.log(\"The non-passing test did not contain any error message, it could not be added for re-run.\")\n            }\n        }\n    }\n\n    // Executed after a Cucumber scenario ends.\n    afterScenario(world) {\n        const status = world.result.status;\n        const scenarioLineNumber = world.gherkinDocument.feature.children.filter((child) => {\n            if(child.scenario){\n                return child.scenario && world.pickle.astNodeIds.includes(child.scenario.id.toString());\n            }\n        })[0].scenario.location.line;\n\n        if (browser.config.framework === 'cucumber' && (status !== 'PASSED' && status !== 'SKIPPED')) {\n            // console.log(`Re-run service is inspecting non-passing scenario.`);\n            const scenarioLocation = `${world.pickle.uri}:${scenarioLineNumber}`;\n            // console.log(`Scenario location: ${scenarioLocation}`);\n            const tagsList = world.pickle.tags.map(tag => tag.name);\n            // console.log(`Scenario tags: ${tagsList}`);\n            const service = this;\n            if (this.ignoredTags && tagsList.some(ignoredTag => service.ignoredTags.includes(ignoredTag))) {\n                // console.log(`Re-run service will ignore the current scenario since it includes one of the ignored tags: ${this.ignoredTags}`);\n            } else {\n                this.nonPassingItems.push({ location: scenarioLocation, failure: world.result.message });\n            }\n        }\n    }\n\n    after(result, capabilities, specs) {\n        if (this.nonPassingItems.length > 0) {\n            fs.writeFileSync(`${this.rerunDataDir}/rerun-${this.serviceWorkerId}.json`, JSON.stringify(this.nonPassingItems));\n        } else {\n            // console.log('Re-run service did not detect any non-passing scenarios or tests.');\n        }\n    }\n\n    onComplete(exitCode, config, capabilities, results) {\n        const directoryPath = path.join(process.cwd(), `${this.rerunDataDir}`);\n        if (fs.existsSync(directoryPath)) {\n            const rerunFiles = fs.readdirSync(directoryPath);\n            if (rerunFiles.length > 0) {\n                let rerunCommand = `DISABLE_RERUN=true node_modules/.bin/wdio ${argv._[0]} `;\n                if (this.commandPrefix) {\n                    rerunCommand = `${this.commandPrefix} ${rerunCommand}`;\n                }\n                let failureLocations = [];\n                rerunFiles.forEach(file => {\n                    const json = JSON.parse(fs.readFileSync(`${this.rerunDataDir}/${file}`));\n                    json.forEach(failure => {\n                        failureLocations.push(failure.location.replace(/\\\\/g, \"/\"));\n                    });\n                });\n                const failureLocationsUnique = [...new Set(failureLocations)];\n                failureLocationsUnique.forEach(failureLocation => {\n                    rerunCommand += ` --spec=${failureLocation}`;\n                });\n                fs.writeFileSync(this.rerunScriptPath, rerunCommand);\n                // console.log(`Re-run script has been generated @ ${this.rerunScriptPath}`);\n            }\n        }\n    }\n};\n\nmodule.exports = RerunService;\n"]}