@adguard/agtree 1.1.1 → 1.1.3

package/dist/agtree.esm.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v1.1.1 (build date: Fri, 11 Aug 2023 13:11:01 GMT)
+ * AGTree v1.1.3 (build date: Mon, 28 Aug 2023 16:19:09 GMT)
  * (c) 2023 AdGuard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -11,8 +11,9 @@ import { walk, parse, toPlainObject, find, generate, fromPlainObject, List } fro
 import * as ecssTree from '@adguard/ecss-tree';
 export { ecssTree as ECSSTree };
 import cloneDeep from 'clone-deep';
-import { redirects } from '@adguard/scriptlets';
+import XRegExp from 'xregexp';
 import { parse as parse$1 } from 'tldts';
+import { redirects } from '@adguard/scriptlets';
 
 /**
  * @file Possible adblock syntaxes are listed here.
@@ -96,6 +97,7 @@ const CR = '\r';
 const FF = '\f';
 const LF = '\n';
 const CRLF = CR + LF;
+const NEWLINE = LF;
 const DOUBLE_QUOTE = '"';
 const SINGLE_QUOTE = '\'';
 // Brackets
@@ -107,21 +109,157 @@ const OPEN_CURLY_BRACKET = '{';
 const CLOSE_CURLY_BRACKET = '}';
 // Letters
 const SMALL_LETTER_A = 'a';
+const SMALL_LETTER_B = 'b';
+const SMALL_LETTER_C = 'c';
+const SMALL_LETTER_D = 'd';
+const SMALL_LETTER_E = 'e';
+const SMALL_LETTER_F = 'f';
+const SMALL_LETTER_G = 'g';
+const SMALL_LETTER_H = 'h';
+const SMALL_LETTER_I = 'i';
+const SMALL_LETTER_J = 'j';
+const SMALL_LETTER_K = 'k';
+const SMALL_LETTER_L = 'l';
+const SMALL_LETTER_M = 'm';
+const SMALL_LETTER_N = 'n';
+const SMALL_LETTER_O = 'o';
+const SMALL_LETTER_P = 'p';
+const SMALL_LETTER_Q = 'q';
+const SMALL_LETTER_R = 'r';
+const SMALL_LETTER_S = 's';
+const SMALL_LETTER_T = 't';
+const SMALL_LETTER_U = 'u';
+const SMALL_LETTER_V = 'v';
+const SMALL_LETTER_W = 'w';
+const SMALL_LETTER_X = 'x';
+const SMALL_LETTER_Y = 'y';
 const SMALL_LETTER_Z = 'z';
+/**
+ * Set of all small letters.
+ */
+const SMALL_LETTERS = new Set([
+    SMALL_LETTER_A,
+    SMALL_LETTER_B,
+    SMALL_LETTER_C,
+    SMALL_LETTER_D,
+    SMALL_LETTER_E,
+    SMALL_LETTER_F,
+    SMALL_LETTER_G,
+    SMALL_LETTER_H,
+    SMALL_LETTER_I,
+    SMALL_LETTER_J,
+    SMALL_LETTER_K,
+    SMALL_LETTER_L,
+    SMALL_LETTER_M,
+    SMALL_LETTER_N,
+    SMALL_LETTER_O,
+    SMALL_LETTER_P,
+    SMALL_LETTER_Q,
+    SMALL_LETTER_R,
+    SMALL_LETTER_S,
+    SMALL_LETTER_T,
+    SMALL_LETTER_U,
+    SMALL_LETTER_V,
+    SMALL_LETTER_W,
+    SMALL_LETTER_X,
+    SMALL_LETTER_Y,
+    SMALL_LETTER_Z,
+]);
 // Capital letters
 const CAPITAL_LETTER_A = 'A';
+const CAPITAL_LETTER_B = 'B';
+const CAPITAL_LETTER_C = 'C';
+const CAPITAL_LETTER_D = 'D';
+const CAPITAL_LETTER_E = 'E';
+const CAPITAL_LETTER_F = 'F';
+const CAPITAL_LETTER_G = 'G';
+const CAPITAL_LETTER_H = 'H';
+const CAPITAL_LETTER_I = 'I';
+const CAPITAL_LETTER_J = 'J';
+const CAPITAL_LETTER_K = 'K';
+const CAPITAL_LETTER_L = 'L';
+const CAPITAL_LETTER_M = 'M';
+const CAPITAL_LETTER_N = 'N';
+const CAPITAL_LETTER_O = 'O';
+const CAPITAL_LETTER_P = 'P';
+const CAPITAL_LETTER_Q = 'Q';
+const CAPITAL_LETTER_R = 'R';
+const CAPITAL_LETTER_S = 'S';
+const CAPITAL_LETTER_T = 'T';
+const CAPITAL_LETTER_U = 'U';
+const CAPITAL_LETTER_V = 'V';
+const CAPITAL_LETTER_W = 'W';
+const CAPITAL_LETTER_X = 'X';
+const CAPITAL_LETTER_Y = 'Y';
 const CAPITAL_LETTER_Z = 'Z';
+/**
+ * Set of all capital letters.
+ */
+const CAPITAL_LETTERS = new Set([
+    CAPITAL_LETTER_A,
+    CAPITAL_LETTER_B,
+    CAPITAL_LETTER_C,
+    CAPITAL_LETTER_D,
+    CAPITAL_LETTER_E,
+    CAPITAL_LETTER_F,
+    CAPITAL_LETTER_G,
+    CAPITAL_LETTER_H,
+    CAPITAL_LETTER_I,
+    CAPITAL_LETTER_J,
+    CAPITAL_LETTER_K,
+    CAPITAL_LETTER_L,
+    CAPITAL_LETTER_M,
+    CAPITAL_LETTER_N,
+    CAPITAL_LETTER_O,
+    CAPITAL_LETTER_P,
+    CAPITAL_LETTER_Q,
+    CAPITAL_LETTER_R,
+    CAPITAL_LETTER_S,
+    CAPITAL_LETTER_T,
+    CAPITAL_LETTER_U,
+    CAPITAL_LETTER_V,
+    CAPITAL_LETTER_W,
+    CAPITAL_LETTER_X,
+    CAPITAL_LETTER_Y,
+    CAPITAL_LETTER_Z,
+]);
 // Numbers as strings
 const NUMBER_0 = '0';
+const NUMBER_1 = '1';
+const NUMBER_2 = '2';
+const NUMBER_3 = '3';
+const NUMBER_4 = '4';
+const NUMBER_5 = '5';
+const NUMBER_6 = '6';
+const NUMBER_7 = '7';
+const NUMBER_8 = '8';
 const NUMBER_9 = '9';
+/**
+ * Set of all numbers as strings.
+ */
+const NUMBERS = new Set([
+    NUMBER_0,
+    NUMBER_1,
+    NUMBER_2,
+    NUMBER_3,
+    NUMBER_4,
+    NUMBER_5,
+    NUMBER_6,
+    NUMBER_7,
+    NUMBER_8,
+    NUMBER_9,
+]);
 const REGEX_MARKER = '/';
 const ADG_SCRIPTLET_MASK = '//scriptlet';
 const UBO_SCRIPTLET_MASK = 'js';
 // Modifiers are separated by ",". For example: "script,domain=example.com"
 const MODIFIERS_SEPARATOR = ',';
-const MODIFIER_EXCEPTION_MARKER = '~';
 const MODIFIER_ASSIGN_OPERATOR = '=';
-const DOMAIN_EXCEPTION_MARKER = '~';
+const NEGATION_MARKER = '~';
+/**
+ * The wildcard symbol — `*`.
+ */
+const WILDCARD$1 = ASTERISK;
 /**
  * Classic domain separator.
  *
@@ -131,9 +269,9 @@ const DOMAIN_EXCEPTION_MARKER = '~';
  * example.com,~example.org##.ads
  * ```
  */
-const CLASSIC_DOMAIN_SEPARATOR = ',';
+const COMMA_DOMAIN_LIST_SEPARATOR = ',';
 /**
- * Modifier domain separator.
+ * Modifier separator for $app, $denyallow, $domain, $method.
  *
  * @example
  * ```adblock
@@ -141,8 +279,7 @@ const CLASSIC_DOMAIN_SEPARATOR = ',';
  * ads.js^$script,domains=example.com|~example.org
  * ```
  */
-const MODIFIER_DOMAIN_SEPARATOR = '|';
-const DOMAIN_LIST_TYPE = 'DomainList';
+const PIPE_MODIFIER_SEPARATOR = '|';
 const CSS_IMPORTANT = '!important';
 const HINT_MARKER = '!+';
 const HINT_MARKER_LEN = HINT_MARKER.length;
@@ -775,6 +912,27 @@ var RuleCategory;
      */
     RuleCategory["Network"] = "Network";
 })(RuleCategory || (RuleCategory = {}));
+/**
+ * Represents similar types of modifiers values
+ * which may be separated by a comma `,` (only for DomainList) or a pipe `|`.
+ */
+var ListNodeType;
+(function (ListNodeType) {
+    ListNodeType["AppList"] = "AppList";
+    ListNodeType["DomainList"] = "DomainList";
+    ListNodeType["MethodList"] = "MethodList";
+    ListNodeType["StealthOptionList"] = "StealthOptionList";
+})(ListNodeType || (ListNodeType = {}));
+/**
+ * Represents child items for {@link ListNodeType}.
+ */
+var ListItemNodeType;
+(function (ListItemNodeType) {
+    ListItemNodeType["App"] = "App";
+    ListItemNodeType["Domain"] = "Domain";
+    ListItemNodeType["Method"] = "Method";
+    ListItemNodeType["StealthOption"] = "StealthOption";
+})(ListItemNodeType || (ListItemNodeType = {}));
 /**
  * Represents possible comment types.
  */
@@ -2526,6 +2684,87 @@ class CommentRuleParser {
     }
 }
 
