@adguard/filters-compiler 3.2.3 → 3.2.5

package/README.md

@@ -10,6 +10,7 @@ It is used in [FiltersRegistry].
 - [Filters metadata](#filters-metadata)
 - [`@include` directive and its options](#include-directive)
 - [Logging](#logging)
+- [Additional resources](#additional-resources)
 
 ## Usage
 
@@ -261,5 +262,11 @@ The logger supports the following log levels:
 
 The logger is initialized during compilation when a valid `logPath` is provided.
 
+## Additional resources
+
+- [AGENTS.md](AGENTS.md) — AI agent instructions and code guidelines
+- [DEVELOPMENT.md](DEVELOPMENT.md) — Development environment setup guide
+- [CHANGELOG.md](CHANGELOG.md) — Version history
+
 [FiltersRegistry]: https://github.com/AdguardTeam/FiltersRegistry/
 [filters-metadata]: https://github.com/AdguardTeam/FiltersRegistry/blob/master/README.md#filters-metadata

package/dist/build.txt

@@ -1 +1 @@
-version=3.2.3
+version=3.2.5

package/dist/index.cjs

@@ -770,10 +770,12 @@ class RuleValidator {
      * Validates rule node.
      *
      * @param {AnyRule} ruleNode Rule node to validate.
+     * @param {string} [ruleText] Pre-generated rule text.
+     * If not provided, generated from rule node.
      *
      * @returns {ValidationResult} Validation result.
      */
-    static validate(ruleNode) {
+    static validate(ruleNode, ruleText) {
         if (ruleNode.category === agtree.RuleCategory.Invalid) {
             return RuleValidator.createValidationResult(
                 false,
@@ -785,23 +787,23 @@ class RuleValidator {
             return RuleValidator.createValidationResult(true);
         }
 
-        const ruleText = agtree.RuleGenerator.generate(ruleNode);
+        const text = ruleText ?? agtree.RuleGenerator.generate(ruleNode);
 
         try {
             // Validate cosmetic rules
             if (ruleNode.category === agtree.RuleCategory.Cosmetic) {
                 // eslint-disable-next-line no-new
-                new tsurlfilter.CosmeticRule(ruleNode, 0);
+                new tsurlfilter.CosmeticRule(text, 0);
                 return RuleValidator.createValidationResult(true);
             }
 
             // Validate network rules
-            const rule = new tsurlfilter.NetworkRule(ruleNode, 0);
-            RuleValidator.validateRegexp(rule.getPattern(), ruleText);
+            const rule = new tsurlfilter.NetworkRule(text, 0);
+            RuleValidator.validateRegexp(rule.getPattern(), text);
         } catch (error) {
             // TODO: add getErrorMessage as a helper
             const message = error instanceof Error ? error.message : String(error);
-            const errorMessage = `Error: "${message}" in the rule: "${ruleText}"`;
+            const errorMessage = `Error: "${message}" in the rule: "${text}"`;
             return RuleValidator.createValidationResult(false, errorMessage);
         }
 
@@ -925,8 +927,9 @@ const validateAndFilterRules = (list, excluded, invalid = [], filterName) => {
 
         for (let i = 0; i < convertedRuleNodes.length; i += 1) {
             const convertedRuleNode = convertedRuleNodes[i];
+            const convertedRuleText = agtree.RuleGenerator.generate(convertedRuleNode);
 
-            let validationResult = RuleValidator.validate(convertedRuleNode);
+            let validationResult = RuleValidator.validate(convertedRuleNode, convertedRuleText);
 
             // TODO: remove this checking when $header is fixed
             // https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2942
@@ -949,7 +952,7 @@ const validateAndFilterRules = (list, excluded, invalid = [], filterName) => {
                 return false;
             }
 
-            const rule = tsurlfilter.RuleFactory.createRule(convertedRuleNode);
+            const rule = tsurlfilter.RuleFactory.createRule(convertedRuleText);
 
             // It is impossible to bundle jsdom into tsurlfilter, so we check if rules are valid in the compiler
             if (rule instanceof tsurlfilter.CosmeticRule && rule.getType() === agtree.CosmeticRuleType.ElementHidingRule) {
@@ -1415,7 +1418,7 @@ const __dirname$4 = path$1.dirname(url.fileURLToPath((typeof document === 'undef
 
 const RULES_SEPARATOR = '\r\n';
 let filterIdsPool = [];
-const metadataFilterIdsPool = [];
+let metadataFilterIdsPool = [];
 
 const OPTIMIZED_PLATFORMS_LIST = ['ext_safari', 'android', 'ios'];
 
@@ -2564,6 +2567,7 @@ const generate = async (filtersDir, platformsPath, whitelist, blacklist) => {
     // reset af the end
     // TODO: find out better way to reset
     filterIdsPool = [];
+    metadataFilterIdsPool = [];
 };
 
 const { log } = console;

package/dist/index.js

@@ -767,10 +767,12 @@ class RuleValidator {
      * Validates rule node.
      *
      * @param {AnyRule} ruleNode Rule node to validate.
+     * @param {string} [ruleText] Pre-generated rule text.
+     * If not provided, generated from rule node.
      *
      * @returns {ValidationResult} Validation result.
      */
-    static validate(ruleNode) {
+    static validate(ruleNode, ruleText) {
         if (ruleNode.category === RuleCategory.Invalid) {
             return RuleValidator.createValidationResult(
                 false,
@@ -782,23 +784,23 @@ class RuleValidator {
             return RuleValidator.createValidationResult(true);
         }
 
-        const ruleText = RuleGenerator.generate(ruleNode);
+        const text = ruleText ?? RuleGenerator.generate(ruleNode);
 
         try {
             // Validate cosmetic rules
             if (ruleNode.category === RuleCategory.Cosmetic) {
                 // eslint-disable-next-line no-new
-                new CosmeticRule(ruleNode, 0);
+                new CosmeticRule(text, 0);
                 return RuleValidator.createValidationResult(true);
             }
 
             // Validate network rules
-            const rule = new NetworkRule(ruleNode, 0);
-            RuleValidator.validateRegexp(rule.getPattern(), ruleText);
+            const rule = new NetworkRule(text, 0);
+            RuleValidator.validateRegexp(rule.getPattern(), text);
         } catch (error) {
             // TODO: add getErrorMessage as a helper
             const message = error instanceof Error ? error.message : String(error);
-            const errorMessage = `Error: "${message}" in the rule: "${ruleText}"`;
+            const errorMessage = `Error: "${message}" in the rule: "${text}"`;
             return RuleValidator.createValidationResult(false, errorMessage);
         }
 
@@ -922,8 +924,9 @@ const validateAndFilterRules = (list, excluded, invalid = [], filterName) => {
 
         for (let i = 0; i < convertedRuleNodes.length; i += 1) {
             const convertedRuleNode = convertedRuleNodes[i];
+            const convertedRuleText = RuleGenerator.generate(convertedRuleNode);
 
-            let validationResult = RuleValidator.validate(convertedRuleNode);
+            let validationResult = RuleValidator.validate(convertedRuleNode, convertedRuleText);
 
             // TODO: remove this checking when $header is fixed
             // https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2942
@@ -946,7 +949,7 @@ const validateAndFilterRules = (list, excluded, invalid = [], filterName) => {
                 return false;
             }
 
-            const rule = RuleFactory.createRule(convertedRuleNode);
+            const rule = RuleFactory.createRule(convertedRuleText);
 
             // It is impossible to bundle jsdom into tsurlfilter, so we check if rules are valid in the compiler
             if (rule instanceof CosmeticRule && rule.getType() === CosmeticRuleType.ElementHidingRule) {
@@ -1412,7 +1415,7 @@ const __dirname$3 = path$1.dirname(fileURLToPath(import.meta.url));
 
 const RULES_SEPARATOR = '\r\n';
 let filterIdsPool = [];
-const metadataFilterIdsPool = [];
+let metadataFilterIdsPool = [];
 
 const OPTIMIZED_PLATFORMS_LIST = ['ext_safari', 'android', 'ios'];
 
@@ -2561,6 +2564,7 @@ const generate = async (filtersDir, platformsPath, whitelist, blacklist) => {
     // reset af the end
     // TODO: find out better way to reset
     filterIdsPool = [];
+    metadataFilterIdsPool = [];
 };
 
 const { log } = console;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adguard/filters-compiler",
-  "version": "3.2.3",
+  "version": "3.2.5",
   "description": "AdGuard filters compiler",
   "homepage": "http://adguard.com",
   "type": "module",
@@ -18,15 +18,15 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@adguard/agtree": "^3.3.1",
+    "@adguard/agtree": "^4.0.2",
     "@adguard/css-tokenizer": "^1.2.0",
     "@adguard/ecss-tree": "^2.0.1",
     "@eslint/css-tree": "3.6.6",
     "@adguard/extended-css": "^2.1.1",
     "@adguard/filters-downloader": "^2.4.0",
     "@adguard/logger": "^2.0.0",
-    "@adguard/scriptlets": "^2.2.13",
-    "@adguard/tsurlfilter": "^3.5.1",
+    "@adguard/scriptlets": "^2.3.0",
+    "@adguard/tsurlfilter": "^4.0.3",
     "ajv": "^8.17.1",
     "child_process": ">=1.0.2",
     "jsdom": "^21.1.1",