npm-groovy-lint 14.5.0 → 14.6.1-beta202408252114.0

package/lib/rules/IfStatementBraces.js

@@ -3,7 +3,7 @@
 // nvuillam: Fix not always working, especially when embedded missing If statements ...
 //   let's let people correct that manually for now :)
 
-const { getOutOfBracesStrings, getStringRange, getVariable, isValidCodeLine } = require("../utils");
+import { getOutOfBracesStrings, getStringRange, getVariable, isValidCodeLine } from "../utils.js";
 
 const rule = {
     scope: "file",
@@ -14,7 +14,7 @@ const rule = {
         type: "function",
         func: (errLine, errItem) => {
             return getStringRange(errLine, "if", errItem);
-        }
+        },
     },
     fix: {
         label: "Add if statement braces",
@@ -62,7 +62,7 @@ const rule = {
                 pos++;
             }
             return allLines;
-        }
+        },
     },
     tests: [
         {
@@ -75,7 +75,7 @@ if (a == 1) {
     whatever()
 }
 `,
-            codeNarcCallsNumber: 2
+            codeNarcCallsNumber: 2,
         },
         {
             sourceBefore: `
@@ -91,7 +91,7 @@ if (new File(sfdxWorkingDir + '/.sfdx').exists() && this.promptForReloadMetadata
 else
     doRetrieve = true
 `,
-            codeNarcCallsNumber: 2
+            codeNarcCallsNumber: 2,
         },
         {
             sourceBefore: `
@@ -150,7 +150,7 @@ if (allowCreation==true) {
     }
 }
 `,
-            codeNarcCallsNumber: 2
+            codeNarcCallsNumber: 2,
         },
         {
             sourceBefore: `
@@ -159,9 +159,9 @@ if (a == 1 && ( x === 2) && something()) whatever()
             sourceAfter: `
 if (a == 1 && ( x === 2) && something()) whatever()
 `,
-            codeNarcCallsNumber: 1
-        }
-    ]
+            codeNarcCallsNumber: 1,
+        },
+    ],
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/Indentation.js

@@ -1,7 +1,7 @@
 // Indentation
 // Warning CodeNarc does not like tabs, better replace them by spaces ...
 
-const { getVariable } = require("../utils");
+import { getVariable } from "../utils.js";
 
 const rule = {
     triggers: ["IndentationClosingBraces", "IndentationComments"],
@@ -11,35 +11,35 @@ const rule = {
             name: "EXPECTED",
             regex: /The (.*) is at the incorrect indent level: Expected column (.*) but was (.*)/,
             regexPos: 2,
-            type: "number"
+            type: "number",
         },
         {
             name: "EXPECTED_LIST",
             regex: /The (.*) is at the incorrect indent level: Expected one of columns (.*) but was (.*)/,
             regexPos: 2,
-            type: "array"
+            type: "array",
         },
         {
             name: "EXPECTED_LIST_CHAINING",
             regex: /The (.*) is at the incorrect indent level: Depending on your chaining style, expected one of (.*) or one of (.*) columns, but was (.*)/,
             regexPos: 2,
-            type: "array"
+            type: "array",
         },
         {
             name: "FOUND",
             regex: /The (.*) is at the incorrect indent level: Expected column (.*) but was (.*)/,
             regexPos: 3,
-            type: "number"
-        }
+            type: "number",
+        },
     ],
     range: {
         type: "function",
         func: (errLine, errItem, evaluatedVars) => {
             return {
                 start: { line: errItem.line, character: 0 },
-                end: { line: errItem.line, character: getVariable(evaluatedVars, "FOUND") - 1 }
+                end: { line: errItem.line, character: getVariable(evaluatedVars, "FOUND") - 1 },
             };
-        }
+        },
     },
     fix: {
         label: "Correct Indentation",
@@ -55,7 +55,7 @@ const rule = {
             const startSpaces = expected === 0 ? 0 : expected - 1;
             line = " ".repeat(startSpaces) + line.trimStart();
             return line;
-        }
+        },
     },
     tests: [
         {
@@ -66,7 +66,7 @@ x = 1
             sourceAfter: `
 if (a == 2){
     x = 1
-}`
+}`,
         },
         {
             sourceBefore: `
@@ -104,9 +104,9 @@ docker.withRegistry("https://"+ envVars.GetDockerRegistry(), envVars.GetDockerRe
         }
     }
 }
-`
-        }
-    ]
+`,
+        },
+    ],
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/IndentationClosingBraces.js

