code updates

Author: agracio

.gitignore

@@ -14,3 +14,4 @@ report1/
 tests/data/tmp/
 jest.json
 *.xml
+tester.js

.npmignore

@@ -15,3 +15,4 @@ jest.config.js
 jest.json
 junit.xml
 *.xml
+tester.js

index.d.ts

@@ -14,38 +14,52 @@ declare module 'junit-converter'{
     }
 
     /**
-     * Test suite JSON representation
+     * JUnit JSON structure from XML
      */
+    interface TestSuites {
+        testsuites: Array<{
+            name?: string;
+            classname?: string;
+            tests: string | number;
+            failures: string | number;
+            errors?: string | number;
+            skipped: string | number;
+            disabled?: string | number;
+            assertions?: string | number;
+            time: string | number;
+            timestamp?: string;
+            testsuite: TestSuite[];
+        }>;
+    }
+
     interface TestSuite {
         name: string;
-        tests: string;
-        failures: string;
-        skipped: string;
-        time: string;
-        testcase: TestCase[];
+        classname?: string;
         file?: string;
+        tests: string | number;
+        passed?: string | number;
+        failures: string | number;
+        errors?: string | number;
+        skipped: string | number;
+        disabled?: string | number;
+        time: string | number;
+        timestamp?: string;
+        testcase: TestCase[];
     }
-    /**
-     * Test case JSON representation
-     */
+
     interface TestCase {
-        classname: string;
         name: string;
-        time: number;
-        status?: string;
-        [key: string]: any;
-    }
-    /**
-     * Test suites JSON structure
-     */
-    interface TestSuites {
-        testsuites: Array<{
-            time?: string | number;
-            testsuite: TestSuite[];
-        }>;
+        classname: string;
+        status: string;
+        time: string;
+        failure?: any;
+        error?: any;
+        properties?: any;
+        skipped?: any;
+        'system-out'?: any;
+        'system-err'?: any;
     }
 
-
     /**
      * Convert test report to JUnit XML and write to file async.
      *
@@ -69,6 +83,4 @@ declare module 'junit-converter'{
      * @return {Promise<object>}
      */
     function toJson(options: TestReportConverterOptions): Promise<TestSuites>;
-}
-
-
+}

lib/junit.js

@@ -40,15 +40,15 @@
     "MSTest"
   ],
   "dependencies": {
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "p3x-xml2json": "^2025.4.123",
     "xml-formatter": "^3.6.7",
     "xslt-processor": "^3.4.0",
     "yargs": "^18.0.0"
   },
   "devDependencies": {
-    "@types/lodash": "^4.17.21",
-    "@types/node": "^24.10.1",
+    "@types/lodash": "^4.17.23",
+    "@types/node": "^25.2.1",
     "jest": "^30.2.0",
     "jest-junit": "^16.0.0",
     "ts-jest": "^29.4.6",

lib/junit.js.map

@@ -43,34 +43,50 @@ export interface XmlParserOptions {
     sanitize: boolean;
     reversible: boolean;
 }
+
 /**
- * Test suite JSON representation
+ * JUnit JSON structure from XML
  */
+export interface TestSuites {
+    testsuites: Array<{
+        name?: string;
+        classname?: string;
+        tests: string | number;
+        failures: string | number;
+        errors?: string | number;
+        skipped: string | number;
+        disabled?: string | number;
+        assertions?: string | number;
+        time: string | number;
+        timestamp?: string;
+        testsuite: TestSuite[];
+    }>;
+}
+
 export interface TestSuite {
     name: string;
-    tests: string;
-    failures: string;
-    skipped: string;
-    time: string;
-    testcase: TestCase[];
+    classname?: string;
     file?: string;
+    tests: string | number;
+    passed?: string | number;
+    failures: string | number;
+    errors?: string | number;
+    skipped: string | number;
+    disabled?: string | number;
+    time: string | number;
+    timestamp?: string;
+    testcase: TestCase[];
 }
-/**
- * Test case JSON representation
- */
+
 export interface TestCase {
-    classname: string;
     name: string;
-    time: number;
-    status?: string;
-    [key: string]: any;
-}
-/**
- * Test suites JSON structure
- */
-export interface TestSuites {
-    testsuites: Array<{
-        time?: string | number;
-        testsuite: TestSuite[];
-    }>;
+    classname: string;
+    status: string;
+    time: string;
+    failure?: any;
+    error?: any;
+    properties?: any;
+    skipped?: any;
+    'system-out'?: any;
+    'system-err'?: any;
 }

package-lock.json

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import xmlFormat from 'xml-formatter';
 import * as _ from 'lodash';
-const parser: any = require('p3x-xml2json');
+import {toJson, toXml} from 'p3x-xml2json';
 import { ConverterOptions, XmlParserOptions, TestSuites, TestCase } from './interfaces';
 
 /**
@@ -89,7 +89,7 @@ export class XmlProcessor {
         let json: TestSuites;
 
         try {
-            json = parser.toJson(xml, xmlParserOptions) as TestSuites;
+            json = toJson(xml, xmlParserOptions) as TestSuites;
         } catch (e) {
             throw new Error(
                 `Could not parse JSON from converted XML ${options.testFile}.\n ${
@@ -130,7 +130,7 @@ export class XmlProcessor {
 
         // Convert back to XML and format
         xmlParserOptions.sanitize = true;
-        const xmlOutput = parser.toXml(json, xmlParserOptions);
+        const xmlOutput = toXml(json, xmlParserOptions);
 
         return options.minify
             ? xmlFormat.minify(xmlOutput, { forceSelfClosingEmptyTag: true })

package.json

@@ -0,0 +1,4 @@
+declare module 'p3x-xml2json' {
+    export function toJson(data: any, opts: any): string | object;
+    export function toXml(data: any, opts: any): string;
+}