npm-groovy-lint 14.0.1 → 14.1.1-beta202401152058.0

package/lib/codenarc-caller.js

@@ -6,7 +6,6 @@ const trace = require("debug")("npm-groovy-lint-trace");
 const { JavaCaller } = require("java-caller");
 const optionsDefinition = require("./options");
 const { performance } = require("perf_hooks");
-const { getSourceLines } = require("./utils");
 const c = require("chalk");
 
 // Request over IPv4 because Java typically prefers it.
@@ -68,9 +67,8 @@ class CodeNarcCaller {
                 codeNarcBaseDir: this.execOpts.codeNarcBaseDir,
                 codeNarcIncludes: this.execOpts.codeNarcIncludes,
                 codeNarcExcludes: this.execOpts.codeNarcExcludes,
-                parse: this.options.parse !== false && this.execOpts.onlyCodeNarc === false ? true : false,
-                file: this.execOpts.groovyFileName || null,
-                fileList: this.execOpts.inputFileList || null,
+                parse: this.options.parse !== false && this.execOpts.onlyCodeNarc === false,
+                fileList: this.execOpts.groovyFileName ? [this.execOpts.groovyFileName] : this.execOpts.inputFileList,
                 requestKey: this.execOpts.requestKey || null
             },
             timeout: 600000