@@ -1,4 +1,4 @@
-const { containsExceptInsideString } = require("../utils");
+import { containsExceptInsideString } from "../utils.js";
 
 // Indentation closing braces
 const rule = {
@@ -7,7 +7,7 @@ const rule = {
     fix: {
         label: "Fix indentation closing braces",
         type: "function",
-        func: allLines => {
+        func: (allLines) => {
             const newFileLines = [];
             for (let i = 0; i < allLines.length; i++) {
                 let line = allLines[i] + "";
@@ -41,7 +41,7 @@ const rule = {
                 newFileLines.push(line);
             }
             return newFileLines;
-        }
+        },
     },
     tests: [
         {
@@ -58,7 +58,7 @@ try {
 } catch { 
     whateverelse()
 }
-`
+`,
         },
         {
             sourceBefore: `
@@ -97,9 +97,9 @@ docker.withRegistry("https://"+ envVars.GetDockerRegistry(), envVars.GetDockerRe
         }
     }
 }
-    `
-        }
-    ]
+    `,
+        },
+    ],
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/IndentationComments.js

@@ -6,7 +6,7 @@ const rule = {
     fix: {
         label: "Fix indentation",
         type: "function",
-        func: allLines => {
+        func: (allLines) => {
             const newFileLines = [];
             for (let i = 0; i < allLines.length; i++) {
                 let line = allLines[i];
@@ -29,7 +29,7 @@ const rule = {
                 newFileLines.push(line);
             }
             return newFileLines;
-        }
+        },
     },
     tests: [
         {
@@ -40,9 +40,9 @@ const rule = {
             sourceAfter: `
     // comments should be aligned with line after
     whateverelse()
-`
-        }
-    ]
+`,
+        },
+    ],
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/InsecureRandom.js

@@ -1,5 +1,5 @@
 // Insecure use of Random
-const { addImport, getVariable, getVariableRange } = require("../utils");
+import { addImport, getVariable, getVariableRange } from "../utils.js";
 
 const rule = {
     scope: "file",
@@ -7,14 +7,14 @@ const rule = {
     variables: [
         {
             name: "RANDOM_REFERENCE",
-            regex: /Using (.*) is insecure. Use SecureRandom instead/
-        }
+            regex: /Using (.*) is insecure. Use SecureRandom instead/,
+        },
     ],
     range: {
         type: "function",
         func: (errLine, errItem, evaluatedVars) => {
             return getVariableRange(errLine, evaluatedVars, "RANDOM_REFERENCE", errItem);
-        }
+        },
     },
     fix: {
         label: "Replace by SecureRandom use",
@@ -36,7 +36,7 @@ const rule = {
             allLines[lineNumber] = line;
             allLines = addImport(allLines, "java.security.SecureRandom");
             return allLines;
-        }
+        },
     },
     tests: [
         {
@@ -53,7 +53,7 @@ def r2 = new SecureRandom()
 def r3 = new SecureRandom().nextDouble()
 def r4 = new SecureRandom().nextDouble()
 def r5 = "lelamanul"+new SecureRandom().nextDouble()+"_yeah_"+new SecureRandom().nextDouble()
-`
+`,
         },
         {
             sourceBefore: `
@@ -80,7 +80,7 @@ def r2 = new SecureRandom()
 def r3 = new SecureRandom().nextDouble()
 def r4 = new SecureRandom().nextDouble()
 def r5 = "lelamanul"+new SecureRandom().nextDouble()+"_yeah_"+new SecureRandom().nextDouble()
-`
+`,
         },
         {
             sourceBefore: `
@@ -103,7 +103,7 @@ def r2 = new SecureRandom()
 def r3 = new SecureRandom().nextDouble()
 def r4 = new SecureRandom().nextDouble()
 def r5 = "lelamanul"+new SecureRandom().nextDouble()+"_yeah_"+new SecureRandom().nextDouble()
-`
+`,
         },
         {
             sourceBefore: `def r1 = new Random()
@@ -119,7 +119,7 @@ def r2 = new SecureRandom()
 def r3 = new SecureRandom().nextDouble()
 def r4 = new SecureRandom().nextDouble()
 def r5 = "lelamanul"+new SecureRandom().nextDouble()+"_yeah_"+new SecureRandom().nextDouble()
-`
+`,
         },
         {
             sourceBefore: `/* blablabla */
@@ -138,7 +138,7 @@ def r2 = new SecureRandom()
 def r3 = new SecureRandom().nextDouble()
 def r4 = new SecureRandom().nextDouble()
 def r5 = "lelamanul"+new SecureRandom().nextDouble()+"_yeah_"+new SecureRandom().nextDouble()
-`
+`,
         },
         {
             sourceBefore: `/* blablabla */
@@ -162,9 +162,9 @@ def r2 = new SecureRandom()
 def r3 = new SecureRandom().nextDouble()
 def r4 = new SecureRandom().nextDouble()
 def r5 = "lelamanul"+new SecureRandom().nextDouble()+"_yeah_"+new SecureRandom().nextDouble()
-`
-        }
-    ]
+`,
+        },
+    ],
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/JavaIoPackageAccess.js

@@ -1,6 +1,6 @@
 // No use of Java.io classes
 
-const { getLastVariableRange } = require("../utils");
+import { getLastVariableRange } from "../utils.js";
 
 //NV: TODO: finalise for when there is several occurrences of the string in the same line
 const rule = {
@@ -9,15 +9,15 @@ const rule = {
         {
             name: "CLASSNAME",
             regex: /The use of java.io.(.*) violates the Enterprise Java Bean specification/,
-            regexPos: 1
-        }
+            regexPos: 1,
+        },
     ],
     range: {
         type: "function",
         func: (errLine, errItem, evaluatedVars) => {
             return getLastVariableRange(errLine, evaluatedVars, "CLASSNAME", errItem);
-        }
-    }
+        },
+    },
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/MethodCount.js

@@ -1,21 +1,21 @@
 // Too many methods in a class
 
-const { getVariableRange } = require("../utils");
+import { getVariableRange } from "../utils.js";
 
 const rule = {
     variables: [
         {
             name: "CLASSNAME",
             regex: /Class (.*) has 52 methods/,
-            regexPos: 1
-        }
+            regexPos: 1,
+        },
     ],
     range: {
         type: "function",
         func: (errLine, errItem, evaluatedVars) => {
             return getVariableRange(errLine, evaluatedVars, "CLASSNAME", errItem);
-        }
-    }
+        },
+    },
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/MethodParameterTypeRequired.js

@@ -1,21 +1,21 @@
 // Too many methods in a class
 
-const { getVariableRange } = require("../utils");
+import { getVariableRange } from "../utils.js";
 
 const rule = {
     variables: [
         {
             name: "METHODNAME",
             regex: /"(.*)" parameter of "(.*)" method is dynamically typed/,
-            regexPos: 1
-        }
+            regexPos: 1,
+        },
     ],
     range: {
         type: "function",
         func: (errLine, errItem, evaluatedVars) => {
             return getVariableRange(errLine, evaluatedVars, "METHODNAME", errItem);
-        }
-    }
+        },
+    },
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/MethodReturnTypeRequired.js

@@ -1,21 +1,21 @@
 // Too many methods in a class
 
-const { getVariableRange } = require("../utils");
+import { getVariableRange } from "../utils.js";
 
 const rule = {
     variables: [
         {
             name: "METHODNAME",
             regex: /Method "(.*)" has a dynamic return type/,
-            regexPos: 1
-        }
+            regexPos: 1,
+        },
     ],
     range: {
         type: "function",
         func: (errLine, errItem, evaluatedVars) => {
             return getVariableRange(errLine, evaluatedVars, "METHODNAME", errItem);
-        }
-    }
+        },
+    },
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/MisorderedStaticImports.js

@@ -8,12 +8,12 @@ Update list following format
 }
 */
 function addInImportsList(importsLs, commentLine, importLine) {
-    const commentImportObjs = importsLs.filter(importObj => importObj.commentLine === commentLine);
+    const commentImportObjs = importsLs.filter((importObj) => importObj.commentLine === commentLine);
     const commentImportObj = commentImportObjs && commentImportObjs[0] ? commentImportObjs[0] : { commentLine: commentLine, importLines: [] };
     commentImportObj.importLines.push(importLine);
     commentImportObj.importLines.sort();
     if (commentImportObjs && commentImportObjs.length > 0) {
-        importsLs = importsLs.map(importObj => (importObj.commentLine === commentLine ? commentImportObj : importObj));
+        importsLs = importsLs.map((importObj) => (importObj.commentLine === commentLine ? commentImportObj : importObj));
     } else {
         importsLs.push(commentImportObj);
     }
@@ -40,7 +40,7 @@ const rule = {
     fix: {
         label: "Reorder imports",
         type: "function",
-        func: allLines => {
+        func: (allLines) => {
             let lastCommentFound = "";
             let lastCommentFoundPos = null;
             let firstCommentFoundPos = null;
@@ -48,7 +48,7 @@ const rule = {
             let lastImportFoundPos = null;
             const imports = {
                 static: [],
-                normal: []
+                normal: [],
             };
             let pos = 0;
             // Parse all lines and store what we need in imports object
@@ -61,13 +61,13 @@ const rule = {
                     // Import static line
                     if (line.trimStart().startsWith("import static")) {
                         const commentKey =
-                            imports.normal.filter(importObj => importObj.commentLine === lastCommentFound).length === 0 ? lastCommentFound : "";
+                            imports.normal.filter((importObj) => importObj.commentLine === lastCommentFound).length === 0 ? lastCommentFound : "";
                         imports.static = addInImportsList(imports.static, commentKey, line);
                     }
                     // Import line
                     else {
                         const commentKey =
-                            imports.static.filter(importObj => importObj.commentLine === lastCommentFound).length === 0 ? lastCommentFound : "";
+                            imports.static.filter((importObj) => importObj.commentLine === lastCommentFound).length === 0 ? lastCommentFound : "";
                         imports.normal = addInImportsList(imports.normal, commentKey, line);
                     }
                     // Update positions for later build of ordered imports with comments
@@ -77,8 +77,8 @@ const rule = {
                         firstCommentFoundPos || firstCommentFoundPos === 0
                             ? firstCommentFoundPos
                             : lastCommentFound === ""
-                            ? null
-                            : lastCommentFoundPos;
+                              ? null
+                              : lastCommentFoundPos;
                 }
                 pos++;
             }
@@ -89,7 +89,7 @@ const rule = {
             const startPos = firstCommentFoundPos ? Math.min(firstCommentFoundPos, firstImportFoundPos) : firstImportFoundPos;
             allLines.splice(startPos, lastImportFoundPos - startPos + 1, ...allImportLines);
             return allLines;
-        }
+        },
     },
 
     tests: [
@@ -137,7 +137,7 @@ import java.io.File
 import after.all.does.it.work
 
 // The rest of the file below ...
-`
+`,
         },
         {
             sourceBefore: `
