npm - @adguard/agtree - Versions diffs - 2.1.2 → 2.1.3 - Mend

@adguard/agtree 2.1.2 → 2.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/agtree.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.2 (build date: Thu, 19 Sep 2024 15:44:40 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

package/dist/agtree.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.2 (build date: Thu, 19 Sep 2024 15:44:40 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 {
@@ -15617,7 +15648,7 @@ class RuleCategorizer {
     }
 }
-const version = "2.1.2";
+const version = "2.1.3";
 /**
  * @file AGTree version

package/dist/agtree.mjs CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.2 (build date: Thu, 19 Sep 2024 15:44:40 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 {
@@ -15597,7 +15628,7 @@ class RuleCategorizer {
     }
 }
-const version = "2.1.2";
+const version = "2.1.3";
 /**
  * @file AGTree version

package/package.json CHANGED Viewed

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