+/**
+ * Prefixes for error messages which are used for parsing of value lists.
+ */
+const LIST_PARSE_ERROR_PREFIX = {
+    EMPTY_ITEM: 'Empty value specified in the list',
+    NO_MULTIPLE_NEGATION: 'Exception marker cannot be followed by another exception marker',
+    NO_SEPARATOR_AFTER_NEGATION: 'Exception marker cannot be followed by a separator',
+    NO_SEPARATOR_AT_THE_END: 'Value list cannot end with a separator',
+    NO_WHITESPACE_AFTER_NEGATION: 'Exception marker cannot be followed by whitespace',
+};
+/**
+ * Parses a `raw` modifier value which may be represented as a list of items separated by `separator`.
+ * Needed for $app, $denyallow, $domain, $method.
+ *
+ * @param raw Raw modifier value.
+ * @param separator Separator character.
+ * @param loc Location of the modifier value.
+ *
+ * @returns List AST children — {@link App} | {@link Domain} | {@link Method} —
+ * but with no `type` specified (see {@link ListItemNoType}).
+ * @throws An {@link AdblockSyntaxError} if the list is syntactically invalid
+ *
+ * @example
+ * - parses an app list — `com.example.app|Example.exe`
+ * - parses a domain list — `example.com,example.org,~example.org` or `example.com|~example.org`
+ * - parses a method list — `~post|~put`
+ */
+const parseListItems = (raw, separator, loc = defaultLocation) => {
+    const rawListItems = [];
+    // If the last character is a separator, then the list item is invalid
+    // and no need to continue parsing
+    const realEndIndex = StringUtils.skipWSBack(raw);
+    if (raw[realEndIndex] === separator) {
+        throw new AdblockSyntaxError(LIST_PARSE_ERROR_PREFIX.NO_SEPARATOR_AT_THE_END, locRange(loc, realEndIndex, realEndIndex + 1));
+    }
+    let offset = 0;
+    // Skip whitespace before the list
+    offset = StringUtils.skipWS(raw, offset);
+    // Split list items by unescaped separators
+    while (offset < raw.length) {
+        // Skip whitespace before the list item
+        offset = StringUtils.skipWS(raw, offset);
+        let itemStart = offset;
+        // Find the index of the first unescaped separator character
+        const separatorStartIndex = StringUtils.findNextUnescapedCharacter(raw, separator, offset);
+        const itemEnd = separatorStartIndex === -1
+            ? StringUtils.skipWSBack(raw) + 1
+            : StringUtils.skipWSBack(raw, separatorStartIndex - 1) + 1;
+        const exception = raw[itemStart] === NEGATION_MARKER;
+        // Skip the exception marker
+        if (exception) {
+            itemStart += 1;
+            // Exception marker cannot be followed by another exception marker
+            if (raw[itemStart] === NEGATION_MARKER) {
+                throw new AdblockSyntaxError(LIST_PARSE_ERROR_PREFIX.NO_MULTIPLE_NEGATION, locRange(loc, itemStart, itemStart + 1));
+            }
+            // Exception marker cannot be followed by a separator
+            if (raw[itemStart] === separator) {
+                throw new AdblockSyntaxError(LIST_PARSE_ERROR_PREFIX.NO_SEPARATOR_AFTER_NEGATION, locRange(loc, itemStart, itemStart + 1));
+            }
+            // Exception marker cannot be followed by whitespace
+            if (StringUtils.isWhitespace(raw[itemStart])) {
+                throw new AdblockSyntaxError(LIST_PARSE_ERROR_PREFIX.NO_WHITESPACE_AFTER_NEGATION, locRange(loc, itemStart, itemStart + 1));
+            }
+        }
+        // List item can't be empty
+        if (itemStart === itemEnd) {
+            throw new AdblockSyntaxError(LIST_PARSE_ERROR_PREFIX.EMPTY_ITEM, locRange(loc, itemStart, raw.length));
+        }
+        // Collect list item
+        rawListItems.push({
+            loc: locRange(loc, itemStart, itemEnd),
+            value: raw.substring(itemStart, itemEnd),
+            exception,
+        });
+        // Increment the offset to the next list item (or the end of the string)
+        offset = separatorStartIndex === -1 ? raw.length : separatorStartIndex + 1;
+    }
+    return rawListItems;
+};
+
 /**
  * `DomainListParser` is responsible for parsing a domain list.
  *
@@ -2539,83 +2778,39 @@ class DomainListParser {
     /**
      * Parses a domain list, eg. `example.com,example.org,~example.org`
      *
-     * @param raw Raw domain list
-     * @param separator Separator character
-     * @param loc Location of the domain list
-     * @returns Domain list AST
-     * @throws If the domain list is syntactically invalid
+     * @param raw Raw domain list.
+     * @param separator Separator character.
+     * @param loc Location of the domain list in the rule. If not set, the default location is used.
+     *
+     * @returns Domain list AST.
+     * @throws An {@link AdblockSyntaxError} if the domain list is syntactically invalid.
      */
