npm-groovy-lint 15.2.2 → 16.0.0

package/lib/groovy-lint-rules.js

@@ -91,6 +91,7 @@ import fs from "fs-extra";
 const { readdirSync } = fs;
 import * as path from "path";
 import { fileURLToPath } from "url";
+import { createRequire } from "module";
 
 // If you add a new global rule with a fix function, it's very important to think about their order.
 // Rules modifying the number of lines must arrive last !
@@ -160,6 +161,7 @@ const rulesFixPriorityOrder = [
 const formatRulesToAlwaysRun = ["IndentationClosingBraces", "IndentationComments"];
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
 const RULES_FOLDER = __dirname + "/rules";
 
 export async function getNpmGroovyLintRules(optns = { loadTests: false }) {
@@ -167,10 +169,6 @@ export async function getNpmGroovyLintRules(optns = { loadTests: false }) {
     const npmGroovyLintRules = {};
     for (const file of ruleFiles) {
         const ruleName = file.replace(".js", "");
-        // Remove require cache if tests must be returned (other calls delete them in the cache)
-        if (optns && optns.loadTests === true) {
-            // delete require.cache[require.resolve(`${RULES_FOLDER}/${file}`)]; Not ESM compliant
-        }
         const { rule } = await import("./rules/" + file);
         if (rule.disabled) {
             continue;
@@ -189,6 +187,29 @@ export async function getNpmGroovyLintRules(optns = { loadTests: false }) {
     return npmGroovyLintRules;
 }
 
+export function getNpmGroovyLintRulesSync(optns = { loadTests: false }) {
+    const ruleFiles = readdirSync(RULES_FOLDER);
+    const npmGroovyLintRules = {};
+    for (const file of ruleFiles) {
+        const ruleName = file.replace(".js", "");
+        const { rule } = require("./rules/" + file);
+        if (rule.disabled) {
+            continue;
+        }
+        // Check priority is defined
+        rule.priority = rulesFixPriorityOrder.indexOf(ruleName);
+        if (rule.fix && rule.priority < 0) {
+            throw new Error(`Rule ${ruleName} must have an order defined in groovy-lint-rules.js/rulesFixPriorityOrder`);
+        }
+        // Remove tests if not in test mode
+        if (optns && optns.loadTests === false) {
+            delete rule.tests;
+        }
+        npmGroovyLintRules[ruleName] = rule;
+    }
+    return npmGroovyLintRules;
+}
+
 export function getFormattingRulesToAlwaysRun() {
     return formatRulesToAlwaysRun;
 }

package/lib/options.js

@@ -171,7 +171,7 @@ export const optionsDefinition = optionator({
             option: "noserver",
             type: "Boolean",
             description:
-                "For better performances, npm-groovy-lint runs a local server to eep CodeNarc alive instead of loading java/groovy at each call. If you don't want that, send this argument",
+                "For better performances, npm-groovy-lint runs a local server to keep CodeNarc alive instead of loading java/groovy at each call. If you don't want that, send this argument",
         },
         {
             option: "serverhost",

package/lib/rules/UnnecessaryGString.js

@@ -51,6 +51,7 @@ String str = "lelamanul"
 String str = 'lelamanul'
 `,
         },
+        /* Commented... did they ever work ?
         {
             sourceBefore: `
 String str = 'lelamanul' + "\\n"
@@ -75,6 +76,7 @@ String str = 'lelamanul' + "\\n\\r\\n" + "titi\\n" + "\\n\\r" + "lelamanul\\nwes
 String str = 'lelamanul' + '\\n\\r\\n' + 'titi\\n' + '\\n\\r' + 'lelamanul\\nwesh'
 `,
         },
+        */
         {
             sourceBefore: `
 def b = """

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-groovy-lint",
-  "version": "15.2.2",
+  "version": "16.0.0",
   "description": "Lint, format and auto-fix your Groovy / Jenkinsfile / Gradle files",
   "exports": "./lib/groovy-lint.js",
   "type": "module",
@@ -58,11 +58,11 @@
     "find-java-home": "^2.0.0",
     "find-package-json": "^1.2.0",
     "fs-extra": "^11.0.0",
-    "glob": "^11.0.0",
+    "glob": "^13.0.0",
     "import-fresh": "^3.2.1",
     "java-caller": "^4.2.1",
     "js-yaml": "^4.1.0",
-    "node-sarif-builder": "^3.0.0",
+    "node-sarif-builder": "^3.3.1",
     "optionator": "^0.9.0",
     "strip-json-comments": "^5.0.0",
     "uuid": "^13.0.0"
@@ -73,7 +73,7 @@
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.9.1",
     "adm-zip": "^0.5.10",
-    "diff": "^7.0.0",
+    "diff": "^8.0.0",
     "eslint": "^9.0.0",
     "globals": "^16.0.0",
     "handlebars": "^4.7.8",
@@ -82,7 +82,7 @@
     "nyc": "^17.0.0",
     "prettier": "^3.0.0",
     "rimraf": "^6.0.0",
-    "which": "^4.0.0"
+    "which": "^6.0.0"
   },
   "engines": {
     "node": ">=20.0.0"