@@ -176,7 +176,7 @@ import java.io.File
 import after.all.does.it.work
 
 // The rest of the file below ...
-`
+`,
         } /*,
         {
             sourceBefore: `
@@ -230,8 +230,8 @@ import after.all.does.it.work
 
 // The rest of the file below ...
 `
-        } */
-    ]
+        } */,
+    ],
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/MissingBlankLineAfterImports.js

@@ -1,6 +1,6 @@
 // Missing blank lines after import
 
-const { getVariable } = require("../utils");
+import { getVariable } from "../utils.js";
 
 const rule = {
     scope: "file",
@@ -12,7 +12,7 @@ const rule = {
             const lineNumber = getVariable(variables, "lineNb", { mandatory: true });
             allLines.splice(lineNumber, 0, "");
             return allLines;
-        }
+        },
     },
     tests: [
         {
@@ -28,9 +28,9 @@ import g.eeee.f.g.Hhhhh
 import g.eeee.f.g.Iiii
 
 def a = 1
-`
-        }
-    ]
+`,
+        },
+    ],
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/MissingBlankLineAfterPackage.js

@@ -1,6 +1,6 @@
 // Missing blank lines after package
 
-const { getVariable } = require("../utils");
+import { getVariable } from "../utils.js";
 
 const rule = {
     scope: "file",
@@ -12,7 +12,7 @@ const rule = {
             const lineNumber = getVariable(variables, "lineNb", { mandatory: true });
             allLines.splice(lineNumber + 1, 0, "");
             return allLines;
-        }
+        },
     },
     tests: [
         {
@@ -28,9 +28,9 @@ package com.lelama.nul
 import a.b.c.D
 import g.eeee.f.g.Hhhhh
 import g.eeee.f.g.Iiii
-`
-        }
-    ]
+`,
+        },
+    ],
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/NoDef.js