-    static parse(raw, separator = CLASSIC_DOMAIN_SEPARATOR, loc = defaultLocation) {
-        const result = {
-            type: DOMAIN_LIST_TYPE,
+    static parse(raw, separator = COMMA_DOMAIN_LIST_SEPARATOR, loc = defaultLocation) {
+        const rawItems = parseListItems(raw, separator, loc);
+        const children = rawItems.map((rawListItem) => ({
+            ...rawListItem,
+            type: ListItemNodeType.Domain,
+        }));
+        return {
+            type: ListNodeType.DomainList,
             loc: locRange(loc, 0, raw.length),
             separator,
-            children: [],
+            children,
         };
-        // If the last character is a separator, then the domain list is invalid
-        // and no need to continue parsing
-        const realEndIndex = StringUtils.skipWSBack(raw);
-        if (raw[realEndIndex] === separator) {
-            throw new AdblockSyntaxError('Domain list cannot end with a separator', locRange(loc, realEndIndex, realEndIndex + 1));
-        }
-        let offset = 0;
-        // Skip whitespace before the domain list
-        offset = StringUtils.skipWS(raw, offset);
-        // Split domains by unescaped separators
-        while (offset < raw.length) {
-            // Skip whitespace before the domain
-            offset = StringUtils.skipWS(raw, offset);
-            let domainStart = offset;
-            // Find the index of the first unescaped separator character
-            const separatorStartIndex = StringUtils.findNextUnescapedCharacter(raw, separator, offset);
-            const domainEnd = separatorStartIndex === -1
-                ? StringUtils.skipWSBack(raw) + 1
-                : StringUtils.skipWSBack(raw, separatorStartIndex - 1) + 1;
-            const exception = raw[domainStart] === DOMAIN_EXCEPTION_MARKER;
-            // Skip the exception marker
-            if (exception) {
-                domainStart += 1;
-                // Exception marker cannot be followed by another exception marker
-                if (raw[domainStart] === DOMAIN_EXCEPTION_MARKER) {
-                    throw new AdblockSyntaxError('Exception marker cannot be followed by another exception marker', locRange(loc, domainStart, domainStart + 1));
-                }
-                // Exception marker cannot be followed by a separator
-                if (raw[domainStart] === separator) {
-                    throw new AdblockSyntaxError('Exception marker cannot be followed by a separator', locRange(loc, domainStart, domainStart + 1));
-                }
-                // Exception marker cannot be followed by whitespace
-                if (StringUtils.isWhitespace(raw[domainStart])) {
-                    throw new AdblockSyntaxError('Exception marker cannot be followed by whitespace', locRange(loc, domainStart, domainStart + 1));
-                }
-            }
-            // Domain can't be empty
-            if (domainStart === domainEnd) {
-                throw new AdblockSyntaxError('Empty domain specified', locRange(loc, domainStart, raw.length));
-            }
-            // Add the domain to the result
-            result.children.push({
-                type: 'Domain',
-                loc: locRange(loc, domainStart, domainEnd),
-                value: raw.substring(domainStart, domainEnd),
-                exception,
-            });
-            // Increment the offset to the next domain (or the end of the string)
-            offset = separatorStartIndex === -1 ? raw.length : separatorStartIndex + 1;
-        }
-        return result;
     }
     /**
      * Converts a domain list AST to a string.
      *
-     * @param ast Domain list AST
-     * @returns Raw string
+     * @param ast Domain list AST.
+     *
+     * @returns Raw string.
      */
     static generate(ast) {
         const result = ast.children
             .map(({ value, exception }) => {
             let subresult = EMPTY;
             if (exception) {
-                subresult += DOMAIN_EXCEPTION_MARKER;
+                subresult += NEGATION_MARKER;
             }
             subresult += value.trim();
             return subresult;
@@ -2649,8 +2844,8 @@ class ModifierParser {
         const modifierStart = offset;
         // Check if the modifier is an exception
         let exception = false;
-        if (raw[offset] === MODIFIER_EXCEPTION_MARKER) {
-            offset += MODIFIER_EXCEPTION_MARKER.length;
+        if (raw[offset] === NEGATION_MARKER) {
+            offset += NEGATION_MARKER.length;
             exception = true;
         }
         // Skip whitespace after the exception marker (if any)
@@ -2714,7 +2909,7 @@ class ModifierParser {
     static generate(modifier) {
         let result = EMPTY;
         if (modifier.exception) {
-            result += MODIFIER_EXCEPTION_MARKER;
+            result += NEGATION_MARKER;
         }
         result += modifier.modifier.value;
         if (modifier.value !== undefined) {
@@ -4308,21 +4503,15 @@ class ScriptletInjectionBodyParser {
         }
         // Save the offset of the opening parentheses
         const openingParenthesesIndex = offset;
-        // Find closing parentheses
-        // eslint-disable-next-line max-len
-        const closingParenthesesIndex = StringUtils.findUnescapedNonStringNonRegexChar(raw, CLOSE_PARENTHESIS, openingParenthesesIndex + 1);
+        // Skip whitespace from the end
+        const closingParenthesesIndex = StringUtils.skipWSBack(raw, raw.length - 1);
         // Closing parentheses should be present
-        if (closingParenthesesIndex === -1) {
+        if (raw[closingParenthesesIndex] !== CLOSE_PARENTHESIS
+            || raw[closingParenthesesIndex - 1] === ESCAPE_CHARACTER) {
             throw new AdblockSyntaxError(
             // eslint-disable-next-line max-len
             `Invalid AdGuard/uBlock scriptlet call, no closing parentheses '${CLOSE_PARENTHESIS}' found`, locRange(loc, offset, raw.length));
         }
-        // Shouldn't have any characters after the closing parentheses
-        if (StringUtils.skipWSBack(raw) !== closingParenthesesIndex) {
-            throw new AdblockSyntaxError(
-            // eslint-disable-next-line max-len
-            `Invalid AdGuard/uBlock scriptlet call, unexpected characters after the closing parentheses '${CLOSE_PARENTHESIS}'`, locRange(loc, closingParenthesesIndex + 1, raw.length));
-        }
         // Parse parameter list
         const params = ParameterListParser.parse(raw.substring(openingParenthesesIndex + 1, closingParenthesesIndex), COMMA, shiftLoc(loc, openingParenthesesIndex + 1));
         // Allow empty scritptlet call: js() or //scriptlet(), but not allow parameters
@@ -5568,6 +5757,102 @@ class RuleParser {
     }
 }
 
+/**
+ * `AppListParser` is responsible for parsing an app list.
+ *
+ * @see {@link https://adguard.app/kb/general/ad-filtering/create-own-filters/#app-modifier}
+ */
+class AppListParser {
+    /**
+     * Parses an app list which items are separated by `|`,
+     * e.g. `Example.exe|com.example.osx`.
+     *
+     * @param raw Raw app list
+     * @param loc Location of the app list in the rule. If not set, the default location is used.
+     *
+     * @returns App list AST.
+     * @throws An {@link AdblockSyntaxError} if the app list is syntactically invalid.
+     */
+    static parse(raw, loc = defaultLocation) {
+        const separator = PIPE_MODIFIER_SEPARATOR;
+        const rawItems = parseListItems(raw, separator, loc);
+        const children = rawItems.map((rawListItem) => ({
+            ...rawListItem,
+            type: ListItemNodeType.App,
+        }));
+        return {
+            type: ListNodeType.AppList,
+            loc: locRange(loc, 0, raw.length),
+            separator,
+            children,
+        };
+    }
+}
+
+/**
+ * `MethodListParser` is responsible for parsing a method list.
+ *
+ * @see {@link https://adguard.app/kb/general/ad-filtering/create-own-filters/#method-modifier}
+ */
+class MethodListParser {
+    /**
+     * Parses a method list which items are separated by `|`,
+     * e.g. `get|post|put`.
+     *
+     * @param raw Raw method list
+     * @param loc Location of the method list in the rule. If not set, the default location is used.
+     *
+     * @returns Method list AST.
+     * @throws An {@link AdblockSyntaxError} if the method list is syntactically invalid.
+     */
+    static parse(raw, loc = defaultLocation) {
+        const separator = PIPE_MODIFIER_SEPARATOR;
+        const rawItems = parseListItems(raw, separator, loc);
+        const children = rawItems.map((rawListItem) => ({
+            ...rawListItem,
+            type: ListItemNodeType.Method,
+        }));
+        return {
+            type: ListNodeType.MethodList,
+            loc: locRange(loc, 0, raw.length),
+            separator,
+            children,
+        };
+    }
+}
+
+/**
+ * `StealthOptionListParser` is responsible for parsing a list of stealth options.
+ *
+ * @see {@link https://adguard.app/kb/general/ad-filtering/create-own-filters/#stealth-modifier}
+ */
+class StealthOptionListParser {
+    /**
+     * Parses a stealth option list which items are separated by `|`,
+     * e.g. `dpi|ip`.
+     *
+     * @param raw Raw list of stealth options.
+     * @param loc Location of the stealth option list in the rule. If not set, the default location is used.
+     *
+     * @returns Stealth option list AST.
+     * @throws An {@link AdblockSyntaxError} if the stealth option list is syntactically invalid.
+     */
+    static parse(raw, loc = defaultLocation) {
+        const separator = PIPE_MODIFIER_SEPARATOR;
+        const rawItems = parseListItems(raw, separator, loc);
+        const children = rawItems.map((rawListItem) => ({
+            ...rawListItem,
+            type: ListItemNodeType.StealthOption,
+        }));
+        return {
+            type: ListNodeType.StealthOptionList,
+            loc: locRange(loc, 0, raw.length),
+            separator,
+            children,
+        };
+    }
+}
+
 /**
  * `FilterListParser` is responsible for parsing a whole adblock filter list (list of rules).
  * It is a wrapper around `RuleParser` which parses each line separately.
@@ -5778,7 +6063,8 @@ var data$S = { adg_os_any:{ name:"app",
     description:"The `$app` modifier lets you narrow the rule coverage down to a specific application or a list of applications.\nThe modifier's behavior and syntax perfectly match the corresponding basic rules `$app` modifier.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#app-modifier",
     assignable:true,
-    negatable:false } };
+    negatable:false,
+    value_format:"pipe_separated_apps" } };
 
 var data$R = { adg_os_any:{ name:"badfilter",
     description:"The rules with the `$badfilter` modifier disable other basic rules to which they refer. It means that\nthe text of the disabled rule should match the text of the `$badfilter` rule (without the `$badfilter` modifier).",
@@ -5839,7 +6125,7 @@ var data$N = { adg_os_any:{ name:"csp",
     assignable:true,
     negatable:false,
     value_optional:true,
-    value_format:"/[^,$]+/" },
+    value_format:"(?xi)\n  ^(\n    base-uri|\n    child-src|\n    connect-src|\n    default-src|\n    font-src|\n    form-action|\n    frame-ancestors|\n    frame-src|\n    img-src|\n    manifest-src|\n    media-src|\n    navigate-to|\n    object-src|\n    plugin-types|\n    prefetch-src|\n    report-to|\n    report-uri|\n    sandbox|\n    script-src|\n    style-src|\n    upgrade-insecure-requests|\n    worker-src|\n  )\n  \\s+\n  \\S{1,}" },
   adg_ext_any:{ name:"csp",
     description:"This modifier completely changes the rule behavior.\nIf it is applied to a rule, it will not block the matching request.\nThe response headers are going to be modified instead.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#csp-modifier",
@@ -5851,7 +6137,7 @@ var data$N = { adg_os_any:{ name:"csp",
     assignable:true,
     negatable:false,
     value_optional:true,
-    value_format:"/[^,$]+/" },
+    value_format:"(?xi)\n  ^(\n    base-uri|\n    child-src|\n    connect-src|\n    default-src|\n    font-src|\n    form-action|\n    frame-ancestors|\n    frame-src|\n    img-src|\n    manifest-src|\n    media-src|\n    navigate-to|\n    object-src|\n    plugin-types|\n    prefetch-src|\n    report-to|\n    report-uri|\n    sandbox|\n    script-src|\n    style-src|\n    upgrade-insecure-requests|\n    worker-src|\n  )\n  \\s+\n  \\S{1,}" },
   abp_ext_any:{ name:"csp",
     description:"This modifier completely changes the rule behavior.\nIf it is applied to a rule, it will not block the matching request.\nThe response headers are going to be modified instead.",
     docs:"https://help.adblockplus.org/hc/en-us/articles/360062733293-How-to-write-filters#content-security-policies",
@@ -5861,7 +6147,7 @@ var data$N = { adg_os_any:{ name:"csp",
     assignable:true,
     negatable:false,
     value_optional:true,
-    value_format:"/[^,$]+/" },
+    value_format:"(?xi)\n  ^(\n    base-uri|\n    child-src|\n    connect-src|\n    default-src|\n    font-src|\n    form-action|\n    frame-ancestors|\n    frame-src|\n    img-src|\n    manifest-src|\n    media-src|\n    navigate-to|\n    object-src|\n    plugin-types|\n    prefetch-src|\n    report-to|\n    report-uri|\n    sandbox|\n    script-src|\n    style-src|\n    upgrade-insecure-requests|\n    worker-src|\n  )\n  \\s+\n  \\S{1,}" },
   ubo_ext_any:{ name:"csp",
     description:"This modifier completely changes the rule behavior.\nIf it is applied to a rule, it will not block the matching request.\nThe response headers are going to be modified instead.",
     docs:"https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#csp",
@@ -5873,7 +6159,7 @@ var data$N = { adg_os_any:{ name:"csp",
     assignable:true,
     negatable:false,
     value_optional:true,
-    value_format:"/[^,$]+/" } };
+    value_format:"(?xi)\n  ^(\n    base-uri|\n    child-src|\n    connect-src|\n    default-src|\n    font-src|\n    form-action|\n    frame-ancestors|\n    frame-src|\n    img-src|\n    manifest-src|\n    media-src|\n    navigate-to|\n    object-src|\n    plugin-types|\n    prefetch-src|\n    report-to|\n    report-uri|\n    sandbox|\n    script-src|\n    style-src|\n    upgrade-insecure-requests|\n    worker-src|\n  )\n  \\s+\n  \\S{1,}" } };
 
 var data$M = { adg_os_any:{ name:"denyallow",
     description:"The `$denyallow` modifier allows to avoid creating additional rules\nwhen it is needed to disable a certain rule for specific domains.\n`$denyallow` matches only target domains and not referrer domains.",
@@ -5881,35 +6167,35 @@ var data$M = { adg_os_any:{ name:"denyallow",
     conflicts:[ "to" ],
     assignable:true,
     negatable:false,
-    value_format:"pipe_separated_domains" },
+    value_format:"pipe_separated_denyallow_domains" },
   adg_ext_any:{ name:"denyallow",
     description:"The `$denyallow` modifier allows to avoid creating additional rules\nwhen it is needed to disable a certain rule for specific domains.\n`$denyallow` matches only target domains and not referrer domains.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#denyallow-modifier",
     conflicts:[ "to" ],
     assignable:true,
     negatable:false,
-    value_format:"pipe_separated_domains" },
+    value_format:"pipe_separated_denyallow_domains" },
   adg_cb_ios:{ name:"denyallow",
     description:"The `$denyallow` modifier allows to avoid creating additional rules\nwhen it is needed to disable a certain rule for specific domains.\n`$denyallow` matches only target domains and not referrer domains.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#denyallow-modifier",
     conflicts:[ "to" ],
     assignable:true,
     negatable:false,
-    value_format:"pipe_separated_domains" },
+    value_format:"pipe_separated_denyallow_domains" },
   adg_cb_safari:{ name:"denyallow",
     description:"The `$denyallow` modifier allows to avoid creating additional rules\nwhen it is needed to disable a certain rule for specific domains.\n`$denyallow` matches only target domains and not referrer domains.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#denyallow-modifier",
     conflicts:[ "to" ],
     assignable:true,
     negatable:false,
-    value_format:"pipe_separated_domains" },
+    value_format:"pipe_separated_denyallow_domains" },
   ubo_ext_any:{ name:"denyallow",
     description:"The `$denyallow` modifier allows to avoid creating additional rules\nwhen it is needed to disable a certain rule for specific domains.\n`$denyallow` matches only target domains and not referrer domains.",
     docs:"https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#denyallow",
     conflicts:[ "to" ],
     assignable:true,
     negatable:false,
-    value_format:"pipe_separated_domains" } };
+    value_format:"pipe_separated_denyallow_domains" } };
 
 var data$L = { adg_os_any:{ name:"document",
     description:"The rule corresponds to the main frame document requests,\ni.e. HTML documents that are loaded in the browser tab.",
@@ -6125,17 +6411,17 @@ var data$C = { adg_os_any:{ name:"header",
     description:"The `$header` modifier allows matching the HTTP response\nhaving a specific header with (optionally) a specific value.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#header-modifier",
     assignable:true,
-    value_format:"/^[A-z0-9-]+(:.+|)$/" },
+    value_format:"(?xi)\n  ^\n    # header name\n    [\\w-]+\n    (\n      :\n      # header value: string or regexp\n      (\\w+|\\/.+\\/)\n    )?" },
   adg_ext_any:{ name:"header",
     description:"The `$header` modifier allows matching the HTTP response\nhaving a specific header with (optionally) a specific value.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#header-modifier",
     assignable:true,
-    value_format:"/^[A-z0-9-]+(:.+|)$/" },
+    value_format:"(?xi)\n  ^\n    # header name\n    [\\w-]+\n    (\n      :\n      # header value: string or regexp\n      (\\w+|\\/.+\\/)\n    )?" },
   ubo_ext_any:{ name:"header",
     description:"The `$header` modifier allows matching the HTTP response\nhaving a specific header with (optionally) a specific value.",
     docs:"https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#header",
     assignable:true,
-    value_format:"/^[A-z0-9-]+(:.+|)$/" } };
+    value_format:"(?xi)\n  ^\n    # header name\n    [\\w-]+\n    (\n      :\n      # header value: string or regexp\n      (\\w+|\\/.+\\/)\n    )?" } };
 
 var data$B = { adg_os_any:{ name:"hls",
     description:"The `$hls` rules modify the response of a matching request.\nThey are intended as a convenient way to remove segments from HLS playlists (RFC 8216).",
@@ -6150,7 +6436,8 @@ var data$B = { adg_os_any:{ name:"hls",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
-    value_format:"/^(?!.*([^\\\\](,|\\$|\\/))).*$/" } };
+    value_optional:true,
+    value_format:"(?xi)\n  (\n    # string pattern\n    \\w+\n    # or regexp pattern\n    |\n    # TODO: improve regexp pattern to invalidate unescaped `/`, `$`, and `,`\n    \\/.+\\/\n      # options\n      ([ti]*)?\n  )" } };
 
 var data$A = { adg_any:{ name:"image",
     description:"The rule corresponds to images requests.",
@@ -6255,7 +6542,8 @@ var data$v = { adg_os_any:{ name:"jsonprune",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#jsonprune-modifier",
     assignable:true,
     negatable:false,
-    value_format:"/^\\\\\\$\\.(?!.*([^\\\\](,|\\$|\\/))).*$/" } };
+    value_optional:true,
+    value_format:"(?xi)\n  ^\n    # the expression always starts with a dollar sign (for root)\n    # which should be escaped\n    \\\\\n    \\$\n    \\.?\n    # TODO: improve the expression to invalidate unescaped `$` and `,`\n    .+\n  $" } };
 
 var data$u = { adg_any:{ name:"match-case",
     description:"This modifier defines a rule which applies only to addresses that match the case.\nDefault rules are case-insensitive.",
@@ -6282,19 +6570,19 @@ var data$s = { adg_os_any:{ name:"method",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#method-modifier",
     negatable:false,
     assignable:true,
-    value_format:"(?xi)\n  ^(?!\\|)(?:\\b(\n    get|\n    head|\n    post|\n    put|\n    delete|\n    connect|\n    options|\n    trace|\n    patch\n  )\\b|(\\|?|~?))+(?<!\\|)$" },
+    value_format:"pipe_separated_methods" },
   adg_ext_any:{ name:"method",
     description:"This modifier limits the rule scope to requests that use the specified set of HTTP methods.\nNegated methods are allowed.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#method-modifier",
     negatable:false,
     assignable:true,
-    value_format:"(?xi)\n  ^(?!\\|)(?:\\b(\n    get|\n    head|\n    post|\n    put|\n    delete|\n    connect|\n    options|\n    trace|\n    patch\n  )\\b|(\\|?|~?))+(?<!\\|)$" },
+    value_format:"pipe_separated_methods" },
   ubo_ext_any:{ name:"method",
     description:"This modifier limits the rule scope to requests that use the specified set of HTTP methods.\nNegated methods are allowed.",
     docs:"https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#method",
     negatable:false,
     assignable:true,
-    value_format:"(?xi)\n  ^(?!\\|)(?:\\b(\n    get|\n    head|\n    post|\n    put|\n    delete|\n    connect|\n    options|\n    trace|\n    patch\n  )\\b|(\\|?|~?))+(?<!\\|)$" } };
+    value_format:"pipe_separated_methods" } };
 
 var data$r = { adg_os_any:{ name:"mp4",
     description:"As a response to blocked request AdGuard returns a short video placeholder.\nRules with `$mp4` are still supported and being converted into `$redirect=noopmp4-1s` now\nbut the support shall be removed in the future.",
@@ -6378,7 +6666,7 @@ var data$l = { adg_os_any:{ name:"permissions",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
-    value_format:"(?x)\n^(?:(\n  accelerometer|\n  ambient-light-sensor|\n  autoplay|\n  battery|\n  camera|\n  display-capture|\n  document-domain|\n  encrypted-media|\n  execution-while-not-rendered|\n  execution-while-out-of-viewport|\n  fullscreen|\n  gamepad|\n  geolocation|\n  gyroscope|\n  hid|\n  identity-credentials-get|\n  idle-detection|\n  local-fonts|\n  magnetometer|\n  microphone|\n  midi|\n  payment|\n  picture-in-picture|\n  publickey-credentials-create|\n  publickey-credentials-get|\n  screen-wake-lock|\n  serial|\n  speaker-selection|\n  storage-access|\n  usb|\n  web-share|\n  xr-spatial-tracking\n  )=\\(\\)(\\\\, )?)+(?<!,)$" } };
+    value_format:"(?x)\n  ^\n    (\n      ?:(\n        accelerometer|\n        ambient-light-sensor|\n        autoplay|\n        battery|\n        camera|\n        display-capture|\n        document-domain|\n        encrypted-media|\n        execution-while-not-rendered|\n        execution-while-out-of-viewport|\n        fullscreen|\n        gamepad|\n        geolocation|\n        gyroscope|\n        hid|\n        identity-credentials-get|\n        idle-detection|\n        local-fonts|\n        magnetometer|\n        microphone|\n        midi|\n        payment|\n        picture-in-picture|\n        publickey-credentials-create|\n        publickey-credentials-get|\n        screen-wake-lock|\n        serial|\n        speaker-selection|\n        storage-access|\n        usb|\n        web-share|\n        xr-spatial-tracking\n      )\n      =\\(\\)\n      # optional escaped comma for multiple permissions\n      (\\\\,(\\s+)?)?\n    )+\n  $" } };
 
 var data$k = { adg_any:{ name:"ping",
     description:"The rule corresponds to requests caused by either navigator.sendBeacon() or the ping attribute on links.",
@@ -6520,7 +6808,13 @@ var data$g = { adg_os_any:{ name:"redirect",
     assignable:true,
     negatable:false,
     value_optional:true,
-    value_format:"(?x)\n  ^(\n    1x1\\.gif|\n    2x2\\.png|\n    3x2\\.png|\n    32x32\\.png|\n    noop\\.css|\n    noop\\.html|\n    noopframe|\n    noop\\.js|\n    noop\\.txt|\n    noop-0\\.1s\\.mp3|\n    noop-0\\.5s\\.mp3|\n    noop-1s\\.mp4|\n    none|\n    click2load\\.html|\n    addthis_widget\\.js|\n    amazon_ads\\.js|\n    amazon_apstag\\.js|\n    monkeybroker\\.js|\n    doubleclick_instream_ad_status|\n    google-analytics_ga\\.js|\n    google-analytics_analytics\\.js|\n    google-analytics_inpage_linkid\\.js|\n    google-analytics_cx_api\\.js|\n    google-ima\\.js|\n    googletagservices_gpt\\.js|\n    googletagmanager_gtm\\.js|\n    googlesyndication_adsbygoogle\\.js|\n    scorecardresearch_beacon\\.js|\n    outbrain-widget\\.js|\n    hd-main\\.js\n  )\n  (:[0-9]+)?$" } };
+    value_format:"(?x)\n  ^(\n    1x1\\.gif|\n    2x2\\.png|\n    3x2\\.png|\n    32x32\\.png|\n    noop\\.css|\n    noop\\.html|\n    noopframe|\n    noop\\.js|\n    noop\\.txt|\n    noop-0\\.1s\\.mp3|\n    noop-0\\.5s\\.mp3|\n    noop-1s\\.mp4|\n    none|\n    click2load\\.html|\n    addthis_widget\\.js|\n    amazon_ads\\.js|\n    amazon_apstag\\.js|\n    monkeybroker\\.js|\n    doubleclick_instream_ad_status|\n    google-analytics_ga\\.js|\n    google-analytics_analytics\\.js|\n    google-analytics_inpage_linkid\\.js|\n    google-analytics_cx_api\\.js|\n    google-ima\\.js|\n    googletagservices_gpt\\.js|\n    googletagmanager_gtm\\.js|\n    googlesyndication_adsbygoogle\\.js|\n    scorecardresearch_beacon\\.js|\n    outbrain-widget\\.js|\n    hd-main\\.js\n  )\n  (:[0-9]+)?$" },
+  abp_ext_any:{ name:"rewrite",
+    description:"The `rewrite=` option allows the rewriting of URLs (or redirecting requests) to an internal\nresource in order to deactivate it without causing an error. Indicate the internal resource\nby name and prefix `abp-resource:` in order to be recognized. For example\n`$rewrite=abp-resource:blank-js` sends an empty JavaScript.",
+    docs:"https://help.adblockplus.org/hc/en-us/articles/360062733293#rewrite",
+    assignable:true,
+    negatable:false,
+    value_format:"(?x)\n  # ABP resources always starts with the `abp-resource:` prefix\n  ^abp-resource:\n  # Possible resource names\n  (\n    blank-text|\n    blank-css|\n    blank-js|\n    blank-html|\n    blank-mp3|\n    1x1-transparent-gif|\n    2x2-transparent-png|\n    3x2-transparent-png|\n    32x32-transparent-png\n  )$" } };
 
 var data$f = { adg_os_any:{ name:"removeheader",
     description:"Rules with the `$removeheader` modifier are intended to remove headers from HTTP requests and responses.",
@@ -6583,20 +6877,20 @@ var data$e = { adg_os_any:{ name:"removeparam",
     assignable:true,
     negatable:false,
     value_optional:true,
-    value_format:"/^(?!.*([^\\\\](,|\\$|\\/))).*$/" },
+    value_format:"(?xi)\n  (\n    # string pattern\n    \\w+\n    # or regexp pattern\n    |\n    \\/.+\\/\n      # flags\n      ([gimuy]+)?\n  )" },
   adg_ext_any:{ name:"removeparam",
     description:"Rules with the `$removeparam` modifier are intended to strip query parameters from requests' URLs.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#removeparam-modifier",
     assignable:true,
     negatable:false,
     value_optional:true,
-    value_format:"/^(?!.*([^\\\\](,|\\$|\\/))).*$/" },
+    value_format:"(?xi)\n  (\n    # string pattern\n    \\w+\n    # or regexp pattern\n    |\n    \\/.+\\/\n      # flags\n      ([gimuy]+)?\n  )" },
   ubo_ext_any:{ name:"removeparam",
     description:"Rules with the `$removeparam` modifier are intended to strip query parameters from requests' URLs.",
     docs:"https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#removeparam",
     assignable:true,
     negatable:false,
-    value_format:"/^(?!.*([^\\\\](,|\\$|\\/))).*$/" } };
+    value_format:"(?xi)\n  (\n    # string pattern\n    \\w+\n    # or regexp pattern\n    |\n    \\/.+\\/\n      # flags\n      ([gimuy]+)?\n  )" } };
 
 var data$d = { adg_os_any:{ name:"replace",
     description:"This modifier completely changes the rule behavior.\nIf it is applied, the rule will not block the request. The response is going to be modified instead.",
@@ -6616,7 +6910,7 @@ var data$d = { adg_os_any:{ name:"replace",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
-    value_format:"/^\\/.+\\/.*\\/$/" },
+    value_format:"(?xi)\n  ^\n    \\/\n      # the regexp to match by\n      (.+)\n    # separator\n    \\/\n      # replacement\n      (.+?)\n    \\/\n      # flags\n      ([gimuy]*)?\n  $" },
   adg_ext_firefox:{ name:"replace",
     description:"This modifier completely changes the rule behavior.\nIf it is applied, the rule will not block the request. The response is going to be modified instead.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#replace-modifier",
@@ -6634,7 +6928,7 @@ var data$d = { adg_os_any:{ name:"replace",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
-    value_format:"/^\\/.+\\/.*\\/$/" } };
+    value_format:"(?xi)\n  ^\n    \\/\n      # the regexp to match by\n      (.+)\n    # separator\n    \\/\n      # replacement\n      (.+?)\n    \\/\n      # flags\n      ([gimuy]*)?\n  $" } };
 
 var data$c = { adg_any:{ name:"script",
     description:"The rule corresponds to script requests, e.g. javascript, vbscript.",
@@ -6678,7 +6972,7 @@ var data$a = { adg_os_any:{ name:"stealth",
     negatable:false,
     exception_only:true,
     value_optional:true,
-    value_format:"(?x)\n  ^(?!\\|)\\b(?:(\n    searchqueries|\n    donottrack|\n    3p-cookie|\n    1p-cookie|\n    3p-cache|\n    3p-auth|\n    webrtc|\n    push|\n    location|\n    flash|\n    java|\n    referrer|\n    useragent|\n    ip|\n    xclientdata|\n    dpi|\n    \\|?\n  )\\b)+(?<!\\|)$" },
+    value_format:"pipe_separated_stealth_options" },
   adg_ext_chrome:{ name:"stealth",
     description:"Disables the Stealth Mode module for all corresponding pages and requests.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#stealth-modifier",
@@ -6686,7 +6980,7 @@ var data$a = { adg_os_any:{ name:"stealth",
     negatable:false,
     exception_only:true,
     value_optional:true,
-    value_format:"(?x)\n  ^(?!\\|)\\b(?:(\n    searchqueries|\n    donottrack|\n    3p-cookie|\n    1p-cookie|\n    webrtc|\n    referrer|\n    xclientdata\n    |\\|?\n  )\\b)+(?<!\\|)$" },
+    value_format:"pipe_separated_stealth_options" },
   adg_ext_firefox:{ name:"stealth",
     description:"Disables the Stealth Mode module for all corresponding pages and requests.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#stealth-modifier",
@@ -6694,7 +6988,7 @@ var data$a = { adg_os_any:{ name:"stealth",
     negatable:false,
     exception_only:true,
     value_optional:true,
-    value_format:"(?x)\n  ^(?!\\|)\\b(?:(\n    searchqueries|\n    donottrack|\n    3p-cookie|\n    1p-cookie|\n    webrtc|\n    referrer|\n    |\\|?\n  )\\b)+(?<!\\|)$" },
+    value_format:"pipe_separated_stealth_options" },
   adg_ext_opera:{ name:"stealth",
     description:"Disables the Stealth Mode module for all corresponding pages and requests.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#stealth-modifier",
@@ -6702,7 +6996,7 @@ var data$a = { adg_os_any:{ name:"stealth",
     negatable:false,
     exception_only:true,
     value_optional:true,
-    value_format:"(?x)\n  ^(?!\\|)\\b(?:(\n    searchqueries|\n    donottrack|\n    3p-cookie|\n    1p-cookie|\n    webrtc|\n    referrer|\n    |\\|?\n  )\\b)+(?<!\\|)$" },
+    value_format:"pipe_separated_stealth_options" },
   adg_ext_edge:{ name:"stealth",
     description:"Disables the Stealth Mode module for all corresponding pages and requests.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#stealth-modifier",
@@ -6710,7 +7004,7 @@ var data$a = { adg_os_any:{ name:"stealth",
     negatable:false,
     exception_only:true,
     value_optional:true,
-    value_format:"(?x)\n  ^(?!\\|)\\b(?:(\n    searchqueries|\n    donottrack|\n    3p-cookie|\n    1p-cookie|\n    webrtc|\n    referrer|\n    |\\|?\n  )\\b)+(?<!\\|)$" } };
+    value_format:"pipe_separated_stealth_options" } };
 
 var data$9 = { ubo_any:{ name:"strict1p",
     description:"This new `strict1p` option can check for strict partyness.\nFor example, a network request qualifies as 1st-party if both the context and the request share the same hostname.",
@@ -6913,8 +7207,6 @@ var SpecificKey;
     SpecificKey["Negatable"] = "negatable";
     SpecificKey["BlockOnly"] = "block_only";
     SpecificKey["ExceptionOnly"] = "exception_only";
-    // TODO: consider removing this field
-    // and handle whether the value is optional by `value_format`. AG-24028
     SpecificKey["ValueOptional"] = "value_optional";
     SpecificKey["ValueFormat"] = "value_format";
     // TODO: following fields should be handled later
@@ -6978,25 +7270,123 @@ const getModifiersData = () => {
     return dataMap;
 };
 
-const INVALID_ERROR_PREFIX = {
-    NOT_EXISTENT: 'Not existent modifier',
-    NOT_SUPPORTED: 'The adblocker does not support the modifier',
-    REMOVED: 'Removed and no longer supported modifier',
+/**
+ * Prefixes for different adblockers to describe the platform-specific modifiers data
+ * stored in the yaml files.
+ */
+const BLOCKER_PREFIX = {
+    [AdblockSyntax.Adg]: 'adg_',
+    [AdblockSyntax.Ubo]: 'ubo_',
+    [AdblockSyntax.Abp]: 'abp_',
+};
+/**
+ * Set of all allowed characters for app name except the dot `.`.
+ */
+const APP_NAME_ALLOWED_CHARS = new Set([
+    ...CAPITAL_LETTERS,
+    ...SMALL_LETTERS,
+    ...NUMBERS,
+    UNDERSCORE,
+]);
+/**
+ * Allowed methods for $method modifier.
+ *
+ * @see {@link https://adguard.app/kb/general/ad-filtering/create-own-filters/#method-modifier}
+ */
+const ALLOWED_METHODS = new Set([
+    'connect',
+    'delete',
+    'get',
+    'head',
+    'options',
+    'patch',
+    'post',
+    'put',
+    'trace',
+]);
+/**
+ * Allowed stealth options for $stealth modifier.
+ *
+ * @see {@link https://adguard.app/kb/general/ad-filtering/create-own-filters/#stealth-modifier}
+ */
+const ALLOWED_STEALTH_OPTIONS = new Set([
+    'searchqueries',
+    'donottrack',
+    '3p-cookie',
+    '1p-cookie',
+    '3p-cache',
+    '3p-auth',
+    'webrtc',
+    'push',
+    'location',
+    'flash',
+    'java',
+    'referrer',
+    'useragent',
+    'ip',
+    'xclientdata',
+    'dpi',
+]);
+/**
+ * Prefixes for error messages used in modifier validation.
+ */
+const VALIDATION_ERROR_PREFIX = {
     BLOCK_ONLY: 'Only blocking rules may contain the modifier',
     EXCEPTION_ONLY: 'Only exception rules may contain the modifier',
-    NOT_NEGATABLE: 'Not negatable modifier',
-    VALUE_REQUIRED: 'Value is required for the modifier',
-    VALUE_FORBIDDEN: 'Value is not allowed for the modifier',
+    INVALID_LIST_VALUES: 'Invalid values for the modifier',
     INVALID_NOOP: 'Invalid noop modifier',
+    MIXED_NEGATIONS: 'Simultaneous usage of negated and not negated values is forbidden for the modifier',
+    NOT_EXISTENT: 'Non-existent modifier',
+    NOT_NEGATABLE_MODIFIER: 'Non-negatable modifier',
+    NOT_NEGATABLE_VALUE: 'Values cannot be negated for the modifier',
+    NOT_SUPPORTED: 'The adblocker does not support the modifier',
+    REMOVED: 'Removed and no longer supported modifier',
+    VALUE_FORBIDDEN: 'Value is not allowed for the modifier',
+    VALUE_INVALID: 'Value is invalid for the modifier',
+    VALUE_REQUIRED: 'Value is required for the modifier',
+};
+/**
+ * Prefixes for error messages related to issues in the source YAML files' data.
+ */
+const SOURCE_DATA_ERROR_PREFIX = {
+    INVALID_VALUE_FORMAT_REGEXP: "Invalid regular expression in 'value_format' for the modifier",
+    NO_DEPRECATION_MESSAGE: "Property 'deprecation_message' is required for the 'deprecated' modifier",
+    NO_VALUE_FORMAT_FOR_ASSIGNABLE: "Property 'value_format' should be specified for the assignable modifier",
 };
 
 /**
- * @file Validator for modifiers.
+ * Validates the noop modifier (i.e. only underscores).
+ *
+ * @param value Value of the modifier.
+ *
+ * @returns True if the modifier is valid, false otherwise.
  */
-const BLOCKER_PREFIX = {
-    [AdblockSyntax.Adg]: 'adg_',
-    [AdblockSyntax.Ubo]: 'ubo_',
-    [AdblockSyntax.Abp]: 'abp_',
+const isValidNoopModifier = (value) => {
+    return value.split('').every((char) => char === UNDERSCORE);
+};
+/**
+ * Returns invalid validation result with given error message.
+ *
+ * @param error Error message.
+ *
+ * @returns Validation result `{ valid: false, error }`.
+ */
+const getInvalidValidationResult = (error) => {
+    return {
+        valid: false,
+        error,
+    };
+};
+/**
+ * Returns invalid validation result which uses {@link VALIDATION_ERROR_PREFIX.VALUE_REQUIRED} as prefix
+ * and specifies the given `modifierName` in the error message.
+ *
+ * @param modifierName Modifier name.
+ *
+ * @returns Validation result `{ valid: false, error }`.
+ */
+const getValueRequiredValidationResult = (modifierName) => {
+    return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.VALUE_REQUIRED}: '${modifierName}'`);
 };
 /**
  * Collects names and aliases for all supported modifiers.
@@ -7048,116 +7438,621 @@ const getSpecificBlockerData = (modifiersData, blockerPrefix, modifierName) => {
     });
     return specificBlockerData;
 };
+
 /**
- * Returns invalid validation result with given error message.
- *
- * @param error Error message.
- *
- * @returns Validation result `{ ok: false, error }`.
+ * @file Utility functions for domain and hostname validation.
  */
-const getInvalidValidationResult = (error) => {
-    return {
-        ok: false,
-        error,
-    };
-};
 /**
- * Fully checks whether the given `modifier` valid for given blocker `syntax`:
- * is it supported by the blocker, deprecated, assignable, negatable, etc.
+ * Marker for a wildcard top-level domain — `.*`.
  *
- * @param modifiersData Parsed all modifiers data map.
- * @param syntax Adblock syntax to check the modifier for.
- * 'Common' is not supported, it should be specific — 'AdGuard', 'uBlockOrigin', or 'AdblockPlus'.
- * @param modifier Parsed modifier AST node.
- * @param isException Whether the modifier is used in exception rule.
- * Needed to check whether the modifier is allowed only in blocking or exception rules.
+ * @example
+ * `example.*` — matches with any TLD, e.g. `example.org`, `example.com`, etc.
+ */
+const WILDCARD_TLD = DOT + WILDCARD$1;
+/**
+ * Marker for a wildcard subdomain — `*.`.
  *
- * @returns Result of modifier validation.
+ * @example
+ * `*.example.org` — matches with any subdomain, e.g. `foo.example.org` or `bar.example.org`
  */
-const validateForSpecificSyntax = (modifiersData, syntax, modifier, isException) => {
-    if (syntax === AdblockSyntax.Common) {
-        throw new Error(`Syntax should be specific, '${AdblockSyntax.Common}' is not supported`);
-    }
-    const modifierName = modifier.modifier.value;
-    const blockerPrefix = BLOCKER_PREFIX[syntax];
-    if (!blockerPrefix) {
-        throw new Error(`Unknown syntax: ${syntax}`);
-    }
-    // needed for validation of negation, assignment, etc.
-    const specificBlockerData = getSpecificBlockerData(modifiersData, blockerPrefix, modifierName);
-    // if no specific blocker data is found
-    if (!specificBlockerData) {
-        return getInvalidValidationResult(`${INVALID_ERROR_PREFIX.NOT_SUPPORTED}: '${modifierName}'`);
-    }
-    // e.g. 'object-subrequest'
-    if (specificBlockerData.removed) {
-        return getInvalidValidationResult(`${INVALID_ERROR_PREFIX.REMOVED}: '${modifierName}'`);
-    }
-    if (specificBlockerData.deprecated) {
-        if (!specificBlockerData.deprecation_message) {
-            throw new Error('Deprecation notice is required for deprecated modifier');
+const WILDCARD_SUBDOMAIN = WILDCARD$1 + DOT;
+class DomainUtils {
+    /**
+     * Check if the input is a valid domain or hostname.
+     *
+     * @param domain Domain to check
+     * @returns `true` if the domain is valid, `false` otherwise
+     */
+    static isValidDomainOrHostname(domain) {
+        let domainToCheck = domain;
+        // Wildcard-only domain, typically a generic rule
+        if (domainToCheck === WILDCARD$1) {
+            return true;
         }
-        return {
-            ok: true,
-            warn: specificBlockerData.deprecation_message,
-        };
-    }
-    if (specificBlockerData.block_only && isException) {
-        return getInvalidValidationResult(`${INVALID_ERROR_PREFIX.BLOCK_ONLY}: '${modifierName}'`);
-    }
-    if (specificBlockerData.exception_only && !isException) {
-        return getInvalidValidationResult(`${INVALID_ERROR_PREFIX.EXCEPTION_ONLY}: '${modifierName}'`);
-    }
-    // e.g. '~domain=example.com'
-    if (!specificBlockerData.negatable && modifier.exception) {
-        return getInvalidValidationResult(`${INVALID_ERROR_PREFIX.NOT_NEGATABLE}: '${modifierName}'`);
-    }
-    // e.g. 'domain'
-    if (specificBlockerData.assignable) {
-        /**
-         * Some assignable modifiers can be used without a value,
-         * e.g. '@@||example.com^$cookie'.
-         */
-        if (!modifier.value
-            // value should be specified if it is not optional
-            && !specificBlockerData.value_optional) {
-            return getInvalidValidationResult(`${INVALID_ERROR_PREFIX.VALUE_REQUIRED}: '${modifierName}'`);
+        // https://adguard.com/kb/general/ad-filtering/create-own-filters/#wildcard-for-tld
+        if (domainToCheck.endsWith(WILDCARD_TLD)) {
+            // Remove the wildcard TLD
+            domainToCheck = domainToCheck.substring(0, domainToCheck.length - WILDCARD_TLD.length);
         }
-        /**
-         * TODO: consider to return `{ ok: true, warn: 'Modifier value may be specified' }` (???)
-         * for $stealth modifier without a value
-         * but only after the extension will support value for $stealth:
-         * https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2107
-         */
-    }
-    else if (modifier?.value) {
-        return getInvalidValidationResult(`${INVALID_ERROR_PREFIX.VALUE_FORBIDDEN}: '${modifierName}'`);
+        if (domainToCheck.startsWith(WILDCARD_SUBDOMAIN)) {
+            // Remove the wildcard subdomain
+            domainToCheck = domainToCheck.substring(WILDCARD_SUBDOMAIN.length);
+        }
+        // Parse the domain with tldts
+        const tldtsResult = parse$1(domainToCheck);
+        // Check if the domain is valid
+        return domainToCheck === tldtsResult.domain || domainToCheck === tldtsResult.hostname;
     }
-    return { ok: true };
-};
+}
+
 /**
- * Returns documentation URL for given modifier and adblocker.
- *
+ * @file Utility functions for working with quotes
+ */
+/**
+ * Possible quote types for scriptlet parameters
+ */
+var QuoteType;
+(function (QuoteType) {
+    /**
+     * No quotes at all
+     */
+    QuoteType["None"] = "none";
+    /**
+     * Single quotes (`'`)
+     */
+    QuoteType["Single"] = "single";
+    /**
+     * Double quotes (`"`)
+     */
+    QuoteType["Double"] = "double";
+})(QuoteType || (QuoteType = {}));
+/**
+ * Utility functions for working with quotes
+ */
+class QuoteUtils {
+    /**
+     * Escape all unescaped occurrences of the character
+     *
+     * @param string String to escape
+     * @param char Character to escape
+     * @returns Escaped string
+     */
+    static escapeUnescapedOccurrences(string, char) {
+        let result = EMPTY;
+        for (let i = 0; i < string.length; i += 1) {
+            if (string[i] === char && (i === 0 || string[i - 1] !== ESCAPE_CHARACTER)) {
+                result += ESCAPE_CHARACTER;
+            }
+            result += string[i];
+        }
+        return result;
+    }
+    /**
+     * Unescape all single escaped occurrences of the character
+     *
+     * @param string String to unescape
+     * @param char Character to unescape
+     * @returns Unescaped string
+     */
+    static unescapeSingleEscapedOccurrences(string, char) {
+        let result = EMPTY;
+        for (let i = 0; i < string.length; i += 1) {
+            if (string[i] === char
+                && string[i - 1] === ESCAPE_CHARACTER
+                && (i === 1 || string[i - 2] !== ESCAPE_CHARACTER)) {
+                result = result.slice(0, -1);
+            }
+            result += string[i];
+        }
+        return result;
+    }
+    /**
+     * Get quote type of the string
+     *
+     * @param string String to check
+     * @returns Quote type of the string
+     */
+    static getStringQuoteType(string) {
+        // Don't check 1-character strings to avoid false positives
+        if (string.length > 1) {
+            if (string.startsWith(SINGLE_QUOTE) && string.endsWith(SINGLE_QUOTE)) {
+                return QuoteType.Single;
+            }
+            if (string.startsWith(DOUBLE_QUOTE) && string.endsWith(DOUBLE_QUOTE)) {
+                return QuoteType.Double;
+            }
+        }
+        return QuoteType.None;
+    }
+    /**
+     * Set quote type of the string
+     *
+     * @param string String to set quote type of
+     * @param quoteType Quote type to set
+     * @returns String with the specified quote type
+     */
+    static setStringQuoteType(string, quoteType) {
+        const actualQuoteType = QuoteUtils.getStringQuoteType(string);
+        switch (quoteType) {
+            case QuoteType.None:
+                if (actualQuoteType === QuoteType.Single) {
+                    return QuoteUtils.escapeUnescapedOccurrences(string.slice(1, -1), SINGLE_QUOTE);
+                }
+                if (actualQuoteType === QuoteType.Double) {
+                    return QuoteUtils.escapeUnescapedOccurrences(string.slice(1, -1), DOUBLE_QUOTE);
+                }
+                return string;
+            case QuoteType.Single:
+                if (actualQuoteType === QuoteType.None) {
+                    return SINGLE_QUOTE + QuoteUtils.escapeUnescapedOccurrences(string, SINGLE_QUOTE) + SINGLE_QUOTE;
+                }
+                if (actualQuoteType === QuoteType.Double) {
+                    return SINGLE_QUOTE
+                        + QuoteUtils.escapeUnescapedOccurrences(QuoteUtils.unescapeSingleEscapedOccurrences(string.slice(1, -1), DOUBLE_QUOTE), SINGLE_QUOTE) + SINGLE_QUOTE;
+                }
+                return string;
+            case QuoteType.Double:
+                if (actualQuoteType === QuoteType.None) {
+                    return DOUBLE_QUOTE + QuoteUtils.escapeUnescapedOccurrences(string, DOUBLE_QUOTE) + DOUBLE_QUOTE;
+                }
+                if (actualQuoteType !== QuoteType.Double) {
+                    // eslint-disable-next-line max-len
+                    return DOUBLE_QUOTE
+                        + QuoteUtils.escapeUnescapedOccurrences(QuoteUtils.unescapeSingleEscapedOccurrences(string.slice(1, -1), SINGLE_QUOTE), DOUBLE_QUOTE) + DOUBLE_QUOTE;
+                }
+                return string;
+            default:
+                return string;
+        }
+    }
+    /**
+     * Removes bounding quotes from a string, if any
+     *
+     * @param string Input string
+     * @returns String without quotes
+     */
+    static removeQuotes(string) {
+        if (
+        // We should check for string length to avoid false positives
+        string.length > 1
+            && (string[0] === SINGLE_QUOTE || string[0] === DOUBLE_QUOTE)
+            && string[0] === string[string.length - 1]) {
+            return string.slice(1, -1);
+        }
+        return string;
+    }
+    /**
+     * Wraps given `strings` with `quote` (defaults to single quote `'`)
+     * and joins them with `separator` (defaults to comma+space `, `).
+     *
+     * @param strings Strings to quote and join.
+     * @param quoteType Quote to use.
+     * @param separator Separator to use.
+     *
+     * @returns String with joined items.
+     *
+     * @example
+     * ['abc', 'def']: strings[]  ->  "'abc', 'def'": string
+     */
+    static quoteAndJoinStrings(strings, quoteType = QuoteType.Single, separator = `${COMMA}${SPACE}`) {
+        return strings
+            .map((s) => QuoteUtils.setStringQuoteType(s, quoteType))
+            .join(separator);
+    }
+}
+
+/**
+ * Pre-defined available validators for modifiers with custom `value_format`.
+ */
+var CustomValueFormatValidatorName;
+(function (CustomValueFormatValidatorName) {
+    CustomValueFormatValidatorName["App"] = "pipe_separated_apps";
+    // there are some differences between $domain and $denyallow
+    CustomValueFormatValidatorName["DenyAllow"] = "pipe_separated_denyallow_domains";
+    CustomValueFormatValidatorName["Domain"] = "pipe_separated_domains";
+    CustomValueFormatValidatorName["Method"] = "pipe_separated_methods";
+    CustomValueFormatValidatorName["StealthOption"] = "pipe_separated_stealth_options";
+})(CustomValueFormatValidatorName || (CustomValueFormatValidatorName = {}));
+/**
+ * Checks whether the `chunk` of app name (which if splitted by dot `.`) is valid.
+ * Only letters, numbers, and underscore `_` are allowed.
+ *
+ * @param chunk Chunk of app name to check.
+ *
+ * @returns True if the `chunk` is valid part of app name, false otherwise.
+ */
+const isValidAppNameChunk = (chunk) => {
+    // e.g. 'Example..exe'
+    if (chunk.length === 0) {
+        return false;
+    }
+    for (let i = 0; i < chunk.length; i += 1) {
+        const char = chunk[i];
+        if (!APP_NAME_ALLOWED_CHARS.has(char)) {
+            return false;
+        }
+    }
+    return true;
+};
+/**
+ * Checks whether the given `value` is valid app name as $app modifier value.
+ *
+ * @param value App name to check.
+ *
+ * @returns True if the `value` is valid app name, false otherwise.
+ */
+const isValidAppModifierValue = (value) => {
+    // $app modifier does not support wildcard tld
+    // https://adguard.app/kb/general/ad-filtering/create-own-filters/#app-modifier
+    if (value.includes(WILDCARD$1)) {
+        return false;
+    }
+    return value
+        .split(DOT)
+        .every((chunk) => isValidAppNameChunk(chunk));
+};
+/**
+ * Checks whether the given `value` is valid HTTP method as $method modifier value.
+ *
+ * @param value Method to check.
+ *
+ * @returns True if the `value` is valid HTTP method, false otherwise.
+ */
+const isValidMethodModifierValue = (value) => {
+    return ALLOWED_METHODS.has(value);
+};
+/**
+ * Checks whether the given `value` is valid option as $stealth modifier value.
+ *
+ * @param value Stealth option to check.
+ *
+ * @returns True if the `value` is valid stealth option, false otherwise.
+ */
+const isValidStealthModifierValue = (value) => {
+    return ALLOWED_STEALTH_OPTIONS.has(value);
+};
+/**
+ * Checks whether the given `value` is valid domain as $denyallow modifier value.
+ * Important: wildcard tld are not supported, compared to $domain.
+ *
+ * @param value Value to check.
+ *
+ * @returns True if the `value` is valid domain and does not contain wildcard `*`, false otherwise.
+ */
+const isValidDenyAllowModifierValue = (value) => {
+    // $denyallow modifier does not support wildcard tld
+    // https://adguard.app/kb/general/ad-filtering/create-own-filters/#denyallow-modifier
+    // but here we are simply checking whether the value contains wildcard `*`, not ends with `.*`
+    if (value.includes(WILDCARD$1)) {
+        return false;
+    }
+    // TODO: add cache for domains validation
+    return DomainUtils.isValidDomainOrHostname(value);
+};
+/**
+ * Checks whether the given `value` is valid domain as $domain modifier value.
+ *
+ * @param value Value to check.
+ *
+ * @returns True if the `value` is valid domain, false otherwise.
+ */
+const isValidDomainModifierValue = (value) => {
+    // TODO: add cache for domains validation
+    return DomainUtils.isValidDomainOrHostname(value);
+};
+/**
+ * Checks whether the all list items' exceptions are `false`.
+ * Those items which `exception` is `true` is to be specified in the validation result error message.
+ *
+ * @param modifierName Modifier name.
+ * @param listItems List items to check.
+ *
+ * @returns Validation result.
+ */
+const customNoNegatedListItemsValidator = (modifierName, listItems) => {
+    const negatedValues = [];
+    listItems.forEach((listItem) => {
+        if (listItem.exception) {
+            negatedValues.push(listItem.value);
+        }
+    });
+    if (negatedValues.length > 0) {
+        const valuesToStr = QuoteUtils.quoteAndJoinStrings(negatedValues);
+        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.NOT_NEGATABLE_VALUE}: '${modifierName}': ${valuesToStr}`);
+    }
+    return { valid: true };
+};
+/**
+ * Checks whether the all list items' exceptions are consistent,
+ * i.e. all items are either negated or not negated.
+ *
+ * The `exception` value of the first item is used as a reference, and all other items are checked against it.
+ * Those items which `exception` is not consistent with the first item
+ * is to be specified in the validation result error message.
+ *
+ * @see {@link https://adguard.com/kb/general/ad-filtering/create-own-filters/#method-modifier}
+ *
+ * @param modifierName Modifier name.
+ * @param listItems List items to check.
+ *
+ * @returns Validation result.
+ */
+const customConsistentExceptionsValidator = (modifierName, listItems) => {
+    const firstException = listItems[0].exception;
+    const nonConsistentItemValues = [];
+    listItems.forEach((listItem) => {
+        if (listItem.exception !== firstException) {
+            nonConsistentItemValues.push(listItem.value);
+        }
+    });
+    if (nonConsistentItemValues.length > 0) {
+        const valuesToStr = QuoteUtils.quoteAndJoinStrings(nonConsistentItemValues);
+        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.MIXED_NEGATIONS}: '${modifierName}': ${valuesToStr}`);
+    }
+    return { valid: true };
+};
+/**
+ * Checks whether the given `modifier` value is valid.
+ * Supposed to validate the value of modifiers which values are lists separated by pipe `|` —
+ * $app, $domain, $denyallow, $method.
+ *
+ * @param modifier Modifier AST node.
+ * @param listParser Parser function for parsing modifier value
+ * which is supposed to be a list separated by pipe `|`.
+ * @param isValidListItem Predicate function for checking of modifier's list item validity,
+ * e.g. $denyallow modifier does not support wildcard tld, but $domain does.
+ * @param customListValidator Optional; custom validator for specific modifier,
+ * e.g. $denyallow modifier does not support negated domains.
+ *
+ * @returns Result of modifier domains validation.
+ */
+const validateListItemsModifier = (modifier, listParser, isValidListItem, customListValidator) => {
+    const modifierName = modifier.modifier.value;
+    const defaultInvalidValueResult = getValueRequiredValidationResult(modifierName);
+    if (!modifier.value?.value) {
+        return defaultInvalidValueResult;
+    }
+    let theList;
+    try {
+        theList = listParser(modifier.value.value, PIPE_MODIFIER_SEPARATOR);
+    }
+    catch (e) {
+        if (e instanceof AdblockSyntaxError) {
+            return {
+                valid: false,
+                error: e.message,
+            };
+        }
+        return defaultInvalidValueResult;
+    }
+    const invalidListItems = [];
+    theList.children.forEach((item) => {
+        // different validators are used for $denyallow and $domain modifiers
+        // because of different requirements and restrictions
+        if (!isValidListItem(item.value)) {
+            invalidListItems.push(item.value);
+        }
+    });
+    if (invalidListItems.length > 0) {
+        const itemsToStr = QuoteUtils.quoteAndJoinStrings(invalidListItems);
+        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.INVALID_LIST_VALUES}: '${modifierName}': ${itemsToStr}`);
+    }
+    // IMPORTANT: run custom validator after all other checks
+    // Some lists should be fully checked, not just the list items:
+    // e.g. Safari does not support allowed and disallowed domains for $domain in the same list
+    // or   domains cannot be negated for $denyallow modifier
+    if (customListValidator) {
+        return customListValidator(modifierName, theList.children);
+    }
+    return { valid: true };
+};
+/**
+ * Validates 'pipe_separated_apps' custom value format.
+ * Used for $app modifier.
+ *
+ * @param modifier Modifier AST node.
+ *
+ * @returns Validation result.
+ */
+const validatePipeSeparatedApps = (modifier) => {
+    return validateListItemsModifier(modifier, (raw) => AppListParser.parse(raw), isValidAppModifierValue);
+};
+/**
+ * Validates 'pipe_separated_denyallow_domains' custom value format.
+ * Used for $denyallow modifier.
+ *
+ * @param modifier Modifier AST node.
+ *
+ * @returns Validation result.
+ */
+const validatePipeSeparatedDenyAllowDomains = (modifier) => {
+    return validateListItemsModifier(modifier, DomainListParser.parse, isValidDenyAllowModifierValue, customNoNegatedListItemsValidator);
+};
+/**
+ * Validates 'pipe_separated_domains' custom value format.
+ * Used for $domains modifier.
+ *
+ * @param modifier Modifier AST node.
+ *
+ * @returns Validation result.
+ */
+const validatePipeSeparatedDomains = (modifier) => {
+    return validateListItemsModifier(modifier, DomainListParser.parse, isValidDomainModifierValue);
+};
+/**
+ * Validates 'pipe_separated_methods' custom value format.
+ * Used for $method modifier.
+ *
+ * @param modifier Modifier AST node.
+ *
+ * @returns Validation result.
+ */
+const validatePipeSeparatedMethods = (modifier) => {
+    return validateListItemsModifier(modifier, (raw) => MethodListParser.parse(raw), isValidMethodModifierValue, customConsistentExceptionsValidator);
+};
+/**
+ * Validates 'pipe_separated_stealth_options' custom value format.
+ * Used for $stealth modifier.
+ *
+ * @param modifier Modifier AST node.
+ *
+ * @returns Validation result.
+ */
+const validatePipeSeparatedStealthOptions = (modifier) => {
+    return validateListItemsModifier(modifier, (raw) => StealthOptionListParser.parse(raw), isValidStealthModifierValue, customNoNegatedListItemsValidator);
+};
+/**
+ * Map of all available pre-defined validators for modifiers with custom `value_format`.
+ */
+const CUSTOM_VALUE_FORMAT_MAP = {
+    [CustomValueFormatValidatorName.App]: validatePipeSeparatedApps,
+    [CustomValueFormatValidatorName.DenyAllow]: validatePipeSeparatedDenyAllowDomains,
+    [CustomValueFormatValidatorName.Domain]: validatePipeSeparatedDomains,
+    [CustomValueFormatValidatorName.Method]: validatePipeSeparatedMethods,
+    [CustomValueFormatValidatorName.StealthOption]: validatePipeSeparatedStealthOptions,
+};
+/**
+ * Returns whether the given `valueFormat` is a valid custom value format validator name.
+ *
+ * @param valueFormat Value format for the modifier.
+ *
+ * @returns True if `valueFormat` is a supported pre-defined value format validator name, false otherwise.
+ */
+const isCustomValueFormatValidator = (valueFormat) => {
+    return Object.keys(CUSTOM_VALUE_FORMAT_MAP).includes(valueFormat);
+};
+/**
+ * Checks whether the value for given `modifier` is valid.
+ *
+ * @param modifier Modifier AST node.
+ * @param valueFormat Value format for the modifier.
+ *
+ * @returns Validation result.
+ */
+const validateValue = (modifier, valueFormat) => {
+    if (isCustomValueFormatValidator(valueFormat)) {
+        const validator = CUSTOM_VALUE_FORMAT_MAP[valueFormat];
+        return validator(modifier);
+    }
+    const modifierName = modifier.modifier.value;
+    const defaultInvalidValueResult = getValueRequiredValidationResult(modifierName);
+    if (!modifier.value?.value) {
+        return defaultInvalidValueResult;
+    }
+    let xRegExp;
+    try {
+        xRegExp = XRegExp(valueFormat);
+    }
+    catch (e) {
+        throw new Error(`${SOURCE_DATA_ERROR_PREFIX.INVALID_VALUE_FORMAT_REGEXP}: '${modifierName}'`);
+    }
+    const isValid = xRegExp.test(modifier.value?.value);
+    if (!isValid) {
+        return defaultInvalidValueResult;
+    }
+    return { valid: true };
+};
+
+/**
+ * @file Validator for modifiers.
+ */
+/**
+ * Fully checks whether the given `modifier` valid for given blocker `syntax`:
+ * is it supported by the blocker, deprecated, assignable, negatable, etc.
+ *
  * @param modifiersData Parsed all modifiers data map.
- * @param blockerPrefix Prefix of the adblocker, e.g. 'adg_', 'ubo_', or 'abp_'.
+ * @param syntax Adblock syntax to check the modifier for.
+ * 'Common' is not supported, it should be specific — 'AdGuard', 'uBlockOrigin', or 'AdblockPlus'.
  * @param modifier Parsed modifier AST node.
+ * @param isException Whether the modifier is used in exception rule.
+ * Needed to check whether the modifier is allowed only in blocking or exception rules.
  *
- * @returns Documentation URL or `null` if not found.
+ * @returns Result of modifier validation.
  */
-const getBlockerDocumentationLink = (modifiersData, blockerPrefix, modifier) => {
-    const specificBlockerData = getSpecificBlockerData(modifiersData, blockerPrefix, modifier.modifier.value);
-    return specificBlockerData?.docs || null;
+const validateForSpecificSyntax = (modifiersData, syntax, modifier, isException) => {
+    if (syntax === AdblockSyntax.Common) {
+        throw new Error(`Syntax should be specific, '${AdblockSyntax.Common}' is not supported`);
+    }
+    const modifierName = modifier.modifier.value;
+    const blockerPrefix = BLOCKER_PREFIX[syntax];
+    if (!blockerPrefix) {
+        throw new Error(`Unknown syntax: ${syntax}`);
+    }
+    // needed for validation of negation, assignment, etc.
+    const specificBlockerData = getSpecificBlockerData(modifiersData, blockerPrefix, modifierName);
+    // if no specific blocker data is found
+    if (!specificBlockerData) {
+        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.NOT_SUPPORTED}: '${modifierName}'`);
+    }
+    // e.g. 'object-subrequest'
+    if (specificBlockerData[SpecificKey.Removed]) {
+        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.REMOVED}: '${modifierName}'`);
+    }
+    if (specificBlockerData[SpecificKey.Deprecated]) {
+        if (!specificBlockerData[SpecificKey.DeprecationMessage]) {
+            throw new Error(`${SOURCE_DATA_ERROR_PREFIX.NO_DEPRECATION_MESSAGE}: '${modifierName}'`);
+        }
+        // prepare the message which is multiline in the yaml file
+        const warn = specificBlockerData[SpecificKey.DeprecationMessage].replace(NEWLINE, SPACE);
+        return {
+            valid: true,
+            warn,
+        };
+    }
+    if (specificBlockerData[SpecificKey.BlockOnly] && isException) {
+        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.BLOCK_ONLY}: '${modifierName}'`);
+    }
+    if (specificBlockerData[SpecificKey.ExceptionOnly] && !isException) {
+        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.EXCEPTION_ONLY}: '${modifierName}'`);
+    }
+    // e.g. '~domain=example.com'
+    if (!specificBlockerData[SpecificKey.Negatable] && modifier.exception) {
+        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.NOT_NEGATABLE_MODIFIER}: '${modifierName}'`);
+    }
+    // e.g. 'domain'
+    if (specificBlockerData[SpecificKey.Assignable]) {
+        if (!modifier.value) {
+            /**
+             * Some assignable modifiers can be used without a value,
+             * e.g. '@@||example.com^$cookie'.
+             */
+            if (specificBlockerData[SpecificKey.ValueOptional]) {
+                return { valid: true };
+            }
+            // for other assignable modifiers the value is required
+            return getValueRequiredValidationResult(modifierName);
+        }
+        /**
+         * TODO: consider to return `{ valid: true, warn: 'Modifier value may be specified' }` (???)
+         * for $stealth modifier without a value
+         * but only after the extension will support value for $stealth:
+         * https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2107
+         */
+        if (!specificBlockerData[SpecificKey.ValueFormat]) {
+            throw new Error(`${SOURCE_DATA_ERROR_PREFIX.NO_VALUE_FORMAT_FOR_ASSIGNABLE}: '${modifierName}'`);
+        }
+        return validateValue(modifier, specificBlockerData[SpecificKey.ValueFormat]);
+    }
+    if (modifier?.value) {
+        // e.g. 'third-party=true'
+        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.VALUE_FORBIDDEN}: '${modifierName}'`);
+    }
+    return { valid: true };
 };
 /**
- * Validates the noop modifier (i.e. only underscores).
+ * Returns documentation URL for given modifier and adblocker.
  *
- * @param value Value of the modifier.
+ * @param modifiersData Parsed all modifiers data map.
+ * @param blockerPrefix Prefix of the adblocker, e.g. 'adg_', 'ubo_', or 'abp_'.
+ * @param modifier Parsed modifier AST node.
  *
- * @returns True if the modifier is valid, false otherwise.
+ * @returns Documentation URL or `null` if not found.
  */
-const isValidNoopModifier = (value) => {
-    return value.split('').every((char) => char === UNDERSCORE);
+const getBlockerDocumentationLink = (modifiersData, blockerPrefix, modifier) => {
+    const specificBlockerData = getSpecificBlockerData(modifiersData, blockerPrefix, modifier.modifier.value);
+    return specificBlockerData?.docs || null;
 };
+// TODO: move to modifier.ts and use index.ts only for exporting
 /**
  * Modifier validator class.
  */
@@ -7210,18 +8105,18 @@ class ModifierValidator {
         if (modifier.modifier.value.startsWith(UNDERSCORE)) {
             // check whether the modifier value contains something else besides underscores
             if (!isValidNoopModifier(modifier.modifier.value)) {
-                return getInvalidValidationResult(`${INVALID_ERROR_PREFIX.INVALID_NOOP}: '${modifier.modifier.value}'`);
+                return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.INVALID_NOOP}: '${modifier.modifier.value}'`);
             }
             // otherwise, replace the modifier value with single underscore.
             // it is needed to check whether the modifier is supported by specific adblocker due to the syntax
             modifier.modifier.value = UNDERSCORE;
         }
         if (!this.exists(modifier)) {
-            return getInvalidValidationResult(`${INVALID_ERROR_PREFIX.NOT_EXISTENT}: '${modifier.modifier.value}'`);
+            return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.NOT_EXISTENT}: '${modifier.modifier.value}'`);
         }
         // for 'Common' syntax we cannot check something more
         if (syntax === AdblockSyntax.Common) {
-            return { ok: true };
+            return { valid: true };
         }
         return validateForSpecificSyntax(this.modifiersData, syntax, modifier, isException);
     };
@@ -7579,7 +8474,7 @@ const MAX_LENGTH = 'max-length';
 const MIN_LENGTH = 'min-length';
 const MIN_TEXT_LENGTH = 'min-text-length';
 const TAG_CONTENT = 'tag-content';
-const WILDCARD$1 = 'wildcard';
+const WILDCARD = 'wildcard';
 /**
  * HTML filtering rule converter class
  *
@@ -7650,7 +8545,7 @@ class HtmlRuleConverter extends RuleConverterBase {
                                 maxLength = CssTree.parseAttributeSelectorValueAsNumber(node);
                                 break;
                             case TAG_CONTENT:
-                            case WILDCARD$1:
+                            case WILDCARD:
                                 CssTree.assertAttributeSelectorHasStringValue(node);
                                 convertedSelector.children.push(cloneDeep(node));
                                 break;
@@ -7728,144 +8623,6 @@ class HtmlRuleConverter extends RuleConverterBase {
     }
 }
 
-/**
- * @file Utility functions for working with quotes
- */
-/**
- * Possible quote types for scriptlet parameters
- */
-var QuoteType;
-(function (QuoteType) {
-    /**
-     * No quotes at all
-     */
-    QuoteType["None"] = "none";
-    /**
-     * Single quotes (`'`)
-     */
-    QuoteType["Single"] = "single";
-    /**
-     * Double quotes (`"`)
-     */
-    QuoteType["Double"] = "double";
-})(QuoteType || (QuoteType = {}));
-/**
- * Utility functions for working with quotes
- */
-class QuoteUtils {
-    /**
-     * Escape all unescaped occurrences of the character
-     *
-     * @param string String to escape
-     * @param char Character to escape
-     * @returns Escaped string
-     */
-    static escapeUnescapedOccurrences(string, char) {
-        let result = EMPTY;
-        for (let i = 0; i < string.length; i += 1) {
-            if (string[i] === char && (i === 0 || string[i - 1] !== ESCAPE_CHARACTER)) {
-                result += ESCAPE_CHARACTER;
-            }
-            result += string[i];
-        }
-        return result;
-    }
-    /**
-     * Unescape all single escaped occurrences of the character
-     *
-     * @param string String to unescape
-     * @param char Character to unescape
-     * @returns Unescaped string
-     */
-    static unescapeSingleEscapedOccurrences(string, char) {
-        let result = EMPTY;
-        for (let i = 0; i < string.length; i += 1) {
-            if (string[i] === char
-                && string[i - 1] === ESCAPE_CHARACTER
-                && (i === 1 || string[i - 2] !== ESCAPE_CHARACTER)) {
-                result = result.slice(0, -1);
-            }
-            result += string[i];
-        }
-        return result;
-    }
-    /**
-     * Get quote type of the string
-     *
-     * @param string String to check
-     * @returns Quote type of the string
-     */
-    static getStringQuoteType(string) {
-        // Don't check 1-character strings to avoid false positives
-        if (string.length > 1) {
-            if (string.startsWith(SINGLE_QUOTE) && string.endsWith(SINGLE_QUOTE)) {
-                return QuoteType.Single;
-            }
-            if (string.startsWith(DOUBLE_QUOTE) && string.endsWith(DOUBLE_QUOTE)) {
-                return QuoteType.Double;
-            }
-        }
-        return QuoteType.None;
-    }
-    /**
-     * Set quote type of the string
-     *
-     * @param string String to set quote type of
-     * @param quoteType Quote type to set
-     * @returns String with the specified quote type
-     */
-    static setStringQuoteType(string, quoteType) {
-        const actualQuoteType = QuoteUtils.getStringQuoteType(string);
-        switch (quoteType) {
-            case QuoteType.None:
-                if (actualQuoteType === QuoteType.Single) {
-                    return QuoteUtils.escapeUnescapedOccurrences(string.slice(1, -1), SINGLE_QUOTE);
-                }
-                if (actualQuoteType === QuoteType.Double) {
-                    return QuoteUtils.escapeUnescapedOccurrences(string.slice(1, -1), DOUBLE_QUOTE);
-                }
-                return string;
-            case QuoteType.Single:
-                if (actualQuoteType === QuoteType.None) {
-                    return SINGLE_QUOTE + QuoteUtils.escapeUnescapedOccurrences(string, SINGLE_QUOTE) + SINGLE_QUOTE;
-                }
-                if (actualQuoteType === QuoteType.Double) {
-                    return SINGLE_QUOTE
-                        + QuoteUtils.escapeUnescapedOccurrences(QuoteUtils.unescapeSingleEscapedOccurrences(string.slice(1, -1), DOUBLE_QUOTE), SINGLE_QUOTE) + SINGLE_QUOTE;
-                }
-                return string;
-            case QuoteType.Double:
-                if (actualQuoteType === QuoteType.None) {
-                    return DOUBLE_QUOTE + QuoteUtils.escapeUnescapedOccurrences(string, DOUBLE_QUOTE) + DOUBLE_QUOTE;
-                }
-                if (actualQuoteType !== QuoteType.Double) {
-                    // eslint-disable-next-line max-len
-                    return DOUBLE_QUOTE
-                        + QuoteUtils.escapeUnescapedOccurrences(QuoteUtils.unescapeSingleEscapedOccurrences(string.slice(1, -1), SINGLE_QUOTE), DOUBLE_QUOTE) + DOUBLE_QUOTE;
-                }
-                return string;
-            default:
-                return string;
-        }
-    }
-    /**
-     * Removes bounding quotes from a string, if any
-     *
-     * @param string Input string
-     * @returns String without quotes
-     */
-    static removeQuotes(string) {
-        if (
-        // We should check for string length to avoid false positives
-        string.length > 1
-            && (string[0] === SINGLE_QUOTE || string[0] === DOUBLE_QUOTE)
-            && string[0] === string[string.length - 1]) {
-            return string.slice(1, -1);
-        }
-        return string;
-    }
-}
-
 /**
  * @file Utility functions for working with scriptlet nodes
  */
