@adguard/filters-compiler 3.1.2 → 3.1.4

package/dist/build.txt

@@ -1 +1 @@
-version=3.1.2
+version=3.1.4

package/dist/index.cjs

@@ -6,10 +6,10 @@ var fs$1 = require('fs');
 var md5 = require('md5');
 var filtersDownloader = require('@adguard/filters-downloader');
 var agtree = require('@adguard/agtree');
+var logger$1 = require('@adguard/logger');
 var fs = require('node:fs');
 var os = require('node:os');
 var path = require('node:path');
-var logger$1 = require('@adguard/logger');
 var parser = require('@adguard/agtree/parser');
 var ecssTree = require('@adguard/ecss-tree');
 var util = require('util');
@@ -203,6 +203,245 @@ const RuleMasks = {
     MASK_TRUSTED_SCRIPTLET: 'trusted-',
 };
 
+// TODO: consider refactoring this file
+// because agtree provides modern approach to solve such problems
+
+// Based on: https://github.com/github/linguist/pull/5968/commits/f7c5c39139945576a5f9ff0b41c990e6b6019232
+// eslint-disable-next-line max-len
+const ADBLOCK_AGENT_PATTERN = /^(?:!|#)?\s*\[(?<AdblockInfo>\s*(?:[Aa]d[Bb]lock(?:\s+[Pp]lus)?|u[Bb]lock(?:\s+[Oo]rigin)?|[Aa]d[Gg]uard)(?:\s+(?:\d\.?)+)?\s*)(?:;\g<AdblockInfo>)*\]\s*$/;
+
+/**
+ * CSS rules with width and height attributes break SVG rendering
+ * https://github.com/AdguardTeam/AdguardBrowserExtension/issues/683
+ *
+ * @param ruleText Rule text
+ */
+const fixCssRuleAttributesForEdge = function (ruleText) {
+    if (ruleText.includes(RuleMasks.MASK_CSS)
+        || ruleText.includes(RuleMasks.MASK_CSS_EXCEPTION)
+        || ruleText.includes(RuleMasks.MASK_ELEMENT_HIDING)
+        || ruleText.includes(RuleMasks.MASK_ELEMENT_HIDING_EXCEPTION)) {
+        ruleText = ruleText.replace(/\[width=/gi, '[Width=');
+        ruleText = ruleText.replace('/[height=/gi', '[Height=');
+    }
+
+    return ruleText;
+};
+
+/**
+ * Updates rule text
+ */
+const overrideRule = function (ruleText, platform) {
+    if (platform === 'ext_edge') {
+        ruleText = fixCssRuleAttributesForEdge(ruleText);
+    }
+
+    return ruleText;
+};
+
+/**
+ * Modifies header for AdGuard Base filter
+ * https://github.com/AdguardTeam/FiltersCompiler/issues/78
+ * @param {array} header
+ * @param {boolean} optimized
+ */
+const modifyBaseFilterHeader = (header, optimized) => {
+    header[0] = `! Title: AdGuard Base filter + EasyList${optimized ? ' (Optimized)' : ''}`;
+};
+
+/**
+ * Rewrites title and description
+ * https://github.com/AdguardTeam/AdguardFilters/issues/5138#issuecomment-328847738
+ */
+const rewriteHeader = function (header) {
+    const result = [];
+    header.forEach((line) => {
+        if (line.startsWith('! Title: ')) {
+            line = '! Title: AdGuard Base filter';
+        } else if (line.startsWith('! Description: ')) {
+            line = '! Description: This filter is necessary for quality ad blocking.';
+        }
+
+        result.push(line);
+    });
+
+    return result;
+};
+
+/**
+ * Filters easylist block from list of rules
+ * https://github.com/AdguardTeam/AdguardFilters/issues/5138#issuecomment-328847738
+ */
+const rewriteRules = function (rules) {
+    const filtered = [];
+    let flag = -1;
+    for (let i = 0; i < rules.length; i += 1) {
+        const rule = rules[i];
+
+        if (flag >= 0 && rule.startsWith('!------------------')) {
+            if (flag !== i - 1) {
+                // we skip next line after block header
+                // looking for the end of easylist block
+                flag = -1;
+            }
+
+            continue;
+        }
+
+        if (rule.startsWith('!------------------ EasyList rules')) {
+            flag = i;
+            continue;
+        }
+
+        if (flag < 0) {
+            filtered.push(rule);
+        }
+    }
+
+    return filtered;
+};
+
+/**
+ * Replaces Version: with OriginalVersion: comments in case of some client cannot afford it.
+ *
+ * @param rules
+ */
+const fixVersionComments = (rules) => {
+    return rules.map((x) => {
+        if (x.startsWith('! Version:')) {
+            return x.replace('! Version:', '! OriginalVersion:');
+        }
+
+        return x;
+    });
+};
+
+// TODO: use agtree to remove adblock agent strings
+/**
+ * Removes adblock agent strings, for example:
+ *  - [AdBlock],
+ *  - [Adblock Plus],
+ *  - [Adblock Plus 2.0],
+ *  - [AdGuard],
+ *  - [uBlock] / [uBlock Origin], etc.
+ *
+ * @param lines
+ */
+const removeAdblockVersion = (lines) => {
+    return lines.filter((line) => !line.trim().match(ADBLOCK_AGENT_PATTERN));
+};
+
+/**
+ * Removes scriptlet rules
+ * @param {array} rules
+ * @return {array} rules
+ */
+const removeScriptletRules = (rules) => rules.filter((rule) => !rule.script.startsWith(agtree.ADG_SCRIPTLET_MASK));
+
+/**
+ * Removes `groupDescription` field from `groups`.
+ *
+ * @param rawGroups
+ * @returns Corrected groups
+ */
+const removeGroupDescriptions$1 = function (rawGroups) {
+    const groups = [];
+
+    // eslint-disable-next-line no-restricted-syntax
+    for (const g of rawGroups) {
+        // Explicitly keep only the required fields for backward compatibility
+        const copy = {
+            groupId: g.groupId,
+            groupName: g.groupName,
+            displayNumber: g.displayNumber,
+        };
+
+        groups.push(copy);
+    }
+
+    return groups;
+};
+
+/**
+ * Corrects metadata for backward compatibility with old clients on MAC (v1) platform
+ * Hides tag fields
+ *
+ * @param metadata
+ * @returns Corrected metadata
+ */
+const rewriteMetadataForOldMacV1 = function (metadata) {
+    const result = {
+        groups: removeGroupDescriptions$1(metadata.groups.slice(0)),
+        filters: [],
+    };
+
+    // eslint-disable-next-line no-restricted-syntax
+    for (const f of metadata.filters) {
+        const copy = { ...f };
+        delete copy.tags;
+        delete copy.timeAdded;
+        delete copy.trustLevel;
+        delete copy.downloadUrl;
+        delete copy.deprecated;
+
+        result.filters.push(copy);
+    }
+
+    return result;
+};
+
+/**
+ * Corrects metadata for backward compatibility with old clients on MAC_V2 platform —
+ * removed `groupDescription` field from `groups`.
+ *
+ * @param metadata
+ * @returns Corrected metadata
+ */
+const rewriteMetadataForOldMacV2 = function (metadata) {
+    const result = { ...metadata };
+    result.groups = removeGroupDescriptions$1(result.groups.slice(0));
+    return result;
+};
+
+/**
+ * Markers of pseudo-classes for HTML filtering rules.
+ *
+ * Already supported by the AdGuard apps, but not implemented for the extension yet.
+ * TODO: AG-24662.
+ *
+ * @see {@link https://adgkb.service.agrd.dev/kb/general/ad-filtering/create-own-filters/#html-filtering-rules--pseudo-classes}
+ */
+const HTML_RULES_PSEUDO_CLASS_MARKERS = [
+    // AdGuard-specific pseudo-classes
+    ':contains(',
+    // aliases
+    ':-abp-contains(',
+    ':has-text(',
+];
+
+/**
+ * Checks if the rule should be kept as is,
+ * i.e. no conversion and no validation,
+ * since it is not supported by the extension yet.
+ *
+ * Conditions for keeping the rule as is:
+ * - rule is HTML filtering rule
+ * - rule is AdGuard syntax
+ * - rule contains pseudo-class marker.
+ *
+ * Planned to be fixed:
+ * https://github.com/AdguardTeam/tsurlfilter/issues/96.
+ *
+ * @param {import('@adguard/agtree').AnyRule} ruleNode Rule node to check.
+ *
+ * @returns {boolean} True if the rule should be kept as is, otherwise false.
+ */
+const shouldKeepAdgHtmlFilteringRuleAsIs = (ruleNode) => {
+    return ruleNode.type === agtree.CosmeticRuleType.HtmlFilteringRule
+        && ruleNode.syntax === agtree.AdblockSyntax.Adg
+        && HTML_RULES_PSEUDO_CLASS_MARKERS.some((marker) => ruleNode.body.value.includes(marker));
+};
+
 /**
  * Excludes rule
  * @param {string} rule
@@ -218,29 +457,50 @@ const excludeRule$1 = (rule, excluded, message) => {
 
 /**
  * Converts rules to AdGuard syntax
- * @param {array} rulesList
- * @param {array} [excluded]
- * @return {array} result
+ *
+ * @param {string[]} rulesList Input rules.
+ * @param {string[]} [excluded=[]] Rules to exclude.
+ * @param {string[]} [invalidRules=[]] Collected invalid rules for the report file.
+ *
+ * @return {string[]} Rules converted to AdGuard syntax.
  */
-const convertRulesToAdgSyntax = (rulesList, excluded) => {
+const convertRulesToAdgSyntax = (rulesList, excluded = [], invalidRules = []) => {
     const result = [];
 
     for (let i = 0; i < rulesList.length; i += 1) {
         const rule = rulesList[i];
         try {
             const ruleNode = agtree.RuleParser.parse(rule);
+
+            // temporary workaround for AdGuard's HTML filtering rules with pseudo-classes.
+            // TODO: remove during AG-24662 resolving
+            if (shouldKeepAdgHtmlFilteringRuleAsIs(ruleNode)) {
+                const message = `Keeping HTML filtering rule with pseudo-classes as is: "${rule}"`;
+                logger.warn(message);
+                result.push(rule);
+                continue;
+            }
+
             const conversionResult = agtree.RuleConverter.convertToAdg(ruleNode);
             const convertedRules = conversionResult.result.map((r) => agtree.RuleGenerator.generate(r));
             result.push(...convertedRules);
 
             if (conversionResult.isConverted) {
-                const message = `Rule "${rule}" converted to: "${[...convertedRules]}"`;
+                const messagePostfix = convertedRules.length > 1
+                    // eslint-disable-next-line quotes
+                    ? `to multiple rules: "${convertedRules.join(", ")}"`
+                    : `to: "${convertedRules[0]}"`;
+                const message = `Rule "${rule}" converted ${messagePostfix}`;
                 excludeRule$1(rule, excluded, message);
             }
         } catch (e) {
-            const message = `Unable to convert rule to AdGuard syntax: "${rule}" due to error: ${e.message}`;
+            // eslint-disable-next-line max-len
+            const message = `Error: Unable to convert rule to AdGuard syntax: "${rule}" due to error: ${logger$1.getErrorMessage(e)}`;
             logger.error(message);
             excludeRule$1(rule, excluded, message);
+
+            // collect the invalid rule for the report file
+            invalidRules.push(message);
         }
     }
 
@@ -614,6 +874,13 @@ const validateAndFilterRules = (list, excluded, invalid = [], filterName) => {
                 parseAbpSpecificRules: false,
                 parseUboSpecificRules: false,
             });
+
+            // temporary workaround for AdGuard's HTML filtering rules with pseudo-classes.
+            // TODO: remove during AG-24662 resolving
+            if (shouldKeepAdgHtmlFilteringRuleAsIs(ruleNode)) {
+                return true;
+            }
+
             const conversionResult = agtree.RuleConverter.convertToAdg(ruleNode);
             convertedRuleNodes = conversionResult.result;
             // eslint-disable-next-line no-restricted-syntax
@@ -642,9 +909,10 @@ const validateAndFilterRules = (list, excluded, invalid = [], filterName) => {
                 }
             }
         } catch (e) {
-            logger.error(`Invalid rule in ${filterName}: ${ruleText}`);
-            excludeRule(excluded, e.message, ruleText);
-            invalid.push(e.message);
+            const message = `Error: Invalid rule in ${filterName}: "${ruleText}" due to error: ${logger$1.getErrorMessage(e)}`;
+            logger.error(message);
+            excludeRule(excluded, message, ruleText);
+            invalid.push(message);
             return false;
         }
 
@@ -729,203 +997,6 @@ const checkAffinityDirectives = (lines) => {
     return !stack.length;
 };
 
-// TODO: consider refactoring this file
-// because agtree provides modern approach to solve such problems
-
-// Based on: https://github.com/github/linguist/pull/5968/commits/f7c5c39139945576a5f9ff0b41c990e6b6019232
-// eslint-disable-next-line max-len
-const ADBLOCK_AGENT_PATTERN = /^(?:!|#)?\s*\[(?<AdblockInfo>\s*(?:[Aa]d[Bb]lock(?:\s+[Pp]lus)?|u[Bb]lock(?:\s+[Oo]rigin)?|[Aa]d[Gg]uard)(?:\s+(?:\d\.?)+)?\s*)(?:;\g<AdblockInfo>)*\]\s*$/;
-
-/**
- * CSS rules with width and height attributes break SVG rendering
- * https://github.com/AdguardTeam/AdguardBrowserExtension/issues/683
- *
- * @param ruleText Rule text
- */
-const fixCssRuleAttributesForEdge = function (ruleText) {
-    if (ruleText.includes(RuleMasks.MASK_CSS)
-        || ruleText.includes(RuleMasks.MASK_CSS_EXCEPTION)
-        || ruleText.includes(RuleMasks.MASK_ELEMENT_HIDING)
-        || ruleText.includes(RuleMasks.MASK_ELEMENT_HIDING_EXCEPTION)) {
-        ruleText = ruleText.replace(/\[width=/gi, '[Width=');
-        ruleText = ruleText.replace('/[height=/gi', '[Height=');
-    }
-
-    return ruleText;
-};
-
-/**
- * Updates rule text
- */
-const overrideRule = function (ruleText, platform) {
-    if (platform === 'ext_edge') {
-        ruleText = fixCssRuleAttributesForEdge(ruleText);
-    }
-
-    return ruleText;
-};
-
-/**
- * Modifies header for AdGuard Base filter
- * https://github.com/AdguardTeam/FiltersCompiler/issues/78
- * @param {array} header
- * @param {boolean} optimized
- */
-const modifyBaseFilterHeader = (header, optimized) => {
-    header[0] = `! Title: AdGuard Base filter + EasyList${optimized ? ' (Optimized)' : ''}`;
-};
-
-/**
- * Rewrites title and description
- * https://github.com/AdguardTeam/AdguardFilters/issues/5138#issuecomment-328847738
- */
-const rewriteHeader = function (header) {
-    const result = [];
-    header.forEach((line) => {
-        if (line.startsWith('! Title: ')) {
-            line = '! Title: AdGuard Base filter';
-        } else if (line.startsWith('! Description: ')) {
-            line = '! Description: This filter is necessary for quality ad blocking.';
-        }
-
-        result.push(line);
-    });
-
-    return result;
-};
-
-/**
- * Filters easylist block from list of rules
- * https://github.com/AdguardTeam/AdguardFilters/issues/5138#issuecomment-328847738
- */
-const rewriteRules = function (rules) {
-    const filtered = [];
-    let flag = -1;
-    for (let i = 0; i < rules.length; i += 1) {
-        const rule = rules[i];
-
-        if (flag >= 0 && rule.startsWith('!------------------')) {
-            if (flag !== i - 1) {
-                // we skip next line after block header
-                // looking for the end of easylist block
-                flag = -1;
-            }
-
-            continue;
-        }
-
-        if (rule.startsWith('!------------------ EasyList rules')) {
-            flag = i;
-            continue;
-        }
-
-        if (flag < 0) {
-            filtered.push(rule);
-        }
-    }
-
-    return filtered;
-};
-
-/**
- * Replaces Version: with OriginalVersion: comments in case of some client cannot afford it.
- *
- * @param rules
- */
-const fixVersionComments = (rules) => {
-    return rules.map((x) => {
-        if (x.startsWith('! Version:')) {
-            return x.replace('! Version:', '! OriginalVersion:');
-        }
-
-        return x;
-    });
-};
-
-// TODO: use agtree to remove adblock agent strings
-/**
- * Removes adblock agent strings, for example:
- *  - [AdBlock],
- *  - [Adblock Plus],
- *  - [Adblock Plus 2.0],
- *  - [AdGuard],
- *  - [uBlock] / [uBlock Origin], etc.
- *
- * @param lines
- */
-const removeAdblockVersion = (lines) => {
-    return lines.filter((line) => !line.trim().match(ADBLOCK_AGENT_PATTERN));
-};
-
-/**
- * Removes scriptlet rules
- * @param {array} rules
- * @return {array} rules
- */
-const removeScriptletRules = (rules) => rules.filter((rule) => !rule.script.startsWith(agtree.ADG_SCRIPTLET_MASK));
-
-/**
- * Removes `groupDescription` field from `groups`.
- *
- * @param rawGroups
- * @returns Corrected groups
- */
-const removeGroupDescriptions$1 = function (rawGroups) {
-    const groups = [];
-
-    // eslint-disable-next-line no-restricted-syntax
-    for (const g of rawGroups) {
-        const copy = { ...g };
-
-        delete copy.groupDescription;
-
-        groups.push(copy);
-    }
-
-    return groups;
-};
-
-/**
- * Corrects metadata for backward compatibility with old clients on MAC (v1) platform
- * Hides tag fields
- *
- * @param metadata
- * @returns Corrected metadata
- */
-const rewriteMetadataForOldMacV1 = function (metadata) {
-    const result = {
-        groups: removeGroupDescriptions$1(metadata.groups.slice(0)),
-        filters: [],
-    };
-
-    // eslint-disable-next-line no-restricted-syntax
-    for (const f of metadata.filters) {
-        const copy = { ...f };
-        delete copy.tags;
-        delete copy.timeAdded;
-        delete copy.trustLevel;
-        delete copy.downloadUrl;
-        delete copy.deprecated;
-
-        result.filters.push(copy);
-    }
-
-    return result;
-};
-
-/**
- * Corrects metadata for backward compatibility with old clients on MAC_V2 platform —
- * removed `groupDescription` field from `groups`.
- *
- * @param metadata
- * @returns Corrected metadata
- */
-const rewriteMetadataForOldMacV2 = function (metadata) {
-    const result = { ...metadata };
-    result.groups = removeGroupDescriptions$1(result.groups.slice(0));
-    return result;
-};
-
 /* eslint-disable global-require */
 
 const require$1 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
@@ -3155,13 +3226,20 @@ const getResolvedPreprocessorIncludes = async function (filterDir, filterName, l
  * @param {string} filterDir Filter directory.
  * @param {string} filterName Filter name.
  * @param {string[]} lines Array of raw rules and possibly preprocessor `!#include` directives.
- * @param {string} excluded Array of rules to exclude.
+ * @param {string[]} excluded Array of rules to exclude.
+ * @param {string[]} invalidRules Invalid rules for the report file.
  *
  * @returns {Promise<string[]>} Promise which resolves to array of AdGuard syntax rules.
  */
-const prepareAdgRules = async function (filterDir, filterName, lines, excluded) {
+const prepareAdgRules = async function (
+    filterDir,
+    filterName,
+    lines,
+    excluded,
+    invalidRules,
+) {
     const resolvedIncludes = await getResolvedPreprocessorIncludes(filterDir, filterName, lines);
-    return convertRulesToAdgSyntax(resolvedIncludes, excluded);
+    return convertRulesToAdgSyntax(resolvedIncludes, excluded, invalidRules);
 };
 
 /**
@@ -3227,7 +3305,13 @@ const compile$1 = async function (filterDir, filterName, templateContent, trustL
             includedLines.forEach((line) => includedRules.push(line.trim()));
 
             // eslint-disable-next-line no-await-in-loop
-            includedRules = await prepareAdgRules(filterDir, filterName, includedRules, excluded);
+            includedRules = await prepareAdgRules(
+                filterDir,
+                filterName,
+                includedRules,
+                excluded,
+                invalid,
+            );
 
             if (shouldIgnoreTrustLevel) {
                 logger.info(`Ignoring trust level for ${filterName} due to @include directive: ${line}`);
@@ -3245,7 +3329,13 @@ const compile$1 = async function (filterDir, filterName, templateContent, trustL
             let inlineRules = [line.trim()];
 
             // eslint-disable-next-line no-await-in-loop
-            inlineRules = await prepareAdgRules(filterDir, filterName, inlineRules, excluded);
+            inlineRules = await prepareAdgRules(
+                filterDir,
+                filterName,
+                inlineRules,
+                excluded,
+                invalid,
+            );
 
             logger.info('Applying trust-level exclusions to inline template.txt rules...');
             inlineRules = exclude(inlineRules, trustLevelSettings, excluded);

package/dist/index.js

@@ -3,11 +3,11 @@ import { RuleFactory, CosmeticRule, NetworkRule, setConfiguration, Compatibility
 import fs$1 from 'fs';
 import md5 from 'md5';
 import { FiltersDownloader } from '@adguard/filters-downloader';
-import { RuleParser, RuleConverter, RuleGenerator, CosmeticRuleType, CommentParser, RuleCategory, RegExpUtils, ADG_SCRIPTLET_MASK } from '@adguard/agtree';
+import { ADG_SCRIPTLET_MASK, CosmeticRuleType, AdblockSyntax, RuleParser, RuleConverter, RuleGenerator, CommentParser, RuleCategory, RegExpUtils } from '@adguard/agtree';
+import { Logger, getErrorMessage } from '@adguard/logger';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { Logger } from '@adguard/logger';
 import { defaultParserOptions } from '@adguard/agtree/parser';
 import { parse } from '@adguard/ecss-tree';
 import { TextEncoder, TextDecoder } from 'util';
@@ -200,6 +200,245 @@ const RuleMasks = {
     MASK_TRUSTED_SCRIPTLET: 'trusted-',
 };
 
+// TODO: consider refactoring this file
+// because agtree provides modern approach to solve such problems
+
+// Based on: https://github.com/github/linguist/pull/5968/commits/f7c5c39139945576a5f9ff0b41c990e6b6019232
+// eslint-disable-next-line max-len
+const ADBLOCK_AGENT_PATTERN = /^(?:!|#)?\s*\[(?<AdblockInfo>\s*(?:[Aa]d[Bb]lock(?:\s+[Pp]lus)?|u[Bb]lock(?:\s+[Oo]rigin)?|[Aa]d[Gg]uard)(?:\s+(?:\d\.?)+)?\s*)(?:;\g<AdblockInfo>)*\]\s*$/;
+
+/**
+ * CSS rules with width and height attributes break SVG rendering
+ * https://github.com/AdguardTeam/AdguardBrowserExtension/issues/683
+ *
+ * @param ruleText Rule text
+ */
+const fixCssRuleAttributesForEdge = function (ruleText) {
+    if (ruleText.includes(RuleMasks.MASK_CSS)
+        || ruleText.includes(RuleMasks.MASK_CSS_EXCEPTION)
+        || ruleText.includes(RuleMasks.MASK_ELEMENT_HIDING)
+        || ruleText.includes(RuleMasks.MASK_ELEMENT_HIDING_EXCEPTION)) {
+        ruleText = ruleText.replace(/\[width=/gi, '[Width=');
+        ruleText = ruleText.replace('/[height=/gi', '[Height=');
+    }
+
+    return ruleText;
+};
+
+/**
+ * Updates rule text
+ */
+const overrideRule = function (ruleText, platform) {
+    if (platform === 'ext_edge') {
+        ruleText = fixCssRuleAttributesForEdge(ruleText);
+    }
+
+    return ruleText;
+};
+
+/**
+ * Modifies header for AdGuard Base filter
+ * https://github.com/AdguardTeam/FiltersCompiler/issues/78
+ * @param {array} header
+ * @param {boolean} optimized
+ */
+const modifyBaseFilterHeader = (header, optimized) => {
+    header[0] = `! Title: AdGuard Base filter + EasyList${optimized ? ' (Optimized)' : ''}`;
+};
+
+/**
+ * Rewrites title and description
+ * https://github.com/AdguardTeam/AdguardFilters/issues/5138#issuecomment-328847738
+ */
+const rewriteHeader = function (header) {
+    const result = [];
+    header.forEach((line) => {
+        if (line.startsWith('! Title: ')) {
+            line = '! Title: AdGuard Base filter';
+        } else if (line.startsWith('! Description: ')) {
+            line = '! Description: This filter is necessary for quality ad blocking.';
+        }
+
+        result.push(line);
+    });
+
+    return result;
+};
+
+/**
+ * Filters easylist block from list of rules
+ * https://github.com/AdguardTeam/AdguardFilters/issues/5138#issuecomment-328847738
+ */
+const rewriteRules = function (rules) {
+    const filtered = [];
+    let flag = -1;
+    for (let i = 0; i < rules.length; i += 1) {
+        const rule = rules[i];
+
+        if (flag >= 0 && rule.startsWith('!------------------')) {
+            if (flag !== i - 1) {
+                // we skip next line after block header
+                // looking for the end of easylist block
+                flag = -1;
+            }
+
+            continue;
+        }
+
+        if (rule.startsWith('!------------------ EasyList rules')) {
+            flag = i;
+            continue;
+        }
+
+        if (flag < 0) {
+            filtered.push(rule);
+        }
+    }
+
+    return filtered;
+};
+
+/**
+ * Replaces Version: with OriginalVersion: comments in case of some client cannot afford it.
+ *
+ * @param rules
+ */
+const fixVersionComments = (rules) => {
+    return rules.map((x) => {
+        if (x.startsWith('! Version:')) {
+            return x.replace('! Version:', '! OriginalVersion:');
+        }
+
+        return x;
+    });
+};
+
+// TODO: use agtree to remove adblock agent strings
+/**
+ * Removes adblock agent strings, for example:
+ *  - [AdBlock],
+ *  - [Adblock Plus],
+ *  - [Adblock Plus 2.0],
+ *  - [AdGuard],
+ *  - [uBlock] / [uBlock Origin], etc.
+ *
+ * @param lines
+ */
+const removeAdblockVersion = (lines) => {
+    return lines.filter((line) => !line.trim().match(ADBLOCK_AGENT_PATTERN));
+};
+
+/**
+ * Removes scriptlet rules
+ * @param {array} rules
+ * @return {array} rules
+ */
+const removeScriptletRules = (rules) => rules.filter((rule) => !rule.script.startsWith(ADG_SCRIPTLET_MASK));
+
+/**
+ * Removes `groupDescription` field from `groups`.
+ *
+ * @param rawGroups
+ * @returns Corrected groups
+ */
+const removeGroupDescriptions$1 = function (rawGroups) {
+    const groups = [];
+
+    // eslint-disable-next-line no-restricted-syntax
+    for (const g of rawGroups) {
+        // Explicitly keep only the required fields for backward compatibility
+        const copy = {
+            groupId: g.groupId,
+            groupName: g.groupName,
+            displayNumber: g.displayNumber,
+        };
+
+        groups.push(copy);
+    }
+
+    return groups;
+};
+
+/**
+ * Corrects metadata for backward compatibility with old clients on MAC (v1) platform
+ * Hides tag fields
+ *
+ * @param metadata
+ * @returns Corrected metadata
+ */
+const rewriteMetadataForOldMacV1 = function (metadata) {
+    const result = {
+        groups: removeGroupDescriptions$1(metadata.groups.slice(0)),
+        filters: [],
+    };
+
+    // eslint-disable-next-line no-restricted-syntax
+    for (const f of metadata.filters) {
+        const copy = { ...f };
+        delete copy.tags;
+        delete copy.timeAdded;
+        delete copy.trustLevel;
+        delete copy.downloadUrl;
+        delete copy.deprecated;
+
+        result.filters.push(copy);
+    }
+
+    return result;
+};
+
+/**
+ * Corrects metadata for backward compatibility with old clients on MAC_V2 platform —
+ * removed `groupDescription` field from `groups`.
+ *
+ * @param metadata
+ * @returns Corrected metadata
+ */
+const rewriteMetadataForOldMacV2 = function (metadata) {
+    const result = { ...metadata };
+    result.groups = removeGroupDescriptions$1(result.groups.slice(0));
+    return result;
+};
+
+/**
+ * Markers of pseudo-classes for HTML filtering rules.
+ *
+ * Already supported by the AdGuard apps, but not implemented for the extension yet.
+ * TODO: AG-24662.
+ *
+ * @see {@link https://adgkb.service.agrd.dev/kb/general/ad-filtering/create-own-filters/#html-filtering-rules--pseudo-classes}
+ */
+const HTML_RULES_PSEUDO_CLASS_MARKERS = [
+    // AdGuard-specific pseudo-classes
+    ':contains(',
+    // aliases
+    ':-abp-contains(',
+    ':has-text(',
+];
+
+/**
+ * Checks if the rule should be kept as is,
+ * i.e. no conversion and no validation,
+ * since it is not supported by the extension yet.
+ *
+ * Conditions for keeping the rule as is:
+ * - rule is HTML filtering rule
+ * - rule is AdGuard syntax
+ * - rule contains pseudo-class marker.
+ *
+ * Planned to be fixed:
+ * https://github.com/AdguardTeam/tsurlfilter/issues/96.
+ *
+ * @param {import('@adguard/agtree').AnyRule} ruleNode Rule node to check.
+ *
+ * @returns {boolean} True if the rule should be kept as is, otherwise false.
+ */
+const shouldKeepAdgHtmlFilteringRuleAsIs = (ruleNode) => {
+    return ruleNode.type === CosmeticRuleType.HtmlFilteringRule
+        && ruleNode.syntax === AdblockSyntax.Adg
+        && HTML_RULES_PSEUDO_CLASS_MARKERS.some((marker) => ruleNode.body.value.includes(marker));
+};
+
 /**
  * Excludes rule
  * @param {string} rule
@@ -215,29 +454,50 @@ const excludeRule$1 = (rule, excluded, message) => {
 
 /**
  * Converts rules to AdGuard syntax
- * @param {array} rulesList
- * @param {array} [excluded]
- * @return {array} result
+ *
+ * @param {string[]} rulesList Input rules.
+ * @param {string[]} [excluded=[]] Rules to exclude.
+ * @param {string[]} [invalidRules=[]] Collected invalid rules for the report file.
+ *
+ * @return {string[]} Rules converted to AdGuard syntax.
  */
-const convertRulesToAdgSyntax = (rulesList, excluded) => {
+const convertRulesToAdgSyntax = (rulesList, excluded = [], invalidRules = []) => {
     const result = [];
 
     for (let i = 0; i < rulesList.length; i += 1) {
         const rule = rulesList[i];
         try {
             const ruleNode = RuleParser.parse(rule);
+
+            // temporary workaround for AdGuard's HTML filtering rules with pseudo-classes.
+            // TODO: remove during AG-24662 resolving
+            if (shouldKeepAdgHtmlFilteringRuleAsIs(ruleNode)) {
+                const message = `Keeping HTML filtering rule with pseudo-classes as is: "${rule}"`;
+                logger.warn(message);
+                result.push(rule);
+                continue;
+            }
+
             const conversionResult = RuleConverter.convertToAdg(ruleNode);
             const convertedRules = conversionResult.result.map((r) => RuleGenerator.generate(r));
             result.push(...convertedRules);
 
             if (conversionResult.isConverted) {
-                const message = `Rule "${rule}" converted to: "${[...convertedRules]}"`;
+                const messagePostfix = convertedRules.length > 1
+                    // eslint-disable-next-line quotes
+                    ? `to multiple rules: "${convertedRules.join(", ")}"`
+                    : `to: "${convertedRules[0]}"`;
+                const message = `Rule "${rule}" converted ${messagePostfix}`;
                 excludeRule$1(rule, excluded, message);
             }
         } catch (e) {
-            const message = `Unable to convert rule to AdGuard syntax: "${rule}" due to error: ${e.message}`;
+            // eslint-disable-next-line max-len
+            const message = `Error: Unable to convert rule to AdGuard syntax: "${rule}" due to error: ${getErrorMessage(e)}`;
             logger.error(message);
             excludeRule$1(rule, excluded, message);
+
+            // collect the invalid rule for the report file
+            invalidRules.push(message);
         }
     }
 
@@ -611,6 +871,13 @@ const validateAndFilterRules = (list, excluded, invalid = [], filterName) => {
                 parseAbpSpecificRules: false,
                 parseUboSpecificRules: false,
             });
+
+            // temporary workaround for AdGuard's HTML filtering rules with pseudo-classes.
+            // TODO: remove during AG-24662 resolving
+            if (shouldKeepAdgHtmlFilteringRuleAsIs(ruleNode)) {
+                return true;
+            }
+
             const conversionResult = RuleConverter.convertToAdg(ruleNode);
             convertedRuleNodes = conversionResult.result;
             // eslint-disable-next-line no-restricted-syntax
@@ -639,9 +906,10 @@ const validateAndFilterRules = (list, excluded, invalid = [], filterName) => {
                 }
             }
         } catch (e) {
-            logger.error(`Invalid rule in ${filterName}: ${ruleText}`);
-            excludeRule(excluded, e.message, ruleText);
-            invalid.push(e.message);
+            const message = `Error: Invalid rule in ${filterName}: "${ruleText}" due to error: ${getErrorMessage(e)}`;
+            logger.error(message);
+            excludeRule(excluded, message, ruleText);
+            invalid.push(message);
             return false;
         }
 
@@ -726,203 +994,6 @@ const checkAffinityDirectives = (lines) => {
     return !stack.length;
 };
 
-// TODO: consider refactoring this file
-// because agtree provides modern approach to solve such problems
-
-// Based on: https://github.com/github/linguist/pull/5968/commits/f7c5c39139945576a5f9ff0b41c990e6b6019232
-// eslint-disable-next-line max-len
-const ADBLOCK_AGENT_PATTERN = /^(?:!|#)?\s*\[(?<AdblockInfo>\s*(?:[Aa]d[Bb]lock(?:\s+[Pp]lus)?|u[Bb]lock(?:\s+[Oo]rigin)?|[Aa]d[Gg]uard)(?:\s+(?:\d\.?)+)?\s*)(?:;\g<AdblockInfo>)*\]\s*$/;
-
-/**
- * CSS rules with width and height attributes break SVG rendering
- * https://github.com/AdguardTeam/AdguardBrowserExtension/issues/683
- *
- * @param ruleText Rule text
- */
-const fixCssRuleAttributesForEdge = function (ruleText) {
-    if (ruleText.includes(RuleMasks.MASK_CSS)
-        || ruleText.includes(RuleMasks.MASK_CSS_EXCEPTION)
-        || ruleText.includes(RuleMasks.MASK_ELEMENT_HIDING)
-        || ruleText.includes(RuleMasks.MASK_ELEMENT_HIDING_EXCEPTION)) {
-        ruleText = ruleText.replace(/\[width=/gi, '[Width=');
-        ruleText = ruleText.replace('/[height=/gi', '[Height=');
-    }
-
-    return ruleText;
-};
-
-/**
- * Updates rule text
- */
-const overrideRule = function (ruleText, platform) {
-    if (platform === 'ext_edge') {
-        ruleText = fixCssRuleAttributesForEdge(ruleText);
-    }
-
-    return ruleText;
-};
-
-/**
- * Modifies header for AdGuard Base filter
- * https://github.com/AdguardTeam/FiltersCompiler/issues/78
- * @param {array} header
- * @param {boolean} optimized
- */
-const modifyBaseFilterHeader = (header, optimized) => {
-    header[0] = `! Title: AdGuard Base filter + EasyList${optimized ? ' (Optimized)' : ''}`;
-};
-
-/**
- * Rewrites title and description
- * https://github.com/AdguardTeam/AdguardFilters/issues/5138#issuecomment-328847738
- */
-const rewriteHeader = function (header) {
-    const result = [];
-    header.forEach((line) => {
-        if (line.startsWith('! Title: ')) {
-            line = '! Title: AdGuard Base filter';
-        } else if (line.startsWith('! Description: ')) {
-            line = '! Description: This filter is necessary for quality ad blocking.';
-        }
-
-        result.push(line);
-    });
-
-    return result;
-};
-
-/**
- * Filters easylist block from list of rules
- * https://github.com/AdguardTeam/AdguardFilters/issues/5138#issuecomment-328847738
- */
-const rewriteRules = function (rules) {
-    const filtered = [];
-    let flag = -1;
-    for (let i = 0; i < rules.length; i += 1) {
-        const rule = rules[i];
-
-        if (flag >= 0 && rule.startsWith('!------------------')) {
-            if (flag !== i - 1) {
-                // we skip next line after block header
-                // looking for the end of easylist block
-                flag = -1;
-            }
-
-            continue;
-        }
-
-        if (rule.startsWith('!------------------ EasyList rules')) {
-            flag = i;
-            continue;
-        }
-
-        if (flag < 0) {
-            filtered.push(rule);
-        }
-    }
-
-    return filtered;
-};
-
-/**
- * Replaces Version: with OriginalVersion: comments in case of some client cannot afford it.
- *
- * @param rules
- */
-const fixVersionComments = (rules) => {
-    return rules.map((x) => {
-        if (x.startsWith('! Version:')) {
-            return x.replace('! Version:', '! OriginalVersion:');
-        }
-
-        return x;
-    });
-};
-
-// TODO: use agtree to remove adblock agent strings
-/**
- * Removes adblock agent strings, for example:
- *  - [AdBlock],
- *  - [Adblock Plus],
- *  - [Adblock Plus 2.0],
- *  - [AdGuard],
- *  - [uBlock] / [uBlock Origin], etc.
- *
- * @param lines
- */
-const removeAdblockVersion = (lines) => {
-    return lines.filter((line) => !line.trim().match(ADBLOCK_AGENT_PATTERN));
-};
-
-/**
- * Removes scriptlet rules
- * @param {array} rules
- * @return {array} rules
- */
-const removeScriptletRules = (rules) => rules.filter((rule) => !rule.script.startsWith(ADG_SCRIPTLET_MASK));
-
-/**
- * Removes `groupDescription` field from `groups`.
- *
- * @param rawGroups
- * @returns Corrected groups
- */
-const removeGroupDescriptions$1 = function (rawGroups) {
-    const groups = [];
-
-    // eslint-disable-next-line no-restricted-syntax
-    for (const g of rawGroups) {
-        const copy = { ...g };
-
-        delete copy.groupDescription;
-
-        groups.push(copy);
-    }
-
-    return groups;
-};
-
-/**
- * Corrects metadata for backward compatibility with old clients on MAC (v1) platform
- * Hides tag fields
- *
- * @param metadata
- * @returns Corrected metadata
- */
-const rewriteMetadataForOldMacV1 = function (metadata) {
-    const result = {
-        groups: removeGroupDescriptions$1(metadata.groups.slice(0)),
-        filters: [],
-    };
-
-    // eslint-disable-next-line no-restricted-syntax
-    for (const f of metadata.filters) {
-        const copy = { ...f };
-        delete copy.tags;
-        delete copy.timeAdded;
-        delete copy.trustLevel;
-        delete copy.downloadUrl;
-        delete copy.deprecated;
-
-        result.filters.push(copy);
-    }
-
-    return result;
-};
-
-/**
- * Corrects metadata for backward compatibility with old clients on MAC_V2 platform —
- * removed `groupDescription` field from `groups`.
- *
- * @param metadata
- * @returns Corrected metadata
- */
-const rewriteMetadataForOldMacV2 = function (metadata) {
-    const result = { ...metadata };
-    result.groups = removeGroupDescriptions$1(result.groups.slice(0));
-    return result;
-};
-
 /* eslint-disable global-require */
 
 const require = createRequire(import.meta.url);
@@ -3152,13 +3223,20 @@ const getResolvedPreprocessorIncludes = async function (filterDir, filterName, l
  * @param {string} filterDir Filter directory.
  * @param {string} filterName Filter name.
  * @param {string[]} lines Array of raw rules and possibly preprocessor `!#include` directives.
- * @param {string} excluded Array of rules to exclude.
+ * @param {string[]} excluded Array of rules to exclude.
+ * @param {string[]} invalidRules Invalid rules for the report file.
  *
  * @returns {Promise<string[]>} Promise which resolves to array of AdGuard syntax rules.
  */
-const prepareAdgRules = async function (filterDir, filterName, lines, excluded) {
+const prepareAdgRules = async function (
+    filterDir,
+    filterName,
+    lines,
+    excluded,
+    invalidRules,
+) {
     const resolvedIncludes = await getResolvedPreprocessorIncludes(filterDir, filterName, lines);
-    return convertRulesToAdgSyntax(resolvedIncludes, excluded);
+    return convertRulesToAdgSyntax(resolvedIncludes, excluded, invalidRules);
 };
 
 /**
@@ -3224,7 +3302,13 @@ const compile$1 = async function (filterDir, filterName, templateContent, trustL
             includedLines.forEach((line) => includedRules.push(line.trim()));
 
             // eslint-disable-next-line no-await-in-loop
-            includedRules = await prepareAdgRules(filterDir, filterName, includedRules, excluded);
+            includedRules = await prepareAdgRules(
+                filterDir,
+                filterName,
+                includedRules,
+                excluded,
+                invalid,
+            );
 
             if (shouldIgnoreTrustLevel) {
                 logger.info(`Ignoring trust level for ${filterName} due to @include directive: ${line}`);
@@ -3242,7 +3326,13 @@ const compile$1 = async function (filterDir, filterName, templateContent, trustL
             let inlineRules = [line.trim()];
 
             // eslint-disable-next-line no-await-in-loop
-            inlineRules = await prepareAdgRules(filterDir, filterName, inlineRules, excluded);
+            inlineRules = await prepareAdgRules(
+                filterDir,
+                filterName,
+                inlineRules,
+                excluded,
+                invalid,
+            );
 
             logger.info('Applying trust-level exclusions to inline template.txt rules...');
             inlineRules = exclude(inlineRules, trustLevelSettings, excluded);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adguard/filters-compiler",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "description": "AdGuard filters compiler",
   "homepage": "http://adguard.com",
   "type": "module",
@@ -18,13 +18,13 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@adguard/agtree": "^3.2.4",
+    "@adguard/agtree": "^3.2.5",
     "@adguard/ecss-tree": "^1.1.0",
     "@adguard/extended-css": "^2.1.1",
     "@adguard/filters-downloader": "^2.4.0",
     "@adguard/logger": "^2.0.0",
-    "@adguard/scriptlets": "^2.2.11",
-    "@adguard/tsurlfilter": "^3.2.7",
+    "@adguard/scriptlets": "^2.2.12",
+    "@adguard/tsurlfilter": "^3.2.8",
     "ajv": "^8.17.1",
     "child_process": ">=1.0.2",
     "jsdom": "^21.1.1",