@@ -1,14 +1,14 @@
 // No use of def
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {
         type: "function",
         func: (errLine, errItem) => {
             return getStringRange(errLine, "def", errItem);
-        }
-    }
+        },
+    },
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/NoJavaUtilDate.js

@@ -1,14 +1,14 @@
 // No use of Java.util.date
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {
         type: "function",
         func: (errLine, errItem) => {
             return getStringRange(errLine, "Date", errItem);
-        }
-    }
+        },
+    },
 };
 
-module.exports = { rule };
+export { rule };

package/lib/rules/NoTabCharacter.js

@@ -1,20 +1,20 @@
 // No tab character
 
-const { getIndentLength } = require("../utils");
+import { getIndentLength } from "../utils.js";
 
 const rule = {
     scope: "file",
     fix: {
         label: "Replace tabs by spaces in all file",
         type: "function",
-        func: allLines => {
+        func: (allLines) => {
             const newFileLines = [];
             const replaceChars = " ".repeat(getIndentLength());
             for (const line of allLines) {
                 newFileLines.push(line.replace(/\t/g, replaceChars));
             }
             return newFileLines;
-        }
+        },
     },
     tests: [
         {
@@ -31,9 +31,9 @@ try {
 } catch(Exception){
     whateverelse(    )
 }
-`
-        }
-    ]
+`,
+        },
+    ],
 };
 
-module.exports = { rule };
+export { rule };