@@ -8762,41 +9519,6 @@ class FilterListConverter extends ConverterBase {
     }
 }
 
-/**
- * @file Utility functions for domain and hostname validation.
- */
-const WILDCARD = ASTERISK; // *
-const WILDCARD_TLD = DOT + WILDCARD; // .*
-const WILDCARD_SUBDOMAIN = WILDCARD + DOT; // *.
-class DomainUtils {
-    /**
-     * Check if the input is a valid domain or hostname.
-     *
-     * @param domain Domain to check
-     * @returns `true` if the domain is valid, `false` otherwise
-     */
-    static isValidDomainOrHostname(domain) {
-        let domainToCheck = domain;
-        // Wildcard-only domain, typically a generic rule
-        if (domainToCheck === WILDCARD) {
-            return true;
-        }
-        // https://adguard.com/kb/general/ad-filtering/create-own-filters/#wildcard-for-tld
-        if (domainToCheck.endsWith(WILDCARD_TLD)) {
-            // Remove the wildcard TLD
-            domainToCheck = domainToCheck.substring(0, domainToCheck.length - WILDCARD_TLD.length);
-        }
-        if (domainToCheck.startsWith(WILDCARD_SUBDOMAIN)) {
-            // Remove the wildcard subdomain
-            domainToCheck = domainToCheck.substring(WILDCARD_SUBDOMAIN.length);
-        }
-        // Parse the domain with tldts
-        const tldtsResult = parse$1(domainToCheck);
-        // Check if the domain is valid
-        return domainToCheck === tldtsResult.domain || domainToCheck === tldtsResult.hostname;
-    }
-}
-
 /**
  * @file Utility functions for logical expression AST.
  */
