More ESM

lib/codenarc-caller.js

@@ -8,6 +8,7 @@ import { JavaCaller } from "java-caller";
 import { optionsDefinition } from "./options.js";
 import { performance } from 'node:perf_hooks';
 import * as c from "chalk";
+import * as findJavaHome from 'find-java-home';
 import * as path from "path";
 import { fileURLToPath } from "node:url";
 
@@ -238,14 +239,11 @@ export class CodeNarcCaller {
                     reason =
                         "It seems node.js has not been found on your computer. Please install a recent node.js: https://nodejs.org/en/download/\nIf node is already installed, make sure your PATH contains node installation folder: https://love2dev.com/blog/node-is-not-recognized-as-an-internal-or-external-command/";
                 } else {
-                    await new Promise((resolve) => {
-                        require("find-java-home")((err) => {
-                            if (err) {
-                                reason =
-                                    "Java is required to run npm-groovy-lint, as CodeNarc is written in Java/Groovy. Please install Java (version 8 minimum) https://www.java.com/download";
-                            }
-                            resolve();
-                        });
+                    await findJavaHome({ allowJre: true }, (err) => {
+                        if (err) {
+                            reason =
+                                "Java is required to run npm-groovy-lint, as CodeNarc is written in Java/Groovy. Please install Java (version 8 minimum) https://www.java.com/download";
+                        }
                     });
                 }
                 return {

lib/groovy-lint-rules.js

@@ -170,9 +170,9 @@ export async function getNpmGroovyLintRules(optns = { loadTests: false }) {
         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}`)];
+            // delete require.cache[require.resolve(`${RULES_FOLDER}/${file}`)]; Not ESM compliant
         }
-        const { rule } = await import(path.join(".", "rules", file));
+        const { rule } = await import("./rules/" + file);
         if (rule.disabled) {
             continue;
         }

lib/rules/AssignmentInConditional.js

@@ -1,6 +1,6 @@
 // Assignment in condition
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/BlankLineBeforePackage.js

@@ -1,6 +1,6 @@
 // Blank line before package
 
-const { getVariable } = require("../utils");
+import { getVariable } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/BlockEndsWithBlankLine.js

@@ -1,6 +1,6 @@
 // Unused import
 
-const { getVariable } = require("../utils");
+import { getVariable } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/BlockStartsWithBlankLine.js

@@ -1,6 +1,6 @@
 // Unused import
 
-const { getVariable } = require("../utils");
+import { getVariable } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/BracesForClass.js

@@ -1,6 +1,6 @@
 // Braces for class
 
-const { moveOpeningBracket, findRangeBetweenStrings } = require("../utils");
+import { moveOpeningBracket, findRangeBetweenStrings } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/BracesForForLoop.js

@@ -1,6 +1,6 @@
 // Braces for for loop
 
-const { getVariable, moveOpeningBracket, findRangeBetweenStrings } = require("../utils");
+import { getVariable, moveOpeningBracket, findRangeBetweenStrings } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/BracesForIfElse.js

@@ -1,6 +1,6 @@
 // Braces for if else
 
-const { moveOpeningBracket, findRangeBetweenStrings } = require("../utils");
+import { moveOpeningBracket, findRangeBetweenStrings } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/BracesForMethod.js

@@ -1,6 +1,6 @@
 // Braces for method
 
-const { moveOpeningBracket, findRangeBetweenStrings, getVariable } = require("../utils");
+import { moveOpeningBracket, findRangeBetweenStrings, getVariable } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/BracesForTryCatchFinally.js

@@ -1,6 +1,6 @@
 // Braces for try catch finally
 
-const { moveOpeningBracket, findRangeBetweenStrings } = require("../utils");
+import { moveOpeningBracket, findRangeBetweenStrings } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/CatchException.js

@@ -1,5 +1,5 @@
 // Exception type must not be used
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/ClassEndsWithBlankLine.js

@@ -1,6 +1,6 @@
 // Unused import
 
-const { getVariable } = require("../utils");
+import { getVariable } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/ClassStartsWithBlankLine.js

@@ -1,6 +1,6 @@
 // Unused import
 
-const { getVariable } = require("../utils");
+import { getVariable } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/ConsecutiveBlankLines.js

@@ -1,6 +1,6 @@
 // Consecutive blank lines
 
-const { getVariable } = require("../utils");
+import { getVariable } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/DuplicateImport.js

@@ -1,6 +1,6 @@
 // Duplicate import
 
-const { getVariable } = require("../utils");
+import { getVariable } from "../utils.js";
 
 const rule = {
     scope: "file",

lib/rules/DuplicateNumberLiteral.js

@@ -1,6 +1,6 @@
 // Duplicate number literal
 
-const { getVariableRange } = require("../utils");
+import { getVariableRange } from "../utils.js";
 
 const rule = {
     variables: [

lib/rules/DuplicateStringLiteral.js

@@ -1,6 +1,6 @@
 // Duplicate string literal
 
-const { getVariableRange } = require("../utils");
+import { getVariableRange } from "../utils.js";
 
 const rule = {
     variables: [

lib/rules/ElseBlockBraces.js

@@ -1,5 +1,5 @@
 // Missing else braces
-const { containsOtherThan, getStringRangeMultiline, getVariable, isValidCodeLine } = require("../utils");
+import { containsOtherThan, getStringRangeMultiline, getVariable, isValidCodeLine } from "../utils";
 
 const rule = {
     scope: "file",

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",

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"],

lib/rules/IndentationClosingBraces.js

@@ -1,4 +1,4 @@
-const { containsExceptInsideString } = require("../utils");
+import { containsExceptInsideString } from "../utils.js";
 
 // Indentation closing braces
 const rule = {

lib/rules/InsecureRandom.js

@@ -1,5 +1,5 @@
 // Insecure use of Random
-const { addImport, getVariable, getVariableRange } = require("../utils");
+import { addImport, getVariable, getVariableRange } from "../utils";
 
 const rule = {
     scope: "file",

lib/rules/JavaIoPackageAccess.js

@@ -1,6 +1,6 @@
 // No use of Java.io classes
 
-const { getLastVariableRange } = require("../utils");
+import { getLastVariableRange } from "../utils";
 
 //NV: TODO: finalise for when there is several occurrences of the string in the same line
 const rule = {

lib/rules/MethodCount.js

@@ -1,6 +1,6 @@
 // Too many methods in a class
 
-const { getVariableRange } = require("../utils");
+import { getVariableRange } from "../utils.js";
 
 const rule = {
     variables: [

lib/rules/MethodParameterTypeRequired.js

@@ -1,6 +1,6 @@
 // Too many methods in a class
 
-const { getVariableRange } = require("../utils");
+import { getVariableRange } from "../utils.js";
 
 const rule = {
     variables: [

lib/rules/MethodReturnTypeRequired.js

@@ -1,6 +1,6 @@
 // Too many methods in a class
 
-const { getVariableRange } = require("../utils");
+import { getVariableRange } from "../utils.js";
 
 const rule = {
     variables: [

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",

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",

lib/rules/NoDef.js

@@ -1,6 +1,6 @@
 // No use of def
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/NoJavaUtilDate.js

@@ -1,6 +1,6 @@
 // No use of Java.util.date
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/NoTabCharacter.js

@@ -1,6 +1,6 @@
 // No tab character
 
-const { getIndentLength } = require("../utils");
+import { getIndentLength } from "../utils";
 
 const rule = {
     scope: "file",

lib/rules/SimpleDateFormatMissingLocale.js

@@ -1,6 +1,6 @@
 // Simple Date Format missing locale
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceAfterCatch.js

@@ -1,6 +1,6 @@
 // Space after catch
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceAfterComma.js

@@ -1,6 +1,6 @@
 // Add space after a comma
 
-const { getStringRange, addSpaceAfterChar } = require("../utils");
+import { getStringRange,addSpaceAfterChar  } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceAfterFor.js

@@ -1,5 +1,5 @@
 // Space after for
-const { getStringRange, addSpaceAfterChar } = require("../utils");
+import { getStringRange,addSpaceAfterChar  } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceAfterIf.js

@@ -1,6 +1,6 @@
 // Space after if
 
-const { getStringRange, addSpaceAfterChar } = require("../utils");
+import { getStringRange,addSpaceAfterChar  } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceAfterMethodCallName.js

@@ -1,6 +1,6 @@
 // Space after method call name
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceAfterOpeningBrace.js

@@ -1,6 +1,6 @@
 // Space after opening brace
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceAfterSemicolon.js

@@ -1,6 +1,6 @@
 // Add space after a semicolon
 
-const { getStringRange, addSpaceAfterChar } = require("../utils");
+import { getStringRange,addSpaceAfterChar  } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceAfterSwitch.js

@@ -1,6 +1,6 @@
 // Space after switch
 
-const { getStringRange, addSpaceAfterChar } = require("../utils");
+import { getStringRange,addSpaceAfterChar  } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceAfterWhile.js

@@ -1,6 +1,6 @@
 // Space after while
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceAroundOperator.js

@@ -1,6 +1,6 @@
 // Space around operators
 
-const { getVariable, getVariableRange, addSpaceAroundChar } = require("../utils");
+import { getVariable, getVariableRange, addSpaceAroundChar } from "../utils.js";
 
 const rule = {
     variables: [

lib/rules/SpaceBeforeClosingBrace.js

@@ -1,5 +1,5 @@
 // Space before opening brace
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceBeforeOpeningBrace.js

@@ -1,5 +1,5 @@
 // Space before opening brace
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {

lib/rules/SpaceInsideParentheses.js

@@ -1,6 +1,6 @@
 // No space between parenthesis
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     fix: {

lib/rules/SystemExit.js

@@ -1,6 +1,6 @@
 // System.exit forbidden
 
-const { getStringRange } = require("../utils");
+import { getStringRange } from "../utils.js";
 
 const rule = {
     range: {