## 1.9.0 - April 2022

* Fixes an issue with remaining source calculation and minified files.

Author: gmullerb

CHANGELOG.md

@@ -1,9 +1,10 @@
 # ESLint Plugin Regex Change Log
 
-## 1.9.0 - March 2022
+## 1.9.0 - April 2022
 
 * Closes #15, Allowing mixing different error level.
   * This bug required that the same rule can be defined with different error levels, that is not possible at the moment on eslint. Error level is not available at plugin level (as indicate by ESLint official documentation: "Keep in mind that the error level is not part of context.options, as the error level cannot be known or modified from inside a rule"). So I came up a different approach, which not only **allows to use "the same" rule with different error levels**, but also **allows Mixing custom set of regex rules**, this is useful for creating package/libraries/plugins with your own set of rules and sharing it with others.
+* Fixes an issue with remaining source calculation and minified files.
 * Improves project configuration.
   * Now uses [`any-eslint-parser`](https://www.npmjs.com/package/any-eslint-parser)
 * Improves documentation.

lib/rules/invalid-regex-rule.js

@@ -5,23 +5,21 @@ const { formatReportMessage } = require('../utils/report-utils.js')
 const { shouldCheck } = require('../utils/check-utils.js')
 
 function checkRegexInLines(sourceLines, nextLine, nextChar, regex) {
-  if (nextLine !== -1) {
-    regex.test('')
-    let foundDetail = regex.exec(sourceLines[nextLine].slice(nextChar))
-    if (foundDetail) {
-      return {
-        foundColumn: nextChar + foundDetail.index,
-        nextLine,
-        nextChar: nextChar + regex.lastIndex
-      }
+  regex.test('')
+  let foundDetail = regex.exec(sourceLines[nextLine].slice(nextChar))
+  if (foundDetail) {
+    return {
+      foundColumn: nextChar + foundDetail.index,
+      nextLine,
+      nextChar: nextChar + regex.lastIndex
     }
-    nextLine = sourceLines.findIndex((lin, index) => index > nextLine && (foundDetail = regex.exec(lin)))
-    if (foundDetail) {
-      return {
-        foundColumn: foundDetail.index,
-        nextLine,
-        nextChar: regex.lastIndex
-      }
+  }
+  nextLine = sourceLines.findIndex((lin, index) => index > nextLine && (foundDetail = regex.exec(lin)))
+  if (foundDetail) {
+    return {
+      foundColumn: foundDetail.index,
+      nextLine,
+      nextChar: regex.lastIndex
     }
   }
   return {
@@ -58,9 +56,9 @@ function checkRegex(source, sourceLines, nextLine, nextChar, rootChar, pattern,
   if (source.length !== 0) {
     const sourceDetail = checkRegexInSource(source, pattern.regex)
     if (sourceDetail.patternIndex !== -1) {
-      const remainingSourceStart = sourceDetail.patternIndex + 1
+      const remainingSourceStart = sourceDetail.patternIndex + sourceDetail.$[0].length
       const remainingSource = source.slice(remainingSourceStart)
-      let foundDetail = checkRegexInLines(sourceLines, nextLine, nextChar, pattern.regex)
+      const foundDetail = checkRegexInLines(sourceLines, nextLine, nextChar, pattern.regex)
       if (foundDetail.nextLine !== -1) {
         report({
           loc: {
@@ -79,16 +77,18 @@ function checkRegex(source, sourceLines, nextLine, nextChar, rootChar, pattern,
           pattern, replace, report, originalSource)
       }
       else {
-        report({
-          loc: { start: foundStart(originalSource, sourceDetail.patternIndex + rootChar) },
-          message: formatReportMessage(
-            pattern,
-            from => `Invalid regular expression ${from} found`
-          ),
-          fix: replace(rootChar, sourceDetail)
-        })
-        checkRegex(remainingSource, sourceLines, nextLine + 1, nextChar, rootChar + remainingSourceStart, pattern, replace, report,
-          originalSource)
+        if (++nextLine < sourceLines.length) {
+          report({
+            loc: { start: foundStart(originalSource, sourceDetail.patternIndex + rootChar) },
+            message: formatReportMessage(
+              pattern,
+              from => `Invalid regular expression ${from} found`
+            ),
+            fix: replace(rootChar, sourceDetail)
+          })
+          checkRegex(remainingSource, sourceLines, nextLine, nextChar, rootChar + remainingSourceStart, pattern, replace, report,
+            originalSource)
+        }
       }
     }
   }

package.json

@@ -64,9 +64,9 @@
   ],
   "scripts": {
     "lint": "npm run lint.common && npm run lint.source",
-    "lint.common": "echo ==== Lint Common ==== && eslint --config .eslintrc-any.json \"**/[\\.a-zA-Z]*.+(js|jsx|ts|tsx|json|yml|xml|sh|txt|md|svg|properties|gradle|java|cpp|c|html|css|groovy)\" \"**/.+(|gitignore|npmignore)\" --no-eslintrc --ignore-pattern \"build\"",
-    "lint.source": "echo ==== Lint Source Code ==== && eslint --color \"**/*.js\"",
-    "test.only": "node tests/tests.js && node tests/lib/rules/e2e-tests.js ",
+    "lint.common": "echo ==== Lint Common ==== && eslint --config .eslintrc-any.json \"**/[\\.a-zA-Z]*.+(js|jsx|ts|tsx|json|yml|xml|sh|txt|md|svg|properties|gradle|java|cpp|c|html|css|groovy)\" \"**/.+(|gitignore|npmignore)\" --no-eslintrc --ignore-pattern \"build\" --ignore-pattern \"tests/lib/rules/case-*.js\"",
+    "lint.source": "echo ==== Lint Source Code ==== && eslint --color \"**/*.js\" --ignore-pattern \"tests/lib/rules/case-*.js\"",
+    "test.only": "node tests/tests.js && node tests/lib/rules/e2e-tests.js",
     "test": "echo ==== Test With Coverage ==== && mkdir -p build && nyc npm run test.only",
     "prepack": "echo ==== Build Package ====",
     "check": "npm install && npm run lint && npm test && mkdir -p build && cd build && npm pack ../",
@@ -81,7 +81,7 @@
   },
   "devDependencies": {
     "any-eslint-parser": "^1.0.1",
-    "eslint": "^8.12.0",
+    "eslint": "^8.13.0",
     "eslint-plugin-base-style-config": "^2.8.1",
     "eslint-plugin-import": "^2.25.4",
     "jasmine": "^4.0.2",

tests/lib/rules/.eslintrc.json

@@ -2,6 +2,7 @@
   "rules": {
     "global-require": "off",
     "no-console": "off",
-    "no-throw-literal": "off"
+    "no-throw-literal": "off",
+    "max-lines": "off"
   }
 }