Merge main

Author: davidjgoss

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.github/workflows/release-npm.yml

@@ -0,0 +1,24 @@
+name: Release NPM
+
+on:
+  push:
+    branches: [release/*]
+
+jobs:
+  publish-npm:
+    name: Publish NPM module
+    runs-on: ubuntu-latest
+    environment: Release
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: javascript/package-lock.json
+      - run: npm install-test
+        working-directory: javascript
+      - uses: cucumber/action-publish-npm@v1.1.1
+        with:
+          npm-token: ${{ secrets.NPM_TOKEN }}
+          working-directory: javascript

.github/workflows/test-javascript.yml

@@ -0,0 +1,39 @@
+name: test-javascript
+
+on:
+  push:
+    branches:
+      - main
+      - renovate/**
+  pull_request:
+    branches:
+      - main
+  workflow_call:
+
+jobs:
+  test-javascript:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        node-version: ["18.x", "20.x", "22.x"]
+        include:
+          - os: windows-latest
+            node-version: "22.x"
+          - os: macos-latest
+            node-version: "22.x"
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: with Node.js ${{ matrix.node-version }} on ${{ matrix.os }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "npm"
+          cache-dependency-path: javascript/package-lock.json
+
+      - run: npm install-ci-test
+        working-directory: javascript

CHANGELOG.md

@@ -6,11 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-
 ### Added
-- Update dependency io.cucumber:messages up to v26 ((#38)[https://github.com/cucumber/query/pull/38])
 - Add `timestamp` attribute ((#45)[https://github.com/cucumber/junit-xml-formatter/pull/45])
 
+## [0.6.0] - 2024-11-15
+### Added
+- JavaScript implementation ([#42](https://github.com/cucumber/junit-xml-formatter/pull/42))
+- Update dependency io.cucumber:messages up to v26 ([#38](https://github.com/cucumber/junit-xml-formatter/pull/38))
+
+### Fixed
+- Attempts that have been superseded by retries are now omitted from the report ([#42](https://github.com/cucumber/junit-xml-formatter/pull/42))
+
 ## [0.5.0] - 2024-06-22
 ### Added
 - Include pickle name if parameterized [#34](https://github.com/cucumber/junit-xml-formatter/pull/34)
@@ -37,7 +43,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Java implementation ([#3](https://github.com/cucumber/junit-xml-formatter/pull/3) M.P. Korstanje)
 
-[Unreleased]: https://github.com/cucumber/junit-xml-formatter/compare/v0.5.0...HEAD
+[Unreleased]: https://github.com/cucumber/junit-xml-formatter/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/cucumber/junit-xml-formatter/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/cucumber/junit-xml-formatter/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/cucumber/junit-xml-formatter/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/cucumber/junit-xml-formatter/compare/v0.2.1...v0.3.0

java/pom.xml

@@ -9,15 +9,15 @@
     </parent>
 
     <artifactId>junit-xml-formatter</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.6.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>JUnit XML Formatter</name>
     <description>Renders Cucumber Messages as JUnit XML</description>
     <url>https://github.com/cucumber/junit-xml-formatter</url>
 
     <properties>
         <project.Automatic-Module-Name>io.cucumber.junitxmlformatter</project.Automatic-Module-Name>
-        <project.build.outputTimestamp>1719064372</project.build.outputTimestamp>
+        <project.build.outputTimestamp>1731653110</project.build.outputTimestamp>
     </properties>
 
     <scm>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>query</artifactId>
-            <version>[12.2.0,13.0.0)</version>
+            <version>[13.0.2,14.0.0)</version>
         </dependency>
 
         <dependency>

java/src/main/java/io/cucumber/junitxmlformatter/XmlReportData.java

@@ -63,17 +63,19 @@ int getTestCaseCount() {
         return query.findAllTestCaseStarted().size();
     }
 
-    String getPickleName(TestCaseStarted testCaseStarted) {
-        Pickle pickle = query.findPickleBy(testCaseStarted)
+    private Pickle getPickle(TestCaseStarted testCaseStarted) {
+        return query.findPickleBy(testCaseStarted)
                 .orElseThrow(() -> new IllegalStateException("No pickle for " + testCaseStarted.getId()));
+    }
 
-        return query.findNameOf(pickle, namingStrategy);
+    String getPickleName(TestCaseStarted testCaseStarted) {
+        return query.findNameOf(getPickle(testCaseStarted), namingStrategy);
     }
 
     String getFeatureName(TestCaseStarted testCaseStarted) {
         return query.findFeatureBy(testCaseStarted)
                 .map(Feature::getName)
-                .orElseThrow(() -> new IllegalStateException("No feature for " + testCaseStarted));
+                .orElseGet(() -> this.getPickle(testCaseStarted).getUri());
     }
 
     List<Entry<String, String>> getStepsAndResult(TestCaseStarted testCaseStarted) {
@@ -122,7 +124,7 @@ List<TestCaseStarted> getAllTestCaseStarted() {
     private static final TestStepResult SCENARIO_WITH_NO_STEPS = new TestStepResult(ZERO_DURATION, null, PASSED, null);
 
     TestStepResult getTestCaseStatus(TestCaseStarted testCaseStarted) {
-        return query.findMostSevereTestStepResulBy(testCaseStarted)
+        return query.findMostSevereTestStepResultBy(testCaseStarted)
                 .orElse(SCENARIO_WITH_NO_STEPS);
     }
 

java/src/main/java/io/cucumber/junitxmlformatter/XmlReportWriter.java

@@ -56,7 +56,7 @@ private void writeSuiteAttributes(EscapingXmlStreamWriter writer) throws XMLStre
         Map<TestStepResultStatus, Long> counts = data.getTestCaseStatusCounts();
 
         writer.writeAttribute("tests", String.valueOf(data.getTestCaseCount()));
-        writer.writeAttribute("skipped", counts.getOrDefault(SKIPPED, 0L).toString());
+        writer.writeAttribute("skipped", counts.get(SKIPPED).toString());
         writer.writeAttribute("failures", String.valueOf(countFailures(counts)));
         writer.writeAttribute("errors", "0");
 
@@ -67,7 +67,7 @@ private void writeSuiteAttributes(EscapingXmlStreamWriter writer) throws XMLStre
     }
 
     private static long countFailures(Map<TestStepResultStatus, Long> counts) {
-        return createNotPassedNotSkippedSet().stream().mapToLong(s -> counts.getOrDefault(s, 0L)).sum();
+        return createNotPassedNotSkippedSet().stream().mapToLong(counts::get).sum();
     }
 
     private static EnumSet<TestStepResultStatus> createNotPassedNotSkippedSet() {

javascript/.eslintrc.json

@@ -0,0 +1,39 @@
+{
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "project": "tsconfig.json",
+    "sourceType": "module"
+  },
+  "plugins": [
+    "import",
+    "simple-import-sort",
+    "n",
+    "@typescript-eslint"
+  ],
+  "extends": [
+    "eslint:recommended",
+    "plugin:import/typescript",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:prettier/recommended"
+  ],
+  "rules": {
+    "import/no-cycle": "error",
+    "n/no-extraneous-import": "error",
+    "@typescript-eslint/ban-ts-ignore": "off",
+    "@typescript-eslint/ban-ts-comment": "off",
+    "@typescript-eslint/explicit-module-boundary-types": "off",
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/no-use-before-define": "off",
+    "@typescript-eslint/interface-name-prefix": "off",
+    "@typescript-eslint/member-delimiter-style": "off",
+    "@typescript-eslint/no-explicit-any": "error",
+    "@typescript-eslint/no-non-null-assertion": "error",
+    "simple-import-sort/imports": "error",
+    "simple-import-sort/exports": "error"
+  }
+}

javascript/.gitignore

@@ -0,0 +1,22 @@
+dist/
+.idea/
+.nyc_output/
+coverage/
+node_modules/
+yarn.lock
+*.log
+.deps
+.tested*
+.linted
+.built*
+.compared
+.codegen
+acceptance/
+storybook-static
+*-go
+*.iml
+.vscode-test
+
+# stryker temp files
+.stryker-tmp
+reports

javascript/.mocharc.json

@@ -0,0 +1,5 @@
+{
+  "loader": "ts-node/esm",
+  "extension": ["ts"],
+  "recursive": true
+}