@adguard/agtree 3.1.5 → 3.2.1

package/dist/ast-utils/clone.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/ast-utils/modifiers.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/ast-utils/network-rules.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/ast-utils/scriptlets.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/common/abp-snippet-injection-body-common.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/common/agent-common.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/common/ubo-selector-common.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/base.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/compatibility-table-data.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/modifiers.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/platforms.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/redirects.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/schemas/base.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/schemas/modifier.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/schemas/platform.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/schemas/redirect.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/schemas/resource-type.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/schemas/scriptlet.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/scriptlets.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/utils/platform-helpers.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/utils/resource-type-helpers.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/compatibility-tables/utils/zod-camelcase.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/base-interfaces/base-converter.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/base-interfaces/conversion-result.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/base-interfaces/rule-converter-base.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/comment/index.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/cosmetic/css.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/cosmetic/element-hiding.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/cosmetic/header-removal.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/cosmetic/html.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -14,8 +14,12 @@ import { RegExpUtils } from '../../utils/regexp.js';
 import { createNodeConversionResult } from '../base-interfaces/conversion-result.js';
 import { cloneDomainListNode } from '../../ast-utils/clone.js';
 import { CssTokenStream } from '../../parser/css/css-token-stream.js';
-import { UBO_HTML_MASK, EQUALS, EMPTY, ESCAPE_CHARACTER, OPEN_SQUARE_BRACKET, CLOSE_SQUARE_BRACKET } from '../../utils/constants.js';
+import { UBO_HTML_MASK, EQUALS, EMPTY, ESCAPE_CHARACTER, CSS_PSEUDO_MARKER, CSS_PSEUDO_OPEN, CSS_PSEUDO_CLOSE, OPEN_SQUARE_BRACKET, CLOSE_SQUARE_BRACKET } from '../../utils/constants.js';
 import { StringUtils, DOUBLE_QUOTE_MARKER } from '../../utils/string.js';
+import 'tldts';
+import { QuoteUtils } from '../../utils/quotes.js';
+import 'json5';
+import '../../parser/css/balancing.js';
 
 /**
  * @file HTML filtering rule converter
@@ -37,6 +41,16 @@ const PseudoClasses = {
     HasText: 'has-text',
     MinTextLength: 'min-text-length',
 };
+/**
+ * Constructs a pseudo-class string with a specified value for use in CSS selectors.
+ *
+ * @param pseudo - The pseudo-class name.
+ * @param value - The value of the pseudo-class.
+ * @returns pseudo-class string, including pseudo-class name, value and delimiters.
+ */
+const addPseudoClassWithValue = (pseudo, value) => {
+    return `${CSS_PSEUDO_MARKER}${pseudo}${CSS_PSEUDO_OPEN}${value}${CSS_PSEUDO_CLOSE}`;
+};
 const AttributeSelectors = {
     MaxLength: 'max-length',
     MinLength: 'min-length',
@@ -59,6 +73,7 @@ const ERROR_MESSAGES = {
     REGEXP_NOT_SUPPORTED: "Cannot convert RegExp parameter '%s' from '%s' pseudo class, because converting RegExp patterns are not supported yet",
     ATTRIBUTE_SELECTOR_REQUIRES_VALUE: "Attribute selector '%s' requires a value",
     VALUE_SHOULD_BE_SPECIFIED: 'Value should be specified if operator is specified',
+    VALUE_SHOULD_BE_POSITIVE: 'Value should be positive',
     UNEXPECTED_TOKEN_WITH_VALUE: "Unexpected token '%s' with value '%s'",
     FLAGS_NOT_SUPPORTED: 'Flags are not supported for attribute selectors',
 };
@@ -94,6 +109,25 @@ function escapeDoubleQuotes(selector) {
     }
     return buffer.join(EMPTY);
 }