@@ -8875,7 +9597,7 @@ class LogicalExpressionUtils {
     }
 }
 
-const version$1 = "1.1.1";
+const version$1 = "1.1.3";
 
 /**
  * @file AGTree version
@@ -8886,4 +9608,4 @@ const version$1 = "1.1.1";
 // with wrong relative path to `package.json`. So we need this little "hack"
 const version = version$1;
 
-export { ADBLOCK_URL_SEPARATOR, ADBLOCK_URL_SEPARATOR_REGEX, ADBLOCK_URL_START, ADBLOCK_URL_START_REGEX, ADBLOCK_WILDCARD, ADBLOCK_WILDCARD_REGEX, ADG_SCRIPTLET_MASK, AGLINT_COMMAND_PREFIX, AdblockSyntax, AdblockSyntaxError, AgentCommentRuleParser, AgentParser, CLASSIC_DOMAIN_SEPARATOR, CommentMarker, CommentRuleParser, CommentRuleType, ConfigCommentRuleParser, CosmeticRuleParser, CosmeticRuleSeparator, CosmeticRuleSeparatorUtils, CosmeticRuleType, CssTree, CssTreeNodeType, CssTreeParserContext, DOMAIN_EXCEPTION_MARKER, DomainListParser, DomainUtils, EXT_CSS_LEGACY_ATTRIBUTES, EXT_CSS_PSEUDO_CLASSES, FORBIDDEN_CSS_FUNCTIONS, FilterListConverter, FilterListParser, HINT_MARKER, HintCommentRuleParser, HintParser, IF, INCLUDE, LogicalExpressionParser, LogicalExpressionUtils, METADATA_HEADERS, MODIFIERS_SEPARATOR, MODIFIER_ASSIGN_OPERATOR, MODIFIER_DOMAIN_SEPARATOR, MODIFIER_EXCEPTION_MARKER, MetadataCommentRuleParser, ModifierListParser, ModifierParser, NETWORK_RULE_EXCEPTION_MARKER, NETWORK_RULE_SEPARATOR, NetworkRuleParser, NotImplementedError, PREPROCESSOR_MARKER, ParameterListParser, PreProcessorCommentRuleParser, QuoteType, QuoteUtils, RegExpUtils, RuleCategory, RuleConversionError, RuleConverter, RuleParser, SAFARI_CB_AFFINITY, SPECIAL_REGEX_SYMBOLS, UBO_SCRIPTLET_MASK, locRange, modifierValidator, shiftLoc, version };
+export { ADBLOCK_URL_SEPARATOR, ADBLOCK_URL_SEPARATOR_REGEX, ADBLOCK_URL_START, ADBLOCK_URL_START_REGEX, ADBLOCK_WILDCARD, ADBLOCK_WILDCARD_REGEX, ADG_SCRIPTLET_MASK, AGLINT_COMMAND_PREFIX, AdblockSyntax, AdblockSyntaxError, AgentCommentRuleParser, AgentParser, AppListParser, COMMA_DOMAIN_LIST_SEPARATOR, CommentMarker, CommentRuleParser, CommentRuleType, ConfigCommentRuleParser, CosmeticRuleParser, CosmeticRuleSeparator, CosmeticRuleSeparatorUtils, CosmeticRuleType, CssTree, CssTreeNodeType, CssTreeParserContext, DomainListParser, DomainUtils, EXT_CSS_LEGACY_ATTRIBUTES, EXT_CSS_PSEUDO_CLASSES, FORBIDDEN_CSS_FUNCTIONS, FilterListConverter, FilterListParser, HINT_MARKER, HintCommentRuleParser, HintParser, IF, INCLUDE, LogicalExpressionParser, LogicalExpressionUtils, METADATA_HEADERS, MODIFIERS_SEPARATOR, MODIFIER_ASSIGN_OPERATOR, MetadataCommentRuleParser, MethodListParser, ModifierListParser, ModifierParser, NEGATION_MARKER, NETWORK_RULE_EXCEPTION_MARKER, NETWORK_RULE_SEPARATOR, NetworkRuleParser, NotImplementedError, PIPE_MODIFIER_SEPARATOR, PREPROCESSOR_MARKER, ParameterListParser, PreProcessorCommentRuleParser, QuoteType, QuoteUtils, RegExpUtils, RuleCategory, RuleConversionError, RuleConverter, RuleParser, SAFARI_CB_AFFINITY, SPECIAL_REGEX_SYMBOLS, StealthOptionListParser, UBO_SCRIPTLET_MASK, locRange, modifierValidator, shiftLoc, version };