@@ -93,9 +91,17 @@ class CodeNarcCaller {
                 if ((await this.startCodeNarcServer()) && this.serverStatus === "running") {
                     return await this.callCodeNarcServer(true);
                 }
-            }
-            // Cancelled codeNarcAction (duplicate)
-            else if (e.code && e.code === "ECONNRESET") {
+            } else if (e.code === "ERR_BAD_REQUEST") {
+                // Bad request.
+                return {
+                    status: e.response.data.statusCode,
+                    error: {
+                        msg: `exception: ${e.response.data.exceptionType} message: ${e.response.data.errorMessage}`,
+                        stack: e.stack,
+                        responseData: e.response.data.errorDtl
+                    }
+                };
+            } else if (e.code === "ECONNRESET") {
                 // The server was shutdown just retry.
                 if (startServerTried === false && (await this.startCodeNarcServer()) && this.serverStatus === "running") {
                     return await this.callCodeNarcServer(true);
@@ -110,12 +116,7 @@ class CodeNarcCaller {
             } else {
                 console.error(
                     c.red(
-                        "CodeNarcServer unexpected error:\n" +
-                            JSON.stringify(e, null, 2) +
-                            "\n" +
-                            (e.response && e.response.data && e.response.data.errorDtl
-                                ? JSON.stringify(e.response.data.errorDtl, null, 2)
-                                : undefined)
+                        "CodeNarcServer unexpected error:\n" + JSON.stringify(e, null, 2) + "\n" + JSON.stringify(e.response?.data?.errorDtl, null, 2)
                     )
                 );
             }
@@ -125,7 +126,7 @@ class CodeNarcCaller {
                 error: {
                     msg: e.message,
                     stack: e.stack,
-                    responseData: e.response && e.response.data && e.response.data.errorDtl ? e.response.data.errorDtl : undefined
+                    responseData: e.response?.data?.errorDtl
                 }
             };
         }
@@ -160,7 +161,7 @@ class CodeNarcCaller {
             codeNarcStdErr: response.data.errorDtl,
             status: 1,
             error: {
-                msg: `CodeNarc exception: ${response.data.exceptionType} message: ${response.data.errorMessage}`,
+                msg: `exception: ${response.data.exceptionType} message: ${response.data.errorMessage}`,
                 msgDtl: {
                     parseErrors: response.data.parseErrors,
                     stdout: response.data.stdout,
@@ -173,7 +174,19 @@ class CodeNarcCaller {
     // Call CodeNard java class
     async callCodeNarcJava(secondAttempt = false) {
         // Build java codenarc command (request to launch server for next call except if --noserver is sent)
-        const scriptArgs = this.codenarcArgs;
+        const scriptArgs = [...this.codenarcArgs]; // Take a copy of the args so we can modify it.
+
+        if (this.options.parse !== false && this.execOpts.onlyCodeNarc === false) {
+            scriptArgs.unshift("--parse");
+        }
+
+        if (this.execOpts.groovyFileName) {
+            scriptArgs.unshift("--file", this.execOpts.groovyFileName);
+        } else if (this.execOpts.inputFileList) {
+            this.execOpts.inputFileList.forEach(file => {
+                scriptArgs.unshift("--file", file);
+            });
+        }
 
         // Start progress bar
         trace(`CALL CodeNarcJava with ${scriptArgs.join(" ")}`);
@@ -239,8 +252,11 @@ class CodeNarcCaller {
             }
         }
 
+        const response = await this.getCodeNarcServerJson(javaResult.stdout);
         return {
-            codeNarcJsonResult: await this.getCodeNarcJsonResult(javaResult.stdout),
+            codeNarcJsonResult: response.jsonResult,
+            fileList: response.fileList,
+            parseErrors: response.parseErrors,
             codeNarcStdOut: javaResult.stdout,
             codeNarcStdErr: javaResult.stderr,
             status: 0
@@ -411,19 +427,19 @@ class CodeNarcCaller {
         return (this.options.serverhost || serverOptions.serverhost) + ":" + (this.options.serverport || serverOptions.serverport);
     }
 
-    // Retrieve JSON result in CodeNarc stdout
-    async getCodeNarcJsonResult(response) {
-        const stdout = typeof response === "string" ? response : response && response.data && response.data.stdout ? response.data.stdout : null;
-        if (stdout) {
-            const outputLineLs = await getSourceLines(stdout);
-            const jsonLine = outputLineLs[1] && outputLineLs[1].startsWith("{") ? outputLineLs[1] : outputLineLs[0];
-            try {
-                return JSON.parse(jsonLine);
-            } catch (e) {
-                return { err: "Unable to parse " + stdout };
-            }
+    /**
+     * Parse JSON result from CodeNarcServer.
+     *
+     * @param {string} response the response from CodeNarcServer
+     * @returns {Promise<*>}
+     * @private
+     */
+    async getCodeNarcServerJson(response) {
+        try {
+            return JSON.parse(response);
+        } catch (e) {
+            return { err: `Unable to parse ${response}` };
         }
-        return {};
     }
 }
 

package/lib/java/logback.xml

@@ -5,6 +5,25 @@
   <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
   <import class="ch.qos.logback.core.ConsoleAppender"/>
 
+  <if condition='isDefined("logging.appender.file.level")'>
+    <then>
+      <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>${logging.appender.file.fileName:-npm-groovy-lint.log}</file>
+        <append>${logging.appender.file.append:-true}</append>
+        <immediateFlush>${logging.appender.file.flush:-true}</immediateFlush>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+          <level>${logging.appender.file.level:-OFF}</level>
+        </filter>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+      </appender>
+      <root>
+        <appender-ref ref="FILE"/>
+      </root>
+    </then>
+  </if>
+
   <appender name="STDERR" class="ConsoleAppender">
     <target>System.err</target>
     <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -15,20 +34,7 @@
     </encoder>
   </appender>
 
-  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-    <file>${logging.appender.file.fileName:-logback.log}</file>
-    <append>true</append>
-    <immediateFlush>true</immediateFlush>
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>${logging.appender.file.level:-OFF}</level>
-    </filter>
-    <encoder>
-        <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
   <root>
-    <appender-ref ref="FILE"/>
     <appender-ref ref="STDERR"/>
   </root>
 </configuration>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-groovy-lint",
-  "version": "14.0.1",
+  "version": "14.1.1-beta202401152058.0",
   "description": "Lint, format and auto-fix your Groovy / Jenkinsfile / Gradle files",
   "main": "index.js",
   "scripts": {