@adguard/agtree 2.1.4 → 2.2.0

package/dist/agtree.d.ts

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.4 (build date: Mon, 25 Nov 2024 16:56:07 GMT)
+ * AGTree v2.2.0 (build date: Wed, 27 Nov 2024 16:28:27 GMT)
  * (c) 2024 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -3699,6 +3699,7 @@ declare const modifierDataSchema: zod.ZodEffects<zod.ZodTypeAny, {
     exceptionOnly: boolean;
     valueOptional: boolean;
     valueFormat: string | null;
+    valueFormatFlags: string | null;
 }, any>;
 /**
  * Type of the modifier data schema.

package/dist/agtree.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.4 (build date: Mon, 25 Nov 2024 16:56:07 GMT)
+ * AGTree v2.2.0 (build date: Wed, 27 Nov 2024 16:28:27 GMT)
  * (c) 2024 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -13,7 +13,6 @@ var sprintfJs = require('sprintf-js');
 var cssTokenizer = require('@adguard/css-tokenizer');
 var tldts = require('tldts');
 var isIp = require('is-ip');
-var XRegExp = require('xregexp');
 var cloneDeep = require('clone-deep');
 var compatibilityTableData_js = require('./compatibility-table-data.js');
 var zod = require('zod');
@@ -10764,10 +10763,11 @@ const isCustomValueFormatValidator = (valueFormat) => {
  *
  * @param modifier Modifier AST node.
  * @param valueFormat Value format for the modifier.
+ * @param valueFormatFlags Optional; RegExp flags for the value format.
  *
  * @returns Validation result.
  */
