@adguard/agtree 2.1.1 → 2.1.3

package/dist/agtree.d.ts

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.1 (build date: Thu, 19 Sep 2024 13:27:19 GMT)
+ * AGTree v2.1.3 (build date: Mon, 21 Oct 2024 08:22:25 GMT)
  * (c) 2024 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -3415,9 +3415,12 @@ declare const SPECIAL_REGEX_SYMBOLS: Set<string>;
  */
 declare class RegExpUtils {
     /**
-     * Checks whether a string is a RegExp pattern.
+     * Checks whether a string possibly is a RegExp pattern.
      * Flags are not supported.
      *
+     * Note: it does not perform a full validation of the pattern,
+     * it just checks if the string starts and ends with a slash.
+     *
      * @param pattern - Pattern to check
      * @returns `true` if the string is a RegExp pattern, `false` otherwise
      */

package/dist/agtree.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.1 (build date: Thu, 19 Sep 2024 13:27:19 GMT)
+ * AGTree v2.1.3 (build date: Mon, 21 Oct 2024 08:22:25 GMT)
  * (c) 2024 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -343,10 +343,11 @@ class StringUtils {
      * @param searchedCharacter - Searched character
      * @param start - Start index
      * @param escapeCharacter - Escape character, \ by default
+     * @param end - End index (excluded)
      * @returns Index or -1 if the character not found
      */
-    static findNextUnescapedCharacter(pattern, searchedCharacter, start = 0, escapeCharacter = ESCAPE_CHARACTER) {
-        for (let i = start; i < pattern.length; i += 1) {
+    static findNextUnescapedCharacter(pattern, searchedCharacter, start = 0, escapeCharacter = ESCAPE_CHARACTER, end = pattern.length) {
+        for (let i = start; i < end; i += 1) {
             // The searched character cannot be preceded by an escape
             if (pattern[i] === searchedCharacter && pattern[i - 1] !== escapeCharacter) {
                 return i;
@@ -361,10 +362,11 @@ class StringUtils {
      * @param searchedCharacter - Searched character
      * @param start - Start index
      * @param escapeCharacter - Escape character, \ by default
+     * @param end - End index (Included)
      * @returns Index or -1 if the character not found
      */
-    static findNextUnescapedCharacterBackwards(pattern, searchedCharacter, start = pattern.length - 1, escapeCharacter = ESCAPE_CHARACTER) {
-        for (let i = start; i >= 0; i -= 1) {
+    static findNextUnescapedCharacterBackwards(pattern, searchedCharacter, start = pattern.length - 1, escapeCharacter = ESCAPE_CHARACTER, end = 0) {
+        for (let i = start; i >= end; i -= 1) {
             // The searched character cannot be preceded by an escape
             if (pattern[i] === searchedCharacter && pattern[i - 1] !== escapeCharacter) {
                 return i;
@@ -7052,9 +7054,6 @@ class UboParameterListParser extends ParameterListParser {
                     // Next non-whitespace character after the closing quote should be the separator
                     const nextSeparatorIndex = StringUtils.skipWS(raw, possibleClosingQuoteIndex + 1);
                     if (nextSeparatorIndex === length) {
-                        if (requireQuotes) {
-                            throw new AdblockSyntaxError('Expected separator, got end of string', baseOffset + nextSeparatorIndex, baseOffset + length);
-                        }
                         // If the separator is not found, the param end is the end of the string
                         paramEnd = StringUtils.skipWSBack(raw, length - 1) + 1;
                         offset = length;
@@ -7068,9 +7067,41 @@ class UboParameterListParser extends ParameterListParser {
                         if (requireQuotes) {
                             throw new AdblockSyntaxError(`Expected separator, got: '${raw[nextSeparatorIndex]}'`, baseOffset + nextSeparatorIndex, baseOffset + length);
                         }
-                        // Param end should be the last separator before the quote
-                        offset = StringUtils.findNextUnescapedCharacterBackwards(raw, separator, possibleClosingQuoteIndex) + 1;
-                        paramEnd = StringUtils.skipWSBack(raw, offset - 2) + 1;
+                        /**
+                         * At that point found `possibleClosingQuoteIndex` is wrong
+                         * | is `offset`
+                         * ~ is `possibleClosingQuoteIndex`
+                         * ^ is `nextSeparatorIndex`
+                         *
+                         * Example 1: "abc, ').cba='1'"
+                         *                  |      ~^
+                         * Example 2: "abc, ').cba, '1'"
+                         *                  |       ~^
+                         * Example 3: "abc, ').cba='1', cba"
+                         *                  |      ~^
+                         *
+                         * Search for separator before `possibleClosingQuoteIndex`
+                         */
+                        const separatorIndexBeforeQuote = StringUtils.findNextUnescapedCharacterBackwards(raw, separator, possibleClosingQuoteIndex, ESCAPE_CHARACTER, offset + 1);
+                        if (separatorIndexBeforeQuote !== -1) {
+                            // Found separator before (Example 2)
+                            paramEnd = StringUtils.skipWSBack(raw, separatorIndexBeforeQuote - 1) + 1;
+                            offset = separatorIndexBeforeQuote + 1;
+                        }
+                        else {
+                            // Didn't found separator before, search after
+                            const separatorIndexAfterQuote = StringUtils.findNextUnescapedCharacter(raw, separator, possibleClosingQuoteIndex);
+                            if (separatorIndexAfterQuote !== -1) {
+                                // We found separator after (Example 3)
+                                paramEnd = StringUtils.skipWSBack(raw, separatorIndexAfterQuote - 1) + 1;
+                                offset = separatorIndexAfterQuote + 1;
+                            }
+                            else {
+                                // If the separator is not found, the param end is the end of the string (Example 1)
+                                paramEnd = StringUtils.skipWSBack(raw, length - 1) + 1;
+                                offset = length;
+                            }
+                        }
                     }
                 }
                 else {
@@ -11566,20 +11597,22 @@ const SPECIAL_REGEX_SYMBOLS = new Set([
  */
 class RegExpUtils {
     /**
-     * Checks whether a string is a RegExp pattern.
+     * Checks whether a string possibly is a RegExp pattern.
      * Flags are not supported.
      *
+     * Note: it does not perform a full validation of the pattern,
+     * it just checks if the string starts and ends with a slash.
+     *
      * @param pattern - Pattern to check
      * @returns `true` if the string is a RegExp pattern, `false` otherwise
      */
     static isRegexPattern(pattern) {
         const trimmedPattern = pattern.trim();
         // Avoid false positives
-        if (trimmedPattern.length > REGEX_MARKER.length * 2 && trimmedPattern.startsWith(REGEX_MARKER)) {
-            const last = StringUtils.findNextUnescapedCharacter(trimmedPattern, REGEX_MARKER, REGEX_MARKER.length);
-            return last === trimmedPattern.length - 1;
-        }
-        return false;
+        return trimmedPattern.length > REGEX_MARKER.length * 2
+            && trimmedPattern.startsWith(REGEX_MARKER)
+            && trimmedPattern.endsWith(REGEX_MARKER)
+            && trimmedPattern[REGEX_MARKER.length - 2] !== ESCAPE_CHARACTER;
     }
     /**
      * Negates a RegExp pattern. Technically, this method wraps the pattern in `^((?!` and `).)*$`.
@@ -15615,7 +15648,7 @@ class RuleCategorizer {
     }
 }
 
-const version = "2.1.1";
+const version = "2.1.3";
 
 /**
  * @file AGTree version

package/dist/agtree.mjs

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.1 (build date: Thu, 19 Sep 2024 13:27:19 GMT)
+ * AGTree v2.1.3 (build date: Mon, 21 Oct 2024 08:22:25 GMT)
  * (c) 2024 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -323,10 +323,11 @@ class StringUtils {
      * @param searchedCharacter - Searched character
      * @param start - Start index
      * @param escapeCharacter - Escape character, \ by default
+     * @param end - End index (excluded)
      * @returns Index or -1 if the character not found
      */
-    static findNextUnescapedCharacter(pattern, searchedCharacter, start = 0, escapeCharacter = ESCAPE_CHARACTER) {
-        for (let i = start; i < pattern.length; i += 1) {
+    static findNextUnescapedCharacter(pattern, searchedCharacter, start = 0, escapeCharacter = ESCAPE_CHARACTER, end = pattern.length) {
+        for (let i = start; i < end; i += 1) {
             // The searched character cannot be preceded by an escape
             if (pattern[i] === searchedCharacter && pattern[i - 1] !== escapeCharacter) {
                 return i;
@@ -341,10 +342,11 @@ class StringUtils {
      * @param searchedCharacter - Searched character
      * @param start - Start index
      * @param escapeCharacter - Escape character, \ by default
+     * @param end - End index (Included)
      * @returns Index or -1 if the character not found
      */
-    static findNextUnescapedCharacterBackwards(pattern, searchedCharacter, start = pattern.length - 1, escapeCharacter = ESCAPE_CHARACTER) {
-        for (let i = start; i >= 0; i -= 1) {
+    static findNextUnescapedCharacterBackwards(pattern, searchedCharacter, start = pattern.length - 1, escapeCharacter = ESCAPE_CHARACTER, end = 0) {
+        for (let i = start; i >= end; i -= 1) {
             // The searched character cannot be preceded by an escape
             if (pattern[i] === searchedCharacter && pattern[i - 1] !== escapeCharacter) {
                 return i;
@@ -7032,9 +7034,6 @@ class UboParameterListParser extends ParameterListParser {
                     // Next non-whitespace character after the closing quote should be the separator
                     const nextSeparatorIndex = StringUtils.skipWS(raw, possibleClosingQuoteIndex + 1);
                     if (nextSeparatorIndex === length) {
-                        if (requireQuotes) {
-                            throw new AdblockSyntaxError('Expected separator, got end of string', baseOffset + nextSeparatorIndex, baseOffset + length);
-                        }
                         // If the separator is not found, the param end is the end of the string
                         paramEnd = StringUtils.skipWSBack(raw, length - 1) + 1;
                         offset = length;
@@ -7048,9 +7047,41 @@ class UboParameterListParser extends ParameterListParser {
                         if (requireQuotes) {
                             throw new AdblockSyntaxError(`Expected separator, got: '${raw[nextSeparatorIndex]}'`, baseOffset + nextSeparatorIndex, baseOffset + length);
                         }
-                        // Param end should be the last separator before the quote
-                        offset = StringUtils.findNextUnescapedCharacterBackwards(raw, separator, possibleClosingQuoteIndex) + 1;
-                        paramEnd = StringUtils.skipWSBack(raw, offset - 2) + 1;
+                        /**
+                         * At that point found `possibleClosingQuoteIndex` is wrong
+                         * | is `offset`
+                         * ~ is `possibleClosingQuoteIndex`
+                         * ^ is `nextSeparatorIndex`
+                         *
+                         * Example 1: "abc, ').cba='1'"
+                         *                  |      ~^
+                         * Example 2: "abc, ').cba, '1'"
+                         *                  |       ~^
+                         * Example 3: "abc, ').cba='1', cba"
+                         *                  |      ~^
+                         *
+                         * Search for separator before `possibleClosingQuoteIndex`
+                         */
+                        const separatorIndexBeforeQuote = StringUtils.findNextUnescapedCharacterBackwards(raw, separator, possibleClosingQuoteIndex, ESCAPE_CHARACTER, offset + 1);
+                        if (separatorIndexBeforeQuote !== -1) {
+                            // Found separator before (Example 2)
+                            paramEnd = StringUtils.skipWSBack(raw, separatorIndexBeforeQuote - 1) + 1;
+                            offset = separatorIndexBeforeQuote + 1;
+                        }
+                        else {
+                            // Didn't found separator before, search after
+                            const separatorIndexAfterQuote = StringUtils.findNextUnescapedCharacter(raw, separator, possibleClosingQuoteIndex);
+                            if (separatorIndexAfterQuote !== -1) {
+                                // We found separator after (Example 3)
+                                paramEnd = StringUtils.skipWSBack(raw, separatorIndexAfterQuote - 1) + 1;
+                                offset = separatorIndexAfterQuote + 1;
+                            }
+                            else {
+                                // If the separator is not found, the param end is the end of the string (Example 1)
+                                paramEnd = StringUtils.skipWSBack(raw, length - 1) + 1;
+                                offset = length;
+                            }
+                        }
                     }
                 }
                 else {
@@ -11546,20 +11577,22 @@ const SPECIAL_REGEX_SYMBOLS = new Set([
  */
 class RegExpUtils {
     /**
-     * Checks whether a string is a RegExp pattern.
+     * Checks whether a string possibly is a RegExp pattern.
      * Flags are not supported.
      *
+     * Note: it does not perform a full validation of the pattern,
+     * it just checks if the string starts and ends with a slash.
+     *
      * @param pattern - Pattern to check
      * @returns `true` if the string is a RegExp pattern, `false` otherwise
      */
     static isRegexPattern(pattern) {
         const trimmedPattern = pattern.trim();
         // Avoid false positives
-        if (trimmedPattern.length > REGEX_MARKER.length * 2 && trimmedPattern.startsWith(REGEX_MARKER)) {
-            const last = StringUtils.findNextUnescapedCharacter(trimmedPattern, REGEX_MARKER, REGEX_MARKER.length);
-            return last === trimmedPattern.length - 1;
-        }
-        return false;
+        return trimmedPattern.length > REGEX_MARKER.length * 2
+            && trimmedPattern.startsWith(REGEX_MARKER)
+            && trimmedPattern.endsWith(REGEX_MARKER)
+            && trimmedPattern[REGEX_MARKER.length - 2] !== ESCAPE_CHARACTER;
     }
     /**
      * Negates a RegExp pattern. Technically, this method wraps the pattern in `^((?!` and `).)*$`.
@@ -15595,7 +15628,7 @@ class RuleCategorizer {
     }
 }
 
-const version = "2.1.1";
+const version = "2.1.3";
 
 /**
  * @file AGTree version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adguard/agtree",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "Tool set for working with adblock filter lists",
   "keywords": [
     "adblock",