npm-groovy-lint 13.0.3-beta202312070716.0 → 13.0.3-beta202312161435.0

package/lib/codenarc-caller.js

@@ -130,45 +130,44 @@ class CodeNarcCaller {
             };
         }
 
-        // Success result
-        if (response.data && response.data.status === "success") {
+        if (response.data.status === "success") {
+            // Success result
             return {
-                codeNarcJsonResult: await this.getCodeNarcJsonResult(response),
+                codeNarcJsonResult: response.data.jsonResult,
                 fileList: response.data.fileList,
                 parseErrors: response.data.parseErrors,
                 codeNarcStdOut: response.data.stdout,
-                codeNarcStdErr: response.data.stderr,
+                codeNarcStdErr: undefined,
                 status: 0
             };
         }
-        /*
-        // Cancelled codeNarcAction (duplicate) (TODO: Update CodeNarcServer.groovy to cleanly stop task and not kill the thread !)
-        else if (response.data && response.data.status === "cancelledByDuplicateRequest") {
+
+        if (response.data.status === "cancelledByDuplicateRequest") {
+            // Cancelled codeNarcAction (duplicate)
             return {
-                codeNarcStdOut: response.data.stdout,
-                codeNarcStdErr: response.data.stderr,
+                codeNarcStdOut: undefined,
+                codeNarcStdErr: undefined,
                 status: 9
             };
-        }*/
+        }
+
         // Codenarc error
-        else {
-            return {
-                fileList: response.data.fileList,
-                parseErrors: response.data.parseErrors,
-                codeNarcJsonResult: await this.getCodeNarcJsonResult(response),
-                codeNarcStdOut: response.data.stdout,
-                codeNarcStdErr: response.data.stderr || response.data.errorDtl,
-                status: 1,
-                error: {
-                    msg: "CodeNarc error",
-                    msgDtl: {
-                        parseErrors: response.data.parseErrors,
-                        stdout: response.data.stdout,
-                        stderr: response.data.stderr || response.data.errorDtl
-                    }
+        return {
+            fileList: response.data.fileList,
+            parseErrors: response.data.parseErrors,
+            codeNarcJsonResult: response.data.jsonResult,
+            codeNarcStdOut: response.data.stdout,
+            codeNarcStdErr: response.data.errorDtl,
+            status: 1,
+            error: {
+                msg: `CodeNarc exception: ${response.data.exceptionType} message: ${response.data.errorMessage}`,
+                msgDtl: {
+                    parseErrors: response.data.parseErrors,
+                    stdout: response.data.stdout,
+                    stderr: response.data.errorDtl
                 }
-            };
-        }
+            }
+        };
     }
 
     // Call CodeNard java class

package/lib/codenarc-factory.js

@@ -188,7 +188,7 @@ async function prepareCodeNarcCall(options) {
  * Converts a path with forward slashes to backslashes.
  *
  * @param {string} path The path to convert
- * @returns The converted path
+ * @return The converted path
  */
 function antPath(path) {
     return path.replace(/\\/gu, "/");
@@ -216,7 +216,7 @@ async function getCodeNarcBaseDirFromFiles(positionalArgs) {
 // Parse XML result file as js object
 async function parseCodeNarcResult(options, codeNarcBaseDir, codeNarcJsonResult, tmpGroovyFileName, parseErrors) {
     if (!codeNarcJsonResult || !codeNarcJsonResult.codeNarc || !codeNarcJsonResult.packages) {
-        const errMsg = `Unable to use CodeNarc JSON result\n ${JSON.stringify(codeNarcJsonResult)}`;
+        const errMsg = `Unable to use CodeNarc JSON result\n${JSON.stringify(codeNarcJsonResult)}`;
         console.error(errMsg);
         return {
             status: 2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-groovy-lint",
-  "version": "13.0.3-beta202312070716.0",
+  "version": "13.0.3-beta202312161435.0",
   "description": "Lint, format and auto-fix your Groovy / Jenkinsfile / Gradle files",
   "main": "index.js",
   "scripts": {
@@ -59,12 +59,10 @@
     "fs-extra": "^8.1.0",
     "glob": "^7.1.6",
     "import-fresh": "^3.2.1",
-    "ip": "^1.1.5",
     "java-caller": "^3.2.0",
     "js-yaml": "^4.1.0",
     "node-sarif-builder": "^2.0.3",
     "optionator": "^0.8.3",
-    "semver": "^7.1.3",
     "strip-json-comments": "^3.0.1",
     "uuid": "^8.2.0"
   },