+/**
+ * Safely parses length values from attribute selectors, like `"262144"` from `[max-length="262144"]`
+ *
+ * @param value The string value to parse
+ * @param attrName The attribute name for error messages
+ * @returns Parsed number
+ * @throws A {@link RuleConversionError} if parsing fails
+ */
+function parseLengthValue(value, attrName) {
+    const cleanValue = QuoteUtils.removeQuotes(value);
+    const parsed = Number(cleanValue);
+    if (Number.isNaN(parsed)) {
+        throw new RuleConversionError(sprintf(ERROR_MESSAGES.VALUE_FOR_ATTR_SHOULD_BE_INT, attrName, value));
+    }
+    if (parsed < 0) {
+        throw new RuleConversionError(sprintf(ERROR_MESSAGES.VALUE_SHOULD_BE_POSITIVE, attrName, value));
+    }
+    return parsed;
+}
 /**
  * Convert escaped double quotes `\"` to `""` within strings.
  *
@@ -367,6 +401,132 @@ class HtmlRuleConverter extends RuleConverterBase {
             },
         })), true);
     }
+    /**
+     * Converts a HTML rule to uBlock Origin syntax, if possible.
+     *
+     * @note AdGuard rules are often more specific than uBlock Origin rules, so some information
+     * may be lost in conversion. AdGuard's `[max-length]` and `[tag-content]` attributes will be converted to
+     * uBlock's `:min-text-length()` and `:has-text()` pseudo-classes when possible.
+     *
+     * @param rule Rule node to convert
+     * @returns An object which follows the {@link NodeConversionResult} interface. Its `result` property contains
+     * the array of converted rule nodes, and its `isConverted` flag indicates whether the original rule was converted.
+     * If the rule was not converted, the result array will contain the original node with the same object reference
+     * @throws Error if the rule is invalid or cannot be converted
+     */
+    static convertToUbo(rule) {
+        // Ignore uBlock Origin rules
+        if (rule.syntax === AdblockSyntax.Ubo) {
+            return createNodeConversionResult([rule], false);
+        }
+        if (rule.syntax === AdblockSyntax.Abp) {
+            throw new RuleConversionError(ERROR_MESSAGES.ABP_NOT_SUPPORTED);
+        }
+        const source = escapeDoubleQuotes(rule.body.value);
+        const stream = new CssTokenStream(source);
+        const convertedSelector = [];
+        let minTextLength;
+        // Skip leading whitespace
+        stream.skipWhitespace();
+        while (!stream.isEof()) {
+            const token = stream.getOrFail();
+            if (token.type === TokenType.Ident) {
+                convertedSelector.push(source.slice(token.start, token.end));
+                stream.advance();
+            }
+            else if (token.type === TokenType.OpenSquareBracket) {
+                // Attribute selectors
+                const { start } = token;
+                let tempToken;
+                // Advance opening square bracket
+                stream.advance();
+                // Skip optional whitespace
+                stream.skipWhitespace();
+                // Parse attribute name
+                tempToken = stream.getOrFail();
+                if (tempToken.type !== TokenType.Ident) {
+                    throw new RuleConversionError(sprintf(ERROR_MESSAGES.INVALID_ATTRIBUTE_NAME, getFormattedTokenName(tempToken.type), source.slice(tempToken.start, tempToken.end)));
+                }
+                const attr = source.slice(tempToken.start, tempToken.end);
+                stream.advance();
+                // Skip optional whitespace
+                stream.skipWhitespace();
+                // Check if this is a standalone attribute (like [disabled])
+                tempToken = stream.getOrFail();
+                if (tempToken.type === TokenType.CloseSquareBracket) {
+                    const { end } = tempToken;
+                    stream.advance();
+                    convertedSelector.push(source.slice(start, end));
+                    continue;
+                }
+                // Expect equals operator
+                stream.expect(TokenType.Delim, { value: EQUALS });
+                stream.advance();
+                // Skip optional whitespace
+                stream.skipWhitespace();
+                // Parse attribute value
+                tempToken = stream.getOrFail();
+                if (tempToken.type !== TokenType.Ident && tempToken.type !== TokenType.String) {
+                    throw new RuleConversionError(sprintf(ERROR_MESSAGES.INVALID_ATTRIBUTE_VALUE, getFormattedTokenName(tempToken.type), source.slice(tempToken.start, tempToken.end)));
+                }
+                const value = source.slice(tempToken.start, tempToken.end);
+                stream.advance();
+                // Skip optional whitespace
+                stream.skipWhitespace();
+                // Check for closing bracket
+                tempToken = stream.getOrFail();
+                if (tempToken.type !== TokenType.CloseSquareBracket) {
+                    throw new RuleConversionError(sprintf(ERROR_MESSAGES.FLAGS_NOT_SUPPORTED));
+                }
+                const { end } = stream.getOrFail();
+                stream.advance();
+                // Handle special attributes with improved number parsing
+                if (attr === AttributeSelectors.MinLength || attr === AttributeSelectors.MaxLength) {
+                    const parsedValue = parseLengthValue(value, attr);
+                    if (attr === AttributeSelectors.MinLength) {
+                        minTextLength = parsedValue;
+                    }
+                }
+                else if (attr === AttributeSelectors.TagContent) {
+                    const unescapedValue = unescapeDoubleQuotes(value);
+                    const valueWithoutQuotes = QuoteUtils.removeQuotes(unescapedValue);
+                    convertedSelector.push(addPseudoClassWithValue(PseudoClasses.HasText, valueWithoutQuotes));
+                }
+                else {
+                    convertedSelector.push(source.slice(start, end));
+                }
+            }
+            else if (token.type === TokenType.Whitespace) {
+                stream.advance();
+            }
+            else {
+                throw new RuleConversionError(sprintf(ERROR_MESSAGES.UNEXPECTED_TOKEN_WITH_VALUE, getFormattedTokenName(token.type), source.slice(token.start, token.end)));
+            }
+        }
+        // Handle min length conversions
+        if (minTextLength !== undefined) {
+            convertedSelector.push(addPseudoClassWithValue(PseudoClasses.MinTextLength, minTextLength));
+        }
+        // Combine all selectors
+        const uboSelector = `${convertedSelector.join(EMPTY)}`;
+        return createNodeConversionResult([{
+                category: RuleCategory.Cosmetic,
+                type: CosmeticRuleType.HtmlFilteringRule,
+                syntax: AdblockSyntax.Ubo,
+                exception: rule.exception,
+                domains: cloneDomainListNode(rule.domains),
+                separator: {
+                    type: 'Value',
+                    value: rule.exception
+                        ? `${CosmeticRuleSeparator.ElementHidingException}${UBO_HTML_MASK}`
+                        : `${CosmeticRuleSeparator.ElementHiding}${UBO_HTML_MASK}`,
+                },
+                body: {
+                    type: 'Value',
+                    value: unescapeDoubleQuotes(uboSelector),
+                },
+            }], true);
+    }
 }
 
 export { ERROR_MESSAGES, HtmlRuleConverter };

