@adguard/agtree 2.1.3 → 2.1.4

package/dist/agtree.d.ts

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.3 (build date: Mon, 21 Oct 2024 08:22:25 GMT)
+ * AGTree v2.1.4 (build date: Mon, 25 Nov 2024 16:56:07 GMT)
  * (c) 2024 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -2357,9 +2357,11 @@ declare class FilterListParser extends ParserBase {
      * @param ast AST to generate
      * @param preferRaw If `true`, then the parser will use `raws.text` property of each rule
      * if it is available. Default is `false`.
+     * @param tolerant If `true`, errors during rule generation will be logged to the console and invalid rules
+     * will be skipped. If `false`, an error will be thrown on the first invalid rule. Default is `true`.
      * @returns Serialized filter list
      */
-    static generate(ast: FilterList, preferRaw?: boolean): string;
+    static generate(ast: FilterList, preferRaw?: boolean, tolerant?: boolean): string;
     /**
      * Serializes a filter list node to binary format.
      *

package/dist/agtree.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.3 (build date: Mon, 21 Oct 2024 08:22:25 GMT)
+ * AGTree v2.1.4 (build date: Mon, 25 Nov 2024 16:56:07 GMT)
  * (c) 2024 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -1913,6 +1913,9 @@ class AgentCommentRuleParser extends ParserBase {
     static serialize(node, buffer) {
         buffer.writeUint8(BinaryTypeMap.AgentRuleNode);
         const count = node.children.length;
+        // If there are no children, we do not write any data related to them, to avoid using unnecessary storage,
+        // but children is a required field, so during deserialization we should initialize it as an empty array,
+        // if there are no children in the binary data.
         if (count) {
             buffer.writeUint8(AgentRuleSerializationMap.Children);
             // note: we store the count, because re-construction of the array is faster if we know the length
@@ -1967,6 +1970,11 @@ class AgentCommentRuleParser extends ParserBase {
             }
             prop = buffer.readUint8();
         }
+        // Maybe children are not present in the binary data,
+        // in this case, we should initialize it as an empty array.
+        if (!node.children) {
+            node.children = [];
+        }
     }
 }
 
@@ -2862,6 +2870,9 @@ class HintCommentRuleParser extends ParserBase {
             buffer.writeUint8(SYNTAX_SERIALIZATION_MAP.get(exports.AdblockSyntax.Adg) ?? 0);
         }
         const count = node.children.length;
+        // If there are no children, we do not write any data related to them, to avoid using unnecessary storage,
+        // but children is a required field, so during deserialization we should initialize it as an empty array,
+        // if there are no children in the binary data.
         if (count) {
             buffer.writeUint8(HintRuleSerializationMap.Children);
             // note: we store the count, because re-construction of the array is faster if we know the length
@@ -2915,6 +2926,11 @@ class HintCommentRuleParser extends ParserBase {
             }
             prop = buffer.readUint8();
         }
+        // Maybe children are not present in the binary data,
+        // in this case, we should initialize it as an empty array.
+        if (!node.children) {
+            node.children = [];
+        }
     }
 }
 
@@ -5348,6 +5364,9 @@ class ModifierListParser extends ParserBase {
     static serialize(node, buffer) {
         buffer.writeUint8(BinaryTypeMap.ModifierListNode);
         const count = node.children.length;
+        // If there are no children, we do not write any data related to them, to avoid using unnecessary storage,
+        // but children is a required field, so during deserialization we should initialize it as an empty array,
+        // if there are no children in the binary data.
         if (count) {
             buffer.writeUint8(ModifierListNodeSerializationMap.Children);
             // note: we store the count, because re-construction of the array is faster if we know the length
@@ -5399,6 +5418,11 @@ class ModifierListParser extends ParserBase {
             }
             prop = buffer.readUint8();
         }
+        // Maybe children are not present in the binary data,
+        // in this case, we should initialize it as an empty array.
+        if (!node.children) {
+            node.children = [];
+        }
     }
 }
 
@@ -8611,10 +8635,16 @@ class NetworkRuleParser extends ParserBase {
         const pattern = ValueParser.parse(raw.slice(patternStart, patternEnd), options, baseOffset + patternStart);
         // Parse modifiers (if any)
         let modifiers;
+        // Get a last non-whitespace index
+        const lastNonWsIndex = StringUtils.skipWSBack(raw);
         // Find start and end index of the modifiers
         const modifiersStart = separatorIndex + 1;
-        const modifiersEnd = StringUtils.skipWSBack(raw) + 1;
+        const modifiersEnd = lastNonWsIndex + 1;
         if (separatorIndex !== -1) {
+            // Check for empty modifiers
+            if (separatorIndex === lastNonWsIndex) {
+                throw new AdblockSyntaxError('Empty modifiers are not allowed', baseOffset + separatorIndex, baseOffset + raw.length);
+            }
             modifiers = ModifierListParser.parse(raw.slice(modifiersStart, modifiersEnd), options, baseOffset + modifiersStart);
         }
         // Throw error if there is no pattern and no modifiers
@@ -8933,6 +8963,9 @@ class HostRuleParser extends ParserBase {
             buffer.writeUint32(node.end);
         }
         const count = node.children.length;
+        // If there are no children, we do not write any data related to them, to avoid using unnecessary storage,
+        // but children is a required field, so during deserialization we should initialize it as an empty array,
+        // if there are no children in the binary data.
         if (count) {
             // note: we store the count, because re-construction of the array is faster if we know the length
             if (count > UINT16_MAX) {
@@ -8976,6 +9009,11 @@ class HostRuleParser extends ParserBase {
             }
             prop = buffer.readUint8();
         }
+        // Maybe children are not present in the binary data,
+        // in this case, we should initialize it as an empty array.
+        if (!node.children) {
+            node.children = [];
+        }
     }
     /**
      * Serializes a host rule node to binary format.
@@ -9743,9 +9781,11 @@ class FilterListParser extends ParserBase {
      * @param ast AST to generate
      * @param preferRaw If `true`, then the parser will use `raws.text` property of each rule
      * if it is available. Default is `false`.
+     * @param tolerant If `true`, errors during rule generation will be logged to the console and invalid rules
+     * will be skipped. If `false`, an error will be thrown on the first invalid rule. Default is `true`.
      * @returns Serialized filter list
      */
-    static generate(ast, preferRaw = false) {
+    static generate(ast, preferRaw = false, tolerant = true) {
         let result = EMPTY;
         for (let i = 0; i < ast.children.length; i += 1) {
             const rule = ast.children[i];
@@ -9753,7 +9793,18 @@ class FilterListParser extends ParserBase {
                 result += rule.raws.text;
             }
             else {
-                result += RuleParser.generate(rule);
+                try {
+                    result += RuleParser.generate(rule);
+                }
+                catch (error) {
+                    if (tolerant) {
+                        // eslint-disable-next-line no-console
+                        console.error(`Error when generating: ${error}`);
+                    }
+                    else {
+                        throw new Error(String(error));
+                    }
+                }
             }
             switch (rule.raws?.nl) {
                 case 'crlf':
@@ -14700,7 +14751,7 @@ class RawFilterListConverter extends ConverterBase {
             return createConversionResult(rawFilterList, false);
         }
         // Otherwise, serialize the filter list and return the result
-        return createConversionResult(FilterListParser.generate(conversionResult.result), true);
+        return createConversionResult(FilterListParser.generate(conversionResult.result, false, tolerant), true);
     }
 }
 
@@ -15648,7 +15699,7 @@ class RuleCategorizer {
     }
 }
 
-const version = "2.1.3";
+const version = "2.1.4";
 
 /**
  * @file AGTree version

package/dist/agtree.mjs

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.3 (build date: Mon, 21 Oct 2024 08:22:25 GMT)
+ * AGTree v2.1.4 (build date: Mon, 25 Nov 2024 16:56:07 GMT)
  * (c) 2024 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -1893,6 +1893,9 @@ class AgentCommentRuleParser extends ParserBase {
     static serialize(node, buffer) {
         buffer.writeUint8(BinaryTypeMap.AgentRuleNode);
         const count = node.children.length;
+        // If there are no children, we do not write any data related to them, to avoid using unnecessary storage,
+        // but children is a required field, so during deserialization we should initialize it as an empty array,
+        // if there are no children in the binary data.
         if (count) {
             buffer.writeUint8(AgentRuleSerializationMap.Children);
             // note: we store the count, because re-construction of the array is faster if we know the length
@@ -1947,6 +1950,11 @@ class AgentCommentRuleParser extends ParserBase {
             }
             prop = buffer.readUint8();
         }
+        // Maybe children are not present in the binary data,
+        // in this case, we should initialize it as an empty array.
+        if (!node.children) {
+            node.children = [];
+        }
     }
 }
 
@@ -2842,6 +2850,9 @@ class HintCommentRuleParser extends ParserBase {
             buffer.writeUint8(SYNTAX_SERIALIZATION_MAP.get(AdblockSyntax.Adg) ?? 0);
         }
         const count = node.children.length;
+        // If there are no children, we do not write any data related to them, to avoid using unnecessary storage,
+        // but children is a required field, so during deserialization we should initialize it as an empty array,
+        // if there are no children in the binary data.
         if (count) {
             buffer.writeUint8(HintRuleSerializationMap.Children);
             // note: we store the count, because re-construction of the array is faster if we know the length
@@ -2895,6 +2906,11 @@ class HintCommentRuleParser extends ParserBase {
             }
             prop = buffer.readUint8();
         }
+        // Maybe children are not present in the binary data,
+        // in this case, we should initialize it as an empty array.
+        if (!node.children) {
+            node.children = [];
+        }
     }
 }
 
@@ -5328,6 +5344,9 @@ class ModifierListParser extends ParserBase {
     static serialize(node, buffer) {
         buffer.writeUint8(BinaryTypeMap.ModifierListNode);
         const count = node.children.length;
+        // If there are no children, we do not write any data related to them, to avoid using unnecessary storage,
+        // but children is a required field, so during deserialization we should initialize it as an empty array,
+        // if there are no children in the binary data.
         if (count) {
             buffer.writeUint8(ModifierListNodeSerializationMap.Children);
             // note: we store the count, because re-construction of the array is faster if we know the length
@@ -5379,6 +5398,11 @@ class ModifierListParser extends ParserBase {
             }
             prop = buffer.readUint8();
         }
+        // Maybe children are not present in the binary data,
+        // in this case, we should initialize it as an empty array.
+        if (!node.children) {
+            node.children = [];
+        }
     }
 }
 
@@ -8591,10 +8615,16 @@ class NetworkRuleParser extends ParserBase {
         const pattern = ValueParser.parse(raw.slice(patternStart, patternEnd), options, baseOffset + patternStart);
         // Parse modifiers (if any)
         let modifiers;
+        // Get a last non-whitespace index
+        const lastNonWsIndex = StringUtils.skipWSBack(raw);
         // Find start and end index of the modifiers
         const modifiersStart = separatorIndex + 1;
-        const modifiersEnd = StringUtils.skipWSBack(raw) + 1;
+        const modifiersEnd = lastNonWsIndex + 1;
         if (separatorIndex !== -1) {
+            // Check for empty modifiers
+            if (separatorIndex === lastNonWsIndex) {
+                throw new AdblockSyntaxError('Empty modifiers are not allowed', baseOffset + separatorIndex, baseOffset + raw.length);
+            }
             modifiers = ModifierListParser.parse(raw.slice(modifiersStart, modifiersEnd), options, baseOffset + modifiersStart);
         }
         // Throw error if there is no pattern and no modifiers
@@ -8913,6 +8943,9 @@ class HostRuleParser extends ParserBase {
             buffer.writeUint32(node.end);
         }
         const count = node.children.length;
+        // If there are no children, we do not write any data related to them, to avoid using unnecessary storage,
+        // but children is a required field, so during deserialization we should initialize it as an empty array,
+        // if there are no children in the binary data.
         if (count) {
             // note: we store the count, because re-construction of the array is faster if we know the length
             if (count > UINT16_MAX) {
@@ -8956,6 +8989,11 @@ class HostRuleParser extends ParserBase {
             }
             prop = buffer.readUint8();
         }
+        // Maybe children are not present in the binary data,
+        // in this case, we should initialize it as an empty array.
+        if (!node.children) {
+            node.children = [];
+        }
     }
     /**
      * Serializes a host rule node to binary format.
@@ -9723,9 +9761,11 @@ class FilterListParser extends ParserBase {
      * @param ast AST to generate
      * @param preferRaw If `true`, then the parser will use `raws.text` property of each rule
      * if it is available. Default is `false`.
+     * @param tolerant If `true`, errors during rule generation will be logged to the console and invalid rules
+     * will be skipped. If `false`, an error will be thrown on the first invalid rule. Default is `true`.
      * @returns Serialized filter list
      */
-    static generate(ast, preferRaw = false) {
+    static generate(ast, preferRaw = false, tolerant = true) {
         let result = EMPTY;
         for (let i = 0; i < ast.children.length; i += 1) {
             const rule = ast.children[i];
@@ -9733,7 +9773,18 @@ class FilterListParser extends ParserBase {
                 result += rule.raws.text;
             }
             else {
-                result += RuleParser.generate(rule);
+                try {
+                    result += RuleParser.generate(rule);
+                }
+                catch (error) {
+                    if (tolerant) {
+                        // eslint-disable-next-line no-console
+                        console.error(`Error when generating: ${error}`);
+                    }
+                    else {
+                        throw new Error(String(error));
+                    }
+                }
             }
             switch (rule.raws?.nl) {
                 case 'crlf':
@@ -14680,7 +14731,7 @@ class RawFilterListConverter extends ConverterBase {
             return createConversionResult(rawFilterList, false);
         }
         // Otherwise, serialize the filter list and return the result
-        return createConversionResult(FilterListParser.generate(conversionResult.result), true);
+        return createConversionResult(FilterListParser.generate(conversionResult.result, false, tolerant), true);
     }
 }
 
@@ -15628,7 +15679,7 @@ class RuleCategorizer {
     }
 }
 
-const version = "2.1.3";
+const version = "2.1.4";
 
 /**
  * @file AGTree version

package/package.json

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