Issue #43: Add Support for ESLint 10

.github/workflows/main.yml

@@ -12,11 +12,11 @@ jobs:
     strategy:
       matrix:
         # Have to use 18.x and up because later versions of eslint require structuredClone
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [18.x, 20.x, 22.x, 24.x]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Run tests against node ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
           cache: "npm"

.gitignore

@@ -1,4 +1,5 @@
 /node_modules/
 *.log
 .vs/
-.DS_Store
+.DS_Store
+tools/

CHANGELOG.md

@@ -1,10 +1,14 @@
 # CHANGELOG
 
+## 2.2.2
+
+- Added support for ESLint 10
+
 ## 2.2.1
 
 ### Minor
 
-- Add support for the official ESLint json parser
+- Added support for the official ESLint json parser
 
 ## 2.1.0
 

dist/index.js

@@ -30,7 +30,7 @@ function shouldIgnore(value, toIgnore) {
 }
 const meta = {
     name: "eslint-plugin-no-secrets",
-    version: "2.1.1",
+    version: "2.2.2",
 };
 exports.meta = meta;
 const noSecrets = {
@@ -42,13 +42,12 @@ const noSecrets = {
         },
         docs: {
             description: "An eslint rule that looks for possible leftover secrets in code",
-            category: "Best Practices",
         },
     },
     create(context) {
         var _a;
         const { tolerance, additionalRegexes, ignoreContent, ignoreModules, ignoreIdentifiers, additionalDelimiters, ignoreCase, } = (0, utils_1.checkOptions)(context.options[0] || {});
-        const sourceCode = context.getSourceCode() || context.sourceCode;
+        const sourceCode = (0, utils_1.getSourceCode)(context);
         const allPatterns = Object.assign({}, regexes_1.default, additionalRegexes);
         const allDelimiters = additionalDelimiters.concat([" "]);
         function splitIntoTokens(value) {
@@ -110,7 +109,7 @@ const noSecrets = {
         comments.forEach((comment) => checkString(comment.value, comment));
         return {
             /**
-             * For the official json
+             * For the official eslint json plugin
              */
             String(node) {
                 const { value } = node;

dist/no-pattern-match.js

@@ -11,14 +11,8 @@ function globalizeRegularExpression(regexp) {
         return regexp;
     return new RegExp(regexp, regexp.flags + "g");
 }
-function globalizeAllRegularExps(patterns) {
-    return Object.fromEntries(Object.entries(patterns).map(([name, pattern]) => [
-        name,
-        globalizeRegularExpression(pattern),
-    ]));
-}
 function parseAndValidateOptions({ patterns }) {
-    const compiledRegexes = (0, utils_1.validateRecordOfRegex)((0, utils_1.plainObjectOption)(patterns, "patterns", utils_1.DEFAULT_ADDTIONAL_REGEXES));
+    const compiledRegexes = (0, utils_1.validateRecordOfRegex)((0, utils_1.plainObjectOption)(patterns, "patterns", utils_1.DEFAULT_ADDITIONAL_REGEXES));
     return {
         patterns: compiledRegexes,
     };
@@ -118,13 +112,11 @@ const noPatternMatch = {
         },
         docs: {
             description: "An eslint rule that does pattern matching against an entire file",
-            category: "Best Practices",
         },
     },
     create(context) {
-        var _a;
         const { patterns } = parseAndValidateOptions(context.options[0] || {});
-        const sourceCode = ((_a = context === null || context === void 0 ? void 0 : context.getSourceCode) === null || _a === void 0 ? void 0 : _a.call(context)) || context.sourceCode;
+        const sourceCode = (0, utils_1.getSourceCode)(context);
         const patternList = Object.entries(patterns);
         const text = sourceCode.text;
         const newLinePos = findAllNewLines(text);

dist/utils.js

@@ -1,21 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FULL_TEXT_MATCH = exports.PATTERN_MATCH = exports.HIGH_ENTROPY = exports.DEFAULT_ADDTIONAL_REGEXES = void 0;
+exports.FULL_TEXT_MATCH = exports.PATTERN_MATCH = exports.HIGH_ENTROPY = exports.DEFAULT_ADDITIONAL_REGEXES = void 0;
 exports.isPlainObject = isPlainObject;
 exports.plainObjectOption = plainObjectOption;
 exports.validateRecordOfRegex = validateRecordOfRegex;
 exports.checkOptions = checkOptions;
 exports.shannonEntropy = shannonEntropy;
 exports.isModulePathString = isModulePathString;
 exports.getIdentifierName = getIdentifierName;
+exports.getSourceCode = getSourceCode;
 const MATH_LOG_2 = Math.log(2);
 /**
  * Charset especially designed to ignore common regular expressions (eg [] and {}), imports/requires (/.), and css classes (-), and other special characters,
  * which raise a lot of false postives and aren't usually in passwords/secrets
  */
 const CHARSET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+=!|*^@~`$%+?\"'_<>".split("");
 const DEFAULT_TOLERANCE = 4;
-exports.DEFAULT_ADDTIONAL_REGEXES = {};
+exports.DEFAULT_ADDITIONAL_REGEXES = {};
 function isPlainObject(obj) {
     return typeof obj === "object" && obj.constructor === Object;
 }
@@ -36,15 +37,17 @@ function compileListOfPatterns(patterns = [], name) {
                 pattern instanceof RegExp ? pattern : new RegExp(String(pattern));
         }
         catch (e) {
-            throw new Error("Failed to compiled the regexp " + patterns[i]);
+            throw new Error(`Failed to compiled the regexp ${patterns[i]}`);
         }
     }
     return compiledPatterns;
 }
 function booleanOption(value, name, defaultValue) {
-    //TODO: This is kind of ridiclous check, fix this
     value = value || defaultValue;
     if (typeof value !== "boolean") {
+        if (typeof value === "undefined") {
+            return defaultValue;
+        }
         throw new Error(`The option '${name}' must be boolean`);
     }
     return value;
@@ -83,7 +86,7 @@ function checkOptions({ tolerance, additionalRegexes, ignoreContent, ignoreModul
     if (typeof tolerance !== "number" || tolerance <= 0) {
         throw new Error("The option tolerance must be a positive (eg greater than zero) number");
     }
-    additionalRegexes = plainObjectOption(additionalRegexes, "additionalRegexes", exports.DEFAULT_ADDTIONAL_REGEXES);
+    additionalRegexes = plainObjectOption(additionalRegexes, "additionalRegexes", exports.DEFAULT_ADDITIONAL_REGEXES);
     const compiledRegexes = validateRecordOfRegex(additionalRegexes);
     return {
         tolerance,
@@ -116,7 +119,6 @@ const MODULE_FUNCTIONS = ["import", "require"];
 /**
  * Used to detect "import()" and "require()"
  * Inspired by https://github.com/benmosher/eslint-plugin-import/blob/45bfe472f38ef790c11efe45ffc59808c67a3f94/src/core/staticRequire.js
- * @param {*} node
  */
 function isStaticImportOrRequire(node) {
     return (node &&
@@ -165,3 +167,16 @@ function getAssignmentName(node) {
 exports.HIGH_ENTROPY = "HIGH_ENTROPY";
 exports.PATTERN_MATCH = "PATTERN_MATCH";
 exports.FULL_TEXT_MATCH = "FULL_TEXT_MATCH";
+/**
+ * Backwards and forward getSourceCode function
+ * @param context
+ * @returns
+ */
+function getSourceCode(context) {
+    if (context === null || context === void 0 ? void 0 : context.sourceCode) {
+        return context.sourceCode;
+    }
+    else {
+        return context.getSourceCode();
+    }
+}