package/dist/converter/cosmetic/index.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -110,27 +110,29 @@ class CosmeticRuleConverter extends RuleConverterBase {
      * If the rule was not converted, the result array will contain the original node with the same object reference
      * @throws If the rule is invalid or cannot be converted
      */
-    // TODO: Add support for other cosmetic rule types
     static convertToUbo(rule) {
         // Skip conversation if the rule is already in uBO format
         if (rule.syntax === AdblockSyntax.Ubo) {
             return createNodeConversionResult([rule], false);
         }
-        // Check if the rule is a simple hiding rule
-        // TODO: Handle elemhide rules with extended CSS pseudos even if type is not marked explicitly
-        if (rule.type === CosmeticRuleType.ElementHidingRule
-            && (rule.separator.value === CosmeticRuleSeparator.ElementHidingException
-                || rule.separator.value === CosmeticRuleSeparator.ElementHiding)
-            && !rule.modifiers) {
-            return createNodeConversionResult([rule], false);
-        }
-        // Convert cosmetic rule based on its type
-        if (rule.type === CosmeticRuleType.ScriptletInjectionRule) {
-            if (rule.syntax === AdblockSyntax.Adg && rule.modifiers?.children.length) {
-                // e.g. example.com##+js(set-constant.js, foo, bar):matches-path(/baz)
-                throw new RuleConversionError('uBO scriptlet injection rules do not support cosmetic rule modifiers');
+        // TODO: Add support for other cosmetic rule types
+        switch (rule.type) {
+            case CosmeticRuleType.HtmlFilteringRule:
+                return HtmlRuleConverter.convertToUbo(rule);
+            case CosmeticRuleType.ElementHidingRule: {
+                // Check if the rule is a simple hiding rule
+                // TODO: Handle elemhide rules with extended CSS pseudos even if type is not marked explicitly
+                const isElementHidingRule = (rule.separator.value === CosmeticRuleSeparator.ElementHidingException
+                    || rule.separator.value === CosmeticRuleSeparator.ElementHiding);
+                if (isElementHidingRule && !rule.modifiers) {
+                    return createNodeConversionResult([rule], false);
+                }
+                break;
             }
-            return ScriptletRuleConverter.convertToUbo(rule);
+            case CosmeticRuleType.ScriptletInjectionRule:
+                return ScriptletRuleConverter.convertToUbo(rule);
+            case CosmeticRuleType.JsInjectionRule:
+                throw new RuleConversionError('uBO does not support JS injection rules');
         }
         let convertedModifiers;
         // Convert cosmetic rule modifiers, if any

package/dist/converter/cosmetic/rule-modifiers/adg.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/cosmetic/rule-modifiers/ubo.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/cosmetic/scriptlet.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -8,7 +8,7 @@ import { CosmeticRuleSeparator } from '../../nodes/index.js';
 import { RuleConverterBase } from '../base-interfaces/rule-converter-base.js';
 import { AdblockSyntax } from '../../utils/adblockers.js';
 import { QuoteUtils, QuoteType } from '../../utils/quotes.js';
-import { EMPTY, SPACE } from '../../utils/constants.js';
+import { EMPTY, ADG_DOMAINS_MODIFIER, PIPE_MODIFIER_SEPARATOR, SPACE } from '../../utils/constants.js';
 import { getScriptletName, setScriptletName, transformAllScriptletArguments, setScriptletQuoteType, transformNthScriptletArgument } from '../../ast-utils/scriptlets.js';
 import { RuleConversionError } from '../../errors/rule-conversion-error.js';
 import { createNodeConversionResult } from '../base-interfaces/conversion-result.js';
@@ -26,6 +26,14 @@ import '../../compatibility-tables/utils/platform-helpers.js';
 import '../../compatibility-tables/schemas/resource-type.js';
 import '../../compatibility-tables/utils/resource-type-helpers.js';
 import { isUndefined, isNull } from '../../utils/type-guards.js';
+import 'json5';
+import 'sprintf-js';
+import '@adguard/css-tokenizer';
+import { DomainListParser } from '../../parser/misc/domain-list-parser.js';
+import '../../parser/css/balancing.js';
+import '../data/css.js';
+import 'tldts';
+import 'is-ip';
 
 /**
  * @file Scriptlet injection rule converter
@@ -229,6 +237,35 @@ class ScriptletRuleConverter extends RuleConverterBase {
         if (rule.syntax === AdblockSyntax.Ubo) {
             return createNodeConversionResult([rule], false);
         }
+        let ruleDomainsList = cloneDomainListNode(rule.domains);
+        if (rule.syntax === AdblockSyntax.Adg && rule.modifiers?.children.length) {
+            const { modifiers } = rule;
+            // Validate modifiers structure
+            if (!modifiers || !modifiers.children || modifiers.children.length === 0) {
+                throw new RuleConversionError('Invalid modifiers in AdGuard rule.');
+            }
+            // Check for single domain modifier
+            const [domainModifier] = modifiers.children;
+            const hasSingleDomainModifier = (modifiers.children.length === 1
+                && domainModifier.name?.value === ADG_DOMAINS_MODIFIER
+                && domainModifier.value?.value);
+            if (!hasSingleDomainModifier) {
+                throw new RuleConversionError('uBlock Origin scriptlet injection rules do not support cosmetic rule modifiers.');
+            }
+            // Validate domain modifier
+            if (!domainModifier.value?.value) {
+                throw new RuleConversionError('Invalid domain modifier in AdGuard rule.');
+            }
+            // Parse domain list
+            const parsedDomainList = DomainListParser.parse(domainModifier.value.value, {}, domainModifier.start, PIPE_MODIFIER_SEPARATOR);
+            // Merge domain lists
+            if (ruleDomainsList) {
+                ruleDomainsList.children.push(...parsedDomainList.children);
+            }
+            else {
+                ruleDomainsList = parsedDomainList;
+            }
+        }
         const separator = rule.separator.value;
         let convertedSeparator = separator;
         convertedSeparator = rule.exception
@@ -337,7 +374,7 @@ class ScriptletRuleConverter extends RuleConverterBase {
                 type: rule.type,
                 syntax: AdblockSyntax.Ubo,
                 exception: rule.exception,
-                domains: cloneDomainListNode(rule.domains),
+                domains: ruleDomainsList,
                 separator: {
                     type: 'Value',
                     value: convertedSeparator,
@@ -347,9 +384,6 @@ class ScriptletRuleConverter extends RuleConverterBase {
                     children: [scriptlet],
                 },
             };
-            if (rule.modifiers) {
-                res.modifiers = cloneModifierListNode(rule.modifiers);
-            }
             return res;
         }), true);
     }

package/dist/converter/css/index.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/data/css.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/filter-list.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/converter/index.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.1.5 (build date: Wed, 21 May 2025 00:20:27 GMT)
+ * AGTree v3.2.1 (build date: Wed, 28 May 2025 13:36:39 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme