@adguard/agtree 3.3.0 → 3.4.0

package/dist/validator/index.js

@@ -1,59 +1,62 @@
 /*
- * AGTree v3.3.0 (build date: Thu, 20 Nov 2025 14:22:17 GMT)
+ * AGTree v3.4.0 (build date: Fri, 28 Nov 2025 09:46:33 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
  */
-import { AdblockSyntax } from '../utils/adblockers.js';
+import { sprintf } from 'sprintf-js';
 import { UNDERSCORE, NEWLINE, SPACE } from '../utils/constants.js';
-import { VALIDATION_ERROR_PREFIX, SOURCE_DATA_ERROR_PREFIX, BLOCKER_PREFIX } from './constants.js';
-import { isValidNoopModifier, getInvalidValidationResult, getValueRequiredValidationResult } from './helpers.js';
+import { VALIDATION_ERROR_PREFIX, SOURCE_DATA_ERROR_PREFIX } from './constants.js';
+import { getInvalidValidationResult, getValueRequiredValidationResult } from './helpers.js';
 import { validateValue } from './value.js';
-import { clone } from '../utils/clone.js';
 import { modifiersCompatibilityTable } from '../compatibility-tables/modifiers.js';
-import { GenericPlatform } from '../compatibility-tables/platforms.js';
+import '../compatibility-tables/redirects.js';
+import '../compatibility-tables/scriptlets.js';
+import '../compatibility-tables/platforms.js';
+import '../compatibility-tables/schemas/base.js';
+import '../compatibility-tables/schemas/modifier.js';
+import '../compatibility-tables/schemas/redirect.js';
+import '../compatibility-tables/schemas/scriptlet.js';
+import '../compatibility-tables/schemas/platform.js';
+import { hasPlatformMultipleProducts, getHumanReadablePlatformName, isGenericPlatform } from '../compatibility-tables/utils/platform-helpers.js';
+import '../compatibility-tables/schemas/resource-type.js';
+import '../compatibility-tables/utils/resource-type-helpers.js';
+import { isValidNoopModifier } from '../utils/noop-modifier.js';
 
 /**
  * @file Validator for modifiers.
  */
-const convertSyntaxToGenericPlatform = (syntax) => {
-    switch (syntax) {
-        case AdblockSyntax.Adg:
-            return GenericPlatform.AdgAny;
-        case AdblockSyntax.Ubo:
-            return GenericPlatform.UboAny;
-        case AdblockSyntax.Abp:
-            return GenericPlatform.AbpAny;
-        default:
-            throw new Error(`Unknown syntax: ${syntax}`);
-    }
-};
 /**
- * Fully checks whether the given `modifier` valid for given blocker `syntax`:
- * is it supported by the blocker, deprecated, assignable, negatable, etc.
+ * Fully checks whether the given `modifier` is valid for a specific product platform:
+ * is it supported by the product, deprecated, assignable, negatable, etc.
  *
- * @param syntax Adblock syntax to check the modifier for.
- * 'Common' is not supported, it should be specific — 'AdGuard', 'uBlockOrigin', or 'AdblockPlus'.
+ * @param platform Platform to check the modifier for. Must be a specific platform (e.g., AdgExtChrome)
+ * or a generic platform for a single product (e.g., AdgAny, UboExtChromium).
+ * If multiple products are specified, validation is skipped and returns valid.
  * @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 Result of modifier validation.
  */
-const validateForSpecificSyntax = (syntax, modifier, isException) => {
-    if (syntax === AdblockSyntax.Common) {
-        throw new Error(`Syntax should be specific, '${AdblockSyntax.Common}' is not supported`);
+const validateForSpecificProduct = (platform, modifier, isException) => {
+    if (platform === 0) {
+        throw new Error('No platforms specified');
     }
-    const modifierName = modifier.name.value;
-    const blockerPrefix = BLOCKER_PREFIX[syntax];
-    if (!blockerPrefix) {
-        throw new Error(`Unknown syntax: ${syntax}`);
+    const isGeneric = isGenericPlatform(platform);
+    // Skip validation if multiple products are specified
+    if (isGeneric && hasPlatformMultipleProducts(platform)) {
+        return { valid: true };
     }
+    const modifierName = modifier.name.value;
     // needed for validation of negation, assignment, etc.
-    const specificBlockerData = modifiersCompatibilityTable.getFirst(modifierName, convertSyntaxToGenericPlatform(syntax));
+    // Use getSingle for specific platforms, getFirst for generic platforms
+    const specificBlockerData = isGeneric
+        ? modifiersCompatibilityTable.getFirst(modifierName, platform)
+        : modifiersCompatibilityTable.getSingle(modifierName, platform);
     // if no specific blocker data is found
     if (!specificBlockerData) {
-        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.NOT_SUPPORTED}: '${modifierName}'`);
+        return getInvalidValidationResult(sprintf(VALIDATION_ERROR_PREFIX.NOT_SUPPORTED, getHumanReadablePlatformName(platform)));
     }
     // e.g. 'object-subrequest'
     if (specificBlockerData.removed) {
@@ -133,21 +136,21 @@ class ModifierValidator {
         return modifiersCompatibilityTable.existsAny(modifier.name.value);
     };
     /**
-     * Checks whether the given `modifier` is valid for specified `syntax`.
+     * Checks whether the given `modifier` is valid for specified `platforms`.
+     * It checks whether the modifier is supported by the product, deprecated, assignable, negatable, etc.
      *
-     * For `Common` syntax it simply checks whether the modifier exists.
-     * For specific syntax the validation is more complex —
-     * deprecated, assignable, negatable and other requirements are checked.
-     *
-     * @param syntax Adblock syntax to check the modifier for.
-     * @param rawModifier Modifier AST node.
+     * @param platforms Platforms to check the modifier for. Can be a specific platform (e.g., AdgExtChrome)
+     * or a generic platform (e.g., AdgAny, UboExtChromium, or combination of multiple products).
+     * @param modifier Modifier AST node.
      * @param isException Whether the modifier is used in exception rule, default to false.
      * Needed to check whether the modifier is allowed only in blocking or exception rules.
      *
+     * @note For single product: specific platforms use exact lookup, generic platforms use first match.
+     * If multiple products are specified (e.g., AdgAny | UboAny), validation is skipped and returns valid.
+     *
      * @returns Result of modifier validation.
      */
-    validate = (syntax, rawModifier, isException = false) => {
-        const modifier = clone(rawModifier);
+    validate = (platforms, modifier, isException = false) => {
         // special case: handle noop modifier which may be used as multiple underscores (not just one)
         // https://adguard.com/kb/general/ad-filtering/create-own-filters/#noop-modifier
         if (modifier.name.value.startsWith(UNDERSCORE)) {
@@ -155,18 +158,11 @@ class ModifierValidator {
             if (!isValidNoopModifier(modifier.name.value)) {
                 return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.INVALID_NOOP}: '${modifier.name.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.name.value = UNDERSCORE;
         }
         if (!this.exists(modifier)) {
             return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.NOT_EXISTENT}: '${modifier.name.value}'`);
         }
-        // for 'Common' syntax we cannot check something more
-        if (syntax === AdblockSyntax.Common) {
-            return { valid: true };
-        }
-        return validateForSpecificSyntax(syntax, modifier, isException);
+        return validateForSpecificProduct(platforms, modifier, isException);
     };
 }
 const modifierValidator = new ModifierValidator();

package/dist/validator/value.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.3.0 (build date: Thu, 20 Nov 2025 14:22:17 GMT)
+ * AGTree v3.4.0 (build date: Fri, 28 Nov 2025 09:46:33 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/version.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.3.0 (build date: Thu, 20 Nov 2025 14:22:17 GMT)
+ * AGTree v3.4.0 (build date: Fri, 28 Nov 2025 09:46:33 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/package.json

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