-const validateValue = (modifier, valueFormat) => {
+const validateValue = (modifier, valueFormat, valueFormatFlags) => {
     if (isCustomValueFormatValidator(valueFormat)) {
         const validator = CUSTOM_VALUE_FORMAT_MAP[valueFormat];
         return validator(modifier);
@@ -10776,14 +10776,19 @@ const validateValue = (modifier, valueFormat) => {
     if (!modifier.value?.value) {
         return getValueRequiredValidationResult(modifierName);
     }
-    let xRegExp;
+    let regExp;
     try {
-        xRegExp = XRegExp(valueFormat);
+        if (isString(valueFormatFlags)) {
+            regExp = new RegExp(valueFormat, valueFormatFlags);
+        }
+        else {
+            regExp = new RegExp(valueFormat);
+        }
     }
     catch (e) {
         throw new Error(`${SOURCE_DATA_ERROR_PREFIX.INVALID_VALUE_FORMAT_REGEXP}: '${modifierName}'`);
     }
-    const isValid = xRegExp.test(modifier.value?.value);
+    const isValid = regExp.test(modifier.value?.value);
     if (!isValid) {
         return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.VALUE_INVALID}: '${modifierName}'`);
     }
@@ -11367,7 +11372,7 @@ const validateForSpecificSyntax = (syntax, modifier, isException) => {
         if (!specificBlockerData.valueFormat) {
             throw new Error(`${SOURCE_DATA_ERROR_PREFIX.NO_VALUE_FORMAT_FOR_ASSIGNABLE}: '${modifierName}'`);
         }
-        return validateValue(modifier, specificBlockerData.valueFormat);
+        return validateValue(modifier, specificBlockerData.valueFormat, specificBlockerData.valueFormatFlags);
     }
     if (modifier?.value) {
         // e.g. 'third-party=true'
@@ -13064,8 +13069,14 @@ function getErrorMessage(error) {
  * Known validators that don't need to be validated as regex.
  */
 const KNOWN_VALIDATORS = new Set([
+    'csp_value',
     'domain',
+    'permissions_value',
+    'pipe_separated_apps',
+    'pipe_separated_denyallow_domains',
     'pipe_separated_domains',
+    'pipe_separated_methods',
+    'pipe_separated_stealth_options',
     'regexp',
     'url',
 ]);
@@ -13116,6 +13127,10 @@ zodToCamelCase(baseCompatibilityDataSchema.extend({
      * Its value can be a regex pattern or a known validator name (e.g. `domain`, `pipe_separated_domains`, etc.).
      */
     value_format: nonEmptyStringSchema.nullable().default(null),
+    /**
+     * Describes the flags for the `value_format` regex pattern.
+     */
+    value_format_flags: nonEmptyStringSchema.nullable().default(null),
 }).superRefine((data, ctx) => {
     // TODO: find something better, for now we can't add refine logic to the base schema:
     // https://github.com/colinhacks/zod/issues/454#issuecomment-848370721
@@ -13136,11 +13151,17 @@ zodToCamelCase(baseCompatibilityDataSchema.extend({
         const valueFormat = data.value_format.trim();
         // if it is a known validator, we don't need to validate it further
         if (KNOWN_VALIDATORS.has(valueFormat)) {
+            if (data.value_format_flags) {
+                ctx.addIssue({
+                    code: zod.ZodIssueCode.custom,
+                    message: 'value_format_flags are not allowed for known validators',
+                });
+            }
             return;
         }
         // otherwise, we need to validate it as a regex
         try {
-            XRegExp(valueFormat);
+            new RegExp(valueFormat, data.value_format_flags ?? EMPTY);
         }
         catch (error) {
             ctx.addIssue({
@@ -13149,6 +13170,12 @@ zodToCamelCase(baseCompatibilityDataSchema.extend({
             });
         }
     }
+    else if (data.value_format_flags) {
+        ctx.addIssue({
+            code: zod.ZodIssueCode.custom,
+            message: 'value_format is required for value_format_flags',
+        });
+    }
 }));
 
 /**
@@ -15699,7 +15726,7 @@ class RuleCategorizer {
     }
 }
 
-const version = "2.1.4";
+const version = "2.2.0";
 
 /**
  * @file AGTree version

package/dist/agtree.mjs

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.1.4 (build date: Mon, 25 Nov 2024 16:56:07 GMT)
+ * AGTree v2.2.0 (build date: Wed, 27 Nov 2024 16:28:27 GMT)
  * (c) 2024 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -12,7 +12,6 @@ import { TokenType as TokenType$1, tokenizeExtended, getFormattedTokenName } fro
 import * as tldts from 'tldts';
 import { parse } from 'tldts';
 import isIp from 'is-ip';
-import XRegExp from 'xregexp';
 import cloneDeep from 'clone-deep';
 import { modifiersCompatibilityTableData, redirectsCompatibilityTableData, scriptletsCompatibilityTableData } from './compatibility-table-data.js';
 import zod from 'zod';
@@ -10744,10 +10743,11 @@ const isCustomValueFormatValidator = (valueFormat) => {
  *
  * @param modifier Modifier AST node.
  * @param valueFormat Value format for the modifier.
+ * @param valueFormatFlags Optional; RegExp flags for the value format.
  *
  * @returns Validation result.
  */
-const validateValue = (modifier, valueFormat) => {
+const validateValue = (modifier, valueFormat, valueFormatFlags) => {
     if (isCustomValueFormatValidator(valueFormat)) {
         const validator = CUSTOM_VALUE_FORMAT_MAP[valueFormat];
         return validator(modifier);
@@ -10756,14 +10756,19 @@ const validateValue = (modifier, valueFormat) => {
     if (!modifier.value?.value) {
         return getValueRequiredValidationResult(modifierName);
     }
-    let xRegExp;
+    let regExp;
     try {
-        xRegExp = XRegExp(valueFormat);
+        if (isString(valueFormatFlags)) {
+            regExp = new RegExp(valueFormat, valueFormatFlags);
+        }
+        else {
+            regExp = new RegExp(valueFormat);
+        }
     }
     catch (e) {
         throw new Error(`${SOURCE_DATA_ERROR_PREFIX.INVALID_VALUE_FORMAT_REGEXP}: '${modifierName}'`);
     }
-    const isValid = xRegExp.test(modifier.value?.value);
+    const isValid = regExp.test(modifier.value?.value);
     if (!isValid) {
         return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.VALUE_INVALID}: '${modifierName}'`);
     }
@@ -11347,7 +11352,7 @@ const validateForSpecificSyntax = (syntax, modifier, isException) => {
         if (!specificBlockerData.valueFormat) {
             throw new Error(`${SOURCE_DATA_ERROR_PREFIX.NO_VALUE_FORMAT_FOR_ASSIGNABLE}: '${modifierName}'`);
         }
-        return validateValue(modifier, specificBlockerData.valueFormat);
+        return validateValue(modifier, specificBlockerData.valueFormat, specificBlockerData.valueFormatFlags);
     }
     if (modifier?.value) {
         // e.g. 'third-party=true'
@@ -13044,8 +13049,14 @@ function getErrorMessage(error) {
  * Known validators that don't need to be validated as regex.
  */
 const KNOWN_VALIDATORS = new Set([
+    'csp_value',
     'domain',
+    'permissions_value',
+    'pipe_separated_apps',
+    'pipe_separated_denyallow_domains',
     'pipe_separated_domains',
+    'pipe_separated_methods',
+    'pipe_separated_stealth_options',
     'regexp',
     'url',
 ]);
@@ -13096,6 +13107,10 @@ zodToCamelCase(baseCompatibilityDataSchema.extend({
      * Its value can be a regex pattern or a known validator name (e.g. `domain`, `pipe_separated_domains`, etc.).
      */
     value_format: nonEmptyStringSchema.nullable().default(null),
+    /**
+     * Describes the flags for the `value_format` regex pattern.
+     */
+    value_format_flags: nonEmptyStringSchema.nullable().default(null),
 }).superRefine((data, ctx) => {
     // TODO: find something better, for now we can't add refine logic to the base schema:
     // https://github.com/colinhacks/zod/issues/454#issuecomment-848370721
@@ -13116,11 +13131,17 @@ zodToCamelCase(baseCompatibilityDataSchema.extend({
         const valueFormat = data.value_format.trim();
         // if it is a known validator, we don't need to validate it further
         if (KNOWN_VALIDATORS.has(valueFormat)) {
+            if (data.value_format_flags) {
+                ctx.addIssue({
+                    code: zod.ZodIssueCode.custom,
+                    message: 'value_format_flags are not allowed for known validators',
+                });
+            }
             return;
         }
         // otherwise, we need to validate it as a regex
         try {
-            XRegExp(valueFormat);
+            new RegExp(valueFormat, data.value_format_flags ?? EMPTY);
         }
         catch (error) {
             ctx.addIssue({
@@ -13129,6 +13150,12 @@ zodToCamelCase(baseCompatibilityDataSchema.extend({
             });
         }
     }
+    else if (data.value_format_flags) {
+        ctx.addIssue({
+            code: zod.ZodIssueCode.custom,
+            message: 'value_format is required for value_format_flags',
+        });
+    }
 }));
 
 /**
@@ -15679,7 +15706,7 @@ class RuleCategorizer {
     }
 }
 
-const version = "2.1.4";
+const version = "2.2.0";
 
 /**
  * @file AGTree version